equal
deleted
inserted
replaced
559 | new_xprods2 => |
559 | new_xprods2 => |
560 if subset (op =) (input1, input2) then (input2, gram2) |
560 if subset (op =) (input1, input2) then (input2, gram2) |
561 else |
561 else |
562 let |
562 let |
563 val input' = new_xprods2 @ input1; |
563 val input' = new_xprods2 @ input1; |
564 val gram' = extend_gram new_xprods2 input1 gram1; |
564 val gram' = new_gram input'; |
565 in (input', gram') end); |
565 in (input', gram') end); |
566 in |
566 in |
567 Syntax |
567 Syntax |
568 ({input = input', |
568 ({input = input', |
569 lexicon = Scan.merge_lexicons (lexicon1, lexicon2), |
569 lexicon = Scan.merge_lexicons (lexicon1, lexicon2), |