equal
deleted
inserted
replaced
110 else if (this eq Outer_Syntax.empty) other |
110 else if (this eq Outer_Syntax.empty) other |
111 else { |
111 else { |
112 val keywords1 = keywords ++ other.keywords |
112 val keywords1 = keywords ++ other.keywords |
113 val completion1 = completion ++ other.completion |
113 val completion1 = completion ++ other.completion |
114 val rev_abbrevs1 = Library.merge(rev_abbrevs, other.rev_abbrevs) |
114 val rev_abbrevs1 = Library.merge(rev_abbrevs, other.rev_abbrevs) |
115 if ((keywords eq keywords1) && (completion eq completion1)) this |
115 if ((keywords eq keywords1) && (completion eq completion1) && (rev_abbrevs eq rev_abbrevs1)) |
|
116 this |
116 else new Outer_Syntax(keywords1, completion1, rev_abbrevs1, language_context, has_tokens) |
117 else new Outer_Syntax(keywords1, completion1, rev_abbrevs1, language_context, has_tokens) |
117 } |
118 } |
118 |
119 |
119 |
120 |
120 /* load commands */ |
121 /* load commands */ |