Add simpler configuration syntax and language specific block markers.

Simplifications: - allow configurations without `re2c` prefix (for languages other than C/C++ `re2c` prefix is illogical, as the program has a different name, e.g. `re2ocaml` for OCaml, etc.) - allow dropping `define:` part - allow dropping `variable:` part So, for example, former `re2c:define:YYFILL` is now `:YYFILL`. Language-specific block markers are of the form `/*!re2<x>`, where `<x>` is a word that should match the name of the program (e.g. `ocaml` for re2ocaml), or else `<x>` can be `c` (historically `/*!re2c` marker was allowed for languages other than C/C++, we should allow it for backwards compatibility).
skvadrik · Oct 17, 2024 · cb247ad · cb247ad
1 parent 8317afc
commit cb247ad
Show file tree

Hide file tree

Showing 47 changed files with 15,633 additions and 14,930 deletions.
diff --git a/bootstrap/src/default_syntax_c.cc b/bootstrap/src/default_syntax_c.cc
diff --git a/bootstrap/src/default_syntax_d.cc b/bootstrap/src/default_syntax_d.cc
diff --git a/bootstrap/src/default_syntax_go.cc b/bootstrap/src/default_syntax_go.cc
diff --git a/bootstrap/src/default_syntax_haskell.cc b/bootstrap/src/default_syntax_haskell.cc
diff --git a/bootstrap/src/default_syntax_java.cc b/bootstrap/src/default_syntax_java.cc
diff --git a/bootstrap/src/default_syntax_js.cc b/bootstrap/src/default_syntax_js.cc
diff --git a/bootstrap/src/default_syntax_ocaml.cc b/bootstrap/src/default_syntax_ocaml.cc
diff --git a/bootstrap/src/default_syntax_python.cc b/bootstrap/src/default_syntax_python.cc
diff --git a/bootstrap/src/default_syntax_rust.cc b/bootstrap/src/default_syntax_rust.cc
diff --git a/bootstrap/src/default_syntax_v.cc b/bootstrap/src/default_syntax_v.cc
diff --git a/bootstrap/src/default_syntax_zig.cc b/bootstrap/src/default_syntax_zig.cc
diff --git a/bootstrap/src/parse/conf_lexer.cc b/bootstrap/src/parse/conf_lexer.cc
diff --git a/bootstrap/src/parse/lexer.cc b/bootstrap/src/parse/lexer.cc
diff --git a/bootstrap/src/parse/lexer.h b/bootstrap/src/parse/lexer.h
@@ -17,8 +17,8 @@ struct LexerState {
     uint8_t* bot, *lim, *cur, *mar, *ctx, *tok, *ptr, *pos, *eof;
 
 #line 20 "src/parse/lexer.h"
-uint8_t* yyt1;uint8_t* yyt2;uint8_t* yyt3;
-#line 78 "../src/parse/lexer.re"
+uint8_t* yyt1;uint8_t* yyt2;uint8_t* yyt3;uint8_t* yyt4;
+#line 79 "../src/parse/lexer.re"
 
 
     inline LexerState()
@@ -35,8 +35,8 @@ uint8_t* yyt1;uint8_t* yyt2;uint8_t* yyt3;
           eof(nullptr)
 
 #line 38 "src/parse/lexer.h"
-, yyt1(lim), yyt2(lim), yyt3(lim)
-#line 92 "../src/parse/lexer.re"
+, yyt1(lim), yyt2(lim), yyt3(lim), yyt4(lim)
+#line 93 "../src/parse/lexer.re"
  {
         memset(lim, 0, maxfill());
     }
@@ -62,8 +62,8 @@ uint8_t* yyt1;uint8_t* yyt2;uint8_t* yyt3;
         pos += offs;
 
 #line 65 "src/parse/lexer.h"
-if (yyt1) { yyt1 += offs; }if (yyt2) { yyt2 += offs; }if (yyt3) { yyt3 += offs; }
-#line 115 "../src/parse/lexer.re"
+if (yyt1) { yyt1 += offs; }if (yyt2) { yyt2 += offs; }if (yyt3) { yyt3 += offs; }if (yyt4) { yyt4 += offs; }
+#line 116 "../src/parse/lexer.re"
 
     }