Refactoring of grammar literals parsing #3780
Conversation
Split CharSupport on CharSupport and AntlrCharSupport Signed-off-by: Ivan Kochurkin <kvanttt@gmail.com>
Signed-off-by: Ivan Kochurkin <kvanttt@gmail.com>
…arser Signed-off-by: Ivan Kochurkin <kvanttt@gmail.com>
|
Hmm...pretty risky modifying the ATN construction... |
| if ( a==Token.EOF ) buf.append("<EOF>"); | ||
| else if ( elemAreChar ) buf.append("'").appendCodePoint(a).append("'"); | ||
| else buf.append(a); | ||
| if ( a==Token.EOF ) { |
There was a problem hiding this comment.
Seems like a lot of cosmetic changes here and flipping of strings two characters for no real game in performance. Yet it costs me mental effort to review
There was a problem hiding this comment.
It's not only cosmetic changes but clarity changes as well. toString should print clear representation of object instead of plain strings. In the old version it prints
'
'
In the new version it prints '\n'. It's more expected behaior I think.
|
Can you help me understand the prime motivation here? There's a lot to review and a lot of changes that could affect allow users, because it touches the tool itself. |
I decided to rebase and suggest my old commits since they exist, remove code duplication (more removed lines than added) and fix inaccurancy in error messages (see tests). Our test coverage is good enough especially for the tool. Error messages without location look akward. I've touched the tool several times, and it almost hasn't cause any trouble. |
|
I'm going to leave this active as it could be useful but I'm allocating my time to antlr-as-a-service proj at moment. thanks! |
Code for parsing grammar string literals
'abc'and grammar char set[abc]have a lot of in common and I unified it. I extracted the functionality intoGrammarLiteralParserthat is responsible for parsing from string literals and char sets. It has the following methods:parseStringFromStringLiteralparseCharFromStringLiteral(returnsCharParseResult)parseChar(returnsCharParseResult)parseNextChar(returnsCharParseResult)CharParseResultcan be eitherINVALIDorCODE_POINTorPROPERTY.PROPERTYis supported only by char set.Also, I unraveled ANTLR tool and ANTLR runtime functionality of char processing.