Mercurial Mercurial > repos > isabelle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modified merge_aux to prevent newer names from getting overwritten
authorberghofe
Mon, 22 Sep 2003 16:19:46 +0200
changeset 14198 8ea2645b8132
parent 14197 3d7c6fc7c66e
child 14199 d3b8d972a488
Modified merge_aux to prevent newer names from getting overwritten by older names.
src/Pure/General/name_space.ML file | annotate | diff | comparison | revisions 
--- a/src/Pure/General/name_space.ML	Mon Sep 22 16:16:03 2003 +0200
+++ b/src/Pure/General/name_space.ML	Mon Sep 22 16:19:46 2003 +0200
@@ -106,8 +106,9 @@
 
 (* merge *)             (*1st preferred over 2nd*)
 
-fun merge_aux (tab, (xname, (names, names'))) =
-  foldr (change add xname) (names, foldr (change' add xname) (names', tab));
+fun merge_aux (tab, (xname, (names1, names1'))) =
+  map_space (fn (names2, names2') =>
+    (merge_lists' names2 names1, merge_lists' names2' names1')) xname tab;
 
 fun merge (NameSpace tab1, NameSpace tab2) =
   NameSpace (Symtab.foldl merge_aux (tab2, tab1));
isabelle