Revert "fixes to ebnfParser"

This reverts commit 0c8dc9f5e041dc980aa41a16fbe0f5a679a8ef9b.
Revert "Revert "fixes to ebnfParser""

This reverts commit 7c8a16484fbce5ab2d49bee8949ac073f5686f38.
add ast