# HG changeset patch # User nipkow # Date 1319100240 -7200 # Node ID c4fab1099cd0b10ef8426436c93cd5bfad4205d0 # Parent 1b2132017774b9d7bb382f4110cc87c0aac60191# Parent a51a706875174bb4696276530aa1621c2b631b7d merged diff -r 1b2132017774 -r c4fab1099cd0 src/HOL/IMP/AExp.thy --- a/src/HOL/IMP/AExp.thy Thu Oct 20 09:59:12 2011 +0200 +++ b/src/HOL/IMP/AExp.thy Thu Oct 20 10:44:00 2011 +0200 @@ -11,7 +11,7 @@ datatype aexp = N int | V vname | Plus aexp aexp fun aval :: "aexp \ state \ val" where -"aval (N n) _ = n" | +"aval (N n) s = n" | "aval (V x) s = s x" | "aval (Plus a1 a2) s = aval a1 s + aval a2 s" diff -r 1b2132017774 -r c4fab1099cd0 src/HOL/IMP/BExp.thy --- a/src/HOL/IMP/BExp.thy Thu Oct 20 09:59:12 2011 +0200 +++ b/src/HOL/IMP/BExp.thy Thu Oct 20 10:44:00 2011 +0200 @@ -5,7 +5,7 @@ datatype bexp = Bc bool | Not bexp | And bexp bexp | Less aexp aexp fun bval :: "bexp \ state \ bool" where -"bval (Bc v) _ = v" | +"bval (Bc v) s = v" | "bval (Not b) s = (\ bval b s)" | "bval (And b1 b2) s = (if bval b1 s then bval b2 s else False)" | "bval (Less a1 a2) s = (aval a1 s < aval a2 s)"