Attachment #149105 for bug #184048

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




 *
 * </copyright>
 *
 * $Id: BasicOCLTest.java,v 1.10 2009/10/07 16:59:09 ewillink Exp $
 */

package org.eclipse.ocl.ecore.tests;

		assertFalse(check(expr, eCls));
	}
	
	public void testIfExpressions_184048() {
		EClass eCls = EcoreFactory.eINSTANCE.createEClass();
		eCls.setName("bar"); //$NON-NLS-1$
		
		OCLExpression<EClassifier> expr = parse(
			"package ecore context EClass " + //$NON-NLS-1$
			"inv: if self.abstract then name = 'bar' else name <> 'bar' endif ->asSequence()->at(1)" + //$NON-NLS-1$
			"endpackage "); //$NON-NLS-1$
		
		assertFalse(check(expr, eCls));
		
		eCls.setAbstract(true);
		
		assertTrue(check(expr, eCls));
		
		eCls.setName("foo"); //$NON-NLS-1$
		
		assertFalse(check(expr, eCls));
		
		OCLExpression<EClassifier> expr2 = parse(
			"package ecore context EClass " + //$NON-NLS-1$
			"inv: 7 = 1 + let a : String = invalid in 1 + if self.oclIsUndefined() then 1 else 5 endif " + //$NON-NLS-1$
			"endpackage "); //$NON-NLS-1$
		assertTrue(check(expr2, eCls));
	}
	
	public void testLetExpressions() {
		EClass eCls = EcoreFactory.eINSTANCE.createEClass();
		eCls.setName("foo"); //$NON-NLS-1$

		String self = ""; //$NON-NLS-1$

		try {
			assertInvalidString("'\\\\\\ '"); //$NON-NLS-1$
			assertInvalidString("'str\\(ing'"); //$NON-NLS-1$
			assertInvalidString("'string\\'"); //$NON-NLS-1$
			assertInvalidString("'string\\9'"); //$NON-NLS-1$

			assertEquals("\\", //$NON-NLS-1$
				evaluate(helper, self, "'\\\\'")); //$NON-NLS-1$

			assertEquals("str\ning", //$NON-NLS-1$
				evaluate(helper, self, "'str\\ning'")); //$NON-NLS-1$





/**
 * <copyright>
 * 
 * Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc., 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:
 *   IBM - Initial API and implementation
 *   Zeligsoft - Bug 243976
 *
 * </copyright>
 *
 * $Id: StateExpCSImpl.java,v 1.4 2009/09/04 13:40:43 ewillink Exp $
 */
package org.eclipse.ocl.cst.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.ocl.cst.CSTPackage;
import org.eclipse.ocl.cst.SimpleNameCS;
import org.eclipse.ocl.cst.StateExpCS;

/**
 * <!-- begin-user-doc -->
 * An implementation of the model object '<em><b>State Exp CS</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.impl.StateExpCSImpl#getSimpleNames <em>Simple Names</em>}</li>
 * </ul>
 * </p>
 *
 * @generated
 */
public class StateExpCSImpl
		extends TypeCSImpl
		implements StateExpCS {

	/**
	 * The cached value of the '{@link #getSimpleNames() <em>Simple Names</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @see #getSimpleNames()
	 * @generated
	 * @ordered
	 */
	protected EList<SimpleNameCS> simpleNames;

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	protected StateExpCSImpl() {
		super();
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	protected EClass eStaticClass() {
		return CSTPackage.Literals.STATE_EXP_CS;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EList<SimpleNameCS> getSimpleNames() {
		if (simpleNames == null) {
			simpleNames = new EObjectContainmentEList<SimpleNameCS>(
				SimpleNameCS.class, this, CSTPackage.STATE_EXP_CS__SIMPLE_NAMES);
		}
		return simpleNames;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public NotificationChain eInverseRemove(InternalEObject otherEnd,
			int featureID, NotificationChain msgs) {
		switch (featureID) {
			case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
				return ((InternalEList<?>) getSimpleNames()).basicRemove(
					otherEnd, msgs);
		}
		return super.eInverseRemove(otherEnd, featureID, msgs);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
		switch (featureID) {
			case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
				return getSimpleNames();
		}
		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 CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
				getSimpleNames().clear();
				getSimpleNames().addAll(
					(Collection<? extends SimpleNameCS>) newValue);
				return;
		}
		super.eSet(featureID, newValue);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public void eUnset(int featureID) {
		switch (featureID) {
			case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
				getSimpleNames().clear();
				return;
		}
		super.eUnset(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public boolean eIsSet(int featureID) {
		switch (featureID) {
			case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
				return simpleNames != null && !simpleNames.isEmpty();
		}
		return super.eIsSet(featureID);
	}

} //StateExpCSImpl




 */
package org.eclipse.ocl.cst.impl;

import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.ocl.cst.CSTPackage;
import org.eclipse.ocl.cst.InvalidLiteralExpCS;


 * An implementation of the model object '<em><b>Invalid Literal Exp CS</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.impl.InvalidLiteralExpCSImpl#getSymbol <em>Symbol</em>}</li>
 * </ul>
 * </p>
 *
 * @generated
 */
public class InvalidLiteralExpCSImpl
		extends SimpleNameCSImpl
		implements InvalidLiteralExpCS {

	/**
	 * The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getSymbol()
	 * @generated
	 * @ordered
	 */
	protected static final String SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getSymbol()
	 * @generated
	 * @ordered
	 */
	protected String symbol = SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated

		return CSTPackage.Literals.INVALID_LITERAL_EXP_CS;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getSymbol() {
		return symbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setSymbol(String newSymbol) {
		String oldSymbol = symbol;
		symbol = newSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,
				CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL, oldSymbol, symbol));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
		switch (featureID) {
			case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
				return getSymbol();
		}
		return super.eGet(featureID, resolve, coreType);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
				setSymbol((String) newValue);
				return;
		}
		super.eSet(featureID, newValue);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public void eUnset(int featureID) {
		switch (featureID) {
			case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
				setSymbol(SYMBOL_EDEFAULT);
				return;
		}
		super.eUnset(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public boolean eIsSet(int featureID) {
		switch (featureID) {
			case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
				return SYMBOL_EDEFAULT == null
					? symbol != null
					: !SYMBOL_EDEFAULT.equals(symbol);
		}
		return super.eIsSet(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public String toString() {
		if (eIsProxy())
			return super.toString();

		StringBuffer result = new StringBuffer(super.toString());
		result.append(" (symbol: "); //$NON-NLS-1$
		result.append(symbol);
		result.append(')');
		return result.toString();
	}

} //InvalidLiteralExpCSImpl

Lines 22-27 Link Here

(-)src/org/eclipse/ocl/cst/impl/BooleanLiteralExpCSImpl.java (-2 / +113 lines)
22	import org.eclipse.emf.ecore.impl.ENotificationImpl;	22	import org.eclipse.emf.ecore.impl.ENotificationImpl;
23	import org.eclipse.ocl.cst.BooleanLiteralExpCS;	23	import org.eclipse.ocl.cst.BooleanLiteralExpCS;
24	import org.eclipse.ocl.cst.CSTPackage;	24	import org.eclipse.ocl.cst.CSTPackage;
		25	import org.eclipse.ocl.cst.LiteralExpCS;
		26	import org.eclipse.ocl.cst.PrimitiveLiteralExpCS;
25		27
26	/**	28	/**
27	* <!-- begin-user-doc -->	29	* <!-- begin-user-doc -->
Lines 30-35 Link Here
30	* <p>	32	* <p>
31	* The following features are implemented:	33	* The following features are implemented:
32	* <ul>	34	* <ul>
		35	* <li>{@link org.eclipse.ocl.cst.impl.BooleanLiteralExpCSImpl#getSymbol <em>Symbol</em>}</li>
33	* <li>{@link org.eclipse.ocl.cst.impl.BooleanLiteralExpCSImpl#getBooleanSymbol <em>Boolean Symbol</em>}</li>	36	* <li>{@link org.eclipse.ocl.cst.impl.BooleanLiteralExpCSImpl#getBooleanSymbol <em>Boolean Symbol</em>}</li>
34	* </ul>	37	* </ul>
35	* </p>	38	* </p>
Lines 37-46 Link Here
37	* @generated	40	* @generated
38	*/	41	*/
39	public class BooleanLiteralExpCSImpl	42	public class BooleanLiteralExpCSImpl
40	extends PrimitiveLiteralExpCSImpl	43	extends SimpleNameCSImpl
41	implements BooleanLiteralExpCS {	44	implements BooleanLiteralExpCS {
42		45
43	/**	46	/**
		47	* The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
		48	* <!-- begin-user-doc -->
		49	* @since 3.0
		50	* <!-- end-user-doc -->
		51	* @see #getSymbol()
		52	* @generated
		53	* @ordered
		54	*
		55	*/
		56	protected static final String SYMBOL_EDEFAULT = null;
		57
		58	/**
		59	* The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
		60	* <!-- begin-user-doc -->
		61	* @since 3.0
		62	* <!-- end-user-doc -->
		63	* @see #getSymbol()
		64	* @generated
		65	* @ordered
		66	*
		67	*/
		68	protected String symbol = SYMBOL_EDEFAULT;
		69
		70	/**
44	* The default value of the '{@link #getBooleanSymbol() <em>Boolean Symbol</em>}' attribute.	71	* The default value of the '{@link #getBooleanSymbol() <em>Boolean Symbol</em>}' attribute.
45	* <!-- begin-user-doc -->	72	* <!-- begin-user-doc -->
46	* <!-- end-user-doc -->	73	* <!-- end-user-doc -->
Lines 84-89 Link Here
84	* <!-- end-user-doc -->	111	* <!-- end-user-doc -->
85	* @generated	112	* @generated
86	*/	113	*/
		114	public String getSymbol() {
		115	return symbol;
		116	}
		117
		118	/**
		119	* <!-- begin-user-doc -->
		120	* <!-- end-user-doc -->
		121	* @generated
		122	*/
		123	public void setSymbol(String newSymbol) {
		124	String oldSymbol = symbol;
		125	symbol = newSymbol;
		126	if (eNotificationRequired())
		127	eNotify(new ENotificationImpl(this, Notification.SET,
		128	CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL, oldSymbol, symbol));
		129	}
		130
		131	/**
		132	* <!-- begin-user-doc -->
		133	* <!-- end-user-doc -->
		134	* @generated
		135	*/
87	public Boolean getBooleanSymbol() {	136	public Boolean getBooleanSymbol() {
88	return booleanSymbol;	137	return booleanSymbol;
89	}	138	}
Lines 110-115 Link Here
110	@Override	159	@Override
111	public Object eGet(int featureID, boolean resolve, boolean coreType) {	160	public Object eGet(int featureID, boolean resolve, boolean coreType) {
112	switch (featureID) {	161	switch (featureID) {
		162	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL :
		163	return getSymbol();
113	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :	164	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :
114	return getBooleanSymbol();	165	return getBooleanSymbol();
115	}	166	}
Lines 124-129 Link Here
124	@Override	175	@Override
125	public void eSet(int featureID, Object newValue) {	176	public void eSet(int featureID, Object newValue) {
126	switch (featureID) {	177	switch (featureID) {
		178	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL :
		179	setSymbol((String) newValue);
		180	return;
127	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :	181	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :
128	setBooleanSymbol((Boolean) newValue);	182	setBooleanSymbol((Boolean) newValue);
129	return;	183	return;
Lines 139-144 Link Here
139	@Override	193	@Override
140	public void eUnset(int featureID) {	194	public void eUnset(int featureID) {
141	switch (featureID) {	195	switch (featureID) {
		196	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL :
		197	setSymbol(SYMBOL_EDEFAULT);
		198	return;
142	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :	199	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :
143	setBooleanSymbol(BOOLEAN_SYMBOL_EDEFAULT);	200	setBooleanSymbol(BOOLEAN_SYMBOL_EDEFAULT);
144	return;	201	return;
Lines 154-159 Link Here
154	@Override	211	@Override
155	public boolean eIsSet(int featureID) {	212	public boolean eIsSet(int featureID) {
156	switch (featureID) {	213	switch (featureID) {
		214	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL :
		215	return SYMBOL_EDEFAULT == null
		216	? symbol != null
		217	: !SYMBOL_EDEFAULT.equals(symbol);
157	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :	218	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL :
158	return BOOLEAN_SYMBOL_EDEFAULT == null	219	return BOOLEAN_SYMBOL_EDEFAULT == null
159	? booleanSymbol != null	220	? booleanSymbol != null
Lines 168-179 Link Here
168	* @generated	229	* @generated
169	*/	230	*/
170	@Override	231	@Override
		232	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
		233	if (baseClass == LiteralExpCS.class) {
		234	switch (derivedFeatureID) {
		235	default :
		236	return -1;
		237	}
		238	}
		239	if (baseClass == PrimitiveLiteralExpCS.class) {
		240	switch (derivedFeatureID) {
		241	case CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL :
		242	return CSTPackage.PRIMITIVE_LITERAL_EXP_CS__SYMBOL;
		243	default :
		244	return -1;
		245	}
		246	}
		247	return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
		248	}
		249
		250	/**
		251	* <!-- begin-user-doc -->
		252	* <!-- end-user-doc -->
		253	* @generated
		254	*/
		255	@Override
		256	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
		257	if (baseClass == LiteralExpCS.class) {
		258	switch (baseFeatureID) {
		259	default :
		260	return -1;
		261	}
		262	}
		263	if (baseClass == PrimitiveLiteralExpCS.class) {
		264	switch (baseFeatureID) {
		265	case CSTPackage.PRIMITIVE_LITERAL_EXP_CS__SYMBOL :
		266	return CSTPackage.BOOLEAN_LITERAL_EXP_CS__SYMBOL;
		267	default :
		268	return -1;
		269	}
		270	}
		271	return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
		272	}
		273
		274	/**
		275	* <!-- begin-user-doc -->
		276	* <!-- end-user-doc -->
		277	* @generated
		278	*/
		279	@Override
171	public String toString() {	280	public String toString() {
172	if (eIsProxy())	281	if (eIsProxy())
173	return super.toString();	282	return super.toString();
174		283
175	StringBuffer result = new StringBuffer(super.toString());	284	StringBuffer result = new StringBuffer(super.toString());
176	result.append(" (booleanSymbol: "); //$NON-NLS-1$	285	result.append(" (symbol: "); //$NON-NLS-1$
		286	result.append(symbol);
		287	result.append(", booleanSymbol: "); //$NON-NLS-1$
177	result.append(booleanSymbol);	288	result.append(booleanSymbol);
178	result.append(')');	289	result.append(')');
179	return result.toString();	290	return result.toString();




import org.eclipse.ocl.cst.RealLiteralExpCS;
import org.eclipse.ocl.cst.SimpleNameCS;
import org.eclipse.ocl.cst.SimpleTypeEnum;
import org.eclipse.ocl.cst.StateExpCS;
import org.eclipse.ocl.cst.StringLiteralExpCS;
import org.eclipse.ocl.cst.TupleLiteralExpCS;
import org.eclipse.ocl.cst.TupleTypeCS;

	 * <!-- end-user-doc -->
	 * @generated
	 */
	private EClass stateExpCSEClass = null;

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	private EClass oclDocumentCSEClass = null;

	/**

	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 * 
	 */
	public EReference getOperationCallExpCS_PathNameCS() {
		return (EReference) operationCallExpCSEClass.getEStructuralFeatures()
			.get(0);
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EAttribute getOperationCallExpCS_IsAtomic() {
		return (EAttribute) operationCallExpCSEClass.getEStructuralFeatures()
			.get(1);
	}

	/**


	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EClass getStateExpCS() {
		return stateExpCSEClass;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EReference getStateExpCS_SimpleNames() {
		return (EReference) stateExpCSEClass.getEStructuralFeatures().get(0);
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 1.3
	 * <!-- end-user-doc -->
	 * @generated

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EAttribute getNullLiteralExpCS_Symbol() {
		return (EAttribute) nullLiteralExpCSEClass.getEStructuralFeatures()
			.get(0);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EClass getInvalidLiteralExpCS() {
		return invalidLiteralExpCSEClass;
	}

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EAttribute getInvalidLiteralExpCS_Symbol() {
		return (EAttribute) invalidLiteralExpCSEClass.getEStructuralFeatures()
			.get(0);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public EClass getCallExpCS() {
		return callExpCSEClass;
	}

			BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL);

		nullLiteralExpCSEClass = createEClass(NULL_LITERAL_EXP_CS);
		createEAttribute(nullLiteralExpCSEClass, NULL_LITERAL_EXP_CS__SYMBOL);

		invalidLiteralExpCSEClass = createEClass(INVALID_LITERAL_EXP_CS);
		createEAttribute(invalidLiteralExpCSEClass,
			INVALID_LITERAL_EXP_CS__SYMBOL);

		collectionRangeCSEClass = createEClass(COLLECTION_RANGE_CS);
		createEReference(collectionRangeCSEClass,

			FEATURE_CALL_EXP_CS__IS_MARKED_PRE_CS);

		operationCallExpCSEClass = createEClass(OPERATION_CALL_EXP_CS);
		createEReference(operationCallExpCSEClass,
			OPERATION_CALL_EXP_CS__PATH_NAME_CS);
		createEAttribute(operationCallExpCSEClass,
			OPERATION_CALL_EXP_CS__IS_ATOMIC);

		stateExpCSEClass = createEClass(STATE_EXP_CS);
		createEReference(stateExpCSEClass, STATE_EXP_CS__SIMPLE_NAMES);

		oclDocumentCSEClass = createEClass(OCL_DOCUMENT_CS);
		createEReference(oclDocumentCSEClass,
			OCL_DOCUMENT_CS__PACKAGE_DECLARATIONS);

		primitiveTypeCSEClass.getESuperTypes().add(this.getSimpleNameCS());
		primitiveTypeCSEClass.getESuperTypes().add(this.getTypeCS());
		tupleTypeCSEClass.getESuperTypes().add(this.getTypeCS());
		collectionTypeCSEClass.getESuperTypes().add(this.getSimpleNameCS());
		collectionTypeCSEClass.getESuperTypes().add(this.getTypeCS());
		letExpCSEClass.getESuperTypes().add(this.getOCLExpressionCS());
		ifExpCSEClass.getESuperTypes().add(this.getOCLExpressionCS());

			this.getPrimitiveLiteralExpCS());
		stringLiteralExpCSEClass.getESuperTypes().add(
			this.getPrimitiveLiteralExpCS());
		booleanLiteralExpCSEClass.getESuperTypes().add(this.getSimpleNameCS());
		booleanLiteralExpCSEClass.getESuperTypes().add(
			this.getPrimitiveLiteralExpCS());
		nullLiteralExpCSEClass.getESuperTypes().add(this.getSimpleNameCS());
		nullLiteralExpCSEClass.getESuperTypes().add(this.getLiteralExpCS());
		invalidLiteralExpCSEClass.getESuperTypes().add(this.getSimpleNameCS());
		invalidLiteralExpCSEClass.getESuperTypes().add(this.getLiteralExpCS());
		collectionRangeCSEClass.getESuperTypes().add(
			this.getCollectionLiteralPartCS());

		featureCallExpCSEClass.getESuperTypes().add(this.getCallExpCS());
		operationCallExpCSEClass.getESuperTypes().add(
			this.getFeatureCallExpCS());
		stateExpCSEClass.getESuperTypes().add(this.getTypeCS());
		oclDocumentCSEClass.getESuperTypes().add(this.getCSTNode());

		// Initialize classes and features; add operations and parameters

			nullLiteralExpCSEClass,
			NullLiteralExpCS.class,
			"NullLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEAttribute(
			getNullLiteralExpCS_Symbol(),
			ecorePackage.getEString(),
			"symbol", null, 0, 1, NullLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

		initEClass(
			invalidLiteralExpCSEClass,
			InvalidLiteralExpCS.class,
			"InvalidLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEAttribute(
			getInvalidLiteralExpCS_Symbol(),
			ecorePackage.getEString(),
			"symbol", null, 0, 1, InvalidLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

		initEClass(
			collectionRangeCSEClass,

			operationCallExpCSEClass,
			OperationCallExpCS.class,
			"OperationCallExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEReference(
			getOperationCallExpCS_PathNameCS(),
			this.getPathNameCS(),
			null,
			"pathNameCS", null, 0, 1, OperationCallExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
		initEAttribute(
			getOperationCallExpCS_IsAtomic(),
			ecorePackage.getEBooleanObject(),
			"isAtomic", "false", 0, 1, OperationCallExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$

		initEClass(
			stateExpCSEClass,
			StateExpCS.class,
			"StateExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		initEReference(
			getStateExpCS_SimpleNames(),
			this.getSimpleNameCS(),
			null,
			"simpleNames", null, 0, -1, StateExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

		initEClass(
			oclDocumentCSEClass,
			OCLDocumentCS.class,
			"OCLDocumentCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$




import org.eclipse.ocl.cst.RealLiteralExpCS;
import org.eclipse.ocl.cst.SimpleNameCS;
import org.eclipse.ocl.cst.SimpleTypeEnum;
import org.eclipse.ocl.cst.StateExpCS;
import org.eclipse.ocl.cst.StringLiteralExpCS;
import org.eclipse.ocl.cst.TupleLiteralExpCS;
import org.eclipse.ocl.cst.TupleTypeCS;

				return createFeatureCallExpCS();
			case CSTPackage.OPERATION_CALL_EXP_CS :
				return createOperationCallExpCS();
			case CSTPackage.STATE_EXP_CS :
				return createStateExpCS();
			case CSTPackage.OCL_DOCUMENT_CS :
				return createOCLDocumentCS();
			default :


	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public StateExpCS createStateExpCS() {
		StateExpCSImpl stateExpCS = new StateExpCSImpl();
		return stateExpCS;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 1.3
	 * <!-- end-user-doc -->
	 * @generated

Lines 42-48 Link Here

(-)src/org/eclipse/ocl/cst/impl/CollectionTypeCSImpl.java (-1 / +1 lines)
42	* @generated	42	* @generated
43	*/	43	*/
44	public class CollectionTypeCSImpl	44	public class CollectionTypeCSImpl
45	extends TypeCSImpl	45	extends SimpleNameCSImpl
46	implements CollectionTypeCS {	46	implements CollectionTypeCS {
47		47
48	/**	48	/**




package org.eclipse.ocl.cst.impl;

import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.ocl.cst.CSTPackage;
import org.eclipse.ocl.cst.OperationCallExpCS;
import org.eclipse.ocl.cst.PathNameCS;

/**
 * <!-- begin-user-doc -->

 * <p>
 * The following features are implemented:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.impl.OperationCallExpCSImpl#getPathNameCS <em>Path Name CS</em>}</li>
 *   <li>{@link org.eclipse.ocl.cst.impl.OperationCallExpCSImpl#getIsAtomic <em>Is Atomic</em>}</li>
 * </ul>
 * </p>

		implements OperationCallExpCS {

	/**
	 * The cached value of the '{@link #getPathNameCS() <em>Path Name CS</em>}' containment reference.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @see #getPathNameCS()
	 * @generated
	 * @ordered
	 * 
	 */
	protected PathNameCS pathNameCS;

	/**
	 * The default value of the '{@link #getIsAtomic() <em>Is Atomic</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * @since 3.0

	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 * 
	 */
	public PathNameCS getPathNameCS() {
		return pathNameCS;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 * 
	 */
	public NotificationChain basicSetPathNameCS(PathNameCS newPathNameCS,
			NotificationChain msgs) {
		PathNameCS oldPathNameCS = pathNameCS;
		pathNameCS = newPathNameCS;
		if (eNotificationRequired()) {
			ENotificationImpl notification = new ENotificationImpl(this,
				Notification.SET,
				CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, oldPathNameCS,
				newPathNameCS);
			if (msgs == null)
				msgs = notification;
			else
				msgs.add(notification);
		}
		return msgs;
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setPathNameCS(PathNameCS newPathNameCS) {
		if (newPathNameCS != pathNameCS) {
			NotificationChain msgs = null;
			if (pathNameCS != null)
				msgs = ((InternalEObject) pathNameCS).eInverseRemove(this,
					EOPPOSITE_FEATURE_BASE
						- CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, null,
					msgs);
			if (newPathNameCS != null)
				msgs = ((InternalEObject) newPathNameCS).eInverseAdd(this,
					EOPPOSITE_FEATURE_BASE
						- CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, null,
					msgs);
			msgs = basicSetPathNameCS(newPathNameCS, msgs);
			if (msgs != null)
				msgs.dispatch();
		} else if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,
				CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, newPathNameCS,
				newPathNameCS));
	}

	/**
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Boolean getIsAtomic() {
		return isAtomic;

	 * @generated
	 */
	@Override
	public NotificationChain eInverseRemove(InternalEObject otherEnd,
			int featureID, NotificationChain msgs) {
		switch (featureID) {
			case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
				return basicSetPathNameCS(null, msgs);
		}
		return super.eInverseRemove(otherEnd, featureID, msgs);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
		switch (featureID) {
			case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
				return getPathNameCS();
			case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
				return getIsAtomic();
		}

	@Override
	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
				setPathNameCS((PathNameCS) newValue);
				return;
			case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
				setIsAtomic((Boolean) newValue);
				return;

	@Override
	public void eUnset(int featureID) {
		switch (featureID) {
			case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
				setPathNameCS((PathNameCS) null);
				return;
			case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
				setIsAtomic(IS_ATOMIC_EDEFAULT);
				return;

	@Override
	public boolean eIsSet(int featureID) {
		switch (featureID) {
			case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
				return pathNameCS != null;
			case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
				return IS_ATOMIC_EDEFAULT == null
					? isAtomic != null




 */
package org.eclipse.ocl.cst.impl;

import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.ocl.cst.CSTPackage;
import org.eclipse.ocl.cst.NullLiteralExpCS;


 * An implementation of the model object '<em><b>Null Literal Exp CS</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.impl.NullLiteralExpCSImpl#getSymbol <em>Symbol</em>}</li>
 * </ul>
 * </p>
 *
 * @generated
 */
public class NullLiteralExpCSImpl
		extends SimpleNameCSImpl
		implements NullLiteralExpCS {

	/**
	 * The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getSymbol()
	 * @generated
	 * @ordered
	 */
	protected static final String SYMBOL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getSymbol()
	 * @generated
	 * @ordered
	 */
	protected String symbol = SYMBOL_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated

		return CSTPackage.Literals.NULL_LITERAL_EXP_CS;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getSymbol() {
		return symbol;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setSymbol(String newSymbol) {
		String oldSymbol = symbol;
		symbol = newSymbol;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET,
				CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL, oldSymbol, symbol));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
		switch (featureID) {
			case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
				return getSymbol();
		}
		return super.eGet(featureID, resolve, coreType);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public void eSet(int featureID, Object newValue) {
		switch (featureID) {
			case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
				setSymbol((String) newValue);
				return;
		}
		super.eSet(featureID, newValue);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public void eUnset(int featureID) {
		switch (featureID) {
			case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
				setSymbol(SYMBOL_EDEFAULT);
				return;
		}
		super.eUnset(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public boolean eIsSet(int featureID) {
		switch (featureID) {
			case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
				return SYMBOL_EDEFAULT == null
					? symbol != null
					: !SYMBOL_EDEFAULT.equals(symbol);
		}
		return super.eIsSet(featureID);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override
	public String toString() {
		if (eIsProxy())
			return super.toString();

		StringBuffer result = new StringBuffer(super.toString());
		result.append(" (symbol: "); //$NON-NLS-1$
		result.append(symbol);
		result.append(')');
		return result.toString();
	}

} //NullLiteralExpCSImpl




/**
 * <copyright>
 * 
 * Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc., 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:
 *   IBM - Initial API and implementation
 *   Zeligsoft - Bug 243976
 *
 * </copyright>
 *
 * $Id: StateExpCS.java,v 1.4 2009/09/04 13:40:44 ewillink Exp $
 */
package org.eclipse.ocl.cst;

import org.eclipse.emf.common.util.EList;

/**
 * <!-- begin-user-doc -->
 * A representation of the model object '<em><b>State Exp CS</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.StateExpCS#getSimpleNames <em>Simple Names</em>}</li>
 * </ul>
 * </p>
 *
 * @see org.eclipse.ocl.cst.CSTPackage#getStateExpCS()
 * @model
 * @generated
 * @noimplement This interface is not intended to be implemented by clients.
 * @noextend This interface is not intended to be extended by clients.
 */
public interface StateExpCS
		extends TypeCS {

	/**
	 * Returns the value of the '<em><b>Simple Names</b></em>' containment reference list.
	 * The list contents are of type {@link org.eclipse.ocl.cst.SimpleNameCS}.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Simple Names</em>' containment reference list isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Simple Names</em>' containment reference list.
	 * @see org.eclipse.ocl.cst.CSTPackage#getStateExpCS_SimpleNames()
	 * @model containment="true"
	 * @generated
	 */
	EList<SimpleNameCS> getSimpleNames();

} // StateExpCS




 * A representation of the model object '<em><b>Invalid Literal Exp CS</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.InvalidLiteralExpCS#getSymbol <em>Symbol</em>}</li>
 * </ul>
 * </p>
 *
 * @see org.eclipse.ocl.cst.CSTPackage#getInvalidLiteralExpCS()
 * @model

 * @noextend This interface is not intended to be extended by clients.
 */
public interface InvalidLiteralExpCS
		extends SimpleNameCS, LiteralExpCS {

	/**
	 * Returns the value of the '<em><b>Symbol</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Symbol</em>' attribute.
	 * @see #setSymbol(String)
	 * @see org.eclipse.ocl.cst.CSTPackage#getInvalidLiteralExpCS_Symbol()
	 * @model
	 * @generated
	 */
	String getSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.cst.InvalidLiteralExpCS#getSymbol <em>Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Symbol</em>' attribute.
	 * @see #getSymbol()
	 * @generated
	 */
	void setSymbol(String value);

} // InvalidLiteralExpCS

Lines 36-42 Link Here

(-)src/org/eclipse/ocl/cst/BooleanLiteralExpCS.java (-1 / +1 lines)
36	* @noextend This interface is not intended to be extended by clients.	36	* @noextend This interface is not intended to be extended by clients.
37	*/	37	*/
38	public interface BooleanLiteralExpCS	38	public interface BooleanLiteralExpCS
39	extends PrimitiveLiteralExpCS {	39	extends SimpleNameCS, PrimitiveLiteralExpCS {
40		40
41	/**	41	/**
42	* Returns the value of the '<em><b>Boolean Symbol</b></em>' attribute.	42	* Returns the value of the '<em><b>Boolean Symbol</b></em>' attribute.




	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__START_OFFSET = SIMPLE_NAME_CS__START_OFFSET;

	/**
	 * The feature id for the '<em><b>End Offset</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__END_OFFSET = SIMPLE_NAME_CS__END_OFFSET;

	/**
	 * The feature id for the '<em><b>Start Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__START_TOKEN = SIMPLE_NAME_CS__START_TOKEN;

	/**
	 * The feature id for the '<em><b>End Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__END_TOKEN = SIMPLE_NAME_CS__END_TOKEN;

	/**
	 * The feature id for the '<em><b>Ast</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__AST = SIMPLE_NAME_CS__AST;

	/**
	 * The feature id for the '<em><b>Value</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__VALUE = SIMPLE_NAME_CS__VALUE;

	/**
	 * The feature id for the '<em><b>Type</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__TYPE = SIMPLE_NAME_CS__TYPE;

	/**
	 * The feature id for the '<em><b>Collection Type Identifier</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__COLLECTION_TYPE_IDENTIFIER = SIMPLE_NAME_CS_FEATURE_COUNT + 0;

	/**
	 * The feature id for the '<em><b>Type CS</b></em>' containment reference.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS__TYPE_CS = SIMPLE_NAME_CS_FEATURE_COUNT + 1;

	/**
	 * The number of structural features of the '<em>Collection Type CS</em>' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_CS_FEATURE_COUNT = SIMPLE_NAME_CS_FEATURE_COUNT + 2;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.impl.LetExpCSImpl <em>Let Exp CS</em>}' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__START_OFFSET = SIMPLE_NAME_CS__START_OFFSET;

	/**
	 * The feature id for the '<em><b>End Offset</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__END_OFFSET = SIMPLE_NAME_CS__END_OFFSET;

	/**
	 * The feature id for the '<em><b>Start Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__START_TOKEN = SIMPLE_NAME_CS__START_TOKEN;

	/**
	 * The feature id for the '<em><b>End Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__END_TOKEN = SIMPLE_NAME_CS__END_TOKEN;

	/**
	 * The feature id for the '<em><b>Ast</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__AST = SIMPLE_NAME_CS__AST;

	/**
	 * The feature id for the '<em><b>Value</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__VALUE = SIMPLE_NAME_CS__VALUE;

	/**
	 * The feature id for the '<em><b>Type</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__TYPE = SIMPLE_NAME_CS__TYPE;

	/**
	 * The feature id for the '<em><b>Symbol</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__SYMBOL = SIMPLE_NAME_CS_FEATURE_COUNT + 0;

	/**
	 * The feature id for the '<em><b>Boolean Symbol</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL = SIMPLE_NAME_CS_FEATURE_COUNT + 1;

	/**
	 * The number of structural features of the '<em>Boolean Literal Exp CS</em>' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int BOOLEAN_LITERAL_EXP_CS_FEATURE_COUNT = SIMPLE_NAME_CS_FEATURE_COUNT + 2;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.impl.NullLiteralExpCSImpl <em>Null Literal Exp CS</em>}' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__START_OFFSET = SIMPLE_NAME_CS__START_OFFSET;

	/**
	 * The feature id for the '<em><b>End Offset</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__END_OFFSET = SIMPLE_NAME_CS__END_OFFSET;

	/**
	 * The feature id for the '<em><b>Start Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__START_TOKEN = SIMPLE_NAME_CS__START_TOKEN;

	/**
	 * The feature id for the '<em><b>End Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__END_TOKEN = SIMPLE_NAME_CS__END_TOKEN;

	/**
	 * The feature id for the '<em><b>Ast</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__AST = SIMPLE_NAME_CS__AST;

	/**
	 * The feature id for the '<em><b>Value</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__VALUE = SIMPLE_NAME_CS__VALUE;

	/**
	 * The feature id for the '<em><b>Type</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS__TYPE = SIMPLE_NAME_CS__TYPE;

	/**
	 * The number of structural features of the '<em>Null Literal Exp CS</em>' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int NULL_LITERAL_EXP_CS_FEATURE_COUNT = SIMPLE_NAME_CS_FEATURE_COUNT + 0;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.impl.InvalidLiteralExpCSImpl <em>Invalid Literal Exp CS</em>}' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__START_OFFSET = SIMPLE_NAME_CS__START_OFFSET;

	/**
	 * The feature id for the '<em><b>End Offset</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__END_OFFSET = SIMPLE_NAME_CS__END_OFFSET;

	/**
	 * The feature id for the '<em><b>Start Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__START_TOKEN = SIMPLE_NAME_CS__START_TOKEN;

	/**
	 * The feature id for the '<em><b>End Token</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__END_TOKEN = SIMPLE_NAME_CS__END_TOKEN;

	/**
	 * The feature id for the '<em><b>Ast</b></em>' attribute.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__AST = SIMPLE_NAME_CS__AST;

	/**
	 * The feature id for the '<em><b>Value</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__VALUE = SIMPLE_NAME_CS__VALUE;

	/**
	 * The feature id for the '<em><b>Type</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS__TYPE = SIMPLE_NAME_CS__TYPE;

	/**
	 * The number of structural features of the '<em>Invalid Literal Exp CS</em>' class.

	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int INVALID_LITERAL_EXP_CS_FEATURE_COUNT = SIMPLE_NAME_CS_FEATURE_COUNT + 0;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.impl.CollectionRangeCSImpl <em>Collection Range CS</em>}' class.

	int OPERATION_CALL_EXP_CS__IS_MARKED_PRE_CS = FEATURE_CALL_EXP_CS__IS_MARKED_PRE_CS;

	/**
	 * The feature id for the '<em><b>Path Name CS</b></em>' containment reference.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int OPERATION_CALL_EXP_CS__IS_ATOMIC = FEATURE_CALL_EXP_CS_FEATURE_COUNT + 0;

	/**
	 * The number of structural features of the '<em>Operation Call Exp CS</em>' class.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int OPERATION_CALL_EXP_CS_FEATURE_COUNT = FEATURE_CALL_EXP_CS_FEATURE_COUNT + 1;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.impl.StateExpCSImpl <em>State Exp CS</em>}' class.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see org.eclipse.ocl.cst.impl.StateExpCSImpl
	 * @see org.eclipse.ocl.cst.impl.CSTPackageImpl#getStateExpCS()
	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int STATE_EXP_CS = 49;

	/**
	 * The feature id for the '<em><b>Start Offset</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int STATE_EXP_CS__START_OFFSET = TYPE_CS__START_OFFSET;

	/**
	 * The feature id for the '<em><b>End Offset</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int STATE_EXP_CS__END_OFFSET = TYPE_CS__END_OFFSET;

	/**
	 * The feature id for the '<em><b>Start Token</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int STATE_EXP_CS__START_TOKEN = TYPE_CS__START_TOKEN;

	/**
	 * The feature id for the '<em><b>End Token</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int STATE_EXP_CS__END_TOKEN = TYPE_CS__END_TOKEN;

	/**
	 * The feature id for the '<em><b>Ast</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int OPERATION_CALL_EXP_CS__PATH_NAME_CS = FEATURE_CALL_EXP_CS_FEATURE_COUNT + 0;

	/**
	 * The feature id for the '<em><b>Is Atomic</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int OPERATION_CALL_EXP_CS__IS_ATOMIC = FEATURE_CALL_EXP_CS_FEATURE_COUNT + 1;

	/**
	 * The number of structural features of the '<em>Operation Call Exp CS</em>' class.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int OPERATION_CALL_EXP_CS_FEATURE_COUNT = FEATURE_CALL_EXP_CS_FEATURE_COUNT + 2;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.impl.OCLDocumentCSImpl <em>OCL Document CS</em>}' class.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int OCL_DOCUMENT_CS = 49;

	/**
	 * The feature id for the '<em><b>Start Offset</b></em>' attribute.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int SIMPLE_TYPE_ENUM = 50;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.PrePostOrBodyEnum <em>Pre Post Or Body Enum</em>}' enum.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int PRE_POST_OR_BODY_ENUM = 51;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.CollectionTypeIdentifierEnum <em>Collection Type Identifier Enum</em>}' enum.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int COLLECTION_TYPE_IDENTIFIER_ENUM = 52;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.MessageExpKind <em>Message Exp Kind</em>}' enum.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int MESSAGE_EXP_KIND = 53;

	/**
	 * The meta object id for the '{@link org.eclipse.ocl.cst.DotOrArrowEnum <em>Dot Or Arrow Enum</em>}' enum.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int DOT_OR_ARROW_ENUM = 54;

	/**
	 * The meta object id for the '<em>IToken</em>' data type.

	 * @generated
	 * @noreference This field is not intended to be referenced by clients.
	 */
	int ITOKEN = 55;

	/**
	 * Returns the meta object for class '{@link org.eclipse.ocl.cst.CSTNode <em>Node</em>}'.

	EClass getNullLiteralExpCS();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.ocl.cst.NullLiteralExpCS#getSymbol <em>Symbol</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Symbol</em>'.
	 * @see org.eclipse.ocl.cst.NullLiteralExpCS#getSymbol()
	 * @see #getNullLiteralExpCS()
	 * @generated
	 */
	EAttribute getNullLiteralExpCS_Symbol();

	/**
	 * Returns the meta object for class '{@link org.eclipse.ocl.cst.InvalidLiteralExpCS <em>Invalid Literal Exp CS</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	EClass getInvalidLiteralExpCS();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.ocl.cst.InvalidLiteralExpCS#getSymbol <em>Symbol</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Symbol</em>'.
	 * @see org.eclipse.ocl.cst.InvalidLiteralExpCS#getSymbol()
	 * @see #getInvalidLiteralExpCS()
	 * @generated
	 */
	EAttribute getInvalidLiteralExpCS_Symbol();

	/**
	 * Returns the meta object for class '{@link org.eclipse.ocl.cst.CollectionRangeCS <em>Collection Range CS</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	EClass getOperationCallExpCS();

	/**
	 * Returns the meta object for the containment reference '{@link org.eclipse.ocl.cst.OperationCallExpCS#getPathNameCS <em>Path Name CS</em>}'.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the meta object for the containment reference '<em>Path Name CS</em>'.
	 * @see org.eclipse.ocl.cst.OperationCallExpCS#getPathNameCS()
	 * @see #getOperationCallExpCS()
	 * @generated
	 * 
	 */
	EReference getOperationCallExpCS_PathNameCS();

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.ocl.cst.OperationCallExpCS#getIsAtomic <em>Is Atomic</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for class '<em>State Exp CS</em>'.
	 * @see org.eclipse.ocl.cst.StateExpCS
	 * @generated
	 */
	EClass getStateExpCS();

	/**
	 * Returns the meta object for the containment reference list '{@link org.eclipse.ocl.cst.StateExpCS#getSimpleNames <em>Simple Names</em>}'.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Is Atomic</em>'.
	 * @see org.eclipse.ocl.cst.OperationCallExpCS#getIsAtomic()
	 * @see #getOperationCallExpCS()
	 * @generated
	 */
	EAttribute getOperationCallExpCS_IsAtomic();

	/**
	 * Returns the meta object for class '{@link org.eclipse.ocl.cst.OCLDocumentCS <em>OCL Document CS</em>}'.

		EClass NULL_LITERAL_EXP_CS = eINSTANCE.getNullLiteralExpCS();

		/**
		 * The meta object literal for the '<em><b>Symbol</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute NULL_LITERAL_EXP_CS__SYMBOL = eINSTANCE
			.getNullLiteralExpCS_Symbol();

		/**
		 * The meta object literal for the '{@link org.eclipse.ocl.cst.impl.InvalidLiteralExpCSImpl <em>Invalid Literal Exp CS</em>}' class.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->

		EClass INVALID_LITERAL_EXP_CS = eINSTANCE.getInvalidLiteralExpCS();

		/**
		 * The meta object literal for the '<em><b>Symbol</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute INVALID_LITERAL_EXP_CS__SYMBOL = eINSTANCE
			.getInvalidLiteralExpCS_Symbol();

		/**
		 * The meta object literal for the '{@link org.eclipse.ocl.cst.impl.CollectionRangeCSImpl <em>Collection Range CS</em>}' class.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->

		EClass OPERATION_CALL_EXP_CS = eINSTANCE.getOperationCallExpCS();

		/**
		 * The meta object literal for the '<em><b>Path Name CS</b></em>' containment reference feature.
		 * <!-- begin-user-doc -->
		 * @since 3.0
		 * <!-- end-user-doc -->
		 * @generated
		 * 
		 */
		EReference OPERATION_CALL_EXP_CS__PATH_NAME_CS = eINSTANCE
			.getOperationCallExpCS_PathNameCS();

		/**
		 * The meta object literal for the '<em><b>Is Atomic</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @see org.eclipse.ocl.cst.impl.StateExpCSImpl
		 * @see org.eclipse.ocl.cst.impl.CSTPackageImpl#getStateExpCS()
		 * @generated
		 */
		EClass STATE_EXP_CS = eINSTANCE.getStateExpCS();

		/**
		 * The meta object literal for the '<em><b>Simple Names</b></em>' containment reference list feature.
		 * <!-- begin-user-doc -->
		 * @since 3.0
		 * <!-- end-user-doc -->
		 * @generated
		 */
		EAttribute OPERATION_CALL_EXP_CS__IS_ATOMIC = eINSTANCE
			.getOperationCallExpCS_IsAtomic();

		/**
		 * The meta object literal for the '{@link org.eclipse.ocl.cst.impl.OCLDocumentCSImpl <em>OCL Document CS</em>}' class.




 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.OperationCallExpCS#getPathNameCS <em>Path Name CS</em>}</li>
 *   <li>{@link org.eclipse.ocl.cst.OperationCallExpCS#getIsAtomic <em>Is Atomic</em>}</li>
 * </ul>
 * </p>

		extends FeatureCallExpCS {

	/**
	 * Returns the value of the '<em><b>Path Name CS</b></em>' containment reference.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Path Name CS</em>' containment reference isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * 
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Path Name CS</em>' containment reference.
	 * @see #setPathNameCS(PathNameCS)
	 * @see org.eclipse.ocl.cst.CSTPackage#getOperationCallExpCS_PathNameCS()
	 * @model containment="true"
	 * @generated
	 * 
	 */
	PathNameCS getPathNameCS();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.cst.OperationCallExpCS#getPathNameCS <em>Path Name CS</em>}' containment reference.
	 * <!-- begin-user-doc -->
	 * @since 3.0
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Path Name CS</em>' containment reference.
	 * @see #getPathNameCS()
	 * @generated
	 * 
	 */
	void setPathNameCS(PathNameCS value);

	/**
	 * Returns the value of the '<em><b>Is Atomic</b></em>' attribute.
	 * The default value is <code>"false"</code>.
	 * <!-- begin-user-doc -->




	OperationCallExpCS createOperationCallExpCS();

	/**
	 * Returns a new object of class '<em>State Exp CS</em>'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return a new object of class '<em>State Exp CS</em>'.
	 * @generated
	 */
	StateExpCS createStateExpCS();

	/**
	 * Returns a new object of class '<em>OCL Document CS</em>'.
	 * <!-- begin-user-doc -->
	 * @since 1.3

Lines 37-43 Link Here

(-)src/org/eclipse/ocl/cst/CollectionTypeCS.java (-1 / +1 lines)
37	* @noextend This interface is not intended to be extended by clients.	37	* @noextend This interface is not intended to be extended by clients.
38	*/	38	*/
39	public interface CollectionTypeCS	39	public interface CollectionTypeCS
40	extends TypeCS {	40	extends SimpleNameCS, TypeCS {
41		41
42	/**	42	/**
43	* Returns the value of the '<em><b>Collection Type Identifier</b></em>' attribute.	43	* Returns the value of the '<em><b>Collection Type Identifier</b></em>' attribute.




 * A representation of the model object '<em><b>Null Literal Exp CS</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * <ul>
 *   <li>{@link org.eclipse.ocl.cst.NullLiteralExpCS#getSymbol <em>Symbol</em>}</li>
 * </ul>
 * </p>
 *
 * @see org.eclipse.ocl.cst.CSTPackage#getNullLiteralExpCS()
 * @model

 * @noextend This interface is not intended to be extended by clients.
 */
public interface NullLiteralExpCS
		extends SimpleNameCS, LiteralExpCS {

	/**
	 * Returns the value of the '<em><b>Symbol</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Symbol</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Symbol</em>' attribute.
	 * @see #setSymbol(String)
	 * @see org.eclipse.ocl.cst.CSTPackage#getNullLiteralExpCS_Symbol()
	 * @model
	 * @generated
	 */
	String getSymbol();

	/**
	 * Sets the value of the '{@link org.eclipse.ocl.cst.NullLiteralExpCS#getSymbol <em>Symbol</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Symbol</em>' attribute.
	 * @see #getSymbol()
	 * @generated
	 */
	void setSymbol(String value);

} // NullLiteralExpCS




 * Contributors: 
 *   IBM - Initial API and implementation
 *   E.D.Willink - refactored to separate from OCLAnalyzer and OCLParser
 *               - Bugs 184048, 237126, 245586, 213886, 242236, 259818, 259819
 *   Adolfo Sánchez-Barbudo Herrera - Bug 237441
 *   Zeligsoft - Bugs 243526, 243079, 245586 (merging and docs), 213886, 179990,
 *               255599, 251349, 242236, 259740

 *
 * </copyright>
 *
 * $Id: AbstractOCLAnalyzer.java,v 1.30 2009/09/04 13:40:43 ewillink Exp $
 */
package org.eclipse.ocl.parser;


import org.eclipse.ocl.cst.RealLiteralExpCS;
import org.eclipse.ocl.cst.SimpleNameCS;
import org.eclipse.ocl.cst.SimpleTypeEnum;
import org.eclipse.ocl.cst.StateExpCS;
import org.eclipse.ocl.cst.StringLiteralExpCS;
import org.eclipse.ocl.cst.TupleLiteralExpCS;
import org.eclipse.ocl.cst.TupleTypeCS;

			case OCLParsersym.TK_collectNested :
			case OCLParsersym.TK_sortedBy :
			case OCLParsersym.TK_closure :
			case OCLParsersym.TK_oclIsKindOf :
			case OCLParsersym.TK_oclIsTypeOf :
			case OCLParsersym.TK_oclAsType :
			case OCLParsersym.TK_oclIsNew :
			case OCLParsersym.TK_oclIsUndefined :
			case OCLParsersym.TK_oclIsInvalid :
			case OCLParsersym.TK_oclIsInState :
			case OCLParsersym.TK_allInstances :
			case OCLParsersym.TK_String :
			case OCLParsersym.TK_Integer :
			case OCLParsersym.TK_UnlimitedNatural :

			initASTMapping(packageEnv, createDummyPackage(env,
				packageDeclarationCS), packageDeclarationCS);
		} else {
			pathname = createSequenceOfNames(pathNameCS, null);
			try {
				packageEnv = createPackageContext(getOCLEnvironment(), pathname);
				if (packageEnv != null) {


		O operation = null;
		C classifier = null;
		EList<String> className = createSequenceOfNames(operationCS.getPathNameCS(), null);
			.getSimpleNames());
		String operationName = operationCS.getSimpleNameCS().getValue();
		EList<String> qualifiedOperationName = new BasicEList<String>();
		qualifiedOperationName.addAll(className);

			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env,
			List<CT> constraints) {

		EList<String> pathName = createSequenceOfNames(propertyContextCS.getPathNameCS(), null);
			.getSimpleNames());
		C owner = lookupClassifier(propertyContextCS.getPathNameCS(), env,
			pathName);


		Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> result = null;

		PathNameCS pathNameCS = classifierContextDeclCS.getPathNameCS();
		EList<String> pathName = createSequenceOfNames(pathNameCS, null);
		C type = lookupClassifier(pathNameCS, env, pathName);

		if (type == null) {

			astNode = primitiveTypeCS(((PrimitiveTypeCS) typeCS).getType(), env);
			typeCS.setAst(astNode);
		} else if (typeCS instanceof PathNameCS) {
			EList<String> pathName = createSequenceOfNames((PathNameCS) typeCS, null);
			astNode = lookupClassifier(typeCS, env, pathName);
			if (astNode == null) {
				String message = OCLMessages.bind(

	 * @param env
	 *            the OCL environment
	 * @return a <code>StateExp</code> representing the state
	 * @since 3.0
	 */
	protected StateExp<C, S> stateExpCS(OCLExpression<C> source,
			CSTNode stateExpCS, EList<String> statePath,
			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env) {

		C sourceType = null;


		S state = null;

		EList<String> statePath = createSequenceOfNames(stateExpCS.getSimpleNames());

		if (!statePath.isEmpty()) {
			// to support content-assist, we can parse an expression that
			// has no state, to provide suggestions for the first part


		OCLExpression<C> astNode = null;

		EList<String> sequenceOfNames = createSequenceOfNames(enumLiteralExpCS.getPathNameCS(), null);
		EList<String> sequenceOfNames = createSequenceOfNames(simpleNames);
		String lastToken = enumLiteralExpCS.getSimpleNameCS().getValue();

		EL literal = null;

			OperationCallExpCS operationCallExpCS,
			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env) {

		if (ParsingOptions.getValue(env, ParsingOptions.WARN_OF_XOR_OR_AND_PRECEDENCE_CHANGE)) {
			checkForXorOrAndPrecedenceHazard(operationCallExpCS);
		}

		OperationCallExp<C, O> astNode = null;

		List<OCLExpression<C>> args = new java.util.ArrayList<OCLExpression<C>>();
		// boolean isMarkedPre = false;

		String name = operationCallExpCS.getSimpleNameCS().getValue();
		int operator = operationCallExpCS.getAccessor().getValue();

		/*
		 * The type of the operation is specified by a path expression or self,
		 * or by an explicit source expression. The source expression may be a
		 * collection type (-> operation) or a regular navigation expression (.
		 * operation)
		 */
		OCLExpression<C> source = null;
		if (operator == DotOrArrowEnum.ARROW) {
			return arrowOperationCallExpCS(operationCallExpCS, env);
		}
		OCLExpressionCS sourceCS = operationCallExpCS.getSource();
		if ((sourceCS == null) && (operationCallExpCS.getPathNameCS() != null)) {
			return staticOperationCallExpCS(operationCallExpCS, env);
			if (sourceCS instanceof PathNameCS) {
				// static operation call
				PathNameCS pathName = (PathNameCS) sourceCS;

				EList<String> pathNames = createSequenceOfNames(pathName
					.getSimpleNames());
				C sourceType = lookupClassifier(sourceCS, env, pathNames);
				if (sourceType == null) {
					String message = OCLMessages.bind(
						OCLMessages.UnrecognizedType_ERROR_, pathNames);
					ERROR(sourceCS, "operatonCallExpCS", message);//$NON-NLS-1$
				} else {
					source = typeCS(sourceCS, env, sourceType);
				}
			} else {
				source = oclExpressionCS(operationCallExpCS.getSource(), env);
			}
		}

		String operationName = operationCallExpCS.getSimpleNameCS().getValue();

		if (PredefinedType.OCL_IS_IN_STATE_NAME.equals(operationName)) {
			return oclIsInStateOperationCallExpCS(operationCallExpCS, env);
				String message = OCLMessages.bind(
					OCLMessages.IsInStateSignature_ERROR_,
					computeInputString(operationCallExpCS));
				ERROR(operationCallExpCS, "operationCallExpCS", message);//$NON-NLS-1$
			}

			if (!operationCallExpCS.getArguments().isEmpty()) {
				OCLExpressionCS arg = operationCallExpCS.getArguments().get(0);

				if (arg instanceof StateExpCS) {
					args.add(stateExpCS(source, (StateExpCS) arg, env));
				} else {
					String message = OCLMessages.bind(
						OCLMessages.IsInStateSignature_ERROR_,
						computeInputString(operationCallExpCS));
					ERROR(arg, "operationCallExpCS", message);//$NON-NLS-1$
				}
			}
		} else {
			for (OCLExpressionCS arg : operationCallExpCS.getArguments()) {
				OCLExpression<C> argExpr = oclExpressionCS(arg, env);
				if (argExpr == null) {
					argExpr = createDummyInvalidLiteralExp(env, arg);
					initASTMapping(env, argExpr, arg);
				}
				args.add(argExpr);
			}
		}
		if (ParsingOptions.getValue(env, ParsingOptions.WARN_OF_XOR_OR_AND_PRECEDENCE_CHANGE)) {
			checkForXorOrAndPrecedenceHazard(operationCallExpCS);
		}
		OCLExpression<C> source = oclExpressionCS(operationCallExpCS.getSource(), env);
		List<OCLExpression<C>> args = argumentsCS(operationCallExpCS, env);
		if (source == null) { 						// create an implicit source
			source = createImplicitSource(operationCallExpCS, env, args);
			if (implicitSource == null) {
				String errMessage = name + "(";//$NON-NLS-1$
				for (int i = 0; i < args.size(); i++) {
					if (i > 0) {
						errMessage += ", ";//$NON-NLS-1$
					}
					errMessage += uml.getName(args.get(i).getType());
				}
				errMessage += ")";//$NON-NLS-1$
				String message = OCLMessages.bind(
					OCLMessages.IllegalSignature_ERROR_, errMessage);
				ERROR(operationCallExpCS, "operationCallExpCS", message); //$NON-NLS-1$
			}

			if (implicitSource != null) {
				vexp.setType(implicitSource.getType());
				vexp.setReferredVariable(implicitSource);
			} else {
				vexp.setType(getOclVoid());
			}

			source = vexp;
		}

		/*

		// if the sourceType is a TypeType then this must be a static operation
		boolean isStatic = operationSourceType instanceof TypeType<?, ?>;

		OperationCallExp<C, O> astNode = genOperationCallExp(env, operationCallExpCS,
			"operationCallExpCS", operationName,//$NON-NLS-1$
			source, operationSourceType, args);
		if (isStatic) {

		return result;
	}

	/**
	 * @since 3.0
	 */
	protected OCLExpression<C> createImplicitSource(OperationCallExpCS operationCallExpCS,
			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env,
			List<OCLExpression<C>> args) {

		String operationName = operationCallExpCS.getSimpleNameCS().getValue();
		Variable<C, PM> implicitSource = lookupImplicitSourceForOperation(
			operationCallExpCS, env, args, operationName);
		VariableExp<C, PM> vexp = createVariableExp(env, operationCallExpCS, implicitSource);

		if (implicitSource == null) {
			String errMessage = operationName + "(";//$NON-NLS-1$
			for (int i = 0; i < args.size(); i++) {
				if (i > 0) {
					errMessage += ", ";//$NON-NLS-1$
				}
				errMessage += uml.getName(args.get(i).getType());
			}
			errMessage += ")";//$NON-NLS-1$
			String message = OCLMessages.bind(
				OCLMessages.IllegalSignature_ERROR_, errMessage);
			ERROR(operationCallExpCS, "operationCallExpCS", message); //$NON-NLS-1$
		}

		if (implicitSource != null) {
			vexp.setType(implicitSource.getType());
			vexp.setReferredVariable(implicitSource);
		} else {
			vexp.setType(getOclVoid());
		}
		return vexp;
	}

	/**
	 * OperationCallExpCS for an ->
	 * 
	 * @param operationCallExpCS
	 *            the <code>OperationCallExpCS</code> <code>CSTNode</code>
	 * @param env
	 *            the OCL environment
	 * @return the parsed <code>OCLExpression</code>
	 * @since 3.0
	 */
	protected OCLExpression<C> arrowOperationCallExpCS(
			OperationCallExpCS operationCallExpCS,
			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env) {

		OCLExpression<C> source = getCollectionSourceExpression(operationCallExpCS.getSource(), env);
		List<OCLExpression<C>> args = argumentsCS(operationCallExpCS, env);
		
		String operationName = operationCallExpCS.getSimpleNameCS().getValue();
		C operationSourceType = source.getType();
		OperationCallExp<C, O> astNode = genOperationCallExp(env, operationCallExpCS,
			"operationCallExpCS", operationName,//$NON-NLS-1$
			source, operationSourceType, args);

		initPropertyPositions(astNode, operationCallExpCS.getSimpleNameCS());

		if (isErrorNode(source)) {
			// don't attempt to parse navigation from an unparseable source
			markAsErrorNode(astNode);
		}

		return astNode;
	}
	/**
	 * OperationCallExpCS for oclIsInState
	 * 
	 * @param operationCallExpCS
	 *            the <code>OperationCallExpCS</code> <code>CSTNode</code>
	 * @param env
	 *            the OCL environment
	 * @return the parsed <code>OCLExpression</code>
	 * @since 3.0
	 */
	protected OCLExpression<C> oclIsInStateOperationCallExpCS(
			OperationCallExpCS operationCallExpCS,
			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env) {
		if (operationCallExpCS.getArguments().size() != 1) {
			String message = OCLMessages.bind(
				OCLMessages.IsInStateSignature_ERROR_,
				computeInputString(operationCallExpCS));
			ERROR(operationCallExpCS, "operationCallExpCS", message);//$NON-NLS-1$
		}

		OCLExpression<C> source = oclExpressionCS(operationCallExpCS.getSource(), env);
		List<OCLExpression<C>> args = new java.util.ArrayList<OCLExpression<C>>();
		if (!operationCallExpCS.getArguments().isEmpty()) {
			OCLExpressionCS arg = operationCallExpCS.getArguments().get(0);
			if (arg instanceof VariableExpCS) {
				VariableExpCS stateName = (VariableExpCS) arg;
				EList<String> statePath = createSequenceOfNames(null, stateName.getSimpleNameCS());
				args.add(stateExpCS(source, stateName, statePath, env));
			} else if (arg instanceof EnumLiteralExpCS) {
				EnumLiteralExpCS stateName = (EnumLiteralExpCS) arg;
				EList<String> statePath = createSequenceOfNames(stateName.getPathNameCS(), stateName.getSimpleNameCS());
				args.add(stateExpCS(source, stateName, statePath, env));
			} else {
				String message = OCLMessages.bind(
					OCLMessages.IsInStateSignature_ERROR_,
					computeInputString(operationCallExpCS));
				ERROR(arg, "operationCallExpCS", message);//$NON-NLS-1$
			}
		}
		if (source == null) { // create an implicit source
			source = createImplicitSource(operationCallExpCS, env, args);
		}
		C operationSourceType = source.getType();
		String operationName = operationCallExpCS.getSimpleNameCS().getValue();
		OperationCallExp<C, O> astNode = genOperationCallExp(env, operationCallExpCS,
			"operationCallExpCS", operationName,//$NON-NLS-1$
			source, operationSourceType, args);
		astNode.setMarkedPre(isAtPre(operationCallExpCS));
		initPropertyPositions(astNode, operationCallExpCS.getSimpleNameCS());
		if (isErrorNode(source)) {
			// don't attempt to parse navigation from an unparseable source
			markAsErrorNode(astNode);
		}
		return astNode;
	}
	
	/**
	 * @since 3.0
	 */
	protected OCLExpression<C> staticOperationCallExpCS(
		OperationCallExpCS operationCallExpCS,
		Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env) {

	OCLExpression<C> source = null;
//	OCLExpressionCS sourceCS = operationCallExpCS.getSource();
	PathNameCS pathNameCS = operationCallExpCS.getPathNameCS();

	EList<String> pathNames = createSequenceOfNames(pathNameCS, null);
	C sourceType = lookupClassifier(pathNameCS, env, pathNames);
	if (sourceType == null) {
		String message = OCLMessages.bind(
			OCLMessages.UnrecognizedType_ERROR_, pathNames);
		ERROR(operationCallExpCS, "operatonCallExpCS", message);//$NON-NLS-1$
	} else {
		source = typeCS(pathNameCS, env, sourceType);
	}

	String operationName = operationCallExpCS.getSimpleNameCS().getValue();

	List<OCLExpression<C>> args = argumentsCS(operationCallExpCS, env);

	/*
	 * If the source type is a collection and operator is ".", then there is
	 * an implicit COLLECT operator.
	 */
	C operationSourceType = source.getType();

	// if the sourceType is a TypeType then this must be a static operation
	boolean isStatic = operationSourceType instanceof TypeType<?, ?>;

	OperationCallExp<C, O> astNode = genOperationCallExp(env, operationCallExpCS,
		"operationCallExpCS", operationName,//$NON-NLS-1$
		source, operationSourceType, args);
	if (isStatic) {
		@SuppressWarnings("unchecked")
		TypeType<C, O> typeType = (TypeType<C, O>) operationSourceType;
		O operation = astNode.getReferredOperation();

		// operation must either be defined by the TypeType (e.g.,
		// allInstances())
		// or be a static operation of the referred classifier
		if (!(typeType.oclOperations().contains(operation) || uml
			.isStatic(operation))) {

			String message = OCLMessages.bind(
				OCLMessages.NonStaticOperation_ERROR_, operationName);
			ERROR(astNode, "operationCallExpCS", message);//$NON-NLS-1$
		}
	}

//	astNode.setMarkedPre(isAtPre(operationCallExpCS));

	initPropertyPositions(astNode, operationCallExpCS.getSimpleNameCS());

	OCLExpression<C> result = astNode;

	if (isErrorNode(source)) {
		// don't attempt to parse navigation from an unparseable source
		markAsErrorNode(result);
	}

	return result;
}

	/**
	 * @since 3.0
	 */
	protected List<OCLExpression<C>> argumentsCS(OperationCallExpCS operationCallExpCS,
			Environment<PK, C, O, P, EL, PM, S, COA, SSA, CT, CLS, E> env) {
		List<OCLExpression<C>> args = new java.util.ArrayList<OCLExpression<C>>();
		for (OCLExpressionCS arg : operationCallExpCS.getArguments()) {
			OCLExpression<C> argExpr = oclExpressionCS(arg, env);
			if (argExpr == null) {
				argExpr = createDummyInvalidLiteralExp(env, arg);
				initASTMapping(env, argExpr, arg);
			}
			args.add(argExpr);
		}
		return args;
	}

	private void checkForXorOrAndPrecedenceHazard(OperationCallExpCS operationCallExpCS) {
		String parentOperationName = operationCallExpCS.getSimpleNameCS().getValue();
		if ("xor".equals(parentOperationName)) { //$NON-NLS-1$

	/**
	 * @since 3.0
	 */
	@Deprecated  // Temporary compatibility with 3.0.0M1
	public static EList<String> createSequenceOfNames(List<SimpleNameCS> simpleNames) {
		EList<String> sequenceOfNames = new BasicEList<String>();
		for (SimpleNameCS simpleName : simpleNames)

	}

	/**
	 * @since 3.0
	 */
	public static EList<String> createSequenceOfNames(PathNameCS pathNameCS, SimpleNameCS simpleNameCS) {
		EList<String> sequenceOfNames = new BasicEList<String>();
		if (pathNameCS != null) {
			for (SimpleNameCS simpleName : pathNameCS.getSimpleNames())
				sequenceOfNames.add(simpleName.getValue());
		}
		if (simpleNameCS != null) {
			sequenceOfNames.add(simpleNameCS.getValue());
		}
		return sequenceOfNames;
	}

	/**
	 * Queries whether the specified name is escaped with an initial underscore
	 * (<code>'_'</code>) character.
	 * 




	./
$End

$KeyWords
	context
	package
	
	--
	-- the following are not used in the OCL concrete syntax, but
	-- are defined as reserved words in the OCL 2.0 Spec 7.4.9
	-- and were removed in the OCL 2.1 RTF 09-05-02. 
	--
	attr
	oper
$End

$Rules
	-- opt = optional
	-- m = multiple

	contextDeclCS -> operationContextDeclCS
	contextDeclCS -> propertyContextCS

	propertyContextCS ::= context qualifiedPathNameCS ':' typeCS initOrDerValueCSm
		/.$BeginJava
					PathNameCS pathNameCS = (PathNameCS)$getSym(2);
					EList<InitOrDerValueCS> list = (EList<InitOrDerValueCS>)$getSym(5);
					CSTNode result = createPropertyContextCS(
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							(TypeCS)$getSym(4),
							list
						);
					setOffsets(result, getIToken($getToken(1)), list.get(list.size()-1));

Lines 40-45 Link Here

(-)src/org/eclipse/ocl/parser/AbstractOCLParser.java (-48 / +110 lines)
40	import org.eclipse.ocl.cst.DefCS;	40	import org.eclipse.ocl.cst.DefCS;
41	import org.eclipse.ocl.cst.DefExpressionCS;	41	import org.eclipse.ocl.cst.DefExpressionCS;
42	import org.eclipse.ocl.cst.DerValueCS;	42	import org.eclipse.ocl.cst.DerValueCS;
		43	import org.eclipse.ocl.cst.DotOrArrowEnum;
43	import org.eclipse.ocl.cst.EnumLiteralExpCS;	44	import org.eclipse.ocl.cst.EnumLiteralExpCS;
44	import org.eclipse.ocl.cst.FeatureCallExpCS;	45	import org.eclipse.ocl.cst.FeatureCallExpCS;
45	import org.eclipse.ocl.cst.IfExpCS;	46	import org.eclipse.ocl.cst.IfExpCS;
Lines 71-77 Link Here
71	import org.eclipse.ocl.cst.RealLiteralExpCS;	72	import org.eclipse.ocl.cst.RealLiteralExpCS;
72	import org.eclipse.ocl.cst.SimpleNameCS;	73	import org.eclipse.ocl.cst.SimpleNameCS;
73	import org.eclipse.ocl.cst.SimpleTypeEnum;	74	import org.eclipse.ocl.cst.SimpleTypeEnum;
74	import org.eclipse.ocl.cst.StateExpCS;
75	import org.eclipse.ocl.cst.StringLiteralExpCS;	75	import org.eclipse.ocl.cst.StringLiteralExpCS;
76	import org.eclipse.ocl.cst.TupleLiteralExpCS;	76	import org.eclipse.ocl.cst.TupleLiteralExpCS;
77	import org.eclipse.ocl.cst.TupleTypeCS;	77	import org.eclipse.ocl.cst.TupleTypeCS;
Lines 274-285 Link Here
274	SimpleTypeEnum.IDENTIFIER_LITERAL, simpleName), list, typeCS);	274	SimpleTypeEnum.IDENTIFIER_LITERAL, simpleName), list, typeCS);
275	}	275	}
276		276
277	protected OperationCallExpCS createOperationCallExpCS(	277	/**
278	OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS,	278	* @since 3.0
		279	*/
		280	private OperationCallExpCS createOperationCallExpCS(
		281	OCLExpressionCS oclExpressionCS, DotOrArrowEnum dotOrArrow, PathNameCS pathNameCS, SimpleNameCS simpleNameCS,
279	IsMarkedPreCS isMarkedPreCS, EList<OCLExpressionCS> arguments) {	282	IsMarkedPreCS isMarkedPreCS, EList<OCLExpressionCS> arguments) {
280	OperationCallExpCS result = CSTFactory.eINSTANCE	283	OperationCallExpCS result = CSTFactory.eINSTANCE
281	.createOperationCallExpCS();	284	.createOperationCallExpCS();
282	result.setSource(oclExpressionCS);	285	result.setSource(oclExpressionCS);
		286	result.setAccessor(dotOrArrow);
		287	result.setPathNameCS(pathNameCS);
283	result.setSimpleNameCS(simpleNameCS);	288	result.setSimpleNameCS(simpleNameCS);
284	result.getArguments().addAll(arguments);	289	result.getArguments().addAll(arguments);
285		290
Lines 305-342 Link Here
305	return atPreCS != null;	310	return atPreCS != null;
306	}	311	}
307		312
		313	/**
		314	* @since 3.0
		315	*/
308	protected OperationCallExpCS createOperationCallExpCS(	316	protected OperationCallExpCS createOperationCallExpCS(
309	OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS,	317	OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS,
310	EList<OCLExpressionCS> arguments) {	318	EList<OCLExpressionCS> arguments) {
311	return createOperationCallExpCS(oclExpressionCS, simpleNameCS,	319	return createOperationCallExpCS(oclExpressionCS, null, null, simpleNameCS,
312	null, arguments);	320	null, arguments);
313	}	321	}
314		322
315	protected OperationCallExpCS createOperationCallExpCS(	323	/**
316	SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,	324	* @since 3.0
		325	*/
		326	protected OperationCallExpCS createArrowOperationCallExpCS(
		327	OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,
317	EList<OCLExpressionCS> arguments) {	328	EList<OCLExpressionCS> arguments) {
318	return createOperationCallExpCS(null, simpleNameCS, isMarkedPreCS,	329	return createOperationCallExpCS(oclExpressionCS, DotOrArrowEnum.ARROW_LITERAL, null, simpleNameCS, isMarkedPreCS,
319	arguments);	330	arguments);
320	}	331	}
321		332
322	protected OperationCallExpCS createOperationCallExpCS(	333	/**
323	SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,	334	* @since 3.0
324	StateExpCS stateExpCS) {	335	*/
325	OperationCallExpCS result = CSTFactory.eINSTANCE	336	protected OperationCallExpCS createDotOperationCallExpCS(
326	.createOperationCallExpCS();	337	OCLExpressionCS oclExpressionCS, PathNameCS pathNameCS, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,
327	result.setSimpleNameCS(simpleNameCS);	338	EList<OCLExpressionCS> arguments) {
328	result.getArguments().add(stateExpCS);	339	OperationCallExpCS result = createOperationCallExpCS(oclExpressionCS, DotOrArrowEnum.DOT_LITERAL, pathNameCS, simpleNameCS,
329		340	isMarkedPreCS, arguments);
330	if (isAtPre(isMarkedPreCS)) {	341	if (oclExpressionCS != null) {
331	result.setIsMarkedPreCS(isMarkedPreCS);	342	result.setIsAtomic(true);
332	}	343	}
333
334	return result;
335	}
336
337	protected StateExpCS createStateExpCS(PathNameCS pathName) {
338	StateExpCS result = CSTFactory.eINSTANCE.createStateExpCS();
339	result.getSimpleNames().addAll(pathName.getSimpleNames());
340	return result;	344	return result;
341	}	345	}
342		346
Lines 364-370 Link Here
364	String value) {	368	String value) {
365	PrimitiveTypeCS result = CSTFactory.eINSTANCE.createPrimitiveTypeCS();	369	PrimitiveTypeCS result = CSTFactory.eINSTANCE.createPrimitiveTypeCS();
366	result.setType(type);	370	result.setType(type);
367	result.setValue(value);	371	result.setValue(unquote(value));
368	return result;	372	return result;
369	}	373	}
370		374
Lines 385-394 Link Here
385	return path;	389	return path;
386	}	390	}
387		391
		392	/**
		393	* @since 3.0
		394	*/
		395	protected SimpleNameCS removeLastSimpleNameCS(PathNameCS path) {
		396	EList<SimpleNameCS> simpleNames = path.getSimpleNames();
		397	SimpleNameCS name = simpleNames.remove(simpleNames.size()-1);
		398	setOffsets(path, path, simpleNames.get(simpleNames.size()-1));
		399	return name;
		400	}
		401
388	protected PathNameCS createPathNameCS() {	402	protected PathNameCS createPathNameCS() {
389	return CSTFactory.eINSTANCE.createPathNameCS();	403	return CSTFactory.eINSTANCE.createPathNameCS();
390	}	404	}
391		405
		406	/**
		407	* @since 3.0
		408	*/
		409	protected PathNameCS createPathNamePrefixCS(PathNameCS pathNameCS) {
		410	EList<SimpleNameCS> simpleNames = pathNameCS.getSimpleNames();
		411	int size = simpleNames.size();
		412	PathNameCS prefixPathNameCS = CSTFactory.eINSTANCE.createPathNameCS();
		413	if (size > 1) {
		414	for (int i = 0; i < size-1; i++) {
		415	extendPathNameCS(prefixPathNameCS, simpleNames.get(i));
		416	}
		417	setOffsets(prefixPathNameCS, prefixPathNameCS.getSimpleNames().get(0), prefixPathNameCS.getSimpleNames().get(size-2));
		418	}
		419	return prefixPathNameCS;
		420	}
		421	/**
		422	* @since 3.0
		423	*/
		424	protected SimpleNameCS getPathNameSuffixCS(PathNameCS pathNameCS) {
		425	EList<SimpleNameCS> simpleNames = pathNameCS.getSimpleNames();
		426	int size = simpleNames.size();
		427	return size > 0 ? simpleNames.get(size-1) : null;
		428	}
		429
		430	/**
		431	* @since 3.0
		432	*/
392	protected EnumLiteralExpCS createEnumLiteralExpCS(PathNameCS pathNameCS,	433	protected EnumLiteralExpCS createEnumLiteralExpCS(PathNameCS pathNameCS,
393	SimpleNameCS simpleNameCS) {	434	SimpleNameCS simpleNameCS) {
394	EnumLiteralExpCS result = CSTFactory.eINSTANCE.createEnumLiteralExpCS();	435	EnumLiteralExpCS result = CSTFactory.eINSTANCE.createEnumLiteralExpCS();
Lines 398-419 Link Here
398	}	439	}
399		440
400	/**	441	/**
401	* @deprecated Use {@link #createEnumLiteralExpCS(PathNameCS, SimpleNameCS)}	442	* @since 3.0
402	* , instead.
403	*/	443	*/
404	@Deprecated
405	protected EnumLiteralExpCS createEnumLiteralExpCS(PathNameCS pathNameCS,
406	String simpleName) {
407	return createEnumLiteralExpCS(pathNameCS, createSimpleNameCS(
408	SimpleTypeEnum.IDENTIFIER_LITERAL, simpleName));
409	}
410
411	protected CollectionLiteralExpCS createCollectionLiteralExpCS(	444	protected CollectionLiteralExpCS createCollectionLiteralExpCS(
412	CollectionTypeIdentifierEnum type,	445	CollectionTypeCS typeCS,
413	EList<CollectionLiteralPartCS> collectionLiteralParts) {	446	EList<CollectionLiteralPartCS> collectionLiteralParts) {
414	CollectionLiteralExpCS result = CSTFactory.eINSTANCE	447	CollectionLiteralExpCS result = CSTFactory.eINSTANCE
415	.createCollectionLiteralExpCS();	448	.createCollectionLiteralExpCS();
416	result.setCollectionType(type);	449	result.setCollectionType(typeCS.getCollectionTypeIdentifier());
417	result.getCollectionLiteralParts().addAll(collectionLiteralParts);	450	result.getCollectionLiteralParts().addAll(collectionLiteralParts);
418	return result;	451	return result;
419	}	452	}
Lines 500-505 Link Here
500	protected BooleanLiteralExpCS createBooleanLiteralExpCS(String string) {	533	protected BooleanLiteralExpCS createBooleanLiteralExpCS(String string) {
501	BooleanLiteralExpCS result = CSTFactory.eINSTANCE	534	BooleanLiteralExpCS result = CSTFactory.eINSTANCE
502	.createBooleanLiteralExpCS();	535	.createBooleanLiteralExpCS();
		536	result.setValue(string);
		537	result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
503	result.setSymbol(string);	538	result.setSymbol(string);
504	result.setBooleanSymbol(Boolean.valueOf(string));	539	result.setBooleanSymbol(Boolean.valueOf(string));
505	return result;	540	return result;
Lines 507-527 Link Here
507		542
508	protected NullLiteralExpCS createNullLiteralExpCS(String string) {	543	protected NullLiteralExpCS createNullLiteralExpCS(String string) {
509	NullLiteralExpCS result = CSTFactory.eINSTANCE.createNullLiteralExpCS();	544	NullLiteralExpCS result = CSTFactory.eINSTANCE.createNullLiteralExpCS();
510	result.setSymbol(string);	545	result.setValue(string);
		546	result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
511	return result;	547	return result;
512	}	548	}
513		549
514	protected InvalidLiteralExpCS createInvalidLiteralExpCS(String string) {	550	protected InvalidLiteralExpCS createInvalidLiteralExpCS(String string) {
515	InvalidLiteralExpCS result = CSTFactory.eINSTANCE	551	InvalidLiteralExpCS result = CSTFactory.eINSTANCE
516	.createInvalidLiteralExpCS();	552	.createInvalidLiteralExpCS();
517	result.setSymbol(string);	553	result.setValue(string);
		554	result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
518	return result;	555	return result;
519	}	556	}
520		557
521	protected IteratorExpCS createIteratorExpCS(SimpleNameCS simpleNameCS,	558	/**
		559	* @since 3.0
		560	*/
		561	protected IteratorExpCS createIteratorExpCS(
		562	OCLExpressionCS source, SimpleNameCS simpleNameCS,
522	VariableCS variable1, VariableCS variable2,	563	VariableCS variable1, VariableCS variable2,
523	OCLExpressionCS oclExpressionCS) {	564	OCLExpressionCS oclExpressionCS) {
524	IteratorExpCS result = CSTFactory.eINSTANCE.createIteratorExpCS();	565	IteratorExpCS result = CSTFactory.eINSTANCE.createIteratorExpCS();
		566	result.setSource(source);
		567	result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
525	result.setSimpleNameCS(simpleNameCS);	568	result.setSimpleNameCS(simpleNameCS);
526	result.setVariable1(variable1);	569	result.setVariable1(variable1);
527	result.setVariable2(variable2);	570	result.setVariable2(variable2);
Lines 529-538 Link Here
529	return result;	572	return result;
530	}	573	}
531		574
532	protected IterateExpCS createIterateExpCS(SimpleNameCS simpleNameCS,	575	/**
		576	* @since 3.0
		577	*/
		578	protected IterateExpCS createIterateExpCS(
		579	OCLExpressionCS source, SimpleNameCS simpleNameCS,
533	VariableCS variable1, VariableCS variable2,	580	VariableCS variable1, VariableCS variable2,
534	OCLExpressionCS oclExpressionCS) {	581	OCLExpressionCS oclExpressionCS) {
535	IterateExpCS result = CSTFactory.eINSTANCE.createIterateExpCS();	582	IterateExpCS result = CSTFactory.eINSTANCE.createIterateExpCS();
		583	result.setSource(source);
		584	result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
536	result.setSimpleNameCS(simpleNameCS);	585	result.setSimpleNameCS(simpleNameCS);
537	result.setVariable1(variable1);	586	result.setVariable1(variable1);
538	result.setVariable2(variable2);	587	result.setVariable2(variable2);
Lines 540-559 Link Here
540	return result;	589	return result;
541	}	590	}
542		591
543	protected VariableCS createVariableCS(String varName, TypeCS typeCS,	592	/**
544	OCLExpressionCS oclExpressionCS) {	593	* @since 3.0
		594	*/
		595	protected VariableCS createVariableCS(String varName) {
545	VariableCS result = CSTFactory.eINSTANCE.createVariableCS();	596	VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
546	result.setName(unquote(varName));	597	result.setName(unquote(varName));
547	result.setTypeCS(typeCS);
548	result.setInitExpression(oclExpressionCS);
549	return result;	598	return result;
550	}	599	}
551		600
		601	/**
		602	* @since 3.0
		603	*/
552	protected CollectionTypeCS createCollectionTypeCS(	604	protected CollectionTypeCS createCollectionTypeCS(
553	CollectionTypeIdentifierEnum collectionType, TypeCS typeCS) {	605	CollectionTypeIdentifierEnum collectionType, String value) {
554	CollectionTypeCS result = CSTFactory.eINSTANCE.createCollectionTypeCS();	606	CollectionTypeCS result = CSTFactory.eINSTANCE.createCollectionTypeCS();
		607	result.setType(SimpleTypeEnum.IDENTIFIER_LITERAL);
		608	result.setValue(unquote(value));
555	result.setCollectionTypeIdentifier(collectionType);	609	result.setCollectionTypeIdentifier(collectionType);
556	result.setTypeCS(typeCS);
557	return result;	610	return result;
558	}	611	}
559		612
Lines 563-572 Link Here
563	return result;	616	return result;
564	}	617	}
565		618
		619	/**
		620	* @since 3.0
		621	*/
566	protected FeatureCallExpCS createFeatureCallExpCS(	622	protected FeatureCallExpCS createFeatureCallExpCS(
567	SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments,	623	OCLExpressionCS source, SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments,
568	IsMarkedPreCS isMarkedPreCS) {	624	IsMarkedPreCS isMarkedPreCS) {
569	FeatureCallExpCS result = CSTFactory.eINSTANCE.createFeatureCallExpCS();	625	FeatureCallExpCS result = CSTFactory.eINSTANCE.createFeatureCallExpCS();
		626	result.setSource(source);
		627	result.setAccessor(DotOrArrowEnum.DOT_LITERAL);
570	result.setSimpleNameCS(simpleNameCS);	628	result.setSimpleNameCS(simpleNameCS);
571	result.getArguments().addAll(arguments);	629	result.getArguments().addAll(arguments);
572		630
Lines 602-610 Link Here
602	return result;	660	return result;
603	}	661	}
604		662
605	protected MessageExpCS createMessageExpCS(boolean hasSent,	663	/**
		664	* @since 3.0
		665	*/
		666	protected MessageExpCS createMessageExpCS(OCLExpressionCS target, boolean hasSent,
606	SimpleNameCS simpleNameCS, EList<OCLMessageArgCS> oclMessageArgs) {	667	SimpleNameCS simpleNameCS, EList<OCLMessageArgCS> oclMessageArgs) {
607	MessageExpCS result = CSTFactory.eINSTANCE.createMessageExpCS();	668	MessageExpCS result = CSTFactory.eINSTANCE.createMessageExpCS();
		669	result.setTarget(target);
608	result.setKind(hasSent	670	result.setKind(hasSent
609	? MessageExpKind.HAS_SENT_LITERAL	671	? MessageExpKind.HAS_SENT_LITERAL
610	: MessageExpKind.SENT_LITERAL);	672	: MessageExpKind.SENT_LITERAL);

Lines 12-18 Link Here

(-)src/org/eclipse/ocl/parser/OCLKWLexer.g
12	-- *	12	-- *
13	-- * </copyright>	13	-- * </copyright>
14	-- *	14	-- *




 * Contributors:
 *   IBM - Initial API and implementation
 *   E.D.Willink - Lexer and Parser refactoring to support extensibility and flexible error handling
 *   E.D.Willink - Bug 285633 static definitions
$copyright_contributions
 * </copyright>
 *
 * $Id: OCLKWLexer.g,v 1.3 2009/09/04 08:27:07 ewillink Exp $
 */
	./
$End

	null
	invalid
--  return  -- don't need a keyword for LPG purposes
	
	--
	-- the following are not used in the OCL concrete syntax, but
	-- are defined as reserved words in the OCL 2.0 Spec 7.4.9
	-- and were removed in the OCL 2.1 RTF 09-05-02. 
	--
	attr
	oper

	--
	-- the following were introduced in the OCL 2.1 RTF 09-05-02. 

	--
	closure

	oclIsKindOf
	oclIsTypeOf
	oclAsType
	oclIsNew
	oclIsUndefined
	oclIsInvalid
	oclIsInState
	allInstances

	String
	Integer
	UnlimitedNatural

			$setResult($_closure);
		  $EndAction
		./
		
		| o c l I s K i n d O f
		/.$BeginAction
			$setResult($_oclIsKindOf);
		  $EndAction
		./

		| o c l I s T y p e O f
		/.$BeginAction
			$setResult($_oclIsTypeOf);
		  $EndAction
		./
		
		| o c l A s T y p e
		/.$BeginAction
			$setResult($_oclAsType);
		  $EndAction
		./
		
		| o c l I s N e w
		/.$BeginAction
			$setResult($_oclIsNew);
		  $EndAction
		./
		
		| o c l I s U n d e f i n e d
		/.$BeginAction
			$setResult($_oclIsUndefined);
		  $EndAction
		./
		
		| o c l I s I n v a l i d
		/.$BeginAction
			$setResult($_oclIsInvalid);
		  $EndAction
		./
		
		| o c l I s I n S t a t e
		/.$BeginAction
			$setResult($_oclIsInState);
		  $EndAction
		./
		
		| a l l I n s t a n c e s
		/.$BeginAction
			$setResult($_allInstances);
		  $EndAction
		./

		| S t r i n g
		/.$BeginAction

		  $EndAction
		./

		| a t t r
		/.$BeginAction
			$setResult($_attr);
		  $EndAction
		./

		| o p e r
		/.$BeginAction
			$setResult($_oper);
		  $EndAction
		./

		| s t a t i c
		/.$BeginAction
			$setResult($_static);

Lines 12-18 Link Here

(-)src/org/eclipse/ocl/parser/EssentialOCL.g
12	-- *	12	-- *
13	-- * </copyright>	13	-- * </copyright>
14	-- *	14	-- *




 *   IBM - Initial API and implementation
 *   E.D.Willink - Elimination of some shift-reduce conflicts
 *   E.D.Willink - Remove unnecessary warning suppression
 *   E.D.Willink - Bugs 184048, 225493, 243976, 259818, 282882, 287993, 288040
 *   Borland - Bug 242880
$copyright_contributions
 * </copyright>
 *
 * $Id: EssentialOCL.g,v 1.10 2009/09/04 13:40:43 ewillink Exp $
 */
	./
$End

	import org.eclipse.emf.common.util.EList;
	import org.eclipse.ocl.cst.CSTNode;
	import org.eclipse.ocl.cst.CallExpCS;
	import org.eclipse.ocl.cst.CollectionTypeCS;
	import org.eclipse.ocl.cst.CollectionTypeIdentifierEnum;
	import org.eclipse.ocl.cst.DotOrArrowEnum;
	import org.eclipse.ocl.cst.IntegerLiteralExpCS;
	import org.eclipse.ocl.cst.IsMarkedPreCS;
	import org.eclipse.ocl.cst.MessageExpCS;

	import org.eclipse.ocl.cst.PathNameCS;
	import org.eclipse.ocl.cst.SimpleNameCS;
	import org.eclipse.ocl.cst.SimpleTypeEnum;
	import org.eclipse.ocl.cst.StateExpCS;
	import org.eclipse.ocl.cst.StringLiteralExpCS;
	import org.eclipse.ocl.cst.TypeCS;
	import org.eclipse.ocl.cst.VariableCS;

$End

$KeyWords
	-- EssentialOCL keywords
	and
	pre
	post
	endpackage
	def
	if
	then
	else
	endif
	if
	or
	xor
	not
	implies
	let
	in
	let
	not
	or
	then
	xor
	
	-- CompleteOCL keywords
	body
	context
	def
	derive
	endpackage
	init
	inv
	package
	post
	pre
	static

	--
	-- the following appear to have been omitted from the list of
	-- OCL reserved words in Section 7.4.9.  They will be treated 
	-- as unreserved for compliance
	--
	false
	derive
	init
	null
	invalid




	sortedBy

	closure

	oclIsKindOf
	oclIsTypeOf
	oclAsType
	oclIsNew
	oclIsUndefined
	oclIsInvalid
	oclIsInState
	allInstances

	String
	Integer
	UnlimitedNatural
	Real
	Boolean
	Tuple
	OclAny
	OclVoid
	OclInvalid
	OclMessage
$End

$Identifier

	-- and are commonly used in models such as the UML metamodel, itself
	--
	
	binaryKeyword -> and
	binaryKeyword -> or
	binaryKeyword -> xor
	binaryPunctuation -> EQUAL
	binaryPunctuation -> NOT_EQUAL
	binaryPunctuation -> PLUS
	binaryPunctuation -> MULTIPLY
	binaryPunctuation -> DIVIDE
	binaryPunctuation -> GREATER
	binaryPunctuation -> LESS
	binaryPunctuation -> GREATER_EQUAL
	binaryPunctuation -> LESS_EQUAL
	binaryIdentifier -> LESS
	binaryIdentifier -> GREATER_EQUAL
	binaryIdentifier -> LESS_EQUAL
	binaryIdentifier -> and
	binaryIdentifier -> or
	binaryIdentifier -> xor

	unaryKeyword -> not
	unaryPunctuation -> MINUS

	iterateIdentifier -> iterate
	
	iteratorIdentifier -> forAll
	iteratorIdentifier -> exists
	iteratorIdentifier -> isUnique

	iteratorIdentifier -> sortedBy
	iteratorIdentifier -> closure

	reservedKeyword -> binaryKeyword
	reservedKeyword -> unaryKeyword
	-- Eliminate these for EssentialOCL
	reservedKeyword -> body
	reservedKeyword -> context
	reservedKeyword -> def
	reservedKeyword -> derive
	reservedKeyword -> endpackage
	reservedKeyword -> init
	reservedKeyword -> inv
	reservedKeyword -> package
	reservedKeyword -> post
	reservedKeyword -> pre
	reservedKeyword -> static

	reservedPunctuation -> binaryPunctuation
	reservedPunctuation -> unaryPunctuation

	reservedKeywordCS ::= reservedKeyword
		/.$NewCase./
	keywordAsName1 ::= keywordAsIdentifier1
		/.$NewCase./
	reservedPunctuationCS ::= reservedPunctuation
		/.$BeginJava
					SimpleNameCS result = createSimpleNameCS(
								SimpleTypeEnum.IDENTIFIER_LITERAL,

		  $EndJava
		./
		
	iterateNameCS ::= iterateIdentifier
		/.$NewCase./
	iteratorNameCS ::= iteratorIdentifier
		/.$NewCase./
	oclIsInStateName ::= oclIsInState
		/.$BeginJava
					SimpleNameCS result = createSimpleNameCS(
								SimpleTypeEnum.KEYWORD_LITERAL,

		  $EndJava
		./

	literalSimpleNameCS -> booleanLiteralExpCS
	literalSimpleNameCS -> invalidLiteralExpCS
	literalSimpleNameCS -> nullLiteralExpCS
		
	notIteratorNorReservedSimpleNameCS -> collectionTypeIdentifierCS
--	notIteratorNorReservedSimpleNameCS -> iterateNameCS
--	notIteratorNorReservedSimpleNameCS -> iteratorNameCS
	notIteratorNorReservedSimpleNameCS -> literalSimpleNameCS
--	notIteratorNorReservedSimpleNameCS -> reservedKeywordCS
	notIteratorNorReservedSimpleNameCS -> simpleIdentifierCS

	notLiteralNorReservedSimpleNameCS -> collectionTypeIdentifierCS
	notLiteralNorReservedSimpleNameCS -> iterateNameCS
	notLiteralNorReservedSimpleNameCS -> iteratorNameCS
--	notLiteralNorReservedSimpleNameCS -> literalSimpleNameCS
--	notLiteralNorReservedSimpleNameCS -> reservedKeywordCS
	notLiteralNorReservedSimpleNameCS -> simpleIdentifierCS	-- IDENTIFIER, self, primitiveTypeCS

	notReservedSimpleNameCS -> notLiteralNorReservedSimpleNameCS
	notReservedSimpleNameCS -> literalSimpleNameCS

	simpleNameCS -> notReservedSimpleNameCS
	simpleNameCS -> reservedKeywordCS
	
	operationOrNotReservedSimpleNameCS -> notReservedSimpleNameCS
	operationOrNotReservedSimpleNameCS -> reservedKeywordCS
	operationOrNotReservedSimpleNameCS -> reservedPunctuationCS

	--
	-- the 'operationCS' non-terminal is not referenced in this grammar
	--
	operationCS -> operationCS1
	operationCS -> operationCS2
	operationCS1 ::= notReservedSimpleNameCS '(' variableListCSopt ')' ':' typeCSopt
		/.$BeginJava
					CSTNode result = createOperationCS(
							getTokenText($getToken(1)),

					$setResult(result);
		  $EndJava
		./
	operationCS2 ::= qualifiedPathNameCS '(' variableListCSopt ')' ':' typeCSopt
		/.$BeginJava
					PathNameCS pathNameCS = (PathNameCS)$getSym(1);
					TypeCS typeCS = (TypeCS)$getSym(6);
					CSTNode result = createOperationCS(
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							(EList)$getSym(3),
							typeCS
						);
					if (typeCS != null) {
						setOffsets(result, pathNameCS, typeCS);
					} else {
						setOffsets(result, pathNameCS, getIToken($getToken(5)));
					}
					$setResult(result);
		  $EndJava
		./


	parametersCSopt ::= $empty
		/.$EmptyListAction./
	parametersCSopt -> parametersCS
	parametersCS ::= variableCS
		/.$BeginJava
					EList result = new BasicEList();
					result.add($getSym(1));
					$setResult(result);
		  $EndJava
		./
	parametersCS ::= parametersCS ',' variableCS
		/.$BeginJava
					EList result = (EList)$getSym(1);
					result.add($getSym(3));
					$setResult(result);
		  $EndJava
		./

	simpleNameCSopt ::= $empty
		/.$NullAction./
	simpleNameCSopt -> simpleNameCS	

	equalityWithLet ::= equalityExpCS '<>' relationalWithLet
		/.$NewCase./
	
	relationalExpCS -> additiveExpCS
	-- Note that ifExp already embeds let, so we needn't deal with it here
	relationalWithLet -> additiveWithLet
	relationalExpCS ::= relationalExpCS '>' additiveExpCS
		/.$NewCase./
	relationalWithLet ::= relationalExpCS '>' additiveWithLet
		/.$NewCase./
	relationalExpCS ::= relationalExpCS '<' additiveExpCS
		/.$NewCase./
	relationalWithLet ::= relationalExpCS '<' additiveWithLet
		/.$NewCase./
	relationalExpCS ::= relationalExpCS '>=' additiveExpCS
		/.$NewCase./
	relationalWithLet ::= relationalExpCS '>=' additiveWithLet
		/.$NewCase./
	relationalExpCS ::= relationalExpCS '<=' additiveExpCS
		/.$NewCase./
	relationalWithLet ::= relationalExpCS '<=' additiveWithLet
		/.$NewCase./
	
	ifExpCSPrec -> additiveExpCS
	ifExpCSPrec -> ifExpCS

	additiveExpCS -> multiplicativeExpCS
	additiveWithLet -> multiplicativeWithLet

		./

	dotArrowExpCS -> oclExpCS
	dotArrowExpCS -> callExpCS
	dotArrowExpCS -> oclMessageExpCS
					CallExpCS result = (CallExpCS)$getSym(2);
					result.setSource((OCLExpressionCS)$getSym(1));
					setOffsets(result, (CSTNode)$getSym(1), result);
					$setResult(result);
		  $EndJava
		./
	dotArrowExpCS ::= dotArrowExpCS messageExpCS
		/.$BeginJava
					MessageExpCS result = (MessageExpCS)$getSym(2);
					result.setTarget((OCLExpressionCS)$getSym(1));
					setOffsets(result, (CSTNode)$getSym(1), (CSTNode)$getSym(2));
					$setResult(result);
		  $EndJava
		./
	dotArrowExpCS ::= NUMERIC_OPERATION '(' argumentsCSopt ')'
		/.$BeginJava
					// NUMERIC_OPERATION -> Integer '.' Identifier

		  $EndJava
		./

	oclExpCS -> ifExpCS
	oclExpCS -> associationClassCallExpCS
		/.$BeginJava
					OperationCallExpCS result = createOperationCallExpCS(
							(PathNameCS)$getSym(1),
							(SimpleNameCS)$getSym(3),
							(EList)$getSym(5)
						);
					setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(6)));
					result.setAccessor(DotOrArrowEnum.DOT_LITERAL);
					$setResult(result);
		  $EndJava
		./


	oclExpCS -> variableExpCS
	oclExpCS -> literalExpCS
	oclExpCS -> operationCallExpCS_DF
	oclExpCS -> operationCallExpCS_G

	oclExpCS ::= '(' oclExpressionCS ')'
		/.$BeginJava

		  $EndJava
		./

	associationClassCallExpCS ::= notLiteralNorReservedSimpleNameCS isMarkedPreCSopt
		/.$NewCase./
	variableExpCS ::= keywordAsName1 isMarkedPreCS
		/.$BeginJava
					IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS)$getSym(2);
					CSTNode result = createVariableExpCS(

					$setResult(result);
		  $EndJava
		./
	associationClassCallExpCS ::= notReservedSimpleNameCS '[' argumentsCS ']' isMarkedPreCSopt
		/.$NewCase./
	variableExpCS ::= keywordAsName1 '[' argumentsCS ']' isMarkedPreCS
		/.$BeginJava
					IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS)$getSym(5);
					CSTNode result = createVariableExpCS(

		  $EndJava
		./

	simpleIdentifierCS -> primitiveTypeCS
	simpleIdentifierCS ::= self
	simpleNameCS ::= self
		/.$BeginJava
					CSTNode result = createSimpleNameCS(
							SimpleTypeEnum.SELF_LITERAL,

					$setResult(result);
		  $EndJava
		./
	simpleNameCS -> simpleIdentifierCS
	simpleIdentifierCS ::= IDENTIFIER
		/.$BeginJava
					CSTNode result = createSimpleNameCS(

		  $EndJava
		./

	pathNameCS ::= notReservedSimpleNameCS
		/.$BeginJava
					SimpleNameCS simpleName = (SimpleNameCS)$getSym(1);
					PathNameCS result = createPathNameCS(simpleName);

					$setResult(result);
		  $EndJava
		./
	qualifiedPathNameCS ::= pathNameCS '::' notReservedSimpleNameCS
		/.$BeginJava
					PathNameCS result = (PathNameCS)$getSym(1);
					SimpleNameCS simpleName = (SimpleNameCS)$getSym(3);

					$setResult(result);
		  $EndJava
		./
	pathNameCS -> qualifiedPathNameCS
	pathNameCSOpt ::= $empty
		/.$BeginJava
					CSTNode result = createPathNameCS();
					$setResult(result);
		  $EndJava
		./
	pathNameCSOpt -> pathNameCS

	literalExpCS -> enumLiteralExpCS
	literalExpCS -> collectionLiteralExpCS


    -- also covers the case of static attribute call, in which
    --    case @pre is not allowed anyway
	enumLiteralExpCS ::= qualifiedPathNameCS
		/.$NewCase./
	enumLiteralExpCS ::= pathNameCS '::' simpleNameCS
		/.$BeginJava
					PathNameCS pathNameCS = (PathNameCS)$getSym(1);
					SimpleNameCS simpleNameCS = removeLastSimpleNameCS(pathNameCS);
					CSTNode result = createEnumLiteralExpCS(
							pathNameCS,
							simpleNameCS
						);
					setOffsets(result, pathNameCS, simpleNameCS);
					$setResult(result);
		  $EndJava
		./

	collectionLiteralExpCS ::= collectionTypeIdentifierCS '{' collectionLiteralPartsCSopt '}'
		/.$BeginJava
					CollectionTypeCS typeCS = (CollectionTypeCS)$getSym(1);
					CSTNode result = createCollectionLiteralExpCS(
							typeCS,
							(EList)$getSym(3)
						);
					setOffsets(result, typeCS, getIToken($getToken(4)));
					$setResult(result);
		  $EndJava
		./

	collectionTypeIdentifierCS ::= Set
		/.$BeginJava
					SimpleNameCS result = createCollectionTypeCS(
								CollectionTypeIdentifierEnum.SET_LITERAL,
								getTokenText($getToken(1))
							);
					setOffsets(result, getIToken($getToken(1)));
					$setResult(result);
		  $EndJava
		./
	collectionTypeIdentifierCS ::= Bag
		/.$BeginJava
					SimpleNameCS result = createCollectionTypeCS(
								CollectionTypeIdentifierEnum.BAG_LITERAL,
								getTokenText($getToken(1))
							);
					setOffsets(result, getIToken($getToken(1)));
					$setResult(result);
		  $EndJava
		./
	collectionTypeIdentifierCS ::= Sequence
		/.$BeginJava
					SimpleNameCS result = createCollectionTypeCS(
								CollectionTypeIdentifierEnum.SEQUENCE_LITERAL,
								getTokenText($getToken(1))
							);
					setOffsets(result, getIToken($getToken(1)));
					$setResult(result);
		  $EndJava
		./
	collectionTypeIdentifierCS ::= Collection
		/.$BeginJava
					SimpleNameCS result = createCollectionTypeCS(
								CollectionTypeIdentifierEnum.COLLECTION_LITERAL,
								getTokenText($getToken(1))
							);
					setOffsets(result, getIToken($getToken(1)));
					$setResult(result);
		  $EndJava
		./
	collectionTypeIdentifierCS ::= OrderedSet
		/.$BeginJava
					SimpleNameCS result = createCollectionTypeCS(
								CollectionTypeIdentifierEnum.ORDERED_SET_LITERAL,
								getTokenText($getToken(1))
							);
					setOffsets(result, getIToken($getToken(1)));
					$setResult(result);
		  $EndJava
		./


		  $EndJava
		./

	callExpCS -> loopExpCS
	callExpCS -> propertyCallExpCS
	callExpCS -> operationCallExpCS_B
	callExpCS -> operationCallExpCS_CE
	callExpCS -> operationCallExpCS_IJ
					CallExpCS result = (CallExpCS)$getSym(2);
					result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
					$setResult(result);
		  $EndJava
		./
	callExpCS ::= '.' keywordOperationCallExpCS
		/.$NewCase./
	callExpCS ::= '.' featureCallExpCS
		/.$BeginJava
					CallExpCS result = (CallExpCS)$getSym(2);
					result.setAccessor(DotOrArrowEnum.DOT_LITERAL);
					if (result instanceof OperationCallExpCS) {
						((OperationCallExpCS)result).setIsAtomic(true);
					}
					$setResult(result);
		  $EndJava
		./

	loopExpCS -> iteratorExpCS
	loopExpCS -> iterateExpCS

	iteratorExpCS ::= dotArrowExpCS '->' iteratorNameCS '(' oclExpressionCS ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
					CSTNode result = createIteratorExpCS(
							source,
							simpleNameCS,
							null,
							null,
							(OCLExpressionCS)$getSym(5)
						);
					setOffsets(result, source, getIToken($getToken(6)));
					$setResult(result);
		  $EndJava
		./
	iteratorExpCS ::= dotArrowExpCS '->' iteratorNameCS '(' variableCS '|' oclExpressionCS ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
					CSTNode result = createIteratorExpCS(
							source,
							simpleNameCS,
							(VariableCS)$getSym(5),
							null,
							(OCLExpressionCS)$getSym(7)
						);
					setOffsets(result, source, getIToken($getToken(8)));
					$setResult(result);
		  $EndJava
		./
	iteratorExpCS ::= dotArrowExpCS '->' iteratorNameCS '(' variableCS ',' variableCS '|' oclExpressionCS ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
					CSTNode result = createIteratorExpCS(
							source,
							simpleNameCS,
							(VariableCS)$getSym(3),
							(VariableCS)$getSym(5),
							(VariableCS)$getSym(7),
							(OCLExpressionCS)$getSym(9)
						);
					setOffsets(result, source, getIToken($getToken(10)));
					$setResult(result);
		  $EndJava
		./

	iterateExpCS ::= dotArrowExpCS '->' iterateNameCS '(' variableCS '|' oclExpressionCS ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
					CSTNode result = createIterateExpCS(
							source,
							simpleNameCS,
							(VariableCS)$getSym(5),
							null,
							(OCLExpressionCS)$getSym(7)
						);
					setOffsets(result, source, getIToken($getToken(8)));
					$setResult(result);
		  $EndJava
		./
	iterateExpCS ::= dotArrowExpCS '->' iterateNameCS '(' variableCS ';' variableCS '|' oclExpressionCS ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
					CSTNode result = createIterateExpCS(
							source,
							simpleNameCS,
							(VariableCS)$getSym(3),
							(VariableCS)$getSym(5),
							(VariableCS)$getSym(7),
							(OCLExpressionCS)$getSym(9)
						);
					setOffsets(result, source, getIToken($getToken(10)));
					$setResult(result);
		  $EndJava
		./
	
	-- Merging these as notReservedSimpleNameCS gives conflicts; why? LPG bug ??
	variableNameCS ::= booleanLiteralExpCS
		/.$NewCase./
	variableNameCS ::= invalidLiteralExpCS
		/.$NewCase./
	variableNameCS ::= nullLiteralExpCS
		/.$NewCase./
	variableNameCS ::= notLiteralNorReservedSimpleNameCS
		/.$BeginJava
					SimpleNameCS name = (SimpleNameCS)$getSym(1);
					CSTNode result = createVariableCS(name.getValue());
					setOffsets(result, name);
							null
						);
					setOffsets(result, getIToken($getToken(1)));
					$setResult(result);
		  $EndJava
		./
	typedVariableCS ::= variableNameCS ':' typeCS
		/.$BeginJava
					VariableCS result = (VariableCS)$getSym(1);
					TypeCS type = (TypeCS)$getSym(3);
					result.setTypeCS(type);
					setOffsets(result, result, type);
						);
					setOffsets(result, getIToken($getToken(1)), (CSTNode)$getSym(3));
					$setResult(result);
		  $EndJava
		./
	variableCS -> variableNameCS
	variableCS -> typedVariableCS
	variableCS2 -> variableCS
		/.$BeginJava
					CSTNode result = createVariableCS(
							getTokenText($getToken(1)),
							(TypeCS)$getSym(3),
							(OCLExpressionCS)$getSym(5)
						);
					setOffsets(result, getIToken($getToken(1)), (CSTNode)$getSym(5));
					$setResult(result);
		  $EndJava
		./

	-- this form of variable declaration is only used in tuple literals
	variableCS2 ::= variableNameCS '=' oclExpressionCS
		/.$NewCase./
	variableCS ::= typedVariableCS '=' oclExpressionCS
		/.$BeginJava
					VariableCS result = (VariableCS)$getSym(1);
					OCLExpressionCS initExpression = (OCLExpressionCS)$getSym(3);
					result.setInitExpression(initExpression);
					setOffsets(result, result, initExpression);
						);
					setOffsets(result, getIToken($getToken(1)), (CSTNode)$getSym(3));
					$setResult(result);
		  $EndJava
		./

		/.$NullAction./
	typeCSopt -> typeCS

	-- the order of these rules is important!  Try to match primitives
	--   first, then tuples (more complex), and finally collections.
	--   Looking for type names in the Ecore model is a last resort
	typeCS -> primitiveTypeCS
	typeCS -> tupleTypeCS
	typeCS -> collectionTypeCS
	typeCS -> qualifiedPathNameCS
	typeCS ::= notReservedSimpleNameCS				-- covers primitiveTypeCS
		/.$BeginJava
					CSTNode result = (CSTNode)$getSym(1);
					if (!(result instanceof TypeCS)) {
						PathNameCS pathNameCS = createPathNameCS((SimpleNameCS)result);
						setOffsets(pathNameCS, result);
						result = pathNameCS;
					}
					$setResult(result);
		  $EndJava
		./

	collectionTypeCS ::= collectionTypeIdentifierCS '(' typeCS ')'
		/.$BeginJava
					CollectionTypeCS result = (CollectionTypeCS)$getSym(1);
					result.setTypeCS((TypeCS)$getSym(3));
					setOffsets(result, result, getIToken($getToken(4)));
							(TypeCS)$getSym(3)
						);
					setOffsets(result, (IToken)objs[0], getIToken($getToken(4)));
					$setResult(result);
		  $EndJava
		./

	variableListCSopt ::= $empty
		/.$EmptyListAction./
	variableListCSopt -> variableListCS
	variableListCS2 ::= variableCS2
		/.$NewCase./
	variableListCS ::= variableCS 
		/.$BeginJava
					EList result = new BasicEList();

					$setResult(result);
		  $EndJava
		./
	variableListCS2 ::= variableListCS2 ',' variableCS2
		/.$NewCase./
	variableListCS ::= variableListCS ',' variableCS
		/.$BeginJava
					EList result = (EList)$getSym(1);

		  $EndJava
		./
	
	operationCallExpCS_B ::= dotArrowExpCS '->' notIteratorNorReservedSimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
	variableListCS2 ::= variableCS2
		/.$NewCase./
	variableListCS2 ::= variableCS
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CSTNode result = createArrowOperationCallExpCS(
							source,
							(SimpleNameCS)$getSym(3),
							(IsMarkedPreCS)$getSym(4),
							(EList)$getSym(6)
						);
					setOffsets(result, source, getIToken($getToken(7)));
					$setResult(result);
		  $EndJava
		./
	operationCallExpCS_CE ::= dotArrowExpCS '.' operationOrNotReservedSimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
		/.$NewCase./
	variableListCS2 ::= variableListCS2 ',' variableCS
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CSTNode result = createDotOperationCallExpCS(
							source,
							null,
							(SimpleNameCS)$getSym(3),
							(IsMarkedPreCS)$getSym(4),
							(EList)$getSym(6)
						);
					setOffsets(result, getIToken($getToken(1)), getIToken($getToken(7)));
					$setResult(result);
		  $EndJava
		./
	operationCallExpCS_DF ::= notReservedSimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
	-- covers attributeCallExpCS and navigationCallExpCS
	featureCallExpCS -> attrOrNavCallExpCS

	featureCallExpCS -> operationCallExpCS
	featureCallExpCS ::= unaryName isMarkedPreCS '(' argumentsCSopt ')'
		/.$NewCase./
	-- even though these operations do not use @pre or do not accept multiple arguments
	-- in order to get better error reporting, the rule signature must comply with
	-- the full rule of an operationCallExpCS
	-- the alternative would be to remove these as keywords, but then the parser
	-- would accept variable declarations where the var can be named "oclIsNew" for example
	operationCallExpCS ::= binaryName isMarkedPreCS '(' argumentsCSopt ')'
		/.$NewCase./
	keywordOperationCallExpCS ::= keywordAsName isMarkedPreCS '(' argumentsCSopt ')'
		/.$BeginJava
					CSTNode result = createDotOperationCallExpCS(
							null,
							null,
							(SimpleNameCS)$getSym(1),
							(IsMarkedPreCS)$getSym(2),
							(EList)$getSym(4)

					$setResult(result);
		  $EndJava
		./
	operationCallExpCS_G ::=  qualifiedPathNameCS '(' argumentsCSopt ')'
	stateExpCS ::= pathNameCSOpt
		/.$BeginJava
					PathNameCS pathNameCS = (PathNameCS)$getSym(1);
					OperationCallExpCS result = createDotOperationCallExpCS(
							null,
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							null,
							(EList)$getSym(3)
						);
					setOffsets(result, pathNameCS, getIToken($getToken(4)));
					$setResult(result);
		  $EndJava
		./
	operationCallExpCS_IJ ::= dotArrowExpCS '.' qualifiedPathNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
	operationCallExpCS ::= oclIsInStateName isMarkedPreCS '(' stateExpCS ')'
		/.$BeginJava
					PathNameCS pathNameCS = (PathNameCS)$getSym(3);
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createDotOperationCallExpCS(
							source,
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							(IsMarkedPreCS)$getSym(4),
							(EList)$getSym(6)
						);
					setOffsets(result, source, getIToken($getToken(7)));
					$setResult(result);
		  $EndJava
		./		

	propertyCallExpCS ::= dotArrowExpCS '.' notReservedSimpleNameCS isMarkedPreCSopt
		/.$NewCase./
	attrOrNavCallExpCS ::= keywordAsName isMarkedPreCS
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS)$getSym(4);
					CSTNode result = createFeatureCallExpCS(
							source,
							(SimpleNameCS)$getSym(3),
							new BasicEList(),
							isMarkedPreCS
						);
					if (isMarkedPreCS != null) {
						setOffsets(result, source, isMarkedPreCS);
					} else {
						setOffsets(result, source, (SimpleNameCS)$getSym(3));
					}
					$setResult(result);
		  $EndJava
		./
	propertyCallExpCS ::= dotArrowExpCS '.' notReservedSimpleNameCS '[' argumentsCS ']' isMarkedPreCSopt
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS)$getSym(7);
					CSTNode result = createFeatureCallExpCS(
							source,
							(SimpleNameCS)$getSym(3),
							(EList)$getSym(5),
							isMarkedPreCS
						);
					if (isMarkedPreCS != null) {
						setOffsets(result, source, isMarkedPreCS);
					} else {
						setOffsets(result, source, getIToken($getToken(6)));
					}
					$setResult(result);
		  $EndJava
		./

	isMarkedPreCSopt ::= $empty
		/.$BeginJava
					$setResult(null);
		  $EndJava
		./
	isMarkedPreCSopt ::= '@pre'
		/.$BeginJava
					CSTNode result = createIsMarkedPreCS();
					setOffsets(result, getIToken($getToken(1)));

		  $EndJava
		./

	oclMessageExpCS ::= dotArrowExpCS '^' simpleNameCS '(' oclMessageArgumentsCSopt ')'
		/.$NewCase./
	oclMessageExpCS ::= dotArrowExpCS '^^' simpleNameCS '(' oclMessageArgumentsCSopt ')'
		/.$BeginJava
					OCLExpressionCS target = (OCLExpressionCS)$getSym(1);
					MessageExpCS result = createMessageExpCS(
							target,
							getIToken($getToken(2)).getKind() == $sym_type.TK_CARET,
							(SimpleNameCS)$getSym(3),
							(EList<OCLMessageArgCS>)$getSym(5)
						);
					setOffsets(result, target, getIToken($getToken(6)));
					$setResult(result);
		  $EndJava
		./




      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/BooleanLiteralExpCS">
        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/BooleanLiteralExpCS/booleanSymbol"/>
      </genClasses>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/NullLiteralExpCS"/>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/InvalidLiteralExpCS"/>
      </genClasses>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/InvalidLiteralExpCS">
        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/InvalidLiteralExpCS/symbol"/>
      </genClasses>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/CollectionRangeCS">
        <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
            createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/CollectionRangeCS/lastExpressionCS"/>

            createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/FeatureCallExpCS/isMarkedPreCS"/>
      </genClasses>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/OperationCallExpCS">
        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/OperationCallExpCS/isAtomic"/>
      </genClasses>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/StateExpCS">
        <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
            createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/OperationCallExpCS/pathNameCS"/>
        <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/OperationCallExpCS/isAtomic"/>
      </genClasses>
      <genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/OCLDocumentCS">
        <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"




      <eStructuralFeatures xsi:type="ecore:EReference" name="variables" lowerBound="1"
          upperBound="-1" eType="#//cst/VariableCS" containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="CollectionTypeCS" eSuperTypes="#//cst/SimpleNameCS #//cst/TypeCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="collectionTypeIdentifier"
          eType="#//cst/CollectionTypeIdentifierEnum"/>
      <eStructuralFeatures xsi:type="ecore:EReference" name="typeCS" eType="#//cst/TypeCS"

      <eStructuralFeatures xsi:type="ecore:EAttribute" name="unescapedStringSymbol"
          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="BooleanLiteralExpCS" eSuperTypes="#//cst/SimpleNameCS #//cst/PrimitiveLiteralExpCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="NullLiteralExpCS" eSuperTypes="#//cst/SimpleNameCS #//cst/LiteralExpCS"/>
    <eClassifiers xsi:type="ecore:EClass" name="InvalidLiteralExpCS" eSuperTypes="#//cst/SimpleNameCS #//cst/LiteralExpCS"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="InvalidLiteralExpCS" eSuperTypes="#//cst/LiteralExpCS">
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="CollectionRangeCS" eSuperTypes="#//cst/CollectionLiteralPartCS">
      <eStructuralFeatures xsi:type="ecore:EReference" name="lastExpressionCS" eType="#//cst/OCLExpressionCS"
          containment="true">

          containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="OperationCallExpCS" eSuperTypes="#//cst/FeatureCallExpCS">
      <eStructuralFeatures xsi:type="ecore:EReference" name="pathNameCS" eType="#//cst/PathNameCS"
          containment="true"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="isAtomic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
          defaultValueLiteral="false"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="StateExpCS" eSuperTypes="#//cst/TypeCS">
      <eStructuralFeatures xsi:type="ecore:EReference" name="simpleNames" upperBound="-1"
          eType="#//cst/SimpleNameCS" containment="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="OCLDocumentCS" eSuperTypes="#//cst/CSTNode">
      <eStructuralFeatures xsi:type="ecore:EReference" name="packageDeclarations"
          ordered="false" upperBound="-1" eType="#//cst/PackageDeclarationCS" containment="true"/>




<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/4" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/4 pathmap://UML_PROFILES/Ecore.profile.uml#_B7dOIMEREduRdatXodjBjA">
  <uml:Model xmi:id="_qdx8sQ8fEduhWtVvKtiQ7w" name="ocl">
    <packagedElement xmi:type="uml:Package" xmi:id="_qdx8sP8fEduhWtVvKtiQ7w" name="cst">
      <elementImport xmi:id="_5DyD0LD5Ed6LkdYdYK9_JA"/>
      <packageImport xmi:id="_CSYeEI2GEd2mlKUM3HGxZg">
        <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#_0"/>
      </packageImport>

        <ownedEnd xmi:id="_qdx9lP8fEduhWtVvKtiQ7w" type="_qdx9j_8fEduhWtVvKtiQ7w" association="_qdx9k_8fEduhWtVvKtiQ7w"/>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx9lf8fEduhWtVvKtiQ7w" name="CollectionTypeCS">
        <generalization xmi:id="_2NUGIJw2Ed6az7Hq7e93gA" general="_qdx83P8fEduhWtVvKtiQ7w"/>
        <generalization xmi:id="_qdx9lv8fEduhWtVvKtiQ7w" general="_qdx8xP8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx9l_8fEduhWtVvKtiQ7w" name="collectionTypeIdentifier" visibility="public" type="_qdx9m_8fEduhWtVvKtiQ7w" isOrdered="true">
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx9mP8fEduhWtVvKtiQ7w"/>

        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-E_8fEduhWtVvKtiQ7w" name="BooleanLiteralExpCS">
        <generalization xmi:id="_HVRk0LKtEd6RC43VVMBX9w" general="_qdx83P8fEduhWtVvKtiQ7w"/>
        <generalization xmi:id="_qdx-FP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx-Ff8fEduhWtVvKtiQ7w" name="booleanSymbol" visibility="public" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>

        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-F_8fEduhWtVvKtiQ7w" name="NullLiteralExpCS">
        <generalization xmi:id="_GYa7ALKtEd6RC43VVMBX9w" general="_qdx83P8fEduhWtVvKtiQ7w"/>
        <generalization xmi:id="_qdx-GP8fEduhWtVvKtiQ7w" general="_qdx93f8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx-Gf8fEduhWtVvKtiQ7w" name="symbol" visibility="public" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Gv8fEduhWtVvKtiQ7w"/>
        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-G_8fEduhWtVvKtiQ7w" name="InvalidLiteralExpCS">
        <generalization xmi:id="_9073ALKsEd6RC43VVMBX9w" general="_qdx83P8fEduhWtVvKtiQ7w"/>
        <generalization xmi:id="_qdx-HP8fEduhWtVvKtiQ7w" general="_qdx93f8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_qdx-Hf8fEduhWtVvKtiQ7w" name="symbol" visibility="public" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Hv8fEduhWtVvKtiQ7w"/>
        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-H_8fEduhWtVvKtiQ7w" name="CollectionRangeCS">
        <generalization xmi:id="_qdx-IP8fEduhWtVvKtiQ7w" general="_qdx98P8fEduhWtVvKtiQ7w"/>

      </packagedElement>
      <packagedElement xmi:type="uml:Class" xmi:id="_qdx-Vf8fEduhWtVvKtiQ7w" name="OperationCallExpCS">
        <generalization xmi:id="_qdx-Vv8fEduhWtVvKtiQ7w" general="_qdx-Sv8fEduhWtVvKtiQ7w"/>
        <ownedAttribute xmi:id="_uREjQJrAEd6qQcRgrpdjbQ" name="pathNameCS" type="_qdx8v_8fEduhWtVvKtiQ7w" isOrdered="true" aggregation="composite">
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uREjQZrAEd6qQcRgrpdjbQ"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_306UMZXiEd6Wx-S3aeq4Aw"/>
          <defaultValue xmi:type="uml:LiteralString" xmi:id="_8lGFsJXiEd6Wx-S3aeq4Aw" value="false"/>
        </ownedAttribute>
        <ownedAttribute xmi:id="_z9V7sLI8Ed6kyPEWd5jeqw" name="isAtomic" visibility="public" isOrdered="true">
          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z9V7sbI8Ed6kyPEWd5jeqw"/>
          <defaultValue xmi:type="uml:LiteralString" xmi:id="_3WtEMLI8Ed6kyPEWd5jeqw" value="false"/>
          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pS7AEZPiEd6yA_hAShwLtA" value="*"/>
          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pS7AEpPiEd6yA_hAShwLtA"/>
        </ownedAttribute>
      </packagedElement>
      <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_tvVQwI2FEd2mlKUM3HGxZg" name="IToken"/>

  <Ecore:EClass xmi:id="_qfsogP8fEduhWtVvKtiQ7w" base_Class="_qdx-E_8fEduhWtVvKtiQ7w"/>
  <Ecore:EAttribute xmi:id="_qfsogf8fEduhWtVvKtiQ7w" base_Property="_qdx-Ff8fEduhWtVvKtiQ7w"/>
  <Ecore:EClass xmi:id="_qfsogv8fEduhWtVvKtiQ7w" base_Class="_qdx-F_8fEduhWtVvKtiQ7w"/>
  <Ecore:EAttribute xmi:id="_qfsog_8fEduhWtVvKtiQ7w"/>
  <Ecore:EClass xmi:id="_qfsohP8fEduhWtVvKtiQ7w" base_Class="_qdx-G_8fEduhWtVvKtiQ7w"/>
  <Ecore:EAttribute xmi:id="_qfsohf8fEduhWtVvKtiQ7w"/>
  <Ecore:EClass xmi:id="_qfsohv8fEduhWtVvKtiQ7w" base_Class="_qdx-H_8fEduhWtVvKtiQ7w"/>
  <Ecore:EReference xmi:id="_qfsoh_8fEduhWtVvKtiQ7w" xmlName="lastOclExpressionCS" base_Property="_qdx-If8fEduhWtVvKtiQ7w"/>
  <Ecore:EClass xmi:id="_qfsoiP8fEduhWtVvKtiQ7w" base_Class="_qdx-Jf8fEduhWtVvKtiQ7w"/>

  <Ecore:EReference xmi:id="_qf-8Jf8fEduhWtVvKtiQ7w" base_Property="_qdx-TP8fEduhWtVvKtiQ7w"/>
  <Ecore:EReference xmi:id="_qf-8Jv8fEduhWtVvKtiQ7w" base_Property="_qdx-T_8fEduhWtVvKtiQ7w"/>
  <Ecore:EClass xmi:id="_qf-8J_8fEduhWtVvKtiQ7w" base_Class="_qdx-Vf8fEduhWtVvKtiQ7w"/>
  <Ecore:EClass xmi:id="_qf-8KP8fEduhWtVvKtiQ7w"/>
  <Ecore:EAttribute xmi:id="_qf-8Kf8fEduhWtVvKtiQ7w"/>
  <Ecore:EDataType xmi:id="_wn-44I2FEd2mlKUM3HGxZg" instanceClassName="lpg.lpgjavaruntime.IToken" base_PrimitiveType="_tvVQwI2FEd2mlKUM3HGxZg"/>
  <Ecore:EAttribute xmi:id="_qkehgI2JEd2mlKUM3HGxZg" isTransient="true" base_Property="_PkTnII2GEd2mlKUM3HGxZg"/>

Lines 55-65 Link Here

(-)src/org/eclipse/ocl/parser/backtracking/OCLParserErrors.g (-5 / +1 lines)
55	./	55	./
56	defExpressionCS ::= IDENTIFIER ERROR_Colon	56	defExpressionCS ::= IDENTIFIER ERROR_Colon
57	/.$BeginJava	57	/.$BeginJava
58	VariableCS variableCS = createVariableCS(	58	VariableCS variableCS = createVariableCS(getTokenText($getToken(1)));
59	getTokenText($getToken(1)),
60	null,
61	null
62	);
63	setOffsets(variableCS, getIToken($getToken(1)), getIToken($getToken(2)));	59	setOffsets(variableCS, getIToken($getToken(1)), getIToken($getToken(2)));
64	CSTNode result = createDefExpressionCS(	60	CSTNode result = createDefExpressionCS(
65	variableCS,	61	variableCS,




		  $EndJava
		./

	associationClassCallExpCS ::= notReservedSimpleNameCS '[' argumentsCS ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RBRACK);
					CSTNode result = createVariableExpCS(
							(SimpleNameCS)$getSym(1),
							(EList)$getSym(3),
							null

					$setResult(result);
		  $EndJava
		./
	propertyCallExpCS ::= dotArrowExpCS '.' notReservedSimpleNameCS '[' argumentsCS ERROR_TOKEN
	collectionTypeCS ::= collectionTypeIdentifierCS '(' typeCS ERROR_TOKEN
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createFeatureCallExpCS(
							source,
							(SimpleNameCS)$getSym(3),
							(EList)$getSym(5),
							null
						);
					setOffsets(result, source, getIToken($getToken(6)));
					$setResult(result);
		  $EndJava
		./
	propertyCallExpCS ::= dotArrowExpCS '.' ERROR_SimpleNameCS '[' argumentsCS ']' isMarkedPreCSopt
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS)$getSym(7);
					CallExpCS result = createFeatureCallExpCS(
							source,
							(SimpleNameCS)$getSym(3),
							(EList)$getSym(5),
							isMarkedPreCS
						);
					if (isMarkedPreCS != null) {
						setOffsets(result, source, isMarkedPreCS);
					} else {
						setOffsets(result, source, getIToken($getToken(6)));
					}
					$setResult(result);
		  $EndJava
		./
		
	collectionTypeCS ::= collectionTypeIdentifierCS '(' typeCS ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RPAREN);
					CollectionTypeCS result = (CollectionTypeCS)dtParser.getSym(1); 
					result.setTypeCS((TypeCS)dtParser.getSym(3));
					setOffsets(result, result, getIToken($getToken(4)));
						);
					setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(6)));
					result.setAccessor(DotOrArrowEnum.DOT_LITERAL);
					$setResult(result);
		  $EndJava
		./




		  $EndJava
		./
		
	operationCallExpCS_B ::= dotArrowExpCS '->' ERROR_SimpleNameCS '(' argumentsCSopt ')'
		/.$NewCase./
	keywordOperationCallExpCS ::= keywordAsName ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		/.$NewCase./
	operationCallExpCS ::= binaryName ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createArrowOperationCallExpCS(
							source,
							(SimpleNameCS)$getSym(3),
							(IsMarkedPreCS)null,
							(EList)$getSym(5)
						);
					setOffsets(result, source, getIToken($getToken(6)));
					$setResult(result);
		  $EndJava
		./	
		
	operationCallExpCS_CE ::= dotArrowExpCS '.' ERROR_SimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createDotOperationCallExpCS(
							source,
							null,
							(SimpleNameCS)$getSym(3),
							(IsMarkedPreCS)$getSym(4),
							(EList)$getSym(6)
						);
					setOffsets(result, source, getIToken($getToken(7)));
					$setResult(result);
		  $EndJava
		./
	operationCallExpCS_CE ::= dotArrowExpCS '.' operationOrNotReservedSimpleNameCS ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createDotOperationCallExpCS(
							source,
							null,
							(SimpleNameCS)$getSym(3),
							(IsMarkedPreCS)$getSym(4),
							(EList)$getSym(6)
						);
					setOffsets(result, source, getIToken($getToken(7)));
					$setResult(result);
		  $EndJava
		./
		
	operationCallExpCS_DF ::= notReservedSimpleNameCS ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		/.$BeginJava
					CSTNode result = createDotOperationCallExpCS(
							null,
							null,
							(SimpleNameCS)$getSym(1),
							(IsMarkedPreCS)$getSym(2),
							(EList)$getSym(4)
						);
					setOffsets(result, getIToken($getToken(1)), getIToken($getToken(5)));
					$setResult(result);
		  $EndJava
		./

	operationCallExpCS_G ::=  pathNameCS '::' ERROR_SimpleNameCS '(' argumentsCSopt ')'
		/.$BeginJava
					OperationCallExpCS result = createDotOperationCallExpCS(
							null,
							(PathNameCS)$getSym(1),
							(SimpleNameCS)$getSym(3),
							null,
							(EList)$getSym(5)
						);
					setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(6)));
					$setResult(result);
		  $EndJava
		./
		
	operationCallExpCS_IJ ::= dotArrowExpCS '.' qualifiedPathNameCS ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		/.$BeginJava
					PathNameCS pathName = (PathNameCS)$getSym(3);
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createDotOperationCallExpCS(
							source,
							pathName,
							removeLastSimpleNameCS(pathName),
							(IsMarkedPreCS)$getSym(4),
							(EList)$getSym(6)
						);
					setOffsets(result, source, getIToken($getToken(7)));
					$setResult(result);
		  $EndJava
		./		
	operationCallExpCS_IJ ::= dotArrowExpCS '.' pathNameCS '::' ERROR_SimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
		/.$BeginJava
					OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
					CallExpCS result = createDotOperationCallExpCS(
							source,
							(PathNameCS)$getSym(3),
							(SimpleNameCS)$getSym(5),
							(IsMarkedPreCS)$getSym(6),
							(EList)$getSym(8)
						);
					setOffsets(result, source, getIToken($getToken(9)));
					$setResult(result);
		  $EndJava
		./	

	ifExpCS ::= if oclExpressionCS then oclExpressionCS else oclExpressionCS ERROR_TOKEN
		/.$BeginJava

		  $EndJava
		./
		
	oclMessageExpCS ::= dotArrowExpCS '^' simpleNameCS ERROR_TOKEN
		/.$NewCase./
	oclMessageExpCS ::= dotArrowExpCS '^^' simpleNameCS ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_MESSAGE_ARGUMENTS);
					OCLExpressionCS target = (OCLExpressionCS)$getSym(1);
					MessageExpCS result = createMessageExpCS(
							target,
							getIToken($getToken(2)).getKind() == $sym_type.TK_CARET,
							(SimpleNameCS)$getSym(3),
							new BasicEList<OCLMessageArgCS>()
						);
					setOffsets(result, target, getIToken($getToken(4)));
					$setResult(result);
		  $EndJava
		./
	oclMessageExpCS ::= dotArrowExpCS '^' ERROR_SimpleNameCS
		/.$NewCase./
	oclMessageExpCS ::= dotArrowExpCS '^^' ERROR_SimpleNameCS
		/.$BeginJava
					SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
					OCLExpressionCS target = (OCLExpressionCS)$getSym(1);
					MessageExpCS result = createMessageExpCS(
							target,
							getIToken($getToken(2)).getKind() == $sym_type.TK_CARET,
							simpleNameCS,
							new BasicEList<OCLMessageArgCS>()
						);
					setOffsets(result, target, simpleNameCS);
					$setResult(result);
		  $EndJava
		./

		  $EndJava
		./

	operationCS1 ::= notReservedSimpleNameCS '(' variableListCSopt ')' ERROR_Colon
		/.$BeginJava
					CSTNode result = createOperationCS(
							getTokenText($getToken(1)),

					$setResult(result);
		  $EndJava
		./
	operationCS1 ::= notReservedSimpleNameCS '(' variableListCSopt ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RPAREN);
					CSTNode result = createOperationCS(

					$setResult(result);
		  $EndJava
		./
	operationCS1 ::= notReservedSimpleNameCS ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_LPAREN);
					CSTNode result = createOperationCS(

					$setResult(result);
		  $EndJava
		./
	operationCS2 ::= qualifiedPathNameCS '(' variableListCSopt ')' ERROR_Colon
		/.$BeginJava
					PathNameCS pathNameCS = (PathNameCS)$getSym(1);
					CSTNode result = createOperationCS(
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							(EList)$getSym(3),
							null
						);
					setOffsets(result, pathNameCS, getIToken($getToken(5)));
					$setResult(result);
		  $EndJava
		./
	operationCS2 ::= qualifiedPathNameCS '(' variableListCSopt ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(6), OCLParserErrors.MISSING_RPAREN);
					PathNameCS pathNameCS = (PathNameCS)$getSym(1);
					CSTNode result = createOperationCS(
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							(EList)$getSym(3),
							null
						);
					setOffsets(result, pathNameCS, getIToken($getToken(4)));
					$setResult(result);
		  $EndJava
		./
	operationCS2 ::= qualifiedPathNameCS ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_LPAREN);
					PathNameCS pathNameCS = (PathNameCS)$getSym(1);
					CSTNode result = createOperationCS(
							pathNameCS,
							removeLastSimpleNameCS(pathNameCS),
							new BasicEList(),
							null
						);
					setOffsets(result, pathNameCS, getIToken($getToken(2)));
					$setResult(result);
		  $EndJava
		./

		  $EndJava
		./

--	variableCS ::= notLiteralNorReservedSimpleNameCS ERROR_TOKEN
--		/.$BeginJava
--					reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_VARIABLE_TYPE);
--					SimpleNameCS name = (SimpleNameCS)$getSym(1);
--					CSTNode result = createVariableCS(name.getValue());
--					setOffsets(result, getIToken($getToken(1)), getIToken($getToken(2)));
--					$setResult(result);
--		  $EndJava
--		./
					$setResult(result);
		  $EndJava
		./

	variableExpCS ::= simpleNameCS '[' argumentsCS ERROR_TOKEN
		/.$NewCase./
	variableExpCS ::= keywordAsName1 '[' argumentsCS ERROR_TOKEN
		/.$BeginJava
					reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RBRACK);
					CSTNode result = createVariableExpCS(
							(SimpleNameCS)$getSym(1),
							(EList)$getSym(3),
							null
						);
					setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(4)));
					$setResult(result);
		  $EndJava
		./

	variableListCS ::= ERROR_TOKEN
		/.$NewCase./




import org.eclipse.ocl.cst.PropertyContextCS;
import org.eclipse.ocl.cst.RealLiteralExpCS;
import org.eclipse.ocl.cst.SimpleNameCS;
import org.eclipse.ocl.cst.StateExpCS;
import org.eclipse.ocl.cst.StringLiteralExpCS;
import org.eclipse.ocl.cst.TupleLiteralExpCS;
import org.eclipse.ocl.cst.TupleTypeCS;

		}

		@Override
		public Adapter caseStateExpCS(StateExpCS object) {
			return createStateExpCSAdapter();
		}

		@Override
		public Adapter caseOCLDocumentCS(OCLDocumentCS object) {
			return createOCLDocumentCSAdapter();
		}

	}

	/**
	 * Creates a new adapter for an object of class '{@link org.eclipse.ocl.cst.StateExpCS <em>State Exp CS</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.ocl.cst.StateExpCS
	 * @generated
	 */
	public Adapter createStateExpCSAdapter() {
		return null;
	}

	/**
	 * Creates a new adapter for an object of class '{@link org.eclipse.ocl.cst.OCLDocumentCS <em>OCL Document CS</em>}'.
	 * <!-- begin-user-doc -->
	 * This default implementation returns null so that we can easily ignore cases;

Lines 67-73 Link Here

(-)src/org/eclipse/ocl/cst/util/CSTSwitch.java (-29 / +8 lines)
67	import org.eclipse.ocl.cst.PropertyContextCS;	67	import org.eclipse.ocl.cst.PropertyContextCS;
68	import org.eclipse.ocl.cst.RealLiteralExpCS;	68	import org.eclipse.ocl.cst.RealLiteralExpCS;
69	import org.eclipse.ocl.cst.SimpleNameCS;	69	import org.eclipse.ocl.cst.SimpleNameCS;
70	import org.eclipse.ocl.cst.StateExpCS;
71	import org.eclipse.ocl.cst.StringLiteralExpCS;	70	import org.eclipse.ocl.cst.StringLiteralExpCS;
72	import org.eclipse.ocl.cst.TupleLiteralExpCS;	71	import org.eclipse.ocl.cst.TupleLiteralExpCS;
73	import org.eclipse.ocl.cst.TupleTypeCS;	72	import org.eclipse.ocl.cst.TupleTypeCS;
Lines 401-406 Link Here
401	CollectionTypeCS collectionTypeCS = (CollectionTypeCS) theEObject;	400	CollectionTypeCS collectionTypeCS = (CollectionTypeCS) theEObject;
402	T result = caseCollectionTypeCS(collectionTypeCS);	401	T result = caseCollectionTypeCS(collectionTypeCS);
403	if (result == null)	402	if (result == null)
		403	result = caseSimpleNameCS(collectionTypeCS);
		404	if (result == null)
404	result = caseTypeCS(collectionTypeCS);	405	result = caseTypeCS(collectionTypeCS);
405	if (result == null)	406	if (result == null)
406	result = caseOCLExpressionCS(collectionTypeCS);	407	result = caseOCLExpressionCS(collectionTypeCS);
Lines 588-593 Link Here
588	BooleanLiteralExpCS booleanLiteralExpCS = (BooleanLiteralExpCS) theEObject;	589	BooleanLiteralExpCS booleanLiteralExpCS = (BooleanLiteralExpCS) theEObject;
589	T result = caseBooleanLiteralExpCS(booleanLiteralExpCS);	590	T result = caseBooleanLiteralExpCS(booleanLiteralExpCS);
590	if (result == null)	591	if (result == null)
		592	result = caseSimpleNameCS(booleanLiteralExpCS);
		593	if (result == null)
591	result = casePrimitiveLiteralExpCS(booleanLiteralExpCS);	594	result = casePrimitiveLiteralExpCS(booleanLiteralExpCS);
592	if (result == null)	595	if (result == null)
593	result = caseLiteralExpCS(booleanLiteralExpCS);	596	result = caseLiteralExpCS(booleanLiteralExpCS);
Lines 603-608 Link Here
603	NullLiteralExpCS nullLiteralExpCS = (NullLiteralExpCS) theEObject;	606	NullLiteralExpCS nullLiteralExpCS = (NullLiteralExpCS) theEObject;
604	T result = caseNullLiteralExpCS(nullLiteralExpCS);	607	T result = caseNullLiteralExpCS(nullLiteralExpCS);
605	if (result == null)	608	if (result == null)
		609	result = caseSimpleNameCS(nullLiteralExpCS);
		610	if (result == null)
606	result = caseLiteralExpCS(nullLiteralExpCS);	611	result = caseLiteralExpCS(nullLiteralExpCS);
607	if (result == null)	612	if (result == null)
608	result = caseOCLExpressionCS(nullLiteralExpCS);	613	result = caseOCLExpressionCS(nullLiteralExpCS);
Lines 616-621 Link Here
616	InvalidLiteralExpCS invalidLiteralExpCS = (InvalidLiteralExpCS) theEObject;	621	InvalidLiteralExpCS invalidLiteralExpCS = (InvalidLiteralExpCS) theEObject;
617	T result = caseInvalidLiteralExpCS(invalidLiteralExpCS);	622	T result = caseInvalidLiteralExpCS(invalidLiteralExpCS);
618	if (result == null)	623	if (result == null)
		624	result = caseSimpleNameCS(invalidLiteralExpCS);
		625	if (result == null)
619	result = caseLiteralExpCS(invalidLiteralExpCS);	626	result = caseLiteralExpCS(invalidLiteralExpCS);
620	if (result == null)	627	if (result == null)
621	result = caseOCLExpressionCS(invalidLiteralExpCS);	628	result = caseOCLExpressionCS(invalidLiteralExpCS);
Lines 718-736 Link Here
718	result = defaultCase(theEObject);	725	result = defaultCase(theEObject);
719	return result;	726	return result;
720	}	727	}
721	case CSTPackage.STATE_EXP_CS : {
722	StateExpCS stateExpCS = (StateExpCS) theEObject;
723	T result = caseStateExpCS(stateExpCS);
724	if (result == null)
725	result = caseTypeCS(stateExpCS);
726	if (result == null)
727	result = caseOCLExpressionCS(stateExpCS);
728	if (result == null)
729	result = caseCSTNode(stateExpCS);
730	if (result == null)
731	result = defaultCase(theEObject);
732	return result;
733	}
734	case CSTPackage.OCL_DOCUMENT_CS : {	728	case CSTPackage.OCL_DOCUMENT_CS : {
735	OCLDocumentCS oclDocumentCS = (OCLDocumentCS) theEObject;	729	OCLDocumentCS oclDocumentCS = (OCLDocumentCS) theEObject;
736	T result = caseOCLDocumentCS(oclDocumentCS);	730	T result = caseOCLDocumentCS(oclDocumentCS);
Lines 1452-1472 Link Here
1452	}	1446	}
1453		1447
1454	/**	1448	/**
1455	* Returns the result of interpreting the object as an instance of '<em>State Exp CS</em>'.
1456	* <!-- begin-user-doc -->
1457	* This implementation returns null;
1458	* returning a non-null result will terminate the switch.
1459	* <!-- end-user-doc -->
1460	* @param object the target of the switch.
1461	* @return the result of interpreting the object as an instance of '<em>State Exp CS</em>'.
1462	* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
1463	* @generated
1464	*/
1465	public T caseStateExpCS(StateExpCS object) {
1466	return null;
1467	}
1468
1469	/**
1470	* Returns the result of interpreting the object as an instance of '<em>OCL Document CS</em>'.	1449	* Returns the result of interpreting the object as an instance of '<em>OCL Document CS</em>'.
1471	* <!-- begin-user-doc -->	1450	* <!-- begin-user-doc -->
1472	* This implementation returns null;	1451	* This implementation returns null;




	}
	
	/**
	 * Gets the token at the specified index in the list of tokens
	 * represented by the given text.  Token indices count from zero, with
	 * negative indices counting backwards from the last token (-1 is the last,
	 * -2 the next-to-last, etc.).

	 * @param tokenIndex the token index to look at (negative indices count
	 *    backwards from the end)
	 *    
	 * @return the token at the index, or null
	 *    if there is no token at the specified index
	 */
	private IToken tokenAt(String text, int tokenIndex) {
		IToken result = null;
		List<IToken> tokens = tokenize(text);
		
		if (tokenIndex < 0) {

		}
		
		if ((tokenIndex >= 0) && (tokenIndex < tokens.size())) {
			result = tokens.get(tokenIndex);
		}
		
		return result;

						if (iter.hasPrevious()) {
							prev = iter.previous();
							
							if (isOclIsInState(prev)) {
								syntaxHelpStringSuffix = OCL_IS_IN_STATE;
								position = prev.getStartOffset();
								break;

					result = getPathChoices(pathName);
				}
			} else if (txt.endsWith("(") // known BMP code point //$NON-NLS-1$
					&& isOclIsInState(tokenAt(txt, -2))) {

				syntaxHelpStringSuffix = OCL_IS_IN_STATE;
				

		
		return result;
	}

	protected boolean isOclIsInState(IToken token) {
		if (token == null)
			return false;
		if (token.getKind() != OCLParsersym.TK_IDENTIFIER)
			return false;
		return PredefinedType.OCL_IS_IN_STATE_NAME.equals(token.toString());
	}
	
	/**
	 * Disposes not only the specified <tt>object</tt> but all of the objects

Return to bug 184048

Lines 825-831 Link Here

(-)src/org/eclipse/ocl/internal/helper/OCLSyntaxHelper.java (-7 / +15 lines)
825	}	825	}
826		826
827	/**	827	/**
828	* Gets the type of token at the specified index in the list of tokens	828	* Gets the token at the specified index in the list of tokens
829	* represented by the given text. Token indices count from zero, with	829	* represented by the given text. Token indices count from zero, with
830	* negative indices counting backwards from the last token (-1 is the last,	830	* negative indices counting backwards from the last token (-1 is the last,
831	* -2 the next-to-last, etc.).	831	* -2 the next-to-last, etc.).
Lines 834-844 Link Here
834	* @param tokenIndex the token index to look at (negative indices count	834	* @param tokenIndex the token index to look at (negative indices count
835	* backwards from the end)	835	* backwards from the end)
836	*	836	*
837	* @return the token type at the index, or {@link OCLParsersym#TK_EOF_TOKEN}	837	* @return the token at the index, or null
838	* if there is no token at the specified index	838	* if there is no token at the specified index
839	*/	839	*/
840	private int tokenAt(String text, int tokenIndex) {	840	private IToken tokenAt(String text, int tokenIndex) {
841	int result = OCLParsersym.TK_EOF_TOKEN;	841	IToken result = null;
842	List<IToken> tokens = tokenize(text);	842	List<IToken> tokens = tokenize(text);
843		843
844	if (tokenIndex < 0) {	844	if (tokenIndex < 0) {
Lines 846-852 Link Here
846	}	846	}
847		847
848	if ((tokenIndex >= 0) && (tokenIndex < tokens.size())) {	848	if ((tokenIndex >= 0) && (tokenIndex < tokens.size())) {
849	result = tokens.get(tokenIndex).getKind();	849	result = tokens.get(tokenIndex);
850	}	850	}
851		851
852	return result;	852	return result;
Lines 963-969 Link Here
963	if (iter.hasPrevious()) {	963	if (iter.hasPrevious()) {
964	prev = iter.previous();	964	prev = iter.previous();
965		965
966	if (prev.getKind() == OCLParsersym.TK_oclIsInState) {	966	if (isOclIsInState(prev)) {
967	syntaxHelpStringSuffix = OCL_IS_IN_STATE;	967	syntaxHelpStringSuffix = OCL_IS_IN_STATE;
968	position = prev.getStartOffset();	968	position = prev.getStartOffset();
969	break;	969	break;
Lines 1000-1006 Link Here
1000	result = getPathChoices(pathName);	1000	result = getPathChoices(pathName);
1001	}	1001	}
1002	} else if (txt.endsWith("(") // known BMP code point //$NON-NLS-1$	1002	} else if (txt.endsWith("(") // known BMP code point //$NON-NLS-1$
1003	&& (tokenAt(txt, -2) == OCLParsersym.TK_oclIsInState)) {	1003	&& isOclIsInState(tokenAt(txt, -2))) {
1004		1004
1005	syntaxHelpStringSuffix = OCL_IS_IN_STATE;	1005	syntaxHelpStringSuffix = OCL_IS_IN_STATE;
1006		1006
Lines 1076-1081 Link Here
1076		1076
1077	return result;	1077	return result;
1078	}	1078	}
		1079
		1080	protected boolean isOclIsInState(IToken token) {
		1081	if (token == null)
		1082	return false;
		1083	if (token.getKind() != OCLParsersym.TK_IDENTIFIER)
		1084	return false;
		1085	return PredefinedType.OCL_IS_IN_STATE_NAME.equals(token.toString());
		1086	}
1079		1087
1080	/**	1088	/**
1081	* Disposes not only the specified <tt>object</tt> but all of the objects	1089	* Disposes not only the specified <tt>object</tt> but all of the objects

Lines 14-20 Link Here

(-)src/org/eclipse/ocl/ecore/tests/BasicOCLTest.java (-5 / +27 lines)
14	*	14	*
15	* </copyright>	15	* </copyright>
16	*	16	*
17	* $Id: BasicOCLTest.java,v 1.11 2009/10/07 20:39:29 ewillink Exp $	17	* $Id: BasicOCLTest.java,v 1.10 2009/10/07 16:59:09 ewillink Exp $
18	*/	18	*/
19		19
20	package org.eclipse.ocl.ecore.tests;	20	package org.eclipse.ocl.ecore.tests;
Lines 260-265 Link Here
260	assertFalse(check(expr, eCls));	260	assertFalse(check(expr, eCls));
261	}	261	}
262		262
		263	public void testIfExpressions_184048() {
		264	EClass eCls = EcoreFactory.eINSTANCE.createEClass();
		265	eCls.setName("bar"); //$NON-NLS-1$
		266
		267	OCLExpression<EClassifier> expr = parse(
		268	"package ecore context EClass " + //$NON-NLS-1$
		269	"inv: if self.abstract then name = 'bar' else name <> 'bar' endif ->asSequence()->at(1)" + //$NON-NLS-1$
		270	"endpackage "); //$NON-NLS-1$
		271
		272	assertFalse(check(expr, eCls));
		273
		274	eCls.setAbstract(true);
		275
		276	assertTrue(check(expr, eCls));
		277
		278	eCls.setName("foo"); //$NON-NLS-1$
		279
		280	assertFalse(check(expr, eCls));
		281
		282	OCLExpression<EClassifier> expr2 = parse(
		283	"package ecore context EClass " + //$NON-NLS-1$
		284	"inv: 7 = 1 + let a : String = invalid in 1 + if self.oclIsUndefined() then 1 else 5 endif " + //$NON-NLS-1$
		285	"endpackage "); //$NON-NLS-1$
		286	assertTrue(check(expr2, eCls));
		287	}
		288
263	public void testLetExpressions() {	289	public void testLetExpressions() {
264	EClass eCls = EcoreFactory.eINSTANCE.createEClass();	290	EClass eCls = EcoreFactory.eINSTANCE.createEClass();
265	eCls.setName("foo"); //$NON-NLS-1$	291	eCls.setName("foo"); //$NON-NLS-1$
Lines 359-372 Link Here
359	String self = ""; //$NON-NLS-1$	385	String self = ""; //$NON-NLS-1$
360		386
361	try {	387	try {
362	assertInvalidString("'\\\\\\ '"); //$NON-NLS-1$
363	assertInvalidString("'str\\(ing'"); //$NON-NLS-1$	388	assertInvalidString("'str\\(ing'"); //$NON-NLS-1$
364	assertInvalidString("'string\\'"); //$NON-NLS-1$	389	assertInvalidString("'string\\'"); //$NON-NLS-1$
365	assertInvalidString("'string\\9'"); //$NON-NLS-1$	390	assertInvalidString("'string\\9'"); //$NON-NLS-1$
366		391
367	assertEquals("\\", //$NON-NLS-1$
368	evaluate(helper, self, "'\\\\'")); //$NON-NLS-1$
369
370	assertEquals("str\ning", //$NON-NLS-1$	392	assertEquals("str\ning", //$NON-NLS-1$
371	evaluate(helper, self, "'str\\ning'")); //$NON-NLS-1$	393	evaluate(helper, self, "'str\\ning'")); //$NON-NLS-1$
372		394

Removed Link Here

(-)src/org/eclipse/ocl/cst/impl/StateExpCSImpl.java (-170 lines)
1	/**
2	* <copyright>
3	*
4	* Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc., and others.
5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at
8	* http://www.eclipse.org/legal/epl-v10.html
9	*
10	* Contributors:
11	* IBM - Initial API and implementation
12	* Zeligsoft - Bug 243976
13	*
14	* </copyright>
15	*
16	* $Id: StateExpCSImpl.java,v 1.4 2009/09/04 13:40:43 ewillink Exp $
17	*/
18	package org.eclipse.ocl.cst.impl;
19
20	import java.util.Collection;
21
22	import org.eclipse.emf.common.notify.NotificationChain;
23	import org.eclipse.emf.common.util.EList;
24	import org.eclipse.emf.ecore.EClass;
25	import org.eclipse.emf.ecore.InternalEObject;
26	import org.eclipse.emf.ecore.util.EObjectContainmentEList;
27	import org.eclipse.emf.ecore.util.InternalEList;
28	import org.eclipse.ocl.cst.CSTPackage;
29	import org.eclipse.ocl.cst.SimpleNameCS;
30	import org.eclipse.ocl.cst.StateExpCS;
31
32	/**
33	* <!-- begin-user-doc -->
34	* An implementation of the model object '<em><b>State Exp CS</b></em>'.
35	* <!-- end-user-doc -->
36	* <p>
37	* The following features are implemented:
38	* <ul>
39	* <li>{@link org.eclipse.ocl.cst.impl.StateExpCSImpl#getSimpleNames <em>Simple Names</em>}</li>
40	* </ul>
41	* </p>
42	*
43	* @generated
44	*/
45	public class StateExpCSImpl
46	extends TypeCSImpl
47	implements StateExpCS {
48
49	/**
50	* The cached value of the '{@link #getSimpleNames() <em>Simple Names</em>}' containment reference list.
51	* <!-- begin-user-doc -->
52	* @since 3.0
53	* <!-- end-user-doc -->
54	* @see #getSimpleNames()
55	* @generated
56	* @ordered
57	*/
58	protected EList<SimpleNameCS> simpleNames;
59
60	/**
61	* <!-- begin-user-doc -->
62	* <!-- end-user-doc -->
63	* @generated
64	*/
65	protected StateExpCSImpl() {
66	super();
67	}
68
69	/**
70	* <!-- begin-user-doc -->
71	* <!-- end-user-doc -->
72	* @generated
73	*/
74	@Override
75	protected EClass eStaticClass() {
76	return CSTPackage.Literals.STATE_EXP_CS;
77	}
78
79	/**
80	* <!-- begin-user-doc -->
81	* @since 3.0
82	* <!-- end-user-doc -->
83	* @generated
84	*/
85	public EList<SimpleNameCS> getSimpleNames() {
86	if (simpleNames == null) {
87	simpleNames = new EObjectContainmentEList<SimpleNameCS>(
88	SimpleNameCS.class, this, CSTPackage.STATE_EXP_CS__SIMPLE_NAMES);
89	}
90	return simpleNames;
91	}
92
93	/**
94	* <!-- begin-user-doc -->
95	* <!-- end-user-doc -->
96	* @generated
97	*/
98	@Override
99	public NotificationChain eInverseRemove(InternalEObject otherEnd,
100	int featureID, NotificationChain msgs) {
101	switch (featureID) {
102	case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
103	return ((InternalEList<?>) getSimpleNames()).basicRemove(
104	otherEnd, msgs);
105	}
106	return super.eInverseRemove(otherEnd, featureID, msgs);
107	}
108
109	/**
110	* <!-- begin-user-doc -->
111	* <!-- end-user-doc -->
112	* @generated
113	*/
114	@Override
115	public Object eGet(int featureID, boolean resolve, boolean coreType) {
116	switch (featureID) {
117	case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
118	return getSimpleNames();
119	}
120	return super.eGet(featureID, resolve, coreType);
121	}
122
123	/**
124	* <!-- begin-user-doc -->
125	* <!-- end-user-doc -->
126	* @generated
127	*/
128	@SuppressWarnings("unchecked")
129	@Override
130	public void eSet(int featureID, Object newValue) {
131	switch (featureID) {
132	case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
133	getSimpleNames().clear();
134	getSimpleNames().addAll(
135	(Collection<? extends SimpleNameCS>) newValue);
136	return;
137	}
138	super.eSet(featureID, newValue);
139	}
140
141	/**
142	* <!-- begin-user-doc -->
143	* <!-- end-user-doc -->
144	* @generated
145	*/
146	@Override
147	public void eUnset(int featureID) {
148	switch (featureID) {
149	case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
150	getSimpleNames().clear();
151	return;
152	}
153	super.eUnset(featureID);
154	}
155
156	/**
157	* <!-- begin-user-doc -->
158	* <!-- end-user-doc -->
159	* @generated
160	*/
161	@Override
162	public boolean eIsSet(int featureID) {
163	switch (featureID) {
164	case CSTPackage.STATE_EXP_CS__SIMPLE_NAMES :
165	return simpleNames != null && !simpleNames.isEmpty();
166	}
167	return super.eIsSet(featureID);
168	}
169
170	} //StateExpCSImpl

Lines 17-25 Link Here

(-)src/org/eclipse/ocl/cst/impl/InvalidLiteralExpCSImpl.java (-126 / +1 lines)
17	*/	17	*/
18	package org.eclipse.ocl.cst.impl;	18	package org.eclipse.ocl.cst.impl;
19		19
20	import org.eclipse.emf.common.notify.Notification;
21	import org.eclipse.emf.ecore.EClass;	20	import org.eclipse.emf.ecore.EClass;
22	import org.eclipse.emf.ecore.impl.ENotificationImpl;
23	import org.eclipse.ocl.cst.CSTPackage;	21	import org.eclipse.ocl.cst.CSTPackage;
24	import org.eclipse.ocl.cst.InvalidLiteralExpCS;	22	import org.eclipse.ocl.cst.InvalidLiteralExpCS;
25		23
Lines 28-66 Link Here
28	* An implementation of the model object '<em><b>Invalid Literal Exp CS</b></em>'.	26	* An implementation of the model object '<em><b>Invalid Literal Exp CS</b></em>'.
29	* <!-- end-user-doc -->	27	* <!-- end-user-doc -->
30	* <p>	28	* <p>
31	* The following features are implemented:
32	* <ul>
33	* <li>{@link org.eclipse.ocl.cst.impl.InvalidLiteralExpCSImpl#getSymbol <em>Symbol</em>}</li>
34	* </ul>
35	* </p>	29	* </p>
36	*	30	*
37	* @generated	31	* @generated
38	*/	32	*/
39	public class InvalidLiteralExpCSImpl	33	public class InvalidLiteralExpCSImpl
40	extends LiteralExpCSImpl	34	extends SimpleNameCSImpl
41	implements InvalidLiteralExpCS {	35	implements InvalidLiteralExpCS {
42		36
43	/**	37	/**
44	* The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
45	* <!-- begin-user-doc -->
46	* <!-- end-user-doc -->
47	* @see #getSymbol()
48	* @generated
49	* @ordered
50	*/
51	protected static final String SYMBOL_EDEFAULT = null;
52
53	/**
54	* The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
55	* <!-- begin-user-doc -->
56	* <!-- end-user-doc -->
57	* @see #getSymbol()
58	* @generated
59	* @ordered
60	*/
61	protected String symbol = SYMBOL_EDEFAULT;
62
63	/**
64	* <!-- begin-user-doc -->	38	* <!-- begin-user-doc -->
65	* <!-- end-user-doc -->	39	* <!-- end-user-doc -->
66	* @generated	40	* @generated
Lines 79-181 Link Here
79	return CSTPackage.Literals.INVALID_LITERAL_EXP_CS;	53	return CSTPackage.Literals.INVALID_LITERAL_EXP_CS;
80	}	54	}
81		55
82	/**
83	* <!-- begin-user-doc -->
84	* <!-- end-user-doc -->
85	* @generated
86	*/
87	public String getSymbol() {
88	return symbol;
89	}
90
91	/**
92	* <!-- begin-user-doc -->
93	* <!-- end-user-doc -->
94	* @generated
95	*/
96	public void setSymbol(String newSymbol) {
97	String oldSymbol = symbol;
98	symbol = newSymbol;
99	if (eNotificationRequired())
100	eNotify(new ENotificationImpl(this, Notification.SET,
101	CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL, oldSymbol, symbol));
102	}
103
104	/**
105	* <!-- begin-user-doc -->
106	* <!-- end-user-doc -->
107	* @generated
108	*/
109	@Override
110	public Object eGet(int featureID, boolean resolve, boolean coreType) {
111	switch (featureID) {
112	case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
113	return getSymbol();
114	}
115	return super.eGet(featureID, resolve, coreType);
116	}
117
118	/**
119	* <!-- begin-user-doc -->
120	* <!-- end-user-doc -->
121	* @generated
122	*/
123	@Override
124	public void eSet(int featureID, Object newValue) {
125	switch (featureID) {
126	case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
127	setSymbol((String) newValue);
128	return;
129	}
130	super.eSet(featureID, newValue);
131	}
132
133	/**
134	* <!-- begin-user-doc -->
135	* <!-- end-user-doc -->
136	* @generated
137	*/
138	@Override
139	public void eUnset(int featureID) {
140	switch (featureID) {
141	case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
142	setSymbol(SYMBOL_EDEFAULT);
143	return;
144	}
145	super.eUnset(featureID);
146	}
147
148	/**
149	* <!-- begin-user-doc -->
150	* <!-- end-user-doc -->
151	* @generated
152	*/
153	@Override
154	public boolean eIsSet(int featureID) {
155	switch (featureID) {
156	case CSTPackage.INVALID_LITERAL_EXP_CS__SYMBOL :
157	return SYMBOL_EDEFAULT == null
158	? symbol != null
159	: !SYMBOL_EDEFAULT.equals(symbol);
160	}
161	return super.eIsSet(featureID);
162	}
163
164	/**
165	* <!-- begin-user-doc -->
166	* <!-- end-user-doc -->
167	* @generated
168	*/
169	@Override
170	public String toString() {
171	if (eIsProxy())
172	return super.toString();
173
174	StringBuffer result = new StringBuffer(super.toString());
175	result.append(" (symbol: "); //$NON-NLS-1$
176	result.append(symbol);
177	result.append(')');
178	return result.toString();
179	}
180
181	} //InvalidLiteralExpCSImpl	56	} //InvalidLiteralExpCSImpl

Lines 76-82 Link Here

(-)src/org/eclipse/ocl/cst/impl/CSTPackageImpl.java (-73 / +24 lines)
76	import org.eclipse.ocl.cst.RealLiteralExpCS;	76	import org.eclipse.ocl.cst.RealLiteralExpCS;
77	import org.eclipse.ocl.cst.SimpleNameCS;	77	import org.eclipse.ocl.cst.SimpleNameCS;
78	import org.eclipse.ocl.cst.SimpleTypeEnum;	78	import org.eclipse.ocl.cst.SimpleTypeEnum;
79	import org.eclipse.ocl.cst.StateExpCS;
80	import org.eclipse.ocl.cst.StringLiteralExpCS;	79	import org.eclipse.ocl.cst.StringLiteralExpCS;
81	import org.eclipse.ocl.cst.TupleLiteralExpCS;	80	import org.eclipse.ocl.cst.TupleLiteralExpCS;
82	import org.eclipse.ocl.cst.TupleTypeCS;	81	import org.eclipse.ocl.cst.TupleTypeCS;
Lines 401-413 Link Here
401	* <!-- end-user-doc -->	400	* <!-- end-user-doc -->
402	* @generated	401	* @generated
403	*/	402	*/
404	private EClass stateExpCSEClass = null;
405
406	/**
407	* <!-- begin-user-doc -->
408	* <!-- end-user-doc -->
409	* @generated
410	*/
411	private EClass oclDocumentCSEClass = null;	403	private EClass oclDocumentCSEClass = null;
412		404
413	/**	405	/**
Lines 1511-1520 Link Here
1511	* @since 3.0	1503	* @since 3.0
1512	* <!-- end-user-doc -->	1504	* <!-- end-user-doc -->
1513	* @generated	1505	* @generated
		1506	*
		1507	*/
		1508	public EReference getOperationCallExpCS_PathNameCS() {
		1509	return (EReference) operationCallExpCSEClass.getEStructuralFeatures()
		1510	.get(0);
		1511	}
		1512
		1513	/**
		1514	* <!-- begin-user-doc -->
		1515	* @since 3.0
		1516	* <!-- end-user-doc -->
		1517	* @generated
1514	*/	1518	*/
1515	public EAttribute getOperationCallExpCS_IsAtomic() {	1519	public EAttribute getOperationCallExpCS_IsAtomic() {
1516	return (EAttribute) operationCallExpCSEClass.getEStructuralFeatures()	1520	return (EAttribute) operationCallExpCSEClass.getEStructuralFeatures()
1517	.get(0);	1521	.get(1);
1518	}	1522	}
1519		1523
1520	/**	1524	/**
Lines 1578-1602 Link Here
1578		1582
1579	/**	1583	/**
1580	* <!-- begin-user-doc -->	1584	* <!-- begin-user-doc -->
1581	* <!-- end-user-doc -->
1582	* @generated
1583	*/
1584	public EClass getStateExpCS() {
1585	return stateExpCSEClass;
1586	}
1587
1588	/**
1589	* <!-- begin-user-doc -->
1590	* @since 3.0
1591	* <!-- end-user-doc -->
1592	* @generated
1593	*/
1594	public EReference getStateExpCS_SimpleNames() {
1595	return (EReference) stateExpCSEClass.getEStructuralFeatures().get(0);
1596	}
1597
1598	/**
1599	* <!-- begin-user-doc -->
1600	* @since 1.3	1585	* @since 1.3
1601	* <!-- end-user-doc -->	1586	* <!-- end-user-doc -->
1602	* @generated	1587	* @generated
Lines 1710-1725 Link Here
1710	* <!-- end-user-doc -->	1695	* <!-- end-user-doc -->
1711	* @generated	1696	* @generated
1712	*/	1697	*/
1713	public EAttribute getNullLiteralExpCS_Symbol() {
1714	return (EAttribute) nullLiteralExpCSEClass.getEStructuralFeatures()
1715	.get(0);
1716	}
1717
1718	/**
1719	* <!-- begin-user-doc -->
1720	* <!-- end-user-doc -->
1721	* @generated
1722	*/
1723	public EClass getInvalidLiteralExpCS() {	1698	public EClass getInvalidLiteralExpCS() {
1724	return invalidLiteralExpCSEClass;	1699	return invalidLiteralExpCSEClass;
1725	}	1700	}
Lines 1729-1744 Link Here
1729	* <!-- end-user-doc -->	1704	* <!-- end-user-doc -->
1730	* @generated	1705	* @generated
1731	*/	1706	*/
1732	public EAttribute getInvalidLiteralExpCS_Symbol() {
1733	return (EAttribute) invalidLiteralExpCSEClass.getEStructuralFeatures()
1734	.get(0);
1735	}
1736
1737	/**
1738	* <!-- begin-user-doc -->
1739	* <!-- end-user-doc -->
1740	* @generated
1741	*/
1742	public EClass getCallExpCS() {	1707	public EClass getCallExpCS() {
1743	return callExpCSEClass;	1708	return callExpCSEClass;
1744	}	1709	}
Lines 2060-2070 Link Here
2060	BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL);	2025	BOOLEAN_LITERAL_EXP_CS__BOOLEAN_SYMBOL);
2061		2026
2062	nullLiteralExpCSEClass = createEClass(NULL_LITERAL_EXP_CS);	2027	nullLiteralExpCSEClass = createEClass(NULL_LITERAL_EXP_CS);
2063	createEAttribute(nullLiteralExpCSEClass, NULL_LITERAL_EXP_CS__SYMBOL);
2064		2028
2065	invalidLiteralExpCSEClass = createEClass(INVALID_LITERAL_EXP_CS);	2029	invalidLiteralExpCSEClass = createEClass(INVALID_LITERAL_EXP_CS);
2066	createEAttribute(invalidLiteralExpCSEClass,
2067	INVALID_LITERAL_EXP_CS__SYMBOL);
2068		2030
2069	collectionRangeCSEClass = createEClass(COLLECTION_RANGE_CS);	2031	collectionRangeCSEClass = createEClass(COLLECTION_RANGE_CS);
2070	createEReference(collectionRangeCSEClass,	2032	createEReference(collectionRangeCSEClass,
Lines 2090-2101 Link Here
2090	FEATURE_CALL_EXP_CS__IS_MARKED_PRE_CS);	2052	FEATURE_CALL_EXP_CS__IS_MARKED_PRE_CS);
2091		2053
2092	operationCallExpCSEClass = createEClass(OPERATION_CALL_EXP_CS);	2054	operationCallExpCSEClass = createEClass(OPERATION_CALL_EXP_CS);
		2055	createEReference(operationCallExpCSEClass,
		2056	OPERATION_CALL_EXP_CS__PATH_NAME_CS);
2093	createEAttribute(operationCallExpCSEClass,	2057	createEAttribute(operationCallExpCSEClass,
2094	OPERATION_CALL_EXP_CS__IS_ATOMIC);	2058	OPERATION_CALL_EXP_CS__IS_ATOMIC);
2095		2059
2096	stateExpCSEClass = createEClass(STATE_EXP_CS);
2097	createEReference(stateExpCSEClass, STATE_EXP_CS__SIMPLE_NAMES);
2098
2099	oclDocumentCSEClass = createEClass(OCL_DOCUMENT_CS);	2060	oclDocumentCSEClass = createEClass(OCL_DOCUMENT_CS);
2100	createEReference(oclDocumentCSEClass,	2061	createEReference(oclDocumentCSEClass,
2101	OCL_DOCUMENT_CS__PACKAGE_DECLARATIONS);	2062	OCL_DOCUMENT_CS__PACKAGE_DECLARATIONS);
Lines 2166-2171 Link Here
2166	primitiveTypeCSEClass.getESuperTypes().add(this.getSimpleNameCS());	2127	primitiveTypeCSEClass.getESuperTypes().add(this.getSimpleNameCS());
2167	primitiveTypeCSEClass.getESuperTypes().add(this.getTypeCS());	2128	primitiveTypeCSEClass.getESuperTypes().add(this.getTypeCS());
2168	tupleTypeCSEClass.getESuperTypes().add(this.getTypeCS());	2129	tupleTypeCSEClass.getESuperTypes().add(this.getTypeCS());
		2130	collectionTypeCSEClass.getESuperTypes().add(this.getSimpleNameCS());
2169	collectionTypeCSEClass.getESuperTypes().add(this.getTypeCS());	2131	collectionTypeCSEClass.getESuperTypes().add(this.getTypeCS());
2170	letExpCSEClass.getESuperTypes().add(this.getOCLExpressionCS());	2132	letExpCSEClass.getESuperTypes().add(this.getOCLExpressionCS());
2171	ifExpCSEClass.getESuperTypes().add(this.getOCLExpressionCS());	2133	ifExpCSEClass.getESuperTypes().add(this.getOCLExpressionCS());
Lines 2187-2195 Link Here
2187	this.getPrimitiveLiteralExpCS());	2149	this.getPrimitiveLiteralExpCS());
2188	stringLiteralExpCSEClass.getESuperTypes().add(	2150	stringLiteralExpCSEClass.getESuperTypes().add(
2189	this.getPrimitiveLiteralExpCS());	2151	this.getPrimitiveLiteralExpCS());
		2152	booleanLiteralExpCSEClass.getESuperTypes().add(this.getSimpleNameCS());
2190	booleanLiteralExpCSEClass.getESuperTypes().add(	2153	booleanLiteralExpCSEClass.getESuperTypes().add(
2191	this.getPrimitiveLiteralExpCS());	2154	this.getPrimitiveLiteralExpCS());
		2155	nullLiteralExpCSEClass.getESuperTypes().add(this.getSimpleNameCS());
2192	nullLiteralExpCSEClass.getESuperTypes().add(this.getLiteralExpCS());	2156	nullLiteralExpCSEClass.getESuperTypes().add(this.getLiteralExpCS());
		2157	invalidLiteralExpCSEClass.getESuperTypes().add(this.getSimpleNameCS());
2193	invalidLiteralExpCSEClass.getESuperTypes().add(this.getLiteralExpCS());	2158	invalidLiteralExpCSEClass.getESuperTypes().add(this.getLiteralExpCS());
2194	collectionRangeCSEClass.getESuperTypes().add(	2159	collectionRangeCSEClass.getESuperTypes().add(
2195	this.getCollectionLiteralPartCS());	2160	this.getCollectionLiteralPartCS());
Lines 2200-2206 Link Here
2200	featureCallExpCSEClass.getESuperTypes().add(this.getCallExpCS());	2165	featureCallExpCSEClass.getESuperTypes().add(this.getCallExpCS());
2201	operationCallExpCSEClass.getESuperTypes().add(	2166	operationCallExpCSEClass.getESuperTypes().add(
2202	this.getFeatureCallExpCS());	2167	this.getFeatureCallExpCS());
2203	stateExpCSEClass.getESuperTypes().add(this.getTypeCS());
2204	oclDocumentCSEClass.getESuperTypes().add(this.getCSTNode());	2168	oclDocumentCSEClass.getESuperTypes().add(this.getCSTNode());
2205		2169
2206	// Initialize classes and features; add operations and parameters	2170	// Initialize classes and features; add operations and parameters
Lines 2713-2731 Link Here
2713	nullLiteralExpCSEClass,	2677	nullLiteralExpCSEClass,
2714	NullLiteralExpCS.class,	2678	NullLiteralExpCS.class,
2715	"NullLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2679	"NullLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2716	initEAttribute(
2717	getNullLiteralExpCS_Symbol(),
2718	ecorePackage.getEString(),
2719	"symbol", null, 0, 1, NullLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2720		2680
2721	initEClass(	2681	initEClass(
2722	invalidLiteralExpCSEClass,	2682	invalidLiteralExpCSEClass,
2723	InvalidLiteralExpCS.class,	2683	InvalidLiteralExpCS.class,
2724	"InvalidLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2684	"InvalidLiteralExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2725	initEAttribute(
2726	getInvalidLiteralExpCS_Symbol(),
2727	ecorePackage.getEString(),
2728	"symbol", null, 0, 1, InvalidLiteralExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2729		2685
2730	initEClass(	2686	initEClass(
2731	collectionRangeCSEClass,	2687	collectionRangeCSEClass,
Lines 2805-2826 Link Here
2805	operationCallExpCSEClass,	2761	operationCallExpCSEClass,
2806	OperationCallExpCS.class,	2762	OperationCallExpCS.class,
2807	"OperationCallExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2763	"OperationCallExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		2764	initEReference(
		2765	getOperationCallExpCS_PathNameCS(),
		2766	this.getPathNameCS(),
		2767	null,
		2768	"pathNameCS", null, 0, 1, OperationCallExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2808	initEAttribute(	2769	initEAttribute(
2809	getOperationCallExpCS_IsAtomic(),	2770	getOperationCallExpCS_IsAtomic(),
2810	ecorePackage.getEBooleanObject(),	2771	ecorePackage.getEBooleanObject(),
2811	"isAtomic", "false", 0, 1, OperationCallExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$	2772	"isAtomic", "false", 0, 1, OperationCallExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
2812		2773
2813	initEClass(	2774	initEClass(
2814	stateExpCSEClass,
2815	StateExpCS.class,
2816	"StateExpCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2817	initEReference(
2818	getStateExpCS_SimpleNames(),
2819	this.getSimpleNameCS(),
2820	null,
2821	"simpleNames", null, 0, -1, StateExpCS.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2822
2823	initEClass(
2824	oclDocumentCSEClass,	2775	oclDocumentCSEClass,
2825	OCLDocumentCS.class,	2776	OCLDocumentCS.class,
2826	"OCLDocumentCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	2777	"OCLDocumentCS", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

Lines 70-76 Link Here

(-)src/org/eclipse/ocl/cst/impl/CSTFactoryImpl.java (-13 lines)
70	import org.eclipse.ocl.cst.RealLiteralExpCS;	70	import org.eclipse.ocl.cst.RealLiteralExpCS;
71	import org.eclipse.ocl.cst.SimpleNameCS;	71	import org.eclipse.ocl.cst.SimpleNameCS;
72	import org.eclipse.ocl.cst.SimpleTypeEnum;	72	import org.eclipse.ocl.cst.SimpleTypeEnum;
73	import org.eclipse.ocl.cst.StateExpCS;
74	import org.eclipse.ocl.cst.StringLiteralExpCS;	73	import org.eclipse.ocl.cst.StringLiteralExpCS;
75	import org.eclipse.ocl.cst.TupleLiteralExpCS;	74	import org.eclipse.ocl.cst.TupleLiteralExpCS;
76	import org.eclipse.ocl.cst.TupleTypeCS;	75	import org.eclipse.ocl.cst.TupleTypeCS;
Lines 209-216 Link Here
209	return createFeatureCallExpCS();	208	return createFeatureCallExpCS();
210	case CSTPackage.OPERATION_CALL_EXP_CS :	209	case CSTPackage.OPERATION_CALL_EXP_CS :
211	return createOperationCallExpCS();	210	return createOperationCallExpCS();
212	case CSTPackage.STATE_EXP_CS :
213	return createStateExpCS();
214	case CSTPackage.OCL_DOCUMENT_CS :	211	case CSTPackage.OCL_DOCUMENT_CS :
215	return createOCLDocumentCS();	212	return createOCLDocumentCS();
216	default :	213	default :
Lines 677-692 Link Here
677		674
678	/**	675	/**
679	* <!-- begin-user-doc -->	676	* <!-- begin-user-doc -->
680	* <!-- end-user-doc -->
681	* @generated
682	*/
683	public StateExpCS createStateExpCS() {
684	StateExpCSImpl stateExpCS = new StateExpCSImpl();
685	return stateExpCS;
686	}
687
688	/**
689	* <!-- begin-user-doc -->
690	* @since 1.3	677	* @since 1.3
691	* <!-- end-user-doc -->	678	* <!-- end-user-doc -->
692	* @generated	679	* @generated

Lines 18-27 Link Here

(-)src/org/eclipse/ocl/cst/impl/OperationCallExpCSImpl.java (+104 lines)
18	package org.eclipse.ocl.cst.impl;	18	package org.eclipse.ocl.cst.impl;
19		19
20	import org.eclipse.emf.common.notify.Notification;	20	import org.eclipse.emf.common.notify.Notification;
		21	import org.eclipse.emf.common.notify.NotificationChain;
21	import org.eclipse.emf.ecore.EClass;	22	import org.eclipse.emf.ecore.EClass;
		23	import org.eclipse.emf.ecore.InternalEObject;
22	import org.eclipse.emf.ecore.impl.ENotificationImpl;	24	import org.eclipse.emf.ecore.impl.ENotificationImpl;
23	import org.eclipse.ocl.cst.CSTPackage;	25	import org.eclipse.ocl.cst.CSTPackage;
24	import org.eclipse.ocl.cst.OperationCallExpCS;	26	import org.eclipse.ocl.cst.OperationCallExpCS;
		27	import org.eclipse.ocl.cst.PathNameCS;
25		28
26	/**	29	/**
27	* <!-- begin-user-doc -->	30	* <!-- begin-user-doc -->
Lines 30-35 Link Here
30	* <p>	33	* <p>
31	* The following features are implemented:	34	* The following features are implemented:
32	* <ul>	35	* <ul>
		36	* <li>{@link org.eclipse.ocl.cst.impl.OperationCallExpCSImpl#getPathNameCS <em>Path Name CS</em>}</li>
33	* <li>{@link org.eclipse.ocl.cst.impl.OperationCallExpCSImpl#getIsAtomic <em>Is Atomic</em>}</li>	37	* <li>{@link org.eclipse.ocl.cst.impl.OperationCallExpCSImpl#getIsAtomic <em>Is Atomic</em>}</li>
34	* </ul>	38	* </ul>
35	* </p>	39	* </p>
Lines 41-46 Link Here
41	implements OperationCallExpCS {	45	implements OperationCallExpCS {
42		46
43	/**	47	/**
		48	* The cached value of the '{@link #getPathNameCS() <em>Path Name CS</em>}' containment reference.
		49	* <!-- begin-user-doc -->
		50	* @since 3.0
		51	* <!-- end-user-doc -->
		52	* @see #getPathNameCS()
		53	* @generated
		54	* @ordered
		55	*
		56	*/
		57	protected PathNameCS pathNameCS;
		58
		59	/**
44	* The default value of the '{@link #getIsAtomic() <em>Is Atomic</em>}' attribute.	60	* The default value of the '{@link #getIsAtomic() <em>Is Atomic</em>}' attribute.
45	* <!-- begin-user-doc -->	61	* <!-- begin-user-doc -->
46	* @since 3.0	62	* @since 3.0
Lines 86-91 Link Here
86	* @since 3.0	102	* @since 3.0
87	* <!-- end-user-doc -->	103	* <!-- end-user-doc -->
88	* @generated	104	* @generated
		105	*
		106	*/
		107	public PathNameCS getPathNameCS() {
		108	return pathNameCS;
		109	}
		110
		111	/**
		112	* <!-- begin-user-doc -->
		113	* @since 3.0
		114	* <!-- end-user-doc -->
		115	* @generated
		116	*
		117	*/
		118	public NotificationChain basicSetPathNameCS(PathNameCS newPathNameCS,
		119	NotificationChain msgs) {
		120	PathNameCS oldPathNameCS = pathNameCS;
		121	pathNameCS = newPathNameCS;
		122	if (eNotificationRequired()) {
		123	ENotificationImpl notification = new ENotificationImpl(this,
		124	Notification.SET,
		125	CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, oldPathNameCS,
		126	newPathNameCS);
		127	if (msgs == null)
		128	msgs = notification;
		129	else
		130	msgs.add(notification);
		131	}
		132	return msgs;
		133	}
		134
		135	/**
		136	* <!-- begin-user-doc -->
		137	* @since 3.0
		138	* <!-- end-user-doc -->
		139	* @generated
		140	*/
		141	public void setPathNameCS(PathNameCS newPathNameCS) {
		142	if (newPathNameCS != pathNameCS) {
		143	NotificationChain msgs = null;
		144	if (pathNameCS != null)
		145	msgs = ((InternalEObject) pathNameCS).eInverseRemove(this,
		146	EOPPOSITE_FEATURE_BASE
		147	- CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, null,
		148	msgs);
		149	if (newPathNameCS != null)
		150	msgs = ((InternalEObject) newPathNameCS).eInverseAdd(this,
		151	EOPPOSITE_FEATURE_BASE
		152	- CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, null,
		153	msgs);
		154	msgs = basicSetPathNameCS(newPathNameCS, msgs);
		155	if (msgs != null)
		156	msgs.dispatch();
		157	} else if (eNotificationRequired())
		158	eNotify(new ENotificationImpl(this, Notification.SET,
		159	CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS, newPathNameCS,
		160	newPathNameCS));
		161	}
		162
		163	/**
		164	* <!-- begin-user-doc -->
		165	* @since 3.0
		166	* <!-- end-user-doc -->
		167	* @generated
89	*/	168	*/
90	public Boolean getIsAtomic() {	169	public Boolean getIsAtomic() {
91	return isAtomic;	170	return isAtomic;
Lines 112-119 Link Here
112	* @generated	191	* @generated
113	*/	192	*/
114	@Override	193	@Override
		194	public NotificationChain eInverseRemove(InternalEObject otherEnd,
		195	int featureID, NotificationChain msgs) {
		196	switch (featureID) {
		197	case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
		198	return basicSetPathNameCS(null, msgs);
		199	}
		200	return super.eInverseRemove(otherEnd, featureID, msgs);
		201	}
		202
		203	/**
		204	* <!-- begin-user-doc -->
		205	* <!-- end-user-doc -->
		206	* @generated
		207	*/
		208	@Override
115	public Object eGet(int featureID, boolean resolve, boolean coreType) {	209	public Object eGet(int featureID, boolean resolve, boolean coreType) {
116	switch (featureID) {	210	switch (featureID) {
		211	case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
		212	return getPathNameCS();
117	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :	213	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
118	return getIsAtomic();	214	return getIsAtomic();
119	}	215	}
Lines 128-133 Link Here
128	@Override	224	@Override
129	public void eSet(int featureID, Object newValue) {	225	public void eSet(int featureID, Object newValue) {
130	switch (featureID) {	226	switch (featureID) {
		227	case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
		228	setPathNameCS((PathNameCS) newValue);
		229	return;
131	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :	230	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
132	setIsAtomic((Boolean) newValue);	231	setIsAtomic((Boolean) newValue);
133	return;	232	return;
Lines 143-148 Link Here
143	@Override	242	@Override
144	public void eUnset(int featureID) {	243	public void eUnset(int featureID) {
145	switch (featureID) {	244	switch (featureID) {
		245	case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
		246	setPathNameCS((PathNameCS) null);
		247	return;
146	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :	248	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
147	setIsAtomic(IS_ATOMIC_EDEFAULT);	249	setIsAtomic(IS_ATOMIC_EDEFAULT);
148	return;	250	return;
Lines 158-163 Link Here
158	@Override	260	@Override
159	public boolean eIsSet(int featureID) {	261	public boolean eIsSet(int featureID) {
160	switch (featureID) {	262	switch (featureID) {
		263	case CSTPackage.OPERATION_CALL_EXP_CS__PATH_NAME_CS :
		264	return pathNameCS != null;
161	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :	265	case CSTPackage.OPERATION_CALL_EXP_CS__IS_ATOMIC :
162	return IS_ATOMIC_EDEFAULT == null	266	return IS_ATOMIC_EDEFAULT == null
163	? isAtomic != null	267	? isAtomic != null

Lines 17-25 Link Here

(-)src/org/eclipse/ocl/cst/impl/NullLiteralExpCSImpl.java (-126 / +1 lines)
17	*/	17	*/
18	package org.eclipse.ocl.cst.impl;	18	package org.eclipse.ocl.cst.impl;
19		19
20	import org.eclipse.emf.common.notify.Notification;
21	import org.eclipse.emf.ecore.EClass;	20	import org.eclipse.emf.ecore.EClass;
22	import org.eclipse.emf.ecore.impl.ENotificationImpl;
23	import org.eclipse.ocl.cst.CSTPackage;	21	import org.eclipse.ocl.cst.CSTPackage;
24	import org.eclipse.ocl.cst.NullLiteralExpCS;	22	import org.eclipse.ocl.cst.NullLiteralExpCS;
25		23
Lines 28-66 Link Here
28	* An implementation of the model object '<em><b>Null Literal Exp CS</b></em>'.	26	* An implementation of the model object '<em><b>Null Literal Exp CS</b></em>'.
29	* <!-- end-user-doc -->	27	* <!-- end-user-doc -->
30	* <p>	28	* <p>
31	* The following features are implemented:
32	* <ul>
33	* <li>{@link org.eclipse.ocl.cst.impl.NullLiteralExpCSImpl#getSymbol <em>Symbol</em>}</li>
34	* </ul>
35	* </p>	29	* </p>
36	*	30	*
37	* @generated	31	* @generated
38	*/	32	*/
39	public class NullLiteralExpCSImpl	33	public class NullLiteralExpCSImpl
40	extends LiteralExpCSImpl	34	extends SimpleNameCSImpl
41	implements NullLiteralExpCS {	35	implements NullLiteralExpCS {
42		36
43	/**	37	/**
44	* The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
45	* <!-- begin-user-doc -->
46	* <!-- end-user-doc -->
47	* @see #getSymbol()
48	* @generated
49	* @ordered
50	*/
51	protected static final String SYMBOL_EDEFAULT = null;
52
53	/**
54	* The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
55	* <!-- begin-user-doc -->
56	* <!-- end-user-doc -->
57	* @see #getSymbol()
58	* @generated
59	* @ordered
60	*/
61	protected String symbol = SYMBOL_EDEFAULT;
62
63	/**
64	* <!-- begin-user-doc -->	38	* <!-- begin-user-doc -->
65	* <!-- end-user-doc -->	39	* <!-- end-user-doc -->
66	* @generated	40	* @generated
Lines 79-181 Link Here
79	return CSTPackage.Literals.NULL_LITERAL_EXP_CS;	53	return CSTPackage.Literals.NULL_LITERAL_EXP_CS;
80	}	54	}
81		55
82	/**
83	* <!-- begin-user-doc -->
84	* <!-- end-user-doc -->
85	* @generated
86	*/
87	public String getSymbol() {
88	return symbol;
89	}
90
91	/**
92	* <!-- begin-user-doc -->
93	* <!-- end-user-doc -->
94	* @generated
95	*/
96	public void setSymbol(String newSymbol) {
97	String oldSymbol = symbol;
98	symbol = newSymbol;
99	if (eNotificationRequired())
100	eNotify(new ENotificationImpl(this, Notification.SET,
101	CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL, oldSymbol, symbol));
102	}
103
104	/**
105	* <!-- begin-user-doc -->
106	* <!-- end-user-doc -->
107	* @generated
108	*/
109	@Override
110	public Object eGet(int featureID, boolean resolve, boolean coreType) {
111	switch (featureID) {
112	case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
113	return getSymbol();
114	}
115	return super.eGet(featureID, resolve, coreType);
116	}
117
118	/**
119	* <!-- begin-user-doc -->
120	* <!-- end-user-doc -->
121	* @generated
122	*/
123	@Override
124	public void eSet(int featureID, Object newValue) {
125	switch (featureID) {
126	case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
127	setSymbol((String) newValue);
128	return;
129	}
130	super.eSet(featureID, newValue);
131	}
132
133	/**
134	* <!-- begin-user-doc -->
135	* <!-- end-user-doc -->
136	* @generated
137	*/
138	@Override
139	public void eUnset(int featureID) {
140	switch (featureID) {
141	case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
142	setSymbol(SYMBOL_EDEFAULT);
143	return;
144	}
145	super.eUnset(featureID);
146	}
147
148	/**
149	* <!-- begin-user-doc -->
150	* <!-- end-user-doc -->
151	* @generated
152	*/
153	@Override
154	public boolean eIsSet(int featureID) {
155	switch (featureID) {
156	case CSTPackage.NULL_LITERAL_EXP_CS__SYMBOL :
157	return SYMBOL_EDEFAULT == null
158	? symbol != null
159	: !SYMBOL_EDEFAULT.equals(symbol);
160	}
161	return super.eIsSet(featureID);
162	}
163
164	/**
165	* <!-- begin-user-doc -->
166	* <!-- end-user-doc -->
167	* @generated
168	*/
169	@Override
170	public String toString() {
171	if (eIsProxy())
172	return super.toString();
173
174	StringBuffer result = new StringBuffer(super.toString());
175	result.append(" (symbol: "); //$NON-NLS-1$
176	result.append(symbol);
177	result.append(')');
178	return result.toString();
179	}
180
181	} //NullLiteralExpCSImpl	56	} //NullLiteralExpCSImpl

Removed Link Here

(-)src/org/eclipse/ocl/cst/StateExpCS.java (-60 lines)
1	/**
2	* <copyright>
3	*
4	* Copyright (c) 2005, 2008 IBM Corporation, Zeligsoft Inc., and others.
5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at
8	* http://www.eclipse.org/legal/epl-v10.html
9	*
10	* Contributors:
11	* IBM - Initial API and implementation
12	* Zeligsoft - Bug 243976
13	*
14	* </copyright>
15	*
16	* $Id: StateExpCS.java,v 1.4 2009/09/04 13:40:44 ewillink Exp $
17	*/
18	package org.eclipse.ocl.cst;
19
20	import org.eclipse.emf.common.util.EList;
21
22	/**
23	* <!-- begin-user-doc -->
24	* A representation of the model object '<em><b>State Exp CS</b></em>'.
25	* <!-- end-user-doc -->
26	*
27	* <p>
28	* The following features are supported:
29	* <ul>
30	* <li>{@link org.eclipse.ocl.cst.StateExpCS#getSimpleNames <em>Simple Names</em>}</li>
31	* </ul>
32	* </p>
33	*
34	* @see org.eclipse.ocl.cst.CSTPackage#getStateExpCS()
35	* @model
36	* @generated
37	* @noimplement This interface is not intended to be implemented by clients.
38	* @noextend This interface is not intended to be extended by clients.
39	*/
40	public interface StateExpCS
41	extends TypeCS {
42
43	/**
44	* Returns the value of the '<em><b>Simple Names</b></em>' containment reference list.
45	* The list contents are of type {@link org.eclipse.ocl.cst.SimpleNameCS}.
46	* <!-- begin-user-doc -->
47	* <p>
48	* If the meaning of the '<em>Simple Names</em>' containment reference list isn't clear,
49	* there really should be more of a description here...
50	* </p>
51	* @since 3.0
52	* <!-- end-user-doc -->
53	* @return the value of the '<em>Simple Names</em>' containment reference list.
54	* @see org.eclipse.ocl.cst.CSTPackage#getStateExpCS_SimpleNames()
55	* @model containment="true"
56	* @generated
57	*/
58	EList<SimpleNameCS> getSimpleNames();
59
60	} // StateExpCS

Lines 22-33 Link Here

(-)src/org/eclipse/ocl/cst/InvalidLiteralExpCS.java (-33 / +1 lines)
22	* A representation of the model object '<em><b>Invalid Literal Exp CS</b></em>'.	22	* A representation of the model object '<em><b>Invalid Literal Exp CS</b></em>'.
23	* <!-- end-user-doc -->	23	* <!-- end-user-doc -->
24	*	24	*
25	* <p>
26	* The following features are supported:
27	* <ul>
28	* <li>{@link org.eclipse.ocl.cst.InvalidLiteralExpCS#getSymbol <em>Symbol</em>}</li>
29	* </ul>
30	* </p>
31	*	25	*
32	* @see org.eclipse.ocl.cst.CSTPackage#getInvalidLiteralExpCS()	26	* @see org.eclipse.ocl.cst.CSTPackage#getInvalidLiteralExpCS()
33	* @model	27	* @model
Lines 36-67 Link Here
36	* @noextend This interface is not intended to be extended by clients.	30	* @noextend This interface is not intended to be extended by clients.
37	*/	31	*/
38	public interface InvalidLiteralExpCS	32	public interface InvalidLiteralExpCS
39	extends LiteralExpCS {	33	extends SimpleNameCS, LiteralExpCS {
40
41	/**
42	* Returns the value of the '<em><b>Symbol</b></em>' attribute.
43	* <!-- begin-user-doc -->
44	* <p>
45	* If the meaning of the '<em>Symbol</em>' attribute isn't clear,
46	* there really should be more of a description here...
47	* </p>
48	* <!-- end-user-doc -->
49	* @return the value of the '<em>Symbol</em>' attribute.
50	* @see #setSymbol(String)
51	* @see org.eclipse.ocl.cst.CSTPackage#getInvalidLiteralExpCS_Symbol()
52	* @model
53	* @generated
54	*/
55	String getSymbol();
56
57	/**
58	* Sets the value of the '{@link org.eclipse.ocl.cst.InvalidLiteralExpCS#getSymbol <em>Symbol</em>}' attribute.
59	* <!-- begin-user-doc -->
60	* <!-- end-user-doc -->
61	* @param value the new value of the '<em>Symbol</em>' attribute.
62	* @see #getSymbol()
63	* @generated
64	*/
65	void setSymbol(String value);
66		34
67	} // InvalidLiteralExpCS	35	} // InvalidLiteralExpCS

Lines 25-30 Link Here

(-)src/org/eclipse/ocl/cst/OperationCallExpCS.java (+32 lines)
25	* <p>	25	* <p>
26	* The following features are supported:	26	* The following features are supported:
27	* <ul>	27	* <ul>
		28	* <li>{@link org.eclipse.ocl.cst.OperationCallExpCS#getPathNameCS <em>Path Name CS</em>}</li>
28	* <li>{@link org.eclipse.ocl.cst.OperationCallExpCS#getIsAtomic <em>Is Atomic</em>}</li>	29	* <li>{@link org.eclipse.ocl.cst.OperationCallExpCS#getIsAtomic <em>Is Atomic</em>}</li>
29	* </ul>	30	* </ul>
30	* </p>	31	* </p>
Lines 39-44 Link Here
39	extends FeatureCallExpCS {	40	extends FeatureCallExpCS {
40		41
41	/**	42	/**
		43	* Returns the value of the '<em><b>Path Name CS</b></em>' containment reference.
		44	* <!-- begin-user-doc -->
		45	* <p>
		46	* If the meaning of the '<em>Path Name CS</em>' containment reference isn't clear,
		47	* there really should be more of a description here...
		48	* </p>
		49	*
		50	* @since 3.0
		51	* <!-- end-user-doc -->
		52	* @return the value of the '<em>Path Name CS</em>' containment reference.
		53	* @see #setPathNameCS(PathNameCS)
		54	* @see org.eclipse.ocl.cst.CSTPackage#getOperationCallExpCS_PathNameCS()
		55	* @model containment="true"
		56	* @generated
		57	*
		58	*/
		59	PathNameCS getPathNameCS();
		60
		61	/**
		62	* Sets the value of the '{@link org.eclipse.ocl.cst.OperationCallExpCS#getPathNameCS <em>Path Name CS</em>}' containment reference.
		63	* <!-- begin-user-doc -->
		64	* @since 3.0
		65	* <!-- end-user-doc -->
		66	* @param value the new value of the '<em>Path Name CS</em>' containment reference.
		67	* @see #getPathNameCS()
		68	* @generated
		69	*
		70	*/
		71	void setPathNameCS(PathNameCS value);
		72
		73	/**
42	* Returns the value of the '<em><b>Is Atomic</b></em>' attribute.	74	* Returns the value of the '<em><b>Is Atomic</b></em>' attribute.
43	* The default value is <code>"false"</code>.	75	* The default value is <code>"false"</code>.
44	* <!-- begin-user-doc -->	76	* <!-- begin-user-doc -->

Lines 419-433 Link Here

(-)src/org/eclipse/ocl/cst/CSTFactory.java (-9 lines)
419	OperationCallExpCS createOperationCallExpCS();	419	OperationCallExpCS createOperationCallExpCS();
420		420
421	/**	421	/**
422	* Returns a new object of class '<em>State Exp CS</em>'.
423	* <!-- begin-user-doc -->
424	* <!-- end-user-doc -->
425	* @return a new object of class '<em>State Exp CS</em>'.
426	* @generated
427	*/
428	StateExpCS createStateExpCS();
429
430	/**
431	* Returns a new object of class '<em>OCL Document CS</em>'.	422	* Returns a new object of class '<em>OCL Document CS</em>'.
432	* <!-- begin-user-doc -->	423	* <!-- begin-user-doc -->
433	* @since 1.3	424	* @since 1.3

Lines 22-33 Link Here

(-)src/org/eclipse/ocl/cst/NullLiteralExpCS.java (-33 / +1 lines)
22	* A representation of the model object '<em><b>Null Literal Exp CS</b></em>'.	22	* A representation of the model object '<em><b>Null Literal Exp CS</b></em>'.
23	* <!-- end-user-doc -->	23	* <!-- end-user-doc -->
24	*	24	*
25	* <p>
26	* The following features are supported:
27	* <ul>
28	* <li>{@link org.eclipse.ocl.cst.NullLiteralExpCS#getSymbol <em>Symbol</em>}</li>
29	* </ul>
30	* </p>
31	*	25	*
32	* @see org.eclipse.ocl.cst.CSTPackage#getNullLiteralExpCS()	26	* @see org.eclipse.ocl.cst.CSTPackage#getNullLiteralExpCS()
33	* @model	27	* @model
Lines 36-67 Link Here
36	* @noextend This interface is not intended to be extended by clients.	30	* @noextend This interface is not intended to be extended by clients.
37	*/	31	*/
38	public interface NullLiteralExpCS	32	public interface NullLiteralExpCS
39	extends LiteralExpCS {	33	extends SimpleNameCS, LiteralExpCS {
40
41	/**
42	* Returns the value of the '<em><b>Symbol</b></em>' attribute.
43	* <!-- begin-user-doc -->
44	* <p>
45	* If the meaning of the '<em>Symbol</em>' attribute isn't clear,
46	* there really should be more of a description here...
47	* </p>
48	* <!-- end-user-doc -->
49	* @return the value of the '<em>Symbol</em>' attribute.
50	* @see #setSymbol(String)
51	* @see org.eclipse.ocl.cst.CSTPackage#getNullLiteralExpCS_Symbol()
52	* @model
53	* @generated
54	*/
55	String getSymbol();
56
57	/**
58	* Sets the value of the '{@link org.eclipse.ocl.cst.NullLiteralExpCS#getSymbol <em>Symbol</em>}' attribute.
59	* <!-- begin-user-doc -->
60	* <!-- end-user-doc -->
61	* @param value the new value of the '<em>Symbol</em>' attribute.
62	* @see #getSymbol()
63	* @generated
64	*/
65	void setSymbol(String value);
66		34
67	} // NullLiteralExpCS	35	} // NullLiteralExpCS

Lines 63-81 Link Here

(-)src/org/eclipse/ocl/parser/OCLParser.g (-18 / +6 lines)
63	./	63	./
64	$End	64	$End
65		65
66	$KeyWords
67	context
68	package
69
70	--
71	-- the following are not used in the OCL concrete syntax, but
72	-- are defined as reserved words in the OCL 2.0 Spec 7.4.9
73	-- and were removed in the OCL 2.1 RTF 09-05-02.
74	--
75	attr
76	oper
77	$End
78
79	$Rules	66	$Rules
80	-- opt = optional	67	-- opt = optional
81	-- m = multiple	68	-- m = multiple
Lines 142-154 Link Here
142	contextDeclCS -> operationContextDeclCS	129	contextDeclCS -> operationContextDeclCS
143	contextDeclCS -> propertyContextCS	130	contextDeclCS -> propertyContextCS
144		131
145	propertyContextCS ::= context pathNameCS '::' simpleNameCS ':' typeCS initOrDerValueCSm	132	propertyContextCS ::= context qualifiedPathNameCS ':' typeCS initOrDerValueCSm
146	/.$BeginJava	133	/.$BeginJava
147	EList<InitOrDerValueCS> list = (EList<InitOrDerValueCS>)$getSym(7);	134	PathNameCS pathNameCS = (PathNameCS)$getSym(2);
		135	EList<InitOrDerValueCS> list = (EList<InitOrDerValueCS>)$getSym(5);
148	CSTNode result = createPropertyContextCS(	136	CSTNode result = createPropertyContextCS(
149	(PathNameCS)$getSym(2),	137	pathNameCS,
150	(SimpleNameCS)$getSym(4),	138	removeLastSimpleNameCS(pathNameCS),
151	(TypeCS)$getSym(6),	139	(TypeCS)$getSym(4),
152	list	140	list
153	);	141	);
154	setOffsets(result, getIToken($getToken(1)), list.get(list.size()-1));	142	setOffsets(result, getIToken($getToken(1)), list.get(list.size()-1));

Lines 50-59 Link Here

(-)* $Id: OCLKWLexer.g,v 1.4 2009/10/02 20:55:33 ewillink Exp $ (-78 / +2 lines)
50	* Contributors:	50	* Contributors:
51	* IBM - Initial API and implementation	51	* IBM - Initial API and implementation
52	* E.D.Willink - Lexer and Parser refactoring to support extensibility and flexible error handling	52	* E.D.Willink - Lexer and Parser refactoring to support extensibility and flexible error handling
		53	* E.D.Willink - Bug 285633 static definitions
53	$copyright_contributions	54	$copyright_contributions
54	* </copyright>	55	* </copyright>
55	*	56	*
56	* $Id: OCLKWLexer.g,v 1.4 2009/10/02 20:55:33 ewillink Exp $	57	* $Id: OCLKWLexer.g,v 1.3 2009/09/04 08:27:07 ewillink Exp $
57	*/	58	*/
58	./	59	./
59	$End	60	$End
Lines 101-114 Link Here
101	null	102	null
102	invalid	103	invalid
103	-- return -- don't need a keyword for LPG purposes	104	-- return -- don't need a keyword for LPG purposes
104
105	--
106	-- the following are not used in the OCL concrete syntax, but
107	-- are defined as reserved words in the OCL 2.0 Spec 7.4.9
108	-- and were removed in the OCL 2.1 RTF 09-05-02.
109	--
110	attr
111	oper
112		105
113	--	106	--
114	-- the following were introduced in the OCL 2.1 RTF 09-05-02.	107	-- the following were introduced in the OCL 2.1 RTF 09-05-02.
Lines 144-158 Link Here
144	--	137	--
145	closure	138	closure
146		139
147	oclIsKindOf
148	oclIsTypeOf
149	oclAsType
150	oclIsNew
151	oclIsUndefined
152	oclIsInvalid
153	oclIsInState
154	allInstances
155
156	String	140	String
157	Integer	141	Integer
158	UnlimitedNatural	142	UnlimitedNatural
Lines 429-482 Link Here
429	$setResult($_closure);	413	$setResult($_closure);
430	$EndAction	414	$EndAction
431	./	415	./
432
433	\| o c l I s K i n d O f
434	/.$BeginAction
435	$setResult($_oclIsKindOf);
436	$EndAction
437	./
438
439	\| o c l I s T y p e O f
440	/.$BeginAction
441	$setResult($_oclIsTypeOf);
442	$EndAction
443	./
444
445	\| o c l A s T y p e
446	/.$BeginAction
447	$setResult($_oclAsType);
448	$EndAction
449	./
450
451	\| o c l I s N e w
452	/.$BeginAction
453	$setResult($_oclIsNew);
454	$EndAction
455	./
456
457	\| o c l I s U n d e f i n e d
458	/.$BeginAction
459	$setResult($_oclIsUndefined);
460	$EndAction
461	./
462
463	\| o c l I s I n v a l i d
464	/.$BeginAction
465	$setResult($_oclIsInvalid);
466	$EndAction
467	./
468
469	\| o c l I s I n S t a t e
470	/.$BeginAction
471	$setResult($_oclIsInState);
472	$EndAction
473	./
474
475	\| a l l I n s t a n c e s
476	/.$BeginAction
477	$setResult($_allInstances);
478	$EndAction
479	./
480		416
481	\| S t r i n g	417	\| S t r i n g
482	/.$BeginAction	418	/.$BeginAction
Lines 550-567 Link Here
550	$EndAction	486	$EndAction
551	./	487	./
552		488
553	\| a t t r
554	/.$BeginAction
555	$setResult($_attr);
556	$EndAction
557	./
558
559	\| o p e r
560	/.$BeginAction
561	$setResult($_oper);
562	$EndAction
563	./
564
565	\| s t a t i c	489	\| s t a t i c
566	/.$BeginAction	490	/.$BeginAction
567	$setResult($_static);	491	$setResult($_static);

Lines 193-204 Link Here

(-)* $Id: EssentialOCL.g,v 1.12 2009/10/04 11:15:51 ewillink Exp $ (-22 / +25 lines)
193	* IBM - Initial API and implementation	193	* IBM - Initial API and implementation
194	* E.D.Willink - Elimination of some shift-reduce conflicts	194	* E.D.Willink - Elimination of some shift-reduce conflicts
195	* E.D.Willink - Remove unnecessary warning suppression	195	* E.D.Willink - Remove unnecessary warning suppression
196	* E.D.Willink - Bugs 225493, 243976, 259818, 282882, 287993, 288040	196	* E.D.Willink - Bugs 184048, 225493, 243976, 259818, 282882, 287993, 288040
197	* Borland - Bug 242880	197	* Borland - Bug 242880
198	$copyright_contributions	198	$copyright_contributions
199	* </copyright>	199	* </copyright>
200	*	200	*
201	* $Id: EssentialOCL.g,v 1.12 2009/10/04 11:15:51 ewillink Exp $	201	* $Id: EssentialOCL.g,v 1.10 2009/09/04 13:40:43 ewillink Exp $
202	*/	202	*/
203	./	203	./
204	$End	204	$End
Lines 208-215 Link Here
208	import org.eclipse.emf.common.util.EList;	208	import org.eclipse.emf.common.util.EList;
209	import org.eclipse.ocl.cst.CSTNode;	209	import org.eclipse.ocl.cst.CSTNode;
210	import org.eclipse.ocl.cst.CallExpCS;	210	import org.eclipse.ocl.cst.CallExpCS;
		211	import org.eclipse.ocl.cst.CollectionTypeCS;
211	import org.eclipse.ocl.cst.CollectionTypeIdentifierEnum;	212	import org.eclipse.ocl.cst.CollectionTypeIdentifierEnum;
212	import org.eclipse.ocl.cst.DotOrArrowEnum;
213	import org.eclipse.ocl.cst.IntegerLiteralExpCS;	213	import org.eclipse.ocl.cst.IntegerLiteralExpCS;
214	import org.eclipse.ocl.cst.IsMarkedPreCS;	214	import org.eclipse.ocl.cst.IsMarkedPreCS;
215	import org.eclipse.ocl.cst.MessageExpCS;	215	import org.eclipse.ocl.cst.MessageExpCS;
Lines 219-225 Link Here
219	import org.eclipse.ocl.cst.PathNameCS;	219	import org.eclipse.ocl.cst.PathNameCS;
220	import org.eclipse.ocl.cst.SimpleNameCS;	220	import org.eclipse.ocl.cst.SimpleNameCS;
221	import org.eclipse.ocl.cst.SimpleTypeEnum;	221	import org.eclipse.ocl.cst.SimpleTypeEnum;
222	import org.eclipse.ocl.cst.StateExpCS;
223	import org.eclipse.ocl.cst.StringLiteralExpCS;	222	import org.eclipse.ocl.cst.StringLiteralExpCS;
224	import org.eclipse.ocl.cst.TypeCS;	223	import org.eclipse.ocl.cst.TypeCS;
225	import org.eclipse.ocl.cst.VariableCS;	224	import org.eclipse.ocl.cst.VariableCS;
Lines 239-287 Link Here
239	$End	238	$End
240		239
241	$KeyWords	240	$KeyWords
242	self	241	-- EssentialOCL keywords
243	inv	242	and
244	pre
245	post
246	endpackage
247	def
248	if
249	then
250	else	243	else
251	endif	244	endif
252	and	245	if
253	or
254	xor
255	not
256	implies	246	implies
257	let
258	in	247	in
259	true	248	let
260	false	249	not
		250	or
		251	then
		252	xor
		253
		254	-- CompleteOCL keywords
		255	body
		256	context
		257	def
		258	derive
		259	endpackage
		260	init
		261	inv
		262	package
		263	post
		264	pre
		265	static
261		266
262	--	267	--
263	-- the following appear to have been omitted from the list of	268	-- the following appear to have been omitted from the list of
264	-- OCL reserved words in Section 7.4.9. They will be treated	269	-- OCL reserved words in Section 7.4.9. They will be treated
265	-- as unreserved for compliance	270	-- as unreserved for compliance
266	--	271	--
267	body	272	false
268	derive
269	init
270	null	273	null
271	invalid	274	invalid

Lines 256-267 Link Here

(-)model/OCLCST.genmodel (-10 / +4 lines)
256	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/BooleanLiteralExpCS">	256	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/BooleanLiteralExpCS">
257	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/BooleanLiteralExpCS/booleanSymbol"/>	257	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/BooleanLiteralExpCS/booleanSymbol"/>
258	</genClasses>	258	</genClasses>
259	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/NullLiteralExpCS">	259	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/NullLiteralExpCS"/>
260	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/NullLiteralExpCS/symbol"/>	260	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/InvalidLiteralExpCS"/>
261	</genClasses>
262	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/InvalidLiteralExpCS">
263	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/InvalidLiteralExpCS/symbol"/>
264	</genClasses>
265	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/CollectionRangeCS">	261	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/CollectionRangeCS">
266	<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"	262	<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
267	createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/CollectionRangeCS/lastExpressionCS"/>	263	createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/CollectionRangeCS/lastExpressionCS"/>
Lines 290-300 Link Here
290	createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/FeatureCallExpCS/isMarkedPreCS"/>	286	createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/FeatureCallExpCS/isMarkedPreCS"/>
291	</genClasses>	287	</genClasses>
292	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/OperationCallExpCS">	288	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/OperationCallExpCS">
293	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/OperationCallExpCS/isAtomic"/>
294	</genClasses>
295	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/StateExpCS">
296	<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"	289	<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
297	createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/StateExpCS/simpleNames"/>	290	createChild="true" ecoreFeature="ecore:EReference OCLCST.ecore#//cst/OperationCallExpCS/pathNameCS"/>
		291	<genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute OCLCST.ecore#//cst/OperationCallExpCS/isAtomic"/>
298	</genClasses>	292	</genClasses>
299	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/OCLDocumentCS">	293	<genClasses xsi:type="genmodel:GenClass" ecoreClass="OCLCST.ecore#//cst/OCLDocumentCS">
300	<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"	294	<genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"

Lines 163-169 Link Here

(-)model/OCLCST.ecore (-12 / +6 lines)
163	<eStructuralFeatures xsi:type="ecore:EReference" name="variables" lowerBound="1"	163	<eStructuralFeatures xsi:type="ecore:EReference" name="variables" lowerBound="1"
164	upperBound="-1" eType="#//cst/VariableCS" containment="true"/>	164	upperBound="-1" eType="#//cst/VariableCS" containment="true"/>
165	</eClassifiers>	165	</eClassifiers>
166	<eClassifiers xsi:type="ecore:EClass" name="CollectionTypeCS" eSuperTypes="#//cst/TypeCS">	166	<eClassifiers xsi:type="ecore:EClass" name="CollectionTypeCS" eSuperTypes="#//cst/SimpleNameCS #//cst/TypeCS">
167	<eStructuralFeatures xsi:type="ecore:EAttribute" name="collectionTypeIdentifier"	167	<eStructuralFeatures xsi:type="ecore:EAttribute" name="collectionTypeIdentifier"
168	eType="#//cst/CollectionTypeIdentifierEnum"/>	168	eType="#//cst/CollectionTypeIdentifierEnum"/>
169	<eStructuralFeatures xsi:type="ecore:EReference" name="typeCS" eType="#//cst/TypeCS"	169	<eStructuralFeatures xsi:type="ecore:EReference" name="typeCS" eType="#//cst/TypeCS"
Lines 257-271 Link Here
257	<eStructuralFeatures xsi:type="ecore:EAttribute" name="unescapedStringSymbol"	257	<eStructuralFeatures xsi:type="ecore:EAttribute" name="unescapedStringSymbol"
258	eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	258	eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
259	</eClassifiers>	259	</eClassifiers>
260	<eClassifiers xsi:type="ecore:EClass" name="BooleanLiteralExpCS" eSuperTypes="#//cst/PrimitiveLiteralExpCS">	260	<eClassifiers xsi:type="ecore:EClass" name="BooleanLiteralExpCS" eSuperTypes="#//cst/SimpleNameCS #//cst/PrimitiveLiteralExpCS">
261	<eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>	261	<eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanSymbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
262	</eClassifiers>	262	</eClassifiers>
263	<eClassifiers xsi:type="ecore:EClass" name="NullLiteralExpCS" eSuperTypes="#//cst/LiteralExpCS">	263	<eClassifiers xsi:type="ecore:EClass" name="NullLiteralExpCS" eSuperTypes="#//cst/SimpleNameCS #//cst/LiteralExpCS"/>
264	<eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	264	<eClassifiers xsi:type="ecore:EClass" name="InvalidLiteralExpCS" eSuperTypes="#//cst/SimpleNameCS #//cst/LiteralExpCS"/>
265	</eClassifiers>
266	<eClassifiers xsi:type="ecore:EClass" name="InvalidLiteralExpCS" eSuperTypes="#//cst/LiteralExpCS">
267	<eStructuralFeatures xsi:type="ecore:EAttribute" name="symbol" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
268	</eClassifiers>
269	<eClassifiers xsi:type="ecore:EClass" name="CollectionRangeCS" eSuperTypes="#//cst/CollectionLiteralPartCS">	265	<eClassifiers xsi:type="ecore:EClass" name="CollectionRangeCS" eSuperTypes="#//cst/CollectionLiteralPartCS">
270	<eStructuralFeatures xsi:type="ecore:EReference" name="lastExpressionCS" eType="#//cst/OCLExpressionCS"	266	<eStructuralFeatures xsi:type="ecore:EReference" name="lastExpressionCS" eType="#//cst/OCLExpressionCS"
271	containment="true">	267	containment="true">
Lines 303-315 Link Here
303	containment="true"/>	299	containment="true"/>
304	</eClassifiers>	300	</eClassifiers>
305	<eClassifiers xsi:type="ecore:EClass" name="OperationCallExpCS" eSuperTypes="#//cst/FeatureCallExpCS">	301	<eClassifiers xsi:type="ecore:EClass" name="OperationCallExpCS" eSuperTypes="#//cst/FeatureCallExpCS">
		302	<eStructuralFeatures xsi:type="ecore:EReference" name="pathNameCS" eType="#//cst/PathNameCS"
		303	containment="true"/>
306	<eStructuralFeatures xsi:type="ecore:EAttribute" name="isAtomic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"	304	<eStructuralFeatures xsi:type="ecore:EAttribute" name="isAtomic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"
307	defaultValueLiteral="false"/>	305	defaultValueLiteral="false"/>
308	</eClassifiers>	306	</eClassifiers>
309	<eClassifiers xsi:type="ecore:EClass" name="StateExpCS" eSuperTypes="#//cst/TypeCS">
310	<eStructuralFeatures xsi:type="ecore:EReference" name="simpleNames" upperBound="-1"
311	eType="#//cst/SimpleNameCS" containment="true"/>
312	</eClassifiers>
313	<eClassifiers xsi:type="ecore:EClass" name="OCLDocumentCS" eSuperTypes="#//cst/CSTNode">	307	<eClassifiers xsi:type="ecore:EClass" name="OCLDocumentCS" eSuperTypes="#//cst/CSTNode">
314	<eStructuralFeatures xsi:type="ecore:EReference" name="packageDeclarations"	308	<eStructuralFeatures xsi:type="ecore:EReference" name="packageDeclarations"
315	ordered="false" upperBound="-1" eType="#//cst/PackageDeclarationCS" containment="true"/>	309	ordered="false" upperBound="-1" eType="#//cst/PackageDeclarationCS" containment="true"/>

Lines 2-7 Link Here

(-)model/OCLCST.uml (-21 / +14 lines)
2	<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/4" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/4 pathmap://UML_PROFILES/Ecore.profile.uml#_B7dOIMEREduRdatXodjBjA">	2	<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/4" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/4 pathmap://UML_PROFILES/Ecore.profile.uml#_B7dOIMEREduRdatXodjBjA">
3	<uml:Model xmi:id="_qdx8sQ8fEduhWtVvKtiQ7w" name="ocl">	3	<uml:Model xmi:id="_qdx8sQ8fEduhWtVvKtiQ7w" name="ocl">
4	<packagedElement xmi:type="uml:Package" xmi:id="_qdx8sP8fEduhWtVvKtiQ7w" name="cst">	4	<packagedElement xmi:type="uml:Package" xmi:id="_qdx8sP8fEduhWtVvKtiQ7w" name="cst">
		5	<elementImport xmi:id="_5DyD0LD5Ed6LkdYdYK9_JA"/>
5	<packageImport xmi:id="_CSYeEI2GEd2mlKUM3HGxZg">	6	<packageImport xmi:id="_CSYeEI2GEd2mlKUM3HGxZg">
6	<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#_0"/>	7	<importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#_0"/>
7	</packageImport>	8	</packageImport>
Lines 353-358 Link Here
353	<ownedEnd xmi:id="_qdx9lP8fEduhWtVvKtiQ7w" type="_qdx9j_8fEduhWtVvKtiQ7w" association="_qdx9k_8fEduhWtVvKtiQ7w"/>	354	<ownedEnd xmi:id="_qdx9lP8fEduhWtVvKtiQ7w" type="_qdx9j_8fEduhWtVvKtiQ7w" association="_qdx9k_8fEduhWtVvKtiQ7w"/>
354	</packagedElement>	355	</packagedElement>
355	<packagedElement xmi:type="uml:Class" xmi:id="_qdx9lf8fEduhWtVvKtiQ7w" name="CollectionTypeCS">	356	<packagedElement xmi:type="uml:Class" xmi:id="_qdx9lf8fEduhWtVvKtiQ7w" name="CollectionTypeCS">
		357	<generalization xmi:id="_2NUGIJw2Ed6az7Hq7e93gA" general="_qdx83P8fEduhWtVvKtiQ7w"/>
356	<generalization xmi:id="_qdx9lv8fEduhWtVvKtiQ7w" general="_qdx8xP8fEduhWtVvKtiQ7w"/>	358	<generalization xmi:id="_qdx9lv8fEduhWtVvKtiQ7w" general="_qdx8xP8fEduhWtVvKtiQ7w"/>
357	<ownedAttribute xmi:id="_qdx9l_8fEduhWtVvKtiQ7w" name="collectionTypeIdentifier" visibility="public" type="_qdx9m_8fEduhWtVvKtiQ7w" isOrdered="true">	359	<ownedAttribute xmi:id="_qdx9l_8fEduhWtVvKtiQ7w" name="collectionTypeIdentifier" visibility="public" type="_qdx9m_8fEduhWtVvKtiQ7w" isOrdered="true">
358	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx9mP8fEduhWtVvKtiQ7w"/>	360	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx9mP8fEduhWtVvKtiQ7w"/>
Lines 549-554 Link Here
549	</ownedAttribute>	551	</ownedAttribute>
550	</packagedElement>	552	</packagedElement>
551	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-E_8fEduhWtVvKtiQ7w" name="BooleanLiteralExpCS">	553	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-E_8fEduhWtVvKtiQ7w" name="BooleanLiteralExpCS">
		554	<generalization xmi:id="_HVRk0LKtEd6RC43VVMBX9w" general="_qdx83P8fEduhWtVvKtiQ7w"/>
552	<generalization xmi:id="_qdx-FP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>	555	<generalization xmi:id="_qdx-FP8fEduhWtVvKtiQ7w" general="_qdx9__8fEduhWtVvKtiQ7w"/>
553	<ownedAttribute xmi:id="_qdx-Ff8fEduhWtVvKtiQ7w" name="booleanSymbol" visibility="public" isOrdered="true">	556	<ownedAttribute xmi:id="_qdx-Ff8fEduhWtVvKtiQ7w" name="booleanSymbol" visibility="public" isOrdered="true">
554	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>	557	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>
Lines 556-573 Link Here
556	</ownedAttribute>	559	</ownedAttribute>
557	</packagedElement>	560	</packagedElement>
558	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-F_8fEduhWtVvKtiQ7w" name="NullLiteralExpCS">	561	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-F_8fEduhWtVvKtiQ7w" name="NullLiteralExpCS">
		562	<generalization xmi:id="_GYa7ALKtEd6RC43VVMBX9w" general="_qdx83P8fEduhWtVvKtiQ7w"/>
559	<generalization xmi:id="_qdx-GP8fEduhWtVvKtiQ7w" general="_qdx93f8fEduhWtVvKtiQ7w"/>	563	<generalization xmi:id="_qdx-GP8fEduhWtVvKtiQ7w" general="_qdx93f8fEduhWtVvKtiQ7w"/>
560	<ownedAttribute xmi:id="_qdx-Gf8fEduhWtVvKtiQ7w" name="symbol" visibility="public" isOrdered="true">
561	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
562	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Gv8fEduhWtVvKtiQ7w"/>
563	</ownedAttribute>
564	</packagedElement>	564	</packagedElement>
565	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-G_8fEduhWtVvKtiQ7w" name="InvalidLiteralExpCS">	565	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-G_8fEduhWtVvKtiQ7w" name="InvalidLiteralExpCS">
		566	<generalization xmi:id="_9073ALKsEd6RC43VVMBX9w" general="_qdx83P8fEduhWtVvKtiQ7w"/>
566	<generalization xmi:id="_qdx-HP8fEduhWtVvKtiQ7w" general="_qdx93f8fEduhWtVvKtiQ7w"/>	567	<generalization xmi:id="_qdx-HP8fEduhWtVvKtiQ7w" general="_qdx93f8fEduhWtVvKtiQ7w"/>
567	<ownedAttribute xmi:id="_qdx-Hf8fEduhWtVvKtiQ7w" name="symbol" visibility="public" isOrdered="true">
568	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
569	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qdx-Hv8fEduhWtVvKtiQ7w"/>
570	</ownedAttribute>
571	</packagedElement>	568	</packagedElement>
572	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-H_8fEduhWtVvKtiQ7w" name="CollectionRangeCS">	569	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-H_8fEduhWtVvKtiQ7w" name="CollectionRangeCS">
573	<generalization xmi:id="_qdx-IP8fEduhWtVvKtiQ7w" general="_qdx98P8fEduhWtVvKtiQ7w"/>	570	<generalization xmi:id="_qdx-IP8fEduhWtVvKtiQ7w" general="_qdx98P8fEduhWtVvKtiQ7w"/>
Lines 652-668 Link Here
652	</packagedElement>	649	</packagedElement>
653	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-Vf8fEduhWtVvKtiQ7w" name="OperationCallExpCS">	650	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-Vf8fEduhWtVvKtiQ7w" name="OperationCallExpCS">
654	<generalization xmi:id="_qdx-Vv8fEduhWtVvKtiQ7w" general="_qdx-Sv8fEduhWtVvKtiQ7w"/>	651	<generalization xmi:id="_qdx-Vv8fEduhWtVvKtiQ7w" general="_qdx-Sv8fEduhWtVvKtiQ7w"/>
655	<ownedAttribute xmi:id="_306UMJXiEd6Wx-S3aeq4Aw" name="isAtomic" visibility="public" isOrdered="true">	652	<ownedAttribute xmi:id="_uREjQJrAEd6qQcRgrpdjbQ" name="pathNameCS" type="_qdx8v_8fEduhWtVvKtiQ7w" isOrdered="true" aggregation="composite">
656	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>	653	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uREjQZrAEd6qQcRgrpdjbQ"/>
657	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_306UMZXiEd6Wx-S3aeq4Aw"/>
658	<defaultValue xmi:type="uml:LiteralString" xmi:id="_8lGFsJXiEd6Wx-S3aeq4Aw" value="false"/>
659	</ownedAttribute>	654	</ownedAttribute>
660	</packagedElement>	655	<ownedAttribute xmi:id="_z9V7sLI8Ed6kyPEWd5jeqw" name="isAtomic" visibility="public" isOrdered="true">
661	<packagedElement xmi:type="uml:Class" xmi:id="_qdx-V_8fEduhWtVvKtiQ7w" name="StateExpCS">	656	<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>
662	<generalization xmi:id="_qdx-WP8fEduhWtVvKtiQ7w" general="_qdx8xP8fEduhWtVvKtiQ7w"/>	657	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_z9V7sbI8Ed6kyPEWd5jeqw"/>
663	<ownedAttribute xmi:id="_pS7AEJPiEd6yA_hAShwLtA" name="simpleNames" type="_qdx83P8fEduhWtVvKtiQ7w" isOrdered="true" aggregation="composite">	658	<defaultValue xmi:type="uml:LiteralString" xmi:id="_3WtEMLI8Ed6kyPEWd5jeqw" value="false"/>
664	<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pS7AEZPiEd6yA_hAShwLtA" value="*"/>
665	<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pS7AEpPiEd6yA_hAShwLtA"/>
666	</ownedAttribute>	659	</ownedAttribute>
667	</packagedElement>	660	</packagedElement>
668	<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_tvVQwI2FEd2mlKUM3HGxZg" name="IToken"/>	661	<packagedElement xmi:type="uml:PrimitiveType" xmi:id="_tvVQwI2FEd2mlKUM3HGxZg" name="IToken"/>
Lines 839-847 Link Here
839	<Ecore:EClass xmi:id="_qfsogP8fEduhWtVvKtiQ7w" base_Class="_qdx-E_8fEduhWtVvKtiQ7w"/>	832	<Ecore:EClass xmi:id="_qfsogP8fEduhWtVvKtiQ7w" base_Class="_qdx-E_8fEduhWtVvKtiQ7w"/>
840	<Ecore:EAttribute xmi:id="_qfsogf8fEduhWtVvKtiQ7w" base_Property="_qdx-Ff8fEduhWtVvKtiQ7w"/>	833	<Ecore:EAttribute xmi:id="_qfsogf8fEduhWtVvKtiQ7w" base_Property="_qdx-Ff8fEduhWtVvKtiQ7w"/>
841	<Ecore:EClass xmi:id="_qfsogv8fEduhWtVvKtiQ7w" base_Class="_qdx-F_8fEduhWtVvKtiQ7w"/>	834	<Ecore:EClass xmi:id="_qfsogv8fEduhWtVvKtiQ7w" base_Class="_qdx-F_8fEduhWtVvKtiQ7w"/>
842	<Ecore:EAttribute xmi:id="_qfsog_8fEduhWtVvKtiQ7w" base_Property="_qdx-Gf8fEduhWtVvKtiQ7w"/>	835	<Ecore:EAttribute xmi:id="_qfsog_8fEduhWtVvKtiQ7w"/>
843	<Ecore:EClass xmi:id="_qfsohP8fEduhWtVvKtiQ7w" base_Class="_qdx-G_8fEduhWtVvKtiQ7w"/>	836	<Ecore:EClass xmi:id="_qfsohP8fEduhWtVvKtiQ7w" base_Class="_qdx-G_8fEduhWtVvKtiQ7w"/>
844	<Ecore:EAttribute xmi:id="_qfsohf8fEduhWtVvKtiQ7w" base_Property="_qdx-Hf8fEduhWtVvKtiQ7w"/>	837	<Ecore:EAttribute xmi:id="_qfsohf8fEduhWtVvKtiQ7w"/>
845	<Ecore:EClass xmi:id="_qfsohv8fEduhWtVvKtiQ7w" base_Class="_qdx-H_8fEduhWtVvKtiQ7w"/>	838	<Ecore:EClass xmi:id="_qfsohv8fEduhWtVvKtiQ7w" base_Class="_qdx-H_8fEduhWtVvKtiQ7w"/>
846	<Ecore:EReference xmi:id="_qfsoh_8fEduhWtVvKtiQ7w" xmlName="lastOclExpressionCS" base_Property="_qdx-If8fEduhWtVvKtiQ7w"/>	839	<Ecore:EReference xmi:id="_qfsoh_8fEduhWtVvKtiQ7w" xmlName="lastOclExpressionCS" base_Property="_qdx-If8fEduhWtVvKtiQ7w"/>
847	<Ecore:EClass xmi:id="_qfsoiP8fEduhWtVvKtiQ7w" base_Class="_qdx-Jf8fEduhWtVvKtiQ7w"/>	840	<Ecore:EClass xmi:id="_qfsoiP8fEduhWtVvKtiQ7w" base_Class="_qdx-Jf8fEduhWtVvKtiQ7w"/>
Lines 862-868 Link Here
862	<Ecore:EReference xmi:id="_qf-8Jf8fEduhWtVvKtiQ7w" base_Property="_qdx-TP8fEduhWtVvKtiQ7w"/>	855	<Ecore:EReference xmi:id="_qf-8Jf8fEduhWtVvKtiQ7w" base_Property="_qdx-TP8fEduhWtVvKtiQ7w"/>
863	<Ecore:EReference xmi:id="_qf-8Jv8fEduhWtVvKtiQ7w" base_Property="_qdx-T_8fEduhWtVvKtiQ7w"/>	856	<Ecore:EReference xmi:id="_qf-8Jv8fEduhWtVvKtiQ7w" base_Property="_qdx-T_8fEduhWtVvKtiQ7w"/>
864	<Ecore:EClass xmi:id="_qf-8J_8fEduhWtVvKtiQ7w" base_Class="_qdx-Vf8fEduhWtVvKtiQ7w"/>	857	<Ecore:EClass xmi:id="_qf-8J_8fEduhWtVvKtiQ7w" base_Class="_qdx-Vf8fEduhWtVvKtiQ7w"/>
865	<Ecore:EClass xmi:id="_qf-8KP8fEduhWtVvKtiQ7w" base_Class="_qdx-V_8fEduhWtVvKtiQ7w"/>	858	<Ecore:EClass xmi:id="_qf-8KP8fEduhWtVvKtiQ7w"/>
866	<Ecore:EAttribute xmi:id="_qf-8Kf8fEduhWtVvKtiQ7w"/>	859	<Ecore:EAttribute xmi:id="_qf-8Kf8fEduhWtVvKtiQ7w"/>
867	<Ecore:EDataType xmi:id="_wn-44I2FEd2mlKUM3HGxZg" instanceClassName="lpg.lpgjavaruntime.IToken" base_PrimitiveType="_tvVQwI2FEd2mlKUM3HGxZg"/>	860	<Ecore:EDataType xmi:id="_wn-44I2FEd2mlKUM3HGxZg" instanceClassName="lpg.lpgjavaruntime.IToken" base_PrimitiveType="_tvVQwI2FEd2mlKUM3HGxZg"/>
868	<Ecore:EAttribute xmi:id="_qkehgI2JEd2mlKUM3HGxZg" isTransient="true" base_Property="_PkTnII2GEd2mlKUM3HGxZg"/>	861	<Ecore:EAttribute xmi:id="_qkehgI2JEd2mlKUM3HGxZg" isTransient="true" base_Property="_PkTnII2GEd2mlKUM3HGxZg"/>

Lines 57-66 Link Here

(-)src/org/eclipse/ocl/parser/backtracking/EssentialOCLErrors.g (-26 / +29 lines)
57	$EndJava	57	$EndJava
58	./	58	./
59		59
60	attrOrNavCallExpCS ::= simpleNameCS '[' argumentsCS ERROR_TOKEN	60	associationClassCallExpCS ::= notReservedSimpleNameCS '[' argumentsCS ERROR_TOKEN
61	/.$BeginJava	61	/.$BeginJava
62	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RBRACK);	62	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RBRACK);
63	CSTNode result = createFeatureCallExpCS(	63	CSTNode result = createVariableExpCS(
64	(SimpleNameCS)$getSym(1),	64	(SimpleNameCS)$getSym(1),
65	(EList)$getSym(3),	65	(EList)$getSym(3),
66	null	66	null
Lines 69-113 Link Here
69	$setResult(result);	69	$setResult(result);
70	$EndJava	70	$EndJava
71	./	71	./
72		72	propertyCallExpCS ::= dotArrowExpCS '.' notReservedSimpleNameCS '[' argumentsCS ERROR_TOKEN
73	collectionTypeCS ::= collectionTypeIdentifierCS '(' typeCS ERROR_TOKEN
74	/.$BeginJava	73	/.$BeginJava
75	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RPAREN);	74	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
76	Object[] objs = (Object[])$getSym(1);	75	CallExpCS result = createFeatureCallExpCS(
77	CSTNode result = createCollectionTypeCS(	76	source,
78	(CollectionTypeIdentifierEnum)objs[1],	77	(SimpleNameCS)$getSym(3),
79	(TypeCS)$getSym(3)	78	(EList)$getSym(5),
		79	null
80	);	80	);
81	setOffsets(result, (IToken)objs[0], getIToken($getToken(4)));	81	setOffsets(result, source, getIToken($getToken(6)));
82	$setResult(result);	82	$setResult(result);
83	$EndJava	83	$EndJava
84	./	84	./
85	collectionTypeCS ::= collectionTypeIdentifierCS ERROR_TOKEN	85	propertyCallExpCS ::= dotArrowExpCS '.' ERROR_SimpleNameCS '[' argumentsCS ']' isMarkedPreCSopt
86	/.$BeginJava	86	/.$BeginJava
87	reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_LPAREN);	87	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
88	Object[] objs = (Object[])$getSym(1);	88	IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS)$getSym(7);
89	CSTNode result = createCollectionTypeCS(	89	CallExpCS result = createFeatureCallExpCS(
90	(CollectionTypeIdentifierEnum)objs[1],	90	source,
91	null	91	(SimpleNameCS)$getSym(3),
		92	(EList)$getSym(5),
		93	isMarkedPreCS
92	);	94	);
93	setOffsets(result, (IToken)objs[0], getIToken($getToken(2)));	95	if (isMarkedPreCS != null) {
		96	setOffsets(result, source, isMarkedPreCS);
		97	} else {
		98	setOffsets(result, source, getIToken($getToken(6)));
		99	}
94	$setResult(result);	100	$setResult(result);
95	$EndJava	101	$EndJava
96	./	102	./
97		103
98	dotArrowExpCS ::= pathNameCS '::' ERROR_SimpleNameCS '(' argumentsCSopt ')'	104	collectionTypeCS ::= collectionTypeIdentifierCS '(' typeCS ERROR_TOKEN
99	/.$BeginJava	105	/.$BeginJava
100	OperationCallExpCS result = createOperationCallExpCS(	106	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RPAREN);
101	(PathNameCS)$getSym(1),	107	CollectionTypeCS result = (CollectionTypeCS)dtParser.getSym(1);
102	(SimpleNameCS)$getSym(3),	108	result.setTypeCS((TypeCS)dtParser.getSym(3));
103	(EList)$getSym(5)	109	setOffsets(result, result, getIToken($getToken(4)));
104	);
105	setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(6)));
106	result.setAccessor(DotOrArrowEnum.DOT_LITERAL);
107	$setResult(result);	110	$setResult(result);
108	$EndJava	111	$EndJava
109	./	112	./

Lines 122-155 Link Here

(-)FIXME (-71 / +129 lines)
122	$EndJava	124	$EndJava
123	./	125	./
124		126
125	featureCallExpCS ::= unaryName ERROR_IsMarkedPreCS '(' argumentsCSopt ')'	127	operationCallExpCS_B ::= dotArrowExpCS '->' ERROR_SimpleNameCS '(' argumentsCSopt ')'
126	/.$NewCase./
127	keywordOperationCallExpCS ::= keywordAsName ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
128	/.$NewCase./
129	operationCallExpCS ::= binaryName ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
130	/.$BeginJava	128	/.$BeginJava
131	SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(1);	129	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
132	CSTNode result = createOperationCallExpCS(	130	CallExpCS result = createArrowOperationCallExpCS(
133	simpleNameCS,	131	source,
		132	(SimpleNameCS)$getSym(3),
		133	(IsMarkedPreCS)null,
		134	(EList)$getSym(5)
		135	);
		136	setOffsets(result, source, getIToken($getToken(6)));
		137	$setResult(result);
		138	$EndJava
		139	./
		140
		141	operationCallExpCS_CE ::= dotArrowExpCS '.' ERROR_SimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
		142	/.$BeginJava
		143	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
		144	CallExpCS result = createDotOperationCallExpCS(
		145	source,
		146	null,
		147	(SimpleNameCS)$getSym(3),
		148	(IsMarkedPreCS)$getSym(4),
		149	(EList)$getSym(6)
		150	);
		151	setOffsets(result, source, getIToken($getToken(7)));
		152	$setResult(result);
		153	$EndJava
		154	./
		155	operationCallExpCS_CE ::= dotArrowExpCS '.' operationOrNotReservedSimpleNameCS ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		156	/.$BeginJava
		157	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
		158	CallExpCS result = createDotOperationCallExpCS(
		159	source,
		160	null,
		161	(SimpleNameCS)$getSym(3),
		162	(IsMarkedPreCS)$getSym(4),
		163	(EList)$getSym(6)
		164	);
		165	setOffsets(result, source, getIToken($getToken(7)));
		166	$setResult(result);
		167	$EndJava
		168	./
		169
		170	operationCallExpCS_DF ::= notReservedSimpleNameCS ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		171	/.$BeginJava
		172	CSTNode result = createDotOperationCallExpCS(
		173	null,
		174	null,
		175	(SimpleNameCS)$getSym(1),
134	(IsMarkedPreCS)$getSym(2),	176	(IsMarkedPreCS)$getSym(2),
135	(EList)$getSym(4)	177	(EList)$getSym(4)
136	);	178	);
137	setOffsets(result, simpleNameCS, getIToken($getToken(5)));	179	setOffsets(result, getIToken($getToken(1)), getIToken($getToken(5)));
138	$setResult(result);	180	$setResult(result);
139	$EndJava	181	$EndJava
140	./	182	./
141	operationCallExpCS ::= oclIsInStateName ERROR_IsMarkedPreCS '(' stateExpCS ')'	183
		184	operationCallExpCS_G ::= pathNameCS '::' ERROR_SimpleNameCS '(' argumentsCSopt ')'
142	/.$BeginJava	185	/.$BeginJava
143	SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(1);	186	OperationCallExpCS result = createDotOperationCallExpCS(
144	CSTNode result = createOperationCallExpCS(	187	null,
145	simpleNameCS,	188	(PathNameCS)$getSym(1),
146	(IsMarkedPreCS)$getSym(2),	189	(SimpleNameCS)$getSym(3),
147	(StateExpCS)$getSym(4)	190	null,
		191	(EList)$getSym(5)
148	);	192	);
149	setOffsets(result, simpleNameCS, getIToken($getToken(5)));	193	setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(6)));
150	$setResult(result);	194	$setResult(result);
151	$EndJava	195	$EndJava
152	./	196	./
		197
		198	operationCallExpCS_IJ ::= dotArrowExpCS '.' qualifiedPathNameCS ERROR_IsMarkedPreCS '(' argumentsCSopt ')'
		199	/.$BeginJava
		200	PathNameCS pathName = (PathNameCS)$getSym(3);
		201	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
		202	CallExpCS result = createDotOperationCallExpCS(
		203	source,
		204	pathName,
		205	removeLastSimpleNameCS(pathName),
		206	(IsMarkedPreCS)$getSym(4),
		207	(EList)$getSym(6)
		208	);
		209	setOffsets(result, source, getIToken($getToken(7)));
		210	$setResult(result);
		211	$EndJava
		212	./
		213	operationCallExpCS_IJ ::= dotArrowExpCS '.' pathNameCS '::' ERROR_SimpleNameCS isMarkedPreCSopt '(' argumentsCSopt ')'
		214	/.$BeginJava
		215	OCLExpressionCS source = (OCLExpressionCS)$getSym(1);
		216	CallExpCS result = createDotOperationCallExpCS(
		217	source,
		218	(PathNameCS)$getSym(3),
		219	(SimpleNameCS)$getSym(5),
		220	(IsMarkedPreCS)$getSym(6),
		221	(EList)$getSym(8)
		222	);
		223	setOffsets(result, source, getIToken($getToken(9)));
		224	$setResult(result);
		225	$EndJava
		226	./
153		227
154	ifExpCS ::= if oclExpressionCS then oclExpressionCS else oclExpressionCS ERROR_TOKEN	228	ifExpCS ::= if oclExpressionCS then oclExpressionCS else oclExpressionCS ERROR_TOKEN
155	/.$BeginJava	229	/.$BeginJava
Lines 200-230 Link Here
200	$EndJava	274	$EndJava
201	./	275	./
202		276
203	messageExpCS ::= '^' simpleNameCS ERROR_TOKEN	277	oclMessageExpCS ::= dotArrowExpCS '^' simpleNameCS ERROR_TOKEN
204	/.$NewCase./	278	/.$NewCase./
205	messageExpCS ::= '^^' simpleNameCS ERROR_TOKEN	279	oclMessageExpCS ::= dotArrowExpCS '^^' simpleNameCS ERROR_TOKEN
206	/.$BeginJava	280	/.$BeginJava
207	reportErrorTokenMessage($getToken(1), OCLParserErrors.MISSING_MESSAGE_ARGUMENTS);	281	reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_MESSAGE_ARGUMENTS);
208	CSTNode result = createMessageExpCS(	282	OCLExpressionCS target = (OCLExpressionCS)$getSym(1);
209	getIToken($getToken(1)).getKind() == $sym_type.TK_CARET,	283	MessageExpCS result = createMessageExpCS(
210	(SimpleNameCS)$getSym(2),	284	target,
		285	getIToken($getToken(2)).getKind() == $sym_type.TK_CARET,
		286	(SimpleNameCS)$getSym(3),
211	new BasicEList<OCLMessageArgCS>()	287	new BasicEList<OCLMessageArgCS>()
212	);	288	);
213	setOffsets(result, getIToken($getToken(1)), getIToken($getToken(3)));	289	setOffsets(result, target, getIToken($getToken(4)));
214	$setResult(result);	290	$setResult(result);
215	$EndJava	291	$EndJava
216	./	292	./
217	messageExpCS ::= '^' ERROR_SimpleNameCS	293	oclMessageExpCS ::= dotArrowExpCS '^' ERROR_SimpleNameCS
218	/.$NewCase./	294	/.$NewCase./
219	messageExpCS ::= '^^' ERROR_SimpleNameCS	295	oclMessageExpCS ::= dotArrowExpCS '^^' ERROR_SimpleNameCS
220	/.$BeginJava	296	/.$BeginJava
221	SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(2);	297	SimpleNameCS simpleNameCS = (SimpleNameCS)$getSym(3);
222	CSTNode result = createMessageExpCS(	298	OCLExpressionCS target = (OCLExpressionCS)$getSym(1);
223	getIToken($getToken(1)).getKind() == $sym_type.TK_CARET,	299	MessageExpCS result = createMessageExpCS(
		300	target,
		301	getIToken($getToken(2)).getKind() == $sym_type.TK_CARET,
224	simpleNameCS,	302	simpleNameCS,
225	new BasicEList<OCLMessageArgCS>()	303	new BasicEList<OCLMessageArgCS>()
226	);	304	);
227	setOffsets(result, getIToken($getToken(1)), simpleNameCS);	305	setOffsets(result, target, simpleNameCS);
228	$setResult(result);	306	$setResult(result);
229	$EndJava	307	$EndJava
230	./	308	./
Lines 246-252 Link Here
246	$EndJava	324	$EndJava
247	./	325	./
248		326
249	operationCS1 ::= IDENTIFIER '(' parametersCSopt ')' ERROR_Colon	327	operationCS1 ::= notReservedSimpleNameCS '(' variableListCSopt ')' ERROR_Colon
250	/.$BeginJava	328	/.$BeginJava
251	CSTNode result = createOperationCS(	329	CSTNode result = createOperationCS(
252	getTokenText($getToken(1)),	330	getTokenText($getToken(1)),
Lines 257-263 Link Here
257	$setResult(result);	335	$setResult(result);
258	$EndJava	336	$EndJava
259	./	337	./
260	operationCS1 ::= IDENTIFIER '(' parametersCSopt ERROR_TOKEN	338	operationCS1 ::= notReservedSimpleNameCS '(' variableListCSopt ERROR_TOKEN
261	/.$BeginJava	339	/.$BeginJava
262	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RPAREN);	340	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RPAREN);
263	CSTNode result = createOperationCS(	341	CSTNode result = createOperationCS(
Lines 269-275 Link Here
269	$setResult(result);	347	$setResult(result);
270	$EndJava	348	$EndJava
271	./	349	./
272	operationCS1 ::= IDENTIFIER ERROR_TOKEN	350	operationCS1 ::= notReservedSimpleNameCS ERROR_TOKEN
273	/.$BeginJava	351	/.$BeginJava
274	reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_LPAREN);	352	reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_LPAREN);
275	CSTNode result = createOperationCS(	353	CSTNode result = createOperationCS(
Lines 293-336 Link Here
293	$setResult(result);	371	$setResult(result);
294	$EndJava	372	$EndJava
295	./	373	./
296	operationCS2 ::= pathNameCS '::' simpleNameCS '(' parametersCSopt ')' ERROR_Colon	374	operationCS2 ::= qualifiedPathNameCS '(' variableListCSopt ')' ERROR_Colon
297	/.$BeginJava	375	/.$BeginJava
298	PathNameCS pathNameCS = (PathNameCS)$getSym(1);	376	PathNameCS pathNameCS = (PathNameCS)$getSym(1);
299	CSTNode result = createOperationCS(	377	CSTNode result = createOperationCS(
300	pathNameCS,	378	pathNameCS,
301	(SimpleNameCS)$getSym(3),	379	removeLastSimpleNameCS(pathNameCS),
302	(EList)$getSym(5),	380	(EList)$getSym(3),
303	(TypeCS)$getSym(8)	381	null
304	);	382	);
305	setOffsets(result, pathNameCS, getIToken($getToken(7)));	383	setOffsets(result, pathNameCS, getIToken($getToken(5)));
306	$setResult(result);	384	$setResult(result);
307	$EndJava	385	$EndJava
308	./	386	./
309	operationCS2 ::= pathNameCS '::' simpleNameCS '(' parametersCSopt ERROR_TOKEN	387	operationCS2 ::= qualifiedPathNameCS '(' variableListCSopt ERROR_TOKEN
310	/.$BeginJava	388	/.$BeginJava
311	reportErrorTokenMessage($getToken(6), OCLParserErrors.MISSING_RPAREN);	389	reportErrorTokenMessage($getToken(6), OCLParserErrors.MISSING_RPAREN);
312	PathNameCS pathNameCS = (PathNameCS)$getSym(1);	390	PathNameCS pathNameCS = (PathNameCS)$getSym(1);
313	CSTNode result = createOperationCS(	391	CSTNode result = createOperationCS(
314	pathNameCS,	392	pathNameCS,
315	(SimpleNameCS)$getSym(3),	393	removeLastSimpleNameCS(pathNameCS),
316	(EList)$getSym(5),	394	(EList)$getSym(3),
317	null	395	null
318	);	396	);
319	setOffsets(result, pathNameCS, getIToken($getToken(7)));	397	setOffsets(result, pathNameCS, getIToken($getToken(4)));
320	$setResult(result);	398	$setResult(result);
321	$EndJava	399	$EndJava
322	./	400	./
323	operationCS2 ::= pathNameCS '::' simpleNameCS ERROR_TOKEN	401	operationCS2 ::= qualifiedPathNameCS ERROR_TOKEN
324	/.$BeginJava	402	/.$BeginJava
325	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_LPAREN);	403	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_LPAREN);
326	PathNameCS pathNameCS = (PathNameCS)$getSym(1);	404	PathNameCS pathNameCS = (PathNameCS)$getSym(1);
327	CSTNode result = createOperationCS(	405	CSTNode result = createOperationCS(
328	pathNameCS,	406	pathNameCS,
329	(SimpleNameCS)$getSym(3),	407	removeLastSimpleNameCS(pathNameCS),
330	new BasicEList(),	408	new BasicEList(),
331	null	409	null
332	);	410	);
333	setOffsets(result, pathNameCS, getIToken($getToken(4)));	411	setOffsets(result, pathNameCS, getIToken($getToken(2)));
334	$setResult(result);	412	$setResult(result);
335	$EndJava	413	$EndJava
336	./	414	./
Lines 375-407 Link Here
375	$EndJava	453	$EndJava
376	./	454	./
377		455
378	variableCS ::= IDENTIFIER ERROR_TOKEN	456	-- variableCS ::= notLiteralNorReservedSimpleNameCS ERROR_TOKEN
379	/.$BeginJava	457	-- /.$BeginJava
380	reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_VARIABLE_TYPE);	458	-- reportErrorTokenMessage($getToken(2), OCLParserErrors.MISSING_VARIABLE_TYPE);
381	CSTNode result = createVariableCS(	459	-- SimpleNameCS name = (SimpleNameCS)$getSym(1);
382	getTokenText($getToken(1)),	460	-- CSTNode result = createVariableCS(name.getValue());
383	null,	461	-- setOffsets(result, getIToken($getToken(1)), getIToken($getToken(2)));
384	null	462	-- $setResult(result);
385	);	463	-- $EndJava
386	setOffsets(result, getIToken($getToken(1)), getIToken($getToken(2)));	464	-- ./
387	$setResult(result);
388	$EndJava
389	./
390
391	variableExpCS ::= simpleNameCS '[' argumentsCS ERROR_TOKEN
392	/.$NewCase./
393	variableExpCS ::= keywordAsName1 '[' argumentsCS ERROR_TOKEN
394	/.$BeginJava
395	reportErrorTokenMessage($getToken(4), OCLParserErrors.MISSING_RBRACK);
396	CSTNode result = createVariableExpCS(
397	(SimpleNameCS)$getSym(1),
398	(EList)$getSym(3),
399	null
400	);
401	setOffsets(result, (CSTNode)$getSym(1), getIToken($getToken(4)));
402	$setResult(result);
403	$EndJava
404	./
405		465
406	variableListCS ::= ERROR_TOKEN	466	variableListCS ::= ERROR_TOKEN
407	/.$NewCase./	467	/.$NewCase./

Lines 67-73 Link Here

(-)src/org/eclipse/ocl/cst/util/CSTAdapterFactory.java (-20 lines)
67	import org.eclipse.ocl.cst.PropertyContextCS;	67	import org.eclipse.ocl.cst.PropertyContextCS;
68	import org.eclipse.ocl.cst.RealLiteralExpCS;	68	import org.eclipse.ocl.cst.RealLiteralExpCS;
69	import org.eclipse.ocl.cst.SimpleNameCS;	69	import org.eclipse.ocl.cst.SimpleNameCS;
70	import org.eclipse.ocl.cst.StateExpCS;
71	import org.eclipse.ocl.cst.StringLiteralExpCS;	70	import org.eclipse.ocl.cst.StringLiteralExpCS;
72	import org.eclipse.ocl.cst.TupleLiteralExpCS;	71	import org.eclipse.ocl.cst.TupleLiteralExpCS;
73	import org.eclipse.ocl.cst.TupleTypeCS;	72	import org.eclipse.ocl.cst.TupleTypeCS;
Lines 383-393 Link Here
383	}	382	}
384		383
385	@Override	384	@Override
386	public Adapter caseStateExpCS(StateExpCS object) {
387	return createStateExpCSAdapter();
388	}
389
390	@Override
391	public Adapter caseOCLDocumentCS(OCLDocumentCS object) {	385	public Adapter caseOCLDocumentCS(OCLDocumentCS object) {
392	return createOCLDocumentCSAdapter();	386	return createOCLDocumentCSAdapter();
393	}	387	}
Lines 1014-1033 Link Here
1014	}	1008	}
1015		1009
1016	/**	1010	/**
1017	* Creates a new adapter for an object of class '{@link org.eclipse.ocl.cst.StateExpCS <em>State Exp CS</em>}'.
1018	* <!-- begin-user-doc -->
1019	* This default implementation returns null so that we can easily ignore cases;
1020	* it's useful to ignore a case when inheritance will catch all the cases anyway.
1021	* <!-- end-user-doc -->
1022	* @return the new adapter.
1023	* @see org.eclipse.ocl.cst.StateExpCS
1024	* @generated
1025	*/
1026	public Adapter createStateExpCSAdapter() {
1027	return null;
1028	}
1029
1030	/**
1031	* Creates a new adapter for an object of class '{@link org.eclipse.ocl.cst.OCLDocumentCS <em>OCL Document CS</em>}'.	1011	* Creates a new adapter for an object of class '{@link org.eclipse.ocl.cst.OCLDocumentCS <em>OCL Document CS</em>}'.
1032	* <!-- begin-user-doc -->	1012	* <!-- begin-user-doc -->
1033	* This default implementation returns null so that we can easily ignore cases;	1013	* This default implementation returns null so that we can easily ignore cases;