diff -r 7acbef680bef -r f5c0749858fd main_marking3/re_test6.scala --- a/main_marking3/re_test6.scala Sun Jan 15 10:58:13 2023 +0000 +++ b/main_marking3/re_test6.scala Sat Mar 11 22:01:53 2023 +0000 @@ -1,4 +1,10 @@ import M3._ -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(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)))