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

Merge pull request #712 from eclipse/sz/grammarGenFixes

Browse source 
Fixed a few things in the Antlr generators
This commit is contained in:
Sebastian Zarnekow 2015-10-20 16:40:30 +02:00
commit 8c9115a994
2 changed files with 13 additions and 12 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/AntlrContentAssistGrammarGenerator.xtend
View file

@ -336,7 +336,7 @@ class AntlrContentAssistGrammarGenerator extends AbstractAntlrGrammarWithActions
'''
protected def paramConfig(AbstractElement it) '''
«IF containingRule.alternatives == this && ParserRule.isInstance(containingRule) && !(containingRule.originalElement as ParserRule).parameters.isEmpty»
«IF containingRule.alternatives === it && ParserRule.isInstance(containingRule) && !(containingRule.originalElement as ParserRule).parameters.isEmpty»
, «(containingRule as ParserRule).parameterConfig»
«ENDIF»
'''

23
plugins/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/AntlrGrammarGenerator.xtend
View file

@ -105,7 +105,7 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
}
protected override dispatch compileRule(ParserRule it, Grammar grammar, AntlrOptions options) '''
«IF !it.isFragment»
«IF isValidEntryRule()»
«compileEntryRule(grammar, options)»
«ENDIF»
@ -116,8 +116,8 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
// Entry rule «originalElement.entryRuleName»
«originalElement.entryRuleName» returns «compileEntryReturns(options)»«compileEntryInit(options)»:
{ «newCompositeNode» }
iv_«originalElement.ruleName»=«originalElement.ruleName»«defaultArgumentList»
{ $current=$iv_«originalElement.ruleName».current«IF originalElement.datatypeRule».getText()«ENDIF»; }
iv_«originalElement.ruleName»=«ruleName»«defaultArgumentList»
{ $current=$iv_«ruleName».current«IF originalElement.datatypeRule».getText()«ENDIF»; }
EOF;
«compileEntryFinally(options)»
'''
@ -145,7 +145,7 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
protected def compileReturns(AbstractRule it, AntlrOptions options) {
switch it {
EnumRule:
'returns [Enumerator current=null]'
'[Enumerator current=null]'
ParserRule case originalElement.datatypeRule:
'[AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]'
ParserRule case originalElement.isEObjectFragmentRule:
@ -244,6 +244,7 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
else '''
«localVar»=«super._ebnf2(it, options, supportActions)»
{
$current = grammarAccess.«grammarElementAccess(originalElement)».getEnumLiteral().getInstance();
«newLeafNode(localVar)»
}
'''
@ -265,11 +266,6 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
}
«ENDIF»
{
«IF isEObjectFragmentRuleCall»
if ($current==null) {
$current = «it.createModelElement»;
}
«ENDIF»
«newCompositeNode»
}
«super._ebnf2(it, options, supportActions)»
@ -284,6 +280,11 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
}
«ENDIF»
{
«IF isEObjectFragmentRuleCall»
if ($current==null) {
$current = «it.createModelElement»;
}
«ENDIF»
«newCompositeNode»
}
«localVar»=«super._ebnf2(it, options, supportActions)»
@ -311,13 +312,13 @@ class AntlrGrammarGenerator extends AbstractAntlrGrammarWithActionsGenerator {
{
«ref.newCompositeNode»
}
«originalElement.ruleName»«call.getArgumentList(isPassCurrentIntoFragment, !supportActions)»
«ruleName»«call.getArgumentList(isPassCurrentIntoFragment, !supportActions)»
{
afterParserOrEnumRuleCall();
}
'''
TerminalRule: '''
«ref.containingAssignment.localVar»=«originalElement.ruleName»
«ref.containingAssignment.localVar»=«ruleName»
{
«ref.newLeafNode(ref.containingAssignment.localVar)»
}