diff options
8 files changed, 48 insertions, 40 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/.project b/plugins/org.eclipse.xpand3.parser/.project index 8dea5c60..e7c195d8 100644 --- a/plugins/org.eclipse.xpand3.parser/.project +++ b/plugins/org.eclipse.xpand3.parser/.project @@ -20,9 +20,15 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>de.itemis.emf.ecore.registry.ePackageRegistryBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>de.itemis.emf.ecore.registry.ePackageRegistryNature</nature> </natures> </projectDescription> diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java index e3ae62e8..2a686aea 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclarationPackage.java,v 1.1 2008/03/17 14:39:12 jkohnlein Exp $ + * $Id: DeclarationPackage.java,v 1.2 2008/03/20 10:15:42 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration; @@ -43,7 +43,7 @@ public interface DeclarationPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/declararation"; + String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/declaration"; /** * The package namespace name. diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java index 13bc6199..a4498d8b 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: DeclarationFactoryImpl.java,v 1.1 2008/03/17 14:39:13 jkohnlein Exp $ + * $Id: DeclarationFactoryImpl.java,v 1.2 2008/03/20 10:15:42 jkohnlein Exp $ */ package org.eclipse.xpand3.declaration.impl; @@ -31,7 +31,7 @@ public class DeclarationFactoryImpl extends EFactoryImpl implements DeclarationF */ public static DeclarationFactory init() { try { - DeclarationFactory theDeclarationFactory = (DeclarationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/declararation"); + DeclarationFactory theDeclarationFactory = (DeclarationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/declaration"); if (theDeclarationFactory != null) { return theDeclarationFactory; } diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java index 5c370e70..e4727cb8 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/ExpressionPackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExpressionPackage.java,v 1.1 2008/03/17 14:39:06 jkohnlein Exp $ + * $Id: ExpressionPackage.java,v 1.2 2008/03/20 10:15:42 jkohnlein Exp $ */ package org.eclipse.xpand3.expression; @@ -42,7 +42,7 @@ public interface ExpressionPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/expession"; + String eNS_URI = "http://www.eclipse.org/m2t/xpand/xpand3/expression"; /** * The package namespace name. diff --git a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java index 624f1d74..3cca7a88 100644 --- a/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java +++ b/plugins/org.eclipse.xpand3.parser/emf-gen/org/eclipse/xpand3/expression/impl/ExpressionFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ExpressionFactoryImpl.java,v 1.1 2008/03/17 14:39:10 jkohnlein Exp $ + * $Id: ExpressionFactoryImpl.java,v 1.2 2008/03/20 10:15:42 jkohnlein Exp $ */ package org.eclipse.xpand3.expression.impl; @@ -31,7 +31,7 @@ public class ExpressionFactoryImpl extends EFactoryImpl implements ExpressionFac */ public static ExpressionFactory init() { try { - ExpressionFactory theExpressionFactory = (ExpressionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/expession"); + ExpressionFactory theExpressionFactory = (ExpressionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/m2t/xpand/xpand3/expression"); if (theExpressionFactory != null) { return theExpressionFactory; } diff --git a/plugins/org.eclipse.xpand3.parser/model/xpand3.ecore b/plugins/org.eclipse.xpand3.parser/model/xpand3.ecore index a15ba1d6..6da82f6d 100644 --- a/plugins/org.eclipse.xpand3.parser/model/xpand3.ecore +++ b/plugins/org.eclipse.xpand3.parser/model/xpand3.ecore @@ -29,7 +29,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//Identifier" containment="true"/> </eClassifiers> - <eSubpackages name="expression" nsURI="http://www.eclipse.org/m2t/xpand/xpand3/expession" + <eSubpackages name="expression" nsURI="http://www.eclipse.org/m2t/xpand/xpand3/expression" nsPrefix="expression"> <eClassifiers xsi:type="ecore:EClass" name="AbstractExpression" abstract="true" eSuperTypes="#//SyntaxElement"/> @@ -202,7 +202,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="deleteLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/> </eClassifiers> </eSubpackages> - <eSubpackages name="declaration" nsURI="http://www.eclipse.org/m2t/xpand/xpand3/declararation" + <eSubpackages name="declaration" nsURI="http://www.eclipse.org/m2t/xpand/xpand3/declaration" nsPrefix="declaration"> <eClassifiers xsi:type="ecore:EClass" name="AbstractDeclaration" abstract="true" eSuperTypes="#//SyntaxElement"> diff --git a/plugins/org.eclipse.xpand3.parser/plugin.xml b/plugins/org.eclipse.xpand3.parser/plugin.xml index f95b615c..ee79d267 100644 --- a/plugins/org.eclipse.xpand3.parser/plugin.xml +++ b/plugins/org.eclipse.xpand3.parser/plugin.xml @@ -5,16 +5,44 @@ <copyright> </copyright> - $Id: plugin.xml,v 1.1 2008/03/06 08:55:17 jkohnlein Exp $ + $Id: plugin.xml,v 1.2 2008/03/20 10:15:42 jkohnlein Exp $ --> <plugin> <extension point="org.eclipse.emf.ecore.generated_package"> <package - uri = "http://www.eclipse.org/tmf/common/Xpand3" - class = "org.eclipse.internal.xpand3.Xpand3.Xpand3Package" - genModel = "model/Xpand3.genmodel" /> + uri = "http://www.eclipse.org/m2t/xpand/xpand3" + 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/expression" + 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.statement.StatementPackage" + genModel = "src/xpand3.genmodel" /> + </extension> + + <extension point="org.eclipse.emf.ecore.generated_package"> + <package + uri = "http://www.eclipse.org/m2t/xpand/xpand3/declaration" + class = "org.eclipse.xpand3.declaration.DeclarationPackage" + genModel = "src/xpand3.genmodel" /> + </extension> + + <extension point="org.eclipse.emf.ecore.generated_package"> + <package + uri = "http://www.eclipse.org/tmf/common/Xpand3Node" + class = "org.eclipse.xpand3.internal.frontend.parser.xpand3node.Xpand3nodePackage" + genModel = "model/Xpand3Node.genmodel" /> </extension> </plugin> diff --git a/plugins/org.eclipse.xpand3/plugin.xml b/plugins/org.eclipse.xpand3/plugin.xml index 95085cc3..419f8662 100644 --- a/plugins/org.eclipse.xpand3/plugin.xml +++ b/plugins/org.eclipse.xpand3/plugin.xml @@ -3,33 +3,7 @@ <plugin> - <extension point="org.eclipse.emf.ecore.generated_package"> - <package - uri = "http://www.eclipse.org/m2t/xpand/xpand3" - 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.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.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.declaration.DeclarationPackage" - genModel = "src/xpand3.genmodel" /> - </extension> <extension point="org.eclipse.xtend.backend.MiddleEnd"> <element_1 |