Rename cil.cstd option to std

This allows GCC-like --std=c11 as argument.

Author: sim642

src/common/util/cilfacade.ml

@@ -56,7 +56,7 @@ let is_first_field x = match x.fcomp.cfields with
 let init_options () =
   Mergecil.merge_inlines := get_bool "cil.merge.inlines";
   Cil.cstd := (
-    match get_string "cil.cstd" with
+    match get_string "std" with
     | "c89" | "c90"
     | "gnu89" | "gnu90" -> C90
     | "c99" | "c9x"

src/config/options.schema.json

@@ -171,6 +171,20 @@
       "type": "string",
       "default": ".goblint"
     },
+    "std": {
+      "title": "std",
+      "type": "string",
+      "description": "Specify the c standard used for preprocessing and parsing.",
+      "default": "gnu11",
+      "enum": [
+        "c89", "c90",
+        "gnu89", "gnu90",
+        "c99", "c9x",
+        "gnu99", "gnu9x",
+        "c11", "c1x",
+        "gnu11", "gnu1x"
+      ]
+    },
     "pre": {
       "title": "Preprocessing",
       "description": "Preprocessing options",
@@ -276,20 +290,6 @@
           },
           "additionalProperties": false
         },
-        "cstd": {
-          "title": "cil.cstd",
-          "type": "string",
-          "description": "Specify the c standard used for preprocessing and parsing.",
-          "default": "gnu11",
-          "enum": [
-            "c89", "c90",
-            "gnu89", "gnu90",
-            "c99", "c9x",
-            "gnu99", "gnu9x",
-            "c11", "c1x",
-            "gnu11", "gnu1x"
-          ]
-        },
         "gnu89inline": {
           "title": "cil.gnu89inline",
           "type": "boolean",

src/maingoblint.ml

@@ -267,7 +267,7 @@ let preprocess_files () =
   (* Preprocessor flags *)
   let cppflags = ref (get_string_list "pre.cppflags") in
 
-  cppflags := ("--std=" ^ get_string "cil.cstd") :: !cppflags;
+  cppflags := ("--std=" ^ get_string "std") :: !cppflags;
 
   if get_bool "ana.sv-comp.enabled" then (
     let architecture_flag = match get_string "exp.architecture" with