src/ZF/OrdQuant.thy
changeset 42455 6702c984bf5a
parent 41777 1f7cbe39d425
child 42456 13b4b6ba3593
     1.1 --- a/src/ZF/OrdQuant.thy	Fri Apr 22 13:07:47 2011 +0200
     1.2 +++ b/src/ZF/OrdQuant.thy	Fri Apr 22 13:58:13 2011 +0200
     1.3 @@ -368,27 +368,24 @@
     1.4  
     1.5  text {* Setting up the one-point-rule simproc *}
     1.6  
     1.7 -ML {*
     1.8 -local
     1.9 -
    1.10 -val unfold_rex_tac = unfold_tac [@{thm rex_def}];
    1.11 -fun prove_rex_tac ss = unfold_rex_tac ss THEN Quantifier1.prove_one_point_ex_tac;
    1.12 -val rearrange_bex = Quantifier1.rearrange_bex prove_rex_tac;
    1.13 -
    1.14 -val unfold_rall_tac = unfold_tac [@{thm rall_def}];
    1.15 -fun prove_rall_tac ss = unfold_rall_tac ss THEN Quantifier1.prove_one_point_all_tac;
    1.16 -val rearrange_ball = Quantifier1.rearrange_ball prove_rall_tac;
    1.17 +simproc_setup defined_rex ("EX x[M]. P(x) & Q(x)") = {*
    1.18 +  let
    1.19 +    val unfold_rex_tac = unfold_tac @{thms rex_def};
    1.20 +    fun prove_rex_tac ss = unfold_rex_tac ss THEN Quantifier1.prove_one_point_ex_tac;
    1.21 +  in
    1.22 +    fn _ => fn ss => fn ct =>
    1.23 +      Quantifier1.rearrange_bex prove_rex_tac (theory_of_cterm ct) ss (term_of ct)
    1.24 +  end
    1.25 +*}
    1.26  
    1.27 -in
    1.28 -
    1.29 -val defREX_regroup = Simplifier.simproc_global @{theory}
    1.30 -  "defined REX" ["EX x[M]. P(x) & Q(x)"] rearrange_bex;
    1.31 -val defRALL_regroup = Simplifier.simproc_global @{theory}
    1.32 -  "defined RALL" ["ALL x[M]. P(x) --> Q(x)"] rearrange_ball;
    1.33 -
    1.34 -end;
    1.35 -
    1.36 -Addsimprocs [defRALL_regroup,defREX_regroup];
    1.37 +simproc_setup defined_rall ("ALL x[M]. P(x) --> Q(x)") = {*
    1.38 +  let
    1.39 +    val unfold_rall_tac = unfold_tac @{thms rall_def};
    1.40 +    fun prove_rall_tac ss = unfold_rall_tac ss THEN Quantifier1.prove_one_point_all_tac;
    1.41 +  in
    1.42 +    fn _ => fn ss => fn ct =>
    1.43 +      Quantifier1.rearrange_ball prove_rall_tac (theory_of_cterm ct) ss (term_of ct)
    1.44 +  end
    1.45  *}
    1.46  
    1.47  end