Fixing of bugs caused by the grammar merge:
- re-inserted LiftingTypeopt
- updated hard-coded constants in DiagnoseParser
- adjusted expected results in Syntax tests.
25 files changed