Implement field-like flags in lex, add a cttest.

Contrary to the comment field-like flags are used
in lrlex this adds the missing implementation and
adds a cttest that would have caught the mistake in
either the grmtools_section.test or when building
the `.test`

Author: ratmice

lrlex/src/lib/parser.rs

@@ -304,6 +304,15 @@ where
                             });
                         }
                         i = self.parse_spaces(i)?;
+                        if let Some(j) = self.lookahead_is(":", i) {
+                            i = j
+                        } else {
+                            return Err(LexBuildError {
+                                kind: LexErrorKind::InvalidGrmtoolsSectionValue,
+                                spans: vec![Span::new(i, i)],
+                            });
+                        }
+                        i = self.parse_spaces(i)?;
                         let j = self.parse_digits(i)?;
                         // This checks that the digits are valid numbers, but currently just returns `None`
                         // when the values are actually out of range for that type. This could be improved.
@@ -340,7 +349,6 @@ where
         let mut grmtools_section_span_map = HashMap::new();
         let mut grmtools_section_lex_flags = UNSPECIFIED_LEX_FLAGS;
         if let Some(j) = self.lookahead_is("%grmtools", i) {
-            // lrlex currently doesn't have any `key: value' settings.
             i = self.parse_ws(j)?;
             if let Some(j) = self.lookahead_is("{", i) {
                 i = self.parse_ws(j)?;
@@ -1889,8 +1897,8 @@ b "A"
 
         let src = r#"
 %grmtools {
-  size_limit 5,
-  size_limit 6,
+  size_limit: 5,
+  size_limit: 6,
 }
 %%
 . "dot";
@@ -1904,7 +1912,7 @@ b "A"
 
         let src = r#"
 %grmtools {
-  !size_limit 5,
+  !size_limit: 5,
 }
 %%
 . "dot"

lrpar/cttests/src/lex_flags.test

@@ -0,0 +1,13 @@
+name: Lex flags in the grmtools section
+grammar: |
+    %grmtools{yacckind: Original(NoAction)}
+    %start Start 
+    %%
+    Start: 'ANY' | 'a' | 'NL';
+
+lexer: |
+    %grmtools{!dot_matches_new_line, octal, size_limit: 1048576}
+    %%
+    \141 'a'
+    . 'ANY'
+    [\n] 'NL'

lrpar/cttests/src/lib.rs

@@ -35,6 +35,9 @@ lrpar_mod!("expect.y");
 lrlex_mod!("lexer_lifetime.l");
 lrpar_mod!("lexer_lifetime.y");
 
+lrlex_mod!("lex_flags.l");
+lrpar_mod!("lex_flags.y");
+
 lrlex_mod!("multitypes.l");
 lrpar_mod!("multitypes.y");
 
@@ -47,6 +50,9 @@ lrpar_mod!("parseparam_copy.y");
 lrlex_mod!("passthrough.l");
 lrpar_mod!("passthrough.y");
 
+lrlex_mod!("regex_opt.l");
+lrlex_mod!("regex_opt.y");
+
 lrlex_mod!("span.l");
 lrpar_mod!("span.y");
 
@@ -394,6 +400,28 @@ fn test_grmtools_section() {
     }
 }
 
+// regex options set through the builder methods.
+#[test]
+fn test_regex_opt() {
+    let lexerdef = regex_opt_l::lexerdef();
+    let lexer = lexerdef.lexer("a");
+    match regex_opt_y::parse(&lexer) {
+        ref errs if errs.is_empty() => (),
+        e => panic!("{:?}", e),
+    }
+}
+
+// Lex flags set through the grmtools section.
+#[test]
+fn test_lex_flags() {
+    let lexerdef = lex_flags_l::lexerdef();
+    let lexer = lexerdef.lexer("a");
+    match lex_flags_y::parse(&lexer) {
+        ref errs if errs.is_empty() => (),
+        e => panic!("{:?}", e),
+    }
+}
+
 // Codegen failure tests
 #[cfg(test)]
 generate_codegen_fail_tests!("src/ctfails/*.test");

lrpar/cttests/src/regex_opt.test

@@ -1,4 +1,4 @@
-name: Test NoAction using the calculator grammar
+name: Test regex options via builder.
 yacckind: Original(YaccOriginalActionKind::NoAction)
 lex_flags: ['!dot_matches_new_line', 'octal']
 grammar: |