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

Merge pull request #193 from kthoms/kth/override_rules

Browse source 
Added missing Override annotations
This commit is contained in:
Karsten Thoms 2016-12-06 07:21:29 +01:00 committed by GitHub
commit 077d8c76aa
15 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/ecore/SubTestLanguage.xtext
View file

@ -5,6 +5,7 @@ generate subPackage "http://www.eclipse.org/2009/tmf/xtext/SubTestLanguage"
SubMain :
"{" superMains+=SuperMain "}" (another=AnotherSuperMain)?;
@Override
AnotherSuperMain :
"ups" name=ID;

5
org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/AbstractTestLanguage.xtext
View file

@ -22,7 +22,7 @@ OverridableParserRule returns mm::AType :
'element' name=ID;
OverridableParserRule2 returns mm::AType :
'other element' name=STRING;
'other element' name=STRING;
/* SuppressWarnings[noInstantiation] */
AbstractCallExtendedParserRule returns mm::AModel:
@ -33,4 +33,5 @@ ExtendableParserRule returns mm::AType :
terminal REAL returns ecore::EDouble : INT '.' INT;
terminal ID : ('^')?('a'..'z'|'A'..'Z'|'ö'|'ä'|'ü'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
@Override
terminal ID : ('^')?('a'..'z'|'A'..'Z'|'ö'|'ä'|'ü'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;

4
org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/ConcreteTestLanguage.xtext
View file

@ -19,6 +19,7 @@ ConcreteParserRule :
'model' magicNumber=REAL ':' (elements+=InheritedParserRule)*;
// override OverridableParserRule and call it
@Override
OverridableParserRule returns mm::AType:
'overriddenelement' name=ID;
@ -26,10 +27,12 @@ CallOverridenParserRule:
call=AbstractCallOverridenParserRule;
// override parser rule and change return type
@Override
OverridableParserRule2 returns AType2 :
'overridden other element' name=ID '-' age=INT;
// override and extend ExtendableParserRule and call it
@Override
ExtendableParserRule returns mm::AType:
Subrule1 | Subrule2 | Subrule3;
@ -45,6 +48,7 @@ Subrule3:
CallExtendedParserRule:
call=AbstractCallExtendedParserRule;
@Override
terminal ID:
super
;

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest2Language.xtext
View file

@ -10,6 +10,7 @@ grammar org.eclipse.xtext.grammarinheritance.InheritanceTest2Language
generate inheritanceTest2 "http://www.eclipse.org/2009/tmf/xtext/InheritanceTest2Language"
@Override
Model:
"model" name=ID "{"
elements+=Element*

3
org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTest3Language.xtext
View file

@ -10,10 +10,12 @@ grammar org.eclipse.xtext.grammarinheritance.InheritanceTest3Language
import "http://www.eclipse.org/2009/tmf/xtext/InheritanceTestLanguage"
@Override
Model:
super::Model
;
@Override
Element :
super::Element
| {Element} "element" name=super::ID
@ -21,4 +23,5 @@ Element :
| {Element} "element" name=super::STRING
;
@Override
terminal ID: 'id';

2
org.eclipse.xtext.tests/src/org/eclipse/xtext/grammarinheritance/InheritanceTestLanguage.xtext
View file

@ -10,6 +10,7 @@ grammar org.eclipse.xtext.grammarinheritance.InheritanceTestLanguage
generate inheritanceTest "http://www.eclipse.org/2009/tmf/xtext/InheritanceTestLanguage"
@Override
Model :
"model" name=ID "{"
elements+=Element*
@ -20,4 +21,5 @@ Element :
"element" name=ID
;
@Override
terminal ID: ('a'..'z')+;

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseImportsTestLanguage.xtext
View file

@ -9,6 +9,7 @@ grammar org.eclipse.xtext.linking.IgnoreCaseImportsTestLanguage with org.eclipse
generate ignoreCaseImportsTest "http://eclipse.org/xtext/ignoreCaseImportsTestLanguage"
@Override
Model:
imports += Import*
elements += Element+

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/linking/IgnoreCaseNamespacesTestLanguage.xtext
View file

@ -9,6 +9,7 @@ grammar org.eclipse.xtext.linking.IgnoreCaseNamespacesTestLanguage with org.ecli
generate ignoreCaseNamespacesTest "http://eclipse.org/xtext/ignoreCaseNamespacesTestLanguage"
@Override
Model:
imports += Import*
elements += Element+

3
org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/indentation/IndentationAwareTestLanguage.xtext
View file

@ -20,7 +20,8 @@ TreeNode:
DEDENT)?
;
terminal SL_COMMENT : '//' !('\n'|'\r')*;
@Override
terminal SL_COMMENT: '//' !('\n'|'\r')*;
terminal INDENT: 'synthetic:INDENT';
terminal DEDENT: 'synthetic:DEDENT';

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/NoParametersTestLanguage.xtext
View file

@ -9,6 +9,7 @@ grammar org.eclipse.xtext.parser.parameters.NoParametersTestLanguage with org.ec
import "http://www.eclipse.org/2015/tmf/xtext/parameters"
@Override
ParserRuleParameters: {ParserRuleParameters}
( '#1' scenario=Scenario1_True
| '#2' scenario=Scenario1_False

2
org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/ParametersTestLanguageEx.xtext
View file

@ -9,10 +9,12 @@ grammar org.eclipse.xtext.parser.parameters.ParametersTestLanguageEx with org.ec
import "http://www.eclipse.org/2015/tmf/xtext/parameters"
@Override
ParserRuleParameters returns ParserRuleParameters:
super::ParserRuleParameters
;
@Override
Scenario1<Param> returns Scenario:
super::Scenario1<Param>
;

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/parameters/TwoParametersTestLanguage.xtext
View file

@ -9,6 +9,7 @@ grammar org.eclipse.xtext.parser.parameters.TwoParametersTestLanguage with org.e
import "http://www.eclipse.org/2015/tmf/xtext/parameters"
@Override
ParserRuleParameters: {ParserRuleParameters}
( '#1' scenario=Scenario5<true, true>
| '#2' scenario=Scenario5<false, false>

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/reconstr/Bug302128TestLanguage.xtext
View file

@ -19,4 +19,5 @@ Variable: ID (('.'|'-') ID)*;
/* SuppressWarnings[InvalidTerminalruleName] */
terminal Value: ('='|'+='|'-=') -> '\n';
@Override
terminal SL_COMMENT: '#' !('\n'|'\r')* ('\r'? '\n')?;

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/Bug285140TestLanguage.xtext
View file

@ -10,6 +10,7 @@ grammar org.eclipse.xtext.xtext.ecoreInference.Bug285140TestLanguage with org.ec
import "http://www.eclipse.org/2008/tmf/xtext/ActionLang" as actionLang
@Override
Model returns actionLang::Model:
Child ({actionLang::Parent.left=current} right=Child)?;

1
org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/ecoreInference/DataTypeRuleWithEnumResultTestLanguage.xtext
View file

@ -12,6 +12,7 @@ import 'http://www.eclipse.org/2009/tmf/xtext/EnumRulesTest'
/* SuppressWarnings[external] */
import 'classpath:/org/eclipse/xtext/enumrules/enums.ecore'
@Override
Model:
'model' existing=ExistingEnumAsDT
;