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

applied patch from bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=248463

Browse source
This commit is contained in:
sefftinge 2008-10-13 09:42:56 +00:00 committed by sefftinge
parent 53bab77061
commit ecbab3b021
2 changed files with 42 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java
View file

@ -11,7 +11,6 @@ package org.eclipse.xtext.parsetree.reconstr;
import java.io.ByteArrayOutputStream;
import java.util.Collections;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.parsetree.NodeUtil;
import org.eclipse.xtext.testlanguages.SimpleExpressionsStandaloneSetup;
@ -19,8 +18,6 @@ import org.eclipse.xtext.tests.AbstractGeneratorTest;
import org.eclipse.xtext.util.EmfFormater;
public class SimpleReconstrTest extends AbstractGeneratorTest {
private static final Logger logger = Logger.getLogger(SimpleReconstrTest.class);
public void testSimple1() throws Exception {
String model = "a b";
@ -44,10 +41,10 @@ public class SimpleReconstrTest extends AbstractGeneratorTest {
private String parseAndSerialize(String model) throws Exception {
EObject result = (EObject) getModel(model);
logger.debug(EmfFormater.objToStr(result, ""));
logger.debug(EmfFormater.objToStr(NodeUtil.getRootNode(result),
System.out.println(EmfFormater.objToStr(result, ""));
System.out.println(EmfFormater.objToStr(NodeUtil.getRootNode(result),
""));
logger.debug(EmfFormater.objToStr(NodeUtil.getRootNode(result)
System.out.println(EmfFormater.objToStr(NodeUtil.getRootNode(result)
.getLeafNodes(), ""));
IParseTreeConstructor con = getParseTreeConstructor();
@ -72,6 +69,16 @@ public class SimpleReconstrTest extends AbstractGeneratorTest {
String model = "2 45";
assertEquals(model, parseAndSerialize(model));
}
public void testSimpleTwoNumbersWithDefault() throws Exception {
String model = "0 45";
assertEquals(model, parseAndSerialize(model));
}
public void testSimpleTwoNumbersWithDefault2() throws Exception {
String model = "0 45 # 0 # 1 # 2";
assertEquals(model, parseAndSerialize(model));
}
public void testSimpleManyStrings1() throws Exception {
String model = "= 'xxx' 'yyy'";
@ -83,6 +90,24 @@ public class SimpleReconstrTest extends AbstractGeneratorTest {
assertEquals(model, parseAndSerialize(model));
}
public void testSimpleAlternativeAssignment1() throws Exception {
String model = "#2 mykeyword1";
assertEquals(model, parseAndSerialize(model));
}
// FIXME: this depends on
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=250313
// public void testSimpleAlternativeAssignment2() throws Exception {
// String model = "#2 'str'";
// assertEquals(model, parseAndSerialize(model));
// }
// FIXME: make this work
// public void testCrossRef() throws Exception {
// String model = "type A extends B type B extends A";
// assertEquals(model, parseAndSerialize(model));
// }
@Override
protected void setUp() throws Exception {
with(SimpleReconstrTestStandaloneSetup.class);

16
tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.xtext
View file

@ -13,7 +13,7 @@ Op returns Expression:
Term ({Op.values+=current} values+=Term)*;
Term returns Expression:
Atom | TwoNumbers | ManyStrings | Parens;
Atom | TwoNumbers | ManyStrings | Parens | Type | Ref2;
Atom:
name=ID;
@ -22,9 +22,15 @@ Parens returns Expression:
'(' Op ')' em='!'?;
TwoNumbers:
num1=INT num2=INT;
ManyStrings: '=' (str1+=STRING)* str2+=STRING;
num1=INT num2=INT ('#' num3+=INT)*;
ManyStrings:
'=' (str1+=STRING)* str2+=STRING;
Type :
'type' name=ID 'extends' ^extends=[Type];
Ref2:
'#2' ref2=('mykeyword1' | STRING | 'mykeyword2') ;