summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkohnlein2008-03-14 06:17:29 (EDT)
committer jkohnlein2008-03-14 06:17:29 (EDT)
commite2124faeee901efd69c296c47651616d6cb98529 (patch)
treec6f8644b9765ec758364f3cf1add8c58cb84d4b1
parent43af73b41314b1155f37e66d37978a946443bfac (diff)
downloadorg.eclipse.xpand-e2124faeee901efd69c296c47651616d6cb98529.zip
org.eclipse.xpand-e2124faeee901efd69c296c47651616d6cb98529.tar.gz
org.eclipse.xpand-e2124faeee901efd69c296c47651616d6cb98529.tar.bz2
minor cleanup
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java50
-rw-r--r--plugins/org.eclipse.xpand3/plugin.xml14
-rw-r--r--tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java4
3 files changed, 37 insertions, 31 deletions
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java
index fa29554..f4ffe4e 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/ImportStatement.java
@@ -2,38 +2,38 @@
* <copyright>
* </copyright>
*
- * $Id: ImportStatement.java,v 1.2 2008/03/07 11:10:39 jkohnlein Exp $
+ * $Id: ImportStatement.java,v 1.3 2008/03/14 10:18:41 jkohnlein Exp $
*/
package org.eclipse.xpand3;
-
/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Import Statement</b></em>'.
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Import Statement</b></em>'.
* <!-- end-user-doc -->
- *
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}</li>
- * <li>{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}</li>
+ * <li>{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}</li>
+ * <li>{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.xpand3.Xpand3Package#getImportStatement()
* @model
* @generated
*/
public interface ImportStatement extends SyntaxElement {
/**
- * Returns the value of the '<em><b>Imported Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Imported Id</b></em>' containment
+ * reference. <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Imported Id</em>' containment reference isn't clear,
- * there really should be more of a description here...
+ * If the meaning of the '<em>Imported Id</em>' containment reference
+ * isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Imported Id</em>' containment reference.
+ *
+ * @return the value of the '<em>Imported Id</em>' containment
+ * reference.
* @see #setImportedId(Identifier)
* @see org.eclipse.xpand3.Xpand3Package#getImportStatement_ImportedId()
* @model containment="true"
@@ -42,23 +42,26 @@ public interface ImportStatement extends SyntaxElement {
Identifier getImportedId();
/**
- * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Imported Id</em>' containment reference.
+ * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#getImportedId <em>Imported Id</em>}'
+ * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Imported Id</em>' containment
+ * reference.
* @see #getImportedId()
* @generated
*/
void setImportedId(Identifier value);
/**
- * Returns the value of the '<em><b>Exported</b></em>' attribute.
- * <!-- begin-user-doc -->
+ * Returns the value of the '<em><b>Exported</b></em>' attribute. <!--
+ * begin-user-doc -->
* <p>
* If the meaning of the '<em>Exported</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
+ *
* @return the value of the '<em>Exported</em>' attribute.
* @see #setExported(boolean)
* @see org.eclipse.xpand3.Xpand3Package#getImportStatement_Exported()
@@ -68,10 +71,11 @@ public interface ImportStatement extends SyntaxElement {
boolean isExported();
/**
- * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Exported</em>' attribute.
+ * Sets the value of the '{@link org.eclipse.xpand3.ImportStatement#isExported <em>Exported</em>}'
+ * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Exported</em>' attribute.
* @see #isExported()
* @generated
*/
diff --git a/plugins/org.eclipse.xpand3/plugin.xml b/plugins/org.eclipse.xpand3/plugin.xml
index d308fd7..95085cc 100644
--- a/plugins/org.eclipse.xpand3/plugin.xml
+++ b/plugins/org.eclipse.xpand3/plugin.xml
@@ -6,29 +6,35 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/m2t/xpand/xpand3"
- class = "org.eclipse.xpand3.ast.xpand3.Xpand3Package"
+ class = "org.eclipse.xpand3.Xpand3Package"
genModel = "src/xpand3.genmodel" />
</extension>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/m2t/xpand/xpand3/expession"
- class = "org.eclipse.xpand3.ast.expression.expression.ExpressionPackage"
+ class = "org.eclipse.xpand3.expression.ExpressionPackage"
genModel = "src/xpand3.genmodel" />
</extension>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/m2t/xpand/xpand3/statement"
- class = "org.eclipse.xpand3.ast.statement.statement.StatementPackage"
+ class = "org.eclipse.xpand3.statement.StatementPackage"
genModel = "src/xpand3.genmodel" />
</extension>
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/m2t/xpand/xpand3/declararation"
- class = "org.eclipse.xpand3.ast.declaration.declaration.DeclarationPackage"
+ class = "org.eclipse.xpand3.declaration.DeclarationPackage"
genModel = "src/xpand3.genmodel" />
</extension>
+ <extension
+ point="org.eclipse.xtend.backend.MiddleEnd">
+ <element_1
+ class="org.eclipse.xpand3.middlend.Xpand3MiddleEndFactory">
+ </element_1>
+ </extension>
</plugin>
diff --git a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java
index 9ae8f2e..bdb8cfd 100644
--- a/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java
+++ b/tests/org.eclipse.xpand3.parser.tests/src/org/eclipse/xpand3/parser/node2ast/TreetestInterpreterTest.java
@@ -31,10 +31,6 @@ public class TreetestInterpreterTest extends AbstractEcoreTreeTestInterpreter {
private boolean parseExpression;
- public TreetestInterpreterTest() {
- super("MM");
- }
-
public void testStatement() throws Throwable {
parseExpression = false;
test("org/eclipse/xpand3/parser/node2ast/statement.ttst");