ignore sorts of consts declarations;
authorwenzelm
Thu, 13 Apr 2006 12:00:56 +0200
changeset 19419 2d26166aca27
parent 19418 03b01c9314fc
child 19420 bd5c0adec2b1
ignore sorts of consts declarations;
src/Pure/Proof/reconstruct.ML
src/Pure/codegen.ML
--- a/src/Pure/Proof/reconstruct.ML	Thu Apr 13 12:00:55 2006 +0200
+++ b/src/Pure/Proof/reconstruct.ML	Thu Apr 13 12:00:56 2006 +0200
@@ -75,7 +75,7 @@
       (t as Const (s, T)) = if T = dummyT then (case Sign.const_type sg s of
           NONE => error ("reconstruct_proof: No such constant: " ^ quote s)
         | SOME T => 
-            let val T' = Logic.incr_tvar (maxidx + 1) T
+            let val T' = Type.strip_sorts (Logic.incr_tvar (maxidx + 1) T)
             in (Const (s, T'), T', vTs,
               Envir.Envir {maxidx = maxidx + 1, asol = asol, iTs = iTs})
             end)
--- a/src/Pure/codegen.ML	Thu Apr 13 12:00:55 2006 +0200
+++ b/src/Pure/codegen.ML	Thu Apr 13 12:00:56 2006 +0200
@@ -375,7 +375,7 @@
                 NONE => T
               | SOME ty =>
                   let val U = prep_type thy ty
-                  in if Sign.typ_instance thy (U, T) then U
+                  in if Type.raw_instance (U, T) then U
                     else error ("Illegal type constraint for constant " ^ cname)
                   end)
          in