# HG changeset patch
# User Christian Urban <christian.urban@kcl.ac.uk>
# Date 1671814354 0
# Node ID d076cb2e0b75eebc9bf6cb05d2c9d6563623ced6
# Parent  557d18cce0f0d3e62ce0ceff668053ff4ee8e076
updated jars

diff -r 557d18cce0f0 -r d076cb2e0b75 core_solution1/collatz.jar
Binary file core_solution1/collatz.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_solution2/docdiff.jar
Binary file core_solution2/docdiff.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_solution3/postfix.jar
Binary file core_solution3/postfix.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_solution3/postfix2.jar
Binary file core_solution3/postfix2.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_templates1/collatz.jar
Binary file core_templates1/collatz.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_templates2/docdiff.jar
Binary file core_templates2/docdiff.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_templates3/postfix.jar
Binary file core_templates3/postfix.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 core_templates3/postfix2.jar
Binary file core_templates3/postfix2.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_solution1/drumb.jar
Binary file main_solution1/drumb.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_solution3/re.jar
Binary file main_solution3/re.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_solution3/re.scala
--- 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
+*/
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates1/drumb.jar
Binary file main_templates1/drumb.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates2/wordle.jar
Binary file main_templates2/wordle.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates3/re.jar
Binary file main_templates3/re.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates4/knight1.jar
Binary file main_templates4/knight1.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates4/knight2.jar
Binary file main_templates4/knight2.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates4/knight3.jar
Binary file main_templates4/knight3.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates4/knight4.jar
Binary file main_templates4/knight4.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates5/bf.jar
Binary file main_templates5/bf.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_templates5/bfc.jar
Binary file main_templates5/bfc.jar has changed
diff -r 557d18cce0f0 -r d076cb2e0b75 main_testing3/re_test.sh
--- 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")