summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkohnlein2008-03-20 03:56:44 (EDT)
committerjkohnlein2008-03-20 03:56:44 (EDT)
commit63bef15c3810fbd3489a436f707c48df186baf63 (patch)
tree8998bea220cf619542baa78fa9f5ae39eb3b6bfe
parent10a058dca1e6a1c6e0f725c696b0cf71da45c9ba (diff)
downloadorg.eclipse.xpand-63bef15c3810fbd3489a436f707c48df186baf63.zip
org.eclipse.xpand-63bef15c3810fbd3489a436f707c48df186baf63.tar.gz
org.eclipse.xpand-63bef15c3810fbd3489a436f707c48df186baf63.tar.bz2
fixed dependencies to antlr
fixed middlend test
-rw-r--r--plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore136
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeLexer.java2
-rw-r--r--plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeParser.java2
-rw-r--r--plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.xpand3.tests/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/middleend/MiddleEndTest.java23
7 files changed, 89 insertions, 82 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
index 1f9f746..083d71e 100644
--- a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.tmf.common;resolution:=optional,
org.eclipse.tmf.common.generator;bundle-version="1.0.0";resolution:=optional,
org.eclipse.tmf.common.runtime;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.xpand3.common
diff --git a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
index 0b74e63..84fe358 100644
--- a/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
+++ b/plugins/org.eclipse.xpand3.parser/model/Xpand3Node.ecore
@@ -2,19 +2,19 @@
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xpand3node" nsURI="http://www.eclipse.org/tmf/common/Xpand3Node" nsPrefix="xpand3node">
<eClassifiers xsi:type="ecore:EClass" name="FileNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="declarations" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ImportNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="namespace">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="namespace">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -35,18 +35,15 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="type">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DefinitionAroundNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="pointcut">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
@@ -56,6 +53,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SequenceNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -83,16 +83,16 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExpandStatementNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="separator">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="forExpression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="forEachExpression">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="separator">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="forExpression">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="forEachExpression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="name">
@@ -107,10 +107,10 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FileStatementNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="identifier">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="identifier">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="nameExpression">
@@ -119,24 +119,27 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ForeachStatementNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="iterator">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="identifier">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="forExpression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="separatorExpression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="iterator">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IfStatementNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="elseIfs" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
@@ -146,16 +149,13 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="else">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ElseIfStatementNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -170,22 +170,22 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="expression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ProtectStatementNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="id">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="cend">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="id">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sequence">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="cstart">
@@ -194,16 +194,13 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CheckNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="error">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="message">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ifExpression">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="ifExpression">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="message">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="warning">
@@ -212,6 +209,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="constraint">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AroundNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -224,37 +224,37 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="extendBody">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="returnType">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="cached">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="createdName">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="javaCall">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="private">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="create">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaCall">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="createdName">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="create">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="returnType">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="cached">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="private">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="JavaCallNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaReturnType">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="javaName">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaName">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="javaReturnType">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -287,30 +287,30 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="IfExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition0">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="then">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="else">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="then">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="condition1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="condition0">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SwitchExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="cases" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="default">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CasePartNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
@@ -323,10 +323,10 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="OrExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="first">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="first">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -350,19 +350,19 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RelationalExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="first">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="first">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AdditiveExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="first">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="first">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="nexts" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -383,10 +383,10 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="InfixExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="target">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="calls" upperBound="-1">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="calls" upperBound="-1">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="target">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -404,13 +404,13 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeatureCallNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="name">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="paramList">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="name">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
</eClassifiers>
@@ -434,10 +434,10 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CollectionExpressionNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="variable">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="type">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="type">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="expression">
@@ -467,12 +467,12 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CollectionTypeNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="collectionType">
- <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="elementType">
<eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="collectionType">
+ <eType xsi:type="ecore:EClass" href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//LeafNode"/>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SimpleTypeNode">
<eSuperTypes href="platform:/resource/org.eclipse.tmf.common.runtime/src/org/eclipse/tmf/common/node/node.ecore#//CompositeNode"/>
diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeLexer.java b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeLexer.java
index 1fe3413..aafa2de 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeLexer.java
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3Node.g 2008-03-18 09:15:12
+// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3Node.g 2008-03-20 08:52:57
package org.eclipse.xpand3.internal.frontend.parser;
diff --git a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeParser.java b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeParser.java
index cd7e58f..5efd948 100644
--- a/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeParser.java
+++ b/plugins/org.eclipse.xpand3.parser/src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3NodeParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3Node.g 2008-03-18 09:15:11
+// $ANTLR 3.0 ./src-gen/org/eclipse/xpand3/internal/frontend/parser/Xpand3Node.g 2008-03-20 08:52:56
package org.eclipse.xpand3.internal.frontend.parser;
diff --git a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF
index b7d1aad..d07aa58 100644
--- a/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xpand3/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.antlr.patched;bundle-version="3.0.0",
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.xtend.backend;bundle-version="0.7.0";visibility:=reexport,
org.junit,
diff --git a/tests/org.eclipse.xpand3.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xpand3.tests/META-INF/MANIFEST.MF
index 21773b0..5ed43e5 100644
--- a/tests/org.eclipse.xpand3.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xpand3.tests/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Bundle-Vendor: www.eclipse.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit,
org.eclipse.xpand3;bundle-version="0.9",
- org.antlr.patched;bundle-version="3.0.0",
org.eclipse.tmf.common.runtime;bundle-version="1.0.0",
- org.eclipse.xpand3.common
+ org.eclipse.xpand3.common,
+ org.antlr.runtime
diff --git a/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/middleend/MiddleEndTest.java b/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/middleend/MiddleEndTest.java
index 365e590..8182217 100644
--- a/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/middleend/MiddleEndTest.java
+++ b/tests/org.eclipse.xpand3.tests/src/org/eclipse/xpand3/middleend/MiddleEndTest.java
@@ -2,6 +2,7 @@ package org.eclipse.xpand3.middleend;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import junit.framework.TestCase;
@@ -34,15 +35,23 @@ public class MiddleEndTest extends TestCase {
assertNotNull(backendTypeObject);
FunctionDefContext functionDefContext = middleEnd
- .getFunctions("org/eclipse/xpand3/middleend/test.ext");
+ .getFunctions("org/eclipse/xpand3/middleend/test");
+
ExecutionContext executionContext = middleEnd.getExecutionContext();
- Function fooFunction = functionDefContext.getMatch(executionContext,
- "foo", Arrays.asList(new BackendType[] { backendTypeObject,
- backendTypeObject }));
- assertNotNull(fooFunction);
- Object result = fooFunction.invoke(executionContext, new Object[] {
- "x", "y" });
+ List<Object> params = Arrays.asList(new Object[] { "x", "y" });
+ Object result = functionDefContext.invoke(executionContext, "foo",
+ params);
assertNotNull(result);
assertFalse(((Boolean) result).booleanValue());
+
+ Function function = functionDefContext.getMatch(executionContext,
+ "foo", Arrays.asList(new BackendType[] { backendTypeObject,
+ backendTypeObject }));
+ assertNotNull(function);
+
+ Object result2 = executionContext.getFunctionInvoker().invoke(
+ executionContext, function, params);
+ assertEquals(result, result2);
+
}
}