equal
deleted
inserted
replaced
79 |
79 |
80 structure Data = Theory_Data |
80 structure Data = Theory_Data |
81 ( |
81 ( |
82 type T = command Symtab.table; |
82 type T = command Symtab.table; |
83 val empty = Symtab.empty; |
83 val empty = Symtab.empty; |
84 val extend = I; |
|
85 fun merge data : T = |
84 fun merge data : T = |
86 data |> Symtab.join (fn name => fn (cmd1, cmd2) => |
85 data |> Symtab.join (fn name => fn (cmd1, cmd2) => |
87 if eq_command (cmd1, cmd2) then raise Symtab.SAME |
86 if eq_command (cmd1, cmd2) then raise Symtab.SAME |
88 else err_dup_command name [command_pos cmd1, command_pos cmd2]); |
87 else err_dup_command name [command_pos cmd1, command_pos cmd2]); |
89 ); |
88 ); |