Binary file core_solution1/collatz.jar has changed
Binary file core_solution2/docdiff.jar has changed
Binary file core_solution3/postfix.jar has changed
Binary file core_solution3/postfix2.jar has changed
Binary file core_templates1/collatz.jar has changed
Binary file core_templates2/docdiff.jar has changed
Binary file core_templates3/postfix.jar has changed
Binary file core_templates3/postfix2.jar has changed
Binary file main_solution1/drumb.jar has changed
Binary file main_solution3/re.jar has changed
--- a/main_solution3/re.scala Sat Dec 17 12:42:49 2022 +0000
+++ b/main_solution3/re.scala Fri Dec 23 16:52:34 2022 +0000
@@ -93,7 +93,7 @@
def SEQs_smart(rs: List[Rexp]) : Rexp = rs match {
case Nil => ONE
- case ZERO::nil => ZERO
+ case ZERO::Nil => ZERO
case r::Nil => r
case rs => SEQs(rs)
}
@@ -198,4 +198,4 @@
// if nullable(r1)
ALTs(SEQs(der(c, r1)::rs)::(rs filter what is nullable) .map(der(c,_)))
-*/
\ No newline at end of file
+*/
Binary file main_templates1/drumb.jar has changed
Binary file main_templates2/wordle.jar has changed
Binary file main_templates3/re.jar has changed
Binary file main_templates4/knight1.jar has changed
Binary file main_templates4/knight2.jar has changed
Binary file main_templates4/knight3.jar has changed
Binary file main_templates4/knight4.jar has changed
Binary file main_templates5/bf.jar has changed
Binary file main_templates5/bfc.jar has changed
--- a/main_testing3/re_test.sh Sat Dec 17 12:42:49 2022 +0000
+++ b/main_testing3/re_test.sh Fri Dec 23 16:52:34 2022 +0000
@@ -185,7 +185,7 @@
echo -e " SEQs_smart(List(ONE ~ ONE)) == ONE ~ ONE" >> $out
echo -e " SEQs_smart(List(ONE, ONE)) == SEQs(List(ONE, ONE))" >> $out
echo -e " ALTs_smart(Nil) == ZERO" >> $out
- echo -e " ALTs_smart(List(ONE ~ ONE)) == ONE ~ ONE)" >> $out
+ echo -e " ALTs_smart(List(ONE ~ ONE)) == ONE ~ ONE" >> $out
echo -e " ALTs_smart(List(ZERO, ZERO)) == ALTs(List(ZERO, ZERO))" >> $out
if (scala_assert "re.scala" "re_test6.scala")