diff -r 92c31cbb1952 -r 863feeb5c760 testing3/re_test.sh --- a/testing3/re_test.sh Tue Nov 28 20:37:57 2017 +0000 +++ b/testing3/re_test.sh Wed Nov 29 21:22:29 2017 +0000 @@ -108,7 +108,8 @@ echo " simp(ALT(ONE ~ (ONE ~ (ONE ~ ZERO)), CHAR('a'))) == CHAR('a')" >> $out echo " simp(CHAR('a') | CHAR('a')) == CHAR('a')" >> $out echo " simp(ONE | CHAR('a')) == (ONE | CHAR('a'))" >> $out - + echo " simp(ALT((CHAR('a') | ZERO) ~ ONE," >> $out + echo " ((ONE | CHAR('b')) | CHAR('c')) ~ (CHAR('d') ~ ZERO))) == CHAR('a')" >> $out if (scala_assert "re.scala" "re1c_test.scala") then echo " --> success" >> $out @@ -120,7 +121,7 @@ if [ $tsts1 -eq 0 ] then - echo " let EVIL = (a*)* b" >> $out + echo " val EVIL = SEQ(STAR(STAR(CHAR('a'))), CHAR('b'))" >> $out echo " ders(List.fill(5)('a'),EVIL) == SEQ(SEQ(STAR(CHAR('a')),STAR(STAR(CHAR('a')))),CHAR('b'))" >> $out echo " ders(List('b'),EVIL) == ONE" >> $out echo " ders(List('b','b'),EVIL) == ZERO" >> $out @@ -145,7 +146,7 @@ if [ $tsts1 -eq 0 ] then - echo " let EVIL = (a*)* b" >> $out + echo " val EVIL = SEQ(STAR(STAR(CHAR('a'))), CHAR('b'))" >> $out echo " size(der('a', der('a', EVIL))) == 28" >> $out echo " size(der('a', der('a', der('a', EVIL)))) == 58" >> $out echo " size(ders(\"aaaaaa\".toList, EVIL)) == 8" >> $out