# HG changeset patch
# User wenzelm
# Date 876401812 -7200
# Node ID 7e1b695bcc5e917dde5316dfedb3ddcaed8a3aae
# Parent  7e8847f8f3a4420953029b13e01821edeab91abb
changed preference order of prtab entries;

diff -r 7e8847f8f3a4 -r 7e1b695bcc5e src/Pure/Syntax/printer.ML
--- a/src/Pure/Syntax/printer.ML	Thu Oct 09 14:55:24 1997 +0200
+++ b/src/Pure/Syntax/printer.ML	Thu Oct 09 14:56:52 1997 +0200
@@ -178,6 +178,7 @@
 
 type prtabs = (string * ((symb list * int * int) list) Symtab.table) list;
 
+
 (*find tab for mode*)
 fun get_tab prtabs mode =
   if_none (assoc (prtabs, mode)) Symtab.null;
@@ -191,7 +192,7 @@
   | get_fmts (tab :: tabs) a = Symtab.lookup_multi (tab, a) @ get_fmts tabs a;
 
 
-(* xprods_to_fmts *)
+(* xprod_to_fmt *)
 
 fun xprod_to_fmt (XProd (_, _, "", _)) = None
   | xprod_to_fmt (XProd (_, xsymbs, const, pri)) =
@@ -233,8 +234,6 @@
         | _ => sys_error "xprod_to_fmt: unbalanced blocks")
       end;
 
-fun xprods_to_fmts xprods = mapfilter xprod_to_fmt xprods;
-
 
 (* empty, extend, merge prtabs *)
 
@@ -242,9 +241,11 @@
 
 fun extend_prtabs prtabs mode xprods =
   let
-    val fmts = xprods_to_fmts xprods;
+    val fmts = rev (mapfilter xprod_to_fmt xprods);
     val tab = get_tab prtabs mode;
-    val new_tab = generic_extend (op =) Symtab.dest_multi Symtab.make_multi tab fmts;
+    val new_tab =
+      if null fmts then tab
+      else Symtab.make_multi (fmts @ Symtab.dest_multi tab)     (*prefer new entries*)
   in overwrite (prtabs, (mode, new_tab)) end;
 
 fun merge_prtabs prtabs1 prtabs2 =
@@ -253,7 +254,7 @@
     fun merge mode =
       (mode,
         generic_merge (op =) Symtab.dest_multi Symtab.make_multi
-          (get_tab prtabs1 mode) (get_tab prtabs2 mode));
+          (get_tab prtabs2 mode) (get_tab prtabs1 mode));       (*prefer 2nd over 1st*)
   in
     map merge modes
   end;