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

- AbstractAntlrParser handles lookahead in match() mor sophisticated

Browse source 
- fixed tests
- fixed test.xml
This commit is contained in:
jkohnlein 2008-07-08 16:51:20 +00:00 committed by sefftinge
parent 700d9b7149
commit 3f3d6549ba
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parser/PartialParserReplaceTest.java
View file

@ -12,6 +12,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.xtext.parser.impl.PartialParsingPointers;
import org.eclipse.xtext.parser.impl.PartialParsingUtil;
import org.eclipse.xtext.parsetree.CompositeNode;
import org.eclipse.xtext.parsetree.NodeUtil;
import org.eclipse.xtext.parsetree.SyntaxError;
import org.eclipse.xtext.testlanguages.LookaheadLanguageStandaloneSetup;
import org.eclipse.xtext.testlanguages.SimpleExpressionsStandaloneSetup;
@ -26,16 +27,13 @@ public class PartialParserReplaceTest extends AbstractPartialParserTest {
with(SimpleExpressionsStandaloneSetup.class);
String model = "(a+b+c)*(c/d)";
replaceAndReparse(model, 2, 2, "+hugo+egon", "(a+hugo+egon+c)");
//TODO repair
// replaceAndReparse(model, 8, 5, "egon", "egon");
replaceAndReparse(model, 8, 5, "egon", "egon");
replaceAndReparse(model, 1, 2, "", "(b+c)");
replaceAndReparse(model, 6, 3, "*", "(a+b+c*c/d)");
// replaceAndReparse(model, 3, 1, "(x+y+z)", "(x+y+z)");
replaceAndReparse("a b", 1,1,"+","a+b");
// TODO: breaking case
// replaceAndReparse(model, 3, 1, "x)+(b", "x)+(b");
replaceAndReparse(model, 3, 1, "(x+y+z)", "(x+y+z)");
replaceAndReparse("a b", 1, 1, "+", "a+b");
replaceAndReparse(model, 3, 1, "x)+(b", "x)+(b");
}
public void testLookahead() throws Exception {
@ -49,16 +47,18 @@ public class PartialParserReplaceTest extends AbstractPartialParserTest {
private void replaceAndReparse(String model, int offset, int length, String change, String expectedReparseRegion)
throws Exception {
CompositeNode rootNode = getRootNode(model);
if (DEBUG) {
NodeUtil.dumpCompositeNodes("", rootNode);
}
PartialParsingPointers parsingPointers = PartialParsingUtil.calculatePartialParsingPointers(rootNode, offset,
length);
String reparseRegion = PartialParsingUtil.insertChangeIntoReplaceRegion(parsingPointers
.getDefaultReplaceRootNode(), offset, length, change);
assertEquals(expectedReparseRegion, reparseRegion);
IParseResult partiallyReparse = PartialParsingUtil.reparse(getParser(), rootNode, offset, length,
change);
IParseResult partiallyReparse = PartialParsingUtil.reparse(getParser(), rootNode, offset, length, change);
EList<SyntaxError> errors = partiallyReparse.getRootNode().allSyntaxErrors();
for (SyntaxError syntaxError : errors) {
System.out.println(model+offset+length+change+":"+syntaxError.getMessage());
System.out.println(model + offset + length + change + ":" + syntaxError.getMessage());
}
assertTrue(partiallyReparse.getRootNode().allSyntaxErrors().isEmpty());
String expectedReparseModel = model.substring(0, offset) + change + model.substring(offset + length);