Merge pull request #1356 from GaijinEntertainment/gen2_as_option

options gen2
GaijinEntertainment · Nov 6, 2024 · 372d0dc · 372d0dc
2 parents 54630ca + 9330462
commit 372d0dc
Show file tree

Hide file tree

Showing 6 changed files with 870 additions and 869 deletions.
diff --git a/examples/test/misc/hello_world.das b/examples/test/misc/hello_world.das
@@ -1,4 +1,4 @@
-#gen2#
+options gen2;
 
 //	NOTE - this is WIP example of every single feature new syntax has to offer
 //	new syntax no longer supports significant whitespace, oxoford commas, etc

diff --git a/src/ast/ast_lint.cpp b/src/ast/ast_lint.cpp
@@ -838,7 +838,9 @@ namespace das {
         "skip_lock_checks",             Type::tBool,
         "skip_module_lock_checks",      Type::tBool,
     // pinvoke
-        "threadlock_context",           Type::tBool
+        "threadlock_context",           Type::tBool,
+    // version_2_syntax
+        "gen2",                         Type::tBool,
     };
 
     void verifyOptions() {

diff --git a/src/ast/ast_parse.cpp b/src/ast/ast_parse.cpp
@@ -410,8 +410,15 @@ namespace das {
                     continue;
                 }
             }
-            if (text[i] == '#' && i + 5 < length && text[i + 1] == 'g' && text[i + 2] == 'e' && text[i + 3] == 'n' && text[i + 4] == '2' && text[i + 5] == '#') {
-                return true;
+            // check for options\s*gen2
+            if (text[i] == 'o' && i + 7 < length && text[i + 1] == 'p' && text[i + 2] == 't' && text[i + 3] == 'i' && text[i + 4] == 'o' && text[i + 5] == 'n' && text[i + 6] == 's' && isspace(text[i + 7]) ) {
+                i += 7;
+                while (i < length && isspace(text[i])) {
+                    ++i;
+                }
+                if (i + 4 < length && text[i] == 'g' && text[i + 1] == 'e' && text[i + 2] == 'n' && text[i + 3] == '2') {
+                    return true;
+                }
             }
         }
         return false;