diff -r a359976a6f3e -r 975d34506e88 marking4/re_test.sh
--- a/marking4/re_test.sh	Mon Dec 10 02:23:30 2018 +0000
+++ b/marking4/re_test.sh	Fri Dec 14 14:41:54 2018 +0000
@@ -9,24 +9,28 @@
 
 
 echo "Below is the feedback and provisional marks for your submission" >> $out
-echo "for assignment 8 Part 1.  Please note all marks are provisional until" >> $out
+echo "for assignment 9 Part 1.  Please note all marks are provisional until" >> $out
 echo "ratified by the assessment board -- this is not an official" >> $out
 echo "results transcript." >> $out
 echo "" >> $out
 
-# marks for CW8 part 1
+# marks for CW9 part 1
 marks=$(( 0 ))
 
 # compilation tests
 
 function scala_compile {
-    (ulimit -t 360; JAVA_OPTS="-Xmx1g" scala "$1" 2> /dev/null 1> /dev/null)
+    (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc "$1" 2> /dev/null 1> /dev/null)
 }
 
 # functional tests
 
 function scala_assert {
-    (ulimit -t 360; JAVA_OPTS="-Xmx1g" scala -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
+    (ulimit -t 30; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "") # 2> /dev/null 1> /dev/null)
+}
+
+function scala_assert_long {
+    (ulimit -t 60; JAVA_OPTS="-Xmx1g" scala -nc -i "$1" "$2" -e "" 2> /dev/null 1> /dev/null)
 }
 
 # purity test
@@ -67,7 +71,7 @@
   tsts1=$(( 1 ))     
 fi
 
-
+### re1 test
 
 if [ $tsts1 -eq 0 ]
 then
@@ -80,7 +84,7 @@
   echo " nullable(ONE ~ CHAR('a')) == false" | tee -a $out
   echo " nullable(STAR(ZERO)) == true" | tee -a $out
   
-  if (scala_assert "re.scala" "re1a_test.scala")
+  if (scala_assert "re.scala" "re_test1.scala")
   then
       echo "  --> success" | tee -a $out
       marks=$(( marks + 1 ))
@@ -89,7 +93,7 @@
   fi
 fi
 
-
+### re2 test
 
 if [ $tsts1 -eq 0 ]
 then
@@ -98,8 +102,23 @@
   echo " der('a', (CHAR('a') | CHAR('a')) ~ CHAR('a')) == (ONE | ONE) ~ CHAR('a')" | tee -a $out
   echo " der('a', STAR(CHAR('a'))) == (ONE ~ STAR(CHAR('a')))" | tee -a $out
   echo " der('b', STAR(CHAR('a'))) == (ZERO ~ STAR(CHAR('a')))" | tee -a $out
-  
-  if (scala_assert "re.scala" "re1b_test.scala")
+  echo "" | tee -a $out
+  echo " val r0 = \"a\" ~ \"b\" ~ \"c\"" | tee -a $out
+  echo " assert(der('a', r0) == (ONE ~ \"b\") ~ \"c\")" | tee -a $out
+  echo " assert(der('b', r0) == (ZERO ~ \"b\") ~ \"c\")" | tee -a $out
+  echo " assert(der('c', r0) == (ZERO ~ \"b\") ~ \"c\")" | tee -a $out
+  echo "" | tee -a $out
+  echo " val r1 = (ONE ~ \"b\") ~ \"c\"" | tee -a $out
+  echo " assert(der('a', r1) == ((ZERO ~ \"b\") | ZERO) ~ \"c\")" | tee -a $out
+  echo " assert(der('b', r1) == ((ZERO ~ \"b\") | ONE) ~ \"c\")" | tee -a $out
+  echo " assert(der('c', r1) == ((ZERO ~ \"b\") | ZERO) ~ \"c\")" | tee -a $out
+  echo "" | tee -a $out
+  echo " val r2 = ((ZERO ~ \"b\") | ONE) ~ \"c\"" | tee -a $out
+  echo " assert(der('a', r2) == ((((ZERO ~ \"b\") | ZERO) ~ \"c\") | ZERO))" | tee -a $out
+  echo " assert(der('b', r2) == ((((ZERO ~ \"b\") | ZERO) ~ \"c\") | ZERO))" | tee -a $out
+  echo " assert(der('c', r2) == ((((ZERO ~ \"b\") | ZERO) ~ \"c\") | ONE))" | tee -a $out
+
+  if (scala_assert "re.scala" "re_test2.scala")
   then
       echo "  --> success" | tee -a $out
       marks=$(( marks + 1 ))
@@ -108,13 +127,15 @@
   fi
 fi
 
-
+### re3 test
 
 if [ $tsts1 -eq 0 ]
 then
   echo " simp(ZERO | ONE) == ONE" | tee -a $out
   echo " simp(STAR(ZERO | ONE)) == STAR(ZERO | ONE)" | tee -a $out
   echo " simp(ONE ~ (ONE ~ (ONE ~ CHAR('a')))) == CHAR('a')" | tee -a $out
+  echo " simp(((ONE ~ ONE) ~ ONE) ~ CHAR('a')) == CHAR('a')" | tee -a $out
+  echo " simp(((ONE | ONE) ~ ONE) ~ CHAR('a')) == CHAR('a')" | tee -a $out
   echo " simp(ONE ~ (ONE ~ (ONE ~ ZERO))) == ZERO" | tee -a $out
   echo " simp(ALT(ONE ~ (ONE ~ (ONE ~ ZERO)), CHAR('a'))) == CHAR('a')" | tee -a $out
   echo " simp(CHAR('a') | CHAR('a')) == CHAR('a')" | tee -a $out
@@ -125,21 +146,18 @@
   echo " simp((ZERO | ((ZERO | ZERO) | (ZERO | ZERO))) ~ ((ONE | ZERO) | ONE ) ~ (CHAR('a'))) == ZERO" | tee -a $out
   echo " simp(ALT(ONE | ONE, ONE | ONE)) == ONE" | tee -a $out
   echo " simp(ALT(ZERO | CHAR('a'), CHAR('a') | ZERO)) == CHAR('a')" | tee -a $out
-  echo " simp(Iterator.iterate(ONE:Rexp)(r => SEQ(r, ONE | ONE)).drop(50).next) == ONE" | tee -a $out
-  echo "    the Iterator produces the rexp" | tee -a $out
-  echo "" | tee -a $out
-  echo "      SEQ(SEQ(SEQ(..., ONE | ONE) , ONE | ONE), ONE | ONE)" | tee -a $out
-  echo "" | tee -a $out
-  echo "    where SEQ is nested 50 times." | tee -a $out
-  if (scala_assert "re.scala" "re1c_test.scala")
+  echo " simp(ALT(ONE | CHAR('a'), CHAR('a') | ONE)) == ALT(ONE | CHAR('a'), CHAR('a') | ONE)" tee -a $out
+  
+  if (scala_assert "re.scala" "re_test3.scala")
   then
       echo "  --> success" | tee -a $out
-      marks=$(( marks + 2 ))
+      marks=$(( marks + 1 ))
   else
       echo "  --> test failed" | tee -a $out
   fi
 fi
 
+### re4 test
 
 if [ $tsts1 -eq 0 ]
 then
@@ -153,13 +171,14 @@
   echo " matcher(EVIL, \"b\") == true" | tee -a $out
   echo " matcher(EVIL, \"bb\") == false" | tee -a $out
   echo " matcher(\"abc\", \"abc\") == true" | tee -a $out
+  echo " matcher(\"abc\", \"ab\") == true" | tee -a $out
   echo " matcher((\"ab\" | \"a\") ~ (ONE | \"bc\"), \"abc\") == true" | tee -a $out
   echo " matcher(ONE, \"\") == true" | tee -a $out
   echo " matcher(ZERO, \"\") == false" | tee -a $out
   echo " matcher(ONE | CHAR('a'), \"\") == true" | tee -a $out
   echo " matcher(ONE | CHAR('a'), \"a\") == true" | tee -a $out
   
-  if (scala_assert "re.scala" "re1d_test.scala")
+  if (scala_assert "re.scala" "re_test4.scala")
   then
       echo "  --> success" | tee -a $out
       marks=$(( marks + 1 ))
@@ -168,6 +187,8 @@
   fi
 fi
 
+### re5 test
+
 
 if [ $tsts1 -eq 0 ]
 then
@@ -177,7 +198,37 @@
   echo " size(ders(\"aaaaaa\".toList, EVIL)) == 8" | tee -a $out
   echo " size(ders((\"a\" * 50).toList, EVIL)) == 8" | tee -a $out
   
-  if (scala_assert "re.scala" "re1e_test.scala")
+  if (scala_assert "re.scala" "re_test5.scala")
+  then
+      echo "  --> success" | tee -a $out
+      marks=$(( marks + 1 ))
+  else
+      echo "  --> test failed" | tee -a $out
+  fi
+fi
+
+### re6 'power' test
+
+
+
+if [ $tsts1 -eq 0 ]
+then
+  echo " simp(Iterator.iterate(ONE:Rexp)(r => SEQ(r, ONE | ONE)).drop(50).next) == ONE" | tee -a $out
+  echo "    ...the Iterator produces the rexp" | tee -a $out
+  echo "" | tee -a $out
+  echo "      SEQ(SEQ(SEQ(..., ONE | ONE) , ONE | ONE), ONE | ONE)" | tee -a $out
+  echo "" | tee -a $out
+  echo "    where SEQ is nested 50 times." | tee -a $out  
+  echo "" | tee -a $out
+  echo " simp(Iterator.iterate(ONE:Rexp)(r => ALT(r, r)).drop(20).next) == ONE" | tee -a $out
+  echo "    ... the Iterator produces a rexp of size 2097151" | tee -a $out
+  echo "" | tee -a $out
+  echo " val EVIL = SEQ(STAR(STAR(CHAR('a'))), CHAR('b'))" | tee -a $out
+  echo " matcher(EVIL, \"a\" * 1000000 ++ \"b\") == true" | tee -a $out
+  echo " matcher(EVIL, \"a\" * 1000000) == false" | tee -a $out
+
+  
+  if (time scala_assert_long "re.scala" "re_test6.scala")
   then
       echo "  --> success" | tee -a $out
       marks=$(( marks + 1 ))
@@ -188,7 +239,7 @@
 
 
 ## final marks
-echo "Overall mark for CW 8, Part 1" | tee -a $out
+echo "Overall mark for CW 9, Part 1" | tee -a $out
 echo "$marks" | tee -a $out