src/Pure/Isar/rule_insts.ML
changeset 22681 9d42e5365ad1
parent 21879 a3efbae45735
child 22692 1e057a3f087d
     1.1 --- a/src/Pure/Isar/rule_insts.ML	Sat Apr 14 17:36:07 2007 +0200
     1.2 +++ b/src/Pure/Isar/rule_insts.ML	Sat Apr 14 17:36:09 2007 +0200
     1.3 @@ -21,7 +21,7 @@
     1.4  
     1.5  fun is_tvar (x, _) = String.isPrefix "'" x;
     1.6  
     1.7 -fun error_var msg xi = error (msg ^ Syntax.string_of_vname xi);
     1.8 +fun error_var msg xi = error (msg ^ Term.string_of_vname xi);
     1.9  
    1.10  fun the_sort tvars xi = the (AList.lookup (op =) tvars xi)
    1.11    handle Option.Option => error_var "No such type variable in theorem: " xi;
    1.12 @@ -235,15 +235,14 @@
    1.13          val (types, sorts) = types_sorts st;
    1.14      (* Process type insts: Tinsts_env *)
    1.15      fun absent xi = error
    1.16 -          ("No such variable in theorem: " ^ Syntax.string_of_vname xi);
    1.17 +          ("No such variable in theorem: " ^ Term.string_of_vname xi);
    1.18      val (rtypes, rsorts) = types_sorts thm;
    1.19      fun readT (xi, s) =
    1.20          let val S = case rsorts xi of SOME S => S | NONE => absent xi;
    1.21 -            val T = Sign.read_typ (thy, sorts) s;
    1.22 +            val T = Sign.read_def_typ (thy, sorts) s;
    1.23              val U = TVar (xi, S);
    1.24          in if Sign.typ_instance thy (T, U) then (U, T)
    1.25 -           else error
    1.26 -             ("Instantiation of " ^ Syntax.string_of_vname xi ^ " fails")
    1.27 +           else error ("Instantiation of " ^ Term.string_of_vname xi ^ " fails")
    1.28          end;
    1.29      val Tinsts_env = map readT Tinsts;
    1.30      (* Preprocess rule: extract vars and their types, apply Tinsts *)