diff -r f70d74fea67f -r 2a30c7dfe3ed main_marking3/re_test3.scala --- a/main_marking3/re_test3.scala Sun Sep 15 12:57:59 2024 +0100 +++ b/main_marking3/re_test3.scala Mon Jul 21 16:38:07 2025 +0100 @@ -1,22 +1,24 @@ -import M3._ + +def urbanmain() = { + import M3._ -assert(simp(ZERO | ONE) == ONE) -assert(simp(STAR(ZERO | ONE)) == STAR(ZERO | ONE)) -assert(simp(ONE ~ (ONE ~ (ONE ~ CHAR('a')))) == CHAR('a')) -assert(simp(((ONE ~ ONE) ~ ONE) ~ CHAR('a')) == CHAR('a')) -assert(simp(((ONE | ONE) ~ ONE) ~ CHAR('a')) == CHAR('a')) -assert(simp(ONE ~ (ONE ~ (ONE ~ ZERO))) == ZERO) -assert(simp(ALT(ONE ~ (ONE ~ (ONE ~ ZERO)), CHAR('a'))) == CHAR('a')) -assert(simp(CHAR('a') | CHAR('a')) == CHAR('a')) -assert(simp(CHAR('a') ~ CHAR('a')) == CHAR('a') ~ CHAR('a')) -assert(simp(ONE | CHAR('a')) == (ONE | CHAR('a'))) -assert(simp(ALT((CHAR('a') | ZERO) ~ ONE, + assert(simp(ZERO | ONE) == ONE) + assert(simp(STAR(ZERO | ONE)) == STAR(ZERO | ONE)) + assert(simp(ONE ~ (ONE ~ (ONE ~ CHAR('a')))) == CHAR('a')) + assert(simp(((ONE ~ ONE) ~ ONE) ~ CHAR('a')) == CHAR('a')) + assert(simp(((ONE | ONE) ~ ONE) ~ CHAR('a')) == CHAR('a')) + assert(simp(ONE ~ (ONE ~ (ONE ~ ZERO))) == ZERO) + assert(simp(ALT(ONE ~ (ONE ~ (ONE ~ ZERO)), CHAR('a'))) == CHAR('a')) + assert(simp(CHAR('a') | CHAR('a')) == CHAR('a')) + assert(simp(CHAR('a') ~ CHAR('a')) == CHAR('a') ~ CHAR('a')) + assert(simp(ONE | CHAR('a')) == (ONE | CHAR('a'))) + assert(simp(ALT((CHAR('a') | ZERO) ~ ONE, ((ONE | CHAR('b')) | CHAR('c')) ~ (CHAR('d') ~ ZERO))) == CHAR('a')) -assert(simp((ZERO | ((ZERO | ZERO) | (ZERO | ZERO))) ~ ((ONE | ZERO) | ONE ) ~ (CHAR('a'))) == ZERO) -assert(simp(ALT(ONE | ONE, ONE | ONE)) == ONE) -assert(simp(ALT(ZERO | CHAR('a'), CHAR('a') | ZERO)) == CHAR('a')) -assert(simp(ALT(ONE | CHAR('a'), CHAR('a') | ONE)) == ALT(ONE, CHAR('a'))) -assert(simp(ALTs(Nil)) == ZERO) -assert(simp(SEQs(List(CHAR('a')))) == CHAR('a')) - + assert(simp((ZERO | ((ZERO | ZERO) | (ZERO | ZERO))) ~ ((ONE | ZERO) | ONE ) ~ (CHAR('a'))) == ZERO) + assert(simp(ALT(ONE | ONE, ONE | ONE)) == ONE) + assert(simp(ALT(ZERO | CHAR('a'), CHAR('a') | ZERO)) == CHAR('a')) + assert(simp(ALT(ONE | CHAR('a'), CHAR('a') | ONE)) == ALT(ONE, CHAR('a'))) + assert(simp(ALTs(Nil)) == ZERO) + assert(simp(SEQs(List(CHAR('a')))) == CHAR('a')) +}