]> ocean-lang.org Git - ocean/commitdiff
oceani-tests: use LALR to check for conflicts.
authorNeilBrown <neil@brown.name>
Wed, 5 Jun 2019 08:12:20 +0000 (18:12 +1000)
committerNeilBrown <neil@brown.name>
Wed, 5 Jun 2019 08:12:20 +0000 (18:12 +1000)
LR1 analysis takes a lot longer than LALR and will never find
more conflicts, only ever fewer.
So with to that when checking for conflicts.

Also report that the check is happening, and fix a typo.

Signed-off-by: NeilBrown <neil@brown.name>
csrc/oceani-tests.mdc

index c0a9c88b6c344a973d13a4b643d6471aea50c887..40489bffd41dd17f74a6428ba9826614e4e7fb53 100644 (file)
@@ -38,8 +38,10 @@ arguments separated from the name by commas.  For each test, there is a section
 
        tests:: oceani_test_suite
        oceani_test_suite: oceani coverage_oceani
-               @./parsergen --report --LR1 --tag Parser oceani.mdc | grep " - no conflicts" > /dev/null || \
-                   { echo "Grammar container conflicts, please review" ; exit 1; }
+               @echo -n Checking grammar ...
+               @./parsergen --report --LALR --tag Parser oceani.mdc | grep " - no conflicts" > /dev/null || \
+                   { echo "Grammar contains conflicts, please review" ; exit 1; }
+               @echo ok
                @rm -rf coverage; mkdir -p coverage
                @cp *.gcno coverage
                @for T in $(oceani_tests); do \