restored unusual snd-biased merge/join policy -- required due to non-conservative code setups
authorhaftmann
Mon Jul 26 11:15:10 2010 +0200 (2010-07-26)
changeset 37972f37a8d488105
parent 37971 278367fa09f3
child 37973 2b4ff2518ebf
restored unusual snd-biased merge/join policy -- required due to non-conservative code setups
src/Tools/Code/code_target.ML
     1.1 --- a/src/Tools/Code/code_target.ML	Mon Jul 26 11:11:10 2010 +0200
     1.2 +++ b/src/Tools/Code/code_target.ML	Mon Jul 26 11:15:10 2010 +0200
     1.3 @@ -141,9 +141,9 @@
     1.4        name_syntax_table = name_syntax_table2, module_alias = module_alias2 }) =
     1.5    if serial1 = serial2 orelse not strict then
     1.6      make_target ((serial1, description),
     1.7 -      ((merge (op =) (reserved1, reserved2), Symtab.merge (K true) (includes1, includes2)),
     1.8 +      ((merge (op =) (reserved1, reserved2), Symtab.join (K snd) (includes1, includes2)),
     1.9          (merge_name_syntax_table (name_syntax_table1, name_syntax_table2),
    1.10 -          Symtab.join (K fst) (module_alias1, module_alias2))
    1.11 +          Symtab.join (K snd) (module_alias1, module_alias2))
    1.12      ))
    1.13    else
    1.14      error ("Incompatible targets: " ^ quote target);