Merge softdevteam#342

342: Test propagating multiple errors through the routines sections r=ltratt a=ratmice Co-authored-by: matt rice <ratmice@gmail.com>
ratmice · Aug 16, 2022 · 6b011af · 6b011af
2 parents cb99d23 + 3ad4f9b
commit 6b011af
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 0 deletions.
diff --git a/cfgrammar/src/lib/yacc/parser.rs b/cfgrammar/src/lib/yacc/parser.rs
@@ -2362,4 +2362,36 @@ x"
             .into_iter(),
         )
     }
+
+    #[test]
+    fn test_routines_multiple_errors() {
+        let mut src = String::from(
+            "
+        %start A
+        %start B
+        %%
+        A -> () : 'a';
+        A -> () : 'a';
+        %%
+        ",
+        );
+        let mut expected_errs = vec![
+            (
+                YaccGrammarErrorKind::DuplicateStartDeclaration,
+                vec![(2, 16), (3, 16)],
+            ),
+            (YaccGrammarErrorKind::DuplicateRule, vec![(5, 9), (6, 9)]),
+        ];
+        parse(YaccKind::Grmtools, &src)
+            .expect_multiple_errors(&src, &mut expected_errs.clone().into_iter());
+
+        src.push_str(
+            "
+                /* Incomplete comment
+        ",
+        );
+        expected_errs.push((YaccGrammarErrorKind::IncompleteComment, vec![(9, 17)]));
+        parse(YaccKind::Grmtools, &src)
+            .expect_multiple_errors(&src, &mut expected_errs.clone().into_iter());
+    }
 }
diff --git a/lrlex/src/lib/parser.rs b/lrlex/src/lib/parser.rs
@@ -1346,4 +1346,35 @@ a\[\]a 'aboxa'
                 .expect_error_at_line_col(src, LexErrorKind::InvalidStartStateName, 1, 4);
         }
     }
+
+    #[test]
+    fn test_routines_multiple_errors() {
+        let mut src = String::from(
+            r#"
+        %s A
+        %s A
+        %%
+        a "A"
+        b "A"
+        %%
+        "#,
+        );
+
+        let mut expected_errs = vec![
+            (LexErrorKind::DuplicateStartState, vec![(2, 12), (3, 12)]),
+            (LexErrorKind::DuplicateName, vec![(5, 12), (6, 12)]),
+        ];
+        LRNonStreamingLexerDef::<DefaultLexeme<u8>, u8>::from_str(&src)
+            .expect_multiple_errors(&src, &mut expected_errs.clone().into_iter());
+
+        src.push_str(
+            "
+            fn not_supported() {
+            }
+        ",
+        );
+        expected_errs.push((LexErrorKind::RoutinesNotSupported, vec![(7, 9)]));
+        LRNonStreamingLexerDef::<DefaultLexeme<u8>, u8>::from_str(&src)
+            .expect_multiple_errors(&src, &mut expected_errs.into_iter());
+    }
 }