simplify the grammar code, and make the language more flexible, and add tests
1.1.0
2.0.0