moved global pretty/string_of functions from Sign to Syntax;
authorwenzelm
Sun, 18 May 2008 15:04:37 +0200
changeset 26947 133905a0c493
parent 26946 0b6eff8c088d
child 26948 efe3e0e235d6
moved global pretty/string_of functions from Sign to Syntax; tuned message;
src/Pure/Isar/code.ML
--- a/src/Pure/Isar/code.ML	Sun May 18 15:04:33 2008 +0200
+++ b/src/Pure/Isar/code.ML	Sun May 18 15:04:37 2008 +0200
@@ -147,7 +147,7 @@
       | matches (_ :: _) [] = false
       | matches (x :: xs) (y :: ys) = Pattern.matches thy (x, y) andalso matches xs ys;
     fun drop thm' = not (matches args (args_of thm'))
-      orelse (warning ("code generator: dropping redundant defining equation\n" ^ Display.string_of_thm thm'); false);
+      orelse (warning ("Code generator: dropping redundant defining equation\n" ^ Display.string_of_thm thm'); false);
     val (keeps, drops) = List.partition drop sels;
   in (thm :: keeps, dels |> remove Thm.eq_thm_prop thm |> fold (insert Thm.eq_thm_prop) drops) end;
 
@@ -454,7 +454,8 @@
                  | (c, tys) =>
                      (Pretty.block o Pretty.breaks)
                         (Pretty.str (CodeUnit.string_of_const thy c)
-                          :: Pretty.str "of" :: map (Pretty.quote o Sign.pretty_typ thy) tys)) cos)
+                          :: Pretty.str "of"
+                          :: map (Pretty.quote o Syntax.pretty_typ_global thy) tys)) cos)
           );
     val inlines = (#inlines o the_thmproc) exec;
     val posts = (#posts o the_thmproc) exec;
@@ -467,7 +468,8 @@
       |> sort (string_ord o pairself fst);
     val dtyps = the_dtyps exec
       |> Symtab.dest
-      |> map (fn (dtco, (vs, cos)) => (Sign.string_of_typ thy (Type (dtco, map TFree vs)), cos))
+      |> map (fn (dtco, (vs, cos)) =>
+          (Syntax.string_of_typ_global thy (Type (dtco, map TFree vs)), cos))
       |> sort (string_ord o pairself fst)
   in
     (Pretty.writeln o Pretty.chunks) [
@@ -600,7 +602,7 @@
         |> the_default (replicate (Sign.arity_number thy tyco) [])
     in
       base_algebra
-      |> Sorts.add_arities (Sign.pp thy) (tyco, [(class, sorts)])
+      |> Sorts.add_arities (Syntax.pp_global thy) (tyco, [(class, sorts)])
     end
   end;
 
@@ -615,7 +617,7 @@
   in Logic.varifyT (map_type_tfree (K ty_inst) ty) end;
 
 fun retrieve_algebra thy operational =
-  Sorts.subalgebra (Sign.pp thy) operational
+  Sorts.subalgebra (Syntax.pp_global thy) operational
     (weakest_constraints thy (Sign.classes_of thy))
     (Sign.classes_of thy);