Use separate parser and lexer grammars instead of a combined grammar
Simplify boolean expressions
Merge pull request #1 from sharwell/grammar-simplification

Grammar simplification