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

[263773] Further improvements to grammar flattener

Browse source
This commit is contained in:
Sebastian Zarnekow 2015-08-20 08:55:31 +02:00
parent 039a7764c3
commit 70ab3b2602
3 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/normalization/GrammarFlatteningTest.xtend
View file

@ -25,9 +25,14 @@ class GrammarFlatteningTest extends AbstractXtextTests {
}
override Grammar getModel(String model) throws Exception {
return getModel(model, false)
}
def Grammar getModel(String model, boolean dropUnreachable) throws Exception {
var Grammar grammar = super.getModel(model) as Grammar
var RuleNames ruleNames = RuleNames.getRuleNames(grammar, false)
var RuleFilter filter = new RuleFilter()
filter.discardUnreachableRules = dropUnreachable
var Grammar result = FlattenedGrammarProvider.flatten(grammar, ruleNames, filter)
var XtextResource resource = get(XtextResource)
resource.getContents().add(result)
@ -272,5 +277,41 @@ class GrammarFlatteningTest extends AbstractXtextTests {
terminal RULE_ANY_OTHER:
.;'''.toString, serialized)
}
@Test def void test_07() throws Exception {
var Grammar flattened = getModel(
'''
grammar com.foo.bar with org.eclipse.xtext.common.Terminals
generate myPack 'http://myURI'
Rule<A>: name=ID (<A>child=Rule<!A>)?;
''', true)
var String serialized = getSerializer().serialize(flattened)
assertEquals('''
grammar com.foo.bar hidden(RULE_WS, RULE_ML_COMMENT, RULE_SL_COMMENT)
norm0_Rule:
name=RULE_ID;
terminal RULE_ID:
"^"? ("a".."z" | "A".."Z" | "_") ("a".."z" | "A".."Z" | "_" | "0".."9")*;
terminal RULE_INT:
"0".."9"+;
terminal RULE_STRING:
"\"" ("\\" . | !("\\" | "\""))* "\"" | "\'" ("\\" . | !("\\" | "\'"))* "\'";
terminal RULE_ML_COMMENT:
"/*"->"*/";
terminal RULE_SL_COMMENT:
"//" !("\n" | "\r")* ("\r"? "\n")?;
terminal RULE_WS:
" " | "\t" | "\r" | "\n"+;
terminal RULE_ANY_OTHER:
.;'''.toString, serialized)
}
}

2
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parser/fragments/FragmentsEagerLinkingTest.xtend
View file

@ -16,5 +16,5 @@ import org.junit.runner.RunWith
*/
@RunWith(XtextRunner)
@InjectWith(FragmentsEagerLinkingInjectorProvider)
class FragmentEagerLinkingTest extends AbstractFragmentsTest {
class FragmentsEagerLinkingTest extends AbstractFragmentsTest {
}

2
tests/org.eclipse.xtext.tests/suites/org/eclipse/xtext/parser/fragments/FragmentsSuite.java
View file

@ -17,7 +17,7 @@ import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({
FragmentsTest.class,
FragmentEagerLinkingTest.class,
FragmentsEagerLinkingTest.class,
FragmentsExTest.class,
FragmentsPlainParsingTest.class,
FragmentExsPlainParsingTest.class,