From 960dc02bf8c92db10de542897c19d23a2297fe33 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Mon, 16 Nov 2015 16:16:23 +0100 Subject: [PATCH] [xtext tests] changed name computation of lexer grammars to be in line with the formerly taken names, synchronized name computation in grammar comparison fragment Signed-off-by: Christian Schneider --- .../xtext/generator/parser/antlr/GrammarNaming.xtend | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend index 7b60e048d..396f12b1f 100644 --- a/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend +++ b/plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/GrammarNaming.xtend @@ -33,12 +33,20 @@ class GrammarNaming { parserPackage + ".internal" } + protected def String getInternalLexerPackage(Grammar it) { + parserPackage + ".lexer" + } + def AntlrGrammar getParserGrammar(Grammar it) { new AntlrGrammar(internalParserPackage, '''«grammarNamePrefix»Internal«simpleName»«IF !combinedGrammar»Parser«ENDIF»''') } def AntlrGrammar getLexerGrammar(Grammar it) { - new AntlrGrammar(internalParserPackage, '''«grammarNamePrefix»Internal«simpleName»«IF !combinedGrammar»Lexer«ENDIF»''') + if (combinedGrammar) { + getParserGrammar + } else { + new AntlrGrammar(internalLexerPackage, '''«grammarNamePrefix»Internal«simpleName»Lexer''') + } } protected def String getGrammarNamePrefix(Grammar it) {