--- a/progs/cw1.scala	Sun May 21 00:43:02 2017 +0100
+++ b/progs/cw1.scala	Sun May 21 00:46:21 2017 +0100
@@ -159,7 +159,7 @@
 val COMMENT = "/*" ~ (NOT(ALL.% ~ "*/" ~ ALL.%)) ~ "*/"
 
 println(matcher(COMMENT, "/**/"))
-println(matcher(COMMENT, "/*foobar_comment*/"))
+println(matcher(COMMENT, "/*foobar*/"))
 println(matcher(COMMENT, "/*test*/test*/"))
 println(matcher(COMMENT, "/*test/*test*/"))
 
@@ -182,7 +182,7 @@
 println(matcher(EVIL2, "aaa" * 45 + "a"))
 
 println("TEST for bug pointed out by Filips Ivanovs")
-val test = NMTIMES(RANGE(LOWERCASE + "."), 2, 6)
+val test = NMTIMES(CFUN(LOWERCASE | Set('.')), 2, 6)
   
 println(matcher(test,"a"))
 println(matcher(test,"ab"))
@@ -205,7 +205,6 @@
   println("Rexp |" + s + "|")
   println("Derivative:\n" + ders_simp(s.toList, r))
   println("Is Nullable: " + nullable(ders_simp(s.toList, r)))
-  println("Is Zeroable: " + zeroable(ders_simp(s.toList, r)))
   Console.readLine
 }