From 15cb5f175a3d1bb140aaf9a04ea83d5ee6b2f8ca Mon Sep 17 00:00:00 2001 From: sefftinge Date: Fri, 7 Mar 2008 08:28:16 +0000 Subject: refactored runtime dependencies into separate project. --- .../org.eclipse.xpand3.parser/META-INF/MANIFEST.MF | 3 +- .../parser/node2ast/Node2AstTransformer.java | 14 +- .../emf-gen/org/eclipse/xpand3/Identifier.java | 36 +++- .../emf-gen/org/eclipse/xpand3/Xpand3Factory.java | 17 +- .../emf-gen/org/eclipse/xpand3/Xpand3Package.java | 198 ++------------------- .../xpand3/declaration/DeclarationPackage.java | 2 +- .../org/eclipse/xpand3/declaration/Extension.java | 2 +- .../declaration/impl/DeclarationPackageImpl.java | 2 +- .../xpand3/declaration/impl/ExtensionImpl.java | 2 +- .../validation/AbstractAspectValidator.java | 26 --- .../validation/AbstractDeclarationValidator.java | 29 --- .../AbstractNamedDeclarationValidator.java | 21 --- .../declaration/validation/AdviceValidator.java | 19 -- .../declaration/validation/CheckValidator.java | 24 --- .../CreateExtensionStatementValidator.java | 21 --- .../validation/DefinitionAspectValidator.java | 23 --- .../validation/DefinitionValidator.java | 23 --- .../validation/ExtensionAspectValidator.java | 21 --- .../declaration/validation/ExtensionValidator.java | 22 --- .../JavaExtensionStatementValidator.java | 25 --- .../validation/AbstractExpressionValidator.java | 19 -- .../validation/BooleanLiteralValidator.java | 19 -- .../validation/BooleanOperationValidator.java | 25 --- .../expression/validation/CaseValidator.java | 22 --- .../expression/validation/CastValidator.java | 24 --- .../validation/ChainExpressionValidator.java | 22 --- .../validation/CollectionExpressionValidator.java | 24 --- .../ConstructorCallExpressionValidator.java | 21 --- .../validation/FeatureCallValidator.java | 24 --- .../validation/GlobalVarExpressionValidator.java | 21 --- .../validation/IfExpressionValidator.java | 23 --- .../validation/IntegerLiteralValidator.java | 19 -- .../validation/LetExpressionValidator.java | 25 --- .../validation/ListLiteralValidator.java | 23 --- .../expression/validation/LiteralValidator.java | 21 --- .../validation/NullLiteralValidator.java | 19 -- .../validation/OperationCallValidator.java | 23 --- .../validation/RealLiteralValidator.java | 19 -- .../validation/StringLiteralValidator.java | 19 -- .../validation/SwitchExpressionValidator.java | 26 --- .../validation/TypeSelectExpressionValidator.java | 21 --- .../xpand3/impl/ComposedIdentifierImpl.java | 154 ---------------- .../org/eclipse/xpand3/impl/IdentifierImpl.java | 122 ++++++++++++- .../eclipse/xpand3/impl/SimpleIdentifierImpl.java | 166 ----------------- .../org/eclipse/xpand3/impl/Xpand3FactoryImpl.java | 21 +-- .../org/eclipse/xpand3/impl/Xpand3PackageImpl.java | 65 +------ .../validation/AbstractStatementValidator.java | 19 -- .../AbstractStatementWithBodyValidator.java | 23 --- .../validation/ErrorStatementValidator.java | 21 --- .../validation/ExpandStatementValidator.java | 29 --- .../validation/ExpressionStatementValidator.java | 21 --- .../validation/FileStatementValidator.java | 24 --- .../validation/ForEachStatementValidator.java | 26 --- .../statement/validation/IfStatementValidator.java | 25 --- .../validation/LetStatementValidator.java | 24 --- .../validation/ProtectStatementValidator.java | 24 --- .../validation/TextStatementValidator.java | 21 --- .../xpand3/staticTypesystem/DeclaredType.java | 29 +-- .../staticTypesystem/StaticTypesystemPackage.java | 64 +------ .../staticTypesystem/impl/DeclaredTypeImpl.java | 70 +------- .../impl/StaticTypesystemFactoryImpl.java | 50 +----- .../impl/StaticTypesystemPackageImpl.java | 35 +--- .../eclipse/xpand3/util/Xpand3AdapterFactory.java | 38 +--- .../org/eclipse/xpand3/util/Xpand3Switch.java | 48 +---- .../validation/ComposedIdentifierValidator.java | 23 --- .../validation/DeclaredParameterValidator.java | 22 --- .../eclipse/xpand3/validation/FileValidator.java | 26 --- .../xpand3/validation/IdentifierValidator.java | 19 -- .../validation/ImportStatementValidator.java | 22 --- .../validation/SimpleIdentifierValidator.java | 20 --- .../xpand3/validation/SyntaxElementValidator.java | 23 --- plugins/org.eclipse.xpand3/plugin.xml | 7 - .../DeclarationsContributorFactory.java | 43 ----- ...guageSpecificDeclarationContributorFactory.java | 6 +- .../org/eclipse/xand3/analyzation/TypeSystem.java | 2 + .../xand3/analyzation/TypeSystemFactory.java | 45 +++++ .../typesystem/CompositeTypeSystemImpl.java | 17 +- .../builtin/BuiltinDeclarationsContributor.java | 161 +++++++++++++++++ .../BuiltinFunctionsDeclarationsContributor.java | 80 --------- .../BuiltinTypesDeclarationsContributor.java | 161 ----------------- .../typesystem/java/Java2TypesystemConverter.java | 26 --- .../Xpand3ResourceDeclarationsContributor.java | 107 +++++++++++ .../src/org/eclipse/xand3/ast/AstUtil.java | 34 ++++ .../org.eclipse.xpand3/src/static_typesystem.ecore | 3 - plugins/org.eclipse.xpand3/src/xpand3.ecore | 7 +- .../META-INF/MANIFEST.MF | 3 +- 86 files changed, 564 insertions(+), 2401 deletions(-) delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AdviceValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ComposedIdentifierValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/FileValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SimpleIdentifierValidator.java delete mode 100644 plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java delete mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java create mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java create mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java delete mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinFunctionsDeclarationsContributor.java delete mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinTypesDeclarationsContributor.java delete mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/java/Java2TypesystemConverter.java create mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java create mode 100644 plugins/org.eclipse.xpand3/src/org/eclipse/xand3/ast/AstUtil.java diff --git a/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.xpand3.parser/META-INF/MANIFEST.MF index a3c9e4df..715fbaa1 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 d4091d9f..da5188d1 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 { } 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 { 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 079f2699..69f6c8fb 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 @@ * * * - * $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 'Identifier'. * * + *

+ * The following features are supported: + *

+ *

* * @see org.eclipse.xpand3.Xpand3Package#getIdentifier() - * @model abstract="true" + * @model * @generated */ public interface Identifier extends SyntaxElement { + + /** + * Returns the value of the 'Value' attribute. + * + *

+ * If the meaning of the 'Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Value' 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 Value}' attribute. + * + * + * @param value the new value of the 'Value' 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 e98d080b..b7c79a3a 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 @@ * * * - * $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 'Simple Identifier'. + * Returns a new object of class 'Identifier'. * * - * @return a new object of class 'Simple Identifier'. + * @return a new object of class 'Identifier'. * @generated */ - SimpleIdentifier createSimpleIdentifier(); - - /** - * Returns a new object of class 'Composed Identifier'. - * - * - * @return a new object of class 'Composed Identifier'. - * @generated - */ - ComposedIdentifier createComposedIdentifier(); + Identifier createIdentifier(); /** * Returns a new object of class 'Declared Parameter'. 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 90b5a33f..80ab74dc 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 @@ * * * - * $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; @@ -306,61 +306,6 @@ public interface Xpand3Package extends EPackage { */ int IDENTIFIER__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME; - /** - * The number of structural features of the 'Identifier' class. - * - * - * @generated - * @ordered - */ - int IDENTIFIER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 0; - - /** - * The meta object id for the '{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl Simple Identifier}' class. - * - * - * @see org.eclipse.xpand3.impl.SimpleIdentifierImpl - * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSimpleIdentifier() - * @generated - */ - int SIMPLE_IDENTIFIER = 4; - - /** - * The feature id for the 'Line' attribute. - * - * - * @generated - * @ordered - */ - int SIMPLE_IDENTIFIER__LINE = IDENTIFIER__LINE; - - /** - * The feature id for the 'Start' attribute. - * - * - * @generated - * @ordered - */ - int SIMPLE_IDENTIFIER__START = IDENTIFIER__START; - - /** - * The feature id for the 'End' attribute. - * - * - * @generated - * @ordered - */ - int SIMPLE_IDENTIFIER__END = IDENTIFIER__END; - - /** - * The feature id for the 'File Name' attribute. - * - * - * @generated - * @ordered - */ - int SIMPLE_IDENTIFIER__FILE_NAME = IDENTIFIER__FILE_NAME; - /** * The feature id for the 'Value' attribute. * @@ -368,80 +313,16 @@ public interface Xpand3Package extends EPackage { * @generated * @ordered */ - int SIMPLE_IDENTIFIER__VALUE = IDENTIFIER_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Simple Identifier' class. - * - * - * @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 Composed Identifier}' class. - * - * - * @see org.eclipse.xpand3.impl.ComposedIdentifierImpl - * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getComposedIdentifier() - * @generated - */ - int COMPOSED_IDENTIFIER = 5; - - /** - * The feature id for the 'Line' attribute. - * - * - * @generated - * @ordered - */ - int COMPOSED_IDENTIFIER__LINE = IDENTIFIER__LINE; - - /** - * The feature id for the 'Start' attribute. - * - * - * @generated - * @ordered - */ - int COMPOSED_IDENTIFIER__START = IDENTIFIER__START; - - /** - * The feature id for the 'End' attribute. - * - * - * @generated - * @ordered - */ - int COMPOSED_IDENTIFIER__END = IDENTIFIER__END; - - /** - * The feature id for the 'File Name' attribute. - * - * - * @generated - * @ordered - */ - int COMPOSED_IDENTIFIER__FILE_NAME = IDENTIFIER__FILE_NAME; - - /** - * The feature id for the 'Identifiers' containment reference list. - * - * - * @generated - * @ordered - */ - int COMPOSED_IDENTIFIER__IDENTIFIERS = IDENTIFIER_FEATURE_COUNT + 0; - - /** - * The number of structural features of the 'Composed Identifier' class. + * The number of structural features of the 'Identifier' class. * * * @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 Declared Parameter}' 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 'Line' attribute. @@ -646,46 +527,15 @@ public interface Xpand3Package extends EPackage { EClass getIdentifier(); /** - * Returns the meta object for class '{@link org.eclipse.xpand3.SimpleIdentifier Simple Identifier}'. - * - * - * @return the meta object for class 'Simple Identifier'. - * @see org.eclipse.xpand3.SimpleIdentifier - * @generated - */ - EClass getSimpleIdentifier(); - - /** - * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SimpleIdentifier#getValue Value}'. + * Returns the meta object for the attribute '{@link org.eclipse.xpand3.Identifier#getValue Value}'. * * * @return the meta object for the attribute 'Value'. - * @see org.eclipse.xpand3.SimpleIdentifier#getValue() - * @see #getSimpleIdentifier() - * @generated - */ - EAttribute getSimpleIdentifier_Value(); - - /** - * Returns the meta object for class '{@link org.eclipse.xpand3.ComposedIdentifier Composed Identifier}'. - * - * - * @return the meta object for class 'Composed Identifier'. - * @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 Identifiers}'. - * - * - * @return the meta object for the containment reference list 'Identifiers'. - * @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 Declared Parameter}'. @@ -845,41 +695,13 @@ public interface Xpand3Package extends EPackage { */ EClass IDENTIFIER = eINSTANCE.getIdentifier(); - /** - * The meta object literal for the '{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl Simple Identifier}' class. - * - * - * @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 'Value' attribute feature. * * * @generated */ - EAttribute SIMPLE_IDENTIFIER__VALUE = eINSTANCE.getSimpleIdentifier_Value(); - - /** - * The meta object literal for the '{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl Composed Identifier}' class. - * - * - * @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 'Identifiers' containment reference list feature. - * - * - * @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 Declared Parameter}' 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 2b9d08a5..80935b96 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 @@ * * * - * $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 f02f40d3..44a9c1b3 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 @@ * * * - * $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 1dc1b811..6a0346ce 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 @@ * * * - * $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 9b9f38e9..be543abc 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 @@ * * * - * $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 f4abd8d2..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractAspectValidator.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * - * - * - * $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 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 18e710c1..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractDeclarationValidator.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * - * - * - * $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 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 67ae9457..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AbstractNamedDeclarationValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 08003ff7..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/AdviceValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 ac3f2556..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CheckValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 c02d374d..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/CreateExtensionStatementValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 c9324af5..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionAspectValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 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 07a606a0..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/DefinitionValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 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 7564b503..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionAspectValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 5fc397c3..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/ExtensionValidator.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - * - * - * $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 37231def..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/declaration/validation/JavaExtensionStatementValidator.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * - * - * - * $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 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 88df8ac9..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/AbstractExpressionValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 0f238927..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanLiteralValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 d18a4b49..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/BooleanOperationValidator.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * - * - * - * $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 5c98fcb3..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CaseValidator.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - * - * - * $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 17c63334..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CastValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 c92cb1a7..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ChainExpressionValidator.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - * - * - * $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 e977290a..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/CollectionExpressionValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 ea8c5bd7..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ConstructorCallExpressionValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 d879fde0..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/FeatureCallValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 ff8e906b..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/GlobalVarExpressionValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 500efa09..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IfExpressionValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 0a4debfa..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/IntegerLiteralValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 aaaeaf98..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LetExpressionValidator.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * - * - * - * $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 558f2038..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/ListLiteralValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 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 de6bbb95..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/LiteralValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 dc5411db..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/NullLiteralValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 75ad9127..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/OperationCallValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 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 e25b5666..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/RealLiteralValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 fa62fa62..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/StringLiteralValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 c031f4a0..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/SwitchExpressionValidator.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * - * - * - * $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 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 04674f72..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/expression/validation/TypeSelectExpressionValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 4f0db2b1..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java +++ /dev/null @@ -1,154 +0,0 @@ -/** - * - * - * - * $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; - -/** - * - * An implementation of the model object 'Composed Identifier'. - * - *

- * The following features are implemented: - *

    - *
  • {@link org.eclipse.xpand3.impl.ComposedIdentifierImpl#getIdentifiers Identifiers}
    • - *
- *

- * - * @generated - */ -public class ComposedIdentifierImpl extends IdentifierImpl implements ComposedIdentifier { - /** - * The cached value of the '{@link #getIdentifiers() Identifiers}' containment reference list. - * - * - * @see #getIdentifiers() - * @generated - * @ordered - */ - protected EList identifiers; - - /** - * - * - * @generated - */ - protected ComposedIdentifierImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Xpand3Package.Literals.COMPOSED_IDENTIFIER; - } - - /** - * - * - * @generated - */ - public EList getIdentifiers() { - if (identifiers == null) { - identifiers = new EObjectContainmentEList(Identifier.class, this, Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS); - } - return identifiers; - } - - /** - * - * - * @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); - } - - /** - * - * - * @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); - } - - /** - * - * - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS: - getIdentifiers().clear(); - getIdentifiers().addAll((Collection)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS: - getIdentifiers().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @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 df431e51..9ae60439 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 @@ * * * - * $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 'Identifier'. * *

+ * The following features are implemented: + *

    + *
  • {@link org.eclipse.xpand3.impl.IdentifierImpl#getValue Value}
    • + *
*

* * @generated */ -public abstract class IdentifierImpl extends SyntaxElementImpl implements Identifier { +public class IdentifierImpl extends SyntaxElementImpl implements Identifier { + /** + * The default value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = null; + /** + * The cached value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + /** * * @@ -44,4 +67,99 @@ public abstract class IdentifierImpl extends SyntaxElementImpl implements Identi return Xpand3Package.Literals.IDENTIFIER; } + /** + * + * + * @generated + */ + public String getValue() { + return value; + } + + /** + * + * + * @generated + */ + public void setValue(String newValue) { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IDENTIFIER__VALUE, oldValue, value)); + } + + /** + * + * + * @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); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case Xpand3Package.IDENTIFIER__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case Xpand3Package.IDENTIFIER__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @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); + } + + /** + * + * + * @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 d34030f1..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * - * - * - * $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; - -/** - * - * An implementation of the model object 'Simple Identifier'. - * - *

- * The following features are implemented: - *

    - *
  • {@link org.eclipse.xpand3.impl.SimpleIdentifierImpl#getValue Value}
    • - *
- *

- * - * @generated - */ -public class SimpleIdentifierImpl extends IdentifierImpl implements SimpleIdentifier { - /** - * The default value of the '{@link #getValue() Value}' attribute. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected static final String VALUE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getValue() Value}' attribute. - * - * - * @see #getValue() - * @generated - * @ordered - */ - protected String value = VALUE_EDEFAULT; - - /** - * - * - * @generated - */ - protected SimpleIdentifierImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return Xpand3Package.Literals.SIMPLE_IDENTIFIER; - } - - /** - * - * - * @generated - */ - public String getValue() { - return value; - } - - /** - * - * - * @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)); - } - - /** - * - * - * @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); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Xpand3Package.SIMPLE_IDENTIFIER__VALUE: - setValue((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Xpand3Package.SIMPLE_IDENTIFIER__VALUE: - setValue(VALUE_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @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); - } - - /** - * - * - * @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 d51e314c..31485fab 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 @@ * * * - * $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 { * * @generated */ - public SimpleIdentifier createSimpleIdentifier() { - SimpleIdentifierImpl simpleIdentifier = new SimpleIdentifierImpl(); - return simpleIdentifier; - } - - /** - * - * - * @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 9f960420..6b3e10bf 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 @@ * * * - * $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; @@ -70,20 +70,6 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package { */ private EClass identifierEClass = null; - /** - * - * - * @generated - */ - private EClass simpleIdentifierEClass = null; - - /** - * - * - * @generated - */ - private EClass composedIdentifierEClass = null; - /** * * @@ -283,35 +269,8 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package { * * @generated */ - public EClass getSimpleIdentifier() { - return simpleIdentifierEClass; - } - - /** - * - * - * @generated - */ - public EAttribute getSimpleIdentifier_Value() { - return (EAttribute)simpleIdentifierEClass.getEStructuralFeatures().get(0); - } - - /** - * - * - * @generated - */ - public EClass getComposedIdentifier() { - return composedIdentifierEClass; - } - - /** - * - * - * @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 c9b67b6a..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 630162d1..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/AbstractStatementWithBodyValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 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 3acf0fcc..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ErrorStatementValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 eebf9d6c..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpandStatementValidator.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * - * - * - * $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 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 97a83f0f..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ExpressionStatementValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 42da5fbe..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/FileStatementValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 9a7782d9..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ForEachStatementValidator.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * - * - * - * $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 712a7349..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/IfStatementValidator.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * - * - * - * $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 6cef7364..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/LetStatementValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 1a31c570..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/ProtectStatementValidator.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - * - * - * $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 5a10932f..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/statement/validation/TextStatementValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * - * - * - * $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 2787c35a..df2c5ac9 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 @@ * * * - * $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; *
  • {@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getStaticProperties Static Properties}
    • *
  • {@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getProperties Properties}
    • *
  • {@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getDeclaredTypeParameters Declared Type Parameters}
    • - *
  • {@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType Backend Type}
    • * *

    * @@ -78,30 +77,4 @@ public interface DeclaredType extends AbstractNamedElement { */ EList getDeclaredTypeParameters(); - /** - * Returns the value of the 'Backend Type' attribute. - * - *

    - * If the meaning of the 'Backend Type' attribute isn't clear, - * there really should be more of a description here... - *

    - * - * @return the value of the 'Backend Type' 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 Backend Type}' attribute. - * - * - * @param value the new value of the 'Backend Type' 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 095f0a8e..50c097b6 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 @@ * * * - * $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; @@ -311,15 +311,6 @@ public interface StaticTypesystemPackage extends EPackage { */ int DECLARED_TYPE__DECLARED_TYPE_PARAMETERS = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 2; - /** - * The feature id for the 'Backend Type' attribute. - * - * - * @generated - * @ordered - */ - int DECLARED_TYPE__BACKEND_TYPE = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 3; - /** * The number of structural features of the 'Declared Type' class. * @@ -327,7 +318,7 @@ public interface StaticTypesystemPackage extends EPackage { * @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 Declared Function}' class. @@ -532,17 +523,6 @@ public interface StaticTypesystemPackage extends EPackage { */ int DECLARED_PARAMETER_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 1; - /** - * The meta object id for the 'Backend Type' data type. - * - * - * @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 Abstract Named Element}'. * @@ -744,17 +724,6 @@ public interface StaticTypesystemPackage extends EPackage { */ EReference getDeclaredType_DeclaredTypeParameters(); - /** - * Returns the meta object for the attribute '{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType Backend Type}'. - * - * - * @return the meta object for the attribute 'Backend Type'. - * @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 Declared Function}'. * @@ -882,17 +851,6 @@ public interface StaticTypesystemPackage extends EPackage { */ EReference getDeclaredParameter_Type(); - /** - * Returns the meta object for data type '{@link org.eclipse.xtend.backend.common.BackendType Backend Type}'. - * - * - * @return the meta object for data type 'Backend Type'. - * @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. * @@ -1083,14 +1041,6 @@ public interface StaticTypesystemPackage extends EPackage { */ EReference DECLARED_TYPE__DECLARED_TYPE_PARAMETERS = eINSTANCE.getDeclaredType_DeclaredTypeParameters(); - /** - * The meta object literal for the 'Backend Type' attribute feature. - * - * - * @generated - */ - EAttribute DECLARED_TYPE__BACKEND_TYPE = eINSTANCE.getDeclaredType_BackendType(); - /** * The meta object literal for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredFunctionImpl Declared Function}' class. * @@ -1197,16 +1147,6 @@ public interface StaticTypesystemPackage extends EPackage { */ EReference DECLARED_PARAMETER__TYPE = eINSTANCE.getDeclaredParameter_Type(); - /** - * The meta object literal for the 'Backend Type' data type. - * - * - * @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 70315a33..dbb32890 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 @@ * * * - * $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; *
  • {@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getStaticProperties Static Properties}
    • *
  • {@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getProperties Properties}
    • *
  • {@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getDeclaredTypeParameters Declared Type Parameters}
    • - *
  • {@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getBackendType Backend Type}
    • * *

    * @@ -76,26 +75,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar */ protected EList declaredTypeParameters; - /** - * The default value of the '{@link #getBackendType() Backend Type}' attribute. - * - * - * @see #getBackendType() - * @generated - * @ordered - */ - protected static final BackendType BACKEND_TYPE_EDEFAULT = null; - - /** - * The cached value of the '{@link #getBackendType() Backend Type}' attribute. - * - * - * @see #getBackendType() - * @generated - * @ordered - */ - protected BackendType backendType = BACKEND_TYPE_EDEFAULT; - /** * * @@ -151,27 +130,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar return declaredTypeParameters; } - /** - * - * - * @generated - */ - public BackendType getBackendType() { - return backendType; - } - - /** - * - * - * @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)); - } - /** * * @@ -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)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); } - /** - * - * - * @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 311a8758..2e3d196f 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 @@ * * * - * $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; @@ -79,36 +79,6 @@ public class StaticTypesystemFactoryImpl extends EFactoryImpl implements StaticT } } - /** - * - * - * @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"); - } - } - - /** - * - * - * @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"); - } - } - /** * * @@ -219,24 +189,6 @@ public class StaticTypesystemFactoryImpl extends EFactoryImpl implements StaticT return declaredParameter; } - /** - * - * - * @generated - */ - public BackendType createBackendTypeFromString(EDataType eDataType, String initialValue) { - return (BackendType)super.createFromString(eDataType, initialValue); - } - - /** - * - * - * @generated - */ - public String convertBackendTypeToString(EDataType eDataType, Object instanceValue) { - return super.convertToString(eDataType, instanceValue); - } - /** * * 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 b4dc75ee..f48abf5b 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 @@ * * * - * $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; @@ -130,13 +130,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT */ private EClass declaredParameterEClass = null; - /** - * - * - * @generated - */ - private EDataType backendTypeEDataType = null; - /** * Creates an instance of the model Package, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package @@ -376,15 +369,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT return (EReference)declaredTypeEClass.getEStructuralFeatures().get(2); } - /** - * - * - * @generated - */ - public EAttribute getDeclaredType_BackendType() { - return (EAttribute)declaredTypeEClass.getEStructuralFeatures().get(3); - } - /** * * @@ -493,15 +477,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT return (EReference)declaredParameterEClass.getEStructuralFeatures().get(0); } - /** - * - * - * @generated - */ - public EDataType getBackendType() { - return backendTypeEDataType; - } - /** * * @@ -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 b9f03713..c487fb55 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 @@ * * * - * $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(); } @@ -175,34 +167,6 @@ public class Xpand3AdapterFactory extends AdapterFactoryImpl { return null; } - /** - * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.SimpleIdentifier Simple Identifier}'. - * - * 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. - * - * @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 Composed Identifier}'. - * - * 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. - * - * @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 Declared Parameter}'. * 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 464fad97..5e177706 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 @@ * * * - * $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 { 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); @@ -201,36 +185,6 @@ public class Xpand3Switch { return null; } - /** - * Returns the result of interpreting the object as an instance of 'Simple Identifier'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Simple Identifier'. - * @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 'Composed Identifier'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Composed Identifier'. - * @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 'Declared Parameter'. * 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 d3b1cffa..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ComposedIdentifierValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 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 053d825d..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/DeclaredParameterValidator.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - * - * - * $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 895559f6..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/FileValidator.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * - * - * - * $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 value); - boolean validateDeclarations(EList 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 54c27df7..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/IdentifierValidator.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * - * - * - * $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 2b32b618..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/ImportStatementValidator.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - * - * - * $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 4b2964bd..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SimpleIdentifierValidator.java +++ /dev/null @@ -1,20 +0,0 @@ -/** - * - * - * - * $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 6948b00c..00000000 --- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/validation/SyntaxElementValidator.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * - * - * - * $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 c207f29f..d308fd70 100644 --- a/plugins/org.eclipse.xpand3/plugin.xml +++ b/plugins/org.eclipse.xpand3/plugin.xml @@ -1,13 +1,6 @@ - - diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java deleted file mode 100644 index f0c7f788..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/DeclarationsContributorFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * - * - * 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 - * - * - * - */ -package org.eclipse.xand3.analyzation; - -import java.util.HashSet; -import java.util.Set; - - - -/** - * @author Sven Efftinge - * - */ -public class DeclarationsContributorFactory { - - private final static Set factories = new HashSet(); - - public static void registerLanguageSpecificFactory(LanguageSpecificDeclarationContributorFactory factory) { - factories.add(factory); - } - - public static DeclarationsContributor createDeclarationContributor(String namespace) { - for (LanguageSpecificDeclarationContributorFactory factory : factories) { - if (factory.canHandle(namespace)) { - return factory.createDeclarationContributor(namespace); - } - } - return null; - } -} 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 b40074dc..0fe2a318 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 d035690f..4eadb292 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 parameterTypes, AbstractTypeReference...typeArguments); + } diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java new file mode 100644 index 00000000..34ba6831 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/TypeSystemFactory.java @@ -0,0 +1,45 @@ +/** + * + * + * 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 + * + * + * + */ +package org.eclipse.xand3.analyzation; + +import java.util.HashSet; +import java.util.Set; + + + +/** + * @author Sven Efftinge + * + */ +public class TypeSystemFactory { + + private final static Set factories = new HashSet(); + + public static void registerLanguageSpecificFactory(LanguageSpecificDeclarationContributorFactory factory) { + factories.add(factory); + } + + public static DeclarationsContributor createDeclarationContributor(String namespace) { + for (LanguageSpecificDeclarationContributorFactory factory : factories) { + if (factory.canHandle(namespace)) { + return factory.createDeclarationContributor(namespace); + } + } + 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 0e1b1492..e30d2f68 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 parameterTypes, AbstractTypeReference... typeArguments) { + List possibilities = new ArrayList(); 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/BuiltinDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java new file mode 100644 index 00000000..7b1c5031 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java @@ -0,0 +1,161 @@ +/** + * + * + * 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 + * + * + * + */ +package org.eclipse.xand3.analyzation.typesystem.builtin; + +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; + +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.DeclaredProperty; +import org.eclipse.xpand3.staticTypesystem.DeclaredStaticProperty; +import org.eclipse.xpand3.staticTypesystem.DeclaredType; +import org.eclipse.xpand3.staticTypesystem.StaticTypesystemFactory; +import org.eclipse.xtend.backend.common.BackendType; +import org.eclipse.xtend.backend.common.Property; +import org.eclipse.xtend.backend.common.StaticProperty; +import org.eclipse.xtend.backend.types.builtin.BooleanType; +import org.eclipse.xtend.backend.types.builtin.CollectionType; +import org.eclipse.xtend.backend.types.builtin.DoubleType; +import org.eclipse.xtend.backend.types.builtin.FunctionType; +import org.eclipse.xtend.backend.types.builtin.ListType; +import org.eclipse.xtend.backend.types.builtin.LongType; +import org.eclipse.xtend.backend.types.builtin.ObjectType; +import org.eclipse.xtend.backend.types.builtin.PropertyType; +import org.eclipse.xtend.backend.types.builtin.SetType; +import org.eclipse.xtend.backend.types.builtin.StaticPropertyType; +import org.eclipse.xtend.backend.types.builtin.StringType; +import org.eclipse.xtend.backend.types.builtin.TypeType; + +import static org.eclipse.xand3.analyzation.TypeSystem.*; + +/** + * @author Sven Efftinge + * + */ +public class BuiltinDeclarationsContributor implements DeclarationsContributor { + + private Map types = new HashMap(); + + private TypeSystem typeSystems = null; + + /* + * (non-Javadoc) + * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#setTypeSystem(org.eclipse.xand3.analyzation.TypeSystem) + */ + public void setTypeSystem(TypeSystem ts) { + this.typeSystems = ts; + } + + /* (non-Javadoc) + * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#getReferencedResources() + */ + public String[] getReferencedContributors() { + return null; + } + /** + * @param instance + * @return + */ + private DeclaredType createDeclaredType(BackendType bt) { + if (types.containsKey(bt.getName())) { + return types.get(bt.getName()); + } + DeclaredType dt = StaticTypesystemFactory.eINSTANCE + .createDeclaredType(); + types.put(bt.getName(), dt); + dt.setName(bt.getName()); + Map properties = bt.getProperties(); + for (Entry entry : properties.entrySet()) { + dt.getProperties().add(createDeclaredProperty(entry.getValue())); + } + for (StaticProperty sp : bt.getStaticProperties().values()) { + dt.getStaticProperties().add(createDeclaredStaticProperty(sp)); + } + return dt; + } + + /** + * @param sp + * @return + */ + private DeclaredStaticProperty createDeclaredStaticProperty( + StaticProperty sp) { + DeclaredStaticProperty dsp = StaticTypesystemFactory.eINSTANCE.createDeclaredStaticProperty(); + dsp.setName(sp.getName()); + dsp.setType(typeSystems.typeForName(sp.getType().getName())); + return dsp; + } + + /** + * @param value + * @return + */ + private DeclaredProperty createDeclaredProperty(Property value) { + DeclaredProperty dp = StaticTypesystemFactory.eINSTANCE + .createDeclaredProperty(); + dp.setName(value.getName()); + dp.setType(typeSystems.typeForName(value.getType().getName())); + return dp; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#typeForName(java.lang.String) + */ + public DeclaredType typeForName(String name) { + if (name.equals(OBJECT)) { + createDeclaredType(ObjectType.INSTANCE); + } else if (name.equals(STRING)) { + createDeclaredType(StringType.INSTANCE); + } else if (name.equals(BOOLEAN)) { + createDeclaredType(BooleanType.INSTANCE); + } else if (name.equals(INTEGER)) { + createDeclaredType(LongType.INSTANCE); + } else if (name.equals(REAL)) { + createDeclaredType(DoubleType.INSTANCE); + } else if (name.equals(COLLECTION)) { + createDeclaredType(CollectionType.INSTANCE); + } else if (name.equals(LIST)) { + createDeclaredType(ListType.INSTANCE); + } else if (name.equals(SET)) { + createDeclaredType(SetType.INSTANCE); + } else if (name.equals(TYPE)) { + createDeclaredType(TypeType.INSTANCE); + } else if (name.equals(PROPERTY)) { + createDeclaredType(PropertyType.INSTANCE); + } else if (name.equals(OPERATION)) { + createDeclaredType(FunctionType.INSTANCE); + } else if (name.equals(STATIC_PROPERTY)) { + createDeclaredType(StaticPropertyType.INSTANCE); + } + return null; + } + + /* (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) { + //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 7d0ae690..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinFunctionsDeclarationsContributor.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * - * - * 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 - * - * - * - */ -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 functions = new HashMap(); - 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/builtin/BuiltinTypesDeclarationsContributor.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinTypesDeclarationsContributor.java deleted file mode 100644 index 905ac6d5..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinTypesDeclarationsContributor.java +++ /dev/null @@ -1,161 +0,0 @@ -/** - * - * - * 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 - * - * - * - */ -package org.eclipse.xand3.analyzation.typesystem.builtin; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -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.DeclaredProperty; -import org.eclipse.xpand3.staticTypesystem.DeclaredStaticProperty; -import org.eclipse.xpand3.staticTypesystem.DeclaredType; -import org.eclipse.xpand3.staticTypesystem.StaticTypesystemFactory; -import org.eclipse.xtend.backend.common.BackendType; -import org.eclipse.xtend.backend.common.Property; -import org.eclipse.xtend.backend.common.StaticProperty; -import org.eclipse.xtend.backend.types.builtin.BooleanType; -import org.eclipse.xtend.backend.types.builtin.CollectionType; -import org.eclipse.xtend.backend.types.builtin.DoubleType; -import org.eclipse.xtend.backend.types.builtin.FunctionType; -import org.eclipse.xtend.backend.types.builtin.ListType; -import org.eclipse.xtend.backend.types.builtin.LongType; -import org.eclipse.xtend.backend.types.builtin.ObjectType; -import org.eclipse.xtend.backend.types.builtin.PropertyType; -import org.eclipse.xtend.backend.types.builtin.SetType; -import org.eclipse.xtend.backend.types.builtin.StaticPropertyType; -import org.eclipse.xtend.backend.types.builtin.StringType; -import org.eclipse.xtend.backend.types.builtin.TypeType; - -import static org.eclipse.xand3.analyzation.TypeSystem.*; - -/** - * @author Sven Efftinge - * - */ -public class BuiltinTypesDeclarationsContributor implements DeclarationsContributor { - - private Map types = new HashMap(); - - private TypeSystem typeSystems = null; - - /* - * (non-Javadoc) - * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#setTypeSystem(org.eclipse.xand3.analyzation.TypeSystem) - */ - public void setTypeSystem(TypeSystem ts) { - this.typeSystems = ts; - } - - /* (non-Javadoc) - * @see org.eclipse.xand3.analyzation.typesystem.Xpand3DeclarationsResource#getReferencedResources() - */ - public String[] getReferencedContributors() { - return null; - } - /** - * @param instance - * @return - */ - private DeclaredType createDeclaredType(BackendType bt) { - if (types.containsKey(bt.getName())) { - return types.get(bt.getName()); - } - DeclaredType dt = StaticTypesystemFactory.eINSTANCE - .createDeclaredType(); - types.put(bt.getName(), dt); - dt.setName(bt.getName()); - dt.setBackendType(bt); - Map properties = bt.getProperties(); - for (Entry entry : properties.entrySet()) { - dt.getProperties().add(createDeclaredProperty(entry.getValue())); - } - for (StaticProperty sp : bt.getStaticProperties().values()) { - dt.getStaticProperties().add(createDeclaredStaticProperty(sp)); - } - return dt; - } - - /** - * @param sp - * @return - */ - private DeclaredStaticProperty createDeclaredStaticProperty( - StaticProperty sp) { - DeclaredStaticProperty dsp = StaticTypesystemFactory.eINSTANCE.createDeclaredStaticProperty(); - dsp.setName(sp.getName()); - dsp.setType(typeSystems.typeForName(sp.getType().getName())); - return dsp; - } - - /** - * @param value - * @return - */ - private DeclaredProperty createDeclaredProperty(Property value) { - DeclaredProperty dp = StaticTypesystemFactory.eINSTANCE - .createDeclaredProperty(); - dp.setName(value.getName()); - dp.setType(typeSystems.typeForName(value.getType().getName())); - return dp; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.xand3.analyzation.typesystem.DeclarationsContributor#typeForName(java.lang.String) - */ - public DeclaredType typeForName(String name) { - if (name.equals(OBJECT)) { - createDeclaredType(ObjectType.INSTANCE); - } else if (name.equals(STRING)) { - createDeclaredType(StringType.INSTANCE); - } else if (name.equals(BOOLEAN)) { - createDeclaredType(BooleanType.INSTANCE); - } else if (name.equals(INTEGER)) { - createDeclaredType(LongType.INSTANCE); - } else if (name.equals(REAL)) { - createDeclaredType(DoubleType.INSTANCE); - } else if (name.equals(COLLECTION)) { - createDeclaredType(CollectionType.INSTANCE); - } else if (name.equals(LIST)) { - createDeclaredType(ListType.INSTANCE); - } else if (name.equals(SET)) { - createDeclaredType(SetType.INSTANCE); - } else if (name.equals(TYPE)) { - createDeclaredType(TypeType.INSTANCE); - } else if (name.equals(PROPERTY)) { - createDeclaredType(PropertyType.INSTANCE); - } else if (name.equals(OPERATION)) { - createDeclaredType(FunctionType.INSTANCE); - } else if (name.equals(STATIC_PROPERTY)) { - createDeclaredType(StaticPropertyType.INSTANCE); - } - return null; - } - - /* (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; - } - -} 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/analyzation/typesystem/java/Java2TypesystemConverter.java deleted file mode 100644 index 03c858f1..00000000 --- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/java/Java2TypesystemConverter.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * - * - * 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 - * - * - * - */ -package org.eclipse.xand3.analyzation.typesystem.java; - -import org.eclipse.xpand3.staticTypesystem.DeclaredType; - -/** - * @author Sven Efftinge - * - */ -public class Java2TypesystemConverter { - -} 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 00000000..c2093237 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/xpand3/Xpand3ResourceDeclarationsContributor.java @@ -0,0 +1,107 @@ +/** + * + * + * 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 + * + * + * + */ +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 imports = new ArrayList(); + 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/ast/AstUtil.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/ast/AstUtil.java new file mode 100644 index 00000000..6d582164 --- /dev/null +++ b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/ast/AstUtil.java @@ -0,0 +1,34 @@ +/** + * + * + * 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 + * + * + * + */ +package org.eclipse.xand3.ast; + +import org.eclipse.xpand3.Identifier; + +/** + * @author Sven Efftinge + * + */ +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 984a7d9d..313d3581 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"/> - - diff --git a/plugins/org.eclipse.xpand3/src/xpand3.ecore b/plugins/org.eclipse.xpand3/src/xpand3.ecore index 8ef4fae2..3c57db22 100644 --- a/plugins/org.eclipse.xpand3/src/xpand3.ecore +++ b/plugins/org.eclipse.xpand3/src/xpand3.ecore @@ -20,14 +20,9 @@ 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 b47f8f52..9b66c473 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" -- cgit v1.2.3