afl-material: comparison progs/parser-combinators/comb2.sc

equal deleted inserted replaced

-:ebb4a40d9bae
+:f25d338d16c9
 // it allows writing nested patterns as
 // case x ~ y ~ z => ...
 case class ~[+A, +B](x: A, y: B)
+// to make sure the input has an empty-method
 trait IsSeq[I] {
 extension (i: I) def isEmpty: Boolean
 }
 given IsSeq[String] = _.isEmpty
 case Aop("-", a1, a2) => eval_aexp(a1, env) - eval_aexp(a2, env)
 case Aop("*", a1, a2) => eval_aexp(a1, env) * eval_aexp(a2, env)
 case Aop("/", a1, a2) => eval_aexp(a1, env) / eval_aexp(a2, env)
 }
-def eval_bexp(b: BExp, env: Env) : Boolean =
+def eval_bexp(b: BExp, env: Env) : Boolean = b match {
-b match {
 case True => true
 case False => false
 case Bop("==", a1, a2) => eval_aexp(a1, env) == eval_aexp(a2, env)
 case Bop("!=", a1, a2) => !(eval_aexp(a1, env) == eval_aexp(a2, env))
 case Bop(">", a1, a2) => eval_aexp(a1, env) > eval_aexp(a2, env)
 case Bop("<", a1, a2) => eval_aexp(a1, env) < eval_aexp(a2, env)
 case And(b1, b2) => eval_bexp(b1, env) && eval_bexp(b2, env)
 case Or(b1, b2) => eval_bexp(b1, env) || eval_bexp(b2, env)
 }
-def eval_stmt(s: Stmt, env: Env) : Env =
+def eval_stmt(s: Stmt, env: Env) : Env = s match {
-s match {
 case Skip => env
 case Assign(x, a) => env + (x -> eval_aexp(a, env))
 case If(b, bl1, bl2) => if (eval_bexp(b, env)) eval_bl(bl1, env) else eval_bl(bl2, env)
 case While(b, bl) =>
 if (eval_bexp(b, env)) eval_stmt(While(b, bl), eval_bl(bl, env))
 else env
 case Write(x) => { println(env(x)) ; env }
 }
-def eval_bl(bl: Block, env: Env) : Env =
+def eval_bl(bl: Block, env: Env) : Env = bl match {
-bl match {
 case Nil => env
 case s::bl => eval_bl(bl, eval_stmt(s, env))
 }
 def eval(bl: Block) : Env = eval_bl(bl, Map())

changeset 973	f25d338d16c9
parent 972	ebb4a40d9bae
child 977	1e6eca42d90b