summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsefftinge2008-03-04 09:28:06 (EST)
committersefftinge2008-03-04 09:28:06 (EST)
commit6789a19a05b93102fdff11e5373b80e56e8b85c6 (patch)
tree2262003126644cf7d952bc2554fee7877f22e949
parent7af822c24b040ec8fbc00ca886235db4ed946147 (diff)
downloadorg.eclipse.xpand-6789a19a05b93102fdff11e5373b80e56e8b85c6.zip
org.eclipse.xpand-6789a19a05b93102fdff11e5373b80e56e8b85c6.tar.gz
org.eclipse.xpand-6789a19a05b93102fdff11e5373b80e56e8b85c6.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractNamedElement.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractTypeReference.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredFunction.java8
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredOperation.java100
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredParameter.java4
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredProperty.java4
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredStaticProperty.java4
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredTypeParameter.java5
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/FunctionType.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemFactory.java11
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java180
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/Type.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/TypeVariable.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/VoidType.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/WildcardType.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractNamedElementImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractTypeReferenceImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredFunctionImpl.java20
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredOperationImpl.java304
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredParameterImpl.java6
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredPropertyImpl.java6
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredStaticPropertyImpl.java6
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java55
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeParameterImpl.java5
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/FunctionTypeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java13
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java74
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeVariableImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/VoidTypeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/WildcardTypeImpl.java2
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemAdapterFactory.java20
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemSwitch.java24
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/RefTest.java44
-rw-r--r--plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/typesystem/builtin/BuiltinDeclarationsContributor.java1
-rw-r--r--plugins/org.eclipse.xpand3/src/static_typesystem.ecore12
37 files changed, 73 insertions, 882 deletions
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractNamedElement.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractNamedElement.java
index 0c7e7f3..0078363 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractNamedElement.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractNamedElement.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AbstractNamedElement.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: AbstractNamedElement.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractTypeReference.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractTypeReference.java
index b63a6e8..22b0430 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractTypeReference.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/AbstractTypeReference.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AbstractTypeReference.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: AbstractTypeReference.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredFunction.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredFunction.java
index f6b7abf..53e1d33 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredFunction.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredFunction.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredFunction.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredFunction.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -68,12 +68,12 @@ public interface DeclaredFunction extends AbstractNamedElement {
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Return Type</em>' reference.
- * @see #setReturnType(DeclaredType)
+ * @see #setReturnType(AbstractTypeReference)
* @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredFunction_ReturnType()
* @model
* @generated
*/
- DeclaredType getReturnType();
+ AbstractTypeReference getReturnType();
/**
* Sets the value of the '{@link org.eclipse.xpand3.staticTypesystem.DeclaredFunction#getReturnType <em>Return Type</em>}' reference.
@@ -83,6 +83,6 @@ public interface DeclaredFunction extends AbstractNamedElement {
* @see #getReturnType()
* @generated
*/
- void setReturnType(DeclaredType value);
+ void setReturnType(AbstractTypeReference value);
} // DeclaredFunction
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredOperation.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredOperation.java
deleted file mode 100644
index 39002a0..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredOperation.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeclaredOperation.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
- */
-package org.eclipse.xpand3.staticTypesystem;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Declared Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaredParameters <em>Declared Parameters</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaringType <em>Declaring Type</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getReturnType <em>Return Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredOperation()
- * @model
- * @generated
- */
-public interface DeclaredOperation extends AbstractNamedElement {
- /**
- * Returns the value of the '<em><b>Declared Parameters</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.xpand3.staticTypesystem.DeclaredParameter}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Declared Parameters</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Declared Parameters</em>' containment reference list.
- * @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredOperation_DeclaredParameters()
- * @model containment="true"
- * @generated
- */
- EList<DeclaredParameter> getDeclaredParameters();
-
- /**
- * Returns the value of the '<em><b>Declaring Type</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getOperations <em>Operations</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Declaring Type</em>' container reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Declaring Type</em>' container reference.
- * @see #setDeclaringType(DeclaredType)
- * @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredOperation_DeclaringType()
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredType#getOperations
- * @model opposite="operations" required="true" transient="false"
- * @generated
- */
- DeclaredType getDeclaringType();
-
- /**
- * Sets the value of the '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaringType <em>Declaring Type</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Declaring Type</em>' container reference.
- * @see #getDeclaringType()
- * @generated
- */
- void setDeclaringType(DeclaredType value);
-
- /**
- * Returns the value of the '<em><b>Return Type</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Return Type</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Return Type</em>' reference.
- * @see #setReturnType(AbstractTypeReference)
- * @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredOperation_ReturnType()
- * @model required="true"
- * @generated
- */
- AbstractTypeReference getReturnType();
-
- /**
- * Sets the value of the '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getReturnType <em>Return Type</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Return Type</em>' reference.
- * @see #getReturnType()
- * @generated
- */
- void setReturnType(AbstractTypeReference value);
-
-} // DeclaredOperation
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredParameter.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredParameter.java
index da22420..959baf8 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredParameter.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredParameter.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameter.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredParameter.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -24,7 +24,6 @@ package org.eclipse.xpand3.staticTypesystem;
* @generated
*/
public interface DeclaredParameter extends AbstractNamedElement {
-
/**
* Returns the value of the '<em><b>Type</b></em>' reference.
* <!-- begin-user-doc -->
@@ -50,4 +49,5 @@ public interface DeclaredParameter extends AbstractNamedElement {
* @generated
*/
void setType(AbstractTypeReference value);
+
} // DeclaredParameter
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredProperty.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredProperty.java
index c351d97..51b430a 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredProperty.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredProperty.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredProperty.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredProperty.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -24,7 +24,6 @@ package org.eclipse.xpand3.staticTypesystem;
* @generated
*/
public interface DeclaredProperty extends AbstractNamedElement {
-
/**
* Returns the value of the '<em><b>Type</b></em>' reference.
* <!-- begin-user-doc -->
@@ -50,4 +49,5 @@ public interface DeclaredProperty extends AbstractNamedElement {
* @generated
*/
void setType(AbstractTypeReference value);
+
} // DeclaredProperty
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredStaticProperty.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredStaticProperty.java
index 265e76a..693d9a9 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredStaticProperty.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredStaticProperty.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredStaticProperty.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredStaticProperty.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -24,7 +24,6 @@ package org.eclipse.xpand3.staticTypesystem;
* @generated
*/
public interface DeclaredStaticProperty extends AbstractNamedElement {
-
/**
* Returns the value of the '<em><b>Type</b></em>' reference.
* <!-- begin-user-doc -->
@@ -50,4 +49,5 @@ public interface DeclaredStaticProperty extends AbstractNamedElement {
* @generated
*/
void setType(Type value);
+
} // DeclaredStaticProperty
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 1513943..2787c35 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredType.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredType.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredType.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -20,7 +20,6 @@ import org.eclipse.xtend.backend.common.BackendType;
* <ul>
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getStaticProperties <em>Static Properties</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getProperties <em>Properties</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getOperations <em>Operations</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getDeclaredTypeParameters <em>Declared Type Parameters</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getBackendType <em>Backend Type</em>}</li>
* </ul>
@@ -64,24 +63,6 @@ public interface DeclaredType extends AbstractNamedElement {
EList<DeclaredProperty> getProperties();
/**
- * Returns the value of the '<em><b>Operations</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation}.
- * It is bidirectional and its opposite is '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaringType <em>Declaring Type</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Operations</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Operations</em>' containment reference list.
- * @see org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage#getDeclaredType_Operations()
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaringType
- * @model opposite="declaringType" containment="true"
- * @generated
- */
- EList<DeclaredOperation> getOperations();
-
- /**
* Returns the value of the '<em><b>Declared Type Parameters</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.xpand3.staticTypesystem.DeclaredTypeParameter}.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredTypeParameter.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredTypeParameter.java
index afb6c59..1f449a6 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredTypeParameter.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/DeclaredTypeParameter.java
@@ -2,13 +2,12 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredTypeParameter.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredTypeParameter.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
import org.eclipse.emf.common.util.EList;
-
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Declared Type Parameter</b></em>'.
@@ -26,7 +25,6 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface DeclaredTypeParameter extends AbstractNamedElement {
-
/**
* Returns the value of the '<em><b>Upper Bounds</b></em>' reference list.
* The list contents are of type {@link org.eclipse.xpand3.staticTypesystem.AbstractTypeReference}.
@@ -42,4 +40,5 @@ public interface DeclaredTypeParameter extends AbstractNamedElement {
* @generated
*/
EList<AbstractTypeReference> getUpperBounds();
+
} // DeclaredTypeParameter
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/FunctionType.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/FunctionType.java
index 7a3f214..adfb4b4 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/FunctionType.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/FunctionType.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FunctionType.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: FunctionType.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemFactory.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemFactory.java
index 8dbc1d6..5b10915 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemFactory.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemFactory.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: StaticTypesystemFactory.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -80,15 +80,6 @@ public interface StaticTypesystemFactory extends EFactory {
DeclaredType createDeclaredType();
/**
- * Returns a new object of class '<em>Declared Operation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Declared Operation</em>'.
- * @generated
- */
- DeclaredOperation createDeclaredOperation();
-
- /**
* Returns a new object of class '<em>Declared Function</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
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 b53136a..095f0a8 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/StaticTypesystemPackage.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemPackage.java,v 1.3 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: StaticTypesystemPackage.java,v 1.4 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
@@ -303,22 +303,13 @@ public interface StaticTypesystemPackage extends EPackage {
int DECLARED_TYPE__PROPERTIES = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Operations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_TYPE__OPERATIONS = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 2;
-
- /**
* The feature id for the '<em><b>Declared Type Parameters</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DECLARED_TYPE__DECLARED_TYPE_PARAMETERS = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 3;
+ int DECLARED_TYPE__DECLARED_TYPE_PARAMETERS = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Backend Type</b></em>' attribute.
@@ -327,7 +318,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @generated
* @ordered
*/
- int DECLARED_TYPE__BACKEND_TYPE = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 4;
+ int DECLARED_TYPE__BACKEND_TYPE = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>Declared Type</em>' class.
@@ -336,62 +327,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @generated
* @ordered
*/
- int DECLARED_TYPE_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The meta object id for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl <em>Declared Operation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl
- * @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredOperation()
- * @generated
- */
- int DECLARED_OPERATION = 8;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_OPERATION__NAME = ABSTRACT_NAMED_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Declared Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_OPERATION__DECLARED_PARAMETERS = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Declaring Type</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_OPERATION__DECLARING_TYPE = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Return Type</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_OPERATION__RETURN_TYPE = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Declared Operation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DECLARED_OPERATION_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 3;
+ int DECLARED_TYPE_FEATURE_COUNT = ABSTRACT_NAMED_ELEMENT_FEATURE_COUNT + 4;
/**
* The meta object id for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredFunctionImpl <em>Declared Function</em>}' class.
@@ -401,7 +337,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredFunction()
* @generated
*/
- int DECLARED_FUNCTION = 9;
+ int DECLARED_FUNCTION = 8;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -456,7 +392,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredProperty()
* @generated
*/
- int DECLARED_PROPERTY = 10;
+ int DECLARED_PROPERTY = 9;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -493,7 +429,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredStaticProperty()
* @generated
*/
- int DECLARED_STATIC_PROPERTY = 11;
+ int DECLARED_STATIC_PROPERTY = 10;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -530,7 +466,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredTypeParameter()
* @generated
*/
- int DECLARED_TYPE_PARAMETER = 12;
+ int DECLARED_TYPE_PARAMETER = 11;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -567,7 +503,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredParameter()
* @generated
*/
- int DECLARED_PARAMETER = 13;
+ int DECLARED_PARAMETER = 12;
/**
* The feature id for the '<em><b>Name</b></em>' attribute.
@@ -604,7 +540,7 @@ public interface StaticTypesystemPackage extends EPackage {
* @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getBackendType()
* @generated
*/
- int BACKEND_TYPE = 14;
+ int BACKEND_TYPE = 13;
/**
@@ -798,17 +734,6 @@ public interface StaticTypesystemPackage extends EPackage {
EReference getDeclaredType_Properties();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getOperations <em>Operations</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Operations</em>'.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredType#getOperations()
- * @see #getDeclaredType()
- * @generated
- */
- EReference getDeclaredType_Operations();
-
- /**
* Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.staticTypesystem.DeclaredType#getDeclaredTypeParameters <em>Declared Type Parameters</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -831,49 +756,6 @@ public interface StaticTypesystemPackage extends EPackage {
EAttribute getDeclaredType_BackendType();
/**
- * Returns the meta object for class '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation <em>Declared Operation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Declared Operation</em>'.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredOperation
- * @generated
- */
- EClass getDeclaredOperation();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaredParameters <em>Declared Parameters</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Declared Parameters</em>'.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaredParameters()
- * @see #getDeclaredOperation()
- * @generated
- */
- EReference getDeclaredOperation_DeclaredParameters();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaringType <em>Declaring Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the container reference '<em>Declaring Type</em>'.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getDeclaringType()
- * @see #getDeclaredOperation()
- * @generated
- */
- EReference getDeclaredOperation_DeclaringType();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getReturnType <em>Return Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Return Type</em>'.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredOperation#getReturnType()
- * @see #getDeclaredOperation()
- * @generated
- */
- EReference getDeclaredOperation_ReturnType();
-
- /**
* Returns the meta object for class '{@link org.eclipse.xpand3.staticTypesystem.DeclaredFunction <em>Declared Function</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1194,14 +1076,6 @@ public interface StaticTypesystemPackage extends EPackage {
EReference DECLARED_TYPE__PROPERTIES = eINSTANCE.getDeclaredType_Properties();
/**
- * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DECLARED_TYPE__OPERATIONS = eINSTANCE.getDeclaredType_Operations();
-
- /**
* The meta object literal for the '<em><b>Declared Type Parameters</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1218,40 +1092,6 @@ public interface StaticTypesystemPackage extends EPackage {
EAttribute DECLARED_TYPE__BACKEND_TYPE = eINSTANCE.getDeclaredType_BackendType();
/**
- * The meta object literal for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl <em>Declared Operation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl
- * @see org.eclipse.xpand3.staticTypesystem.impl.StaticTypesystemPackageImpl#getDeclaredOperation()
- * @generated
- */
- EClass DECLARED_OPERATION = eINSTANCE.getDeclaredOperation();
-
- /**
- * The meta object literal for the '<em><b>Declared Parameters</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DECLARED_OPERATION__DECLARED_PARAMETERS = eINSTANCE.getDeclaredOperation_DeclaredParameters();
-
- /**
- * The meta object literal for the '<em><b>Declaring Type</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DECLARED_OPERATION__DECLARING_TYPE = eINSTANCE.getDeclaredOperation_DeclaringType();
-
- /**
- * The meta object literal for the '<em><b>Return Type</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DECLARED_OPERATION__RETURN_TYPE = eINSTANCE.getDeclaredOperation_ReturnType();
-
- /**
* The meta object literal for the '{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredFunctionImpl <em>Declared Function</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/Type.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/Type.java
index 09c2889..805d434 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/Type.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/Type.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Type.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: Type.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/TypeVariable.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/TypeVariable.java
index 7f0bc82..eb7f556 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/TypeVariable.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/TypeVariable.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TypeVariable.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: TypeVariable.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/VoidType.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/VoidType.java
index ecb0096..b620ec1 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/VoidType.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/VoidType.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: VoidType.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: VoidType.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/WildcardType.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/WildcardType.java
index b321495..719590e 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/WildcardType.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/WildcardType.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: WildcardType.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: WildcardType.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractNamedElementImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractNamedElementImpl.java
index bf15881..e746d6a 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractNamedElementImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractNamedElementImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AbstractNamedElementImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: AbstractNamedElementImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractTypeReferenceImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractTypeReferenceImpl.java
index d252125..06e9372 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractTypeReferenceImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/AbstractTypeReferenceImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: AbstractTypeReferenceImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: AbstractTypeReferenceImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredFunctionImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredFunctionImpl.java
index 32e7450..f7abcf9 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredFunctionImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredFunctionImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredFunctionImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredFunctionImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
import org.eclipse.xpand3.staticTypesystem.DeclaredFunction;
import org.eclipse.xpand3.staticTypesystem.DeclaredParameter;
-import org.eclipse.xpand3.staticTypesystem.DeclaredType;
import org.eclipse.xpand3.staticTypesystem.DeclaredTypeParameter;
import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage;
@@ -71,7 +71,7 @@ public class DeclaredFunctionImpl extends AbstractNamedElementImpl implements De
* @generated
* @ordered
*/
- protected DeclaredType returnType;
+ protected AbstractTypeReference returnType;
/**
* <!-- begin-user-doc -->
@@ -121,10 +121,10 @@ public class DeclaredFunctionImpl extends AbstractNamedElementImpl implements De
* <!-- end-user-doc -->
* @generated
*/
- public DeclaredType getReturnType() {
+ public AbstractTypeReference getReturnType() {
if (returnType != null && returnType.eIsProxy()) {
InternalEObject oldReturnType = (InternalEObject)returnType;
- returnType = (DeclaredType)eResolveProxy(oldReturnType);
+ returnType = (AbstractTypeReference)eResolveProxy(oldReturnType);
if (returnType != oldReturnType) {
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.RESOLVE, StaticTypesystemPackage.DECLARED_FUNCTION__RETURN_TYPE, oldReturnType, returnType));
@@ -138,7 +138,7 @@ public class DeclaredFunctionImpl extends AbstractNamedElementImpl implements De
* <!-- end-user-doc -->
* @generated
*/
- public DeclaredType basicGetReturnType() {
+ public AbstractTypeReference basicGetReturnType() {
return returnType;
}
@@ -147,8 +147,8 @@ public class DeclaredFunctionImpl extends AbstractNamedElementImpl implements De
* <!-- end-user-doc -->
* @generated
*/
- public void setReturnType(DeclaredType newReturnType) {
- DeclaredType oldReturnType = returnType;
+ public void setReturnType(AbstractTypeReference newReturnType) {
+ AbstractTypeReference oldReturnType = returnType;
returnType = newReturnType;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, StaticTypesystemPackage.DECLARED_FUNCTION__RETURN_TYPE, oldReturnType, returnType));
@@ -207,7 +207,7 @@ public class DeclaredFunctionImpl extends AbstractNamedElementImpl implements De
getDeclaredTypeParameters().addAll((Collection<? extends DeclaredTypeParameter>)newValue);
return;
case StaticTypesystemPackage.DECLARED_FUNCTION__RETURN_TYPE:
- setReturnType((DeclaredType)newValue);
+ setReturnType((AbstractTypeReference)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -228,7 +228,7 @@ public class DeclaredFunctionImpl extends AbstractNamedElementImpl implements De
getDeclaredTypeParameters().clear();
return;
case StaticTypesystemPackage.DECLARED_FUNCTION__RETURN_TYPE:
- setReturnType((DeclaredType)null);
+ setReturnType((AbstractTypeReference)null);
return;
}
super.eUnset(featureID);
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredOperationImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredOperationImpl.java
deleted file mode 100644
index e3a8f7a..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredOperationImpl.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DeclaredOperationImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
- */
-package org.eclipse.xpand3.staticTypesystem.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-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.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
-import org.eclipse.xpand3.staticTypesystem.DeclaredOperation;
-import org.eclipse.xpand3.staticTypesystem.DeclaredParameter;
-import org.eclipse.xpand3.staticTypesystem.DeclaredType;
-import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Declared Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl#getDeclaredParameters <em>Declared Parameters</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl#getDeclaringType <em>Declaring Type</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredOperationImpl#getReturnType <em>Return Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeclaredOperationImpl extends AbstractNamedElementImpl implements DeclaredOperation {
- /**
- * The cached value of the '{@link #getDeclaredParameters() <em>Declared Parameters</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDeclaredParameters()
- * @generated
- * @ordered
- */
- protected EList<DeclaredParameter> declaredParameters;
-
- /**
- * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getReturnType()
- * @generated
- * @ordered
- */
- protected AbstractTypeReference returnType;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DeclaredOperationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return StaticTypesystemPackage.Literals.DECLARED_OPERATION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<DeclaredParameter> getDeclaredParameters() {
- if (declaredParameters == null) {
- declaredParameters = new EObjectContainmentEList<DeclaredParameter>(DeclaredParameter.class, this, StaticTypesystemPackage.DECLARED_OPERATION__DECLARED_PARAMETERS);
- }
- return declaredParameters;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DeclaredType getDeclaringType() {
- if (eContainerFeatureID != StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE) return null;
- return (DeclaredType)eContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetDeclaringType(DeclaredType newDeclaringType, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject)newDeclaringType, StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDeclaringType(DeclaredType newDeclaringType) {
- if (newDeclaringType != eInternalContainer() || (eContainerFeatureID != StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE && newDeclaringType != null)) {
- if (EcoreUtil.isAncestor(this, newDeclaringType))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newDeclaringType != null)
- msgs = ((InternalEObject)newDeclaringType).eInverseAdd(this, StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS, DeclaredType.class, msgs);
- msgs = basicSetDeclaringType(newDeclaringType, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE, newDeclaringType, newDeclaringType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AbstractTypeReference getReturnType() {
- if (returnType != null && returnType.eIsProxy()) {
- InternalEObject oldReturnType = (InternalEObject)returnType;
- returnType = (AbstractTypeReference)eResolveProxy(oldReturnType);
- if (returnType != oldReturnType) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, StaticTypesystemPackage.DECLARED_OPERATION__RETURN_TYPE, oldReturnType, returnType));
- }
- }
- return returnType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AbstractTypeReference basicGetReturnType() {
- return returnType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReturnType(AbstractTypeReference newReturnType) {
- AbstractTypeReference oldReturnType = returnType;
- returnType = newReturnType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, StaticTypesystemPackage.DECLARED_OPERATION__RETURN_TYPE, oldReturnType, returnType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetDeclaringType((DeclaredType)otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARED_PARAMETERS:
- return ((InternalEList<?>)getDeclaredParameters()).basicRemove(otherEnd, msgs);
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- return basicSetDeclaringType(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
- switch (eContainerFeatureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- return eInternalContainer().eInverseRemove(this, StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS, DeclaredType.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARED_PARAMETERS:
- return getDeclaredParameters();
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- return getDeclaringType();
- case StaticTypesystemPackage.DECLARED_OPERATION__RETURN_TYPE:
- if (resolve) return getReturnType();
- return basicGetReturnType();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARED_PARAMETERS:
- getDeclaredParameters().clear();
- getDeclaredParameters().addAll((Collection<? extends DeclaredParameter>)newValue);
- return;
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- setDeclaringType((DeclaredType)newValue);
- return;
- case StaticTypesystemPackage.DECLARED_OPERATION__RETURN_TYPE:
- setReturnType((AbstractTypeReference)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARED_PARAMETERS:
- getDeclaredParameters().clear();
- return;
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- setDeclaringType((DeclaredType)null);
- return;
- case StaticTypesystemPackage.DECLARED_OPERATION__RETURN_TYPE:
- setReturnType((AbstractTypeReference)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARED_PARAMETERS:
- return declaredParameters != null && !declaredParameters.isEmpty();
- case StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE:
- return getDeclaringType() != null;
- case StaticTypesystemPackage.DECLARED_OPERATION__RETURN_TYPE:
- return returnType != null;
- }
- return super.eIsSet(featureID);
- }
-
-} //DeclaredOperationImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredParameterImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredParameterImpl.java
index 871ee90..25045b8 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredParameterImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredParameterImpl.java
@@ -2,15 +2,17 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredParameterImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredParameterImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
import org.eclipse.xpand3.staticTypesystem.DeclaredParameter;
import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredPropertyImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredPropertyImpl.java
index ebb1cc5..78bfc79 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredPropertyImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredPropertyImpl.java
@@ -2,15 +2,17 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredPropertyImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredPropertyImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
import org.eclipse.xpand3.staticTypesystem.DeclaredProperty;
import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredStaticPropertyImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredStaticPropertyImpl.java
index 248f142..973c782 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredStaticPropertyImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredStaticPropertyImpl.java
@@ -2,15 +2,17 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredStaticPropertyImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredStaticPropertyImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
import org.eclipse.xpand3.staticTypesystem.DeclaredStaticProperty;
import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage;
import org.eclipse.xpand3.staticTypesystem.Type;
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 1f44f0e..70315a3 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredTypeImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredTypeImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -19,10 +19,8 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.xpand3.staticTypesystem.DeclaredOperation;
import org.eclipse.xpand3.staticTypesystem.DeclaredProperty;
import org.eclipse.xpand3.staticTypesystem.DeclaredStaticProperty;
import org.eclipse.xpand3.staticTypesystem.DeclaredType;
@@ -40,7 +38,6 @@ import org.eclipse.xtend.backend.common.BackendType;
* <ul>
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getStaticProperties <em>Static Properties</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getProperties <em>Properties</em>}</li>
- * <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getOperations <em>Operations</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getDeclaredTypeParameters <em>Declared Type Parameters</em>}</li>
* <li>{@link org.eclipse.xpand3.staticTypesystem.impl.DeclaredTypeImpl#getBackendType <em>Backend Type</em>}</li>
* </ul>
@@ -70,16 +67,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
protected EList<DeclaredProperty> properties;
/**
- * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOperations()
- * @generated
- * @ordered
- */
- protected EList<DeclaredOperation> operations;
-
- /**
* The cached value of the '{@link #getDeclaredTypeParameters() <em>Declared Type Parameters</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -157,18 +144,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
* <!-- end-user-doc -->
* @generated
*/
- public EList<DeclaredOperation> getOperations() {
- if (operations == null) {
- operations = new EObjectContainmentWithInverseEList<DeclaredOperation>(DeclaredOperation.class, this, StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS, StaticTypesystemPackage.DECLARED_OPERATION__DECLARING_TYPE);
- }
- return operations;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public EList<DeclaredTypeParameter> getDeclaredTypeParameters() {
if (declaredTypeParameters == null) {
declaredTypeParameters = new EObjectContainmentEList<DeclaredTypeParameter>(DeclaredTypeParameter.class, this, StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS);
@@ -202,21 +177,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
* <!-- end-user-doc -->
* @generated
*/
- @SuppressWarnings("unchecked")
- @Override
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getOperations()).basicAdd(otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
@@ -224,8 +184,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
return ((InternalEList<?>)getStaticProperties()).basicRemove(otherEnd, msgs);
case StaticTypesystemPackage.DECLARED_TYPE__PROPERTIES:
return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
- case StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS:
- return ((InternalEList<?>)getOperations()).basicRemove(otherEnd, msgs);
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
return ((InternalEList<?>)getDeclaredTypeParameters()).basicRemove(otherEnd, msgs);
}
@@ -244,8 +202,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
return getStaticProperties();
case StaticTypesystemPackage.DECLARED_TYPE__PROPERTIES:
return getProperties();
- case StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS:
- return getOperations();
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
return getDeclaredTypeParameters();
case StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE:
@@ -271,10 +227,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
getProperties().clear();
getProperties().addAll((Collection<? extends DeclaredProperty>)newValue);
return;
- case StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS:
- getOperations().clear();
- getOperations().addAll((Collection<? extends DeclaredOperation>)newValue);
- return;
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
getDeclaredTypeParameters().clear();
getDeclaredTypeParameters().addAll((Collection<? extends DeclaredTypeParameter>)newValue);
@@ -300,9 +252,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
case StaticTypesystemPackage.DECLARED_TYPE__PROPERTIES:
getProperties().clear();
return;
- case StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS:
- getOperations().clear();
- return;
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
getDeclaredTypeParameters().clear();
return;
@@ -325,8 +274,6 @@ public class DeclaredTypeImpl extends AbstractNamedElementImpl implements Declar
return staticProperties != null && !staticProperties.isEmpty();
case StaticTypesystemPackage.DECLARED_TYPE__PROPERTIES:
return properties != null && !properties.isEmpty();
- case StaticTypesystemPackage.DECLARED_TYPE__OPERATIONS:
- return operations != null && !operations.isEmpty();
case StaticTypesystemPackage.DECLARED_TYPE__DECLARED_TYPE_PARAMETERS:
return declaredTypeParameters != null && !declaredTypeParameters.isEmpty();
case StaticTypesystemPackage.DECLARED_TYPE__BACKEND_TYPE:
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeParameterImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeParameterImpl.java
index b54b036..6b5558a 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeParameterImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/DeclaredTypeParameterImpl.java
@@ -2,15 +2,18 @@
* <copyright>
* </copyright>
*
- * $Id: DeclaredTypeParameterImpl.java,v 1.1 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: DeclaredTypeParameterImpl.java,v 1.2 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
import java.util.Collection;
+
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+
import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
import org.eclipse.xpand3.staticTypesystem.DeclaredTypeParameter;
import org.eclipse.xpand3.staticTypesystem.StaticTypesystemPackage;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/FunctionTypeImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/FunctionTypeImpl.java
index 0322426..e0c4648 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/FunctionTypeImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/FunctionTypeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: FunctionTypeImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: FunctionTypeImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
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 90c1fc2..311a875 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemFactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemFactoryImpl.java,v 1.3 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: StaticTypesystemFactoryImpl.java,v 1.4 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -69,7 +69,6 @@ public class StaticTypesystemFactoryImpl extends EFactoryImpl implements StaticT
case StaticTypesystemPackage.WILDCARD_TYPE: return createWildcardType();
case StaticTypesystemPackage.FUNCTION_TYPE: return createFunctionType();
case StaticTypesystemPackage.DECLARED_TYPE: return createDeclaredType();
- case StaticTypesystemPackage.DECLARED_OPERATION: return createDeclaredOperation();
case StaticTypesystemPackage.DECLARED_FUNCTION: return createDeclaredFunction();
case StaticTypesystemPackage.DECLARED_PROPERTY: return createDeclaredProperty();
case StaticTypesystemPackage.DECLARED_STATIC_PROPERTY: return createDeclaredStaticProperty();
@@ -175,16 +174,6 @@ public class StaticTypesystemFactoryImpl extends EFactoryImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- public DeclaredOperation createDeclaredOperation() {
- DeclaredOperationImpl declaredOperation = new DeclaredOperationImpl();
- return declaredOperation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public DeclaredFunction createDeclaredFunction() {
DeclaredFunctionImpl declaredFunction = new DeclaredFunctionImpl();
return declaredFunction;
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 6c45911..b4dc75e 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/StaticTypesystemPackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemPackageImpl.java,v 1.3 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: StaticTypesystemPackageImpl.java,v 1.4 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
@@ -17,7 +17,6 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.xpand3.staticTypesystem.AbstractNamedElement;
import org.eclipse.xpand3.staticTypesystem.AbstractTypeReference;
import org.eclipse.xpand3.staticTypesystem.DeclaredFunction;
-import org.eclipse.xpand3.staticTypesystem.DeclaredOperation;
import org.eclipse.xpand3.staticTypesystem.DeclaredParameter;
import org.eclipse.xpand3.staticTypesystem.DeclaredProperty;
import org.eclipse.xpand3.staticTypesystem.DeclaredStaticProperty;
@@ -101,13 +100,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- private EClass declaredOperationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EClass declaredFunctionEClass = null;
/**
@@ -380,17 +372,8 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
* <!-- end-user-doc -->
* @generated
*/
- public EReference getDeclaredType_Operations() {
- return (EReference)declaredTypeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public EReference getDeclaredType_DeclaredTypeParameters() {
- return (EReference)declaredTypeEClass.getEStructuralFeatures().get(3);
+ return (EReference)declaredTypeEClass.getEStructuralFeatures().get(2);
}
/**
@@ -399,43 +382,7 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
* @generated
*/
public EAttribute getDeclaredType_BackendType() {
- return (EAttribute)declaredTypeEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getDeclaredOperation() {
- return declaredOperationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getDeclaredOperation_DeclaredParameters() {
- return (EReference)declaredOperationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getDeclaredOperation_DeclaringType() {
- return (EReference)declaredOperationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getDeclaredOperation_ReturnType() {
- return (EReference)declaredOperationEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)declaredTypeEClass.getEStructuralFeatures().get(3);
}
/**
@@ -608,15 +555,9 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
declaredTypeEClass = createEClass(DECLARED_TYPE);
createEReference(declaredTypeEClass, DECLARED_TYPE__STATIC_PROPERTIES);
createEReference(declaredTypeEClass, DECLARED_TYPE__PROPERTIES);
- createEReference(declaredTypeEClass, DECLARED_TYPE__OPERATIONS);
createEReference(declaredTypeEClass, DECLARED_TYPE__DECLARED_TYPE_PARAMETERS);
createEAttribute(declaredTypeEClass, DECLARED_TYPE__BACKEND_TYPE);
- declaredOperationEClass = createEClass(DECLARED_OPERATION);
- createEReference(declaredOperationEClass, DECLARED_OPERATION__DECLARED_PARAMETERS);
- createEReference(declaredOperationEClass, DECLARED_OPERATION__DECLARING_TYPE);
- createEReference(declaredOperationEClass, DECLARED_OPERATION__RETURN_TYPE);
-
declaredFunctionEClass = createEClass(DECLARED_FUNCTION);
createEReference(declaredFunctionEClass, DECLARED_FUNCTION__DECLARED_PARAMETERS);
createEReference(declaredFunctionEClass, DECLARED_FUNCTION__DECLARED_TYPE_PARAMETERS);
@@ -672,7 +613,6 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
wildcardTypeEClass.getESuperTypes().add(this.getAbstractTypeReference());
functionTypeEClass.getESuperTypes().add(this.getAbstractTypeReference());
declaredTypeEClass.getESuperTypes().add(this.getAbstractNamedElement());
- declaredOperationEClass.getESuperTypes().add(this.getAbstractNamedElement());
declaredFunctionEClass.getESuperTypes().add(this.getAbstractNamedElement());
declaredPropertyEClass.getESuperTypes().add(this.getAbstractNamedElement());
declaredStaticPropertyEClass.getESuperTypes().add(this.getAbstractNamedElement());
@@ -705,19 +645,13 @@ public class StaticTypesystemPackageImpl extends EPackageImpl implements StaticT
initEClass(declaredTypeEClass, DeclaredType.class, "DeclaredType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
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_Operations(), this.getDeclaredOperation(), this.getDeclaredOperation_DeclaringType(), "operations", 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(declaredOperationEClass, DeclaredOperation.class, "DeclaredOperation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getDeclaredOperation_DeclaredParameters(), this.getDeclaredParameter(), null, "declaredParameters", null, 0, -1, DeclaredOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDeclaredOperation_DeclaringType(), this.getDeclaredType(), this.getDeclaredType_Operations(), "declaringType", null, 1, 1, DeclaredOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDeclaredOperation_ReturnType(), this.getAbstractTypeReference(), null, "returnType", null, 1, 1, DeclaredOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, 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);
initEReference(getDeclaredFunction_DeclaredTypeParameters(), this.getDeclaredTypeParameter(), null, "declaredTypeParameters", null, 0, -1, DeclaredFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getDeclaredFunction_ReturnType(), this.getDeclaredType(), null, "returnType", null, 0, 1, DeclaredFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getDeclaredFunction_ReturnType(), this.getAbstractTypeReference(), null, "returnType", null, 0, 1, DeclaredFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(declaredPropertyEClass, DeclaredProperty.class, "DeclaredProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeclaredProperty_Type(), this.getAbstractTypeReference(), null, "type", null, 1, 1, DeclaredProperty.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/staticTypesystem/impl/TypeImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeImpl.java
index 8ad03ee..62a60f9 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TypeImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: TypeImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeVariableImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeVariableImpl.java
index cb6a999..4c66ede 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeVariableImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/TypeVariableImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: TypeVariableImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: TypeVariableImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/VoidTypeImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/VoidTypeImpl.java
index 8a1a2d1..c3639b4 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/VoidTypeImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/VoidTypeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: VoidTypeImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: VoidTypeImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/WildcardTypeImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/WildcardTypeImpl.java
index 90f00a0..45b1355 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/WildcardTypeImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/impl/WildcardTypeImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: WildcardTypeImpl.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: WildcardTypeImpl.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.impl;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemAdapterFactory.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemAdapterFactory.java
index 20ef8ff..6da4a81 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemAdapterFactory.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemAdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemAdapterFactory.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: StaticTypesystemAdapterFactory.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.util;
@@ -104,10 +104,6 @@ public class StaticTypesystemAdapterFactory extends AdapterFactoryImpl {
return createDeclaredTypeAdapter();
}
@Override
- public Adapter caseDeclaredOperation(DeclaredOperation object) {
- return createDeclaredOperationAdapter();
- }
- @Override
public Adapter caseDeclaredFunction(DeclaredFunction object) {
return createDeclaredFunctionAdapter();
}
@@ -260,20 +256,6 @@ public class StaticTypesystemAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.staticTypesystem.DeclaredOperation <em>Declared Operation</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.xpand3.staticTypesystem.DeclaredOperation
- * @generated
- */
- public Adapter createDeclaredOperationAdapter() {
- return null;
- }
-
- /**
* Creates a new adapter for an object of class '{@link org.eclipse.xpand3.staticTypesystem.DeclaredFunction <em>Declared Function</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemSwitch.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemSwitch.java
index a58dea1..7c70118 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemSwitch.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/staticTypesystem/util/StaticTypesystemSwitch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: StaticTypesystemSwitch.java,v 1.2 2008/03/04 14:03:38 sefftinge Exp $
+ * $Id: StaticTypesystemSwitch.java,v 1.3 2008/03/04 14:28:06 sefftinge Exp $
*/
package org.eclipse.xpand3.staticTypesystem.util;
@@ -141,13 +141,6 @@ public class StaticTypesystemSwitch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case StaticTypesystemPackage.DECLARED_OPERATION: {
- DeclaredOperation declaredOperation = (DeclaredOperation)theEObject;
- T result = caseDeclaredOperation(declaredOperation);
- if (result == null) result = caseAbstractNamedElement(declaredOperation);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
case StaticTypesystemPackage.DECLARED_FUNCTION: {
DeclaredFunction declaredFunction = (DeclaredFunction)theEObject;
T result = caseDeclaredFunction(declaredFunction);
@@ -308,21 +301,6 @@ public class StaticTypesystemSwitch<T> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Declared Operation</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Declared Operation</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseDeclaredOperation(DeclaredOperation object) {
- return null;
- }
-
- /**
* Returns the result of interpreting the object as an instance of '<em>Declared Function</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/RefTest.java b/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/RefTest.java
deleted file mode 100644
index 4015571..0000000
--- a/plugins/org.eclipse.xpand3/src/org/eclipse/xand3/analyzation/RefTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2007 itemis AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * itemis AG - Initial API and implementation
- *
- * </copyright>
- *
- */
-package org.eclipse.xand3.analyzation;
-
-import java.io.Serializable;
-
-/**
- * @author Sven Efftinge
- *
- */
-public class RefTest<T extends Serializable> implements Comparable<T>{
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- Class<RefTest> cls = RefTest.class;
- cls.getTypeParameters();
- cls.getDeclaredMethods();
-
- }
-
- /* (non-Javadoc)
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(T o) {
- // TODO Auto-generated method stub
- return 0;
- }
-
-}
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
index dc91524..0f025d7 100644
--- 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
@@ -68,7 +68,6 @@ public class BuiltinDeclarationsContributor implements DeclarationsContributor {
.createDeclaredFunction();
functions.put(backendFunction.getName(), df);
df.setName(backendFunction.getName());
-
return df;
}
/**
diff --git a/plugins/org.eclipse.xpand3/src/static_typesystem.ecore b/plugins/org.eclipse.xpand3/src/static_typesystem.ecore
index e8725ea..984a7d9 100644
--- a/plugins/org.eclipse.xpand3/src/static_typesystem.ecore
+++ b/plugins/org.eclipse.xpand3/src/static_typesystem.ecore
@@ -35,27 +35,17 @@
eType="#//DeclaredStaticProperty" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
eType="#//DeclaredProperty" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="operations" upperBound="-1"
- eType="#//DeclaredOperation" containment="true" eOpposite="#//DeclaredOperation/declaringType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="declaredTypeParameters"
upperBound="-1" eType="#//DeclaredTypeParameter" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="backendType" lowerBound="1"
eType="#//BackendType"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DeclaredOperation" eSuperTypes="#//AbstractNamedElement">
- <eStructuralFeatures xsi:type="ecore:EReference" name="declaredParameters" upperBound="-1"
- eType="#//DeclaredParameter" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="declaringType" lowerBound="1"
- eType="#//DeclaredType" eOpposite="#//DeclaredType/operations"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" lowerBound="1"
- eType="#//AbstractTypeReference"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredFunction" eSuperTypes="#//AbstractNamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="declaredParameters" upperBound="-1"
eType="#//DeclaredParameter" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="declaredTypeParameters"
upperBound="-1" eType="#//DeclaredTypeParameter" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//DeclaredType"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//AbstractTypeReference"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredProperty" eSuperTypes="#//AbstractNamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//AbstractTypeReference"/>