summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsefftinge2008-03-07 03:28:16 (EST)
committer sefftinge2008-03-07 03:28:16 (EST)
commit15cb5f175a3d1bb140aaf9a04ea83d5ee6b2f8ca (patch)
treebd2d45ae5895b972e6da521e0f9a375995551032
parent75b33641ef1148a1888f2de5870f7e3009b733c4 (diff)
downloadorg.eclipse.xpand-15cb5f175a3d1bb140aaf9a04ea83d5ee6b2f8ca.zip
org.eclipse.xpand-15cb5f175a3d1bb140aaf9a04ea83d5ee6b2f8ca.tar.gz
org.eclipse.xpand-15cb5f175a3d1bb140aaf9a04ea83d5ee6b2f8ca.tar.bz2
refactored runtime dependencies into separate project.
-rw-r--r--plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java14
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java36
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java17
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java198
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/Extension.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java26
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java29
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AdviceValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionStatementValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java22
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionStatementValidator.java25
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java25
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java22
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java22
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java25
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java26
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java154
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java122
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java166
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java65
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java29
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java26
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java25
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java24
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java29
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java64
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java70
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java50
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java35
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java38
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java48
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ComposedIdentifierValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java22
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/FileValidator.java26
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java19
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java22
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SimpleIdentifierValidator.java20
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java23
-rw-r--r--plugins/org.eclipse.xpand3/plugin.xml7
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/LanguageSpecificDeclarationContributorFactory.java6
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystem.java2
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java (renamed from plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java)4
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/CompositeTypeSystemImpl.java17
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java (renamed from plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinTypesDeclarationsContributor.java)4
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinFunctionsDeclarationsContributor.java80
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java107
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/ast/AstUtil.java (renamed from plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/java/Java2TypesystemConverter.java)16
-rw-r--r--plugins/org.eclipse.xpand3/src/static_typesystem.ecore3
-rw-r--r--plugins/org.eclipse.xpand3/src/xpand3.ecore7
-rw-r--r--tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF3
83 files changed, 341 insertions, 2178 deletions
diff --git a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
index a3c9e4d..715fbaa 100644
--- a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.tmf.common;resolution:=optional;visibility:=reexport,
org.eclipse.tmf.common.generator;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.xpand3;bundle-version="0.9.0";visibility:=reexport
+ org.eclipse.xpand3;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.tmf.common.runtime;bundle-version="1.0.0"
Eclipse-LazyStart: true
Export-Package: org.eclipse.xpand3.internal.parser.xpand3node,
org.eclipse.xpand3.internal.parser.xpand3node.impl,
diff --git a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java
index d4091d9..da5188d 100644
--- a/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java
+++ b/plugins/org.eclipse.xpand3.parser/src/org/eclipse/xpand3/parser/node2ast/Node2AstTransformer.java
@@ -4,10 +4,8 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.tmf.common.node.CompositeNode;
import org.eclipse.tmf.common.node.LeafNode;
import org.eclipse.tmf.common.node.Node;
-import org.eclipse.xpand3.ComposedIdentifier;
import org.eclipse.xpand3.DeclaredParameter;
import org.eclipse.xpand3.Identifier;
-import org.eclipse.xpand3.SimpleIdentifier;
import org.eclipse.xpand3.SyntaxElement;
import org.eclipse.xpand3.Xpand3Factory;
import org.eclipse.xpand3.declaration.DeclarationFactory;
@@ -67,7 +65,7 @@ public class Node2AstTransformer extends Xpand3nodeSwitch<SyntaxElement> {
}
public Identifier createIdentifier(LeafNode leaf) {
- SimpleIdentifier si = xpandFactory.createSimpleIdentifier();
+ Identifier si = xpandFactory.createIdentifier();
setPosition(si, leaf);
si.setValue(getTextFromLeafNode(leaf));
return si;
@@ -198,14 +196,12 @@ public class Node2AstTransformer extends Xpand3nodeSwitch<SyntaxElement> {
stn);
}
if (names.size() > 1) {
- ComposedIdentifier ci = xpandFactory.createComposedIdentifier();
- setPosition(ci, stn);
- for (Node name : names) {
- SimpleIdentifier si = (SimpleIdentifier) caseIdentifierNode((IdentifierNode) name);
- ci.getIdentifiers().add(si);
- }
+ Identifier ci = xpandFactory.createIdentifier();
+ ci.setValue(stn.text());
return ci;
}
return caseIdentifierNode((IdentifierNode) names.get(0));
}
+
+
}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java
index 079f269..69f6c8f 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Identifier.java,v 1.3 2008/03/06 15:37:19 jkohnlein Exp $
+ * $Id: Identifier.java,v 1.4 2008/03/07 08:28:21 sefftinge Exp $
*/
package org.eclipse.xpand3;
@@ -12,10 +12,42 @@ package org.eclipse.xpand3;
* A representation of the model object '<em><b>Identifier</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.Xpand3Package#getIdentifier()
- * @model abstract="true"
+ * @model
* @generated
*/
public interface Identifier extends SyntaxElement {
+
+ /**
+ * Returns the value of the '<em><b>Value</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Value</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Value</em>' attribute.
+ * @see #setValue(String)
+ * @see org.eclipse.xpand3.Xpand3Package#getIdentifier_Value()
+ * @model
+ * @generated
+ */
+ String getValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Value</em>' attribute.
+ * @see #getValue()
+ * @generated
+ */
+ void setValue(String value);
} // Identifier
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
index e98d080..b7c79a3 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3Factory.java,v 1.3 2008/03/06 15:37:18 jkohnlein Exp $
+ * $Id: Xpand3Factory.java,v 1.4 2008/03/07 08:28:21 sefftinge Exp $
*/
package org.eclipse.xpand3;
@@ -44,22 +44,13 @@ public interface Xpand3Factory extends EFactory {
ImportStatement createImportStatement();
/**
- * Returns a new object of class '<em>Simple Identifier</em>'.
+ * Returns a new object of class '<em>Identifier</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Simple Identifier</em>'.
+ * @return a new object of class '<em>Identifier</em>'.
* @generated
*/
- SimpleIdentifier createSimpleIdentifier();
-
- /**
- * Returns a new object of class '<em>Composed Identifier</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Composed Identifier</em>'.
- * @generated
- */
- ComposedIdentifier createComposedIdentifier();
+ Identifier createIdentifier();
/**
* Returns a new object of class '<em>Declared Parameter</em>'.
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java
index 90b5a33..80ab74d 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3Package.java,v 1.3 2008/03/06 15:37:18 jkohnlein Exp $
+ * $Id: Xpand3Package.java,v 1.4 2008/03/07 08:28:21 sefftinge Exp $
*/
package org.eclipse.xpand3;
@@ -307,141 +307,22 @@ public interface Xpand3Package extends EPackage {
int IDENTIFIER__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME;
/**
- * The number of structural features of the '<em>Identifier</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl <em>Simple Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.SimpleIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSimpleIdentifier()
- * @generated
- */
- int SIMPLE_IDENTIFIER = 4;
-
- /**
- * The feature id for the '<em><b>Line</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__LINE = IDENTIFIER__LINE;
-
- /**
- * The feature id for the '<em><b>Start</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__START = IDENTIFIER__START;
-
- /**
- * The feature id for the '<em><b>End</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__END = IDENTIFIER__END;
-
- /**
- * The feature id for the '<em><b>File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__FILE_NAME = IDENTIFIER__FILE_NAME;
-
- /**
* The feature id for the '<em><b>Value</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SIMPLE_IDENTIFIER__VALUE = IDENTIFIER_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Simple Identifier</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER_FEATURE_COUNT = IDENTIFIER_FEATURE_COUNT + 1;
+ int IDENTIFIER__VALUE = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl <em>Composed Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.ComposedIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getComposedIdentifier()
- * @generated
- */
- int COMPOSED_IDENTIFIER = 5;
-
- /**
- * The feature id for the '<em><b>Line</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__LINE = IDENTIFIER__LINE;
-
- /**
- * The feature id for the '<em><b>Start</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__START = IDENTIFIER__START;
-
- /**
- * The feature id for the '<em><b>End</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__END = IDENTIFIER__END;
-
- /**
- * The feature id for the '<em><b>File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__FILE_NAME = IDENTIFIER__FILE_NAME;
-
- /**
- * The feature id for the '<em><b>Identifiers</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__IDENTIFIERS = IDENTIFIER_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Composed Identifier</em>' class.
+ * The number of structural features of the '<em>Identifier</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int COMPOSED_IDENTIFIER_FEATURE_COUNT = IDENTIFIER_FEATURE_COUNT + 1;
+ int IDENTIFIER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 1;
/**
* The meta object id for the '{@link org.eclipse.xpand3.impl.DeclaredParameterImpl <em>Declared Parameter</em>}' class.
@@ -451,7 +332,7 @@ public interface Xpand3Package extends EPackage {
* @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getDeclaredParameter()
* @generated
*/
- int DECLARED_PARAMETER = 6;
+ int DECLARED_PARAMETER = 4;
/**
* The feature id for the '<em><b>Line</b></em>' attribute.
@@ -646,46 +527,15 @@ public interface Xpand3Package extends EPackage {
EClass getIdentifier();
/**
- * Returns the meta object for class '{@link org.eclipse.xpand3.SimpleIdentifier <em>Simple Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Simple Identifier</em>'.
- * @see org.eclipse.xpand3.SimpleIdentifier
- * @generated
- */
- EClass getSimpleIdentifier();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SimpleIdentifier#getValue <em>Value</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.xpand3.SimpleIdentifier#getValue()
- * @see #getSimpleIdentifier()
- * @generated
- */
- EAttribute getSimpleIdentifier_Value();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xpand3.ComposedIdentifier <em>Composed Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Composed Identifier</em>'.
- * @see org.eclipse.xpand3.ComposedIdentifier
+ * @see org.eclipse.xpand3.Identifier#getValue()
+ * @see #getIdentifier()
* @generated
*/
- EClass getComposedIdentifier();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.ComposedIdentifier#getIdentifiers <em>Identifiers</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Identifiers</em>'.
- * @see org.eclipse.xpand3.ComposedIdentifier#getIdentifiers()
- * @see #getComposedIdentifier()
- * @generated
- */
- EReference getComposedIdentifier_Identifiers();
+ EAttribute getIdentifier_Value();
/**
* Returns the meta object for class '{@link org.eclipse.xpand3.DeclaredParameter <em>Declared Parameter</em>}'.
@@ -846,40 +696,12 @@ public interface Xpand3Package extends EPackage {
EClass IDENTIFIER = eINSTANCE.getIdentifier();
/**
- * The meta object literal for the '{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl <em>Simple Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.SimpleIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSimpleIdentifier()
- * @generated
- */
- EClass SIMPLE_IDENTIFIER = eINSTANCE.getSimpleIdentifier();
-
- /**
* The meta object literal for the '<em><b>Value</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute SIMPLE_IDENTIFIER__VALUE = eINSTANCE.getSimpleIdentifier_Value();
-
- /**
- * The meta object literal for the '{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl <em>Composed Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.ComposedIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getComposedIdentifier()
- * @generated
- */
- EClass COMPOSED_IDENTIFIER = eINSTANCE.getComposedIdentifier();
-
- /**
- * The meta object literal for the '<em><b>Identifiers</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference COMPOSED_IDENTIFIER__IDENTIFIERS = eINSTANCE.getComposedIdentifier_Identifiers();
+ EAttribute IDENTIFIER__VALUE = eINSTANCE.getIdentifier_Value();
/**
* The meta object literal for the '{@link org.eclipse.xpand3.impl.DeclaredParameterImpl <em>Declared Parameter</em>}' class.
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java
index 2b9d08a..80935b9 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/DeclarationPackage.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclarationPackage.java,v 1.2 2008/03/06 15:35:15 jkohnlein Exp $
+ * $Id: DeclarationPackage.java,v 1.3 2008/03/07 08:28:25 sefftinge Exp $
*/
package org.eclipse.xpand3.declaration;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/Extension.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/Extension.java
index f02f40d..44a9c1b 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/Extension.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/Extension.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Extension.java,v 1.2 2008/03/06 15:35:15 jkohnlein Exp $
+ * $Id: Extension.java,v 1.3 2008/03/07 08:28:25 sefftinge Exp $
*/
package org.eclipse.xpand3.declaration;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java
index 1dc1b81..6a0346c 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/DeclarationPackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclarationPackageImpl.java,v 1.2 2008/03/06 15:35:15 jkohnlein Exp $
+ * $Id: DeclarationPackageImpl.java,v 1.3 2008/03/07 08:28:24 sefftinge Exp $
*/
package org.eclipse.xpand3.declaration.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java
index 9b9f38e..be543ab 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/impl/ExtensionImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: ExtensionImpl.java,v 1.2 2008/03/06 15:35:15 jkohnlein Exp $
+ * $Id: ExtensionImpl.java,v 1.3 2008/03/07 08:28:24 sefftinge Exp $
*/
package org.eclipse.xpand3.declaration.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java
deleted file mode 100644
index f4abd8d..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractAspectValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.DeclaredParameter;
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.AbstractAspect}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AbstractAspectValidator {
- boolean validate();
-
- boolean validatePointcut(Identifier value);
- boolean validateParams(EList<DeclaredParameter> value);
- boolean validateWildparams(boolean value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java
deleted file mode 100644
index 18e710c..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractDeclarationValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.DeclaredParameter;
-import org.eclipse.xpand3.File;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.AbstractDeclaration}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AbstractDeclarationValidator {
- boolean validate();
-
- boolean validateOwner(File value);
- boolean validateParams(EList<DeclaredParameter> value);
- boolean validateIsPrivate(boolean value);
- boolean validateGuard(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java
deleted file mode 100644
index 67ae945..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractNamedDeclarationValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.AbstractNamedDeclaration}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AbstractNamedDeclarationValidator {
- boolean validate();
-
- boolean validateName(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AdviceValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AdviceValidator.java
deleted file mode 100644
index 08003ff..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AdviceValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AdviceValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.Advice}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AdviceValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java
deleted file mode 100644
index ac3f255..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CheckValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.Check}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface CheckValidator {
- boolean validate();
-
- boolean validateErrorSeverity(boolean value);
- boolean validateMsg(AbstractExpression value);
- boolean validateConstraint(AbstractExpression value);
- boolean validateFeature(String value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionStatementValidator.java
deleted file mode 100644
index c02d374..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionStatementValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CreateExtensionStatementValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.xpand3.DeclaredParameter;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.CreateExtensionStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface CreateExtensionStatementValidator {
- boolean validate();
-
- boolean validateToBeCreated(DeclaredParameter value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java
deleted file mode 100644
index c9324af..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefinitionAspectValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.statement.AbstractStatement;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.DefinitionAspect}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface DefinitionAspectValidator {
- boolean validate();
-
- boolean validateBody(EList<AbstractStatement> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java
deleted file mode 100644
index 07a606a..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DefinitionValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.statement.AbstractStatement;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.Definition}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface DefinitionValidator {
- boolean validate();
-
- boolean validateBody(EList<AbstractStatement> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java
deleted file mode 100644
index 7564b50..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtensionAspectValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.ExtensionAspect}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ExtensionAspectValidator {
- boolean validate();
-
- boolean validateExpression(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java
deleted file mode 100644
index 5fc397c..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExtensionValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.Extension}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ExtensionValidator {
- boolean validate();
-
- boolean validateCached(boolean value);
- boolean validateBody(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionStatementValidator.java
deleted file mode 100644
index 37231de..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionStatementValidator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: JavaExtensionStatementValidator.java,v 1.1 2008/03/06 15:35:13 jkohnlein Exp $
- */
-package org.eclipse.xpand3.declaration.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.declaration.JavaExtensionStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface JavaExtensionStatementValidator {
- boolean validate();
-
- boolean validateJavaType(Identifier value);
- boolean validateJavaMethod(Identifier value);
- boolean validateJavaParamTypes(EList<Identifier> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java
deleted file mode 100644
index 88df8ac..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractExpressionValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.AbstractExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AbstractExpressionValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java
deleted file mode 100644
index 0f23892..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BooleanLiteralValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.BooleanLiteral}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface BooleanLiteralValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java
deleted file mode 100644
index d18a4b4..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: BooleanOperationValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.BooleanOperation}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface BooleanOperationValidator {
- boolean validate();
-
- boolean validateLeft(AbstractExpression value);
- boolean validateRight(AbstractExpression value);
- boolean validateOperator(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java
deleted file mode 100644
index 5c98fcb..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CaseValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.Case}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface CaseValidator {
- boolean validate();
-
- boolean validateCondition(AbstractExpression value);
- boolean validateThenPart(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java
deleted file mode 100644
index 17c6333..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CastValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.Cast}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface CastValidator {
- boolean validate();
-
- boolean validateType(Identifier value);
- boolean validateTarget(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java
deleted file mode 100644
index c92cb1a..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ChainExpressionValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.ChainExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ChainExpressionValidator {
- boolean validate();
-
- boolean validateFirst(AbstractExpression value);
- boolean validateNext(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java
deleted file mode 100644
index e977290..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CollectionExpressionValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.CollectionExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface CollectionExpressionValidator {
- boolean validate();
-
- boolean validateClosure(AbstractExpression value);
- boolean validateEleName(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java
deleted file mode 100644
index ea8c5bd..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ConstructorCallExpressionValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.ConstructorCallExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ConstructorCallExpressionValidator {
- boolean validate();
-
- boolean validateType(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java
deleted file mode 100644
index d879fde..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FeatureCallValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.FeatureCall}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface FeatureCallValidator {
- boolean validate();
-
- boolean validateTarget(AbstractExpression value);
- boolean validateName(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java
deleted file mode 100644
index ff8e906..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GlobalVarExpressionValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.GlobalVarExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface GlobalVarExpressionValidator {
- boolean validate();
-
- boolean validateGlobalVarName(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java
deleted file mode 100644
index 500efa0..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IfExpressionValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.IfExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface IfExpressionValidator {
- boolean validate();
-
- boolean validateCondition(AbstractExpression value);
- boolean validateThenPart(AbstractExpression value);
- boolean validateElsePart(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java
deleted file mode 100644
index 0a4debf..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IntegerLiteralValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.IntegerLiteral}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface IntegerLiteralValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java
deleted file mode 100644
index aaaeaf9..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LetExpressionValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.LetExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface LetExpressionValidator {
- boolean validate();
-
- boolean validateVarExpression(AbstractExpression value);
- boolean validateTargetExpression(AbstractExpression value);
- boolean validateVarName(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java
deleted file mode 100644
index 558f203..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ListLiteralValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.ListLiteral}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ListLiteralValidator {
- boolean validate();
-
- boolean validateElements(EList<AbstractExpression> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java
deleted file mode 100644
index de6bbb9..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LiteralValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.Literal}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface LiteralValidator {
- boolean validate();
-
- boolean validateLiteralValue(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java
deleted file mode 100644
index dc5411d..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NullLiteralValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.NullLiteral}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface NullLiteralValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java
deleted file mode 100644
index 75ad912..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: OperationCallValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.OperationCall}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface OperationCallValidator {
- boolean validate();
-
- boolean validateParams(EList<AbstractExpression> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java
deleted file mode 100644
index e25b566..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RealLiteralValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.RealLiteral}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface RealLiteralValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java
deleted file mode 100644
index fa62fa6..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: StringLiteralValidator.java,v 1.1 2008/03/06 15:35:11 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.StringLiteral}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface StringLiteralValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java
deleted file mode 100644
index c031f4a..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SwitchExpressionValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-import org.eclipse.xpand3.expression.Case;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.SwitchExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface SwitchExpressionValidator {
- boolean validate();
-
- boolean validateSwitchExpr(AbstractExpression value);
- boolean validateDefaultExpr(AbstractExpression value);
- boolean validateCases(EList<Case> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java
deleted file mode 100644
index 04674f7..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TypeSelectExpressionValidator.java,v 1.1 2008/03/06 15:35:12 jkohnlein Exp $
- */
-package org.eclipse.xpand3.expression.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.expression.TypeSelectExpression}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface TypeSelectExpressionValidator {
- boolean validate();
-
- boolean validateTypeLiteral(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java
deleted file mode 100644
index 4f0db2b..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ComposedIdentifierImpl.java,v 1.3 2008/03/06 15:37:19 jkohnlein Exp $
- */
-package org.eclipse.xpand3.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xpand3.ComposedIdentifier;
-import org.eclipse.xpand3.Identifier;
-import org.eclipse.xpand3.Xpand3Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Composed Identifier</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl#getIdentifiers <em>Identifiers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComposedIdentifierImpl extends IdentifierImpl implements ComposedIdentifier {
- /**
- * The cached value of the '{@link #getIdentifiers() <em>Identifiers</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIdentifiers()
- * @generated
- * @ordered
- */
- protected EList<Identifier> identifiers;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedIdentifierImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return Xpand3Package.Literals.COMPOSED_IDENTIFIER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<Identifier> getIdentifiers() {
- if (identifiers == null) {
- identifiers = new EObjectContainmentEList<Identifier>(Identifier.class, this, Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS);
- }
- return identifiers;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- return ((InternalEList<?>)getIdentifiers()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- return getIdentifiers();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- getIdentifiers().clear();
- getIdentifiers().addAll((Collection<? extends Identifier>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- getIdentifiers().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- return identifiers != null && !identifiers.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //ComposedIdentifierImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
index df431e5..9ae6043 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: IdentifierImpl.java,v 1.3 2008/03/06 15:37:20 jkohnlein Exp $
+ * $Id: IdentifierImpl.java,v 1.4 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.impl;
@@ -20,11 +20,34 @@ import org.eclipse.xpand3.Xpand3Package;
* An implementation of the model object '<em><b>Identifier</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.impl.IdentifierImpl#getValue <em>Value</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
-public abstract class IdentifierImpl extends SyntaxElementImpl implements Identifier {
+public class IdentifierImpl extends SyntaxElementImpl implements Identifier {
+ /**
+ * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected static final String VALUE_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected String value = VALUE_EDEFAULT;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -44,4 +67,99 @@ public abstract class IdentifierImpl extends SyntaxElementImpl implements Identi
return Xpand3Package.Literals.IDENTIFIER;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setValue(String newValue) {
+ String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IDENTIFIER__VALUE, oldValue, value));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__VALUE:
+ return getValue();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__VALUE:
+ setValue((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (value: ");
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
+
} //IdentifierImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java
deleted file mode 100644
index d34030f..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SimpleIdentifierImpl.java,v 1.3 2008/03/06 15:37:21 jkohnlein Exp $
- */
-package org.eclipse.xpand3.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xpand3.SimpleIdentifier;
-import org.eclipse.xpand3.Xpand3Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Simple Identifier</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SimpleIdentifierImpl extends IdentifierImpl implements SimpleIdentifier {
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SimpleIdentifierImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return Xpand3Package.Literals.SIMPLE_IDENTIFIER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(String newValue) {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.SIMPLE_IDENTIFIER__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- setValue((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (value: ");
- result.append(value);
- result.append(')');
- return result.toString();
- }
-
-} //SimpleIdentifierImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
index d51e314..31485fa 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3FactoryImpl.java,v 1.3 2008/03/06 15:37:20 jkohnlein Exp $
+ * $Id: Xpand3FactoryImpl.java,v 1.4 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.impl;
@@ -62,8 +62,7 @@ public class Xpand3FactoryImpl extends EFactoryImpl implements Xpand3Factory {
switch (eClass.getClassifierID()) {
case Xpand3Package.FILE: return createFile();
case Xpand3Package.IMPORT_STATEMENT: return createImportStatement();
- case Xpand3Package.SIMPLE_IDENTIFIER: return createSimpleIdentifier();
- case Xpand3Package.COMPOSED_IDENTIFIER: return createComposedIdentifier();
+ case Xpand3Package.IDENTIFIER: return createIdentifier();
case Xpand3Package.DECLARED_PARAMETER: return createDeclaredParameter();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
@@ -95,19 +94,9 @@ public class Xpand3FactoryImpl extends EFactoryImpl implements Xpand3Factory {
* <!-- end-user-doc -->
* @generated
*/
- public SimpleIdentifier createSimpleIdentifier() {
- SimpleIdentifierImpl simpleIdentifier = new SimpleIdentifierImpl();
- return simpleIdentifier;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposedIdentifier createComposedIdentifier() {
- ComposedIdentifierImpl composedIdentifier = new ComposedIdentifierImpl();
- return composedIdentifier;
+ public Identifier createIdentifier() {
+ IdentifierImpl identifier = new IdentifierImpl();
+ return identifier;
}
/**
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
index 9f96042..6b3e10b 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3PackageImpl.java,v 1.3 2008/03/06 15:37:20 jkohnlein Exp $
+ * $Id: Xpand3PackageImpl.java,v 1.4 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.impl;
@@ -75,20 +75,6 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
* <!-- end-user-doc -->
* @generated
*/
- private EClass simpleIdentifierEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass composedIdentifierEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EClass declaredParameterEClass = null;
/**
@@ -283,35 +269,8 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
* <!-- end-user-doc -->
* @generated
*/
- public EClass getSimpleIdentifier() {
- return simpleIdentifierEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSimpleIdentifier_Value() {
- return (EAttribute)simpleIdentifierEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getComposedIdentifier() {
- return composedIdentifierEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getComposedIdentifier_Identifiers() {
- return (EReference)composedIdentifierEClass.getEStructuralFeatures().get(0);
+ public EAttribute getIdentifier_Value() {
+ return (EAttribute)identifierEClass.getEStructuralFeatures().get(0);
}
/**
@@ -384,12 +343,7 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
createEAttribute(importStatementEClass, IMPORT_STATEMENT__EXPORTED);
identifierEClass = createEClass(IDENTIFIER);
-
- simpleIdentifierEClass = createEClass(SIMPLE_IDENTIFIER);
- createEAttribute(simpleIdentifierEClass, SIMPLE_IDENTIFIER__VALUE);
-
- composedIdentifierEClass = createEClass(COMPOSED_IDENTIFIER);
- createEReference(composedIdentifierEClass, COMPOSED_IDENTIFIER__IDENTIFIERS);
+ createEAttribute(identifierEClass, IDENTIFIER__VALUE);
declaredParameterEClass = createEClass(DECLARED_PARAMETER);
createEReference(declaredParameterEClass, DECLARED_PARAMETER__NAME);
@@ -437,8 +391,6 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
fileEClass.getESuperTypes().add(this.getSyntaxElement());
importStatementEClass.getESuperTypes().add(this.getSyntaxElement());
identifierEClass.getESuperTypes().add(this.getSyntaxElement());
- simpleIdentifierEClass.getESuperTypes().add(this.getIdentifier());
- composedIdentifierEClass.getESuperTypes().add(this.getIdentifier());
declaredParameterEClass.getESuperTypes().add(this.getSyntaxElement());
// Initialize classes and features; add operations and parameters
@@ -456,13 +408,8 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
initEReference(getImportStatement_ImportedId(), this.getIdentifier(), null, "importedId", null, 0, 1, ImportStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getImportStatement_Exported(), ecorePackage.getEBoolean(), "exported", null, 0, 1, ImportStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(identifierEClass, Identifier.class, "Identifier", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(simpleIdentifierEClass, SimpleIdentifier.class, "SimpleIdentifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSimpleIdentifier_Value(), ecorePackage.getEString(), "value", null, 0, 1, SimpleIdentifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(composedIdentifierEClass, ComposedIdentifier.class, "ComposedIdentifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getComposedIdentifier_Identifiers(), this.getIdentifier(), null, "identifiers", null, 1, -1, ComposedIdentifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(identifierEClass, Identifier.class, "Identifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getIdentifier_Value(), ecorePackage.getEString(), "value", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(declaredParameterEClass, DeclaredParameter.class, "DeclaredParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeclaredParameter_Name(), this.getIdentifier(), null, "name", null, 0, 1, DeclaredParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java
deleted file mode 100644
index c9b67b6..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.AbstractStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AbstractStatementValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java
deleted file mode 100644
index 630162d..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractStatementWithBodyValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.statement.AbstractStatement;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.AbstractStatementWithBody}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface AbstractStatementWithBodyValidator {
- boolean validate();
-
- boolean validateBody(EList<AbstractStatement> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java
deleted file mode 100644
index 3acf0fc..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ErrorStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.ErrorStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ErrorStatementValidator {
- boolean validate();
-
- boolean validateMessage(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java
deleted file mode 100644
index eebf9d6..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExpandStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.ExpandStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ExpandStatementValidator {
- boolean validate();
-
- boolean validateForeach(boolean value);
- boolean validateParameters(EList<AbstractExpression> value);
- boolean validateSeparator(AbstractExpression value);
- boolean validateTarget(AbstractExpression value);
- boolean validateDefinition(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java
deleted file mode 100644
index 97a83f0..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ExpressionStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.ExpressionStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ExpressionStatementValidator {
- boolean validate();
-
- boolean validateExpression(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java
deleted file mode 100644
index 42da5fb..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FileStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.FileStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface FileStatementValidator {
- boolean validate();
-
- boolean validateFileNameExpression(AbstractExpression value);
- boolean validateOutletNameIdentifier(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java
deleted file mode 100644
index 9a7782d..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ForEachStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.ForEachStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ForEachStatementValidator {
- boolean validate();
-
- boolean validateTarget(AbstractExpression value);
- boolean validateSeperator(AbstractExpression value);
- boolean validateVariable(Identifier value);
- boolean validateIteratorName(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java
deleted file mode 100644
index 712a734..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IfStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-import org.eclipse.xpand3.statement.IfStatement;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.IfStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface IfStatementValidator {
- boolean validate();
-
- boolean validateCondition(AbstractExpression value);
- boolean validateUpperIf(IfStatement value);
- boolean validateElseIf(IfStatement value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java
deleted file mode 100644
index 6cef736..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: LetStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.LetStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface LetStatementValidator {
- boolean validate();
-
- boolean validateVarName(Identifier value);
- boolean validateVarValue(AbstractExpression value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java
deleted file mode 100644
index 1a31c57..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ProtectStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-import org.eclipse.xpand3.expression.AbstractExpression;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.ProtectStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ProtectStatementValidator {
- boolean validate();
-
- boolean validateCommentStart(AbstractExpression value);
- boolean validateCommentEnd(AbstractExpression value);
- boolean validateId(AbstractExpression value);
- boolean validateDisable(boolean value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java
deleted file mode 100644
index 5a10932..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TextStatementValidator.java,v 1.1 2008/03/06 15:35:10 jkohnlein Exp $
- */
-package org.eclipse.xpand3.statement.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.statement.TextStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface TextStatementValidator {
- boolean validate();
-
- boolean validateValue(String value);
- boolean validateDeleteLine(boolean value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java
index 2787c35..df2c5ac 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredType.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
+ * $Id: DeclaredType.java,v 1.3 2008/03/07 08:28:21 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -21,7 +21,6 @@ import org.eclipse.xtend.backend.common.BackendType;
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getStaticProperties <em>Static Properties</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getProperties <em>Properties</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getDeclaredTypeParameters <em>Declared Type Parameters</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType <em>Backend Type</em>}</li>
* </ul>
* </p>
*
@@ -78,30 +77,4 @@ public interface DeclaredType extends AbstractNamedElement {
*/
EList<DeclaredTypeParameter> getDeclaredTypeParameters();
- /**
- * Returns the value of the '<em><b>Backend Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Backend Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Backend Type</em>' attribute.
- * @see #setBackendType(BackendType)
- * @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredType_BackendType()
- * @model dataType="org.eclipse.xpand3.staticTypesystem.BackendType" required="true"
- * @generated
- */
- BackendType getBackendType();
-
- /**
- * Sets the value of the '{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType <em>Backend Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Backend Type</em>' attribute.
- * @see #getBackendType()
- * @generated
- */
- void setBackendType(BackendType value);
-
} // DeclaredType
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java
index 095f0a8..50c097b 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemPackage.java,v 1.4 2008/03/04 14:28:06 sefftinge Exp $
+ * $Id: StaticTypesystemPackage.java,v 1.5 2008/03/07 08:28:21 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -312,22 +312,13 @@ public interface StaticTypesystemPackage extends EPackage {
int DECLARED_TYPE__DECLARED_TYPE_PARAMETERS = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Backend Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_TYPE__BACKEND_TYPE = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 3;
-
- /**
* The number of structural features of the '<em>Declared Type</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DECLARED_TYPE_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 4;
+ int DECLARED_TYPE_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 3;
/**
* The meta object id for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredFunctionImpl <em>Declared Function</em>}' class.
@@ -533,17 +524,6 @@ public interface StaticTypesystemPackage extends EPackage {
int DECLARED_PARAMETER_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 1;
/**
- * The meta object id for the '<em>Backend Type</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xtend.backend.common.BackendType
- * @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getBackendType()
- * @generated
- */
- int BACKEND_TYPE = 13;
-
-
- /**
* Returns the meta object for class '{@link org.eclipse.xpand3.staticTypesystem.AbstractNamedElement <em>Abstract Named Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -745,17 +725,6 @@ public interface StaticTypesystemPackage extends EPackage {
EReference getDeclaredType_DeclaredTypeParameters();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType <em>Backend Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Backend Type</em>'.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType()
- * @see #getDeclaredType()
- * @generated
- */
- EAttribute getDeclaredType_BackendType();
-
- /**
* Returns the meta object for class '{@link org.eclipse.xpand3.staticTypesystem.DeclaredFunction <em>Declared Function</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -883,17 +852,6 @@ public interface StaticTypesystemPackage extends EPackage {
EReference getDeclaredParameter_Type();
/**
- * Returns the meta object for data type '{@link org.eclipse.xtend.backend.common.BackendType <em>Backend Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Backend Type</em>'.
- * @see org.eclipse.xtend.backend.common.BackendType
- * @model instanceClass="org.eclipse.xtend.backend.common.BackendType"
- * @generated
- */
- EDataType getBackendType();
-
- /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1084,14 +1042,6 @@ public interface StaticTypesystemPackage extends EPackage {
EReference DECLARED_TYPE__DECLARED_TYPE_PARAMETERS = eINSTANCE.getDeclaredType_DeclaredTypeParameters();
/**
- * The meta object literal for the '<em><b>Backend Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute DECLARED_TYPE__BACKEND_TYPE = eINSTANCE.getDeclaredType_BackendType();
-
- /**
* The meta object literal for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredFunctionImpl <em>Declared Function</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1197,16 +1147,6 @@ public interface StaticTypesystemPackage extends EPackage {
*/
EReference DECLARED_PARAMETER__TYPE = eINSTANCE.getDeclaredParameter_Type();
- /**
- * The meta object literal for the '<em>Backend Type</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xtend.backend.common.BackendType
- * @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getBackendType()
- * @generated
- */
- EDataType BACKEND_TYPE = eINSTANCE.getBackendType();
-
}
} //StaticTypesystemPackage
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java
index 70315a3..dbb3289 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredTypeImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
+ * $Id: DeclaredTypeImpl.java,v 1.3 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -39,7 +39,6 @@ import org.eclipse.xtend.backend.common.BackendType;
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getStaticProperties <em>Static Properties</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getProperties <em>Properties</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getDeclaredTypeParameters <em>Declared Type Parameters</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getBackendType <em>Backend Type</em>}</li>
* </ul>
* </p>
*
@@ -77,26 +76,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
protected EList<DeclaredTypeParameter> declaredTypeParameters;
/**
- * The default value of the '{@link #getBackendType() <em>Backend Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBackendType()
- * @generated
- * @ordered
- */
- protected static final BackendType BACKEND_TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getBackendType() <em>Backend Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBackendType()
- * @generated
- * @ordered
- */
- protected BackendType backendType = BACKEND_TYPE_EDEFAULT;
-
- /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -156,27 +135,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
* <!-- end-user-doc -->
* @generated
*/
- public BackendType getBackendType() {
- return backendType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBackendType(BackendType newBackendType) {
- BackendType oldBackendType = backendType;
- backendType = newBackendType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE, oldBackendType, backendType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
@@ -204,8 +162,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
return getProperties();
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
return getDeclaredTypeParameters();
- case StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE:
- return getBackendType();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -231,9 +187,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
getDeclaredTypeParameters().clear();
getDeclaredTypeParameters().addAll((Collection<? extends DeclaredTypeParameter>)newValue);
return;
- case StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE:
- setBackendType((BackendType)newValue);
- return;
}
super.eSet(featureID, newValue);
}
@@ -255,9 +208,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
getDeclaredTypeParameters().clear();
return;
- case StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE:
- setBackendType(BACKEND_TYPE_EDEFAULT);
- return;
}
super.eUnset(featureID);
}
@@ -276,26 +226,8 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
return properties != null && !properties.isEmpty();
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
return declaredTypeParameters != null && !declaredTypeParameters.isEmpty();
- case StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE:
- return BACKEND_TYPE_EDEFAULT == null ? backendType != null : !BACKEND_TYPE_EDEFAULT.equals(backendType);
}
return super.eIsSet(featureID);
}
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (backendType: ");
- result.append(backendType);
- result.append(')');
- return result.toString();
- }
-
} //DeclaredTypeImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java
index 311a875..2e3d196 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemFactoryImpl.java,v 1.4 2008/03/04 14:28:06 sefftinge Exp $
+ * $Id: StaticTypesystemFactoryImpl.java,v 1.5 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -84,36 +84,6 @@ public class StaticTypesystemFactoryImpl extends EFactoryImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- @Override
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case StaticTypesystemPackage.BACKEND_TYPE:
- return createBackendTypeFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case StaticTypesystemPackage.BACKEND_TYPE:
- return convertBackendTypeToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public Type createType() {
TypeImpl type = new TypeImpl();
return type;
@@ -224,24 +194,6 @@ public class StaticTypesystemFactoryImpl extends EFactoryImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- public BackendType createBackendTypeFromString(EDataType eDataType, String initialValue) {
- return (BackendType)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertBackendTypeToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public StaticTypesystemPackage getStaticTypesystemPackage() {
return (StaticTypesystemPackage)getEPackage();
}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java
index b4dc75e..f48abf5 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemPackageImpl.java,v 1.4 2008/03/04 14:28:06 sefftinge Exp $
+ * $Id: StaticTypesystemPackageImpl.java,v 1.5 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -131,13 +131,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
private EClass declaredParameterEClass = null;
/**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType backendTypeEDataType = null;
-
- /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -381,15 +374,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeclaredType_BackendType() {
- return (EAttribute)declaredTypeEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public EClass getDeclaredFunction() {
return declaredFunctionEClass;
}
@@ -498,15 +482,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- public EDataType getBackendType() {
- return backendTypeEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public StaticTypesystemFactory getStaticTypesystemFactory() {
return (StaticTypesystemFactory)getEFactoryInstance();
}
@@ -556,7 +531,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
createEReference(declaredTypeEClass, DECLARED_TYPE__STATIC_PROPERTIES);
createEReference(declaredTypeEClass, DECLARED_TYPE__PROPERTIES);
createEReference(declaredTypeEClass, DECLARED_TYPE__DECLARED_TYPE_PARAMETERS);
- createEAttribute(declaredTypeEClass, DECLARED_TYPE__BACKEND_TYPE);
declaredFunctionEClass = createEClass(DECLARED_FUNCTION);
createEReference(declaredFunctionEClass, DECLARED_FUNCTION__DECLARED_PARAMETERS);
@@ -574,9 +548,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
declaredParameterEClass = createEClass(DECLARED_PARAMETER);
createEReference(declaredParameterEClass, DECLARED_PARAMETER__TYPE);
-
- // Create data types
- backendTypeEDataType = createEDataType(BACKEND_TYPE);
}
/**
@@ -646,7 +617,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
initEReference(getDeclaredType_StaticProperties(), this.getDeclaredStaticProperty(), null, "staticProperties", null, 0, -1, DeclaredType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getDeclaredType_Properties(), this.getDeclaredProperty(), null, "properties", null, 0, -1, DeclaredType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getDeclaredType_DeclaredTypeParameters(), this.getDeclaredTypeParameter(), null, "declaredTypeParameters", null, 0, -1, DeclaredType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getDeclaredType_BackendType(), this.getBackendType(), "backendType", null, 1, 1, DeclaredType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(declaredFunctionEClass, DeclaredFunction.class, "DeclaredFunction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeclaredFunction_DeclaredParameters(), this.getDeclaredParameter(), null, "declaredParameters", null, 0, -1, DeclaredFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -665,9 +635,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
initEClass(declaredParameterEClass, DeclaredParameter.class, "DeclaredParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeclaredParameter_Type(), this.getAbstractTypeReference(), null, "type", null, 1, 1, DeclaredParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- // Initialize data types
- initEDataType(backendTypeEDataType, BackendType.class, "BackendType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
// Create resource
createResource(eNS_URI);
}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
index b9f0371..c487fb5 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3AdapterFactory.java,v 1.3 2008/03/06 15:37:17 jkohnlein Exp $
+ * $Id: Xpand3AdapterFactory.java,v 1.4 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.util;
@@ -88,14 +88,6 @@ public class Xpand3AdapterFactory extends AdapterFactoryImpl {
return createIdentifierAdapter();
}
@Override
- public Adapter caseSimpleIdentifier(SimpleIdentifier object) {
- return createSimpleIdentifierAdapter();
- }
- @Override
- public Adapter caseComposedIdentifier(ComposedIdentifier object) {
- return createComposedIdentifierAdapter();
- }
- @Override
public Adapter caseDeclaredParameter(DeclaredParameter object) {
return createDeclaredParameterAdapter();
}
@@ -176,34 +168,6 @@ public class Xpand3AdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.SimpleIdentifier <em>Simple Identifier</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.xpand3.SimpleIdentifier
- * @generated
- */
- public Adapter createSimpleIdentifierAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.ComposedIdentifier <em>Composed Identifier</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.xpand3.ComposedIdentifier
- * @generated
- */
- public Adapter createComposedIdentifierAdapter() {
- return null;
- }
-
- /**
* Creates a new adapter for an object of class '{@link org.eclipse.xpand3.DeclaredParameter <em>Declared Parameter</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
index 464fad9..5e17770 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3Switch.java,v 1.3 2008/03/06 15:37:18 jkohnlein Exp $
+ * $Id: Xpand3Switch.java,v 1.4 2008/03/07 08:28:22 sefftinge Exp $
*/
package org.eclipse.xpand3.util;
@@ -114,22 +114,6 @@ public class Xpand3Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case Xpand3Package.SIMPLE_IDENTIFIER: {
- SimpleIdentifier simpleIdentifier = (SimpleIdentifier)theEObject;
- T result = caseSimpleIdentifier(simpleIdentifier);
- if (result == null) result = caseIdentifier(simpleIdentifier);
- if (result == null) result = caseSyntaxElement(simpleIdentifier);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case Xpand3Package.COMPOSED_IDENTIFIER: {
- ComposedIdentifier composedIdentifier = (ComposedIdentifier)theEObject;
- T result = caseComposedIdentifier(composedIdentifier);
- if (result == null) result = caseIdentifier(composedIdentifier);
- if (result == null) result = caseSyntaxElement(composedIdentifier);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
case Xpand3Package.DECLARED_PARAMETER: {
DeclaredParameter declaredParameter = (DeclaredParameter)theEObject;
T result = caseDeclaredParameter(declaredParameter);
@@ -202,36 +186,6 @@ public class Xpand3Switch<T> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Simple Identifier</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Simple Identifier</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseSimpleIdentifier(SimpleIdentifier object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Composed Identifier</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Composed Identifier</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseComposedIdentifier(ComposedIdentifier object) {
- return null;
- }
-
- /**
* Returns the result of interpreting the object as an instance of '<em>Declared Parameter</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ComposedIdentifierValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ComposedIdentifierValidator.java
deleted file mode 100644
index d3b1cff..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ComposedIdentifierValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ComposedIdentifierValidator.java,v 1.1 2008/03/06 15:35:15 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.ComposedIdentifier}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ComposedIdentifierValidator {
- boolean validate();
-
- boolean validateIdentifiers(EList<Identifier> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java
deleted file mode 100644
index 053d825..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeclaredParameterValidator.java,v 1.1 2008/03/06 15:35:14 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.DeclaredParameter}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface DeclaredParameterValidator {
- boolean validate();
-
- boolean validateName(Identifier value);
- boolean validateType(Identifier value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/FileValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/FileValidator.java
deleted file mode 100644
index 895559f..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/FileValidator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FileValidator.java,v 1.1 2008/03/06 15:35:15 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.xpand3.ImportStatement;
-
-import org.eclipse.xpand3.declaration.AbstractDeclaration;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.File}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface FileValidator {
- boolean validate();
-
- boolean validateImports(EList<ImportStatement> value);
- boolean validateDeclarations(EList<AbstractDeclaration> value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java
deleted file mode 100644
index 54c27df..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IdentifierValidator.java,v 1.1 2008/03/06 15:35:15 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.Identifier}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface IdentifierValidator {
- boolean validate();
-
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java
deleted file mode 100644
index 2b32b61..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ImportStatementValidator.java,v 1.1 2008/03/06 15:35:15 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-import org.eclipse.xpand3.Identifier;
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.ImportStatement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface ImportStatementValidator {
- boolean validate();
-
- boolean validateImportedId(Identifier value);
- boolean validateExported(boolean value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SimpleIdentifierValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SimpleIdentifierValidator.java
deleted file mode 100644
index 4b2964b..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SimpleIdentifierValidator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SimpleIdentifierValidator.java,v 1.1 2008/03/06 15:35:15 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.SimpleIdentifier}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface SimpleIdentifierValidator {
- boolean validate();
-
- boolean validateValue(String value);
-}
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java
deleted file mode 100644
index 6948b00..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SyntaxElementValidator.java,v 1.1 2008/03/06 15:35:15 jkohnlein Exp $
- */
-package org.eclipse.xpand3.validation;
-
-
-/**
- * A sample validator interface for {@link org.eclipse.xpand3.SyntaxElement}.
- * This doesn't really do anything, and it's not a real EMF artifact.
- * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
- * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
- */
-public interface SyntaxElementValidator {
- boolean validate();
-
- boolean validateLine(int value);
- boolean validateStart(int value);
- boolean validateEnd(int value);
- boolean validateFileName(String value);
-}
diff --git a/plugins/org.eclipse.xpand3/plugin.xml b/plugins/org.eclipse.xpand3/plugin.xml
index c207f29..d308fd7 100644
--- a/plugins/org.eclipse.xpand3/plugin.xml
+++ b/plugins/org.eclipse.xpand3/plugin.xml
@@ -1,13 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<!--
- <copyright>
- </copyright>
-
- $Id: plugin.xml,v 1.1 2008/02/27 13:21:09 sefftinge Exp $
--->
-
<plugin>
<extension point="org.eclipse.emf.ecore.generated_package">
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/LanguageSpecificDeclarationContributorFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/LanguageSpecificDeclarationContributorFactory.java
index b40074d..0fe2a31 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/LanguageSpecificDeclarationContributorFactory.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/LanguageSpecificDeclarationContributorFactory.java
@@ -28,6 +28,10 @@ public interface LanguageSpecificDeclarationContributorFactory {
*/
boolean canHandle (String resourceName);
-
+ /**
+ *
+ * @param resourceName
+ * @return
+ */
DeclarationsContributor createDeclarationContributor(String resourceName);
}
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystem.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystem.java
index d035690..4eadb29 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystem.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystem.java
@@ -21,6 +21,7 @@ import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
import org.eclipse.xpand3.staticTypesystem.FunctionType;
import org.eclipse.xpand3.staticTypesystem.Type;
import org.eclipse.xpand3.staticTypesystem.WildcardType;
+import org.eclipse.xtend.backend.common.BackendTypesystem;
/**
* @author Sven Efftinge
@@ -55,4 +56,5 @@ public interface TypeSystem {
FunctionType functionForNameAndParameterTypes(String name, AbstractTypeReference...parameterTypes);
FunctionType functionForName(String name, List<AbstractTypeReference> parameterTypes, AbstractTypeReference...typeArguments);
+
}
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java
index f0c7f78..34ba683 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java
@@ -24,7 +24,7 @@ import java.util.Set;
* @author Sven Efftinge
*
*/
-public class DeclarationsContributorFactory {
+public class TypeSystemFactory {
private final static Set<LanguageSpecificDeclarationContributorFactory> factories = new HashSet<LanguageSpecificDeclarationContributorFactory>();
@@ -40,4 +40,6 @@ public class DeclarationsContributorFactory {
}
return null;
}
+
+
}
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/CompositeTypeSystemImpl.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/CompositeTypeSystemImpl.java
index 0e1b149..e30d2f6 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/CompositeTypeSystemImpl.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/CompositeTypeSystemImpl.java
@@ -15,6 +15,8 @@
*/
package org.eclipse.xand3.analyzation.typesystem;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.eclipse.xand3.analyzation.TypeSystem;
@@ -43,12 +45,16 @@ public class CompositeTypeSystemImpl extends AbstractTypeSystemImpl implements T
public FunctionType functionForName(String name,
List<AbstractTypeReference> parameterTypes,
AbstractTypeReference... typeArguments) {
+ List<FunctionType> possibilities = new ArrayList<FunctionType>();
for (TypeSystem ts : delegates) {
FunctionType functionType = ts.functionForName(name, parameterTypes, typeArguments);
if (functionType!=null)
- return functionType;
+ possibilities.add(functionType);
}
- return null;
+ if (possibilities.isEmpty())
+ return null;
+ //TODO sort by specialization
+ return possibilities.get(0);
}
/*
@@ -59,12 +65,7 @@ public class CompositeTypeSystemImpl extends AbstractTypeSystemImpl implements T
*/
public FunctionType functionForNameAndParameterTypes(String name,
AbstractTypeReference... parameterTypes) {
- for (TypeSystem ts : delegates) {
- FunctionType functionType = ts.functionForNameAndParameterTypes(name, parameterTypes);
- if (functionType!=null)
- return functionType;
- }
- return null;
+ return functionForName(name, Arrays.asList(parameterTypes));
}
/*
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinTypesDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java
index 905ac6d..7b1c503 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinTypesDeclarationsContributor.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java
@@ -49,7 +49,7 @@ import static org.eclipse.xand3.analyzation.TypeSystem.*;
* @author Sven Efftinge
*
*/
-public class BuiltinTypesDeclarationsContributor implements DeclarationsContributor {
+public class BuiltinDeclarationsContributor implements DeclarationsContributor {
private Map<String, DeclaredType> types = new HashMap<String, DeclaredType>();
@@ -81,7 +81,6 @@ public class BuiltinTypesDeclarationsContributor implements DeclarationsContribu
.createDeclaredType();
types.put(bt.getName(), dt);
dt.setName(bt.getName());
- dt.setBackendType(bt);
Map<String, ? extends Property> properties = bt.getProperties();
for (Entry<String, ? extends Property> entry : properties.entrySet()) {
dt.getProperties().add(createDeclaredProperty(entry.getValue()));
@@ -155,6 +154,7 @@ public class BuiltinTypesDeclarationsContributor implements DeclarationsContribu
*/
public DeclaredFunction functionForName(String name,
AbstractTypeReference... parameterTypes) {
+ //TODO
return null;
}
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinFunctionsDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinFunctionsDeclarationsContributor.java
deleted file mode 100644
index 7d0ae69..0000000
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinFunctionsDeclarationsContributor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2007 itemis AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * itemis AG - Initial API and implementation
- *
- * </copyright>
- *
- */
-package org.eclipse.xand3.analyzation.typesystem.builtin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.xand3.analyzation.DeclarationsContributor;
-import org.eclipse.xand3.analyzation.TypeSystem;
-import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
-import org.eclipse.xpand3.staticTypesystem.DeclaredFunction;
-import org.eclipse.xpand3.staticTypesystem.DeclaredType;
-import org.eclipse.xpand3.staticTypesystem.StaticTypesystemFactory;
-import org.eclipse.xtend.backend.common.NamedFunction;
-
-/**
- * @author Sven Efftinge
- *
- */
-public class BuiltinFunctionsDeclarationsContributor implements DeclarationsContributor {
-
- private Map<String, DeclaredFunction> functions = new HashMap<String, DeclaredFunction>();
- private TypeSystem typeSystem;
-
- private DeclaredFunction createDeclaredFunction(NamedFunction backendFunction) {
- if (functions.containsKey(backendFunction.getName())) {
- return functions.get(backendFunction.getName());
- }
- DeclaredFunction df = StaticTypesystemFactory.eINSTANCE
- .createDeclaredFunction();
- functions.put(backendFunction.getName(), df);
- df.setName(backendFunction.getName());
-// df.setReturnType(typeSystem.typeForName(OBJECT, typeArguments))
- return df;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#functionForName(java.lang.String, org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[])
- */
- public DeclaredFunction functionForName(String name,
- AbstractTypeReference... parameterTypes) {
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#typeForName(java.lang.String)
- */
- public DeclaredType typeForName(String name) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#getReferencedResources()
- */
- public String[] getReferencedContributors() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#setTypeSystem(org.eclipse.xand3.analyzation.TypeSystem)
- */
- public void setTypeSystem(TypeSystem ts) {
- this.typeSystem = ts;
- }
-
-}
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java
new file mode 100644
index 0000000..c209323
--- /dev/null
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java
@@ -0,0 +1,107 @@
+/**
+ * <copyright>
+ *
+ * Copyright (c) 2002-2007 itemis AG and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * itemis AG - Initial API and implementation
+ *
+ * </copyright>
+ *
+ */
+package org.eclipse.xand3.analyzation.typesystem.xpand3;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.xand3.analyzation.DeclarationsContributor;
+import org.eclipse.xand3.analyzation.TypeSystem;
+import org.eclipse.xand3.ast.AstUtil;
+import org.eclipse.xpand3.DeclaredParameter;
+import org.eclipse.xpand3.File;
+import org.eclipse.xpand3.Identifier;
+import org.eclipse.xpand3.ImportStatement;
+import org.eclipse.xpand3.declaration.AbstractDeclaration;
+import org.eclipse.xpand3.declaration.Definition;
+import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
+import org.eclipse.xpand3.staticTypesystem.DeclaredFunction;
+import org.eclipse.xpand3.staticTypesystem.DeclaredType;
+import static org.eclipse.xand3.ast.AstUtil.*;
+/**
+ * @author Sven Efftinge
+ *
+ */
+public class Xpand3ResourceDeclarationsContributor implements
+ DeclarationsContributor {
+
+ private File file = null;
+ private TypeSystem typeSystem;
+
+ /**
+ * @param file
+ */
+ public Xpand3ResourceDeclarationsContributor(File file) {
+ super();
+ this.file = file;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.xand3.analyzation.DeclarationsContributor#functionForName(java.lang.String, org.eclipse.xpand3.staticTypesystem.AbstractTypeReference[])
+ */
+ public DeclaredFunction functionForName(String name,
+ AbstractTypeReference... parameterTypes) {
+ return null;
+ }
+
+ /**
+ * @param def
+ * @return
+ */
+ private AbstractTypeReference[] getParamTypes(Definition def) {
+ AbstractTypeReference[] types = new AbstractTypeReference[def.getParams().size()];
+ for (int i=0;i<types.length;i++) {
+ DeclaredParameter declaredParameter = def.getParams().get(i);
+ types[i] = getTypeRef(declaredParameter.getType());
+ }
+ return types;
+ }
+
+ /**
+ * @param type
+ * @return
+ */
+ private AbstractTypeReference getTypeRef(Identifier type) {
+ //TODO type Args
+ return typeSystem.typeForName(AstUtil.toString(type));
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.xand3.analyzation.DeclarationsContributor#getReferencedContributors()
+ */
+ public String[] getReferencedContributors() {
+ List<String> imports = new ArrayList<String>();
+ for (ImportStatement is : file.getImports()) {
+ imports.add(AstUtil.toString(is.getImportedId()));
+ }
+ return imports.toArray(new String[imports.size()]);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.xand3.analyzation.DeclarationsContributor#setTypeSystem(org.eclipse.xand3.analyzation.TypeSystem)
+ */
+ public void setTypeSystem(TypeSystem ts) {
+ this.typeSystem = ts;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.xand3.analyzation.DeclarationsContributor#typeForName(java.lang.String)
+ */
+ public DeclaredType typeForName(String name) {
+ return null;
+ }
+
+}
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/java/Java2TypesystemConverter.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/ast/AstUtil.java
index 03c858f..6d58216 100644
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/java/Java2TypesystemConverter.java
+++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/ast/AstUtil.java
@@ -13,14 +13,22 @@
* </copyright>
*
*/
-package org.eclipse.xand3.analyzation.typesystem.java;
+package org.eclipse.xand3.ast;
-import org.eclipse.xpand3.staticTypesystem.DeclaredType;
+import org.eclipse.xpand3.Identifier;
/**
* @author Sven Efftinge
*
*/
-public class Java2TypesystemConverter {
-
+public class AstUtil {
+
+ /**
+ * @param importedId
+ * @return
+ */
+ public static String toString(Identifier id) {
+ return id.getValue();
+ }
+
}
diff --git a/plugins/org.eclipse.xpand3/src/static_typesystem.ecore b/plugins/org.eclipse.xpand3/src/static_typesystem.ecore
index 984a7d9..313d358 100644
--- a/plugins/org.eclipse.xpand3/src/static_typesystem.ecore
+++ b/plugins/org.eclipse.xpand3/src/static_typesystem.ecore
@@ -37,8 +37,6 @@
eType="#//DeclaredProperty" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="declaredTypeParameters"
upperBound="-1" eType="#//DeclaredTypeParameter" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="backendType" lowerBound="1"
- eType="#//BackendType"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredFunction" eSuperTypes="#//AbstractNamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="declaredParameters" upperBound="-1"
@@ -60,5 +58,4 @@
<eClassifiers xsi:type="ecore:EClass" name="DeclaredParameter" eSuperTypes="#//AbstractNamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//AbstractTypeReference"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="BackendType" instanceClassName="org.eclipse.xtend.backend.common.BackendType"/>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.xpand3/src/xpand3.ecore b/plugins/org.eclipse.xpand3/src/xpand3.ecore
index 8ef4fae..3c57db2 100644
--- a/plugins/org.eclipse.xpand3/src/xpand3.ecore
+++ b/plugins/org.eclipse.xpand3/src/xpand3.ecore
@@ -20,14 +20,9 @@
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="exported" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Identifier" abstract="true" eSuperTypes="#//SyntaxElement"/>
- <eClassifiers xsi:type="ecore:EClass" name="SimpleIdentifier" eSuperTypes="#//Identifier">
+ <eClassifiers xsi:type="ecore:EClass" name="Identifier" eSuperTypes="#//SyntaxElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ComposedIdentifier" eSuperTypes="#//Identifier">
- <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" lowerBound="1"
- upperBound="-1" eType="#//Identifier" containment="true"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredParameter" eSuperTypes="#//SyntaxElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//Identifier"
containment="true"/>
diff --git a/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF
index b47f8f5..9b66c47 100644
--- a/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.xpand3.parser.tests/META-INF/MANIFEST.MF
@@ -5,4 +5,5 @@ Bundle-SymbolicName: org.eclipse.xpand3.parser.tests
Bundle-Version: 1.0.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.xpand3.parser;bundle-version="1.0.0",
- org.junit;bundle-version="3.8.2"
+ org.junit;bundle-version="3.8.2",
+ org.eclipse.tmf.common.runtime;bundle-version="1.0.0"