diff -r de701b64a4e0 -r 6af86ba1208f main_testing3/re_test6.scala --- a/main_testing3/re_test6.scala Thu Nov 03 11:30:09 2022 +0000 +++ b/main_testing3/re_test6.scala Tue Nov 08 00:27:47 2022 +0000 @@ -1,9 +1,10 @@ import M3._ -val EVIL_urban = SEQ(STAR(STAR(CHAR('a'))), CHAR('b')) - - -assert(simp(Iterator.iterate(ONE:Rexp)(r => SEQ(r, ONE | ONE)).drop(50).next) == ONE) -assert(simp(Iterator.iterate(ONE:Rexp)(r => ALT(r, r)).drop(20).next) == ONE) -assert(matcher(EVIL_urban, "a" * 1000000) == false) -assert(matcher(EVIL_urban, "a" * 1000000 ++ "b") == true) +assert(SEQs_smart(Nil) == ONE) +assert(SEQs_smart(List(ZERO)) == ZERO) +assert(SEQs_smart(List(CHAR('a'))) == CHAR('a')) +assert(SEQs_smart(List(ONE ~ ONE)) == ONE ~ ONE) +assert(SEQs_smart(List(ONE, ONE)) == SEQs(List(ONE, ONE))) +assert(ALTs_smart(Nil) == ZERO) +assert(ALTs_smart(List(ONE ~ ONE)) == ONE ~ ONE) +assert(ALTs_smart(List(ZERO, ZERO)) == ALTs(List(ZERO, ZERO)))