grammar elements are now resolved through their URI (incl. language inheritance)

This commit is contained in:
sefftinge 2008-07-03 09:43:20 +00:00 committed by sefftinge
parent fe3ab908c3
commit ab45c02d68
2 changed files with 10 additions and 12 deletions

View file

@ -61,18 +61,6 @@ public class NodeModelTest extends AbstractGeneratorTest {
LeafNode leafNode = (LeafNode) next;
EObject grammarElement = leafNode.getGrammarElement();
assertNotNull(grammarElement);
//TODO is this test obsolete since we've removed the tokenType feature?
// if (grammarElement instanceof Keyword) {
// assertEquals(ITokenTypes.KEYWORD, tokenType);
// } else if (GrammarUtil.isWhitespaceLexerRule(grammarElement)) {
// assertEquals(ITokenTypes.WHITESPACE, tokenType);
// } else if (GrammarUtil.isLexerRuleCall(grammarElement)) {
// assertEquals(((LexerRule) GrammarUtil
// .calledRule((RuleCall) grammarElement))
// .getTokenType(), tokenType);
// } else {
// fail("LeafNodes must correspond to keywords, whitespaces or lexerRules "+grammarElement);
// }
}
}
}

View file

@ -9,6 +9,8 @@
package org.eclipse.xtext.parsetree.reconstr;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.RuleCall;
import org.eclipse.xtext.parsetree.CompositeNode;
import org.eclipse.xtext.parsetree.IParseTreeConstructor;
import org.eclipse.xtext.parsetree.NodeUtil;
import org.eclipse.xtext.tests.AbstractGeneratorTest;
@ -38,4 +40,12 @@ public class ComplexReconstrTest extends AbstractGeneratorTest {
String resultString = NodeUtil.getRootNode(result).serialize();
return resultString;
}
// public void testNormalizableCompositeNodesIncluded() throws Exception {
// EObject model = getModel("a");
// IParseTreeConstructor con = getParseTreeConstructor();
// con.update(model);
// CompositeNode node = NodeUtil.getRootNode(model);
// assertEquals("Op",((RuleCall)node.getGrammarElement()).getName());
// }
}