From: NeilBrown Date: Wed, 5 Jun 2019 08:12:20 +0000 (+1000) Subject: oceani-tests: use LALR to check for conflicts. X-Git-Url: https://ocean-lang.org/code/?p=ocean;a=commitdiff_plain;h=10bdd8cae39ee1ca74967283b958c3c041adfa14 oceani-tests: use LALR to check for conflicts. 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 --- diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc index c0a9c88..40489bf 100644 --- a/csrc/oceani-tests.mdc +++ b/csrc/oceani-tests.mdc @@ -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 \