# HG changeset patch # User Christian Urban # Date 1476863210 -3600 # Node ID 85586bada20a4ed3ad6b860829b04a9a5e7f1d62 # Parent 4abd90760ffea359a662a5aab456a16f0bb73341 updated diff -r 4abd90760ffe -r 85586bada20a progs/re3a.scala --- a/progs/re3a.scala Tue Oct 18 20:39:54 2016 +0100 +++ b/progs/re3a.scala Wed Oct 19 08:46:50 2016 +0100 @@ -35,7 +35,7 @@ case NTIMES(r1, i) => if (i == 0) ZERO else if (nullable(r1)) SEQ(der(c, r1), UPNTIMES(r1, i - 1)) - else SEQ(der(c, r1), NTIMES(r1, i)) + else SEQ(der(c, r1), NTIMES(r1, i - 1)) case UPNTIMES(r1, i) => if (i == 0) ZERO else SEQ(der(c, r1), UPNTIMES(r1, i - 1)) @@ -68,7 +68,6 @@ // main matcher function def matcher(r: Rexp, s: String) : Boolean = nullable(ders(s.toList, r)) - //one or zero def OPT(r: Rexp) = ALT(r, ONE)