Fixing of bugs caused by the grammar merge:
- correct mistakes of patch application
- generated new parser from the grammar
- base.SimpleName has no type annotations
- import cannot have type annotations
- LiftingTypeOpt still disabled
30 files changed