changeset 41493 | f05976d69141 |
parent 40316 | 665862241968 |
child 42361 | 23f352990944 |
--- a/src/Provers/Arith/fast_lin_arith.ML Mon Jan 10 16:07:16 2011 +0100 +++ b/src/Provers/Arith/fast_lin_arith.ML Mon Jan 10 16:45:28 2011 +0100 @@ -138,7 +138,7 @@ lessD = Thm.merge_thms (lessD1, lessD2), neqE = Thm.merge_thms (neqE1, neqE2), simpset = Simplifier.merge_ss (simpset1, simpset2), - number_of = if is_some number_of1 then number_of1 else number_of2}; + number_of = merge_options (number_of1, number_of2)}; ); val map_data = Data.map;