# HG changeset patch # User wenzelm # Date 1269194686 -3600 # Node ID 5c5f08f6d6e4d0b1c3f5ac752e141e0a80c61d7c # Parent dd2636f0f608456575f71bbba69c774d9c72e7cc do not open ML structures; diff -r dd2636f0f608 -r 5c5f08f6d6e4 src/Pure/proofterm.ML --- a/src/Pure/proofterm.ML Sun Mar 21 17:28:35 2010 +0100 +++ b/src/Pure/proofterm.ML Sun Mar 21 19:04:46 2010 +0100 @@ -812,24 +812,24 @@ val f = Free ("f", aT --> bT); val g = Free ("g", aT --> bT); -local open Logic in - val equality_axms = - [("reflexive", mk_equals (x, x)), - ("symmetric", mk_implies (mk_equals (x, y), mk_equals (y, x))), - ("transitive", list_implies ([mk_equals (x, y), mk_equals (y, z)], mk_equals (x, z))), - ("equal_intr", list_implies ([mk_implies (A, B), mk_implies (B, A)], mk_equals (A, B))), - ("equal_elim", list_implies ([mk_equals (A, B), A], B)), - ("abstract_rule", mk_implies - (all x (mk_equals (f $ x, g $ x)), mk_equals (lambda x (f $ x), lambda x (g $ x)))), - ("combination", list_implies - ([mk_equals (f, g), mk_equals (x, y)], mk_equals (f $ x, g $ y)))]; + [("reflexive", Logic.mk_equals (x, x)), + ("symmetric", Logic.mk_implies (Logic.mk_equals (x, y), Logic.mk_equals (y, x))), + ("transitive", + Logic.list_implies ([Logic.mk_equals (x, y), Logic.mk_equals (y, z)], Logic.mk_equals (x, z))), + ("equal_intr", + Logic.list_implies ([Logic.mk_implies (A, B), Logic.mk_implies (B, A)], Logic.mk_equals (A, B))), + ("equal_elim", Logic.list_implies ([Logic.mk_equals (A, B), A], B)), + ("abstract_rule", + Logic.mk_implies + (Logic.all x + (Logic.mk_equals (f $ x, g $ x)), Logic.mk_equals (lambda x (f $ x), lambda x (g $ x)))), + ("combination", Logic.list_implies + ([Logic.mk_equals (f, g), Logic.mk_equals (x, y)], Logic.mk_equals (f $ x, g $ y)))]; val [reflexive_axm, symmetric_axm, transitive_axm, equal_intr_axm, equal_elim_axm, abstract_rule_axm, combination_axm] = - map (fn (s, t) => PAxm ("Pure." ^ s, varify_global t, NONE)) equality_axms; - -end; + map (fn (s, t) => PAxm ("Pure." ^ s, Logic.varify_global t, NONE)) equality_axms; val reflexive = reflexive_axm % NONE;