src/FOL/simpdata.ML
changeset 15531 08c8dad8e399
parent 13462 56610e2ba220
child 15570 8d8c70b41bab
     1.1 --- a/src/FOL/simpdata.ML	Fri Feb 11 18:51:00 2005 +0100
     1.2 +++ b/src/FOL/simpdata.ML	Sun Feb 13 17:15:14 2005 +0100
     1.3 @@ -116,8 +116,8 @@
     1.4               (case head_of p of
     1.5                  Const(a,_) =>
     1.6                    (case assoc(pairs,a) of
     1.7 -                     Some(rls) => flat (map atoms ([th] RL rls))
     1.8 -                   | None => [th])
     1.9 +                     SOME(rls) => flat (map atoms ([th] RL rls))
    1.10 +                   | NONE => [th])
    1.11                | _ => [th])
    1.12           | _ => [th])
    1.13    in atoms end;
    1.14 @@ -239,12 +239,12 @@
    1.15  structure Quantifier1 = Quantifier1Fun(
    1.16  struct
    1.17    (*abstract syntax*)
    1.18 -  fun dest_eq((c as Const("op =",_)) $ s $ t) = Some(c,s,t)
    1.19 -    | dest_eq _ = None;
    1.20 -  fun dest_conj((c as Const("op &",_)) $ s $ t) = Some(c,s,t)
    1.21 -    | dest_conj _ = None;
    1.22 -  fun dest_imp((c as Const("op -->",_)) $ s $ t) = Some(c,s,t)
    1.23 -    | dest_imp _ = None;
    1.24 +  fun dest_eq((c as Const("op =",_)) $ s $ t) = SOME(c,s,t)
    1.25 +    | dest_eq _ = NONE;
    1.26 +  fun dest_conj((c as Const("op &",_)) $ s $ t) = SOME(c,s,t)
    1.27 +    | dest_conj _ = NONE;
    1.28 +  fun dest_imp((c as Const("op -->",_)) $ s $ t) = SOME(c,s,t)
    1.29 +    | dest_imp _ = NONE;
    1.30    val conj = FOLogic.conj
    1.31    val imp  = FOLogic.imp
    1.32    (*rules*)