diff -r 8d0294d877bd -r 107941e8fa01 src/HOL/Tools/Nunchaku/nunchaku_reconstruct.ML --- a/src/HOL/Tools/Nunchaku/nunchaku_reconstruct.ML Tue Sep 28 22:14:02 2021 +0200 +++ b/src/HOL/Tools/Nunchaku/nunchaku_reconstruct.ML Tue Sep 28 22:14:44 2021 +0200 @@ -166,11 +166,11 @@ else if id = nun_equals then Const (\<^const_name>\HOL.eq\, typ_of ty) else if id = nun_false then - \<^const>\False\ + \<^Const>\False\ else if id = nun_if then Const (\<^const_name>\If\, typ_of ty) else if id = nun_implies then - \<^term>\implies\ + \<^Const>\implies\ else if id = nun_not then HOLogic.Not else if id = nun_unique then @@ -178,7 +178,7 @@ else if id = nun_unique_unsafe then Const (\<^const_name>\The_unsafe\, typ_of ty) else if id = nun_true then - \<^const>\True\ + \<^Const>\True\ else if String.isPrefix nun_dollar_anon_fun_prefix id then let val j = Int.fromString (unprefix nun_dollar_anon_fun_prefix id) |> the_default ~1 in Var ((anonymousN ^ nat_subscript (j + 1), 0), typ_of ty) @@ -225,12 +225,12 @@ end | term_of _ (NMatch _) = raise Fail "unexpected match"; - fun rewrite_numbers (t as \<^const>\Suc\ $ _) = + fun rewrite_numbers (t as \<^Const>\Suc\ $ _) = (case try HOLogic.dest_nat t of - SOME n => HOLogic.mk_number \<^typ>\nat\ n + SOME n => HOLogic.mk_number \<^Type>\nat\ n | NONE => t) - | rewrite_numbers (\<^const>\Abs_Integ\ $ (@{const Pair (nat, nat)} $ t $ u)) = - HOLogic.mk_number \<^typ>\int\ (HOLogic.dest_nat t - HOLogic.dest_nat u) + | rewrite_numbers \<^Const_>\Abs_Integ for \<^Const>\Pair \<^Type>\nat\ \<^Type>\nat\ for t u\\ = + HOLogic.mk_number \<^Type>\int\ (HOLogic.dest_nat t - HOLogic.dest_nat u) | rewrite_numbers (t $ u) = rewrite_numbers t $ rewrite_numbers u | rewrite_numbers (Abs (s, T, t)) = Abs (s, T, rewrite_numbers t) | rewrite_numbers t = t;