1.1 --- a/src/Tools/isac/Knowledge/LinEq.thy Fri Jan 17 12:37:21 2020 +0100
1.2 +++ b/src/Tools/isac/Knowledge/LinEq.thy Fri Jan 17 13:14:11 2020 +0100
1.3 @@ -27,14 +27,14 @@
1.4
1.5 val LinEq_prls = (*3.10.02:just the following order due to subterm evaluation*)
1.6 Rule.append_rls "LinEq_prls" Rule.e_rls
1.7 - [Rule.Calc ("HOL.eq", Prog_Expr.eval_equal "#equal_"),
1.8 - Rule.Calc ("Prog_Expr.matches", Prog_Expr.eval_matches ""),
1.9 - Rule.Calc ("Prog_Expr.lhs" , Prog_Expr.eval_lhs ""),
1.10 - Rule.Calc ("Prog_Expr.rhs" , Prog_Expr.eval_rhs ""),
1.11 - Rule.Calc ("Poly.has'_degree'_in", eval_has_degree_in ""),
1.12 - Rule.Calc ("Poly.is'_polyrat'_in", eval_is_polyrat_in ""),
1.13 - Rule.Calc ("Prog_Expr.occurs'_in", Prog_Expr.eval_occurs_in ""),
1.14 - Rule.Calc ("Prog_Expr.ident", Prog_Expr.eval_ident "#ident_"),
1.15 + [Rule.Num_Calc ("HOL.eq", Prog_Expr.eval_equal "#equal_"),
1.16 + Rule.Num_Calc ("Prog_Expr.matches", Prog_Expr.eval_matches ""),
1.17 + Rule.Num_Calc ("Prog_Expr.lhs" , Prog_Expr.eval_lhs ""),
1.18 + Rule.Num_Calc ("Prog_Expr.rhs" , Prog_Expr.eval_rhs ""),
1.19 + Rule.Num_Calc ("Poly.has'_degree'_in", eval_has_degree_in ""),
1.20 + Rule.Num_Calc ("Poly.is'_polyrat'_in", eval_is_polyrat_in ""),
1.21 + Rule.Num_Calc ("Prog_Expr.occurs'_in", Prog_Expr.eval_occurs_in ""),
1.22 + Rule.Num_Calc ("Prog_Expr.ident", Prog_Expr.eval_ident "#ident_"),
1.23 Rule.Thm ("not_true",TermC.num_str @{thm not_true}),
1.24 Rule.Thm ("not_false",TermC.num_str @{thm not_false}),
1.25 Rule.Thm ("and_true",TermC.num_str @{thm and_true}),
1.26 @@ -48,8 +48,8 @@
1.27 [Rule.Thm ("real_assoc_1",TermC.num_str @{thm real_assoc_1})
1.28 (*
1.29 Don't use
1.30 - Rule.Calc ("Rings.divide_class.divide", Prog_Expr.eval_cancel "#divide_e"),
1.31 - Rule.Calc ("Prog_Expr.pow" , (**)eval_binop "#power_"),
1.32 + Rule.Num_Calc ("Rings.divide_class.divide", Prog_Expr.eval_cancel "#divide_e"),
1.33 + Rule.Num_Calc ("Prog_Expr.pow" , (**)eval_binop "#power_"),
1.34 *)
1.35 ];
1.36
1.37 @@ -59,8 +59,8 @@
1.38 [Rule.Thm ("real_assoc_1",TermC.num_str @{thm real_assoc_1})
1.39 (*
1.40 Don't use
1.41 - Rule.Calc ("Rings.divide_class.divide", Prog_Expr.eval_cancel "#divide_e"),
1.42 - Rule.Calc ("Prog_Expr.pow" , (**)eval_binop "#power_"),
1.43 + Rule.Num_Calc ("Rings.divide_class.divide", Prog_Expr.eval_cancel "#divide_e"),
1.44 + Rule.Num_Calc ("Prog_Expr.pow" , (**)eval_binop "#power_"),
1.45 *)
1.46 ];
1.47 \<close>
1.48 @@ -76,14 +76,14 @@
1.49 calc = [], errpatts = [],
1.50 rules = [
1.51 Rule.Thm ("real_assoc_1",TermC.num_str @{thm real_assoc_1}),
1.52 - Rule.Calc ("Groups.plus_class.plus", (**)eval_binop "#add_"),
1.53 - Rule.Calc ("Groups.minus_class.minus", (**)eval_binop "#sub_"),
1.54 - Rule.Calc ("Groups.times_class.times", (**)eval_binop "#mult_"),
1.55 + Rule.Num_Calc ("Groups.plus_class.plus", (**)eval_binop "#add_"),
1.56 + Rule.Num_Calc ("Groups.minus_class.minus", (**)eval_binop "#sub_"),
1.57 + Rule.Num_Calc ("Groups.times_class.times", (**)eval_binop "#mult_"),
1.58 (* Dont use
1.59 - Rule.Calc ("Rings.divide_class.divide", Prog_Expr.eval_cancel "#divide_e"),
1.60 - Rule.Calc ("NthRoot.sqrt", eval_sqrt "#sqrt_"),
1.61 + Rule.Num_Calc ("Rings.divide_class.divide", Prog_Expr.eval_cancel "#divide_e"),
1.62 + Rule.Num_Calc ("NthRoot.sqrt", eval_sqrt "#sqrt_"),
1.63 *)
1.64 - Rule.Calc ("Prog_Expr.pow" , (**)eval_binop "#power_")
1.65 + Rule.Num_Calc ("Prog_Expr.pow" , (**)eval_binop "#power_")
1.66 ],
1.67 scr = Rule.EmptyScr});
1.68 \<close>