sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 16:58:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[antlr grammar generation] fixed issue in 'compileParserMembers' of content assist grammar generator and 'compileTokens' of AbstractAntlrGrammarGenerator

Browse source 
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
This commit is contained in:
Christian Schneider 2015-10-21 15:14:07 +02:00
parent b3a4d042c1
commit f6d4cac3df
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AbstractAntlrGrammarGenerator.xtend
View file

@ -135,7 +135,7 @@ abstract class AbstractAntlrGrammarGenerator {
protected def compileTokens(Grammar it, AntlrOptions options) '''
«IF options.isBacktrackLexer»
tokens {
«FOR kw : allKeywords.sort.sortBy[length]»
«FOR kw : allKeywords.sort.sortBy[-length]»
«keywordHelper.getRuleName(kw)»;
«ENDFOR»
«FOR rule: allTerminalRules»

2
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrContentAssistGrammarGenerator.xtend
View file

@ -44,7 +44,7 @@ class AntlrContentAssistGrammarGenerator extends AbstractAntlrGrammarWithActions
{
«FOR kw: allKeywords.sort.sortBy[-length]»
tokenNameToValue.put("«keywordHelper.getRuleName(kw)»", "'«kw.toJavaIdentifier(false).replaceAll("\\\\\\$", "\\\\u0024")»'");
tokenNameToValue.put("«keywordHelper.getRuleName(kw)»", "'«kw.toStringInAntlrAction.replaceAll("\\\\\\$", "\\\\u0024")»'");
«ENDFOR»
}
«ENDIF»