Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/Version.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/Version.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/Version.java	(revision 12)
@@ -29,7 +29,7 @@
 public class Version {
 
 	public static final String s_releaseMajor = "3";
-	public static final String s_releaseMinor = "0";
+	public static final String s_releaseMinor = "1";
 
 	public static String asString() {
 		return s_releaseMajor + "." + s_releaseMinor;
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaResolveExpressionsVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaResolveExpressionsVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaResolveExpressionsVisitor.java	(revision 12)
@@ -77,6 +77,7 @@
 import org.momut.ooas.ast.types.IntType;
 import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.MapType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.NullType;
 import org.momut.ooas.ast.types.OoActionSystemType;
 import org.momut.ooas.ast.types.TupleType;
@@ -436,9 +437,19 @@
 			{
 				if (!Type.TypeEqual(item.type(), type))
 				{
-					final Expression cast = new UnaryOperator(ExpressionKind.Cast, item, item.line(), item.pos());
-					cast.SetType(type);
-					newitems.add(cast);
+					// one exception: lists will not be cast. instead we descend into the inner-most lists and statically update their inner types
+					if(item.kind() == ExpressionKind.ListConstr)
+					{
+						item.Accept(new OoaStaticListCastVisitor((ListType) type));
+						item.SetType(type);
+						newitems.add(item);
+					}
+					else
+					{
+						final Expression cast = new UnaryOperator(ExpressionKind.Cast, item, item.line(), item.pos());
+						cast.SetType(type);
+						newitems.add(cast);
+					}
 				}
 				else
 					newitems.add(item);
@@ -904,6 +915,13 @@
 		expression.SetLeftChild(lhs);
 
 
+		if (staticAccess) {
+			if (atype.kind() != TypeKind.MetaType)
+				return Error(access, "Expected meta type.");
+			atype = ((MetaType)atype).Type();
+		}
+
+
 		switch (atype.kind())
 		{
 		case OoActionSystemType:
@@ -957,7 +975,7 @@
 			break;
 		default:
 			/*error, we can not access an element with '.' in any other type*/
-			return Error(expression, "Expected: System, Enum, Func, or QR type");
+			return Error(expression, "Expected: System, Enum, or Function");
 		}
 
 		expression.SetType(expression.right().type());
@@ -1157,7 +1175,7 @@
 			if (lt.kind() != TypeKind.MapType)
 				return Error(expression, "Range restriction operator expects map on LHS");
 			if (rt.kind() != TypeKind.ListType)
-				return Error(expression, "Rangle restriction operator expects list on RHS");
+				return Error(expression, "Range restriction operator expects list on RHS");
 			final ListType rangelist = (ListType)rt;
 			domMap = (MapType)lt;
 			if (!Type.TypeEqual(rangelist.innerType(), domMap.fromType()))
@@ -1191,21 +1209,40 @@
 				return lhs;
 			if (la.innerType().kind() == TypeKind.Null || la.maxNumberOfElements() == 0)
 				return rhs;
-			if (!Type.TypeEqual(la.innerType(), lb.innerType()))
-				return Error(expression, String.format("Set/List concatenation expects two lists of same type. (%s <> %s)", la.toString(), lb.toString()));
-			ListType resultList = new ListType(la.innerType(),
-					la.maxNumberOfElements() + lb.maxNumberOfElements(), null);
-			expression.SetType(resultList);
+
+			if (!Type.TypeEqual(la.innerType(), lb.innerType())) {
+				final ListType coverType = (ListType) Type.CoverType(la, lb);
+				if(coverType == null)
+					return Error(expression, String.format("Set/List concatenation expects two lists of same type. (%s <> %s)", la.toString(), lb.toString())); // FIXME adjust error message
+
+				if(!Type.TypeEqual(la, coverType))
+					lhs.Accept(new OoaStaticListCastVisitor(coverType));
+				if(!Type.TypeEqual(lb, coverType))
+					rhs.Accept(new OoaStaticListCastVisitor(coverType));
+
+				expression.SetType(new ListType(coverType.innerType(), la.maxNumberOfElements() + lb.maxNumberOfElements(), null));
+			} else
+				expression.SetType(new ListType(la.innerType(), la.maxNumberOfElements() + lb.maxNumberOfElements(), null));
+
 			break;
 		case diff:       // list of A * list of A -> list of A (does not respect dupes)
-			if (lt.kind() != TypeKind.ListType ||
-			rt.kind() != TypeKind.ListType)
+			if (lt.kind() != TypeKind.ListType || rt.kind() != TypeKind.ListType)
 				return Error(expression, "Set difference expects two lists.");
 			la = (ListType)lt;
 			lb = (ListType)rt;
-			if (!Type.TypeEqual(la.innerType(), lb.innerType()))
-				return Error(expression, "Set difference expects two lists of same type.");
-			expression.SetType(la);
+			if (!Type.TypeEqual(la.innerType(), lb.innerType())) {
+				final ListType coverType = (ListType) Type.CoverType(la, lb);
+				if(coverType == null)
+					return Error(expression, "Set difference expects two lists of same type."); // FIXME adjust error message
+
+				if(!Type.TypeEqual(la, coverType))
+					lhs.Accept(new OoaStaticListCastVisitor(coverType));
+				if(!Type.TypeEqual(lb, coverType))
+					rhs.Accept(new OoaStaticListCastVisitor(coverType));
+
+				expression.SetType(coverType);
+			} else
+				expression.SetType(la);
 			break;
 		case inter:      // list of A * list of A -> list of A (does not respect dupes)
 			if (lt.kind() != TypeKind.ListType ||
@@ -1213,9 +1250,17 @@
 				return Error(expression, "Set intersection expects two lists.");
 			la = (ListType)lt;
 			lb = (ListType)rt;
-			if (!Type.TypeEqual(la.innerType(), lb.innerType()))
-				return Error(expression, "Set intersection expects two lists of same type.");
-			expression.SetType(la.maxNumberOfElements() > lb.maxNumberOfElements() ? la : lb);
+			if (!Type.TypeEqual(la.innerType(), lb.innerType())) {
+				final ListType coverType = (ListType) Type.CoverType(la, lb);
+				if(coverType == null)
+					return Error(expression, "Set intersection expects two lists of same type.");
+				if(!Type.TypeEqual(la, coverType))
+					lhs.Accept(new OoaStaticListCastVisitor(coverType));
+				if(!Type.TypeEqual(lb, coverType))
+					rhs.Accept(new OoaStaticListCastVisitor(coverType));
+				expression.SetType(coverType);
+			} else
+				expression.SetType(la.maxNumberOfElements() > lb.maxNumberOfElements() ? la : lb);
 			break;
 		case elemin:     // A * list of A -> bool
 		case notelemin:  // A * list of A -> bool
@@ -1231,13 +1276,20 @@
 			expression.SetType(new BoolType(null));
 			break;
 		case subset:     // list of A * list of A -> bool (does not respect dupes)
-			if (lt.kind() != TypeKind.ListType ||
-			rt.kind() != TypeKind.ListType)
+			if (lt.kind() != TypeKind.ListType || rt.kind() != TypeKind.ListType)
 				return Error(expression, "Subset operation expects two lists.");
 			la = (ListType)lt;
 			lb = (ListType)rt;
-			if (!Type.TypeEqual(la.innerType(), lb.innerType()))
-				return Error(expression, "Subset operation expects two lists of same type.");
+			if (!Type.TypeEqual(la.innerType(), lb.innerType())) {
+				final ListType coverType = (ListType) Type.CoverType(la, lb);
+				if(coverType == null)
+					return Error(expression, "Subset operation expects two lists of same type.");
+
+				if(!Type.TypeEqual(la, coverType))
+					lhs.Accept(new OoaStaticListCastVisitor(coverType));
+				if(!Type.TypeEqual(lb, coverType))
+					rhs.Accept(new OoaStaticListCastVisitor(coverType));
+			}
 			expression.SetType(new BoolType(null));
 			break;
 		case union:      // list of A * list of A -> list of A (does not respect dupes)
@@ -1252,11 +1304,18 @@
 			if (lb.innerType().kind() == TypeKind.Null || lb.maxNumberOfElements() == 0)
 				return lhs;
 
-			if (!Type.TypeEqual(la.innerType(), lb.innerType()))
-				return Error(expression, "Set union expects two lists of same type.");
-			resultList = new ListType(la.innerType(),
-					la.maxNumberOfElements() + lb.maxNumberOfElements(), null);
-			expression.SetType(resultList);
+			if (!Type.TypeEqual(la.innerType(), lb.innerType())) {
+				final ListType coverType = (ListType) Type.CoverType(la, lb);
+				if(coverType == null)
+					return Error(expression, "Set union expects two lists of same type.");
+				if(!Type.TypeEqual(la, coverType))
+					lhs.Accept(new OoaStaticListCastVisitor(coverType));
+				if(!Type.TypeEqual(lb, coverType))
+					rhs.Accept(new OoaStaticListCastVisitor(coverType));
+
+				expression.SetType(new ListType(coverType.innerType(), la.maxNumberOfElements() + lb.maxNumberOfElements(), null));
+			} else
+				expression.SetType(new ListType(la.innerType(), la.maxNumberOfElements() + lb.maxNumberOfElements(), null));
 			break;
 
 			/*numeric binary*/
@@ -1411,6 +1470,19 @@
 							return Error(expression, "Free variables on both sides of the equality sign in tuple constructors.");
 						m_matcherList.remove(rhs);
 					}
+
+					/* This adds support for "equality-style assignments" in expressions. Not yet supported by the backend though :(
+					if (lhs.type().kind() == TypeKind.Any || rhs.type().kind() == TypeKind.Any)
+					{
+						if (lhs.type().kind() == TypeKind.Any && rhs.type().kind() == TypeKind.Any)
+							return Error(expression, "Free variables on both sides of equality sign.");
+						// free var - so set type and mark initialized
+						final AnyType freevar =  lhs.type().kind() == TypeKind.Any ? (AnyType)lhs.type() : (AnyType)rhs.type();
+						freevar.VariableIdentifier().SetType(cover);
+						freevar.VariableIdentifier().SetInitialized(true);
+						lhs.SetType(cover);
+					}
+					*/
 				}
 
 				lhs = UnaryOperator.TryCoerceUp(lhs, cover);
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaTypeCheckVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaTypeCheckVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaTypeCheckVisitor.java	(revision 12)
@@ -49,6 +49,7 @@
 import org.momut.ooas.ast.statements.KillStatement;
 import org.momut.ooas.ast.statements.Statement;
 import org.momut.ooas.ast.types.FunctionType;
+import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.TypeKind;
 import org.momut.ooas.ast.types.Type;
 import org.momut.ooas.parser.ParserError;
@@ -390,18 +391,34 @@
 					Error(attributeIdentifier, String.format("Type mismatch in attribute initializer: %s ( %s := %s )", attributeIdentifier.toString(), idtype.toString(), acover.toString()));
 				else
 				{
-					final Expression constantvalue = attributeIdentifier.initializer().kind() == ExpressionKind.Value ? attributeIdentifier.initializer() : null;
-
 					if (!Type.TypeEqual(atype, acover))
 					{
-						final UnaryOperator cast = new UnaryOperator(ExpressionKind.Cast, attributeIdentifier.initializer(),
-								attributeIdentifier.initializer().line(), attributeIdentifier.initializer().pos());
-						cast.SetType(acover);
-						attributeIdentifier.SetInitializer(cast);
+						if(acover.kind() == TypeKind.ListType)
+						{
+							attributeIdentifier.initializer().Accept(new OoaStaticListCastVisitor((ListType) acover));
+
+							// now check whether the list lengths are ok
+							((ListType) atype).SetInnerType(((ListType) idtype).innerType());
+							final Type lengthCover = Type.CoverType(idtype, attributeIdentifier.initializer().type());
+							if (!Type.TypeEqual(atype, lengthCover)) {
+								final UnaryOperator cast = new UnaryOperator(ExpressionKind.Cast, attributeIdentifier.initializer(),
+										attributeIdentifier.initializer().line(), attributeIdentifier.initializer().pos());
+								cast.SetType(lengthCover);
+								attributeIdentifier.SetInitializer(cast);
+							}
+						}
+						else
+						{
+							final UnaryOperator cast = new UnaryOperator(ExpressionKind.Cast, attributeIdentifier.initializer(),
+									attributeIdentifier.initializer().line(), attributeIdentifier.initializer().pos());
+							cast.SetType(acover);
+							attributeIdentifier.SetInitializer(cast);
+						}
 					}
 
 					if (Type.FirstTypeLessRange(idtype, acover))
 					{
+						final Expression constantvalue = attributeIdentifier.initializer().kind() == ExpressionKind.Value ? attributeIdentifier.initializer() : null;
 						if (constantvalue == null)
 						{
 							Warning(attributeIdentifier, String.format("Assignment may over/underflow: %s := %s", idtype.toString(), acover.toString()));
@@ -416,17 +433,6 @@
 						}
 					}
 				}
-
-				/*
-
-
-                if (cover == null || !UlyssesType.TypeEqual(cover, idtype))
-                    Error(attributeIdentifier,
-                        String.Format("Type mismatch in attribute initializer: expected '%s', found '%s'",
-                            idtype.ToString(), atype.ToString()));
-                else
-                    attributeIdentifier.SetInitializer(UnaryOperator.CoerceUp(attributeIdentifier.initializer, idtype));
-				 * */
 			}
 		}
 	}
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/IAstVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/IAstVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/IAstVisitor.java	(revision 12)
@@ -79,6 +79,7 @@
 import org.momut.ooas.ast.types.IntType;
 import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.MapType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.NullType;
 import org.momut.ooas.ast.types.OoActionSystemType;
 import org.momut.ooas.ast.types.OpaqueType;
@@ -154,6 +155,7 @@
 	void visit(OpaqueType opaqueType);
 	void visit(AnyType anyType);
 	void visit(NullType nullType);
+	void visit(MetaType metaType);
 
 	void visit(BreakStatement breakStatement);
 }
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/expressions/TypeExpression.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/expressions/TypeExpression.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/expressions/TypeExpression.java	(revision 12)
@@ -28,6 +28,7 @@
 package org.momut.ooas.ast.expressions;
 
 import org.momut.ooas.ast.IAstVisitor;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.Type;
 
 ///////////////////////////////////////////////
@@ -35,24 +36,32 @@
 ///
 public class TypeExpression extends LeafExpression
 {
+	protected Type m_referredType;
+
+	public Type referredType() {return m_referredType;}
+//	public void setReferredType(Type aType) {m_referredType = aType;}
+
 	public TypeExpression(Type atype, int line, int pos)
 	{
 		super (LeafTypeEnum.type, ExpressionKind.Type, line, pos);
-		m_type = atype;
+		m_type = new MetaType(atype);
+		m_referredType = atype;
 	}
 
 	public TypeExpression(TypeExpression toCopy)
 	{
 		super (toCopy);
+		m_referredType = toCopy.m_referredType;
 	}
 
 	@Override
-	public /*override*/ Expression Clone()
+	public Expression Clone()
 	{
 		return new TypeExpression(this);
 	}
 
-	public /*override*/ void Accept(IAstVisitor visitor)
+	@Override
+	public void Accept(IAstVisitor visitor)
 	{
 		visitor.visit(this);
 	}
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/MetaType.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/MetaType.java	(nonexistent)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/MetaType.java	(revision 12)
@@ -0,0 +1,51 @@
+/**
+  *
+  *                      OOAS Compiler
+  *
+  * Copyright 2015, AIT Austrian Institute of Technology. All rights reserved.
+  *
+  * SEE THE "LICENSE" FILE FOR THE TERMS UNDER WHICH THIS FILE IS PROVIDED.
+  *
+  * If you modify the file please update the list of contributors below to in-
+  * clude your name. Please also stick to the coding convention of using TABs
+  * to do the basic (block-level) indentation and spaces for anything after
+  * that. (Enable the display of special chars and it should be pretty obvious
+  * what this means.) Also, remove all trailing whitespace.
+  *
+  * Contributors:
+  *               Willibald Krenn (AIT)
+  */
+
+
+package org.momut.ooas.ast.types;
+
+import org.momut.ooas.ast.IAstVisitor;
+
+///////////////////////////////////////////////
+///  Special type: MetaType (type of <Type> construct)
+///
+public final class MetaType extends Type
+{
+	private final Type m_type;
+
+	public Type Type() { return m_type; }
+
+	public MetaType(Type aType)
+	{
+		super(TypeKind.MetaType, null);
+		m_type = aType;
+	}
+
+	@Override
+	public void Accept(IAstVisitor visitor)
+	{
+		visitor.visit(this);
+	}
+
+	@Override
+	public String AnonymousName()
+	{
+		return "meta_" + m_type.AnonymousName();
+	}
+
+}
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/OoActionSystemType.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/OoActionSystemType.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/OoActionSystemType.java	(revision 12)
@@ -161,5 +161,5 @@
 	public int valueCount() {
 		return m_objects.size() + m_derivedObjects.size() + 1;
 	}
-	
+
 }
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/Type.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/Type.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/Type.java	(revision 12)
@@ -284,15 +284,16 @@
 						 * A cover type of a list must not change the size of the inner type. Mostly what is
 						 * allowed to change is the list length.
 						 */
-						Type subtype = listt1.innerType();
-						final boolean castAllowed = TypeEqual(listt1.innerType(), listt2.innerType())
-						          || (    (listt1.innerType().kind() == TypeKind.OoActionSystemType)
-						               && (subtype = Type.CoverType(listt1.innerType(), listt2.innerType())) != null);
+						final Type innerType1 = listt1.innerType();
+						final Type innerType2 = listt2.innerType();
+						Type resultInner = innerType1;
+						final boolean castAllowed = TypeEqual(innerType1, innerType2)
+						          ||     (resultInner = Type.CoverType(innerType1, innerType2)) != null;
 						if (castAllowed){
 							final int maxelems = listt1.maxNumberOfElements() > listt2.maxNumberOfElements()
 							                ? listt1.maxNumberOfElements()
 							                : listt2.maxNumberOfElements();
-							return new ListType(subtype, maxelems, null);
+							return new ListType(resultInner, maxelems, null);
 						} else
 							return null;
 
@@ -438,6 +439,8 @@
 				return false;
 			case OoActionSystemType:
 				return false;
+			case MetaType:
+				return Type.FirstTypeLessRange( ((MetaType)type1).Type() , ((MetaType)type2).Type());
 			case OpaqueType:
 				assert(false);
 				return false;
@@ -494,6 +497,8 @@
 				return true;
 			case OoActionSystemType:
 				return type1 == type2; // ref equ.
+			case MetaType:
+				return Type.TypeEqualByKind( ((MetaType)type1).Type() , ((MetaType)type2).Type());
 			case OpaqueType:
 				assert(false);
 				return false;
@@ -569,6 +574,8 @@
 				return true;
 			case OoActionSystemType:
 				return type1 == type2; // ref equ. // || Covariance((OoActionSystemType)type1, (OoActionSystemType)type2);
+			case MetaType:
+				return Type.TypeEqual( ((MetaType)type1).Type() , ((MetaType)type2).Type());
 			case OpaqueType:
 				assert(false);
 				return false;
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/TypeKind.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/TypeKind.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/ast/types/TypeKind.java	(revision 12)
@@ -35,7 +35,7 @@
 	EnumeratedType(3),
 	ListType(4),
 	MapType(5),
-//	QrType(6),               // no longer supported
+	MetaType(6),
 	TupleType(7),
 	FunctionType(8),
 	OoActionSystemType(9),
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/IAstDuplicator.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/IAstDuplicator.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/IAstDuplicator.java	(revision 12)
@@ -242,6 +242,13 @@
 			T innerTypeRef,
 			int maxNumberOfElements);
 
+	/** Initialize a meta type */
+	boolean initMetaType(
+			T typeId,
+			T identifierRef,
+			boolean anonymousType,
+			T innerTypeRef);
+
 	/** Initialize a tuple type */
 	boolean initTupleType(
 			T typeId,
@@ -367,7 +374,8 @@
 			int pos,
 			T typeRef,
 			T callTargetsIdentifierListRef,
-			T symbTabRef);
+			T symbTabRef,
+			T referredTypeRef);
 
 	/** Initialize an identifier expression */
 	boolean initIdentifierExpression(
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/OoaAstEmitter.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/OoaAstEmitter.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/OoaAstEmitter.java	(revision 12)
@@ -93,6 +93,7 @@
 import org.momut.ooas.ast.types.IntType;
 import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.MapType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.NullType;
 import org.momut.ooas.ast.types.OoActionSystemInstance;
 import org.momut.ooas.ast.types.OoActionSystemType;
@@ -645,7 +646,23 @@
 				listType.maxNumberOfElements());
 	}
 
+	@Override
+	public void visit(MetaType metaType)
+	{
+		final T type = createType(metaType);
 
+		final Identifier id = metaType.identifier();
+		VisitSub(id, metaType);
+		VisitSub(metaType.Type(), metaType);
+
+		m_copier.initMetaType(
+				type,
+				m_convertedIdentifiers.get(id),
+				metaType.isAnonymousType(),
+				m_convertedTypes.get(metaType.Type()));
+	}
+
+
 	@Override
 	public void visit(TupleType tupleType)
 	{
@@ -1007,6 +1024,8 @@
 	{
 		final T expr = createExpression(typeExpression);
 		final ExprData d = visitBasicExpression(typeExpression);
+		VisitSub(typeExpression.referredType(), typeExpression);
+
 		m_copier.initTypeExpression(
 				expr,
 				d.line,
@@ -1013,7 +1032,8 @@
 				d.pos,
 				d.typeRef,
 				d.callTargetsIdentifierListRef,
-				d.symbTabRef);
+				d.symbTabRef,
+				m_convertedTypes.get(typeExpression.referredType()));
 	}
 
 	@Override
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/AstProtoBufRecorder.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/AstProtoBufRecorder.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/AstProtoBufRecorder.java	(revision 12)
@@ -83,7 +83,7 @@
 	}
 
 	private PBParameter.Builder stringParameter(String text){
-		return PBParameter.newBuilder().setLiteralValue(text);
+		return PBParameter.newBuilder().setLiteralValue(text == null ? "" : text);
 	}
 
 	private PBParameter.Builder boolParameter(boolean value){
@@ -594,6 +594,22 @@
 	}
 
 	@Override
+	public boolean initMetaType(Long typeId, Long identifierRef,
+			boolean anonymousType, Long innerTypeRef) {
+
+//		DLL bool TIRESIAS_INIT_METATYPE(void* context, void* typeId,
+//		void* identifierRef, bool anonymousType,
+//		void* innerTypeRef);
+		boolCall(PBTypes.TIRESIAS_INIT_METATYPE
+				, referenceParameter(typeId)
+				, referenceParameter(identifierRef)
+				, boolParameter(anonymousType)
+				, referenceParameter(innerTypeRef));
+
+		return true;
+	}
+
+	@Override
 	public boolean initTupleType(Long typeId, Long identifierRef,
 			boolean anonymousType, Long typeListRef) {
 
@@ -840,11 +856,11 @@
 
 	@Override
 	public boolean initTypeExpression(Long expr, int line, int pos,
-			Long typeRef, Long callTargetsIdentifierListRef, Long symbTabRef) {
+			Long typeRef, Long callTargetsIdentifierListRef, Long symbTabRef, Long referredTypeRef) {
 
 //		DLL bool TIRESIAS_INIT_TYPEEXPRESSION(void* context,
 //				void* expr, std::int32_t line, std::int32_t pos, void* typeRef,
-//				void* callTargetsIdentifierListRef, void* symbTabRef);
+//				void* callTargetsIdentifierListRef, void* symbTabRef, void* referredTypeRef);
 
 		boolCall(PBExpressions.TIRESIAS_INIT_TYPEEXPRESSION
 				, referenceParameter(expr)
@@ -852,7 +868,8 @@
 				, int32Parameter(pos)
 				, referenceParameter(typeRef)
 				, referenceParameter(callTargetsIdentifierListRef)
-				, referenceParameter(symbTabRef));
+				, referenceParameter(symbTabRef)
+				, referenceParameter(referredTypeRef));
 		return true;
 	}
 
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/gen/FunctionNames.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/gen/FunctionNames.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/gen/FunctionNames.java	(revision 12)
@@ -1,30 +1,3 @@
-/**
-  *
-  *                      OOAS Compiler
-  *
-  *       Copyright 2015, AIT Austrian Institute of Technology.
-  * This code is based on the C# Version of the OOAS Compiler, which is
-  * copyright 2015 by the Institute of Software Technology, Graz University
-  * of Technology with portions copyright by the AIT Austrian Institute of
-  * Technology. All rights reserved.
-  *
-  * SEE THE "LICENSE" FILE FOR THE TERMS UNDER WHICH THIS FILE IS PROVIDED.
-  *
-  * If you modify the file please update the list of contributors below to in-
-  * clude your name. Please also stick to the coding convention of using TABs
-  * to do the basic (block-level) indentation and spaces for anything after
-  * that. (Enable the display of special chars and it should be pretty obvious
-  * what this means.) Also, remove all trailing whitespace.
-  *
-  * Contributors:
-  *               Willibald Krenn (AIT)
-  *               Stephan Zimmerer (AIT)
-  *               Markus Demetz (AIT)
-  *               Christoph Czurda (AIT)
-  *
-  */
-
-
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: FunctionNames.proto
 
@@ -560,6 +533,10 @@
      * <code>TIRESIAS_INIT_NULLTYPE = 0;</code>
      */
     TIRESIAS_INIT_NULLTYPE(9, 0),
+    /**
+     * <code>TIRESIAS_INIT_METATYPE = 10;</code>
+     */
+    TIRESIAS_INIT_METATYPE(10, 10),
     ;
 
     /**
@@ -602,6 +579,10 @@
      * <code>TIRESIAS_INIT_NULLTYPE = 0;</code>
      */
     public static final int TIRESIAS_INIT_NULLTYPE_VALUE = 0;
+    /**
+     * <code>TIRESIAS_INIT_METATYPE = 10;</code>
+     */
+    public static final int TIRESIAS_INIT_METATYPE_VALUE = 10;
 
 
     public final int getNumber() { return value; }
@@ -618,6 +599,7 @@
         case 8: return TIRESIAS_INIT_ACTIONSYSTEMINSTANCE;
         case 9: return TIRESIAS_INIT_ACTIONSYSTEMTYPE;
         case 0: return TIRESIAS_INIT_NULLTYPE;
+        case 10: return TIRESIAS_INIT_METATYPE;
         default: return null;
       }
     }
@@ -1060,7 +1042,7 @@
       "\020\007\022 \n\034TIRESIAS_INIT_SELFIDENTIFIER\020\010\022\"\n\036" +
       "TIRESIAS_INIT_METHODIDENTIFIER\020\t\022\030\n\024TIRE" +
       "SIAS_INIT_MODULE\020\n\022\034\n\030TIRESIAS_INIT_MAIN" +
-      "MODULE\020\000*\277\002\n\007PBTypes\022\031\n\025TIRESIAS_INIT_IN",
+      "MODULE\020\000*\333\002\n\007PBTypes\022\031\n\025TIRESIAS_INIT_IN",
       "TTYPE\020\001\022\032\n\026TIRESIAS_INIT_BOOLTYPE\020\002\022 \n\034T" +
       "IRESIAS_INIT_VALUEDENUMTYPE\020\003\022\032\n\026TIRESIA" +
       "S_INIT_ENUMTYPE\020\004\022\032\n\026TIRESIAS_INIT_LISTT" +
@@ -1068,39 +1050,40 @@
       "RESIAS_INIT_FUNCTIONTYPE\020\007\022&\n\"TIRESIAS_I" +
       "NIT_ACTIONSYSTEMINSTANCE\020\010\022\"\n\036TIRESIAS_I" +
       "NIT_ACTIONSYSTEMTYPE\020\t\022\032\n\026TIRESIAS_INIT_" +
-      "NULLTYPE\020\000*\210\002\n\014PBStatements\022\026\n\022TIRESIAS_" +
-      "INIT_SKIP\020\003\022\027\n\023TIRESIAS_INIT_BREAK\020\004\022\027\n\023" +
-      "TIRESIAS_INIT_ABORT\020\005\022\035\n\031TIRESIAS_INIT_N",
-      "ONDETBLOCK\020\006\022\032\n\026TIRESIAS_INIT_SEQBLOCK\020\007" +
-      "\022\033\n\027TIRESIAS_INIT_PRIOBLOCK\020\010\022 \n\034TIRESIA" +
-      "S_INIT_GUARDEDCOMMAND\020\002\022\034\n\030TIRESIAS_INIT" +
-      "_ASSIGNMENT\020\001\022\026\n\022TIRESIAS_INIT_CALL\020\000*\340\004" +
-      "\n\rPBExpressions\022 \n\034TIRESIAS_INIT_TYPEEXP" +
-      "RESSION\020\004\022&\n\"TIRESIAS_INIT_IDENTIFIEREXP" +
-      "RESSION\020\005\022!\n\035TIRESIAS_INIT_UNARYEXPRESSI" +
-      "ON\020\006\022\"\n\036TIRESIAS_INIT_BINARYEXPRESSION\020\007" +
-      "\022#\n\037TIRESIAS_INIT_TERNARYEXPRESSION\020\010\022$\n" +
-      " TIRESIAS_INIT_INTVALUEEXPRESSION\020\t\022%\n!T",
-      "IRESIAS_INIT_BOOLVALUEEXPRESSION\020\n\022$\n TI" +
-      "RESIAS_INIT_REFVALUEEXPRESSION\020\013\022!\n\035TIRE" +
-      "SIAS_INIT_LISTCONSTRUCTOR\020\014\022 \n\034TIRESIAS_" +
-      "INIT_SETCONSTRUCTOR\020\r\022\"\n\036TIRESIAS_INIT_T" +
-      "UPLECONSTRUCTOR\020\016\022\"\n\036TIRESIAS_INIT_ACCES" +
-      "SEXPRESSION\020\017\022*\n&TIRESIAS_INIT_TUPLEMAPA" +
-      "CCESSEXPRESSION\020\003\022 \n\034TIRESIAS_INIT_CALLE" +
-      "XPRESSION\020\002\022&\n\"TIRESIAS_INIT_QUANTIFIERE" +
-      "XPRESSION\020\001\022#\n\037TIRESIAS_INIT_OBJECTCONST" +
-      "RUCTOR\020\000BA\n0org.momut.ooas.argos.c",
-      "odegen.serialize.genB\rFunctionNames"
+      "NULLTYPE\020\000\022\032\n\026TIRESIAS_INIT_METATYPE\020\n*\210" +
+      "\002\n\014PBStatements\022\026\n\022TIRESIAS_INIT_SKIP\020\003\022" +
+      "\027\n\023TIRESIAS_INIT_BREAK\020\004\022\027\n\023TIRESIAS_INI",
+      "T_ABORT\020\005\022\035\n\031TIRESIAS_INIT_NONDETBLOCK\020\006" +
+      "\022\032\n\026TIRESIAS_INIT_SEQBLOCK\020\007\022\033\n\027TIRESIAS" +
+      "_INIT_PRIOBLOCK\020\010\022 \n\034TIRESIAS_INIT_GUARD" +
+      "EDCOMMAND\020\002\022\034\n\030TIRESIAS_INIT_ASSIGNMENT\020" +
+      "\001\022\026\n\022TIRESIAS_INIT_CALL\020\000*\340\004\n\rPBExpressi" +
+      "ons\022 \n\034TIRESIAS_INIT_TYPEEXPRESSION\020\004\022&\n" +
+      "\"TIRESIAS_INIT_IDENTIFIEREXPRESSION\020\005\022!\n" +
+      "\035TIRESIAS_INIT_UNARYEXPRESSION\020\006\022\"\n\036TIRE" +
+      "SIAS_INIT_BINARYEXPRESSION\020\007\022#\n\037TIRESIAS" +
+      "_INIT_TERNARYEXPRESSION\020\010\022$\n TIRESIAS_IN",
+      "IT_INTVALUEEXPRESSION\020\t\022%\n!TIRESIAS_INIT" +
+      "_BOOLVALUEEXPRESSION\020\n\022$\n TIRESIAS_INIT_" +
+      "REFVALUEEXPRESSION\020\013\022!\n\035TIRESIAS_INIT_LI" +
+      "STCONSTRUCTOR\020\014\022 \n\034TIRESIAS_INIT_SETCONS" +
+      "TRUCTOR\020\r\022\"\n\036TIRESIAS_INIT_TUPLECONSTRUC" +
+      "TOR\020\016\022\"\n\036TIRESIAS_INIT_ACCESSEXPRESSION\020" +
+      "\017\022*\n&TIRESIAS_INIT_TUPLEMAPACCESSEXPRESS" +
+      "ION\020\003\022 \n\034TIRESIAS_INIT_CALLEXPRESSION\020\002\022" +
+      "&\n\"TIRESIAS_INIT_QUANTIFIEREXPRESSION\020\001\022" +
+      "#\n\037TIRESIAS_INIT_OBJECTCONSTRUCTOR\020\000B8\n\'",
+      "org.momut.ooas.codegen.ast.protobuf.genB" +
+      "\rFunctionNames"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          return null;
-        }
-      };
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/gen/RecordedAstTraversal.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/gen/RecordedAstTraversal.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/ast/protobuf/gen/RecordedAstTraversal.java	(revision 12)
@@ -1,30 +1,3 @@
-/**
-  *
-  *                      OOAS Compiler
-  *
-  *       Copyright 2015, AIT Austrian Institute of Technology.
-  * This code is based on the C# Version of the OOAS Compiler, which is
-  * copyright 2015 by the Institute of Software Technology, Graz University
-  * of Technology with portions copyright by the AIT Austrian Institute of
-  * Technology. All rights reserved.
-  *
-  * SEE THE "LICENSE" FILE FOR THE TERMS UNDER WHICH THIS FILE IS PROVIDED.
-  *
-  * If you modify the file please update the list of contributors below to in-
-  * clude your name. Please also stick to the coding convention of using TABs
-  * to do the basic (block-level) indentation and spaces for anything after
-  * that. (Enable the display of special chars and it should be pretty obvious
-  * what this means.) Also, remove all trailing whitespace.
-  *
-  * Contributors:
-  *               Willibald Krenn (AIT)
-  *               Stephan Zimmerer (AIT)
-  *               Markus Demetz (AIT)
-  *               Christoph Czurda (AIT)
-  *
-  */
-
-
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: Record.proto
 
@@ -121,10 +94,10 @@
     // @@protoc_insertion_point(enum_scope:serialize.PBReturnType)
   }
 
-  public interface PBParameterOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PBParameterOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:serialize.PBParameter)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional uint64 uint64_value = 1;
     /**
      * <code>optional uint64 uint64_value = 1;</code>
      *
@@ -142,7 +115,6 @@
      */
     long getUint64Value();
 
-    // optional string literal_value = 2;
     /**
      * <code>optional string literal_value = 2;</code>
      */
@@ -157,7 +129,6 @@
     com.google.protobuf.ByteString
         getLiteralValueBytes();
 
-    // optional bool bool_value = 3;
     /**
      * <code>optional bool bool_value = 3;</code>
      */
@@ -167,7 +138,6 @@
      */
     boolean getBoolValue();
 
-    // optional int32 int32_value = 4;
     /**
      * <code>optional int32 int32_value = 4;</code>
      */
@@ -177,7 +147,6 @@
      */
     int getInt32Value();
 
-    // optional uint32 uint32_value = 5;
     /**
      * <code>optional uint32 uint32_value = 5;</code>
      */
@@ -191,8 +160,9 @@
    * Protobuf type {@code serialize.PBParameter}
    */
   public static final class PBParameter extends
-      com.google.protobuf.GeneratedMessage
-      implements PBParameterOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:serialize.PBParameter)
+      PBParameterOrBuilder {
     // Use PBParameter.newBuilder() to construct.
     private PBParameter(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -221,9 +191,7 @@
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       initFields();
-      @SuppressWarnings("unused")
-	final
-	int mutable_bitField0_ = 0;
+//      int mutable_bitField0_ = 0;
       final com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -247,8 +215,9 @@
               break;
             }
             case 18: {
+              final com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
-              literalValue_ = input.readBytes();
+              literalValue_ = bs;
               break;
             }
             case 24: {
@@ -308,7 +277,6 @@
     }
 
     private int bitField0_;
-    // optional uint64 uint64_value = 1;
     public static final int UINT64_VALUE_FIELD_NUMBER = 1;
     private long uint64Value_;
     /**
@@ -334,7 +302,6 @@
       return uint64Value_;
     }
 
-    // optional string literal_value = 2;
     public static final int LITERAL_VALUE_FIELD_NUMBER = 2;
     private java.lang.Object literalValue_;
     /**
@@ -380,7 +347,6 @@
       }
     }
 
-    // optional bool bool_value = 3;
     public static final int BOOL_VALUE_FIELD_NUMBER = 3;
     private boolean boolValue_;
     /**
@@ -398,7 +364,6 @@
       return boolValue_;
     }
 
-    // optional int32 int32_value = 4;
     public static final int INT32_VALUE_FIELD_NUMBER = 4;
     private int int32Value_;
     /**
@@ -416,7 +381,6 @@
       return int32Value_;
     }
 
-    // optional uint32 uint32_value = 5;
     public static final int UINT32_VALUE_FIELD_NUMBER = 5;
     private int uint32Value_;
     /**
@@ -445,7 +409,8 @@
     @Override
 	public final boolean isInitialized() {
       final byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -584,8 +549,9 @@
      * Protobuf type {@code serialize.PBParameter}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameterOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:serialize.PBParameter)
+        org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameterOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.internal_static_serialize_PBParameter_descriptor;
@@ -599,7 +565,7 @@
                 org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameter.class, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameter.Builder.class);
       }
 
-      // Construct using org.momut.ooas.argos.codegen.serialize.gen.RecordedAstTraversal.PBParameter.newBuilder()
+      // Construct using org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -746,7 +712,6 @@
       }
       private int bitField0_;
 
-      // optional uint64 uint64_value = 1;
       private long uint64Value_ ;
       /**
        * <code>optional uint64 uint64_value = 1;</code>
@@ -797,7 +762,6 @@
         return this;
       }
 
-      // optional string literal_value = 2;
       private java.lang.Object literalValue_ = "";
       /**
        * <code>optional string literal_value = 2;</code>
@@ -813,9 +777,12 @@
 	public java.lang.String getLiteralValue() {
         final java.lang.Object ref = literalValue_;
         if (!(ref instanceof java.lang.String)) {
-          final java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          literalValue_ = s;
+          final com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          final java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            literalValue_ = s;
+          }
           return s;
         } else {
           return (java.lang.String) ref;
@@ -874,7 +841,6 @@
         return this;
       }
 
-      // optional bool bool_value = 3;
       private boolean boolValue_ ;
       /**
        * <code>optional bool bool_value = 3;</code>
@@ -909,7 +875,6 @@
         return this;
       }
 
-      // optional int32 int32_value = 4;
       private int int32Value_ ;
       /**
        * <code>optional int32 int32_value = 4;</code>
@@ -944,7 +909,6 @@
         return this;
       }
 
-      // optional uint32 uint32_value = 5;
       private int uint32Value_ ;
       /**
        * <code>optional uint32 uint32_value = 5;</code>
@@ -990,10 +954,10 @@
     // @@protoc_insertion_point(class_scope:serialize.PBParameter)
   }
 
-  public interface PBReturnValueOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PBReturnValueOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:serialize.PBReturnValue)
+      com.google.protobuf.MessageOrBuilder {
 
-    // required .serialize.PBReturnType return_type = 1;
     /**
      * <code>required .serialize.PBReturnType return_type = 1;</code>
      */
@@ -1003,7 +967,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnType getReturnType();
 
-    // optional uint64 return_id = 2;
     /**
      * <code>optional uint64 return_id = 2;</code>
      */
@@ -1017,8 +980,9 @@
    * Protobuf type {@code serialize.PBReturnValue}
    */
   public static final class PBReturnValue extends
-      com.google.protobuf.GeneratedMessage
-      implements PBReturnValueOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:serialize.PBReturnValue)
+      PBReturnValueOrBuilder {
     // Use PBReturnValue.newBuilder() to construct.
     private PBReturnValue(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1047,9 +1011,7 @@
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       initFields();
-      @SuppressWarnings("unused")
-	final
-	int mutable_bitField0_ = 0;
+//      int mutable_bitField0_ = 0;
       final com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1125,7 +1087,6 @@
     }
 
     private int bitField0_;
-    // required .serialize.PBReturnType return_type = 1;
     public static final int RETURN_TYPE_FIELD_NUMBER = 1;
     private org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnType returnType_;
     /**
@@ -1143,7 +1104,6 @@
       return returnType_;
     }
 
-    // optional uint64 return_id = 2;
     public static final int RETURN_ID_FIELD_NUMBER = 2;
     private long returnId_;
     /**
@@ -1169,7 +1129,8 @@
     @Override
 	public final boolean isInitialized() {
       final byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (!hasReturnType()) {
         memoizedIsInitialized = 0;
@@ -1291,8 +1252,9 @@
      * Protobuf type {@code serialize.PBReturnValue}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValueOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:serialize.PBReturnValue)
+        org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValueOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.internal_static_serialize_PBReturnValue_descriptor;
@@ -1306,7 +1268,7 @@
                 org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue.class, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue.Builder.class);
       }
 
-      // Construct using org.momut.ooas.argos.codegen.serialize.gen.RecordedAstTraversal.PBReturnValue.newBuilder()
+      // Construct using org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1428,7 +1390,6 @@
       }
       private int bitField0_;
 
-      // required .serialize.PBReturnType return_type = 1;
       private org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnType returnType_ = org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnType.type_voidPointer;
       /**
        * <code>required .serialize.PBReturnType return_type = 1;</code>
@@ -1466,7 +1427,6 @@
         return this;
       }
 
-      // optional uint64 return_id = 2;
       private long returnId_ ;
       /**
        * <code>optional uint64 return_id = 2;</code>
@@ -1512,10 +1472,10 @@
     // @@protoc_insertion_point(class_scope:serialize.PBReturnValue)
   }
 
-  public interface PBFunctionCallOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PBFunctionCallOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:serialize.PBFunctionCall)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional .serialize.PBAdd add = 1;
     /**
      * <code>optional .serialize.PBAdd add = 1;</code>
      */
@@ -1525,7 +1485,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAdd getAdd();
 
-    // optional .serialize.PBAllocation allocate = 2;
     /**
      * <code>optional .serialize.PBAllocation allocate = 2;</code>
      */
@@ -1535,7 +1494,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAllocation getAllocate();
 
-    // optional .serialize.PBIdentifiers identifier = 3;
     /**
      * <code>optional .serialize.PBIdentifiers identifier = 3;</code>
      */
@@ -1545,7 +1503,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBIdentifiers getIdentifier();
 
-    // optional .serialize.PBTypes type = 4;
     /**
      * <code>optional .serialize.PBTypes type = 4;</code>
      */
@@ -1555,7 +1512,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBTypes getType();
 
-    // optional .serialize.PBStatements statement = 5;
     /**
      * <code>optional .serialize.PBStatements statement = 5;</code>
      */
@@ -1565,7 +1521,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBStatements getStatement();
 
-    // optional .serialize.PBExpressions expression = 6;
     /**
      * <code>optional .serialize.PBExpressions expression = 6;</code>
      */
@@ -1575,7 +1530,6 @@
      */
     org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBExpressions getExpression();
 
-    // repeated .serialize.PBParameter parameters = 7;
     /**
      * <code>repeated .serialize.PBParameter parameters = 7;</code>
      */
@@ -1600,7 +1554,6 @@
     org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameterOrBuilder getParametersOrBuilder(
         int index);
 
-    // required .serialize.PBReturnValue return_value = 8;
     /**
      * <code>required .serialize.PBReturnValue return_value = 8;</code>
      */
@@ -1618,8 +1571,9 @@
    * Protobuf type {@code serialize.PBFunctionCall}
    */
   public static final class PBFunctionCall extends
-      com.google.protobuf.GeneratedMessage
-      implements PBFunctionCallOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:serialize.PBFunctionCall)
+      PBFunctionCallOrBuilder {
     // Use PBFunctionCall.newBuilder() to construct.
     private PBFunctionCall(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1798,7 +1752,6 @@
     }
 
     private int bitField0_;
-    // optional .serialize.PBAdd add = 1;
     public static final int ADD_FIELD_NUMBER = 1;
     private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAdd add_;
     /**
@@ -1816,7 +1769,6 @@
       return add_;
     }
 
-    // optional .serialize.PBAllocation allocate = 2;
     public static final int ALLOCATE_FIELD_NUMBER = 2;
     private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAllocation allocate_;
     /**
@@ -1834,7 +1786,6 @@
       return allocate_;
     }
 
-    // optional .serialize.PBIdentifiers identifier = 3;
     public static final int IDENTIFIER_FIELD_NUMBER = 3;
     private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBIdentifiers identifier_;
     /**
@@ -1852,7 +1803,6 @@
       return identifier_;
     }
 
-    // optional .serialize.PBTypes type = 4;
     public static final int TYPE_FIELD_NUMBER = 4;
     private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBTypes type_;
     /**
@@ -1870,7 +1820,6 @@
       return type_;
     }
 
-    // optional .serialize.PBStatements statement = 5;
     public static final int STATEMENT_FIELD_NUMBER = 5;
     private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBStatements statement_;
     /**
@@ -1888,7 +1837,6 @@
       return statement_;
     }
 
-    // optional .serialize.PBExpressions expression = 6;
     public static final int EXPRESSION_FIELD_NUMBER = 6;
     private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBExpressions expression_;
     /**
@@ -1906,7 +1854,6 @@
       return expression_;
     }
 
-    // repeated .serialize.PBParameter parameters = 7;
     public static final int PARAMETERS_FIELD_NUMBER = 7;
     private java.util.List<org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameter> parameters_;
     /**
@@ -1947,7 +1894,6 @@
       return parameters_.get(index);
     }
 
-    // required .serialize.PBReturnValue return_value = 8;
     public static final int RETURN_VALUE_FIELD_NUMBER = 8;
     private org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue returnValue_;
     /**
@@ -1986,7 +1932,8 @@
     @Override
 	public final boolean isInitialized() {
       final byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (!hasReturnValue()) {
         memoizedIsInitialized = 0;
@@ -2154,8 +2101,9 @@
      * Protobuf type {@code serialize.PBFunctionCall}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCallOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:serialize.PBFunctionCall)
+        org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCallOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.internal_static_serialize_PBFunctionCall_descriptor;
@@ -2169,7 +2117,7 @@
                 org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCall.class, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCall.Builder.class);
       }
 
-      // Construct using org.momut.ooas.argos.codegen.serialize.gen.RecordedAstTraversal.PBFunctionCall.newBuilder()
+      // Construct using org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCall.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2391,7 +2339,6 @@
       }
       private int bitField0_;
 
-      // optional .serialize.PBAdd add = 1;
       private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAdd add_ = org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAdd.TIRESIAS_ADD_IDENTIFIERTOLIST;
       /**
        * <code>optional .serialize.PBAdd add = 1;</code>
@@ -2429,7 +2376,6 @@
         return this;
       }
 
-      // optional .serialize.PBAllocation allocate = 2;
       private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAllocation allocate_ = org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBAllocation.TIRESIAS_CREATE_IDENTIFIER;
       /**
        * <code>optional .serialize.PBAllocation allocate = 2;</code>
@@ -2467,7 +2413,6 @@
         return this;
       }
 
-      // optional .serialize.PBIdentifiers identifier = 3;
       private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBIdentifiers identifier_ = org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBIdentifiers.TIRESIAS_INIT_ENUMIDENTIFIER;
       /**
        * <code>optional .serialize.PBIdentifiers identifier = 3;</code>
@@ -2505,7 +2450,6 @@
         return this;
       }
 
-      // optional .serialize.PBTypes type = 4;
       private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBTypes type_ = org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBTypes.TIRESIAS_INIT_INTTYPE;
       /**
        * <code>optional .serialize.PBTypes type = 4;</code>
@@ -2543,7 +2487,6 @@
         return this;
       }
 
-      // optional .serialize.PBStatements statement = 5;
       private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBStatements statement_ = org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBStatements.TIRESIAS_INIT_SKIP;
       /**
        * <code>optional .serialize.PBStatements statement = 5;</code>
@@ -2581,7 +2524,6 @@
         return this;
       }
 
-      // optional .serialize.PBExpressions expression = 6;
       private org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBExpressions expression_ = org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.PBExpressions.TIRESIAS_INIT_TYPEEXPRESSION;
       /**
        * <code>optional .serialize.PBExpressions expression = 6;</code>
@@ -2619,7 +2561,6 @@
         return this;
       }
 
-      // repeated .serialize.PBParameter parameters = 7;
       private java.util.List<org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameter> parameters_ =
         java.util.Collections.emptyList();
       private void ensureParametersIsMutable() {
@@ -2764,7 +2705,8 @@
           java.lang.Iterable<? extends org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBParameter> values) {
         if (parametersBuilder_ == null) {
           ensureParametersIsMutable();
-          super.addAll(values, parameters_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, parameters_);
           onChanged();
         } else {
           parametersBuilder_.addAllMessages(values);
@@ -2864,7 +2806,6 @@
         return parametersBuilder_;
       }
 
-      // required .serialize.PBReturnValue return_value = 8;
       private org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue returnValue_ = org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue.Builder, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValueOrBuilder> returnValueBuilder_;
@@ -2976,7 +2917,7 @@
         if (returnValueBuilder_ == null) {
           returnValueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValue.Builder, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBReturnValueOrBuilder>(
-                  returnValue_,
+                  getReturnValue(),
                   getParentForChildren(),
                   isClean());
           returnValue_ = null;
@@ -2995,10 +2936,10 @@
     // @@protoc_insertion_point(class_scope:serialize.PBFunctionCall)
   }
 
-  public interface PBAstTraversalOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PBAstTraversalOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:serialize.PBAstTraversal)
+      com.google.protobuf.MessageOrBuilder {
 
-    // repeated .serialize.PBFunctionCall calls = 1;
     /**
      * <code>repeated .serialize.PBFunctionCall calls = 1;</code>
      */
@@ -3023,7 +2964,6 @@
     org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCallOrBuilder getCallsOrBuilder(
         int index);
 
-    // required uint64 main_module = 2;
     /**
      * <code>required uint64 main_module = 2;</code>
      */
@@ -3037,8 +2977,9 @@
    * Protobuf type {@code serialize.PBAstTraversal}
    */
   public static final class PBAstTraversal extends
-      com.google.protobuf.GeneratedMessage
-      implements PBAstTraversalOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:serialize.PBAstTraversal)
+      PBAstTraversalOrBuilder {
     // Use PBAstTraversal.newBuilder() to construct.
     private PBAstTraversal(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -3143,7 +3084,6 @@
     }
 
     private int bitField0_;
-    // repeated .serialize.PBFunctionCall calls = 1;
     public static final int CALLS_FIELD_NUMBER = 1;
     private java.util.List<org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCall> calls_;
     /**
@@ -3184,7 +3124,6 @@
       return calls_.get(index);
     }
 
-    // required uint64 main_module = 2;
     public static final int MAIN_MODULE_FIELD_NUMBER = 2;
     private long mainModule_;
     /**
@@ -3210,7 +3149,8 @@
     @Override
 	public final boolean isInitialized() {
       final byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       if (!hasMainModule()) {
         memoizedIsInitialized = 0;
@@ -3338,8 +3278,9 @@
      * Protobuf type {@code serialize.PBAstTraversal}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBAstTraversalOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:serialize.PBAstTraversal)
+        org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBAstTraversalOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.internal_static_serialize_PBAstTraversal_descriptor;
@@ -3353,7 +3294,7 @@
                 org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBAstTraversal.class, org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBAstTraversal.Builder.class);
       }
 
-      // Construct using org.momut.ooas.argos.codegen.serialize.gen.RecordedAstTraversal.PBAstTraversal.newBuilder()
+      // Construct using org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBAstTraversal.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3514,7 +3455,6 @@
       }
       private int bitField0_;
 
-      // repeated .serialize.PBFunctionCall calls = 1;
       private java.util.List<org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCall> calls_ =
         java.util.Collections.emptyList();
       private void ensureCallsIsMutable() {
@@ -3659,7 +3599,8 @@
           java.lang.Iterable<? extends org.momut.ooas.codegen.ast.protobuf.gen.RecordedAstTraversal.PBFunctionCall> values) {
         if (callsBuilder_ == null) {
           ensureCallsIsMutable();
-          super.addAll(values, calls_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, calls_);
           onChanged();
         } else {
           callsBuilder_.addAllMessages(values);
@@ -3759,7 +3700,6 @@
         return callsBuilder_;
       }
 
-      // required uint64 main_module = 2;
       private long mainModule_ ;
       /**
        * <code>required uint64 main_module = 2;</code>
@@ -3805,22 +3745,22 @@
     // @@protoc_insertion_point(class_scope:serialize.PBAstTraversal)
   }
 
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_serialize_PBParameter_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_serialize_PBParameter_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_serialize_PBReturnValue_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_serialize_PBReturnValue_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_serialize_PBFunctionCall_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_serialize_PBFunctionCall_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_serialize_PBAstTraversal_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -3852,48 +3792,49 @@
       "nValue\"O\n\016PBAstTraversal\022(\n\005calls\030\001 \003(\0132" +
       "\031.serialize.PBFunctionCall\022\023\n\013main_modul" +
       "e\030\002 \002(\004*6\n\014PBReturnType\022\024\n\020type_voidPoin" +
-      "ter\020\001\022\020\n\014type_boolean\020\002BH\n0at.ac.ait.mom" +
-      "ut.ooas.argos.codegen.serialize.genB\024Rec",
-      "ordedAstTraversal"
+      "ter\020\001\022\020\n\014type_boolean\020\002B?\n\'org.momut.ooa" +
+      "s.codegen.ast.protobuf.genB\024RecordedAstT",
+      "raversal"
     };
     final com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        @Override
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          @Override
 		public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_serialize_PBParameter_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_serialize_PBParameter_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_serialize_PBParameter_descriptor,
-              new java.lang.String[] { "Uint64Value", "LiteralValue", "BoolValue", "Int32Value", "Uint32Value", });
-          internal_static_serialize_PBReturnValue_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_serialize_PBReturnValue_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_serialize_PBReturnValue_descriptor,
-              new java.lang.String[] { "ReturnType", "ReturnId", });
-          internal_static_serialize_PBFunctionCall_descriptor =
-            getDescriptor().getMessageTypes().get(2);
-          internal_static_serialize_PBFunctionCall_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_serialize_PBFunctionCall_descriptor,
-              new java.lang.String[] { "Add", "Allocate", "Identifier", "Type", "Statement", "Expression", "Parameters", "ReturnValue", });
-          internal_static_serialize_PBAstTraversal_descriptor =
-            getDescriptor().getMessageTypes().get(3);
-          internal_static_serialize_PBAstTraversal_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_serialize_PBAstTraversal_descriptor,
-              new java.lang.String[] { "Calls", "MainModule", });
-          return null;
-        }
-      };
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.getDescriptor(),
         }, assigner);
+    internal_static_serialize_PBParameter_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_serialize_PBParameter_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_serialize_PBParameter_descriptor,
+        new java.lang.String[] { "Uint64Value", "LiteralValue", "BoolValue", "Int32Value", "Uint32Value", });
+    internal_static_serialize_PBReturnValue_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_serialize_PBReturnValue_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_serialize_PBReturnValue_descriptor,
+        new java.lang.String[] { "ReturnType", "ReturnId", });
+    internal_static_serialize_PBFunctionCall_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_serialize_PBFunctionCall_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_serialize_PBFunctionCall_descriptor,
+        new java.lang.String[] { "Add", "Allocate", "Identifier", "Type", "Statement", "Expression", "Parameters", "ReturnValue", });
+    internal_static_serialize_PBAstTraversal_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_serialize_PBAstTraversal_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_serialize_PBAstTraversal_descriptor,
+        new java.lang.String[] { "Calls", "MainModule", });
+    org.momut.ooas.codegen.ast.protobuf.gen.FunctionNames.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/cadp/CadpExpression.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/cadp/CadpExpression.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/cadp/CadpExpression.java	(revision 12)
@@ -213,7 +213,7 @@
 	@Override
 	public  void visit(TypeExpression typeExpression)
 	{
-		m_emitter.Append(typeExpression.type().identifier().tokenText());
+		m_emitter.Append(typeExpression.referredType().identifier().tokenText());
 	}
 
 	@Override
@@ -438,7 +438,7 @@
 	{
 		// if this instanceof some "<enumType>.<enumValue>" access, then just print the numeric value of <enumValue>
 		if (accessExpression.left().kind() == ExpressionKind.Type &&
-		    ((TypeExpression)accessExpression.left()).type().kind() == TypeKind.EnumeratedType )
+		    ((TypeExpression)accessExpression.left()).referredType().kind() == TypeKind.EnumeratedType )
 		{
 			accessExpression.right().Accept(this);
 			return;
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/java/JavaExpression.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/java/JavaExpression.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/java/JavaExpression.java	(revision 12)
@@ -184,8 +184,8 @@
 	@Override
 	public void visit(TypeExpression typeExpression)
 	{
-		if (typeExpression.type().kind() != TypeKind.EnumeratedType)
-			m_emitter.Append(GetIdentifierString(typeExpression.type().identifier().tokenText()));
+		if (typeExpression.referredType().kind() != TypeKind.EnumeratedType)
+			m_emitter.Append(GetIdentifierString(typeExpression.referredType().identifier().tokenText()));
 	}
 
 
@@ -315,7 +315,8 @@
 	@Override
 	public void visit(AccessExpression accessExpression)
 	{
-		if (accessExpression.left().type().kind() != TypeKind.EnumeratedType)
+		if (accessExpression.left().type().kind() != TypeKind.MetaType)
+//		if (accessExpression.left().type().kind() != TypeKind.EnumeratedType)
 		{
 			// enums and qr types are directly (statically) converted to nums...
 			VisitSub(accessExpression.left(), accessExpression);
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/prolog/OoaPrologExpression.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/prolog/OoaPrologExpression.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/codegen/prolog/OoaPrologExpression.java	(revision 12)
@@ -53,6 +53,7 @@
 import org.momut.ooas.ast.identifiers.IdentifierKind;
 import org.momut.ooas.ast.types.EnumType;
 import org.momut.ooas.ast.types.FunctionType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.TypeKind;
 import org.momut.ooas.ast.types.Type;
 import org.momut.ooas.ast.types.ValuedEnumType;
@@ -282,9 +283,9 @@
 	@Override
 	public void visit(TypeExpression typeExpression)
 	{
-		if (typeExpression.type().kind() != TypeKind.EnumeratedType)
+		if (typeExpression.referredType().kind() != TypeKind.EnumeratedType)
 		{
-			m_emitter.Append(GetIdentifierString(typeExpression.type().identifier()));
+			m_emitter.Append(GetIdentifierString(typeExpression.referredType().identifier()));
 		}
 	}
 
@@ -411,7 +412,7 @@
 	@Override
 	public void visit(AccessExpression accessExpression)
 	{
-		if (accessExpression.left().type().kind() != TypeKind.EnumeratedType &&
+		if (!(accessExpression.left().type().kind() == TypeKind.MetaType && ((MetaType)accessExpression.left().type()).Type().kind() == TypeKind.EnumeratedType ) &&
 		    !(accessExpression.right().kind() == ExpressionKind.Identifier &&
 		    ((IdentifierExpression)accessExpression.right()).identifier().kind() == IdentifierKind.AttributeIdentifier))
 		{
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/math/Operations.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/math/Operations.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/math/Operations.java	(revision 12)
@@ -57,8 +57,8 @@
 	@Override
 	public AbstractRange GenericArithmeticCover(AbstractRange type1, AbstractRange type2, ExpressionKind op)
 	{
-		Range<T> a = (Range<T>) type1;
-		Range<T> b = (Range<T>) type2;
+		final Range<T> a = (Range<T>) type1;
+		final Range<T> b = (Range<T>) type2;
 
 //		Range<T> a = type1 as Range<T>;
 //		Range<T> b = type2 as Range<T>;
@@ -71,8 +71,8 @@
 
 	public Range<T> GenericArithmeticCover(Range<T> type1, Range<T> type2, ExpressionKind op)
 	{
-		T defaultValue = m_basicOperations.getDefaultValue();
-		Range<T> result = type1.Create(defaultValue, defaultValue);
+		final T defaultValue = m_basicOperations.getDefaultValue();
+		final Range<T> result = type1.Create(defaultValue, defaultValue);
 
 		switch (op)
 		{
@@ -87,7 +87,7 @@
 				assert(type2 != null);
 				// we do some sort of resulttype = type1 - type2
 				// hence, do the unminus stuff with type 2
-				T spare = type2.max;
+				final T spare = type2.max;
 				type2.max = m_basicOperations.unMinus(type2.min);
 				type2.min = m_basicOperations.unMinus(spare);
 				// now it's the same as with sum.. but c# does not let us fall through..
@@ -101,24 +101,35 @@
 				break;
 			case idiv:
 			case div:
+				// get the closest values to 0 for the divisor.
 				assert(type2 != null);
-				type2.min = m_basicOperations.equal(type2.min, defaultValue) ?
-						m_basicOperations.unMinus(type2.precision) : type2.min;
-				type2.max = m_basicOperations.equal(type2.max, defaultValue) ?
-						type2.precision : type2.max;
-				// hmm, brute force.. is there some formula?
-				result.max = m_basicOperations.div(type1.min, type2.min);
+				final Range<T> closestToZero = type2.Create(defaultValue, defaultValue);
+				if (m_basicOperations.greater(type2.max, defaultValue) && (m_basicOperations.greater(type2.min, defaultValue) || m_basicOperations.equal(type2.min, defaultValue))) {
+					// divisor range [X...0+]
+					closestToZero.max = m_basicOperations.equal(type2.min, defaultValue) ? type2.precision : type2.min; // type2.min or type2.precision if that was 0
+					closestToZero.min = closestToZero.max;
+				} else if (m_basicOperations.smaller(type2.max, defaultValue) && (m_basicOperations.smaller(type2.min, defaultValue) || m_basicOperations.equal(type2.min, defaultValue))) {
+					// divisor range [0-...-X]
+					closestToZero.max = m_basicOperations.equal(type2.min, defaultValue) ? m_basicOperations.unMinus(type2.precision) : type2.min; // type2.min or -type2.precision if that was 0
+					closestToZero.min = closestToZero.max;
+				} else {
+					// divisor range [Y ... -X]
+					closestToZero.max = type2.precision;
+					closestToZero.min = m_basicOperations.unMinus(type2.precision);
+				}
+
+				result.max = m_basicOperations.div(type1.min, closestToZero.min);
 				result.min = result.max;
 
-				T tmp = m_basicOperations.div(type1.max, type2.min);
+				T tmp = m_basicOperations.div(type1.max, closestToZero.min);
 				result.max = m_basicOperations.smaller(result.max, tmp) ? tmp : result.max;
 				result.min = m_basicOperations.greater(result.min, tmp) ? tmp : result.min;
 
-				tmp = m_basicOperations.div(type1.min, type2.max);
+				tmp = m_basicOperations.div(type1.min, closestToZero.max);
 				result.max = m_basicOperations.smaller(result.max, tmp) ? tmp : result.max;
 				result.min = m_basicOperations.greater(result.min, tmp) ? tmp : result.min;
 
-				tmp = m_basicOperations.div(type1.max, type2.max);
+				tmp = m_basicOperations.div(type1.max, closestToZero.max);
 				result.max = m_basicOperations.smaller(result.max, tmp) ? tmp : result.max;
 				result.min = m_basicOperations.greater(result.min, tmp) ? tmp : result.min;
 				break;
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g	(revision 12)
@@ -20,6 +20,12 @@
 			 
   History
   ~~~~~~~
+Changes 1.09 to 1.10
+   - allow actions to be declared with empty parameter lists and "()" 
+   
+ Changes 1.08 to 1.09
+   ~ fix actionBody rule to allow multiple prioritized compositions (replace "?" by "*")
+
   Changes 1.07 to 1.08
     ~ remove support for Qualitative Action Systems
 
@@ -140,7 +146,8 @@
     Ulysses OO-Action System Parser
 
     Copyright Graz University of Technology 2009
-    Copyright AIT Austrian Institute of Technology 2013
+    Copyright AIT Austrian Institute of Technology 2013, 2016
+    Version 1.09
  */
  package org.momut.ooas.parser;
 
@@ -377,7 +384,7 @@
 	:	{actionType = FunctionTypeEnum.Internal;}
 		(T_CTRL {actionType = FunctionTypeEnum.Controllable;}| T_OBS {actionType = FunctionTypeEnum.Observable;}| )
 		 actionname=T_IDENTIFIER  {newAction = createNamedAction(actionname,actionType);}
-		(T_LPAREN methodParameterList[newAction]  T_RPAREN)? 
+		(T_LPAREN methodParameterList[newAction]?  T_RPAREN)? 
 		T_EQUAL	
 		(T_VAR localActionVars[newAction] )? 
 		body=discreteActionBody  
@@ -483,7 +490,7 @@
 actionBody[Block top]
 	returns [Block result]
 	:	{result = createPrioBlock(top); pushBlockToResolveStack(result);}
-		actionBodyParallel[result] (T_PRIO actionBodyParallel[result])? 
+		actionBodyParallel[result] (T_PRIO actionBodyParallel[result])*
 	;  
 	finally
 		{popBlockFromResolveStack(result);}
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaCustomParser.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaCustomParser.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaCustomParser.java	(revision 12)
@@ -499,7 +499,7 @@
 		if (rangeLow.getType() == ooaLexer.T_IDENTIFIER)
 		{
 			// see whether we can find the constant
-			final Identifier aconst = pState.currentScope.ResolveIdentifier(rangeLow.getText());
+			final Identifier aconst = pState.Lookup(rangeLow.getText());
 			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
 				doError(rangeLow, String.format("Constant %s not found", rangeLow.getText()));
 			else if (aconst.type().kind() != TypeKind.IntType)
@@ -553,7 +553,7 @@
 		if (rangeLow.getType() == ooaLexer.T_IDENTIFIER)
 		{
 			// see whether we can find the constant
-			final Identifier aconst = pState.currentScope.ResolveIdentifier(rangeLow.getText());
+			final Identifier aconst = pState.Lookup(rangeLow.getText());
 			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
 				doError(rangeLow, String.format("Constant %s not found", rangeLow.getText()));
 			else if (aconst.type().kind() != TypeKind.FloatType)
@@ -707,7 +707,7 @@
 		if (numOfElements.getType() == ooaLexer.T_IDENTIFIER)
 		{
 			// see whether we can find the constant
-			final Identifier aconst = pState.currentScope.ResolveIdentifier(numOfElements.getText());
+			final Identifier aconst = pState.Lookup(numOfElements.getText());
 			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
 				doError(numOfElements, String.format("Constant %s not found", numOfElements.getText()));
 			else if (aconst.type().kind() != TypeKind.IntType)
@@ -744,7 +744,7 @@
 		if (numOfElements.getType() == ooaLexer.T_IDENTIFIER)
 		{
 			// see whether we can find the constant
-			final Identifier aconst = pState.currentScope.ResolveIdentifier(numOfElements.getText());
+			final Identifier aconst = pState.Lookup(numOfElements.getText());
 			if (aconst == null || aconst.kind() != IdentifierKind.Constant)
 				doError(numOfElements, String.format("Constant %s not found", numOfElements.getText()));
 			else if (aconst.type().kind() != TypeKind.IntType)
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaLexer.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaLexer.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaLexer.java	(revision 12)
@@ -1,4 +1,4 @@
-// $ANTLR 3.4 /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g 2015-08-31 13:32:38
+// $ANTLR 3.4 /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g 2016-09-13 11:30:04
 
 /*
     Ulysses OO-Action System Parser
@@ -151,7 +151,7 @@
     public ooaLexer(CharStream input, RecognizerSharedState state) {
         super(input,state);
     }
-    public String getGrammarFileName() { return "/home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g"; }
+    public String getGrammarFileName() { return "/home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g"; }
 
     // $ANTLR start "T__116"
     public final void mT__116() throws RecognitionException {
@@ -158,8 +158,8 @@
         try {
             int _type = T__116;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:12:8: ( '&' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:12:10: '&'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:12:8: ( '&' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:12:10: '&'
             {
             match('&'); if (state.failed) return ;
 
@@ -179,8 +179,8 @@
         try {
             int _type = T__117;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:13:8: ( '::' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:13:10: '::'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:13:8: ( '::' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:13:10: '::'
             {
             match("::"); if (state.failed) return ;
 
@@ -202,8 +202,8 @@
         try {
             int _type = T__118;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:14:8: ( ']|' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:14:10: ']|'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:14:8: ( ']|' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:14:10: ']|'
             {
             match("]|"); if (state.failed) return ;
 
@@ -225,8 +225,8 @@
         try {
             int _type = T__119;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:15:8: ( 'as' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:15:10: 'as'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:15:8: ( 'as' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:15:10: 'as'
             {
             match("as"); if (state.failed) return ;
 
@@ -248,8 +248,8 @@
         try {
             int _type = T__120;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:16:8: ( 'begin' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:16:10: 'begin'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:16:8: ( 'begin' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:16:10: 'begin'
             {
             match("begin"); if (state.failed) return ;
 
@@ -271,8 +271,8 @@
         try {
             int _type = T__121;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:17:8: ( '|[' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:17:10: '|['
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:17:8: ( '|[' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:17:10: '|['
             {
             match("|["); if (state.failed) return ;
 
@@ -294,8 +294,8 @@
         try {
             int _type = T_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:927:8: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:927:10: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:931:8: ( ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' ) )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:931:10: ( ' ' | '\\r' | '\\t' | '\\u000C' | '\\n' )
             {
             if ( (input.LA(1) >= '\t' && input.LA(1) <= '\n')||(input.LA(1) >= '\f' && input.LA(1) <= '\r')||input.LA(1)==' ' ) {
                 input.consume();
@@ -327,14 +327,14 @@
         try {
             int _type = T_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:931:6: ( '/*' ( . )* '*/' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:931:8: '/*' ( . )* '*/'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:6: ( '/*' ( . )* '*/' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:8: '/*' ( . )* '*/'
             {
             match("/*"); if (state.failed) return ;
 
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:931:13: ( . )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:13: ( . )*
             loop1:
             do {
                 int alt1=2;
@@ -359,7 +359,7 @@
 
                 switch (alt1) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:931:13: .
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:13: .
             	    {
             	    matchAny(); if (state.failed) return ;
 
@@ -394,12 +394,12 @@
         try {
             int _type = LINE_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:6: ( '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:8: '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:6: ( '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:8: '#' (~ ( '\\n' | '\\r' ) )* ( '\\r' )? '\\n'
             {
             match('#'); if (state.failed) return ;
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:12: (~ ( '\\n' | '\\r' ) )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:12: (~ ( '\\n' | '\\r' ) )*
             loop2:
             do {
                 int alt2=2;
@@ -412,7 +412,7 @@
 
                 switch (alt2) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
             	    {
             	    if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '\t')||(input.LA(1) >= '\u000B' && input.LA(1) <= '\f')||(input.LA(1) >= '\u000E' && input.LA(1) <= '\uFFFF') ) {
             	        input.consume();
@@ -435,7 +435,7 @@
             } while (true);
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:26: ( '\\r' )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:26: ( '\\r' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -444,7 +444,7 @@
             }
             switch (alt3) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:935:26: '\\r'
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:26: '\\r'
                     {
                     match('\r'); if (state.failed) return ;
 
@@ -474,8 +474,8 @@
         try {
             int _type = T_PRIMED;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:2: ( '\\'' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:939:4: '\\''
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:943:2: ( '\\'' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:943:4: '\\''
             {
             match('\''); if (state.failed) return ;
 
@@ -495,12 +495,12 @@
         try {
             int _type = T_STRINGLITERAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:942:2: ( '\"' ( ( '\"' '\"' )=> '\"' |~ '\"' )* '\"' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:942:4: '\"' ( ( '\"' '\"' )=> '\"' |~ '\"' )* '\"'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:946:2: ( '\"' ( ( '\"' '\"' )=> '\"' |~ '\"' )* '\"' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:946:4: '\"' ( ( '\"' '\"' )=> '\"' |~ '\"' )* '\"'
             {
             match('\"'); if (state.failed) return ;
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:943:3: ( ( '\"' '\"' )=> '\"' |~ '\"' )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:947:3: ( ( '\"' '\"' )=> '\"' |~ '\"' )*
             loop4:
             do {
                 int alt4=3;
@@ -525,7 +525,7 @@
 
                 switch (alt4) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:944:9: ( '\"' '\"' )=> '\"'
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:948:9: ( '\"' '\"' )=> '\"'
             	    {
             	    match('\"'); if (state.failed) return ;
 
@@ -532,7 +532,7 @@
             	    }
             	    break;
             	case 2 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:945:13: ~ '\"'
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:949:13: ~ '\"'
             	    {
             	    if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '!')||(input.LA(1) >= '#' && input.LA(1) <= '\uFFFF') ) {
             	        input.consume();
@@ -573,8 +573,8 @@
         try {
             int _type = T_ABORT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:951:9: ( 'abort' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:951:11: 'abort'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:955:9: ( 'abort' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:955:11: 'abort'
             {
             match("abort"); if (state.failed) return ;
 
@@ -596,8 +596,8 @@
         try {
             int _type = T_ACTIONS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:953:2: ( 'actions' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:953:4: 'actions'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:957:2: ( 'actions' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:957:4: 'actions'
             {
             match("actions"); if (state.failed) return ;
 
@@ -619,8 +619,8 @@
         try {
             int _type = T_ASSIGNMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:955:2: ( ':=' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:955:4: ':='
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:959:2: ( ':=' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:959:4: ':='
             {
             match(":="); if (state.failed) return ;
 
@@ -642,8 +642,8 @@
         try {
             int _type = T_AUTOCONS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:956:11: ( 'autocons' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:956:13: 'autocons'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:960:11: ( 'autocons' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:960:13: 'autocons'
             {
             match("autocons"); if (state.failed) return ;
 
@@ -665,8 +665,8 @@
         try {
             int _type = T_BAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:957:7: ( '|' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:957:9: '|'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:961:7: ( '|' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:961:9: '|'
             {
             match('|'); if (state.failed) return ;
 
@@ -686,8 +686,8 @@
         try {
             int _type = T_BOOL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:958:8: ( 'bool' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:958:10: 'bool'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:962:8: ( 'bool' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:962:10: 'bool'
             {
             match("bool"); if (state.failed) return ;
 
@@ -709,8 +709,8 @@
         try {
             int _type = T_CBRL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:959:8: ( '{' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:959:10: '{'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:963:8: ( '{' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:963:10: '{'
             {
             match('{'); if (state.failed) return ;
 
@@ -730,8 +730,8 @@
         try {
             int _type = T_CBRR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:960:8: ( '}' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:960:10: '}'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:964:8: ( '}' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:964:10: '}'
             {
             match('}'); if (state.failed) return ;
 
@@ -751,8 +751,8 @@
         try {
             int _type = T_COLON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:961:9: ( ':' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:961:11: ':'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:965:9: ( ':' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:965:11: ':'
             {
             match(':'); if (state.failed) return ;
 
@@ -772,8 +772,8 @@
         try {
             int _type = T_COMMA;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:962:9: ( ',' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:962:11: ','
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:966:9: ( ',' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:966:11: ','
             {
             match(','); if (state.failed) return ;
 
@@ -793,8 +793,8 @@
         try {
             int _type = T_CHAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:964:8: ( 'char' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:964:10: 'char'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:968:8: ( 'char' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:968:10: 'char'
             {
             match("char"); if (state.failed) return ;
 
@@ -816,8 +816,8 @@
         try {
             int _type = T_CTRL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:965:9: ( 'ctr' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:965:11: 'ctr'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:969:9: ( 'ctr' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:969:11: 'ctr'
             {
             match("ctr"); if (state.failed) return ;
 
@@ -839,8 +839,8 @@
         try {
             int _type = T_SYSTEM;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:967:2: ( 'system' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:967:4: 'system'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:971:2: ( 'system' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:971:4: 'system'
             {
             match("system"); if (state.failed) return ;
 
@@ -862,8 +862,8 @@
         try {
             int _type = T_DO;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:968:6: ( 'do' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:968:8: 'do'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:972:6: ( 'do' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:972:8: 'do'
             {
             match("do"); if (state.failed) return ;
 
@@ -885,8 +885,8 @@
         try {
             int _type = T_ELSE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:969:8: ( 'else' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:969:10: 'else'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:973:8: ( 'else' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:973:10: 'else'
             {
             match("else"); if (state.failed) return ;
 
@@ -908,8 +908,8 @@
         try {
             int _type = T_END;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:970:7: ( 'end' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:970:9: 'end'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:974:7: ( 'end' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:974:9: 'end'
             {
             match("end"); if (state.failed) return ;
 
@@ -931,8 +931,8 @@
         try {
             int _type = T_EQUAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:971:9: ( '=' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:971:11: '='
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:975:9: ( '=' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:975:11: '='
             {
             match('='); if (state.failed) return ;
 
@@ -952,8 +952,8 @@
         try {
             int _type = T_EXISTS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:972:10: ( 'exists' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:972:12: 'exists'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:976:10: ( 'exists' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:976:12: 'exists'
             {
             match("exists"); if (state.failed) return ;
 
@@ -975,8 +975,8 @@
         try {
             int _type = T_FLOAT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:973:9: ( 'float' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:973:11: 'float'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:977:9: ( 'float' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:977:11: 'float'
             {
             match("float"); if (state.failed) return ;
 
@@ -998,8 +998,8 @@
         try {
             int _type = T_FORALL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:974:10: ( 'forall' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:974:12: 'forall'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:978:10: ( 'forall' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:978:12: 'forall'
             {
             match("forall"); if (state.failed) return ;
 
@@ -1021,8 +1021,8 @@
         try {
             int _type = T_FALSE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:975:10: ( 'false' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:975:12: 'false'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:979:10: ( 'false' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:979:12: 'false'
             {
             match("false"); if (state.failed) return ;
 
@@ -1044,8 +1044,8 @@
         try {
             int _type = T_IF;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:976:6: ( 'if' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:976:8: 'if'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:980:6: ( 'if' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:980:8: 'if'
             {
             match("if"); if (state.failed) return ;
 
@@ -1067,8 +1067,8 @@
         try {
             int _type = T_IN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:977:6: ( 'in' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:977:8: 'in'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:981:6: ( 'in' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:981:8: 'in'
             {
             match("in"); if (state.failed) return ;
 
@@ -1090,8 +1090,8 @@
         try {
             int _type = T_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:978:7: ( 'int' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:978:9: 'int'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:982:7: ( 'int' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:982:9: 'int'
             {
             match("int"); if (state.failed) return ;
 
@@ -1113,8 +1113,8 @@
         try {
             int _type = T_KILL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:979:8: ( 'kill' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:979:10: 'kill'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:983:8: ( 'kill' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:983:10: 'kill'
             {
             match("kill"); if (state.failed) return ;
 
@@ -1136,8 +1136,8 @@
         try {
             int _type = T_LIST;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:980:8: ( 'list' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:980:10: 'list'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:984:8: ( 'list' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:984:10: 'list'
             {
             match("list"); if (state.failed) return ;
 
@@ -1159,8 +1159,8 @@
         try {
             int _type = T_LPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:981:10: ( '(' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:981:12: '('
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:985:10: ( '(' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:985:12: '('
             {
             match('('); if (state.failed) return ;
 
@@ -1180,8 +1180,8 @@
         try {
             int _type = T_LSQPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:982:11: ( '[' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:982:13: '['
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:986:11: ( '[' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:986:13: '['
             {
             match('['); if (state.failed) return ;
 
@@ -1201,8 +1201,8 @@
         try {
             int _type = T_MAP;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:983:7: ( 'map' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:983:9: 'map'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:987:7: ( 'map' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:987:9: 'map'
             {
             match("map"); if (state.failed) return ;
 
@@ -1224,8 +1224,8 @@
         try {
             int _type = T_MAPS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:984:8: ( '->' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:984:10: '->'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:988:8: ( '->' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:988:10: '->'
             {
             match("->"); if (state.failed) return ;
 
@@ -1247,8 +1247,8 @@
         try {
             int _type = T_METHODS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:986:2: ( 'methods' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:986:4: 'methods'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:990:2: ( 'methods' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:990:4: 'methods'
             {
             match("methods"); if (state.failed) return ;
 
@@ -1270,8 +1270,8 @@
         try {
             int _type = T_NEW;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:987:7: ( 'new' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:987:9: 'new'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:991:7: ( 'new' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:991:9: 'new'
             {
             match("new"); if (state.failed) return ;
 
@@ -1293,8 +1293,8 @@
         try {
             int _type = T_NIL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:988:7: ( 'nil' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:988:9: 'nil'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:992:7: ( 'nil' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:992:9: 'nil'
             {
             match("nil"); if (state.failed) return ;
 
@@ -1316,8 +1316,8 @@
         try {
             int _type = T_NONDET;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:989:10: ( '[]' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:989:12: '[]'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:993:10: ( '[]' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:993:12: '[]'
             {
             match("[]"); if (state.failed) return ;
 
@@ -1339,8 +1339,8 @@
         try {
             int _type = T_OBS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:990:7: ( 'obs' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:990:9: 'obs'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:994:7: ( 'obs' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:994:9: 'obs'
             {
             match("obs"); if (state.failed) return ;
 
@@ -1362,8 +1362,8 @@
         try {
             int _type = T_OD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:991:6: ( 'od' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:991:8: 'od'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:995:6: ( 'od' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:995:8: 'od'
             {
             match("od"); if (state.failed) return ;
 
@@ -1385,8 +1385,8 @@
         try {
             int _type = T_OF;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:992:6: ( 'of' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:992:8: 'of'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:996:6: ( 'of' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:996:8: 'of'
             {
             match("of"); if (state.failed) return ;
 
@@ -1408,8 +1408,8 @@
         try {
             int _type = T_PRIO;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:993:8: ( '//' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:993:10: '//'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:997:8: ( '//' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:997:10: '//'
             {
             match("//"); if (state.failed) return ;
 
@@ -1431,8 +1431,8 @@
         try {
             int _type = T_REQUIRES;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:995:2: ( 'requires' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:995:4: 'requires'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:999:2: ( 'requires' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:999:4: 'requires'
             {
             match("requires"); if (state.failed) return ;
 
@@ -1454,8 +1454,8 @@
         try {
             int _type = T_RPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:996:10: ( ')' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:996:12: ')'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1000:10: ( ')' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1000:12: ')'
             {
             match(')'); if (state.failed) return ;
 
@@ -1475,8 +1475,8 @@
         try {
             int _type = T_RSQPAREN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:997:11: ( ']' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:997:13: ']'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1001:11: ( ']' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1001:13: ']'
             {
             match(']'); if (state.failed) return ;
 
@@ -1496,8 +1496,8 @@
         try {
             int _type = T_SELF;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:998:8: ( 'self' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:998:10: 'self'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1002:8: ( 'self' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1002:10: 'self'
             {
             match("self"); if (state.failed) return ;
 
@@ -1519,8 +1519,8 @@
         try {
             int _type = T_SET;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:999:8: ( 'set' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:999:10: 'set'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1003:8: ( 'set' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1003:10: 'set'
             {
             match("set"); if (state.failed) return ;
 
@@ -1542,8 +1542,8 @@
         try {
             int _type = T_SEMICOLON;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1001:2: ( ';' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1001:4: ';'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1005:2: ( ';' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1005:4: ';'
             {
             match(';'); if (state.failed) return ;
 
@@ -1563,8 +1563,8 @@
         try {
             int _type = T_STATIC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1002:10: ( 'static' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1002:12: 'static'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1006:10: ( 'static' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1006:12: 'static'
             {
             match("static"); if (state.failed) return ;
 
@@ -1586,8 +1586,8 @@
         try {
             int _type = T_SKIP;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1003:8: ( 'skip' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1003:10: 'skip'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1007:8: ( 'skip' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1007:10: 'skip'
             {
             match("skip"); if (state.failed) return ;
 
@@ -1609,8 +1609,8 @@
         try {
             int _type = T_BREAK;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1004:9: ( 'break' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1004:11: 'break'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1008:9: ( 'break' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1008:11: 'break'
             {
             match("break"); if (state.failed) return ;
 
@@ -1632,8 +1632,8 @@
         try {
             int _type = T_THEN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1005:8: ( 'then' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1005:10: 'then'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1009:8: ( 'then' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1009:10: 'then'
             {
             match("then"); if (state.failed) return ;
 
@@ -1655,8 +1655,8 @@
         try {
             int _type = T_TRUE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1006:10: ( 'true' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1006:12: 'true'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1010:10: ( 'true' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1010:12: 'true'
             {
             match("true"); if (state.failed) return ;
 
@@ -1678,8 +1678,8 @@
         try {
             int _type = T_TO;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1007:6: ( 'to' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1007:8: 'to'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1011:6: ( 'to' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1011:8: 'to'
             {
             match("to"); if (state.failed) return ;
 
@@ -1701,8 +1701,8 @@
         try {
             int _type = T_TYPES;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1008:9: ( 'types' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1008:11: 'types'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1012:9: ( 'types' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1012:11: 'types'
             {
             match("types"); if (state.failed) return ;
 
@@ -1724,8 +1724,8 @@
         try {
             int _type = T_VAR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1009:7: ( 'var' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1009:9: 'var'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1013:7: ( 'var' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1013:9: 'var'
             {
             match("var"); if (state.failed) return ;
 
@@ -1747,8 +1747,8 @@
         try {
             int _type = T_WITH;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1010:8: ( 'with' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1010:10: 'with'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1014:8: ( 'with' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1014:10: 'with'
             {
             match("with"); if (state.failed) return ;
 
@@ -1770,8 +1770,8 @@
         try {
             int _type = T_AND;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1016:7: ( 'and' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1016:9: 'and'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1020:7: ( 'and' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1020:9: 'and'
             {
             match("and"); if (state.failed) return ;
 
@@ -1793,8 +1793,8 @@
         try {
             int _type = T_BIIMPLIES;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1018:2: ( '<=>' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1018:4: '<=>'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1022:2: ( '<=>' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1022:4: '<=>'
             {
             match("<=>"); if (state.failed) return ;
 
@@ -1816,8 +1816,8 @@
         try {
             int _type = T_IMPLIES;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1020:2: ( '=>' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1020:4: '=>'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1024:2: ( '=>' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1024:4: '=>'
             {
             match("=>"); if (state.failed) return ;
 
@@ -1839,8 +1839,8 @@
         try {
             int _type = T_NOT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1021:7: ( 'not' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1021:9: 'not'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1025:7: ( 'not' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1025:9: 'not'
             {
             match("not"); if (state.failed) return ;
 
@@ -1862,8 +1862,8 @@
         try {
             int _type = T_NOTEQUAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1022:11: ( '<>' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1022:13: '<>'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1026:11: ( '<>' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1026:13: '<>'
             {
             match("<>"); if (state.failed) return ;
 
@@ -1885,8 +1885,8 @@
         try {
             int _type = T_OR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1023:6: ( 'or' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1023:8: 'or'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1027:6: ( 'or' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1027:8: 'or'
             {
             match("or"); if (state.failed) return ;
 
@@ -1908,8 +1908,8 @@
         try {
             int _type = T_ABS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1026:7: ( 'abs' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1026:9: 'abs'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1030:7: ( 'abs' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1030:9: 'abs'
             {
             match("abs"); if (state.failed) return ;
 
@@ -1931,8 +1931,8 @@
         try {
             int _type = T_DIV;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1027:7: ( '/' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1027:9: '/'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1031:7: ( '/' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1031:9: '/'
             {
             match('/'); if (state.failed) return ;
 
@@ -1952,8 +1952,8 @@
         try {
             int _type = T_GREATER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1029:2: ( '>' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1029:4: '>'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1033:2: ( '>' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1033:4: '>'
             {
             match('>'); if (state.failed) return ;
 
@@ -1973,8 +1973,8 @@
         try {
             int _type = T_GREATEREQUAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1031:2: ( '>=' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1031:4: '>='
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1035:2: ( '>=' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1035:4: '>='
             {
             match(">="); if (state.failed) return ;
 
@@ -1996,8 +1996,8 @@
         try {
             int _type = T_IDIV;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1032:8: ( 'div' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1032:10: 'div'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1036:8: ( 'div' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1036:10: 'div'
             {
             match("div"); if (state.failed) return ;
 
@@ -2019,8 +2019,8 @@
         try {
             int _type = T_LESS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1033:8: ( '<' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1033:10: '<'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1037:8: ( '<' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1037:10: '<'
             {
             match('<'); if (state.failed) return ;
 
@@ -2040,8 +2040,8 @@
         try {
             int _type = T_LESSEQUAL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1035:2: ( '<=' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1035:4: '<='
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1039:2: ( '<=' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1039:4: '<='
             {
             match("<="); if (state.failed) return ;
 
@@ -2063,8 +2063,8 @@
         try {
             int _type = T_MOD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1036:7: ( 'mod' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1036:9: 'mod'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1040:7: ( 'mod' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1040:9: 'mod'
             {
             match("mod"); if (state.failed) return ;
 
@@ -2086,8 +2086,8 @@
         try {
             int _type = T_POW;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1037:7: ( '**' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1037:9: '**'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1041:7: ( '**' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1041:9: '**'
             {
             match("**"); if (state.failed) return ;
 
@@ -2109,8 +2109,8 @@
         try {
             int _type = T_PROD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1038:8: ( '*' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1038:10: '*'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1042:8: ( '*' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1042:10: '*'
             {
             match('*'); if (state.failed) return ;
 
@@ -2130,8 +2130,8 @@
         try {
             int _type = T_DERIV;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1039:9: ( 'dt' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1039:11: 'dt'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1043:9: ( 'dt' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1043:11: 'dt'
             {
             match("dt"); if (state.failed) return ;
 
@@ -2153,8 +2153,8 @@
         try {
             int _type = T_CARD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1042:8: ( 'card' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1042:10: 'card'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1046:8: ( 'card' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1046:10: 'card'
             {
             match("card"); if (state.failed) return ;
 
@@ -2176,8 +2176,8 @@
         try {
             int _type = T_CONC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1043:8: ( '^' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1043:10: '^'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1047:8: ( '^' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1047:10: '^'
             {
             match('^'); if (state.failed) return ;
 
@@ -2197,8 +2197,8 @@
         try {
             int _type = T_DCONC;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1044:9: ( 'conc' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1044:11: 'conc'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1048:9: ( 'conc' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1048:11: 'conc'
             {
             match("conc"); if (state.failed) return ;
 
@@ -2220,8 +2220,8 @@
         try {
             int _type = T_DIFF;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1045:8: ( '\\\\' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1045:10: '\\\\'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1049:8: ( '\\\\' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1049:10: '\\\\'
             {
             match('\\'); if (state.failed) return ;
 
@@ -2241,8 +2241,8 @@
         try {
             int _type = T_DINTER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1046:10: ( 'dinter' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1046:12: 'dinter'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1050:10: ( 'dinter' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1050:12: 'dinter'
             {
             match("dinter"); if (state.failed) return ;
 
@@ -2264,8 +2264,8 @@
         try {
             int _type = T_DUNION;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1047:10: ( 'dunion' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1047:12: 'dunion'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1051:10: ( 'dunion' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1051:12: 'dunion'
             {
             match("dunion"); if (state.failed) return ;
 
@@ -2287,8 +2287,8 @@
         try {
             int _type = T_ELEMS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1048:9: ( 'elems' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1048:11: 'elems'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1052:9: ( 'elems' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1052:11: 'elems'
             {
             match("elems"); if (state.failed) return ;
 
@@ -2310,8 +2310,8 @@
         try {
             int _type = T_HEAD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1049:8: ( 'hd' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1049:10: 'hd'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1053:8: ( 'hd' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1053:10: 'hd'
             {
             match("hd"); if (state.failed) return ;
 
@@ -2333,8 +2333,8 @@
         try {
             int _type = T_INDS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1050:8: ( 'inds' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1050:10: 'inds'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1054:8: ( 'inds' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1054:10: 'inds'
             {
             match("inds"); if (state.failed) return ;
 
@@ -2356,8 +2356,8 @@
         try {
             int _type = T_INTER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1051:9: ( 'inter' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1051:11: 'inter'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1055:9: ( 'inter' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1055:11: 'inter'
             {
             match("inter"); if (state.failed) return ;
 
@@ -2379,8 +2379,8 @@
         try {
             int _type = T_LEN;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1052:7: ( 'len' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1052:9: 'len'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1056:7: ( 'len' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1056:9: 'len'
             {
             match("len"); if (state.failed) return ;
 
@@ -2402,8 +2402,8 @@
         try {
             int _type = T_SEQMOD_MAPOVERRIDE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1054:2: ( '++' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1054:4: '++'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1058:2: ( '++' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1058:4: '++'
             {
             match("++"); if (state.failed) return ;
 
@@ -2425,8 +2425,8 @@
         try {
             int _type = T_SUBSET;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1055:10: ( 'subset' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1055:12: 'subset'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1059:10: ( 'subset' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1059:12: 'subset'
             {
             match("subset"); if (state.failed) return ;
 
@@ -2448,8 +2448,8 @@
         try {
             int _type = T_TAIL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1056:8: ( 'tl' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1056:10: 'tl'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1060:8: ( 'tl' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1060:10: 'tl'
             {
             match("tl"); if (state.failed) return ;
 
@@ -2471,8 +2471,8 @@
         try {
             int _type = T_UNION;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1057:9: ( 'union' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1057:11: 'union'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1061:9: ( 'union' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1061:11: 'union'
             {
             match("union"); if (state.failed) return ;
 
@@ -2494,8 +2494,8 @@
         try {
             int _type = T_FOLDLR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1059:2: ( ':>:' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1059:4: ':>:'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1063:2: ( ':>:' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1063:4: ':>:'
             {
             match(":>:"); if (state.failed) return ;
 
@@ -2517,8 +2517,8 @@
         try {
             int _type = T_FOLDRL;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1061:2: ( ':<:' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1061:4: ':<:'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1065:2: ( ':<:' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1065:4: ':<:'
             {
             match(":<:"); if (state.failed) return ;
 
@@ -2540,8 +2540,8 @@
         try {
             int _type = T_DOM;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1065:7: ( 'dom' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1065:9: 'dom'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1069:7: ( 'dom' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1069:9: 'dom'
             {
             match("dom"); if (state.failed) return ;
 
@@ -2563,8 +2563,8 @@
         try {
             int _type = T_DOMRESBY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1067:2: ( '<-:' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1067:4: '<-:'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1071:2: ( '<-:' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1071:4: '<-:'
             {
             match("<-:"); if (state.failed) return ;
 
@@ -2586,8 +2586,8 @@
         try {
             int _type = T_DOMRESTO;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1069:2: ( '<:' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1069:4: '<:'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1073:2: ( '<:' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1073:4: '<:'
             {
             match("<:"); if (state.failed) return ;
 
@@ -2609,8 +2609,8 @@
         try {
             int _type = T_RNG;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1070:7: ( 'rng' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1070:9: 'rng'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1074:7: ( 'rng' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1074:9: 'rng'
             {
             match("rng"); if (state.failed) return ;
 
@@ -2632,8 +2632,8 @@
         try {
             int _type = T_RNGRESBY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1072:2: ( ':->' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1072:4: ':->'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1076:2: ( ':->' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1076:4: ':->'
             {
             match(":->"); if (state.failed) return ;
 
@@ -2655,8 +2655,8 @@
         try {
             int _type = T_RNGRESTO;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1074:2: ( ':>' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1074:4: ':>'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1078:2: ( ':>' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1078:4: ':>'
             {
             match(":>"); if (state.failed) return ;
 
@@ -2678,8 +2678,8 @@
         try {
             int _type = T_MERGE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1075:9: ( 'merge' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1075:11: 'merge'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1079:9: ( 'merge' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1079:11: 'merge'
             {
             match("merge"); if (state.failed) return ;
 
@@ -2701,8 +2701,8 @@
         try {
             int _type = T_MUNION;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1076:10: ( 'munion' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1076:12: 'munion'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1080:10: ( 'munion' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1080:12: 'munion'
             {
             match("munion"); if (state.failed) return ;
 
@@ -2724,8 +2724,8 @@
         try {
             int _type = T_CONSTS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1078:10: ( 'consts' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1078:12: 'consts'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1082:10: ( 'consts' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1082:12: 'consts'
             {
             match("consts"); if (state.failed) return ;
 
@@ -2747,10 +2747,10 @@
         try {
             int _type = T_INFTY;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1082:9: ( ( T_MINUS | T_SUM )? 'inf' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1082:11: ( T_MINUS | T_SUM )? 'inf'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1086:9: ( ( T_MINUS | T_SUM )? 'inf' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1086:11: ( T_MINUS | T_SUM )? 'inf'
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1082:11: ( T_MINUS | T_SUM )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1086:11: ( T_MINUS | T_SUM )?
             int alt5=2;
             int LA5_0 = input.LA(1);
 
@@ -2759,7 +2759,7 @@
             }
             switch (alt5) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
                     {
                     if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                         input.consume();
@@ -2797,8 +2797,8 @@
     // $ANTLR start "T_INTNUMBER"
     public final void mT_INTNUMBER() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1089:2: ()
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1089:4: 
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1093:2: ()
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1093:4: 
             {
             }
 
@@ -2813,8 +2813,8 @@
     // $ANTLR start "T_FLOATNUMBER"
     public final void mT_FLOATNUMBER() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1091:2: ()
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1091:4: 
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1095:2: ()
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1095:4: 
             {
             }
 
@@ -2829,8 +2829,8 @@
     // $ANTLR start "T_RANGETO"
     public final void mT_RANGETO() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1093:2: ()
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1093:4: 
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1097:2: ()
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1097:4: 
             {
             }
 
@@ -2847,7 +2847,7 @@
         try {
             int _type = FLOAT_OR_INT_OR_RANGE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1096:2: ( ( T_MINUS | T_SUM )? ( T_DIGIT )+ ( ( T_POINT T_POINT )=>| ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )? |) | T_POINT ( T_POINT |) | T_MINUS | T_SUM )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1100:2: ( ( T_MINUS | T_SUM )? ( T_DIGIT )+ ( ( T_POINT T_POINT )=>| ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )? |) | T_POINT ( T_POINT |) | T_MINUS | T_SUM )
             int alt14=4;
             switch ( input.LA(1) ) {
             case '-':
@@ -2904,9 +2904,9 @@
 
             switch (alt14) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1096:5: ( T_MINUS | T_SUM )? ( T_DIGIT )+ ( ( T_POINT T_POINT )=>| ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )? |)
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1100:5: ( T_MINUS | T_SUM )? ( T_DIGIT )+ ( ( T_POINT T_POINT )=>| ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )? |)
                     {
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1096:5: ( T_MINUS | T_SUM )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1100:5: ( T_MINUS | T_SUM )?
                     int alt6=2;
                     int LA6_0 = input.LA(1);
 
@@ -2915,7 +2915,7 @@
                     }
                     switch (alt6) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
                             {
                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                 input.consume();
@@ -2935,7 +2935,7 @@
                     }
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1096:22: ( T_DIGIT )+
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1100:22: ( T_DIGIT )+
                     int cnt7=0;
                     loop7:
                     do {
@@ -2949,7 +2949,7 @@
 
                         switch (alt7) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
                     	    {
                     	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
                     	        input.consume();
@@ -2977,7 +2977,7 @@
                     } while (true);
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1097:3: ( ( T_POINT T_POINT )=>| ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )? |)
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1101:3: ( ( T_POINT T_POINT )=>| ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )? |)
                     int alt12=3;
                     int LA12_0 = input.LA(1);
 
@@ -3000,7 +3000,7 @@
                     }
                     switch (alt12) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1098:5: ( T_POINT T_POINT )=>
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1102:5: ( T_POINT T_POINT )=>
                             {
                             if ( state.backtracking==0 ) {_type=T_INTNUMBER;}
 
@@ -3007,12 +3007,12 @@
                             }
                             break;
                         case 2 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:6: ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )?
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:6: ( T_POINT T_DIGIT )=> T_POINT ( T_DIGIT )+ ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )?
                             {
                             mT_POINT(); if (state.failed) return ;
 
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:35: ( T_DIGIT )+
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:35: ( T_DIGIT )+
                             int cnt8=0;
                             loop8:
                             do {
@@ -3026,7 +3026,7 @@
 
                                 switch (alt8) {
                             	case 1 :
-                            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+                            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
                             	    {
                             	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
                             	        input.consume();
@@ -3054,7 +3054,7 @@
                             } while (true);
 
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:44: ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )?
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:44: ( ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+ )?
                             int alt11=2;
                             int LA11_0 = input.LA(1);
 
@@ -3063,7 +3063,7 @@
                             }
                             switch (alt11) {
                                 case 1 :
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:45: ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:45: ( 'e' | 'E' ) ( T_MINUS | T_SUM )? ( T_DIGIT )+
                                     {
                                     if ( input.LA(1)=='E'||input.LA(1)=='e' ) {
                                         input.consume();
@@ -3077,7 +3077,7 @@
                                     }
 
 
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:55: ( T_MINUS | T_SUM )?
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:55: ( T_MINUS | T_SUM )?
                                     int alt9=2;
                                     int LA9_0 = input.LA(1);
 
@@ -3086,7 +3086,7 @@
                                     }
                                     switch (alt9) {
                                         case 1 :
-                                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+                                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
                                             {
                                             if ( input.LA(1)=='+'||input.LA(1)=='-' ) {
                                                 input.consume();
@@ -3106,7 +3106,7 @@
                                     }
 
 
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:72: ( T_DIGIT )+
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:72: ( T_DIGIT )+
                                     int cnt10=0;
                                     loop10:
                                     do {
@@ -3120,7 +3120,7 @@
 
                                         switch (alt10) {
                                     	case 1 :
-                                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+                                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
                                     	    {
                                     	    if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
                                     	        input.consume();
@@ -3159,7 +3159,7 @@
                             }
                             break;
                         case 3 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1100:6: 
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1104:6: 
                             {
                             if ( state.backtracking==0 ) {_type=T_INTNUMBER;}
 
@@ -3172,12 +3172,12 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1102:4: T_POINT ( T_POINT |)
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1106:4: T_POINT ( T_POINT |)
                     {
                     mT_POINT(); if (state.failed) return ;
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:3: ( T_POINT |)
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1107:3: ( T_POINT |)
                     int alt13=2;
                     int LA13_0 = input.LA(1);
 
@@ -3189,7 +3189,7 @@
                     }
                     switch (alt13) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1104:5: T_POINT
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1108:5: T_POINT
                             {
                             mT_POINT(); if (state.failed) return ;
 
@@ -3199,7 +3199,7 @@
                             }
                             break;
                         case 2 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1105:13: 
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1109:13: 
                             {
                             if ( state.backtracking==0 ) {_type=T_POINT;}
 
@@ -3212,7 +3212,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1107:4: T_MINUS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1111:4: T_MINUS
                     {
                     mT_MINUS(); if (state.failed) return ;
 
@@ -3222,7 +3222,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1108:4: T_SUM
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1112:4: T_SUM
                     {
                     mT_SUM(); if (state.failed) return ;
 
@@ -3245,8 +3245,8 @@
     // $ANTLR start "T_MINUS"
     public final void mT_MINUS() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1113:17: ( '-' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1113:19: '-'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1117:17: ( '-' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1117:19: '-'
             {
             match('-'); if (state.failed) return ;
 
@@ -3263,8 +3263,8 @@
     // $ANTLR start "T_SUM"
     public final void mT_SUM() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1114:16: ( '+' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1114:18: '+'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1118:16: ( '+' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1118:18: '+'
             {
             match('+'); if (state.failed) return ;
 
@@ -3281,8 +3281,8 @@
     // $ANTLR start "T_POINT"
     public final void mT_POINT() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1115:17: ( '.' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1115:19: '.'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1119:17: ( '.' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1119:19: '.'
             {
             match('.'); if (state.failed) return ;
 
@@ -3301,13 +3301,13 @@
         try {
             int _type = T_IDENTIFIER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1121:2: ( T_LETTER ( T_LETTER | T_DIGIT )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1121:4: T_LETTER ( T_LETTER | T_DIGIT )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1125:2: ( T_LETTER ( T_LETTER | T_DIGIT )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1125:4: T_LETTER ( T_LETTER | T_DIGIT )*
             {
             mT_LETTER(); if (state.failed) return ;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1121:13: ( T_LETTER | T_DIGIT )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1125:13: ( T_LETTER | T_DIGIT )*
             loop15:
             do {
                 int alt15=2;
@@ -3320,7 +3320,7 @@
 
                 switch (alt15) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
             	    {
             	    if ( input.LA(1)=='$'||(input.LA(1) >= '0' && input.LA(1) <= '9')||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) {
             	        input.consume();
@@ -3357,8 +3357,8 @@
     // $ANTLR start "T_LETTER"
     public final void mT_LETTER() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1130:2: ( '$' | 'A' .. 'Z' | 'a' .. 'z' | '_' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1134:2: ( '$' | 'A' .. 'Z' | 'a' .. 'z' | '_' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
             {
             if ( input.LA(1)=='$'||(input.LA(1) >= 'A' && input.LA(1) <= 'Z')||input.LA(1)=='_'||(input.LA(1) >= 'a' && input.LA(1) <= 'z') ) {
                 input.consume();
@@ -3385,8 +3385,8 @@
     // $ANTLR start "T_DIGIT"
     public final void mT_DIGIT() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1137:8: ( '0' .. '9' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1141:8: ( '0' .. '9' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:
             {
             if ( (input.LA(1) >= '0' && input.LA(1) <= '9') ) {
                 input.consume();
@@ -3411,12 +3411,12 @@
     // $ANTLR end "T_DIGIT"
 
     public void mTokens() throws RecognitionException {
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:8: ( T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T_WS | T_COMMENT | LINE_COMMENT | T_PRIMED | T_STRINGLITERAL | T_ABORT | T_ACTIONS | T_ASSIGNMENT | T_AUTOCONS | T_BAR | T_BOOL | T_CBRL | T_CBRR | T_COLON | T_COMMA | T_CHAR | T_CTRL | T_SYSTEM | T_DO | T_ELSE | T_END | T_EQUAL | T_EXISTS | T_FLOAT | T_FORALL | T_FALSE | T_IF | T_IN | T_INT | T_KILL | T_LIST | T_LPAREN | T_LSQPAREN | T_MAP | T_MAPS | T_METHODS | T_NEW | T_NIL | T_NONDET | T_OBS | T_OD | T_OF | T_PRIO | T_REQUIRES | T_RPAREN | T_RSQPAREN | T_SELF | T_SET | T_SEMICOLON | T_STATIC | T_SKIP | T_BREAK | T_THEN | T_TRUE | T_TO | T_TYPES | T_VAR | T_WITH | T_AND | T_BIIMPLIES | T_IMPLIES | T_NOT | T_NOTEQUAL | T_OR | T_ABS | T_DIV | T_GREATER | T_GREATEREQUAL | T_IDIV | T_LESS | T_LESSEQUAL | T_MOD | T_POW | T_PROD | T_DERIV | T_CARD | T_CONC | T_DCONC | T_DIFF | T_DINTER | T_DUNION | T_ELEMS | T_HEAD | T_INDS | T_INTER | T_LEN | T_SEQMOD_MAPOVERRIDE | T_SUBSET | T_TAIL | T_UNION | T_FOLDLR | T_FOLDRL | T_DOM | T_DOMRESBY | T_DOMRESTO | T_RNG | T_RNGRESBY | T_RNGRESTO | T_MERGE | T_MUNION | T_CONSTS | T_INFTY | FLOAT_OR_INT_OR_RANGE | T_IDENTIFIER )
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:8: ( T__116 | T__117 | T__118 | T__119 | T__120 | T__121 | T_WS | T_COMMENT | LINE_COMMENT | T_PRIMED | T_STRINGLITERAL | T_ABORT | T_ACTIONS | T_ASSIGNMENT | T_AUTOCONS | T_BAR | T_BOOL | T_CBRL | T_CBRR | T_COLON | T_COMMA | T_CHAR | T_CTRL | T_SYSTEM | T_DO | T_ELSE | T_END | T_EQUAL | T_EXISTS | T_FLOAT | T_FORALL | T_FALSE | T_IF | T_IN | T_INT | T_KILL | T_LIST | T_LPAREN | T_LSQPAREN | T_MAP | T_MAPS | T_METHODS | T_NEW | T_NIL | T_NONDET | T_OBS | T_OD | T_OF | T_PRIO | T_REQUIRES | T_RPAREN | T_RSQPAREN | T_SELF | T_SET | T_SEMICOLON | T_STATIC | T_SKIP | T_BREAK | T_THEN | T_TRUE | T_TO | T_TYPES | T_VAR | T_WITH | T_AND | T_BIIMPLIES | T_IMPLIES | T_NOT | T_NOTEQUAL | T_OR | T_ABS | T_DIV | T_GREATER | T_GREATEREQUAL | T_IDIV | T_LESS | T_LESSEQUAL | T_MOD | T_POW | T_PROD | T_DERIV | T_CARD | T_CONC | T_DCONC | T_DIFF | T_DINTER | T_DUNION | T_ELEMS | T_HEAD | T_INDS | T_INTER | T_LEN | T_SEQMOD_MAPOVERRIDE | T_SUBSET | T_TAIL | T_UNION | T_FOLDLR | T_FOLDRL | T_DOM | T_DOMRESBY | T_DOMRESTO | T_RNG | T_RNGRESBY | T_RNGRESTO | T_MERGE | T_MUNION | T_CONSTS | T_INFTY | FLOAT_OR_INT_OR_RANGE | T_IDENTIFIER )
         int alt16=110;
         alt16 = dfa16.predict(input);
         switch (alt16) {
             case 1 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:10: T__116
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:10: T__116
                 {
                 mT__116(); if (state.failed) return ;
 
@@ -3424,7 +3424,7 @@
                 }
                 break;
             case 2 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:17: T__117
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:17: T__117
                 {
                 mT__117(); if (state.failed) return ;
 
@@ -3432,7 +3432,7 @@
                 }
                 break;
             case 3 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:24: T__118
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:24: T__118
                 {
                 mT__118(); if (state.failed) return ;
 
@@ -3440,7 +3440,7 @@
                 }
                 break;
             case 4 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:31: T__119
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:31: T__119
                 {
                 mT__119(); if (state.failed) return ;
 
@@ -3448,7 +3448,7 @@
                 }
                 break;
             case 5 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:38: T__120
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:38: T__120
                 {
                 mT__120(); if (state.failed) return ;
 
@@ -3456,7 +3456,7 @@
                 }
                 break;
             case 6 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:45: T__121
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:45: T__121
                 {
                 mT__121(); if (state.failed) return ;
 
@@ -3464,7 +3464,7 @@
                 }
                 break;
             case 7 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:52: T_WS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:52: T_WS
                 {
                 mT_WS(); if (state.failed) return ;
 
@@ -3472,7 +3472,7 @@
                 }
                 break;
             case 8 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:57: T_COMMENT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:57: T_COMMENT
                 {
                 mT_COMMENT(); if (state.failed) return ;
 
@@ -3480,7 +3480,7 @@
                 }
                 break;
             case 9 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:67: LINE_COMMENT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:67: LINE_COMMENT
                 {
                 mLINE_COMMENT(); if (state.failed) return ;
 
@@ -3488,7 +3488,7 @@
                 }
                 break;
             case 10 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:80: T_PRIMED
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:80: T_PRIMED
                 {
                 mT_PRIMED(); if (state.failed) return ;
 
@@ -3496,7 +3496,7 @@
                 }
                 break;
             case 11 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:89: T_STRINGLITERAL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:89: T_STRINGLITERAL
                 {
                 mT_STRINGLITERAL(); if (state.failed) return ;
 
@@ -3504,7 +3504,7 @@
                 }
                 break;
             case 12 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:105: T_ABORT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:105: T_ABORT
                 {
                 mT_ABORT(); if (state.failed) return ;
 
@@ -3512,7 +3512,7 @@
                 }
                 break;
             case 13 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:113: T_ACTIONS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:113: T_ACTIONS
                 {
                 mT_ACTIONS(); if (state.failed) return ;
 
@@ -3520,7 +3520,7 @@
                 }
                 break;
             case 14 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:123: T_ASSIGNMENT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:123: T_ASSIGNMENT
                 {
                 mT_ASSIGNMENT(); if (state.failed) return ;
 
@@ -3528,7 +3528,7 @@
                 }
                 break;
             case 15 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:136: T_AUTOCONS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:136: T_AUTOCONS
                 {
                 mT_AUTOCONS(); if (state.failed) return ;
 
@@ -3536,7 +3536,7 @@
                 }
                 break;
             case 16 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:147: T_BAR
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:147: T_BAR
                 {
                 mT_BAR(); if (state.failed) return ;
 
@@ -3544,7 +3544,7 @@
                 }
                 break;
             case 17 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:153: T_BOOL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:153: T_BOOL
                 {
                 mT_BOOL(); if (state.failed) return ;
 
@@ -3552,7 +3552,7 @@
                 }
                 break;
             case 18 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:160: T_CBRL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:160: T_CBRL
                 {
                 mT_CBRL(); if (state.failed) return ;
 
@@ -3560,7 +3560,7 @@
                 }
                 break;
             case 19 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:167: T_CBRR
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:167: T_CBRR
                 {
                 mT_CBRR(); if (state.failed) return ;
 
@@ -3568,7 +3568,7 @@
                 }
                 break;
             case 20 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:174: T_COLON
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:174: T_COLON
                 {
                 mT_COLON(); if (state.failed) return ;
 
@@ -3576,7 +3576,7 @@
                 }
                 break;
             case 21 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:182: T_COMMA
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:182: T_COMMA
                 {
                 mT_COMMA(); if (state.failed) return ;
 
@@ -3584,7 +3584,7 @@
                 }
                 break;
             case 22 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:190: T_CHAR
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:190: T_CHAR
                 {
                 mT_CHAR(); if (state.failed) return ;
 
@@ -3592,7 +3592,7 @@
                 }
                 break;
             case 23 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:197: T_CTRL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:197: T_CTRL
                 {
                 mT_CTRL(); if (state.failed) return ;
 
@@ -3600,7 +3600,7 @@
                 }
                 break;
             case 24 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:204: T_SYSTEM
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:204: T_SYSTEM
                 {
                 mT_SYSTEM(); if (state.failed) return ;
 
@@ -3608,7 +3608,7 @@
                 }
                 break;
             case 25 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:213: T_DO
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:213: T_DO
                 {
                 mT_DO(); if (state.failed) return ;
 
@@ -3616,7 +3616,7 @@
                 }
                 break;
             case 26 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:218: T_ELSE
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:218: T_ELSE
                 {
                 mT_ELSE(); if (state.failed) return ;
 
@@ -3624,7 +3624,7 @@
                 }
                 break;
             case 27 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:225: T_END
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:225: T_END
                 {
                 mT_END(); if (state.failed) return ;
 
@@ -3632,7 +3632,7 @@
                 }
                 break;
             case 28 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:231: T_EQUAL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:231: T_EQUAL
                 {
                 mT_EQUAL(); if (state.failed) return ;
 
@@ -3640,7 +3640,7 @@
                 }
                 break;
             case 29 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:239: T_EXISTS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:239: T_EXISTS
                 {
                 mT_EXISTS(); if (state.failed) return ;
 
@@ -3648,7 +3648,7 @@
                 }
                 break;
             case 30 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:248: T_FLOAT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:248: T_FLOAT
                 {
                 mT_FLOAT(); if (state.failed) return ;
 
@@ -3656,7 +3656,7 @@
                 }
                 break;
             case 31 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:256: T_FORALL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:256: T_FORALL
                 {
                 mT_FORALL(); if (state.failed) return ;
 
@@ -3664,7 +3664,7 @@
                 }
                 break;
             case 32 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:265: T_FALSE
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:265: T_FALSE
                 {
                 mT_FALSE(); if (state.failed) return ;
 
@@ -3672,7 +3672,7 @@
                 }
                 break;
             case 33 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:273: T_IF
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:273: T_IF
                 {
                 mT_IF(); if (state.failed) return ;
 
@@ -3680,7 +3680,7 @@
                 }
                 break;
             case 34 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:278: T_IN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:278: T_IN
                 {
                 mT_IN(); if (state.failed) return ;
 
@@ -3688,7 +3688,7 @@
                 }
                 break;
             case 35 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:283: T_INT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:283: T_INT
                 {
                 mT_INT(); if (state.failed) return ;
 
@@ -3696,7 +3696,7 @@
                 }
                 break;
             case 36 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:289: T_KILL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:289: T_KILL
                 {
                 mT_KILL(); if (state.failed) return ;
 
@@ -3704,7 +3704,7 @@
                 }
                 break;
             case 37 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:296: T_LIST
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:296: T_LIST
                 {
                 mT_LIST(); if (state.failed) return ;
 
@@ -3712,7 +3712,7 @@
                 }
                 break;
             case 38 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:303: T_LPAREN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:303: T_LPAREN
                 {
                 mT_LPAREN(); if (state.failed) return ;
 
@@ -3720,7 +3720,7 @@
                 }
                 break;
             case 39 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:312: T_LSQPAREN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:312: T_LSQPAREN
                 {
                 mT_LSQPAREN(); if (state.failed) return ;
 
@@ -3728,7 +3728,7 @@
                 }
                 break;
             case 40 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:323: T_MAP
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:323: T_MAP
                 {
                 mT_MAP(); if (state.failed) return ;
 
@@ -3736,7 +3736,7 @@
                 }
                 break;
             case 41 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:329: T_MAPS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:329: T_MAPS
                 {
                 mT_MAPS(); if (state.failed) return ;
 
@@ -3744,7 +3744,7 @@
                 }
                 break;
             case 42 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:336: T_METHODS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:336: T_METHODS
                 {
                 mT_METHODS(); if (state.failed) return ;
 
@@ -3752,7 +3752,7 @@
                 }
                 break;
             case 43 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:346: T_NEW
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:346: T_NEW
                 {
                 mT_NEW(); if (state.failed) return ;
 
@@ -3760,7 +3760,7 @@
                 }
                 break;
             case 44 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:352: T_NIL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:352: T_NIL
                 {
                 mT_NIL(); if (state.failed) return ;
 
@@ -3768,7 +3768,7 @@
                 }
                 break;
             case 45 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:358: T_NONDET
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:358: T_NONDET
                 {
                 mT_NONDET(); if (state.failed) return ;
 
@@ -3776,7 +3776,7 @@
                 }
                 break;
             case 46 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:367: T_OBS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:367: T_OBS
                 {
                 mT_OBS(); if (state.failed) return ;
 
@@ -3784,7 +3784,7 @@
                 }
                 break;
             case 47 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:373: T_OD
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:373: T_OD
                 {
                 mT_OD(); if (state.failed) return ;
 
@@ -3792,7 +3792,7 @@
                 }
                 break;
             case 48 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:378: T_OF
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:378: T_OF
                 {
                 mT_OF(); if (state.failed) return ;
 
@@ -3800,7 +3800,7 @@
                 }
                 break;
             case 49 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:383: T_PRIO
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:383: T_PRIO
                 {
                 mT_PRIO(); if (state.failed) return ;
 
@@ -3808,7 +3808,7 @@
                 }
                 break;
             case 50 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:390: T_REQUIRES
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:390: T_REQUIRES
                 {
                 mT_REQUIRES(); if (state.failed) return ;
 
@@ -3816,7 +3816,7 @@
                 }
                 break;
             case 51 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:401: T_RPAREN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:401: T_RPAREN
                 {
                 mT_RPAREN(); if (state.failed) return ;
 
@@ -3824,7 +3824,7 @@
                 }
                 break;
             case 52 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:410: T_RSQPAREN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:410: T_RSQPAREN
                 {
                 mT_RSQPAREN(); if (state.failed) return ;
 
@@ -3832,7 +3832,7 @@
                 }
                 break;
             case 53 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:421: T_SELF
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:421: T_SELF
                 {
                 mT_SELF(); if (state.failed) return ;
 
@@ -3840,7 +3840,7 @@
                 }
                 break;
             case 54 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:428: T_SET
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:428: T_SET
                 {
                 mT_SET(); if (state.failed) return ;
 
@@ -3848,7 +3848,7 @@
                 }
                 break;
             case 55 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:434: T_SEMICOLON
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:434: T_SEMICOLON
                 {
                 mT_SEMICOLON(); if (state.failed) return ;
 
@@ -3856,7 +3856,7 @@
                 }
                 break;
             case 56 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:446: T_STATIC
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:446: T_STATIC
                 {
                 mT_STATIC(); if (state.failed) return ;
 
@@ -3864,7 +3864,7 @@
                 }
                 break;
             case 57 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:455: T_SKIP
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:455: T_SKIP
                 {
                 mT_SKIP(); if (state.failed) return ;
 
@@ -3872,7 +3872,7 @@
                 }
                 break;
             case 58 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:462: T_BREAK
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:462: T_BREAK
                 {
                 mT_BREAK(); if (state.failed) return ;
 
@@ -3880,7 +3880,7 @@
                 }
                 break;
             case 59 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:470: T_THEN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:470: T_THEN
                 {
                 mT_THEN(); if (state.failed) return ;
 
@@ -3888,7 +3888,7 @@
                 }
                 break;
             case 60 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:477: T_TRUE
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:477: T_TRUE
                 {
                 mT_TRUE(); if (state.failed) return ;
 
@@ -3896,7 +3896,7 @@
                 }
                 break;
             case 61 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:484: T_TO
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:484: T_TO
                 {
                 mT_TO(); if (state.failed) return ;
 
@@ -3904,7 +3904,7 @@
                 }
                 break;
             case 62 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:489: T_TYPES
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:489: T_TYPES
                 {
                 mT_TYPES(); if (state.failed) return ;
 
@@ -3912,7 +3912,7 @@
                 }
                 break;
             case 63 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:497: T_VAR
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:497: T_VAR
                 {
                 mT_VAR(); if (state.failed) return ;
 
@@ -3920,7 +3920,7 @@
                 }
                 break;
             case 64 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:503: T_WITH
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:503: T_WITH
                 {
                 mT_WITH(); if (state.failed) return ;
 
@@ -3928,7 +3928,7 @@
                 }
                 break;
             case 65 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:510: T_AND
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:510: T_AND
                 {
                 mT_AND(); if (state.failed) return ;
 
@@ -3936,7 +3936,7 @@
                 }
                 break;
             case 66 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:516: T_BIIMPLIES
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:516: T_BIIMPLIES
                 {
                 mT_BIIMPLIES(); if (state.failed) return ;
 
@@ -3944,7 +3944,7 @@
                 }
                 break;
             case 67 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:528: T_IMPLIES
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:528: T_IMPLIES
                 {
                 mT_IMPLIES(); if (state.failed) return ;
 
@@ -3952,7 +3952,7 @@
                 }
                 break;
             case 68 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:538: T_NOT
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:538: T_NOT
                 {
                 mT_NOT(); if (state.failed) return ;
 
@@ -3960,7 +3960,7 @@
                 }
                 break;
             case 69 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:544: T_NOTEQUAL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:544: T_NOTEQUAL
                 {
                 mT_NOTEQUAL(); if (state.failed) return ;
 
@@ -3968,7 +3968,7 @@
                 }
                 break;
             case 70 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:555: T_OR
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:555: T_OR
                 {
                 mT_OR(); if (state.failed) return ;
 
@@ -3976,7 +3976,7 @@
                 }
                 break;
             case 71 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:560: T_ABS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:560: T_ABS
                 {
                 mT_ABS(); if (state.failed) return ;
 
@@ -3984,7 +3984,7 @@
                 }
                 break;
             case 72 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:566: T_DIV
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:566: T_DIV
                 {
                 mT_DIV(); if (state.failed) return ;
 
@@ -3992,7 +3992,7 @@
                 }
                 break;
             case 73 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:572: T_GREATER
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:572: T_GREATER
                 {
                 mT_GREATER(); if (state.failed) return ;
 
@@ -4000,7 +4000,7 @@
                 }
                 break;
             case 74 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:582: T_GREATEREQUAL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:582: T_GREATEREQUAL
                 {
                 mT_GREATEREQUAL(); if (state.failed) return ;
 
@@ -4008,7 +4008,7 @@
                 }
                 break;
             case 75 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:597: T_IDIV
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:597: T_IDIV
                 {
                 mT_IDIV(); if (state.failed) return ;
 
@@ -4016,7 +4016,7 @@
                 }
                 break;
             case 76 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:604: T_LESS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:604: T_LESS
                 {
                 mT_LESS(); if (state.failed) return ;
 
@@ -4024,7 +4024,7 @@
                 }
                 break;
             case 77 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:611: T_LESSEQUAL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:611: T_LESSEQUAL
                 {
                 mT_LESSEQUAL(); if (state.failed) return ;
 
@@ -4032,7 +4032,7 @@
                 }
                 break;
             case 78 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:623: T_MOD
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:623: T_MOD
                 {
                 mT_MOD(); if (state.failed) return ;
 
@@ -4040,7 +4040,7 @@
                 }
                 break;
             case 79 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:629: T_POW
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:629: T_POW
                 {
                 mT_POW(); if (state.failed) return ;
 
@@ -4048,7 +4048,7 @@
                 }
                 break;
             case 80 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:635: T_PROD
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:635: T_PROD
                 {
                 mT_PROD(); if (state.failed) return ;
 
@@ -4056,7 +4056,7 @@
                 }
                 break;
             case 81 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:642: T_DERIV
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:642: T_DERIV
                 {
                 mT_DERIV(); if (state.failed) return ;
 
@@ -4064,7 +4064,7 @@
                 }
                 break;
             case 82 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:650: T_CARD
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:650: T_CARD
                 {
                 mT_CARD(); if (state.failed) return ;
 
@@ -4072,7 +4072,7 @@
                 }
                 break;
             case 83 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:657: T_CONC
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:657: T_CONC
                 {
                 mT_CONC(); if (state.failed) return ;
 
@@ -4080,7 +4080,7 @@
                 }
                 break;
             case 84 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:664: T_DCONC
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:664: T_DCONC
                 {
                 mT_DCONC(); if (state.failed) return ;
 
@@ -4088,7 +4088,7 @@
                 }
                 break;
             case 85 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:672: T_DIFF
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:672: T_DIFF
                 {
                 mT_DIFF(); if (state.failed) return ;
 
@@ -4096,7 +4096,7 @@
                 }
                 break;
             case 86 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:679: T_DINTER
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:679: T_DINTER
                 {
                 mT_DINTER(); if (state.failed) return ;
 
@@ -4104,7 +4104,7 @@
                 }
                 break;
             case 87 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:688: T_DUNION
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:688: T_DUNION
                 {
                 mT_DUNION(); if (state.failed) return ;
 
@@ -4112,7 +4112,7 @@
                 }
                 break;
             case 88 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:697: T_ELEMS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:697: T_ELEMS
                 {
                 mT_ELEMS(); if (state.failed) return ;
 
@@ -4120,7 +4120,7 @@
                 }
                 break;
             case 89 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:705: T_HEAD
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:705: T_HEAD
                 {
                 mT_HEAD(); if (state.failed) return ;
 
@@ -4128,7 +4128,7 @@
                 }
                 break;
             case 90 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:712: T_INDS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:712: T_INDS
                 {
                 mT_INDS(); if (state.failed) return ;
 
@@ -4136,7 +4136,7 @@
                 }
                 break;
             case 91 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:719: T_INTER
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:719: T_INTER
                 {
                 mT_INTER(); if (state.failed) return ;
 
@@ -4144,7 +4144,7 @@
                 }
                 break;
             case 92 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:727: T_LEN
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:727: T_LEN
                 {
                 mT_LEN(); if (state.failed) return ;
 
@@ -4152,7 +4152,7 @@
                 }
                 break;
             case 93 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:733: T_SEQMOD_MAPOVERRIDE
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:733: T_SEQMOD_MAPOVERRIDE
                 {
                 mT_SEQMOD_MAPOVERRIDE(); if (state.failed) return ;
 
@@ -4160,7 +4160,7 @@
                 }
                 break;
             case 94 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:754: T_SUBSET
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:754: T_SUBSET
                 {
                 mT_SUBSET(); if (state.failed) return ;
 
@@ -4168,7 +4168,7 @@
                 }
                 break;
             case 95 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:763: T_TAIL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:763: T_TAIL
                 {
                 mT_TAIL(); if (state.failed) return ;
 
@@ -4176,7 +4176,7 @@
                 }
                 break;
             case 96 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:770: T_UNION
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:770: T_UNION
                 {
                 mT_UNION(); if (state.failed) return ;
 
@@ -4184,7 +4184,7 @@
                 }
                 break;
             case 97 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:778: T_FOLDLR
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:778: T_FOLDLR
                 {
                 mT_FOLDLR(); if (state.failed) return ;
 
@@ -4192,7 +4192,7 @@
                 }
                 break;
             case 98 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:787: T_FOLDRL
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:787: T_FOLDRL
                 {
                 mT_FOLDRL(); if (state.failed) return ;
 
@@ -4200,7 +4200,7 @@
                 }
                 break;
             case 99 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:796: T_DOM
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:796: T_DOM
                 {
                 mT_DOM(); if (state.failed) return ;
 
@@ -4208,7 +4208,7 @@
                 }
                 break;
             case 100 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:802: T_DOMRESBY
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:802: T_DOMRESBY
                 {
                 mT_DOMRESBY(); if (state.failed) return ;
 
@@ -4216,7 +4216,7 @@
                 }
                 break;
             case 101 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:813: T_DOMRESTO
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:813: T_DOMRESTO
                 {
                 mT_DOMRESTO(); if (state.failed) return ;
 
@@ -4224,7 +4224,7 @@
                 }
                 break;
             case 102 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:824: T_RNG
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:824: T_RNG
                 {
                 mT_RNG(); if (state.failed) return ;
 
@@ -4232,7 +4232,7 @@
                 }
                 break;
             case 103 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:830: T_RNGRESBY
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:830: T_RNGRESBY
                 {
                 mT_RNGRESBY(); if (state.failed) return ;
 
@@ -4240,7 +4240,7 @@
                 }
                 break;
             case 104 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:841: T_RNGRESTO
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:841: T_RNGRESTO
                 {
                 mT_RNGRESTO(); if (state.failed) return ;
 
@@ -4248,7 +4248,7 @@
                 }
                 break;
             case 105 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:852: T_MERGE
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:852: T_MERGE
                 {
                 mT_MERGE(); if (state.failed) return ;
 
@@ -4256,7 +4256,7 @@
                 }
                 break;
             case 106 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:860: T_MUNION
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:860: T_MUNION
                 {
                 mT_MUNION(); if (state.failed) return ;
 
@@ -4264,7 +4264,7 @@
                 }
                 break;
             case 107 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:869: T_CONSTS
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:869: T_CONSTS
                 {
                 mT_CONSTS(); if (state.failed) return ;
 
@@ -4272,7 +4272,7 @@
                 }
                 break;
             case 108 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:878: T_INFTY
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:878: T_INFTY
                 {
                 mT_INFTY(); if (state.failed) return ;
 
@@ -4280,7 +4280,7 @@
                 }
                 break;
             case 109 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:886: FLOAT_OR_INT_OR_RANGE
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:886: FLOAT_OR_INT_OR_RANGE
                 {
                 mFLOAT_OR_INT_OR_RANGE(); if (state.failed) return ;
 
@@ -4288,7 +4288,7 @@
                 }
                 break;
             case 110 :
-                // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:908: T_IDENTIFIER
+                // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1:908: T_IDENTIFIER
                 {
                 mT_IDENTIFIER(); if (state.failed) return ;
 
@@ -4302,8 +4302,8 @@
 
     // $ANTLR start synpred1_ooa
     public final void synpred1_ooa_fragment() throws RecognitionException {
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:944:9: ( '\"' '\"' )
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:944:11: '\"' '\"'
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:948:9: ( '\"' '\"' )
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:948:11: '\"' '\"'
         {
         match('\"'); if (state.failed) return ;
 
@@ -4316,8 +4316,8 @@
 
     // $ANTLR start synpred2_ooa
     public final void synpred2_ooa_fragment() throws RecognitionException {
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1098:5: ( T_POINT T_POINT )
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1098:6: T_POINT T_POINT
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1102:5: ( T_POINT T_POINT )
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1102:6: T_POINT T_POINT
         {
         mT_POINT(); if (state.failed) return ;
 
@@ -4332,8 +4332,8 @@
 
     // $ANTLR start synpred3_ooa
     public final void synpred3_ooa_fragment() throws RecognitionException {
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:6: ( T_POINT T_DIGIT )
-        // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1099:7: T_POINT T_DIGIT
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:6: ( T_POINT T_DIGIT )
+        // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:1103:7: T_POINT T_DIGIT
         {
         mT_POINT(); if (state.failed) return ;
 
@@ -4360,11 +4360,11 @@
         state.failed=false;
         return success;
     }
-    public final boolean synpred3_ooa() {
+    public final boolean synpred1_ooa() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred3_ooa_fragment(); // can never throw exception
+            synpred1_ooa_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
@@ -4374,11 +4374,11 @@
         state.failed=false;
         return success;
     }
-    public final boolean synpred1_ooa() {
+    public final boolean synpred3_ooa() {
         state.backtracking++;
         int start = input.mark();
         try {
-            synpred1_ooa_fragment(); // can never throw exception
+            synpred3_ooa_fragment(); // can never throw exception
         } catch (RecognitionException re) {
             System.err.println("impossible: "+re);
         }
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaParser.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaParser.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/parser/ooaParser.java	(revision 12)
@@ -1,10 +1,11 @@
-// $ANTLR 3.4 /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g 2015-08-31 13:32:37
+// $ANTLR 3.4 /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g 2016-09-13 11:30:03
 
  /*
     Ulysses OO-Action System Parser
 
     Copyright Graz University of Technology 2009
-    Copyright AIT Austrian Institute of Technology 2013
+    Copyright AIT Austrian Institute of Technology 2013, 2016
+    Version 1.09
  */
  package org.momut.ooas.parser;
 
@@ -162,23 +163,23 @@
     @Override
 	public String[] getTokenNames() { return ooaParser.tokenNames; }
     @Override
-	public String getGrammarFileName() { return "/home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g"; }
+	public String getGrammarFileName() { return "/home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g"; }
 
 
 
     // $ANTLR start "ooActionSystems"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:154:1: ooActionSystems : ( T_CONSTS namedConstList )? T_TYPES namedTypeList T_SYSTEM comp= asTypeComposition[null] ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:158:1: ooActionSystems : ( T_CONSTS namedConstList )? T_TYPES namedTypeList T_SYSTEM comp= asTypeComposition[null] ;
     public final void ooActionSystems() {
         IdentifierList comp =null;
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:155:2: ( ( T_CONSTS namedConstList )? T_TYPES namedTypeList T_SYSTEM comp= asTypeComposition[null] )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:155:4: ( T_CONSTS namedConstList )? T_TYPES namedTypeList T_SYSTEM comp= asTypeComposition[null]
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:159:2: ( ( T_CONSTS namedConstList )? T_TYPES namedTypeList T_SYSTEM comp= asTypeComposition[null] )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:159:4: ( T_CONSTS namedConstList )? T_TYPES namedTypeList T_SYSTEM comp= asTypeComposition[null]
             {
             initializeTopLevelParserState();
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:157:11: ( T_CONSTS namedConstList )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:161:11: ( T_CONSTS namedConstList )?
             int alt1=2;
             final int LA1_0 = input.LA(1);
 
@@ -187,7 +188,7 @@
             }
             switch (alt1) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:157:12: T_CONSTS namedConstList
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:161:12: T_CONSTS namedConstList
                     {
                     match(input,T_CONSTS,FOLLOW_T_CONSTS_in_ooActionSystems74);
 
@@ -239,11 +240,11 @@
 
 
     // $ANTLR start "namedConstList"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:172:1: namedConstList : namedConst ( T_SEMICOLON namedConst )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:176:1: namedConstList : namedConst ( T_SEMICOLON namedConst )* ;
     public final void namedConstList() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:173:2: ( namedConst ( T_SEMICOLON namedConst )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:173:4: namedConst ( T_SEMICOLON namedConst )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:177:2: ( namedConst ( T_SEMICOLON namedConst )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:177:4: namedConst ( T_SEMICOLON namedConst )*
             {
             pushFollow(FOLLOW_namedConst_in_namedConstList129);
             namedConst();
@@ -251,7 +252,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:173:15: ( T_SEMICOLON namedConst )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:177:15: ( T_SEMICOLON namedConst )*
             loop2:
             do {
                 int alt2=2;
@@ -264,7 +265,7 @@
 
                 switch (alt2) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:173:16: T_SEMICOLON namedConst
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:177:16: T_SEMICOLON namedConst
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_namedConstList132);
 
@@ -301,7 +302,7 @@
 
 
     // $ANTLR start "namedConst"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:176:1: namedConst : aName= T_IDENTIFIER T_EQUAL anExpr= expression ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:180:1: namedConst : aName= T_IDENTIFIER T_EQUAL anExpr= expression ;
     public final void namedConst() throws RecognitionException {
         Token aName=null;
         Expression anExpr =null;
@@ -308,8 +309,8 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:177:2: (aName= T_IDENTIFIER T_EQUAL anExpr= expression )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:177:4: aName= T_IDENTIFIER T_EQUAL anExpr= expression
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:181:2: (aName= T_IDENTIFIER T_EQUAL anExpr= expression )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:181:4: aName= T_IDENTIFIER T_EQUAL anExpr= expression
             {
             aName=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_namedConst150);
 
@@ -341,11 +342,11 @@
 
 
     // $ANTLR start "namedTypeList"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:187:1: namedTypeList : namedType ( T_SEMICOLON namedType )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:191:1: namedTypeList : namedType ( T_SEMICOLON namedType )* ;
     public final void namedTypeList() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:188:2: ( namedType ( T_SEMICOLON namedType )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:188:4: namedType ( T_SEMICOLON namedType )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:192:2: ( namedType ( T_SEMICOLON namedType )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:192:4: namedType ( T_SEMICOLON namedType )*
             {
             pushFollow(FOLLOW_namedType_in_namedTypeList180);
             namedType();
@@ -353,7 +354,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:188:14: ( T_SEMICOLON namedType )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:192:14: ( T_SEMICOLON namedType )*
             loop3:
             do {
                 int alt3=2;
@@ -366,7 +367,7 @@
 
                 switch (alt3) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:188:15: T_SEMICOLON namedType
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:192:15: T_SEMICOLON namedType
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_namedTypeList183);
 
@@ -403,7 +404,7 @@
 
 
     // $ANTLR start "namedType"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:191:1: namedType : aName= T_IDENTIFIER T_EQUAL (aType= complexType |anOoaType= ooActionSystem ) ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:195:1: namedType : aName= T_IDENTIFIER T_EQUAL (aType= complexType |anOoaType= ooActionSystem ) ;
     public final void namedType() throws RecognitionException {
         Token aName=null;
         Type aType =null;
@@ -412,14 +413,14 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:192:2: (aName= T_IDENTIFIER T_EQUAL (aType= complexType |anOoaType= ooActionSystem ) )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:192:4: aName= T_IDENTIFIER T_EQUAL (aType= complexType |anOoaType= ooActionSystem )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:196:2: (aName= T_IDENTIFIER T_EQUAL (aType= complexType |anOoaType= ooActionSystem ) )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:196:4: aName= T_IDENTIFIER T_EQUAL (aType= complexType |anOoaType= ooActionSystem )
             {
             aName=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_namedType201);
 
             match(input,T_EQUAL,FOLLOW_T_EQUAL_in_namedType206);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:194:3: (aType= complexType |anOoaType= ooActionSystem )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:198:3: (aType= complexType |anOoaType= ooActionSystem )
             int alt4=2;
             final int LA4_0 = input.LA(1);
 
@@ -438,7 +439,7 @@
             }
             switch (alt4) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:195:4: aType= complexType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:199:4: aType= complexType
                     {
                     pushFollow(FOLLOW_complexType_in_namedType218);
                     aType=complexType();
@@ -451,7 +452,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:196:5: anOoaType= ooActionSystem
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:200:5: anOoaType= ooActionSystem
                     {
                     pushFollow(FOLLOW_ooActionSystem_in_namedType230);
                     anOoaType=ooActionSystem();
@@ -485,14 +486,14 @@
 
 
     // $ANTLR start "asTypeComposition"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:202:1: asTypeComposition[IdentifierList top] returns [IdentifierList prioList] : asTypeCompositionParallel[prioList] ( T_PRIO asTypeCompositionParallel[prioList] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:206:1: asTypeComposition[IdentifierList top] returns [IdentifierList prioList] : asTypeCompositionParallel[prioList] ( T_PRIO asTypeCompositionParallel[prioList] )* ;
     public final IdentifierList asTypeComposition(IdentifierList top) throws RecognitionException {
         IdentifierList prioList = null;
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:204:2: ( asTypeCompositionParallel[prioList] ( T_PRIO asTypeCompositionParallel[prioList] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:204:6: asTypeCompositionParallel[prioList] ( T_PRIO asTypeCompositionParallel[prioList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:208:2: ( asTypeCompositionParallel[prioList] ( T_PRIO asTypeCompositionParallel[prioList] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:208:6: asTypeCompositionParallel[prioList] ( T_PRIO asTypeCompositionParallel[prioList] )*
             {
             prioList = new PrioIdentifierList(top);
 
@@ -502,7 +503,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:205:40: ( T_PRIO asTypeCompositionParallel[prioList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:209:40: ( T_PRIO asTypeCompositionParallel[prioList] )*
             loop5:
             do {
                 int alt5=2;
@@ -515,7 +516,7 @@
 
                 switch (alt5) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:205:41: T_PRIO asTypeCompositionParallel[prioList]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:209:41: T_PRIO asTypeCompositionParallel[prioList]
             	    {
             	    match(input,T_PRIO,FOLLOW_T_PRIO_in_asTypeComposition271);
 
@@ -552,11 +553,11 @@
 
 
     // $ANTLR start "asTypeCompositionParallel"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:208:1: asTypeCompositionParallel[IdentifierList top] : asTypeCompositionSequential[parList] ( T_NONDET asTypeCompositionSequential[parList] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:212:1: asTypeCompositionParallel[IdentifierList top] : asTypeCompositionSequential[parList] ( T_NONDET asTypeCompositionSequential[parList] )* ;
     public final void asTypeCompositionParallel(IdentifierList top) throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:209:2: ( asTypeCompositionSequential[parList] ( T_NONDET asTypeCompositionSequential[parList] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:209:6: asTypeCompositionSequential[parList] ( T_NONDET asTypeCompositionSequential[parList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:213:2: ( asTypeCompositionSequential[parList] ( T_NONDET asTypeCompositionSequential[parList] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:213:6: asTypeCompositionSequential[parList] ( T_NONDET asTypeCompositionSequential[parList] )*
             {
             final IdentifierList parList = new NondetIdentifierList(top);
 
@@ -566,7 +567,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:210:40: ( T_NONDET asTypeCompositionSequential[parList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:214:40: ( T_NONDET asTypeCompositionSequential[parList] )*
             loop6:
             do {
                 int alt6=2;
@@ -579,7 +580,7 @@
 
                 switch (alt6) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:210:41: T_NONDET asTypeCompositionSequential[parList]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:214:41: T_NONDET asTypeCompositionSequential[parList]
             	    {
             	    match(input,T_NONDET,FOLLOW_T_NONDET_in_asTypeCompositionParallel300);
 
@@ -616,11 +617,11 @@
 
 
     // $ANTLR start "asTypeCompositionSequential"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:213:1: asTypeCompositionSequential[IdentifierList top] : asTypeCompositionBlockParen[seqList] ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:217:1: asTypeCompositionSequential[IdentifierList top] : asTypeCompositionBlockParen[seqList] ;
     public final void asTypeCompositionSequential(IdentifierList top) throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:214:2: ( asTypeCompositionBlockParen[seqList] )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:214:6: asTypeCompositionBlockParen[seqList]
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:218:2: ( asTypeCompositionBlockParen[seqList] )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:218:6: asTypeCompositionBlockParen[seqList]
             {
             final IdentifierList seqList = new SeqIdentifierList(top);
 
@@ -648,12 +649,12 @@
 
 
     // $ANTLR start "asTypeCompositionBlockParen"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:218:1: asTypeCompositionBlockParen[IdentifierList top] : ( T_LPAREN asTypeComposition[top] T_RPAREN |aName= T_IDENTIFIER );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:222:1: asTypeCompositionBlockParen[IdentifierList top] : ( T_LPAREN asTypeComposition[top] T_RPAREN |aName= T_IDENTIFIER );
     public final void asTypeCompositionBlockParen(IdentifierList top) throws RecognitionException {
         Token aName=null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:219:2: ( T_LPAREN asTypeComposition[top] T_RPAREN |aName= T_IDENTIFIER )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:223:2: ( T_LPAREN asTypeComposition[top] T_RPAREN |aName= T_IDENTIFIER )
             int alt7=2;
             final int LA7_0 = input.LA(1);
 
@@ -672,7 +673,7 @@
             }
             switch (alt7) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:219:4: T_LPAREN asTypeComposition[top] T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:223:4: T_LPAREN asTypeComposition[top] T_RPAREN
                     {
                     match(input,T_LPAREN,FOLLOW_T_LPAREN_in_asTypeCompositionBlockParen339);
 
@@ -687,7 +688,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:220:4: aName= T_IDENTIFIER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:224:4: aName= T_IDENTIFIER
                     {
                     aName=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_asTypeCompositionBlockParen351);
 
@@ -713,7 +714,7 @@
 
 
     // $ANTLR start "complexType"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:228:1: complexType returns [Type aTypeSymbol] : ( T_LIST T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN T_OF innertype= complexType | T_LSQPAREN alistelem= T_IDENTIFIER ( T_COMMA otherlistelem= T_IDENTIFIER )* T_RSQPAREN | T_MAP ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )? mapfromtype= simpleType T_TO maptotype= complexType | T_LPAREN aType= complexType ( T_COMMA anotherType= complexType )* T_RPAREN |r= simpleType );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:232:1: complexType returns [Type aTypeSymbol] : ( T_LIST T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN T_OF innertype= complexType | T_LSQPAREN alistelem= T_IDENTIFIER ( T_COMMA otherlistelem= T_IDENTIFIER )* T_RSQPAREN | T_MAP ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )? mapfromtype= simpleType T_TO maptotype= complexType | T_LPAREN aType= complexType ( T_COMMA anotherType= complexType )* T_RPAREN |r= simpleType );
     public final Type complexType() throws RecognitionException {
         Type aTypeSymbol = null;
 
@@ -738,7 +739,7 @@
         		aTypeSymbol = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:233:2: ( T_LIST T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN T_OF innertype= complexType | T_LSQPAREN alistelem= T_IDENTIFIER ( T_COMMA otherlistelem= T_IDENTIFIER )* T_RSQPAREN | T_MAP ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )? mapfromtype= simpleType T_TO maptotype= complexType | T_LPAREN aType= complexType ( T_COMMA anotherType= complexType )* T_RPAREN |r= simpleType )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:237:2: ( T_LIST T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN T_OF innertype= complexType | T_LSQPAREN alistelem= T_IDENTIFIER ( T_COMMA otherlistelem= T_IDENTIFIER )* T_RSQPAREN | T_MAP ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )? mapfromtype= simpleType T_TO maptotype= complexType | T_LPAREN aType= complexType ( T_COMMA anotherType= complexType )* T_RPAREN |r= simpleType )
             int alt11=5;
             switch ( input.LA(1) ) {
             case T_LIST:
@@ -781,7 +782,7 @@
 
             switch (alt11) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:233:4: T_LIST T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN T_OF innertype= complexType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:237:4: T_LIST T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN T_OF innertype= complexType
                     {
                     match(input,T_LIST,FOLLOW_T_LIST_in_complexType382);
 
@@ -814,7 +815,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:237:4: T_LSQPAREN alistelem= T_IDENTIFIER ( T_COMMA otherlistelem= T_IDENTIFIER )* T_RSQPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:241:4: T_LSQPAREN alistelem= T_IDENTIFIER ( T_COMMA otherlistelem= T_IDENTIFIER )* T_RSQPAREN
                     {
                     match(input,T_LSQPAREN,FOLLOW_T_LSQPAREN_in_complexType417);
 
@@ -822,7 +823,7 @@
 
                     aTypeSymbol = createListEnumType(alistelem);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:238:4: ( T_COMMA otherlistelem= T_IDENTIFIER )*
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:242:4: ( T_COMMA otherlistelem= T_IDENTIFIER )*
                     loop8:
                     do {
                         int alt8=2;
@@ -835,7 +836,7 @@
 
                         switch (alt8) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:238:5: T_COMMA otherlistelem= T_IDENTIFIER
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:242:5: T_COMMA otherlistelem= T_IDENTIFIER
                     	    {
                     	    match(input,T_COMMA,FOLLOW_T_COMMA_in_complexType430);
 
@@ -857,11 +858,11 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:241:4: T_MAP ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )? mapfromtype= simpleType T_TO maptotype= complexType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:245:4: T_MAP ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )? mapfromtype= simpleType T_TO maptotype= complexType
                     {
                     match(input,T_MAP,FOLLOW_T_MAP_in_complexType450);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:241:12: ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:245:12: ( T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN )?
                     int alt9=2;
                     final int LA9_0 = input.LA(1);
 
@@ -870,7 +871,7 @@
                     }
                     switch (alt9) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:241:13: T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:245:13: T_LSQPAREN numOfElements= ( T_INTNUMBER | T_IDENTIFIER ) T_RSQPAREN
                             {
                             match(input,T_LSQPAREN,FOLLOW_T_LSQPAREN_in_complexType455);
 
@@ -913,7 +914,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:244:5: T_LPAREN aType= complexType ( T_COMMA anotherType= complexType )* T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:248:5: T_LPAREN aType= complexType ( T_COMMA anotherType= complexType )* T_RPAREN
                     {
                     match(input,T_LPAREN,FOLLOW_T_LPAREN_in_complexType492);
 
@@ -925,7 +926,7 @@
 
                     aTypeSymbol = createTupleType(aType);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:245:4: ( T_COMMA anotherType= complexType )*
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:249:4: ( T_COMMA anotherType= complexType )*
                     loop10:
                     do {
                         int alt10=2;
@@ -938,7 +939,7 @@
 
                         switch (alt10) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:245:5: T_COMMA anotherType= complexType
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:249:5: T_COMMA anotherType= complexType
                     	    {
                     	    match(input,T_COMMA,FOLLOW_T_COMMA_in_complexType505);
 
@@ -964,7 +965,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:248:4: r= simpleType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:252:4: r= simpleType
                     {
                     pushFollow(FOLLOW_simpleType_in_complexType529);
                     r=simpleType();
@@ -995,7 +996,7 @@
 
 
     // $ANTLR start "simpleType"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:254:1: simpleType returns [Type aTypeSymbol] : ( T_BOOL | T_INT T_LSQPAREN rangeLow= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_FLOAT T_LSQPAREN rangeLow= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_CHAR | T_CBRL aRangeValue= T_IDENTIFIER ( T_EQUAL optVal= T_INTNUMBER )? ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )* T_CBRR |aType= T_IDENTIFIER );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:258:1: simpleType returns [Type aTypeSymbol] : ( T_BOOL | T_INT T_LSQPAREN rangeLow= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_FLOAT T_LSQPAREN rangeLow= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_CHAR | T_CBRL aRangeValue= T_IDENTIFIER ( T_EQUAL optVal= T_INTNUMBER )? ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )* T_CBRR |aType= T_IDENTIFIER );
     public final Type simpleType() throws RecognitionException {
         Type aTypeSymbol = null;
 
@@ -1012,7 +1013,7 @@
         		aTypeSymbol = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:259:2: ( T_BOOL | T_INT T_LSQPAREN rangeLow= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_FLOAT T_LSQPAREN rangeLow= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_CHAR | T_CBRL aRangeValue= T_IDENTIFIER ( T_EQUAL optVal= T_INTNUMBER )? ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )* T_CBRR |aType= T_IDENTIFIER )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:263:2: ( T_BOOL | T_INT T_LSQPAREN rangeLow= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_FLOAT T_LSQPAREN rangeLow= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN | T_CHAR | T_CBRL aRangeValue= T_IDENTIFIER ( T_EQUAL optVal= T_INTNUMBER )? ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )* T_CBRR |aType= T_IDENTIFIER )
             int alt15=6;
             switch ( input.LA(1) ) {
             case T_BOOL:
@@ -1055,7 +1056,7 @@
 
             switch (alt15) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:259:4: T_BOOL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:263:4: T_BOOL
                     {
                     match(input,T_BOOL,FOLLOW_T_BOOL_in_simpleType562);
 
@@ -1064,7 +1065,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:262:4: T_INT T_LSQPAREN rangeLow= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:266:4: T_INT T_LSQPAREN rangeLow= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_INTNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN
                     {
                     match(input,T_INT,FOLLOW_T_INT_in_simpleType575);
 
@@ -1103,7 +1104,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:266:4: T_FLOAT T_LSQPAREN rangeLow= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:270:4: T_FLOAT T_LSQPAREN rangeLow= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RANGETO rangeHigh= ( T_FLOATNUMBER | T_INFTY | T_IDENTIFIER ) T_RSQPAREN
                     {
                     match(input,T_FLOAT,FOLLOW_T_FLOAT_in_simpleType620);
 
@@ -1142,7 +1143,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:270:4: T_CHAR
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:274:4: T_CHAR
                     {
                     match(input,T_CHAR,FOLLOW_T_CHAR_in_simpleType665);
 
@@ -1151,13 +1152,13 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:274:4: T_CBRL aRangeValue= T_IDENTIFIER ( T_EQUAL optVal= T_INTNUMBER )? ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )* T_CBRR
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:278:4: T_CBRL aRangeValue= T_IDENTIFIER ( T_EQUAL optVal= T_INTNUMBER )? ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )* T_CBRR
                     {
                     match(input,T_CBRL,FOLLOW_T_CBRL_in_simpleType681);
 
                     aRangeValue=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_simpleType685);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:274:36: ( T_EQUAL optVal= T_INTNUMBER )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:278:36: ( T_EQUAL optVal= T_INTNUMBER )?
                     int alt12=2;
                     final int LA12_0 = input.LA(1);
 
@@ -1166,7 +1167,7 @@
                     }
                     switch (alt12) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:274:37: T_EQUAL optVal= T_INTNUMBER
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:278:37: T_EQUAL optVal= T_INTNUMBER
                             {
                             match(input,T_EQUAL,FOLLOW_T_EQUAL_in_simpleType688);
 
@@ -1180,7 +1181,7 @@
 
                     aTypeSymbol = createEnumType(aRangeValue, optVal);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:275:4: ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )*
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:279:4: ( T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )? )*
                     loop14:
                     do {
                         int alt14=2;
@@ -1193,13 +1194,13 @@
 
                         switch (alt14) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:275:5: T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )?
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:279:5: T_COMMA otherRangeValue= T_IDENTIFIER ( T_EQUAL otherOptVal= T_INTNUMBER )?
                     	    {
                     	    match(input,T_COMMA,FOLLOW_T_COMMA_in_simpleType703);
 
                     	    otherRangeValue=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_simpleType707);
 
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:275:42: ( T_EQUAL otherOptVal= T_INTNUMBER )?
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:279:42: ( T_EQUAL otherOptVal= T_INTNUMBER )?
                     	    int alt13=2;
                     	    final int LA13_0 = input.LA(1);
 
@@ -1208,7 +1209,7 @@
                     	    }
                     	    switch (alt13) {
                     	        case 1 :
-                    	            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:275:43: T_EQUAL otherOptVal= T_INTNUMBER
+                    	            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:279:43: T_EQUAL otherOptVal= T_INTNUMBER
                     	            {
                     	            match(input,T_EQUAL,FOLLOW_T_EQUAL_in_simpleType710);
 
@@ -1236,7 +1237,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:277:4: aType= T_IDENTIFIER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:281:4: aType= T_IDENTIFIER
                     {
                     aType=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_simpleType733);
 
@@ -1263,7 +1264,7 @@
 
 
     // $ANTLR start "ooActionSystem"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:287:1: ooActionSystem returns [OoActionSystemType aTypeSymbol] : ( T_AUTOCONS )? T_SYSTEM ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )? '|[' ( T_VAR attrList )? ( T_METHODS methodList )? ( T_ACTIONS namedActionList )? ( T_DO (bl= actionBlock[null] )? T_OD )? ']|' ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:291:1: ooActionSystem returns [OoActionSystemType aTypeSymbol] : ( T_AUTOCONS )? T_SYSTEM ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )? '|[' ( T_VAR attrList )? ( T_METHODS methodList )? ( T_ACTIONS namedActionList )? ( T_DO (bl= actionBlock[null] )? T_OD )? ']|' ;
     public final OoActionSystemType ooActionSystem() throws RecognitionException {
         OoActionSystemType aTypeSymbol = null;
 
@@ -1278,10 +1279,10 @@
         		refinesSystemName = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:294:2: ( ( T_AUTOCONS )? T_SYSTEM ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )? '|[' ( T_VAR attrList )? ( T_METHODS methodList )? ( T_ACTIONS namedActionList )? ( T_DO (bl= actionBlock[null] )? T_OD )? ']|' )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:294:9: ( T_AUTOCONS )? T_SYSTEM ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )? '|[' ( T_VAR attrList )? ( T_METHODS methodList )? ( T_ACTIONS namedActionList )? ( T_DO (bl= actionBlock[null] )? T_OD )? ']|'
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:298:2: ( ( T_AUTOCONS )? T_SYSTEM ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )? '|[' ( T_VAR attrList )? ( T_METHODS methodList )? ( T_ACTIONS namedActionList )? ( T_DO (bl= actionBlock[null] )? T_OD )? ']|' )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:298:9: ( T_AUTOCONS )? T_SYSTEM ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )? '|[' ( T_VAR attrList )? ( T_METHODS methodList )? ( T_ACTIONS namedActionList )? ( T_DO (bl= actionBlock[null] )? T_OD )? ']|'
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:294:9: ( T_AUTOCONS )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:298:9: ( T_AUTOCONS )?
             int alt16=2;
             final int LA16_0 = input.LA(1);
 
@@ -1290,7 +1291,7 @@
             }
             switch (alt16) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:294:10: T_AUTOCONS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:298:10: T_AUTOCONS
                     {
                     match(input,T_AUTOCONS,FOLLOW_T_AUTOCONS_in_ooActionSystem776);
 
@@ -1304,7 +1305,7 @@
 
             match(input,T_SYSTEM,FOLLOW_T_SYSTEM_in_ooActionSystem785);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:295:12: ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:299:12: ( T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN )?
             int alt17=2;
             final int LA17_0 = input.LA(1);
 
@@ -1313,7 +1314,7 @@
             }
             switch (alt17) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:295:13: T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:299:13: T_LPAREN refinesSystemName= T_IDENTIFIER T_RPAREN
                     {
                     match(input,T_LPAREN,FOLLOW_T_LPAREN_in_ooActionSystem788);
 
@@ -1331,7 +1332,7 @@
 
             match(input,121,FOLLOW_121_in_ooActionSystem807);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:298:4: ( T_VAR attrList )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:302:4: ( T_VAR attrList )?
             int alt18=2;
             final int LA18_0 = input.LA(1);
 
@@ -1340,7 +1341,7 @@
             }
             switch (alt18) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:298:5: T_VAR attrList
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:302:5: T_VAR attrList
                     {
                     match(input,T_VAR,FOLLOW_T_VAR_in_ooActionSystem813);
 
@@ -1356,7 +1357,7 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:299:4: ( T_METHODS methodList )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:303:4: ( T_METHODS methodList )?
             int alt19=2;
             final int LA19_0 = input.LA(1);
 
@@ -1365,7 +1366,7 @@
             }
             switch (alt19) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:299:5: T_METHODS methodList
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:303:5: T_METHODS methodList
                     {
                     match(input,T_METHODS,FOLLOW_T_METHODS_in_ooActionSystem823);
 
@@ -1381,7 +1382,7 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:300:4: ( T_ACTIONS namedActionList )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:304:4: ( T_ACTIONS namedActionList )?
             int alt20=2;
             final int LA20_0 = input.LA(1);
 
@@ -1390,7 +1391,7 @@
             }
             switch (alt20) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:300:5: T_ACTIONS namedActionList
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:304:5: T_ACTIONS namedActionList
                     {
                     match(input,T_ACTIONS,FOLLOW_T_ACTIONS_in_ooActionSystem833);
 
@@ -1406,7 +1407,7 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:301:4: ( T_DO (bl= actionBlock[null] )? T_OD )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:305:4: ( T_DO (bl= actionBlock[null] )? T_OD )?
             int alt22=2;
             final int LA22_0 = input.LA(1);
 
@@ -1415,11 +1416,11 @@
             }
             switch (alt22) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:301:5: T_DO (bl= actionBlock[null] )? T_OD
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:305:5: T_DO (bl= actionBlock[null] )? T_OD
                     {
                     match(input,T_DO,FOLLOW_T_DO_in_ooActionSystem843);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:301:10: (bl= actionBlock[null] )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:305:10: (bl= actionBlock[null] )?
                     int alt21=2;
                     final int LA21_0 = input.LA(1);
 
@@ -1428,7 +1429,7 @@
                     }
                     switch (alt21) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:301:11: bl= actionBlock[null]
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:305:11: bl= actionBlock[null]
                             {
                             pushFollow(FOLLOW_actionBlock_in_ooActionSystem848);
                             bl=actionBlock(null);
@@ -1473,11 +1474,11 @@
 
 
     // $ANTLR start "attrList"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:313:1: attrList : attr ( T_SEMICOLON attr )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:317:1: attrList : attr ( T_SEMICOLON attr )* ;
     public final void attrList() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:314:2: ( attr ( T_SEMICOLON attr )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:314:4: attr ( T_SEMICOLON attr )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:318:2: ( attr ( T_SEMICOLON attr )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:318:4: attr ( T_SEMICOLON attr )*
             {
             BeginParsingAttributes();
 
@@ -1487,7 +1488,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:315:9: ( T_SEMICOLON attr )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:319:9: ( T_SEMICOLON attr )*
             loop23:
             do {
                 int alt23=2;
@@ -1500,7 +1501,7 @@
 
                 switch (alt23) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:315:10: T_SEMICOLON attr
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:319:10: T_SEMICOLON attr
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_attrList895);
 
@@ -1540,7 +1541,7 @@
 
 
     // $ANTLR start "attr"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:321:1: attr : ( T_STATIC )? ( T_OBS | T_CTRL )? varname= T_IDENTIFIER T_COLON aType= complexType ( T_EQUAL anExpr= expression )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:325:1: attr : ( T_STATIC )? ( T_OBS | T_CTRL )? varname= T_IDENTIFIER T_COLON aType= complexType ( T_EQUAL anExpr= expression )? ;
     public final void attr() throws RecognitionException {
         Token varname=null;
         Type aType =null;
@@ -1555,10 +1556,10 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:2: ( ( T_STATIC )? ( T_OBS | T_CTRL )? varname= T_IDENTIFIER T_COLON aType= complexType ( T_EQUAL anExpr= expression )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:5: ( T_STATIC )? ( T_OBS | T_CTRL )? varname= T_IDENTIFIER T_COLON aType= complexType ( T_EQUAL anExpr= expression )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:2: ( ( T_STATIC )? ( T_OBS | T_CTRL )? varname= T_IDENTIFIER T_COLON aType= complexType ( T_EQUAL anExpr= expression )? )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:5: ( T_STATIC )? ( T_OBS | T_CTRL )? varname= T_IDENTIFIER T_COLON aType= complexType ( T_EQUAL anExpr= expression )?
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:5: ( T_STATIC )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:5: ( T_STATIC )?
             int alt24=2;
             final int LA24_0 = input.LA(1);
 
@@ -1567,7 +1568,7 @@
             }
             switch (alt24) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:6: T_STATIC
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:6: T_STATIC
                     {
                     match(input,T_STATIC,FOLLOW_T_STATIC_in_attr922);
 
@@ -1579,7 +1580,7 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:36: ( T_OBS | T_CTRL )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:36: ( T_OBS | T_CTRL )?
             int alt25=3;
             final int LA25_0 = input.LA(1);
 
@@ -1591,7 +1592,7 @@
             }
             switch (alt25) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:37: T_OBS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:37: T_OBS
                     {
                     match(input,T_OBS,FOLLOW_T_OBS_in_attr929);
 
@@ -1600,7 +1601,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:328:61: T_CTRL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:332:61: T_CTRL
                     {
                     match(input,T_CTRL,FOLLOW_T_CTRL_in_attr935);
 
@@ -1622,7 +1623,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:329:51: ( T_EQUAL anExpr= expression )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:333:51: ( T_EQUAL anExpr= expression )?
             int alt26=2;
             final int LA26_0 = input.LA(1);
 
@@ -1631,7 +1632,7 @@
             }
             switch (alt26) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:329:52: T_EQUAL anExpr= expression
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:333:52: T_EQUAL anExpr= expression
                     {
                     match(input,T_EQUAL,FOLLOW_T_EQUAL_in_attr956);
 
@@ -1667,11 +1668,11 @@
 
 
     // $ANTLR start "methodList"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:336:1: methodList : method ( T_SEMICOLON method )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:340:1: methodList : method ( T_SEMICOLON method )* ;
     public final void methodList() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:337:2: ( method ( T_SEMICOLON method )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:337:5: method ( T_SEMICOLON method )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:341:2: ( method ( T_SEMICOLON method )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:341:5: method ( T_SEMICOLON method )*
             {
             pushFollow(FOLLOW_method_in_methodList982);
             method();
@@ -1679,7 +1680,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:337:12: ( T_SEMICOLON method )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:341:12: ( T_SEMICOLON method )*
             loop27:
             do {
                 int alt27=2;
@@ -1692,7 +1693,7 @@
 
                 switch (alt27) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:337:13: T_SEMICOLON method
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:341:13: T_SEMICOLON method
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_methodList985);
 
@@ -1729,7 +1730,7 @@
 
 
     // $ANTLR start "method"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:340:1: method : mname= T_IDENTIFIER ( T_LPAREN methodParameterList[newMethod] T_RPAREN )? ( T_COLON rt= complexType )? T_EQUAL ( T_VAR localActionVars[newMethod] 'begin' )? statements= actionBody[null] T_END ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:344:1: method : mname= T_IDENTIFIER ( T_LPAREN methodParameterList[newMethod] T_RPAREN )? ( T_COLON rt= complexType )? T_EQUAL ( T_VAR localActionVars[newMethod] 'begin' )? statements= actionBody[null] T_END ;
     public final void method() throws RecognitionException {
         Token mname=null;
         Type rt =null;
@@ -1741,14 +1742,14 @@
         		FunctionIdentifier newMethod = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:344:2: (mname= T_IDENTIFIER ( T_LPAREN methodParameterList[newMethod] T_RPAREN )? ( T_COLON rt= complexType )? T_EQUAL ( T_VAR localActionVars[newMethod] 'begin' )? statements= actionBody[null] T_END )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:344:4: mname= T_IDENTIFIER ( T_LPAREN methodParameterList[newMethod] T_RPAREN )? ( T_COLON rt= complexType )? T_EQUAL ( T_VAR localActionVars[newMethod] 'begin' )? statements= actionBody[null] T_END
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:348:2: (mname= T_IDENTIFIER ( T_LPAREN methodParameterList[newMethod] T_RPAREN )? ( T_COLON rt= complexType )? T_EQUAL ( T_VAR localActionVars[newMethod] 'begin' )? statements= actionBody[null] T_END )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:348:4: mname= T_IDENTIFIER ( T_LPAREN methodParameterList[newMethod] T_RPAREN )? ( T_COLON rt= complexType )? T_EQUAL ( T_VAR localActionVars[newMethod] 'begin' )? statements= actionBody[null] T_END
             {
             mname=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_method1009);
 
             newMethod = createMethodSymbol(mname);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:345:3: ( T_LPAREN methodParameterList[newMethod] T_RPAREN )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:349:3: ( T_LPAREN methodParameterList[newMethod] T_RPAREN )?
             int alt28=2;
             final int LA28_0 = input.LA(1);
 
@@ -1757,7 +1758,7 @@
             }
             switch (alt28) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:345:4: T_LPAREN methodParameterList[newMethod] T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:349:4: T_LPAREN methodParameterList[newMethod] T_RPAREN
                     {
                     match(input,T_LPAREN,FOLLOW_T_LPAREN_in_method1017);
 
@@ -1775,7 +1776,7 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:346:3: ( T_COLON rt= complexType )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:350:3: ( T_COLON rt= complexType )?
             int alt29=2;
             final int LA29_0 = input.LA(1);
 
@@ -1784,7 +1785,7 @@
             }
             switch (alt29) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:346:4: T_COLON rt= complexType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:350:4: T_COLON rt= complexType
                     {
                     match(input,T_COLON,FOLLOW_T_COLON_in_method1031);
 
@@ -1804,7 +1805,7 @@
 
             match(input,T_EQUAL,FOLLOW_T_EQUAL_in_method1045);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:348:4: ( T_VAR localActionVars[newMethod] 'begin' )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:352:4: ( T_VAR localActionVars[newMethod] 'begin' )?
             int alt30=2;
             final int LA30_0 = input.LA(1);
 
@@ -1817,7 +1818,7 @@
             }
             switch (alt30) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:348:6: T_VAR localActionVars[newMethod] 'begin'
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:352:6: T_VAR localActionVars[newMethod] 'begin'
                     {
                     match(input,T_VAR,FOLLOW_T_VAR_in_method1053);
 
@@ -1864,7 +1865,7 @@
 
 
     // $ANTLR start "methodParameterList"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:357:1: methodParameterList[FunctionIdentifier newMethod] : paramName= T_IDENTIFIER T_COLON atype= complexType ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:361:1: methodParameterList[FunctionIdentifier newMethod] : paramName= T_IDENTIFIER T_COLON atype= complexType ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )* ;
     public final void methodParameterList(FunctionIdentifier newMethod) throws RecognitionException {
         Token paramName=null;
         Token otherparam=null;
@@ -1874,8 +1875,8 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:358:2: (paramName= T_IDENTIFIER T_COLON atype= complexType ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:358:5: paramName= T_IDENTIFIER T_COLON atype= complexType ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:362:2: (paramName= T_IDENTIFIER T_COLON atype= complexType ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:362:5: paramName= T_IDENTIFIER T_COLON atype= complexType ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )*
             {
             paramName=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_methodParameterList1365);
 
@@ -1889,7 +1890,7 @@
 
             addMethodParameter(newMethod,paramName,atype);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:359:4: ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:363:4: ( T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType )*
             loop31:
             do {
                 int alt31=2;
@@ -1902,7 +1903,7 @@
 
                 switch (alt31) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:359:5: T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:363:5: T_COMMA otherparam= T_IDENTIFIER T_COLON othertype= complexType
             	    {
             	    match(input,T_COMMA,FOLLOW_T_COMMA_in_methodParameterList1379);
 
@@ -1945,11 +1946,11 @@
 
 
     // $ANTLR start "namedActionList"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:368:1: namedActionList : namedAction ( T_SEMICOLON namedAction )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:372:1: namedActionList : namedAction ( T_SEMICOLON namedAction )* ;
     public final void namedActionList() throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:369:2: ( namedAction ( T_SEMICOLON namedAction )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:369:4: namedAction ( T_SEMICOLON namedAction )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:373:2: ( namedAction ( T_SEMICOLON namedAction )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:373:4: namedAction ( T_SEMICOLON namedAction )*
             {
             pushFollow(FOLLOW_namedAction_in_namedActionList1416);
             namedAction();
@@ -1957,7 +1958,7 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:369:16: ( T_SEMICOLON namedAction )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:373:16: ( T_SEMICOLON namedAction )*
             loop32:
             do {
                 int alt32=2;
@@ -1970,7 +1971,7 @@
 
                 switch (alt32) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:369:17: T_SEMICOLON namedAction
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:373:17: T_SEMICOLON namedAction
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_namedActionList1419);
 
@@ -2007,7 +2008,7 @@
 
 
     // $ANTLR start "namedAction"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:372:1: namedAction : ( T_CTRL | T_OBS |) actionname= T_IDENTIFIER ( T_LPAREN methodParameterList[newAction] T_RPAREN )? T_EQUAL ( T_VAR localActionVars[newAction] )? body= discreteActionBody ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:376:1: namedAction : ( T_CTRL | T_OBS |) actionname= T_IDENTIFIER ( T_LPAREN ( methodParameterList[newAction] )? T_RPAREN )? T_EQUAL ( T_VAR localActionVars[newAction] )? body= discreteActionBody ;
     public final void namedAction() throws RecognitionException {
         Token actionname=null;
         GuardedCommand body =null;
@@ -2018,12 +2019,12 @@
         		FunctionIdentifier newAction = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:377:2: ( ( T_CTRL | T_OBS |) actionname= T_IDENTIFIER ( T_LPAREN methodParameterList[newAction] T_RPAREN )? T_EQUAL ( T_VAR localActionVars[newAction] )? body= discreteActionBody )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:377:4: ( T_CTRL | T_OBS |) actionname= T_IDENTIFIER ( T_LPAREN methodParameterList[newAction] T_RPAREN )? T_EQUAL ( T_VAR localActionVars[newAction] )? body= discreteActionBody
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:381:2: ( ( T_CTRL | T_OBS |) actionname= T_IDENTIFIER ( T_LPAREN ( methodParameterList[newAction] )? T_RPAREN )? T_EQUAL ( T_VAR localActionVars[newAction] )? body= discreteActionBody )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:381:4: ( T_CTRL | T_OBS |) actionname= T_IDENTIFIER ( T_LPAREN ( methodParameterList[newAction] )? T_RPAREN )? T_EQUAL ( T_VAR localActionVars[newAction] )? body= discreteActionBody
             {
             actionType = FunctionTypeEnum.Internal;
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:378:3: ( T_CTRL | T_OBS |)
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:382:3: ( T_CTRL | T_OBS |)
             int alt33=3;
             switch ( input.LA(1) ) {
             case T_CTRL:
@@ -2051,7 +2052,7 @@
 
             switch (alt33) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:378:4: T_CTRL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:382:4: T_CTRL
                     {
                     match(input,T_CTRL,FOLLOW_T_CTRL_in_namedAction1446);
 
@@ -2060,7 +2061,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:378:58: T_OBS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:382:58: T_OBS
                     {
                     match(input,T_OBS,FOLLOW_T_OBS_in_namedAction1451);
 
@@ -2069,7 +2070,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:378:109:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:382:109:
                     {
                     }
                     break;
@@ -2081,49 +2082,66 @@
 
             newAction = createNamedAction(actionname,actionType);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:380:3: ( T_LPAREN methodParameterList[newAction] T_RPAREN )?
-            int alt34=2;
-            final int LA34_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:384:3: ( T_LPAREN ( methodParameterList[newAction] )? T_RPAREN )?
+            int alt35=2;
+            final int LA35_0 = input.LA(1);
 
-            if ( (LA34_0==T_LPAREN) ) {
-                alt34=1;
+            if ( (LA35_0==T_LPAREN) ) {
+                alt35=1;
             }
-            switch (alt34) {
+            switch (alt35) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:380:4: T_LPAREN methodParameterList[newAction] T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:384:4: T_LPAREN ( methodParameterList[newAction] )? T_RPAREN
                     {
                     match(input,T_LPAREN,FOLLOW_T_LPAREN_in_namedAction1471);
 
-                    pushFollow(FOLLOW_methodParameterList_in_namedAction1473);
-                    methodParameterList(newAction);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:384:13: ( methodParameterList[newAction] )?
+                    int alt34=2;
+                    final int LA34_0 = input.LA(1);
 
-                    state._fsp--;
+                    if ( (LA34_0==T_IDENTIFIER) ) {
+                        alt34=1;
+                    }
+                    switch (alt34) {
+                        case 1 :
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:384:13: methodParameterList[newAction]
+                            {
+                            pushFollow(FOLLOW_methodParameterList_in_namedAction1473);
+                            methodParameterList(newAction);
 
+                            state._fsp--;
 
-                    match(input,T_RPAREN,FOLLOW_T_RPAREN_in_namedAction1477);
 
+                            }
+                            break;
+
                     }
+
+
+                    match(input,T_RPAREN,FOLLOW_T_RPAREN_in_namedAction1478);
+
+                    }
                     break;
 
             }
 
 
-            match(input,T_EQUAL,FOLLOW_T_EQUAL_in_namedAction1484);
+            match(input,T_EQUAL,FOLLOW_T_EQUAL_in_namedAction1485);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:382:3: ( T_VAR localActionVars[newAction] )?
-            int alt35=2;
-            final int LA35_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:386:3: ( T_VAR localActionVars[newAction] )?
+            int alt36=2;
+            final int LA36_0 = input.LA(1);
 
-            if ( (LA35_0==T_VAR) ) {
-                alt35=1;
+            if ( (LA36_0==T_VAR) ) {
+                alt36=1;
             }
-            switch (alt35) {
+            switch (alt36) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:382:4: T_VAR localActionVars[newAction]
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:386:4: T_VAR localActionVars[newAction]
                     {
-                    match(input,T_VAR,FOLLOW_T_VAR_in_namedAction1490);
+                    match(input,T_VAR,FOLLOW_T_VAR_in_namedAction1491);
 
-                    pushFollow(FOLLOW_localActionVars_in_namedAction1492);
+                    pushFollow(FOLLOW_localActionVars_in_namedAction1493);
                     localActionVars(newAction);
 
                     state._fsp--;
@@ -2135,7 +2153,7 @@
             }
 
 
-            pushFollow(FOLLOW_discreteActionBody_in_namedAction1503);
+            pushFollow(FOLLOW_discreteActionBody_in_namedAction1504);
             body=discreteActionBody();
 
             state._fsp--;
@@ -2162,7 +2180,7 @@
 
 
     // $ANTLR start "localActionVars"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:390:1: localActionVars[FunctionIdentifier newMethod] : id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:394:1: localActionVars[FunctionIdentifier newMethod] : id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ;
     public final void localActionVars(FunctionIdentifier newMethod) throws RecognitionException {
         Token id1=null;
         Token id2=null;
@@ -2172,14 +2190,14 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:391:2: (id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:392:3: id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:395:2: (id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:396:3: id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )*
             {
-            id1=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_localActionVars1535);
+            id1=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_localActionVars1536);
 
-            match(input,T_COLON,FOLLOW_T_COLON_in_localActionVars1537);
+            match(input,T_COLON,FOLLOW_T_COLON_in_localActionVars1538);
 
-            pushFollow(FOLLOW_complexType_in_localActionVars1541);
+            pushFollow(FOLLOW_complexType_in_localActionVars1542);
             t1=complexType();
 
             state._fsp--;
@@ -2187,28 +2205,28 @@
 
             addLocalVariableToNamedAction(newMethod,id1,t1);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:393:4: ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )*
-            loop36:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:397:4: ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )*
+            loop37:
             do {
-                int alt36=2;
-                final int LA36_0 = input.LA(1);
+                int alt37=2;
+                final int LA37_0 = input.LA(1);
 
-                if ( (LA36_0==T_SEMICOLON) ) {
-                    alt36=1;
+                if ( (LA37_0==T_SEMICOLON) ) {
+                    alt37=1;
                 }
 
 
-                switch (alt36) {
+                switch (alt37) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:393:5: T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:397:5: T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType
             	    {
-            	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_localActionVars1550);
+            	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_localActionVars1551);
 
-            	    id2=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_localActionVars1554);
+            	    id2=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_localActionVars1555);
 
-            	    match(input,T_COLON,FOLLOW_T_COLON_in_localActionVars1556);
+            	    match(input,T_COLON,FOLLOW_T_COLON_in_localActionVars1557);
 
-            	    pushFollow(FOLLOW_complexType_in_localActionVars1560);
+            	    pushFollow(FOLLOW_complexType_in_localActionVars1561);
             	    t2=complexType();
 
             	    state._fsp--;
@@ -2220,7 +2238,7 @@
             	    break;
 
             	default :
-            	    break loop36;
+            	    break loop37;
                 }
             } while (true);
 
@@ -2243,7 +2261,7 @@
 
 
     // $ANTLR start "anonymousAction"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:399:1: anonymousAction returns [GuardedCommand result] : b= discreteActionBody ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:403:1: anonymousAction returns [GuardedCommand result] : b= discreteActionBody ;
     public final GuardedCommand anonymousAction() throws RecognitionException {
         GuardedCommand result = null;
 
@@ -2252,10 +2270,10 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:401:2: (b= discreteActionBody )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:402:3: b= discreteActionBody
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:405:2: (b= discreteActionBody )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:406:3: b= discreteActionBody
             {
-            pushFollow(FOLLOW_discreteActionBody_in_anonymousAction1593);
+            pushFollow(FOLLOW_discreteActionBody_in_anonymousAction1594);
             b=discreteActionBody();
 
             state._fsp--;
@@ -2281,7 +2299,7 @@
 
 
     // $ANTLR start "discreteActionBody"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:405:1: discreteActionBody returns [GuardedCommand result] : T_REQUIRES expr= expression T_COLON bdy= actionBody[null] T_END ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:409:1: discreteActionBody returns [GuardedCommand result] : T_REQUIRES expr= expression T_COLON bdy= actionBody[null] T_END ;
     public final GuardedCommand discreteActionBody() throws RecognitionException {
         GuardedCommand result = null;
 
@@ -2295,28 +2313,28 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:410:2: ( T_REQUIRES expr= expression T_COLON bdy= actionBody[null] T_END )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:411:3: T_REQUIRES expr= expression T_COLON bdy= actionBody[null] T_END
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:414:2: ( T_REQUIRES expr= expression T_COLON bdy= actionBody[null] T_END )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:415:3: T_REQUIRES expr= expression T_COLON bdy= actionBody[null] T_END
             {
             result = createGuardedCommandStatement(); pushBlockToResolveStack(result);
 
-            match(input,T_REQUIRES,FOLLOW_T_REQUIRES_in_discreteActionBody1624);
+            match(input,T_REQUIRES,FOLLOW_T_REQUIRES_in_discreteActionBody1625);
 
-            pushFollow(FOLLOW_expression_in_discreteActionBody1628);
+            pushFollow(FOLLOW_expression_in_discreteActionBody1629);
             expr=expression();
 
             state._fsp--;
 
 
-            match(input,T_COLON,FOLLOW_T_COLON_in_discreteActionBody1630);
+            match(input,T_COLON,FOLLOW_T_COLON_in_discreteActionBody1631);
 
-            pushFollow(FOLLOW_actionBody_in_discreteActionBody1637);
+            pushFollow(FOLLOW_actionBody_in_discreteActionBody1638);
             bdy=actionBody(null);
 
             state._fsp--;
 
 
-            match(input,T_END,FOLLOW_T_END_in_discreteActionBody1642);
+            match(input,T_END,FOLLOW_T_END_in_discreteActionBody1643);
 
             addExprAndBlockToGuardedCommand(result,expr,bdy);
 
@@ -2339,41 +2357,41 @@
 
 
     // $ANTLR start "actionBlock"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:425:1: actionBlock[Block top] returns [Block prioList] : actionBlockParallel[prioList] ( T_PRIO actionBlockParallel[prioList] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:429:1: actionBlock[Block top] returns [Block prioList] : actionBlockParallel[prioList] ( T_PRIO actionBlockParallel[prioList] )* ;
     public final Block actionBlock(Block top) throws RecognitionException {
         Block prioList = null;
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:427:2: ( actionBlockParallel[prioList] ( T_PRIO actionBlockParallel[prioList] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:427:6: actionBlockParallel[prioList] ( T_PRIO actionBlockParallel[prioList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:431:2: ( actionBlockParallel[prioList] ( T_PRIO actionBlockParallel[prioList] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:431:6: actionBlockParallel[prioList] ( T_PRIO actionBlockParallel[prioList] )*
             {
             prioList = createPrioBlock(top);  pushBlockToResolveStack(prioList);
 
-            pushFollow(FOLLOW_actionBlockParallel_in_actionBlock1685);
+            pushFollow(FOLLOW_actionBlockParallel_in_actionBlock1686);
             actionBlockParallel(prioList);
 
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:428:34: ( T_PRIO actionBlockParallel[prioList] )*
-            loop37:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:432:34: ( T_PRIO actionBlockParallel[prioList] )*
+            loop38:
             do {
-                int alt37=2;
-                final int LA37_0 = input.LA(1);
+                int alt38=2;
+                final int LA38_0 = input.LA(1);
 
-                if ( (LA37_0==T_PRIO) ) {
-                    alt37=1;
+                if ( (LA38_0==T_PRIO) ) {
+                    alt38=1;
                 }
 
 
-                switch (alt37) {
+                switch (alt38) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:428:35: T_PRIO actionBlockParallel[prioList]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:432:35: T_PRIO actionBlockParallel[prioList]
             	    {
-            	    match(input,T_PRIO,FOLLOW_T_PRIO_in_actionBlock1689);
+            	    match(input,T_PRIO,FOLLOW_T_PRIO_in_actionBlock1690);
 
-            	    pushFollow(FOLLOW_actionBlockParallel_in_actionBlock1691);
+            	    pushFollow(FOLLOW_actionBlockParallel_in_actionBlock1692);
             	    actionBlockParallel(prioList);
 
             	    state._fsp--;
@@ -2383,7 +2401,7 @@
             	    break;
 
             	default :
-            	    break loop37;
+            	    break loop38;
                 }
             } while (true);
 
@@ -2407,39 +2425,39 @@
 
 
     // $ANTLR start "actionBlockParallel"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:433:1: actionBlockParallel[Block top] : actionBlockSequential[parList] ( T_NONDET actionBlockSequential[parList] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:437:1: actionBlockParallel[Block top] : actionBlockSequential[parList] ( T_NONDET actionBlockSequential[parList] )* ;
     public final void actionBlockParallel(Block top) throws RecognitionException {
         	final Block parList = createNondetBlock(top);
         		 	pushBlockToResolveStack(parList);
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:437:2: ( actionBlockSequential[parList] ( T_NONDET actionBlockSequential[parList] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:437:4: actionBlockSequential[parList] ( T_NONDET actionBlockSequential[parList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:441:2: ( actionBlockSequential[parList] ( T_NONDET actionBlockSequential[parList] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:441:4: actionBlockSequential[parList] ( T_NONDET actionBlockSequential[parList] )*
             {
-            pushFollow(FOLLOW_actionBlockSequential_in_actionBlockParallel1724);
+            pushFollow(FOLLOW_actionBlockSequential_in_actionBlockParallel1725);
             actionBlockSequential(parList);
 
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:437:35: ( T_NONDET actionBlockSequential[parList] )*
-            loop38:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:441:35: ( T_NONDET actionBlockSequential[parList] )*
+            loop39:
             do {
-                int alt38=2;
-                final int LA38_0 = input.LA(1);
+                int alt39=2;
+                final int LA39_0 = input.LA(1);
 
-                if ( (LA38_0==T_NONDET) ) {
-                    alt38=1;
+                if ( (LA39_0==T_NONDET) ) {
+                    alt39=1;
                 }
 
 
-                switch (alt38) {
+                switch (alt39) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:437:36: T_NONDET actionBlockSequential[parList]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:441:36: T_NONDET actionBlockSequential[parList]
             	    {
-            	    match(input,T_NONDET,FOLLOW_T_NONDET_in_actionBlockParallel1728);
+            	    match(input,T_NONDET,FOLLOW_T_NONDET_in_actionBlockParallel1729);
 
-            	    pushFollow(FOLLOW_actionBlockSequential_in_actionBlockParallel1730);
+            	    pushFollow(FOLLOW_actionBlockSequential_in_actionBlockParallel1731);
             	    actionBlockSequential(parList);
 
             	    state._fsp--;
@@ -2449,7 +2467,7 @@
             	    break;
 
             	default :
-            	    break loop38;
+            	    break loop39;
                 }
             } while (true);
 
@@ -2473,7 +2491,7 @@
 
 
     // $ANTLR start "actionBlockSequential"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:442:1: actionBlockSequential[Block top] : ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )? actionBlockParen[seqList] ( T_SEMICOLON actionBlockParen[seqList] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:446:1: actionBlockSequential[Block top] : ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )? actionBlockParen[seqList] ( T_SEMICOLON actionBlockParen[seqList] )* ;
     public final void actionBlockSequential(Block top) throws RecognitionException {
         Expression sexpr =null;
 
@@ -2483,42 +2501,42 @@
         			pushBlockToResolveStack(seqList);
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:447:2: ( ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )? actionBlockParen[seqList] ( T_SEMICOLON actionBlockParen[seqList] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:447:5: ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )? actionBlockParen[seqList] ( T_SEMICOLON actionBlockParen[seqList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:451:2: ( ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )? actionBlockParen[seqList] ( T_SEMICOLON actionBlockParen[seqList] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:451:5: ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )? actionBlockParen[seqList] ( T_SEMICOLON actionBlockParen[seqList] )*
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:447:5: ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )?
-            int alt40=2;
-            final int LA40_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:451:5: ( T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON )?
+            int alt41=2;
+            final int LA41_0 = input.LA(1);
 
-            if ( (LA40_0==T_VAR) ) {
-                alt40=1;
+            if ( (LA41_0==T_VAR) ) {
+                alt41=1;
             }
-            switch (alt40) {
+            switch (alt41) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:447:6: T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:451:6: T_VAR syms= blockvarlist[seqList] ( '&' sexpr= expression )? T_COLON
                     {
-                    match(input,T_VAR,FOLLOW_T_VAR_in_actionBlockSequential1764);
+                    match(input,T_VAR,FOLLOW_T_VAR_in_actionBlockSequential1765);
 
-                    pushFollow(FOLLOW_blockvarlist_in_actionBlockSequential1768);
+                    pushFollow(FOLLOW_blockvarlist_in_actionBlockSequential1769);
                     blockvarlist(seqList);
 
                     state._fsp--;
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:447:39: ( '&' sexpr= expression )?
-                    int alt39=2;
-                    final int LA39_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:451:39: ( '&' sexpr= expression )?
+                    int alt40=2;
+                    final int LA40_0 = input.LA(1);
 
-                    if ( (LA39_0==116) ) {
-                        alt39=1;
+                    if ( (LA40_0==116) ) {
+                        alt40=1;
                     }
-                    switch (alt39) {
+                    switch (alt40) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:447:40: '&' sexpr= expression
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:451:40: '&' sexpr= expression
                             {
-                            match(input,116,FOLLOW_116_in_actionBlockSequential1772);
+                            match(input,116,FOLLOW_116_in_actionBlockSequential1773);
 
-                            pushFollow(FOLLOW_expression_in_actionBlockSequential1776);
+                            pushFollow(FOLLOW_expression_in_actionBlockSequential1777);
                             sexpr=expression();
 
                             state._fsp--;
@@ -2532,7 +2550,7 @@
                     }
 
 
-                    match(input,T_COLON,FOLLOW_T_COLON_in_actionBlockSequential1783);
+                    match(input,T_COLON,FOLLOW_T_COLON_in_actionBlockSequential1784);
 
                     }
                     break;
@@ -2540,30 +2558,30 @@
             }
 
 
-            pushFollow(FOLLOW_actionBlockParen_in_actionBlockSequential1792);
+            pushFollow(FOLLOW_actionBlockParen_in_actionBlockSequential1793);
             actionBlockParen(seqList);
 
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:448:30: ( T_SEMICOLON actionBlockParen[seqList] )*
-            loop41:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:452:30: ( T_SEMICOLON actionBlockParen[seqList] )*
+            loop42:
             do {
-                int alt41=2;
-                final int LA41_0 = input.LA(1);
+                int alt42=2;
+                final int LA42_0 = input.LA(1);
 
-                if ( (LA41_0==T_SEMICOLON) ) {
-                    alt41=1;
+                if ( (LA42_0==T_SEMICOLON) ) {
+                    alt42=1;
                 }
 
 
-                switch (alt41) {
+                switch (alt42) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:448:31: T_SEMICOLON actionBlockParen[seqList]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:452:31: T_SEMICOLON actionBlockParen[seqList]
             	    {
-            	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_actionBlockSequential1796);
+            	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_actionBlockSequential1797);
 
-            	    pushFollow(FOLLOW_actionBlockParen_in_actionBlockSequential1798);
+            	    pushFollow(FOLLOW_actionBlockParen_in_actionBlockSequential1799);
             	    actionBlockParen(seqList);
 
             	    state._fsp--;
@@ -2573,7 +2591,7 @@
             	    break;
 
             	default :
-            	    break loop41;
+            	    break loop42;
                 }
             } while (true);
 
@@ -2597,46 +2615,46 @@
 
 
     // $ANTLR start "actionBlockParen"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:453:1: actionBlockParen[Block top] : ( T_LPAREN actionBlock[top] T_RPAREN | anonymousOrNamedAction[top] );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:457:1: actionBlockParen[Block top] : ( T_LPAREN actionBlock[top] T_RPAREN | anonymousOrNamedAction[top] );
     public final void actionBlockParen(Block top) throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:454:2: ( T_LPAREN actionBlock[top] T_RPAREN | anonymousOrNamedAction[top] )
-            int alt42=2;
-            final int LA42_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:458:2: ( T_LPAREN actionBlock[top] T_RPAREN | anonymousOrNamedAction[top] )
+            int alt43=2;
+            final int LA43_0 = input.LA(1);
 
-            if ( (LA42_0==T_LPAREN) ) {
-                alt42=1;
+            if ( (LA43_0==T_LPAREN) ) {
+                alt43=1;
             }
-            else if ( (LA42_0==T_IDENTIFIER||LA42_0==T_REQUIRES||LA42_0==T_SKIP) ) {
-                alt42=2;
+            else if ( (LA43_0==T_IDENTIFIER||LA43_0==T_REQUIRES||LA43_0==T_SKIP) ) {
+                alt43=2;
             }
             else {
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 42, 0, input);
+                    new NoViableAltException("", 43, 0, input);
 
                 throw nvae;
 
             }
-            switch (alt42) {
+            switch (alt43) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:454:4: T_LPAREN actionBlock[top] T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:458:4: T_LPAREN actionBlock[top] T_RPAREN
                     {
-                    match(input,T_LPAREN,FOLLOW_T_LPAREN_in_actionBlockParen1822);
+                    match(input,T_LPAREN,FOLLOW_T_LPAREN_in_actionBlockParen1823);
 
-                    pushFollow(FOLLOW_actionBlock_in_actionBlockParen1824);
+                    pushFollow(FOLLOW_actionBlock_in_actionBlockParen1825);
                     actionBlock(top);
 
                     state._fsp--;
 
 
-                    match(input,T_RPAREN,FOLLOW_T_RPAREN_in_actionBlockParen1827);
+                    match(input,T_RPAREN,FOLLOW_T_RPAREN_in_actionBlockParen1828);
 
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:455:4: anonymousOrNamedAction[top]
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:459:4: anonymousOrNamedAction[top]
                     {
-                    pushFollow(FOLLOW_anonymousOrNamedAction_in_actionBlockParen1832);
+                    pushFollow(FOLLOW_anonymousOrNamedAction_in_actionBlockParen1833);
                     anonymousOrNamedAction(top);
 
                     state._fsp--;
@@ -2662,7 +2680,7 @@
 
 
     // $ANTLR start "anonymousOrNamedAction"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:458:1: anonymousOrNamedAction[Block top] : (gcmd= anonymousAction |aname= T_IDENTIFIER ( T_LPAREN m_params= methodCallParams T_RPAREN )? (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )? | T_SKIP );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:462:1: anonymousOrNamedAction[Block top] : (gcmd= anonymousAction |aname= T_IDENTIFIER ( T_LPAREN m_params= methodCallParams T_RPAREN )? (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )? | T_SKIP );
     public final void anonymousOrNamedAction(Block top) throws RecognitionException {
         Token aname=null;
         Token amap=null;
@@ -2674,37 +2692,37 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:459:2: (gcmd= anonymousAction |aname= T_IDENTIFIER ( T_LPAREN m_params= methodCallParams T_RPAREN )? (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )? | T_SKIP )
-            int alt45=3;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:463:2: (gcmd= anonymousAction |aname= T_IDENTIFIER ( T_LPAREN m_params= methodCallParams T_RPAREN )? (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )? | T_SKIP )
+            int alt46=3;
             switch ( input.LA(1) ) {
             case T_REQUIRES:
                 {
-                alt45=1;
+                alt46=1;
                 }
                 break;
             case T_IDENTIFIER:
                 {
-                alt45=2;
+                alt46=2;
                 }
                 break;
             case T_SKIP:
                 {
-                alt45=3;
+                alt46=3;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 45, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt45) {
+            switch (alt46) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:459:4: gcmd= anonymousAction
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:463:4: gcmd= anonymousAction
                     {
-                    pushFollow(FOLLOW_anonymousAction_in_anonymousOrNamedAction1849);
+                    pushFollow(FOLLOW_anonymousAction_in_anonymousOrNamedAction1850);
                     gcmd=anonymousAction();
 
                     state._fsp--;
@@ -2715,30 +2733,30 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:460:4: aname= T_IDENTIFIER ( T_LPAREN m_params= methodCallParams T_RPAREN )? (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:464:4: aname= T_IDENTIFIER ( T_LPAREN m_params= methodCallParams T_RPAREN )? (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )?
                     {
-                    aname=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_anonymousOrNamedAction1858);
+                    aname=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_anonymousOrNamedAction1859);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:461:11: ( T_LPAREN m_params= methodCallParams T_RPAREN )?
-                    int alt43=2;
-                    final int LA43_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:465:11: ( T_LPAREN m_params= methodCallParams T_RPAREN )?
+                    int alt44=2;
+                    final int LA44_0 = input.LA(1);
 
-                    if ( (LA43_0==T_LPAREN) ) {
-                        alt43=1;
+                    if ( (LA44_0==T_LPAREN) ) {
+                        alt44=1;
                     }
-                    switch (alt43) {
+                    switch (alt44) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:461:12: T_LPAREN m_params= methodCallParams T_RPAREN
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:465:12: T_LPAREN m_params= methodCallParams T_RPAREN
                             {
-                            match(input,T_LPAREN,FOLLOW_T_LPAREN_in_anonymousOrNamedAction1872);
+                            match(input,T_LPAREN,FOLLOW_T_LPAREN_in_anonymousOrNamedAction1873);
 
-                            pushFollow(FOLLOW_methodCallParams_in_anonymousOrNamedAction1877);
+                            pushFollow(FOLLOW_methodCallParams_in_anonymousOrNamedAction1878);
                             m_params=methodCallParams();
 
                             state._fsp--;
 
 
-                            match(input,T_RPAREN,FOLLOW_T_RPAREN_in_anonymousOrNamedAction1879);
+                            match(input,T_RPAREN,FOLLOW_T_RPAREN_in_anonymousOrNamedAction1880);
 
                             }
                             break;
@@ -2746,16 +2764,16 @@
                     }
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:462:11: (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )?
-                    int alt44=2;
-                    final int LA44_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:466:11: (amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')' )?
+                    int alt45=2;
+                    final int LA45_0 = input.LA(1);
 
-                    if ( ((LA44_0 >= T_FOLDLR && LA44_0 <= T_FOLDRL)) ) {
-                        alt44=1;
+                    if ( ((LA45_0 >= T_FOLDLR && LA45_0 <= T_FOLDRL)) ) {
+                        alt45=1;
                     }
-                    switch (alt44) {
+                    switch (alt45) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:462:12: amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')'
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:466:12: amap= ( T_FOLDLR | T_FOLDRL ) '(' amapexpr= expression ')'
                             {
                             amap=input.LT(1);
 
@@ -2769,15 +2787,15 @@
                             }
 
 
-                            match(input,T_LPAREN,FOLLOW_T_LPAREN_in_anonymousOrNamedAction1903);
+                            match(input,T_LPAREN,FOLLOW_T_LPAREN_in_anonymousOrNamedAction1904);
 
-                            pushFollow(FOLLOW_expression_in_anonymousOrNamedAction1907);
+                            pushFollow(FOLLOW_expression_in_anonymousOrNamedAction1908);
                             amapexpr=expression();
 
                             state._fsp--;
 
 
-                            match(input,T_RPAREN,FOLLOW_T_RPAREN_in_anonymousOrNamedAction1909);
+                            match(input,T_RPAREN,FOLLOW_T_RPAREN_in_anonymousOrNamedAction1910);
 
                             }
                             break;
@@ -2790,9 +2808,9 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:464:4: T_SKIP
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:468:4: T_SKIP
                     {
-                    match(input,T_SKIP,FOLLOW_T_SKIP_in_anonymousOrNamedAction1920);
+                    match(input,T_SKIP,FOLLOW_T_SKIP_in_anonymousOrNamedAction1921);
 
                     addSkipStatementToBlockList(top);
 
@@ -2816,36 +2834,36 @@
 
 
     // $ANTLR start "blockvarlist"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:468:1: blockvarlist[Block seqList] : blockvar[seqList] ( T_SEMICOLON blockvar[seqList] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:472:1: blockvarlist[Block seqList] : blockvar[seqList] ( T_SEMICOLON blockvar[seqList] )* ;
     public final void blockvarlist(Block seqList) throws RecognitionException {
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:469:2: ( blockvar[seqList] ( T_SEMICOLON blockvar[seqList] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:469:4: blockvar[seqList] ( T_SEMICOLON blockvar[seqList] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:473:2: ( blockvar[seqList] ( T_SEMICOLON blockvar[seqList] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:473:4: blockvar[seqList] ( T_SEMICOLON blockvar[seqList] )*
             {
-            pushFollow(FOLLOW_blockvar_in_blockvarlist1936);
+            pushFollow(FOLLOW_blockvar_in_blockvarlist1937);
             blockvar(seqList);
 
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:469:23: ( T_SEMICOLON blockvar[seqList] )*
-            loop46:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:473:23: ( T_SEMICOLON blockvar[seqList] )*
+            loop47:
             do {
-                int alt46=2;
-                final int LA46_0 = input.LA(1);
+                int alt47=2;
+                final int LA47_0 = input.LA(1);
 
-                if ( (LA46_0==T_SEMICOLON) ) {
-                    alt46=1;
+                if ( (LA47_0==T_SEMICOLON) ) {
+                    alt47=1;
                 }
 
 
-                switch (alt46) {
+                switch (alt47) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:469:24: T_SEMICOLON blockvar[seqList]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:473:24: T_SEMICOLON blockvar[seqList]
             	    {
-            	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_blockvarlist1941);
+            	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_blockvarlist1942);
 
-            	    pushFollow(FOLLOW_blockvar_in_blockvarlist1943);
+            	    pushFollow(FOLLOW_blockvar_in_blockvarlist1944);
             	    blockvar(seqList);
 
             	    state._fsp--;
@@ -2855,7 +2873,7 @@
             	    break;
 
             	default :
-            	    break loop46;
+            	    break loop47;
                 }
             } while (true);
 
@@ -2878,7 +2896,7 @@
 
 
     // $ANTLR start "blockvar"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:472:1: blockvar[Block seqList] : varname= T_IDENTIFIER T_COLON aType= complexType ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:476:1: blockvar[Block seqList] : varname= T_IDENTIFIER T_COLON aType= complexType ;
     public final void blockvar(Block seqList) throws RecognitionException {
         Token varname=null;
         Type aType =null;
@@ -2885,14 +2903,14 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:473:2: (varname= T_IDENTIFIER T_COLON aType= complexType )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:473:5: varname= T_IDENTIFIER T_COLON aType= complexType
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:477:2: (varname= T_IDENTIFIER T_COLON aType= complexType )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:477:5: varname= T_IDENTIFIER T_COLON aType= complexType
             {
-            varname=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_blockvar1963);
+            varname=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_blockvar1964);
 
-            match(input,T_COLON,FOLLOW_T_COLON_in_blockvar1966);
+            match(input,T_COLON,FOLLOW_T_COLON_in_blockvar1967);
 
-            pushFollow(FOLLOW_complexType_in_blockvar1970);
+            pushFollow(FOLLOW_complexType_in_blockvar1971);
             aType=complexType();
 
             state._fsp--;
@@ -2918,48 +2936,55 @@
 
 
     // $ANTLR start "actionBody"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:483:1: actionBody[Block top] returns [Block result] : actionBodyParallel[result] ( T_PRIO actionBodyParallel[result] )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:487:1: actionBody[Block top] returns [Block result] : actionBodyParallel[result] ( T_PRIO actionBodyParallel[result] )* ;
     public final Block actionBody(Block top) throws RecognitionException {
         Block result = null;
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:485:2: ( actionBodyParallel[result] ( T_PRIO actionBodyParallel[result] )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:485:4: actionBodyParallel[result] ( T_PRIO actionBodyParallel[result] )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:489:2: ( actionBodyParallel[result] ( T_PRIO actionBodyParallel[result] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:489:4: actionBodyParallel[result] ( T_PRIO actionBodyParallel[result] )*
             {
             result = createPrioBlock(top); pushBlockToResolveStack(result);
 
-            pushFollow(FOLLOW_actionBodyParallel_in_actionBody2005);
+            pushFollow(FOLLOW_actionBodyParallel_in_actionBody2006);
             actionBodyParallel(result);
 
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:486:30: ( T_PRIO actionBodyParallel[result] )?
-            int alt47=2;
-            final int LA47_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:490:30: ( T_PRIO actionBodyParallel[result] )*
+            loop48:
+            do {
+                int alt48=2;
+                final int LA48_0 = input.LA(1);
 
-            if ( (LA47_0==T_PRIO) ) {
-                alt47=1;
-            }
-            switch (alt47) {
-                case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:486:31: T_PRIO actionBodyParallel[result]
-                    {
-                    match(input,T_PRIO,FOLLOW_T_PRIO_in_actionBody2009);
+                if ( (LA48_0==T_PRIO) ) {
+                    alt48=1;
+                }
 
-                    pushFollow(FOLLOW_actionBodyParallel_in_actionBody2011);
-                    actionBodyParallel(result);
 
-                    state._fsp--;
+                switch (alt48) {
+            	case 1 :
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:490:31: T_PRIO actionBodyParallel[result]
+            	    {
+            	    match(input,T_PRIO,FOLLOW_T_PRIO_in_actionBody2010);
 
+            	    pushFollow(FOLLOW_actionBodyParallel_in_actionBody2012);
+            	    actionBodyParallel(result);
 
-                    }
-                    break;
+            	    state._fsp--;
 
-            }
 
+            	    }
+            	    break;
 
+            	default :
+            	    break loop48;
+                }
+            } while (true);
+
+
             }
 
         }
@@ -2979,7 +3004,7 @@
 
 
     // $ANTLR start "actionBodyParallel"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:491:1: actionBodyParallel[Block top] returns [Block result] : actionBodySequential[result] ( T_NONDET olst= actionBodySequential[result] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:495:1: actionBodyParallel[Block top] returns [Block result] : actionBodySequential[result] ( T_NONDET olst= actionBodySequential[result] )* ;
     public final Block actionBodyParallel(Block top) throws RecognitionException {
         Block result = null;
 
@@ -2988,8 +3013,8 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:493:2: ( actionBodySequential[result] ( T_NONDET olst= actionBodySequential[result] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:493:4: actionBodySequential[result] ( T_NONDET olst= actionBodySequential[result] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:497:2: ( actionBodySequential[result] ( T_NONDET olst= actionBodySequential[result] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:497:4: actionBodySequential[result] ( T_NONDET olst= actionBodySequential[result] )*
             {
             result = createNondetBlock(top); pushBlockToResolveStack(result);
 
@@ -2999,20 +3024,20 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:495:3: ( T_NONDET olst= actionBodySequential[result] )*
-            loop48:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:499:3: ( T_NONDET olst= actionBodySequential[result] )*
+            loop49:
             do {
-                int alt48=2;
-                final int LA48_0 = input.LA(1);
+                int alt49=2;
+                final int LA49_0 = input.LA(1);
 
-                if ( (LA48_0==T_NONDET) ) {
-                    alt48=1;
+                if ( (LA49_0==T_NONDET) ) {
+                    alt49=1;
                 }
 
 
-                switch (alt48) {
+                switch (alt49) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:495:4: T_NONDET olst= actionBodySequential[result]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:499:4: T_NONDET olst= actionBodySequential[result]
             	    {
             	    match(input,T_NONDET,FOLLOW_T_NONDET_in_actionBodyParallel2052);
 
@@ -3026,7 +3051,7 @@
             	    break;
 
             	default :
-            	    break loop48;
+            	    break loop49;
                 }
             } while (true);
 
@@ -3050,7 +3075,7 @@
 
 
     // $ANTLR start "actionBodySequential"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:502:1: actionBodySequential[Block top] returns [SeqBlock result] : ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )? actionBodyParen[result] ( T_SEMICOLON actionBodyParen[result] )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:506:1: actionBodySequential[Block top] returns [SeqBlock result] : ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )? actionBodyParen[result] ( T_SEMICOLON actionBodyParen[result] )* ;
     public final SeqBlock actionBodySequential(Block top) throws RecognitionException {
         SeqBlock result = null;
 
@@ -3059,21 +3084,21 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:504:2: ( ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )? actionBodyParen[result] ( T_SEMICOLON actionBodyParen[result] )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:504:4: ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )? actionBodyParen[result] ( T_SEMICOLON actionBodyParen[result] )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:508:2: ( ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )? actionBodyParen[result] ( T_SEMICOLON actionBodyParen[result] )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:508:4: ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )? actionBodyParen[result] ( T_SEMICOLON actionBodyParen[result] )*
             {
             result = createSeqBlock(top); pushBlockToResolveStack(result);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:505:3: ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )?
-            int alt50=2;
-            final int LA50_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:509:3: ( T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON )?
+            int alt51=2;
+            final int LA51_0 = input.LA(1);
 
-            if ( (LA50_0==T_VAR) ) {
-                alt50=1;
+            if ( (LA51_0==T_VAR) ) {
+                alt51=1;
             }
-            switch (alt50) {
+            switch (alt51) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:505:4: T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:509:4: T_VAR syms= blockvarlist[result] ( '&' sexpr= expression )? T_COLON
                     {
                     match(input,T_VAR,FOLLOW_T_VAR_in_actionBodySequential2092);
 
@@ -3083,16 +3108,16 @@
                     state._fsp--;
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:505:36: ( '&' sexpr= expression )?
-                    int alt49=2;
-                    final int LA49_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:509:36: ( '&' sexpr= expression )?
+                    int alt50=2;
+                    final int LA50_0 = input.LA(1);
 
-                    if ( (LA49_0==116) ) {
-                        alt49=1;
+                    if ( (LA50_0==116) ) {
+                        alt50=1;
                     }
-                    switch (alt49) {
+                    switch (alt50) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:505:37: '&' sexpr= expression
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:509:37: '&' sexpr= expression
                             {
                             match(input,116,FOLLOW_116_in_actionBodySequential2100);
 
@@ -3124,20 +3149,20 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:506:28: ( T_SEMICOLON actionBodyParen[result] )*
-            loop51:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:510:28: ( T_SEMICOLON actionBodyParen[result] )*
+            loop52:
             do {
-                int alt51=2;
-                final int LA51_0 = input.LA(1);
+                int alt52=2;
+                final int LA52_0 = input.LA(1);
 
-                if ( (LA51_0==T_SEMICOLON) ) {
-                    alt51=1;
+                if ( (LA52_0==T_SEMICOLON) ) {
+                    alt52=1;
                 }
 
 
-                switch (alt51) {
+                switch (alt52) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:506:29: T_SEMICOLON actionBodyParen[result]
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:510:29: T_SEMICOLON actionBodyParen[result]
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_actionBodySequential2123);
 
@@ -3151,7 +3176,7 @@
             	    break;
 
             	default :
-            	    break loop51;
+            	    break loop52;
                 }
             } while (true);
 
@@ -3175,32 +3200,32 @@
 
 
     // $ANTLR start "actionBodyParen"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:512:1: actionBodyParen[SeqBlock top] : ( T_LPAREN actionBody[top] T_RPAREN |stmt= statement );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:516:1: actionBodyParen[SeqBlock top] : ( T_LPAREN actionBody[top] T_RPAREN |stmt= statement );
     public final void actionBodyParen(SeqBlock top) throws RecognitionException {
         Statement stmt =null;
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:513:2: ( T_LPAREN actionBody[top] T_RPAREN |stmt= statement )
-            int alt52=2;
-            final int LA52_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:517:2: ( T_LPAREN actionBody[top] T_RPAREN |stmt= statement )
+            int alt53=2;
+            final int LA53_0 = input.LA(1);
 
-            if ( (LA52_0==T_LPAREN) ) {
-                alt52=1;
+            if ( (LA53_0==T_LPAREN) ) {
+                alt53=1;
             }
-            else if ( (LA52_0==T_ABORT||LA52_0==T_BREAK||LA52_0==T_IDENTIFIER||LA52_0==T_KILL||LA52_0==T_REQUIRES||LA52_0==T_SELF||LA52_0==T_SKIP) ) {
-                alt52=2;
+            else if ( (LA53_0==T_ABORT||LA53_0==T_BREAK||LA53_0==T_IDENTIFIER||LA53_0==T_KILL||LA53_0==T_REQUIRES||LA53_0==T_SELF||LA53_0==T_SKIP) ) {
+                alt53=2;
             }
             else {
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 52, 0, input);
+                    new NoViableAltException("", 53, 0, input);
 
                 throw nvae;
 
             }
-            switch (alt52) {
+            switch (alt53) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:513:5: T_LPAREN actionBody[top] T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:517:5: T_LPAREN actionBody[top] T_RPAREN
                     {
                     match(input,T_LPAREN,FOLLOW_T_LPAREN_in_actionBodyParen2153);
 
@@ -3215,7 +3240,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:514:4: stmt= statement
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:518:4: stmt= statement
                     {
                     pushFollow(FOLLOW_statement_in_actionBodyParen2166);
                     stmt=statement();
@@ -3245,7 +3270,7 @@
 
 
     // $ANTLR start "statement"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:519:1: statement returns [Statement result] : ( T_ABORT | T_SKIP | T_BREAK | T_KILL T_LPAREN aname= ( T_IDENTIFIER | T_SELF ) T_RPAREN |gc= discreteActionBody |aqname= reference ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |) );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:523:1: statement returns [Statement result] : ( T_ABORT | T_SKIP | T_BREAK | T_KILL T_LPAREN aname= ( T_IDENTIFIER | T_SELF ) T_RPAREN |gc= discreteActionBody |aqname= reference ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |) );
     public final Statement statement() throws RecognitionException {
         Statement result = null;
 
@@ -3273,51 +3298,51 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:525:2: ( T_ABORT | T_SKIP | T_BREAK | T_KILL T_LPAREN aname= ( T_IDENTIFIER | T_SELF ) T_RPAREN |gc= discreteActionBody |aqname= reference ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |) )
-            int alt58=6;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:529:2: ( T_ABORT | T_SKIP | T_BREAK | T_KILL T_LPAREN aname= ( T_IDENTIFIER | T_SELF ) T_RPAREN |gc= discreteActionBody |aqname= reference ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |) )
+            int alt59=6;
             switch ( input.LA(1) ) {
             case T_ABORT:
                 {
-                alt58=1;
+                alt59=1;
                 }
                 break;
             case T_SKIP:
                 {
-                alt58=2;
+                alt59=2;
                 }
                 break;
             case T_BREAK:
                 {
-                alt58=3;
+                alt59=3;
                 }
                 break;
             case T_KILL:
                 {
-                alt58=4;
+                alt59=4;
                 }
                 break;
             case T_REQUIRES:
                 {
-                alt58=5;
+                alt59=5;
                 }
                 break;
             case T_IDENTIFIER:
             case T_SELF:
                 {
-                alt58=6;
+                alt59=6;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 58, 0, input);
+                    new NoViableAltException("", 59, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt58) {
+            switch (alt59) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:525:4: T_ABORT
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:529:4: T_ABORT
                     {
                     match(input,T_ABORT,FOLLOW_T_ABORT_in_statement2194);
 
@@ -3326,7 +3351,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:526:4: T_SKIP
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:530:4: T_SKIP
                     {
                     match(input,T_SKIP,FOLLOW_T_SKIP_in_statement2201);
 
@@ -3335,7 +3360,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:527:4: T_BREAK
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:531:4: T_BREAK
                     {
                     match(input,T_BREAK,FOLLOW_T_BREAK_in_statement2208);
 
@@ -3344,7 +3369,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:528:4: T_KILL T_LPAREN aname= ( T_IDENTIFIER | T_SELF ) T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:532:4: T_KILL T_LPAREN aname= ( T_IDENTIFIER | T_SELF ) T_RPAREN
                     {
                     match(input,T_KILL,FOLLOW_T_KILL_in_statement2215);
 
@@ -3369,7 +3394,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:529:5: gc= discreteActionBody
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:533:5: gc= discreteActionBody
                     {
                     pushFollow(FOLLOW_discreteActionBody_in_statement2239);
                     gc=discreteActionBody();
@@ -3382,7 +3407,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:530:4: aqname= reference ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |)
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:534:4: aqname= reference ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |)
                     {
                     pushFollow(FOLLOW_reference_in_statement2248);
                     aqname=reference();
@@ -3390,17 +3415,17 @@
                     state._fsp--;
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:531:7: ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |)
-                    int alt57=3;
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:535:7: ( T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )? | ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )? |)
+                    int alt58=3;
                     switch ( input.LA(1) ) {
                     case T_ASSIGNMENT:
                         {
-                        alt57=1;
+                        alt58=1;
                         }
                         break;
                     case T_COMMA:
                         {
-                        alt57=2;
+                        alt58=2;
                         }
                         break;
                     case T_END:
@@ -3409,20 +3434,20 @@
                     case T_RPAREN:
                     case T_SEMICOLON:
                         {
-                        alt57=3;
+                        alt58=3;
                         }
                         break;
                     default:
                         final NoViableAltException nvae =
-                            new NoViableAltException("", 57, 0, input);
+                            new NoViableAltException("", 58, 0, input);
 
                         throw nvae;
 
                     }
 
-                    switch (alt57) {
+                    switch (alt58) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:532:12: T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )?
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:536:12: T_ASSIGNMENT aexp= expression ( T_WITH ndexp= expression )?
                             {
                             match(input,T_ASSIGNMENT,FOLLOW_T_ASSIGNMENT_in_statement2276);
 
@@ -3434,16 +3459,16 @@
 
                             result = createSingleAssignmentStatement(aqname,aexp);
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:533:15: ( T_WITH ndexp= expression )?
-                            int alt53=2;
-                            final int LA53_0 = input.LA(1);
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:537:15: ( T_WITH ndexp= expression )?
+                            int alt54=2;
+                            final int LA54_0 = input.LA(1);
 
-                            if ( (LA53_0==T_WITH) ) {
-                                alt53=1;
+                            if ( (LA54_0==T_WITH) ) {
+                                alt54=1;
                             }
-                            switch (alt53) {
+                            switch (alt54) {
                                 case 1 :
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:533:16: T_WITH ndexp= expression
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:537:16: T_WITH ndexp= expression
                                     {
                                     match(input,T_WITH,FOLLOW_T_WITH_in_statement2301);
 
@@ -3464,25 +3489,25 @@
                             }
                             break;
                         case 2 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:536:8: ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )?
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:540:8: ( T_COMMA malhs= reference )+ T_ASSIGNMENT mexp= expression ( T_COMMA mexp2= expression )+ ( T_WITH ndex2= expression )?
                             {
                             result = createMultipleAssignmentStatementLHS(aqname);
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:537:7: ( T_COMMA malhs= reference )+
-                            int cnt54=0;
-                            loop54:
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:541:7: ( T_COMMA malhs= reference )+
+                            int cnt55=0;
+                            loop55:
                             do {
-                                int alt54=2;
-                                final int LA54_0 = input.LA(1);
+                                int alt55=2;
+                                final int LA55_0 = input.LA(1);
 
-                                if ( (LA54_0==T_COMMA) ) {
-                                    alt54=1;
+                                if ( (LA55_0==T_COMMA) ) {
+                                    alt55=1;
                                 }
 
 
-                                switch (alt54) {
+                                switch (alt55) {
                             	case 1 :
-                            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:537:8: T_COMMA malhs= reference
+                            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:541:8: T_COMMA malhs= reference
                             	    {
                             	    match(input,T_COMMA,FOLLOW_T_COMMA_in_statement2358);
 
@@ -3498,12 +3523,12 @@
                             	    break;
 
                             	default :
-                            	    if ( cnt54 >= 1 ) break loop54;
+                            	    if ( cnt55 >= 1 ) break loop55;
                                         final EarlyExitException eee =
-                                            new EarlyExitException(54, input);
+                                            new EarlyExitException(55, input);
                                         throw eee;
                                 }
-                                cnt54++;
+                                cnt55++;
                             } while (true);
 
 
@@ -3519,21 +3544,21 @@
 
                             addMutlipleAssignmentStatementRHS(result,mexp);
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:542:8: ( T_COMMA mexp2= expression )+
-                            int cnt55=0;
-                            loop55:
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:546:8: ( T_COMMA mexp2= expression )+
+                            int cnt56=0;
+                            loop56:
                             do {
-                                int alt55=2;
-                                final int LA55_0 = input.LA(1);
+                                int alt56=2;
+                                final int LA56_0 = input.LA(1);
 
-                                if ( (LA55_0==T_COMMA) ) {
-                                    alt55=1;
+                                if ( (LA56_0==T_COMMA) ) {
+                                    alt56=1;
                                 }
 
 
-                                switch (alt55) {
+                                switch (alt56) {
                             	case 1 :
-                            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:542:9: T_COMMA mexp2= expression
+                            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:546:9: T_COMMA mexp2= expression
                             	    {
                             	    match(input,T_COMMA,FOLLOW_T_COMMA_in_statement2418);
 
@@ -3549,25 +3574,25 @@
                             	    break;
 
                             	default :
-                            	    if ( cnt55 >= 1 ) break loop55;
+                            	    if ( cnt56 >= 1 ) break loop56;
                                         final EarlyExitException eee =
-                                            new EarlyExitException(55, input);
+                                            new EarlyExitException(56, input);
                                         throw eee;
                                 }
-                                cnt55++;
+                                cnt56++;
                             } while (true);
 
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:543:8: ( T_WITH ndex2= expression )?
-                            int alt56=2;
-                            final int LA56_0 = input.LA(1);
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:547:8: ( T_WITH ndex2= expression )?
+                            int alt57=2;
+                            final int LA57_0 = input.LA(1);
 
-                            if ( (LA56_0==T_WITH) ) {
-                                alt56=1;
+                            if ( (LA57_0==T_WITH) ) {
+                                alt57=1;
                             }
-                            switch (alt56) {
+                            switch (alt57) {
                                 case 1 :
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:543:9: T_WITH ndex2= expression
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:547:9: T_WITH ndex2= expression
                                     {
                                     match(input,T_WITH,FOLLOW_T_WITH_in_statement2436);
 
@@ -3588,7 +3613,7 @@
                             }
                             break;
                         case 3 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:546:7:
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:550:7:
                             {
                             result = createCallStatement(aqname);
 
@@ -3622,7 +3647,7 @@
 
 
     // $ANTLR start "expression"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:557:1: expression returns [Expression expr] : left= atomExpression (op= binoperator right= atomExpression )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:561:1: expression returns [Expression expr] : left= atomExpression (op= binoperator right= atomExpression )* ;
     public final Expression expression() throws RecognitionException {
         Expression expr = null;
 
@@ -3639,8 +3664,8 @@
         		final ArrayList<Expression> expressions = new ArrayList<Expression>();
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:563:2: (left= atomExpression (op= binoperator right= atomExpression )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:563:4: left= atomExpression (op= binoperator right= atomExpression )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:567:2: (left= atomExpression (op= binoperator right= atomExpression )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:567:4: left= atomExpression (op= binoperator right= atomExpression )*
             {
             pushFollow(FOLLOW_atomExpression_in_expression2515);
             left=atomExpression();
@@ -3650,20 +3675,20 @@
 
             expressions.add(left);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:565:3: (op= binoperator right= atomExpression )*
-            loop59:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:569:3: (op= binoperator right= atomExpression )*
+            loop60:
             do {
-                int alt59=2;
-                final int LA59_0 = input.LA(1);
+                int alt60=2;
+                final int LA60_0 = input.LA(1);
 
-                if ( (LA59_0==T_AND||LA59_0==T_BIIMPLIES||LA59_0==T_CONC||LA59_0==T_DIFF||LA59_0==T_DIV||(LA59_0 >= T_DOMRESBY && LA59_0 <= T_DOMRESTO)||LA59_0==T_EQUAL||(LA59_0 >= T_GREATER && LA59_0 <= T_GREATEREQUAL)||LA59_0==T_IDIV||(LA59_0 >= T_IMPLIES && LA59_0 <= T_IN)||LA59_0==T_INTER||(LA59_0 >= T_LESS && LA59_0 <= T_LESSEQUAL)||(LA59_0 >= T_MINUS && LA59_0 <= T_MUNION)||(LA59_0 >= T_NOT && LA59_0 <= T_NOTEQUAL)||LA59_0==T_OR||LA59_0==T_POW||LA59_0==T_PROD||(LA59_0 >= T_RNGRESBY && LA59_0 <= T_RNGRESTO)||LA59_0==T_SEQMOD_MAPOVERRIDE||(LA59_0 >= T_SUBSET && LA59_0 <= T_SUM)||LA59_0==T_UNION) ) {
-                    alt59=1;
+                if ( (LA60_0==T_AND||LA60_0==T_BIIMPLIES||LA60_0==T_CONC||LA60_0==T_DIFF||LA60_0==T_DIV||(LA60_0 >= T_DOMRESBY && LA60_0 <= T_DOMRESTO)||LA60_0==T_EQUAL||(LA60_0 >= T_GREATER && LA60_0 <= T_GREATEREQUAL)||LA60_0==T_IDIV||(LA60_0 >= T_IMPLIES && LA60_0 <= T_IN)||LA60_0==T_INTER||(LA60_0 >= T_LESS && LA60_0 <= T_LESSEQUAL)||(LA60_0 >= T_MINUS && LA60_0 <= T_MUNION)||(LA60_0 >= T_NOT && LA60_0 <= T_NOTEQUAL)||LA60_0==T_OR||LA60_0==T_POW||LA60_0==T_PROD||(LA60_0 >= T_RNGRESBY && LA60_0 <= T_RNGRESTO)||LA60_0==T_SEQMOD_MAPOVERRIDE||(LA60_0 >= T_SUBSET && LA60_0 <= T_SUM)||LA60_0==T_UNION) ) {
+                    alt60=1;
                 }
 
 
-                switch (alt59) {
+                switch (alt60) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:565:5: op= binoperator right= atomExpression
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:569:5: op= binoperator right= atomExpression
             	    {
             	    pushFollow(FOLLOW_binoperator_in_expression2528);
             	    op=binoperator();
@@ -3688,7 +3713,7 @@
             	    break;
 
             	default :
-            	    break loop59;
+            	    break loop60;
                 }
             } while (true);
 
@@ -3713,176 +3738,176 @@
 
 
     // $ANTLR start "binoperator"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:578:1: binoperator returns [BinaryOperator binop] : ( T_BIIMPLIES | T_GREATER | T_GREATEREQUAL | T_LESS | T_LESSEQUAL | T_EQUAL | T_NOTEQUAL | T_IMPLIES | T_MINUS | T_SUM | T_IN ( T_SET )? | T_NOT T_IN ( T_SET )? | T_SUBSET | T_OR | T_DIV | T_PROD | T_IDIV | T_MOD | T_UNION | T_DIFF | T_INTER | T_AND | T_POW | T_CONC | T_DOMRESBY | T_DOMRESTO | T_RNGRESBY | T_RNGRESTO | T_MUNION | T_SEQMOD_MAPOVERRIDE );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:582:1: binoperator returns [BinaryOperator binop] : ( T_BIIMPLIES | T_GREATER | T_GREATEREQUAL | T_LESS | T_LESSEQUAL | T_EQUAL | T_NOTEQUAL | T_IMPLIES | T_MINUS | T_SUM | T_IN ( T_SET )? | T_NOT T_IN ( T_SET )? | T_SUBSET | T_OR | T_DIV | T_PROD | T_IDIV | T_MOD | T_UNION | T_DIFF | T_INTER | T_AND | T_POW | T_CONC | T_DOMRESBY | T_DOMRESTO | T_RNGRESBY | T_RNGRESTO | T_MUNION | T_SEQMOD_MAPOVERRIDE );
     public final BinaryOperator binoperator() throws RecognitionException {
         BinaryOperator binop = null;
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:580:2: ( T_BIIMPLIES | T_GREATER | T_GREATEREQUAL | T_LESS | T_LESSEQUAL | T_EQUAL | T_NOTEQUAL | T_IMPLIES | T_MINUS | T_SUM | T_IN ( T_SET )? | T_NOT T_IN ( T_SET )? | T_SUBSET | T_OR | T_DIV | T_PROD | T_IDIV | T_MOD | T_UNION | T_DIFF | T_INTER | T_AND | T_POW | T_CONC | T_DOMRESBY | T_DOMRESTO | T_RNGRESBY | T_RNGRESTO | T_MUNION | T_SEQMOD_MAPOVERRIDE )
-            int alt62=30;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:584:2: ( T_BIIMPLIES | T_GREATER | T_GREATEREQUAL | T_LESS | T_LESSEQUAL | T_EQUAL | T_NOTEQUAL | T_IMPLIES | T_MINUS | T_SUM | T_IN ( T_SET )? | T_NOT T_IN ( T_SET )? | T_SUBSET | T_OR | T_DIV | T_PROD | T_IDIV | T_MOD | T_UNION | T_DIFF | T_INTER | T_AND | T_POW | T_CONC | T_DOMRESBY | T_DOMRESTO | T_RNGRESBY | T_RNGRESTO | T_MUNION | T_SEQMOD_MAPOVERRIDE )
+            int alt63=30;
             switch ( input.LA(1) ) {
             case T_BIIMPLIES:
                 {
-                alt62=1;
+                alt63=1;
                 }
                 break;
             case T_GREATER:
                 {
-                alt62=2;
+                alt63=2;
                 }
                 break;
             case T_GREATEREQUAL:
                 {
-                alt62=3;
+                alt63=3;
                 }
                 break;
             case T_LESS:
                 {
-                alt62=4;
+                alt63=4;
                 }
                 break;
             case T_LESSEQUAL:
                 {
-                alt62=5;
+                alt63=5;
                 }
                 break;
             case T_EQUAL:
                 {
-                alt62=6;
+                alt63=6;
                 }
                 break;
             case T_NOTEQUAL:
                 {
-                alt62=7;
+                alt63=7;
                 }
                 break;
             case T_IMPLIES:
                 {
-                alt62=8;
+                alt63=8;
                 }
                 break;
             case T_MINUS:
                 {
-                alt62=9;
+                alt63=9;
                 }
                 break;
             case T_SUM:
                 {
-                alt62=10;
+                alt63=10;
                 }
                 break;
             case T_IN:
                 {
-                alt62=11;
+                alt63=11;
                 }
                 break;
             case T_NOT:
                 {
-                alt62=12;
+                alt63=12;
                 }
                 break;
             case T_SUBSET:
                 {
-                alt62=13;
+                alt63=13;
                 }
                 break;
             case T_OR:
                 {
-                alt62=14;
+                alt63=14;
                 }
                 break;
             case T_DIV:
                 {
-                alt62=15;
+                alt63=15;
                 }
                 break;
             case T_PROD:
                 {
-                alt62=16;
+                alt63=16;
                 }
                 break;
             case T_IDIV:
                 {
-                alt62=17;
+                alt63=17;
                 }
                 break;
             case T_MOD:
                 {
-                alt62=18;
+                alt63=18;
                 }
                 break;
             case T_UNION:
                 {
-                alt62=19;
+                alt63=19;
                 }
                 break;
             case T_DIFF:
                 {
-                alt62=20;
+                alt63=20;
                 }
                 break;
             case T_INTER:
                 {
-                alt62=21;
+                alt63=21;
                 }
                 break;
             case T_AND:
                 {
-                alt62=22;
+                alt63=22;
                 }
                 break;
             case T_POW:
                 {
-                alt62=23;
+                alt63=23;
                 }
                 break;
             case T_CONC:
                 {
-                alt62=24;
+                alt63=24;
                 }
                 break;
             case T_DOMRESBY:
                 {
-                alt62=25;
+                alt63=25;
                 }
                 break;
             case T_DOMRESTO:
                 {
-                alt62=26;
+                alt63=26;
                 }
                 break;
             case T_RNGRESBY:
                 {
-                alt62=27;
+                alt63=27;
                 }
                 break;
             case T_RNGRESTO:
                 {
-                alt62=28;
+                alt63=28;
                 }
                 break;
             case T_MUNION:
                 {
-                alt62=29;
+                alt63=29;
                 }
                 break;
             case T_SEQMOD_MAPOVERRIDE:
                 {
-                alt62=30;
+                alt63=30;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 62, 0, input);
+                    new NoViableAltException("", 63, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt62) {
+            switch (alt63) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:580:4: T_BIIMPLIES
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:584:4: T_BIIMPLIES
                     {
                     match(input,T_BIIMPLIES,FOLLOW_T_BIIMPLIES_in_binoperator2569);
 
@@ -3891,7 +3916,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:582:4: T_GREATER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:586:4: T_GREATER
                     {
                     match(input,T_GREATER,FOLLOW_T_GREATER_in_binoperator2578);
 
@@ -3900,7 +3925,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:584:4: T_GREATEREQUAL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:588:4: T_GREATEREQUAL
                     {
                     match(input,T_GREATEREQUAL,FOLLOW_T_GREATEREQUAL_in_binoperator2588);
 
@@ -3909,7 +3934,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:586:4: T_LESS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:590:4: T_LESS
                     {
                     match(input,T_LESS,FOLLOW_T_LESS_in_binoperator2597);
 
@@ -3918,7 +3943,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:588:4: T_LESSEQUAL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:592:4: T_LESSEQUAL
                     {
                     match(input,T_LESSEQUAL,FOLLOW_T_LESSEQUAL_in_binoperator2607);
 
@@ -3927,7 +3952,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:590:4: T_EQUAL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:594:4: T_EQUAL
                     {
                     match(input,T_EQUAL,FOLLOW_T_EQUAL_in_binoperator2616);
 
@@ -3936,7 +3961,7 @@
                     }
                     break;
                 case 7 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:592:4: T_NOTEQUAL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:596:4: T_NOTEQUAL
                     {
                     match(input,T_NOTEQUAL,FOLLOW_T_NOTEQUAL_in_binoperator2628);
 
@@ -3945,7 +3970,7 @@
                     }
                     break;
                 case 8 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:594:4: T_IMPLIES
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:598:4: T_IMPLIES
                     {
                     match(input,T_IMPLIES,FOLLOW_T_IMPLIES_in_binoperator2639);
 
@@ -3954,7 +3979,7 @@
                     }
                     break;
                 case 9 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:596:4: T_MINUS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:600:4: T_MINUS
                     {
                     match(input,T_MINUS,FOLLOW_T_MINUS_in_binoperator2648);
 
@@ -3963,7 +3988,7 @@
                     }
                     break;
                 case 10 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:598:4: T_SUM
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:602:4: T_SUM
                     {
                     match(input,T_SUM,FOLLOW_T_SUM_in_binoperator2658);
 
@@ -3972,20 +3997,20 @@
                     }
                     break;
                 case 11 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:600:4: T_IN ( T_SET )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:604:4: T_IN ( T_SET )?
                     {
                     match(input,T_IN,FOLLOW_T_IN_in_binoperator2668);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:600:9: ( T_SET )?
-                    int alt60=2;
-                    final int LA60_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:604:9: ( T_SET )?
+                    int alt61=2;
+                    final int LA61_0 = input.LA(1);
 
-                    if ( (LA60_0==T_SET) ) {
-                        alt60=1;
+                    if ( (LA61_0==T_SET) ) {
+                        alt61=1;
                     }
-                    switch (alt60) {
+                    switch (alt61) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:600:9: T_SET
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:604:9: T_SET
                             {
                             match(input,T_SET,FOLLOW_T_SET_in_binoperator2670);
 
@@ -4000,22 +4025,22 @@
                     }
                     break;
                 case 12 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:602:4: T_NOT T_IN ( T_SET )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:606:4: T_NOT T_IN ( T_SET )?
                     {
                     match(input,T_NOT,FOLLOW_T_NOT_in_binoperator2681);
 
                     match(input,T_IN,FOLLOW_T_IN_in_binoperator2683);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:602:15: ( T_SET )?
-                    int alt61=2;
-                    final int LA61_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:606:15: ( T_SET )?
+                    int alt62=2;
+                    final int LA62_0 = input.LA(1);
 
-                    if ( (LA61_0==T_SET) ) {
-                        alt61=1;
+                    if ( (LA62_0==T_SET) ) {
+                        alt62=1;
                     }
-                    switch (alt61) {
+                    switch (alt62) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:602:15: T_SET
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:606:15: T_SET
                             {
                             match(input,T_SET,FOLLOW_T_SET_in_binoperator2685);
 
@@ -4030,7 +4055,7 @@
                     }
                     break;
                 case 13 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:604:4: T_SUBSET
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:608:4: T_SUBSET
                     {
                     match(input,T_SUBSET,FOLLOW_T_SUBSET_in_binoperator2696);
 
@@ -4039,7 +4064,7 @@
                     }
                     break;
                 case 14 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:606:4: T_OR
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:610:4: T_OR
                     {
                     match(input,T_OR,FOLLOW_T_OR_in_binoperator2706);
 
@@ -4048,7 +4073,7 @@
                     }
                     break;
                 case 15 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:608:4: T_DIV
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:612:4: T_DIV
                     {
                     match(input,T_DIV,FOLLOW_T_DIV_in_binoperator2715);
 
@@ -4057,7 +4082,7 @@
                     }
                     break;
                 case 16 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:610:4: T_PROD
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:614:4: T_PROD
                     {
                     match(input,T_PROD,FOLLOW_T_PROD_in_binoperator2724);
 
@@ -4066,7 +4091,7 @@
                     }
                     break;
                 case 17 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:612:4: T_IDIV
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:616:4: T_IDIV
                     {
                     match(input,T_IDIV,FOLLOW_T_IDIV_in_binoperator2734);
 
@@ -4075,7 +4100,7 @@
                     }
                     break;
                 case 18 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:614:4: T_MOD
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:618:4: T_MOD
                     {
                     match(input,T_MOD,FOLLOW_T_MOD_in_binoperator2744);
 
@@ -4084,7 +4109,7 @@
                     }
                     break;
                 case 19 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:616:4: T_UNION
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:620:4: T_UNION
                     {
                     match(input,T_UNION,FOLLOW_T_UNION_in_binoperator2754);
 
@@ -4093,7 +4118,7 @@
                     }
                     break;
                 case 20 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:618:4: T_DIFF
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:622:4: T_DIFF
                     {
                     match(input,T_DIFF,FOLLOW_T_DIFF_in_binoperator2765);
 
@@ -4102,7 +4127,7 @@
                     }
                     break;
                 case 21 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:620:4: T_INTER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:624:4: T_INTER
                     {
                     match(input,T_INTER,FOLLOW_T_INTER_in_binoperator2776);
 
@@ -4111,7 +4136,7 @@
                     }
                     break;
                 case 22 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:622:4: T_AND
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:626:4: T_AND
                     {
                     match(input,T_AND,FOLLOW_T_AND_in_binoperator2787);
 
@@ -4120,7 +4145,7 @@
                     }
                     break;
                 case 23 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:624:4: T_POW
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:628:4: T_POW
                     {
                     match(input,T_POW,FOLLOW_T_POW_in_binoperator2802);
 
@@ -4129,7 +4154,7 @@
                     }
                     break;
                 case 24 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:626:4: T_CONC
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:630:4: T_CONC
                     {
                     match(input,T_CONC,FOLLOW_T_CONC_in_binoperator2817);
 
@@ -4138,7 +4163,7 @@
                     }
                     break;
                 case 25 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:628:4: T_DOMRESBY
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:632:4: T_DOMRESBY
                     {
                     match(input,T_DOMRESBY,FOLLOW_T_DOMRESBY_in_binoperator2830);
 
@@ -4147,7 +4172,7 @@
                     }
                     break;
                 case 26 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:630:4: T_DOMRESTO
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:634:4: T_DOMRESTO
                     {
                     match(input,T_DOMRESTO,FOLLOW_T_DOMRESTO_in_binoperator2840);
 
@@ -4156,7 +4181,7 @@
                     }
                     break;
                 case 27 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:632:4: T_RNGRESBY
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:636:4: T_RNGRESBY
                     {
                     match(input,T_RNGRESBY,FOLLOW_T_RNGRESBY_in_binoperator2850);
 
@@ -4165,7 +4190,7 @@
                     }
                     break;
                 case 28 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:634:4: T_RNGRESTO
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:638:4: T_RNGRESTO
                     {
                     match(input,T_RNGRESTO,FOLLOW_T_RNGRESTO_in_binoperator2860);
 
@@ -4174,7 +4199,7 @@
                     }
                     break;
                 case 29 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:636:4: T_MUNION
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:640:4: T_MUNION
                     {
                     match(input,T_MUNION,FOLLOW_T_MUNION_in_binoperator2870);
 
@@ -4183,7 +4208,7 @@
                     }
                     break;
                 case 30 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:638:4: T_SEQMOD_MAPOVERRIDE
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:642:4: T_SEQMOD_MAPOVERRIDE
                     {
                     match(input,T_SEQMOD_MAPOVERRIDE,FOLLOW_T_SEQMOD_MAPOVERRIDE_in_binoperator2880);
 
@@ -4209,7 +4234,7 @@
 
 
     // $ANTLR start "atomExpression"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:644:1: atomExpression returns [Expression expr] : ( ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? ) |ie= T_IF ce= expression T_THEN te= expression T_ELSE ee= expression T_END );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:648:1: atomExpression returns [Expression expr] : ( ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? ) |ie= T_IF ce= expression T_THEN te= expression T_ELSE ee= expression T_END );
     public final Expression atomExpression() throws RecognitionException {
         Expression expr = null;
 
@@ -4234,40 +4259,40 @@
         		expr = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:2: ( ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? ) |ie= T_IF ce= expression T_THEN te= expression T_ELSE ee= expression T_END )
-            int alt69=2;
-            final int LA69_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:2: ( ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? ) |ie= T_IF ce= expression T_THEN te= expression T_ELSE ee= expression T_END )
+            int alt70=2;
+            final int LA70_0 = input.LA(1);
 
-            if ( (LA69_0==T_ABS||(LA69_0 >= T_CARD && LA69_0 <= T_CBRL)||LA69_0==T_DCONC||LA69_0==T_DINTER||LA69_0==T_DOM||(LA69_0 >= T_DUNION && LA69_0 <= T_ELEMS)||(LA69_0 >= T_EXISTS && LA69_0 <= T_FALSE)||LA69_0==T_FLOATNUMBER||LA69_0==T_FORALL||(LA69_0 >= T_HEAD && LA69_0 <= T_IDENTIFIER)||LA69_0==T_INDS||LA69_0==T_INTNUMBER||LA69_0==T_LEN||(LA69_0 >= T_LPAREN && LA69_0 <= T_LSQPAREN)||LA69_0==T_MERGE||LA69_0==T_MINUS||(LA69_0 >= T_NEW && LA69_0 <= T_NIL)||LA69_0==T_NOT||LA69_0==T_RNG||LA69_0==T_SELF||LA69_0==T_STRINGLITERAL||LA69_0==T_TAIL||LA69_0==T_TRUE) ) {
-                alt69=1;
+            if ( (LA70_0==T_ABS||(LA70_0 >= T_CARD && LA70_0 <= T_CBRL)||LA70_0==T_DCONC||LA70_0==T_DINTER||LA70_0==T_DOM||(LA70_0 >= T_DUNION && LA70_0 <= T_ELEMS)||(LA70_0 >= T_EXISTS && LA70_0 <= T_FALSE)||LA70_0==T_FLOATNUMBER||LA70_0==T_FORALL||(LA70_0 >= T_HEAD && LA70_0 <= T_IDENTIFIER)||LA70_0==T_INDS||LA70_0==T_INTNUMBER||LA70_0==T_LEN||(LA70_0 >= T_LPAREN && LA70_0 <= T_LSQPAREN)||LA70_0==T_MERGE||LA70_0==T_MINUS||(LA70_0 >= T_NEW && LA70_0 <= T_NIL)||LA70_0==T_NOT||LA70_0==T_RNG||LA70_0==T_SELF||LA70_0==T_STRINGLITERAL||LA70_0==T_TAIL||LA70_0==T_TRUE) ) {
+                alt70=1;
             }
-            else if ( (LA69_0==T_IF) ) {
-                alt69=2;
+            else if ( (LA70_0==T_IF) ) {
+                alt70=2;
             }
             else {
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 69, 0, input);
+                    new NoViableAltException("", 70, 0, input);
 
                 throw nvae;
 
             }
-            switch (alt69) {
+            switch (alt70) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:4: ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? )
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:4: ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? )
                     {
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:4: ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? )
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:5: (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:4: ( (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )? )
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:5: (unexpr= op_un )? (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? ) ( 'as' cid= T_IDENTIFIER )?
                     {
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:11: (unexpr= op_un )?
-                    int alt63=2;
-                    final int LA63_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:11: (unexpr= op_un )?
+                    int alt64=2;
+                    final int LA64_0 = input.LA(1);
 
-                    if ( (LA63_0==T_ABS||LA63_0==T_CARD||LA63_0==T_DCONC||LA63_0==T_DINTER||LA63_0==T_DOM||(LA63_0 >= T_DUNION && LA63_0 <= T_ELEMS)||LA63_0==T_HEAD||LA63_0==T_INDS||LA63_0==T_LEN||LA63_0==T_MERGE||LA63_0==T_MINUS||LA63_0==T_NOT||LA63_0==T_RNG||LA63_0==T_TAIL) ) {
-                        alt63=1;
+                    if ( (LA64_0==T_ABS||LA64_0==T_CARD||LA64_0==T_DCONC||LA64_0==T_DINTER||LA64_0==T_DOM||(LA64_0 >= T_DUNION && LA64_0 <= T_ELEMS)||LA64_0==T_HEAD||LA64_0==T_INDS||LA64_0==T_LEN||LA64_0==T_MERGE||LA64_0==T_MINUS||LA64_0==T_NOT||LA64_0==T_RNG||LA64_0==T_TAIL) ) {
+                        alt64=1;
                     }
-                    switch (alt63) {
+                    switch (alt64) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:11: unexpr= op_un
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:11: unexpr= op_un
                             {
                             pushFollow(FOLLOW_op_un_in_atomExpression2918);
                             unexpr=op_un();
@@ -4281,12 +4306,12 @@
                     }
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:649:19: (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? )
-                    int alt67=5;
-                    alt67 = dfa67.predict(input);
-                    switch (alt67) {
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:19: (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? )
+                    int alt68=5;
+                    alt68 = dfa68.predict(input);
+                    switch (alt68) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:650:8: e= identifierExpression
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:654:8: e= identifierExpression
                             {
                             pushFollow(FOLLOW_identifierExpression_in_atomExpression2935);
                             e=identifierExpression();
@@ -4297,7 +4322,7 @@
                             }
                             break;
                         case 2 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:651:8: e= constant
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:655:8: e= constant
                             {
                             pushFollow(FOLLOW_constant_in_atomExpression2946);
                             e=constant();
@@ -4308,7 +4333,7 @@
                             }
                             break;
                         case 3 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:652:8: e= initializedComplexType
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:656:8: e= initializedComplexType
                             {
                             pushFollow(FOLLOW_initializedComplexType_in_atomExpression2957);
                             e=initializedComplexType();
@@ -4319,7 +4344,7 @@
                             }
                             break;
                         case 4 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:653:8: e= quantifierExpression
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:657:8: e= quantifierExpression
                             {
                             pushFollow(FOLLOW_quantifierExpression_in_atomExpression2969);
                             e=quantifierExpression();
@@ -4330,7 +4355,7 @@
                             }
                             break;
                         case 5 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:654:8: T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )?
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:658:8: T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )?
                             {
                             match(input,T_LPAREN,FOLLOW_T_LPAREN_in_atomExpression2978);
 
@@ -4342,35 +4367,35 @@
 
                             match(input,T_RPAREN,FOLLOW_T_RPAREN_in_atomExpression2984);
 
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:655:8: ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )?
-                            int alt66=3;
-                            final int LA66_0 = input.LA(1);
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:659:8: ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )?
+                            int alt67=3;
+                            final int LA67_0 = input.LA(1);
 
-                            if ( (LA66_0==T_POINT) ) {
-                                alt66=1;
+                            if ( (LA67_0==T_POINT) ) {
+                                alt67=1;
                             }
-                            else if ( ((LA66_0 >= T_LPAREN && LA66_0 <= T_LSQPAREN)) ) {
-                                alt66=2;
+                            else if ( ((LA67_0 >= T_LPAREN && LA67_0 <= T_LSQPAREN)) ) {
+                                alt67=2;
                             }
-                            switch (alt66) {
+                            switch (alt67) {
                                 case 1 :
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:656:6: ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )?
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:660:6: ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )?
                                     {
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:656:6: ( T_POINT idn= T_IDENTIFIER )+
-                                    int cnt64=0;
-                                    loop64:
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:660:6: ( T_POINT idn= T_IDENTIFIER )+
+                                    int cnt65=0;
+                                    loop65:
                                     do {
-                                        int alt64=2;
-                                        final int LA64_0 = input.LA(1);
+                                        int alt65=2;
+                                        final int LA65_0 = input.LA(1);
 
-                                        if ( (LA64_0==T_POINT) ) {
-                                            alt64=1;
+                                        if ( (LA65_0==T_POINT) ) {
+                                            alt65=1;
                                         }
 
 
-                                        switch (alt64) {
+                                        switch (alt65) {
                                     	case 1 :
-                                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:656:7: T_POINT idn= T_IDENTIFIER
+                                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:660:7: T_POINT idn= T_IDENTIFIER
                                     	    {
                                     	    match(input,T_POINT,FOLLOW_T_POINT_in_atomExpression3007);
 
@@ -4382,25 +4407,25 @@
                                     	    break;
 
                                     	default :
-                                    	    if ( cnt64 >= 1 ) break loop64;
+                                    	    if ( cnt65 >= 1 ) break loop65;
                                                 final EarlyExitException eee =
-                                                    new EarlyExitException(64, input);
+                                                    new EarlyExitException(65, input);
                                                 throw eee;
                                         }
-                                        cnt64++;
+                                        cnt65++;
                                     } while (true);
 
 
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:659:8: (res= accessExpression[e] )?
-                                    int alt65=2;
-                                    final int LA65_0 = input.LA(1);
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:663:8: (res= accessExpression[e] )?
+                                    int alt66=2;
+                                    final int LA66_0 = input.LA(1);
 
-                                    if ( ((LA65_0 >= T_LPAREN && LA65_0 <= T_LSQPAREN)) ) {
-                                        alt65=1;
+                                    if ( ((LA66_0 >= T_LPAREN && LA66_0 <= T_LSQPAREN)) ) {
+                                        alt66=1;
                                     }
-                                    switch (alt65) {
+                                    switch (alt66) {
                                         case 1 :
-                                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:659:9: res= accessExpression[e]
+                                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:663:9: res= accessExpression[e]
                                             {
                                             pushFollow(FOLLOW_accessExpression_in_atomExpression3043);
                                             res=accessExpression(e);
@@ -4419,7 +4444,7 @@
                                     }
                                     break;
                                 case 2 :
-                                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:661:6: e= accessExpression[e]
+                                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:665:6: e= accessExpression[e]
                                     {
                                     pushFollow(FOLLOW_accessExpression_in_atomExpression3063);
                                     e=accessExpression(e);
@@ -4439,16 +4464,16 @@
                     }
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:663:5: ( 'as' cid= T_IDENTIFIER )?
-                    int alt68=2;
-                    final int LA68_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:667:5: ( 'as' cid= T_IDENTIFIER )?
+                    int alt69=2;
+                    final int LA69_0 = input.LA(1);
 
-                    if ( (LA68_0==119) ) {
-                        alt68=1;
+                    if ( (LA69_0==119) ) {
+                        alt69=1;
                     }
-                    switch (alt68) {
+                    switch (alt69) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:663:6: 'as' cid= T_IDENTIFIER
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:667:6: 'as' cid= T_IDENTIFIER
                             {
                             match(input,119,FOLLOW_119_in_atomExpression3082);
 
@@ -4470,7 +4495,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:666:6: ie= T_IF ce= expression T_THEN te= expression T_ELSE ee= expression T_END
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:670:6: ie= T_IF ce= expression T_THEN te= expression T_ELSE ee= expression T_END
                     {
                     ie=(Token)match(input,T_IF,FOLLOW_T_IF_in_atomExpression3107);
 
@@ -4520,7 +4545,7 @@
 
 
     // $ANTLR start "quantifierExpression"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:671:1: quantifierExpression returns [Quantifier result] : t= ( T_FORALL | T_EXISTS ) (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* ) T_COLON T_LPAREN e= expression T_RPAREN ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:675:1: quantifierExpression returns [Quantifier result] : t= ( T_FORALL | T_EXISTS ) (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* ) T_COLON T_LPAREN e= expression T_RPAREN ;
     public final Quantifier quantifierExpression() throws RecognitionException {
         Quantifier result = null;
 
@@ -4539,8 +4564,8 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:676:2: (t= ( T_FORALL | T_EXISTS ) (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* ) T_COLON T_LPAREN e= expression T_RPAREN )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:676:5: t= ( T_FORALL | T_EXISTS ) (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* ) T_COLON T_LPAREN e= expression T_RPAREN
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:680:2: (t= ( T_FORALL | T_EXISTS ) (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* ) T_COLON T_LPAREN e= expression T_RPAREN )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:680:5: t= ( T_FORALL | T_EXISTS ) (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* ) T_COLON T_LPAREN e= expression T_RPAREN
             {
             t=input.LT(1);
 
@@ -4556,13 +4581,13 @@
 
             result = createQuantifierExpression(t);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:678:3: (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:678:4: id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:682:3: (id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:682:4: id= T_IDENTIFIER ( T_COLON id_type= simpleType ) ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )*
             {
             id=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_quantifierExpression3174);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:678:20: ( T_COLON id_type= simpleType )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:678:21: T_COLON id_type= simpleType
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:682:20: ( T_COLON id_type= simpleType )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:682:21: T_COLON id_type= simpleType
             {
             match(input,T_COLON,FOLLOW_T_COLON_in_quantifierExpression3177);
 
@@ -4577,27 +4602,27 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:679:5: ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )*
-            loop70:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:683:5: ( T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType ) )*
+            loop71:
             do {
-                int alt70=2;
-                final int LA70_0 = input.LA(1);
+                int alt71=2;
+                final int LA71_0 = input.LA(1);
 
-                if ( (LA70_0==T_COMMA) ) {
-                    alt70=1;
+                if ( (LA71_0==T_COMMA) ) {
+                    alt71=1;
                 }
 
 
-                switch (alt70) {
+                switch (alt71) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:679:6: T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType )
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:683:6: T_COMMA id2= T_IDENTIFIER ( T_COLON id_type2= simpleType )
             	    {
             	    match(input,T_COMMA,FOLLOW_T_COMMA_in_quantifierExpression3192);
 
             	    id2=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_quantifierExpression3196);
 
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:679:31: ( T_COLON id_type2= simpleType )
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:679:32: T_COLON id_type2= simpleType
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:683:31: ( T_COLON id_type2= simpleType )
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:683:32: T_COLON id_type2= simpleType
             	    {
             	    match(input,T_COLON,FOLLOW_T_COLON_in_quantifierExpression3199);
 
@@ -4616,7 +4641,7 @@
             	    break;
 
             	default :
-            	    break loop70;
+            	    break loop71;
                 }
             } while (true);
 
@@ -4657,7 +4682,7 @@
 
 
     // $ANTLR start "constant"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:686:1: constant returns [LeafExpression result] : ( T_TRUE | T_FALSE | T_NIL | T_SELF |t_fl= T_FLOATNUMBER |t_in= T_INTNUMBER |t_l= T_STRINGLITERAL );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:690:1: constant returns [LeafExpression result] : ( T_TRUE | T_FALSE | T_NIL | T_SELF |t_fl= T_FLOATNUMBER |t_in= T_INTNUMBER |t_l= T_STRINGLITERAL );
     public final LeafExpression constant() throws RecognitionException {
         LeafExpression result = null;
 
@@ -4670,55 +4695,55 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:691:2: ( T_TRUE | T_FALSE | T_NIL | T_SELF |t_fl= T_FLOATNUMBER |t_in= T_INTNUMBER |t_l= T_STRINGLITERAL )
-            int alt71=7;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:695:2: ( T_TRUE | T_FALSE | T_NIL | T_SELF |t_fl= T_FLOATNUMBER |t_in= T_INTNUMBER |t_l= T_STRINGLITERAL )
+            int alt72=7;
             switch ( input.LA(1) ) {
             case T_TRUE:
                 {
-                alt71=1;
+                alt72=1;
                 }
                 break;
             case T_FALSE:
                 {
-                alt71=2;
+                alt72=2;
                 }
                 break;
             case T_NIL:
                 {
-                alt71=3;
+                alt72=3;
                 }
                 break;
             case T_SELF:
                 {
-                alt71=4;
+                alt72=4;
                 }
                 break;
             case T_FLOATNUMBER:
                 {
-                alt71=5;
+                alt72=5;
                 }
                 break;
             case T_INTNUMBER:
                 {
-                alt71=6;
+                alt72=6;
                 }
                 break;
             case T_STRINGLITERAL:
                 {
-                alt71=7;
+                alt72=7;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 71, 0, input);
+                    new NoViableAltException("", 72, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt71) {
+            switch (alt72) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:691:5: T_TRUE
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:695:5: T_TRUE
                     {
                     match(input,T_TRUE,FOLLOW_T_TRUE_in_constant3255);
 
@@ -4727,7 +4752,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:692:4: T_FALSE
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:696:4: T_FALSE
                     {
                     match(input,T_FALSE,FOLLOW_T_FALSE_in_constant3263);
 
@@ -4736,7 +4761,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:693:4: T_NIL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:697:4: T_NIL
                     {
                     match(input,T_NIL,FOLLOW_T_NIL_in_constant3270);
 
@@ -4745,7 +4770,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:694:4: T_SELF
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:698:4: T_SELF
                     {
                     match(input,T_SELF,FOLLOW_T_SELF_in_constant3278);
 
@@ -4754,7 +4779,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:695:5: t_fl= T_FLOATNUMBER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:699:5: t_fl= T_FLOATNUMBER
                     {
                     t_fl=(Token)match(input,T_FLOATNUMBER,FOLLOW_T_FLOATNUMBER_in_constant3289);
 
@@ -4763,7 +4788,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:696:4: t_in= T_INTNUMBER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:700:4: t_in= T_INTNUMBER
                     {
                     t_in=(Token)match(input,T_INTNUMBER,FOLLOW_T_INTNUMBER_in_constant3298);
 
@@ -4772,7 +4797,7 @@
                     }
                     break;
                 case 7 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:697:4: t_l= T_STRINGLITERAL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:701:4: t_l= T_STRINGLITERAL
                     {
                     t_l=(Token)match(input,T_STRINGLITERAL,FOLLOW_T_STRINGLITERAL_in_constant3307);
 
@@ -4798,7 +4823,7 @@
 
 
     // $ANTLR start "initializedComplexType"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:700:1: initializedComplexType returns [Expression result] : (res= initializedListType |res= initializedSetType | T_NEW T_LPAREN anid= T_IDENTIFIER ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN ) );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:704:1: initializedComplexType returns [Expression result] : (res= initializedListType |res= initializedSetType | T_NEW T_LPAREN anid= T_IDENTIFIER ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN ) );
     public final Expression initializedComplexType() throws RecognitionException {
         Expression result = null;
 
@@ -4812,35 +4837,35 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:705:2: (res= initializedListType |res= initializedSetType | T_NEW T_LPAREN anid= T_IDENTIFIER ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN ) )
-            int alt73=3;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:709:2: (res= initializedListType |res= initializedSetType | T_NEW T_LPAREN anid= T_IDENTIFIER ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN ) )
+            int alt74=3;
             switch ( input.LA(1) ) {
             case T_LSQPAREN:
                 {
-                alt73=1;
+                alt74=1;
                 }
                 break;
             case T_CBRL:
                 {
-                alt73=2;
+                alt74=2;
                 }
                 break;
             case T_NEW:
                 {
-                alt73=3;
+                alt74=3;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 73, 0, input);
+                    new NoViableAltException("", 74, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt73) {
+            switch (alt74) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:705:4: res= initializedListType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:709:4: res= initializedListType
                     {
                     pushFollow(FOLLOW_initializedListType_in_initializedComplexType3334);
                     res=initializedListType();
@@ -4853,7 +4878,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:706:4: res= initializedSetType
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:710:4: res= initializedSetType
                     {
                     pushFollow(FOLLOW_initializedSetType_in_initializedComplexType3343);
                     res=initializedSetType();
@@ -4866,7 +4891,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:707:5: T_NEW T_LPAREN anid= T_IDENTIFIER ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN )
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:711:5: T_NEW T_LPAREN anid= T_IDENTIFIER ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN )
                     {
                     match(input,T_NEW,FOLLOW_T_NEW_in_initializedComplexType3351);
 
@@ -4874,26 +4899,26 @@
 
                     anid=(Token)match(input,T_IDENTIFIER,FOLLOW_T_IDENTIFIER_in_initializedComplexType3357);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:708:4: ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN )
-                    int alt72=2;
-                    final int LA72_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:712:4: ( T_COMMA aname= T_STRINGLITERAL T_RPAREN | T_RPAREN )
+                    int alt73=2;
+                    final int LA73_0 = input.LA(1);
 
-                    if ( (LA72_0==T_COMMA) ) {
-                        alt72=1;
+                    if ( (LA73_0==T_COMMA) ) {
+                        alt73=1;
                     }
-                    else if ( (LA72_0==T_RPAREN) ) {
-                        alt72=2;
+                    else if ( (LA73_0==T_RPAREN) ) {
+                        alt73=2;
                     }
                     else {
                         final NoViableAltException nvae =
-                            new NoViableAltException("", 72, 0, input);
+                            new NoViableAltException("", 73, 0, input);
 
                         throw nvae;
 
                     }
-                    switch (alt72) {
+                    switch (alt73) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:709:5: T_COMMA aname= T_STRINGLITERAL T_RPAREN
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:713:5: T_COMMA aname= T_STRINGLITERAL T_RPAREN
                             {
                             match(input,T_COMMA,FOLLOW_T_COMMA_in_initializedComplexType3369);
 
@@ -4906,7 +4931,7 @@
                             }
                             break;
                         case 2 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:710:6: T_RPAREN
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:714:6: T_RPAREN
                             {
                             match(input,T_RPAREN,FOLLOW_T_RPAREN_in_initializedComplexType3385);
 
@@ -4938,7 +4963,7 @@
 
 
     // $ANTLR start "initializedListType"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:714:1: initializedListType returns [ListConstructor result] : T_LSQPAREN e= expression ( ( T_COMMA e2= expression )+ | listComprehension[result] )? T_RSQPAREN ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:718:1: initializedListType returns [ListConstructor result] : T_LSQPAREN e= expression ( ( T_COMMA e2= expression )+ | listComprehension[result] )? T_RSQPAREN ;
     public final ListConstructor initializedListType() throws RecognitionException {
         ListConstructor result = null;
 
@@ -4953,8 +4978,8 @@
         		pushListVarsOnResolveStack(result); // need this here for list comprehension
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:720:2: ( T_LSQPAREN e= expression ( ( T_COMMA e2= expression )+ | listComprehension[result] )? T_RSQPAREN )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:720:4: T_LSQPAREN e= expression ( ( T_COMMA e2= expression )+ | listComprehension[result] )? T_RSQPAREN
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:724:2: ( T_LSQPAREN e= expression ( ( T_COMMA e2= expression )+ | listComprehension[result] )? T_RSQPAREN )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:724:4: T_LSQPAREN e= expression ( ( T_COMMA e2= expression )+ | listComprehension[result] )? T_RSQPAREN
             {
             match(input,T_LSQPAREN,FOLLOW_T_LSQPAREN_in_initializedListType3416);
 
@@ -4966,35 +4991,35 @@
 
             addListElement(result,e);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:720:56: ( ( T_COMMA e2= expression )+ | listComprehension[result] )?
-            int alt75=3;
-            final int LA75_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:724:56: ( ( T_COMMA e2= expression )+ | listComprehension[result] )?
+            int alt76=3;
+            final int LA76_0 = input.LA(1);
 
-            if ( (LA75_0==T_COMMA) ) {
-                alt75=1;
+            if ( (LA76_0==T_COMMA) ) {
+                alt76=1;
             }
-            else if ( (LA75_0==T_BAR) ) {
-                alt75=2;
+            else if ( (LA76_0==T_BAR) ) {
+                alt76=2;
             }
-            switch (alt75) {
+            switch (alt76) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:721:4: ( T_COMMA e2= expression )+
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:725:4: ( T_COMMA e2= expression )+
                     {
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:721:4: ( T_COMMA e2= expression )+
-                    int cnt74=0;
-                    loop74:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:725:4: ( T_COMMA e2= expression )+
+                    int cnt75=0;
+                    loop75:
                     do {
-                        int alt74=2;
-                        final int LA74_0 = input.LA(1);
+                        int alt75=2;
+                        final int LA75_0 = input.LA(1);
 
-                        if ( (LA74_0==T_COMMA) ) {
-                            alt74=1;
+                        if ( (LA75_0==T_COMMA) ) {
+                            alt75=1;
                         }
 
 
-                        switch (alt74) {
+                        switch (alt75) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:721:5: T_COMMA e2= expression
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:725:5: T_COMMA e2= expression
                     	    {
                     	    match(input,T_COMMA,FOLLOW_T_COMMA_in_initializedListType3431);
 
@@ -5010,12 +5035,12 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt74 >= 1 ) break loop74;
+                    	    if ( cnt75 >= 1 ) break loop75;
                                 final EarlyExitException eee =
-                                    new EarlyExitException(74, input);
+                                    new EarlyExitException(75, input);
                                 throw eee;
                         }
-                        cnt74++;
+                        cnt75++;
                     } while (true);
 
 
@@ -5022,7 +5047,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:722:6: listComprehension[result]
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:726:6: listComprehension[result]
                     {
                     pushFollow(FOLLOW_listComprehension_in_initializedListType3447);
                     listComprehension(result);
@@ -5057,7 +5082,7 @@
 
 
     // $ANTLR start "listComprehension"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:728:1: listComprehension[ListConstructor result] : T_BAR T_VAR id= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )* ( '&' e= expression )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:732:1: listComprehension[ListConstructor result] : T_BAR T_VAR id= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )* ( '&' e= expression )? ;
     public final void listComprehension(ListConstructor result) throws RecognitionException {
         Token id=null;
         Token id2=null;
@@ -5072,8 +5097,8 @@
         		result.SetHasComprehension(true);
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:732:2: ( T_BAR T_VAR id= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )* ( '&' e= expression )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:733:3: T_BAR T_VAR id= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )* ( '&' e= expression )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:736:2: ( T_BAR T_VAR id= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )* ( '&' e= expression )? )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:737:3: T_BAR T_VAR id= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )* ( '&' e= expression )?
             {
             match(input,T_BAR,FOLLOW_T_BAR_in_listComprehension3486);
 
@@ -5091,20 +5116,20 @@
 
             addListComprVar(result,id,t1);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:735:4: ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )*
-            loop76:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:739:4: ( T_SEMICOLON id2= T_IDENTIFIER t2= complexType )*
+            loop77:
             do {
-                int alt76=2;
-                final int LA76_0 = input.LA(1);
+                int alt77=2;
+                final int LA77_0 = input.LA(1);
 
-                if ( (LA76_0==T_SEMICOLON) ) {
-                    alt76=1;
+                if ( (LA77_0==T_SEMICOLON) ) {
+                    alt77=1;
                 }
 
 
-                switch (alt76) {
+                switch (alt77) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:735:5: T_SEMICOLON id2= T_IDENTIFIER t2= complexType
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:739:5: T_SEMICOLON id2= T_IDENTIFIER t2= complexType
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_listComprehension3510);
 
@@ -5122,21 +5147,21 @@
             	    break;
 
             	default :
-            	    break loop76;
+            	    break loop77;
                 }
             } while (true);
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:736:3: ( '&' e= expression )?
-            int alt77=2;
-            final int LA77_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:740:3: ( '&' e= expression )?
+            int alt78=2;
+            final int LA78_0 = input.LA(1);
 
-            if ( (LA77_0==116) ) {
-                alt77=1;
+            if ( (LA78_0==116) ) {
+                alt78=1;
             }
-            switch (alt77) {
+            switch (alt78) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:736:4: '&' e= expression
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:740:4: '&' e= expression
                     {
                     match(input,116,FOLLOW_116_in_listComprehension3529);
 
@@ -5172,7 +5197,7 @@
 
 
     // $ANTLR start "initializedSetType"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:740:1: initializedSetType returns [Expression result] : ( T_CBRL T_MAPS T_CBRR |res= initializedSet );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:744:1: initializedSetType returns [Expression result] : ( T_CBRL T_MAPS T_CBRR |res= initializedSet );
     public final Expression initializedSetType() throws RecognitionException {
         Expression result = null;
 
@@ -5184,22 +5209,22 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:745:2: ( T_CBRL T_MAPS T_CBRR |res= initializedSet )
-            int alt78=2;
-            final int LA78_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:749:2: ( T_CBRL T_MAPS T_CBRR |res= initializedSet )
+            int alt79=2;
+            final int LA79_0 = input.LA(1);
 
-            if ( (LA78_0==T_CBRL) ) {
-                final int LA78_1 = input.LA(2);
+            if ( (LA79_0==T_CBRL) ) {
+                final int LA79_1 = input.LA(2);
 
-                if ( (LA78_1==T_MAPS) ) {
-                    alt78=1;
+                if ( (LA79_1==T_MAPS) ) {
+                    alt79=1;
                 }
-                else if ( (LA78_1==T_ABS||(LA78_1 >= T_CARD && LA78_1 <= T_CBRL)||LA78_1==T_DCONC||LA78_1==T_DINTER||LA78_1==T_DOM||(LA78_1 >= T_DUNION && LA78_1 <= T_ELEMS)||(LA78_1 >= T_EXISTS && LA78_1 <= T_FALSE)||LA78_1==T_FLOATNUMBER||LA78_1==T_FORALL||(LA78_1 >= T_HEAD && LA78_1 <= T_IDENTIFIER)||LA78_1==T_IF||LA78_1==T_INDS||LA78_1==T_INTNUMBER||LA78_1==T_LEN||(LA78_1 >= T_LPAREN && LA78_1 <= T_LSQPAREN)||LA78_1==T_MERGE||LA78_1==T_MINUS||(LA78_1 >= T_NEW && LA78_1 <= T_NIL)||LA78_1==T_NOT||LA78_1==T_RNG||LA78_1==T_SELF||LA78_1==T_STRINGLITERAL||LA78_1==T_TAIL||LA78_1==T_TRUE) ) {
-                    alt78=2;
+                else if ( (LA79_1==T_ABS||(LA79_1 >= T_CARD && LA79_1 <= T_CBRL)||LA79_1==T_DCONC||LA79_1==T_DINTER||LA79_1==T_DOM||(LA79_1 >= T_DUNION && LA79_1 <= T_ELEMS)||(LA79_1 >= T_EXISTS && LA79_1 <= T_FALSE)||LA79_1==T_FLOATNUMBER||LA79_1==T_FORALL||(LA79_1 >= T_HEAD && LA79_1 <= T_IDENTIFIER)||LA79_1==T_IF||LA79_1==T_INDS||LA79_1==T_INTNUMBER||LA79_1==T_LEN||(LA79_1 >= T_LPAREN && LA79_1 <= T_LSQPAREN)||LA79_1==T_MERGE||LA79_1==T_MINUS||(LA79_1 >= T_NEW && LA79_1 <= T_NIL)||LA79_1==T_NOT||LA79_1==T_RNG||LA79_1==T_SELF||LA79_1==T_STRINGLITERAL||LA79_1==T_TAIL||LA79_1==T_TRUE) ) {
+                    alt79=2;
                 }
                 else {
                     final NoViableAltException nvae =
-                        new NoViableAltException("", 78, 1, input);
+                        new NoViableAltException("", 79, 1, input);
 
                     throw nvae;
 
@@ -5207,14 +5232,14 @@
             }
             else {
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 78, 0, input);
+                    new NoViableAltException("", 79, 0, input);
 
                 throw nvae;
 
             }
-            switch (alt78) {
+            switch (alt79) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:745:4: T_CBRL T_MAPS T_CBRR
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:749:4: T_CBRL T_MAPS T_CBRR
                     {
                     match(input,T_CBRL,FOLLOW_T_CBRL_in_initializedSetType3561);
 
@@ -5227,7 +5252,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:746:4: res= initializedSet
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:750:4: res= initializedSet
                     {
                     pushFollow(FOLLOW_initializedSet_in_initializedSetType3576);
                     res=initializedSet();
@@ -5257,7 +5282,7 @@
 
 
     // $ANTLR start "initializedSet"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:749:1: initializedSet returns [Expression result] : T_CBRL e1= expression ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] ) T_CBRR ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:753:1: initializedSet returns [Expression result] : T_CBRL e1= expression ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] ) T_CBRR ;
     public final Expression initializedSet() throws RecognitionException {
         Expression result = null;
 
@@ -5275,8 +5300,8 @@
         		result = theset;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:756:2: ( T_CBRL e1= expression ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] ) T_CBRR )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:756:4: T_CBRL e1= expression ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] ) T_CBRR
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:760:2: ( T_CBRL e1= expression ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] ) T_CBRR )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:760:4: T_CBRL e1= expression ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] ) T_CBRR
             {
             match(input,T_CBRL,FOLLOW_T_CBRL_in_initializedSet3602);
 
@@ -5286,53 +5311,53 @@
             state._fsp--;
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:757:10: ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] )
-            int alt80=3;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:761:10: ( ( T_COMMA e2= expression )* |m= map[result, e1] | setComprehension[(SetConstructor)result] )
+            int alt81=3;
             switch ( input.LA(1) ) {
             case T_CBRR:
             case T_COMMA:
                 {
-                alt80=1;
+                alt81=1;
                 }
                 break;
             case T_MAPS:
                 {
-                alt80=2;
+                alt81=2;
                 }
                 break;
             case T_BAR:
                 {
-                alt80=3;
+                alt81=3;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 80, 0, input);
+                    new NoViableAltException("", 81, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt80) {
+            switch (alt81) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:758:4: ( T_COMMA e2= expression )*
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:762:4: ( T_COMMA e2= expression )*
                     {
                     addToSet(result,e1);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:759:4: ( T_COMMA e2= expression )*
-                    loop79:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:763:4: ( T_COMMA e2= expression )*
+                    loop80:
                     do {
-                        int alt79=2;
-                        final int LA79_0 = input.LA(1);
+                        int alt80=2;
+                        final int LA80_0 = input.LA(1);
 
-                        if ( (LA79_0==T_COMMA) ) {
-                            alt79=1;
+                        if ( (LA80_0==T_COMMA) ) {
+                            alt80=1;
                         }
 
 
-                        switch (alt79) {
+                        switch (alt80) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:759:5: T_COMMA e2= expression
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:763:5: T_COMMA e2= expression
                     	    {
                     	    match(input,T_COMMA,FOLLOW_T_COMMA_in_initializedSet3636);
 
@@ -5348,7 +5373,7 @@
                     	    break;
 
                     	default :
-                    	    break loop79;
+                    	    break loop80;
                         }
                     } while (true);
 
@@ -5356,7 +5381,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:760:6: m= map[result, e1]
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:764:6: m= map[result, e1]
                     {
                     pushFollow(FOLLOW_map_in_initializedSet3658);
                     m=map(result, e1);
@@ -5369,7 +5394,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:761:5: setComprehension[(SetConstructor)result]
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:765:5: setComprehension[(SetConstructor)result]
                     {
                     addToSet(result,e1);
 
@@ -5406,7 +5431,7 @@
 
 
     // $ANTLR start "map"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:767:1: map[Expression _map, Expression e1] returns [Expression result] : am= T_MAPS e2= expression ( T_COMMA e3= expression T_MAPS e4= expression )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:771:1: map[Expression _map, Expression e1] returns [Expression result] : am= T_MAPS e2= expression ( T_COMMA e3= expression T_MAPS e4= expression )* ;
     public final Expression map(Expression _map, Expression e1) throws RecognitionException {
         Expression result = null;
 
@@ -5423,8 +5448,8 @@
         		result = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:772:2: (am= T_MAPS e2= expression ( T_COMMA e3= expression T_MAPS e4= expression )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:772:4: am= T_MAPS e2= expression ( T_COMMA e3= expression T_MAPS e4= expression )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:776:2: (am= T_MAPS e2= expression ( T_COMMA e3= expression T_MAPS e4= expression )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:776:4: am= T_MAPS e2= expression ( T_COMMA e3= expression T_MAPS e4= expression )*
             {
             am=(Token)match(input,T_MAPS,FOLLOW_T_MAPS_in_map3717);
 
@@ -5436,20 +5461,20 @@
 
             result = createMap(e1,e2,am);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:772:63: ( T_COMMA e3= expression T_MAPS e4= expression )*
-            loop81:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:776:63: ( T_COMMA e3= expression T_MAPS e4= expression )*
+            loop82:
             do {
-                int alt81=2;
-                final int LA81_0 = input.LA(1);
+                int alt82=2;
+                final int LA82_0 = input.LA(1);
 
-                if ( (LA81_0==T_COMMA) ) {
-                    alt81=1;
+                if ( (LA82_0==T_COMMA) ) {
+                    alt82=1;
                 }
 
 
-                switch (alt81) {
+                switch (alt82) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:772:64: T_COMMA e3= expression T_MAPS e4= expression
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:776:64: T_COMMA e3= expression T_MAPS e4= expression
             	    {
             	    match(input,T_COMMA,FOLLOW_T_COMMA_in_map3729);
 
@@ -5473,7 +5498,7 @@
             	    break;
 
             	default :
-            	    break loop81;
+            	    break loop82;
                 }
             } while (true);
 
@@ -5496,7 +5521,7 @@
 
 
     // $ANTLR start "setComprehension"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:775:1: setComprehension[SetConstructor _set] : T_BAR T_VAR id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ( '&' epx= expression )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:779:1: setComprehension[SetConstructor _set] : T_BAR T_VAR id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ( '&' epx= expression )? ;
     public final void setComprehension(SetConstructor _set) throws RecognitionException {
         Token id1=null;
         Token id2=null;
@@ -5511,8 +5536,8 @@
         		_set.SetHasComprehension(true);
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:779:2: ( T_BAR T_VAR id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ( '&' epx= expression )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:779:4: T_BAR T_VAR id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ( '&' epx= expression )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:783:2: ( T_BAR T_VAR id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ( '&' epx= expression )? )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:783:4: T_BAR T_VAR id1= T_IDENTIFIER T_COLON t1= complexType ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )* ( '&' epx= expression )?
             {
             match(input,T_BAR,FOLLOW_T_BAR_in_setComprehension3761);
 
@@ -5530,20 +5555,20 @@
 
              addSetComprVar(_set, id1, t1);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:781:3: ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )*
-            loop82:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:785:3: ( T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType )*
+            loop83:
             do {
-                int alt82=2;
-                final int LA82_0 = input.LA(1);
+                int alt83=2;
+                final int LA83_0 = input.LA(1);
 
-                if ( (LA82_0==T_SEMICOLON) ) {
-                    alt82=1;
+                if ( (LA83_0==T_SEMICOLON) ) {
+                    alt83=1;
                 }
 
 
-                switch (alt82) {
+                switch (alt83) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:781:4: T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:785:4: T_SEMICOLON id2= T_IDENTIFIER T_COLON t2= complexType
             	    {
             	    match(input,T_SEMICOLON,FOLLOW_T_SEMICOLON_in_setComprehension3784);
 
@@ -5563,21 +5588,21 @@
             	    break;
 
             	default :
-            	    break loop82;
+            	    break loop83;
                 }
             } while (true);
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:783:3: ( '&' epx= expression )?
-            int alt83=2;
-            final int LA83_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:787:3: ( '&' epx= expression )?
+            int alt84=2;
+            final int LA84_0 = input.LA(1);
 
-            if ( (LA83_0==116) ) {
-                alt83=1;
+            if ( (LA84_0==116) ) {
+                alt84=1;
             }
-            switch (alt83) {
+            switch (alt84) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:783:4: '&' epx= expression
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:787:4: '&' epx= expression
                     {
                     match(input,116,FOLLOW_116_in_setComprehension3808);
 
@@ -5613,7 +5638,7 @@
 
 
     // $ANTLR start "identifierExpression"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:788:1: identifierExpression returns [Expression result] : ({...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN |res= reference );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:792:1: identifierExpression returns [Expression result] : ({...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN |res= reference );
     public final Expression identifierExpression() throws RecognitionException {
         Expression result = null;
 
@@ -5625,12 +5650,12 @@
 
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:790:2: ({...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN |res= reference )
-            int alt84=2;
-            alt84 = dfa84.predict(input);
-            switch (alt84) {
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:794:2: ({...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN |res= reference )
+            int alt85=2;
+            alt85 = dfa85.predict(input);
+            switch (alt85) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:791:3: {...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:795:3: {...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN
                     {
                     if ( !((isTuple(input.LT(1).getText()))) ) {
                         throw new FailedPredicateException(input, "identifierExpression", "isTuple(input.LT(1).getText())");
@@ -5653,7 +5678,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:795:3: res= reference
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:799:3: res= reference
                     {
                     pushFollow(FOLLOW_reference_in_identifierExpression3873);
                     res=reference();
@@ -5683,7 +5708,7 @@
 
 
     // $ANTLR start "reference"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:800:1: reference returns [Expression result] :{...}?aName= qualifiedIdentifier (output= accessExpression[result] |) (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:804:1: reference returns [Expression result] :{...}?aName= qualifiedIdentifier (output= accessExpression[result] |) (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )? ;
     public final Expression reference() throws RecognitionException {
         Expression result = null;
 
@@ -5704,8 +5729,8 @@
         		init = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:806:2: ({...}?aName= qualifiedIdentifier (output= accessExpression[result] |) (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:806:4: {...}?aName= qualifiedIdentifier (output= accessExpression[result] |) (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:810:2: ({...}?aName= qualifiedIdentifier (output= accessExpression[result] |) (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )? )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:810:4: {...}?aName= qualifiedIdentifier (output= accessExpression[result] |) (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )?
             {
             if ( !((!isTuple(input.LT(1).getText()))) ) {
                 throw new FailedPredicateException(input, "reference", "!isTuple(input.LT(1).getText())");
@@ -5719,26 +5744,26 @@
 
             result = aName;
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:808:3: (output= accessExpression[result] |)
-            int alt85=2;
-            final int LA85_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:812:3: (output= accessExpression[result] |)
+            int alt86=2;
+            final int LA86_0 = input.LA(1);
 
-            if ( ((LA85_0 >= T_LPAREN && LA85_0 <= T_LSQPAREN)) ) {
-                alt85=1;
+            if ( ((LA86_0 >= T_LPAREN && LA86_0 <= T_LSQPAREN)) ) {
+                alt86=1;
             }
-            else if ( ((LA85_0 >= T_ACTIONS && LA85_0 <= T_ASSIGNMENT)||(LA85_0 >= T_BAR && LA85_0 <= T_BIIMPLIES)||LA85_0==T_CBRR||(LA85_0 >= T_COLON && LA85_0 <= T_COMMA)||LA85_0==T_CONC||LA85_0==T_DIFF||(LA85_0 >= T_DIV && LA85_0 <= T_DO)||(LA85_0 >= T_DOMRESBY && LA85_0 <= T_DOMRESTO)||(LA85_0 >= T_ELSE && LA85_0 <= T_EQUAL)||(LA85_0 >= T_FOLDLR && LA85_0 <= T_FOLDRL)||(LA85_0 >= T_GREATER && LA85_0 <= T_GREATEREQUAL)||LA85_0==T_IDIV||(LA85_0 >= T_IMPLIES && LA85_0 <= T_IN)||LA85_0==T_INTER||(LA85_0 >= T_LESS && LA85_0 <= T_LESSEQUAL)||LA85_0==T_MAPS||(LA85_0 >= T_METHODS && LA85_0 <= T_MUNION)||(LA85_0 >= T_NONDET && LA85_0 <= T_NOTEQUAL)||LA85_0==T_OR||(LA85_0 >= T_POW && LA85_0 <= T_PROD)||(LA85_0 >= T_RNGRESBY && LA85_0 <= T_RSQPAREN)||(LA85_0 >= T_SEMICOLON && LA85_0 <= T_SEQMOD_MAPOVERRIDE)||(LA85_0 >= T_SUBSET && LA85_0 <= T_SUM)||LA85_0==T_THEN||(LA85_0 >= T_TYPES && LA85_0 <= T_UNION)||LA85_0==T_WITH||(LA85_0 >= 117 && LA85_0 <= 119)) ) {
-                alt85=2;
+            else if ( ((LA86_0 >= T_ACTIONS && LA86_0 <= T_ASSIGNMENT)||(LA86_0 >= T_BAR && LA86_0 <= T_BIIMPLIES)||LA86_0==T_CBRR||(LA86_0 >= T_COLON && LA86_0 <= T_COMMA)||LA86_0==T_CONC||LA86_0==T_DIFF||(LA86_0 >= T_DIV && LA86_0 <= T_DO)||(LA86_0 >= T_DOMRESBY && LA86_0 <= T_DOMRESTO)||(LA86_0 >= T_ELSE && LA86_0 <= T_EQUAL)||(LA86_0 >= T_FOLDLR && LA86_0 <= T_FOLDRL)||(LA86_0 >= T_GREATER && LA86_0 <= T_GREATEREQUAL)||LA86_0==T_IDIV||(LA86_0 >= T_IMPLIES && LA86_0 <= T_IN)||LA86_0==T_INTER||(LA86_0 >= T_LESS && LA86_0 <= T_LESSEQUAL)||LA86_0==T_MAPS||(LA86_0 >= T_METHODS && LA86_0 <= T_MUNION)||(LA86_0 >= T_NONDET && LA86_0 <= T_NOTEQUAL)||LA86_0==T_OR||(LA86_0 >= T_POW && LA86_0 <= T_PROD)||(LA86_0 >= T_RNGRESBY && LA86_0 <= T_RSQPAREN)||(LA86_0 >= T_SEMICOLON && LA86_0 <= T_SEQMOD_MAPOVERRIDE)||(LA86_0 >= T_SUBSET && LA86_0 <= T_SUM)||LA86_0==T_THEN||(LA86_0 >= T_TYPES && LA86_0 <= T_UNION)||LA86_0==T_WITH||(LA86_0 >= 117 && LA86_0 <= 119)) ) {
+                alt86=2;
             }
             else {
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 85, 0, input);
+                    new NoViableAltException("", 86, 0, input);
 
                 throw nvae;
 
             }
-            switch (alt85) {
+            switch (alt86) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:808:5: output= accessExpression[result]
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:812:5: output= accessExpression[result]
                     {
                     pushFollow(FOLLOW_accessExpression_in_reference3923);
                     output=accessExpression(result);
@@ -5751,7 +5776,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:811:3:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:815:3:
                     {
                     }
                     break;
@@ -5759,19 +5784,19 @@
             }
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:812:3: (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )?
-            int alt87=3;
-            final int LA87_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:816:3: (pr= T_PRIMED | ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN )?
+            int alt88=3;
+            final int LA88_0 = input.LA(1);
 
-            if ( (LA87_0==T_PRIMED) ) {
-                alt87=1;
+            if ( (LA88_0==T_PRIMED) ) {
+                alt88=1;
             }
-            else if ( ((LA87_0 >= T_FOLDLR && LA87_0 <= T_FOLDRL)||LA87_0==117) ) {
-                alt87=2;
+            else if ( ((LA88_0 >= T_FOLDLR && LA88_0 <= T_FOLDRL)||LA88_0==117) ) {
+                alt88=2;
             }
-            switch (alt87) {
+            switch (alt88) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:812:6: pr= T_PRIMED
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:816:6: pr= T_PRIMED
                     {
                     pr=(Token)match(input,T_PRIMED,FOLLOW_T_PRIMED_in_reference3948);
 
@@ -5780,18 +5805,18 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:814:5: ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:818:5: ( '::' T_LPAREN init= expression T_RPAREN )? afold= ( T_FOLDLR | T_FOLDRL ) T_LPAREN anexpr= expression T_RPAREN
                     {
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:814:5: ( '::' T_LPAREN init= expression T_RPAREN )?
-                    int alt86=2;
-                    final int LA86_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:818:5: ( '::' T_LPAREN init= expression T_RPAREN )?
+                    int alt87=2;
+                    final int LA87_0 = input.LA(1);
 
-                    if ( (LA86_0==117) ) {
-                        alt86=1;
+                    if ( (LA87_0==117) ) {
+                        alt87=1;
                     }
-                    switch (alt86) {
+                    switch (alt87) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:814:6: '::' T_LPAREN init= expression T_RPAREN
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:818:6: '::' T_LPAREN init= expression T_RPAREN
                             {
                             match(input,117,FOLLOW_117_in_reference3964);
 
@@ -5859,7 +5884,7 @@
 
 
     // $ANTLR start "accessExpression"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:819:1: accessExpression[Expression subexpr] returns [Expression result] : (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+ ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:823:1: accessExpression[Expression subexpr] returns [Expression result] : (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+ ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )? ;
     public final Expression accessExpression(Expression subexpr) throws RecognitionException {
         Expression result = null;
 
@@ -5879,27 +5904,27 @@
         		result = subexpr;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:825:2: ( (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+ ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:826:7: (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+ ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:829:2: ( (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+ ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )? )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:830:7: (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+ ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )?
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:826:7: (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+
-            int cnt88=0;
-            loop88:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:830:7: (tcall= T_LSQPAREN ac= expression T_RSQPAREN |bcall= T_LPAREN m_params= methodCallParams T_RPAREN )+
+            int cnt89=0;
+            loop89:
             do {
-                int alt88=3;
-                final int LA88_0 = input.LA(1);
+                int alt89=3;
+                final int LA89_0 = input.LA(1);
 
-                if ( (LA88_0==T_LSQPAREN) ) {
-                    alt88=1;
+                if ( (LA89_0==T_LSQPAREN) ) {
+                    alt89=1;
                 }
-                else if ( (LA88_0==T_LPAREN) ) {
-                    alt88=2;
+                else if ( (LA89_0==T_LPAREN) ) {
+                    alt89=2;
                 }
 
 
-                switch (alt88) {
+                switch (alt89) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:826:9: tcall= T_LSQPAREN ac= expression T_RSQPAREN
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:830:9: tcall= T_LSQPAREN ac= expression T_RSQPAREN
             	    {
             	    tcall=(Token)match(input,T_LSQPAREN,FOLLOW_T_LSQPAREN_in_accessExpression4035);
 
@@ -5916,7 +5941,7 @@
             	    }
             	    break;
             	case 2 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:828:10: bcall= T_LPAREN m_params= methodCallParams T_RPAREN
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:832:10: bcall= T_LPAREN m_params= methodCallParams T_RPAREN
             	    {
             	    bcall=(Token)match(input,T_LPAREN,FOLLOW_T_LPAREN_in_accessExpression4068);
 
@@ -5934,41 +5959,41 @@
             	    break;
 
             	default :
-            	    if ( cnt88 >= 1 ) break loop88;
+            	    if ( cnt89 >= 1 ) break loop89;
                         final EarlyExitException eee =
-                            new EarlyExitException(88, input);
+                            new EarlyExitException(89, input);
                         throw eee;
                 }
-                cnt88++;
+                cnt89++;
             } while (true);
 
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:831:3: ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )?
-            int alt91=2;
-            final int LA91_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:835:3: ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )? )?
+            int alt92=2;
+            final int LA92_0 = input.LA(1);
 
-            if ( (LA91_0==T_POINT) ) {
-                alt91=1;
+            if ( (LA92_0==T_POINT) ) {
+                alt92=1;
             }
-            switch (alt91) {
+            switch (alt92) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:832:4: ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )?
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:836:4: ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[result] )?
                     {
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:832:4: ( T_POINT idn= T_IDENTIFIER )+
-                    int cnt89=0;
-                    loop89:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:836:4: ( T_POINT idn= T_IDENTIFIER )+
+                    int cnt90=0;
+                    loop90:
                     do {
-                        int alt89=2;
-                        final int LA89_0 = input.LA(1);
+                        int alt90=2;
+                        final int LA90_0 = input.LA(1);
 
-                        if ( (LA89_0==T_POINT) ) {
-                            alt89=1;
+                        if ( (LA90_0==T_POINT) ) {
+                            alt90=1;
                         }
 
 
-                        switch (alt89) {
+                        switch (alt90) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:832:5: T_POINT idn= T_IDENTIFIER
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:836:5: T_POINT idn= T_IDENTIFIER
                     	    {
                     	    match(input,T_POINT,FOLLOW_T_POINT_in_accessExpression4096);
 
@@ -5980,25 +6005,25 @@
                     	    break;
 
                     	default :
-                    	    if ( cnt89 >= 1 ) break loop89;
+                    	    if ( cnt90 >= 1 ) break loop90;
                                 final EarlyExitException eee =
-                                    new EarlyExitException(89, input);
+                                    new EarlyExitException(90, input);
                                 throw eee;
                         }
-                        cnt89++;
+                        cnt90++;
                     } while (true);
 
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:835:4: (res= accessExpression[result] )?
-                    int alt90=2;
-                    final int LA90_0 = input.LA(1);
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:839:4: (res= accessExpression[result] )?
+                    int alt91=2;
+                    final int LA91_0 = input.LA(1);
 
-                    if ( ((LA90_0 >= T_LPAREN && LA90_0 <= T_LSQPAREN)) ) {
-                        alt90=1;
+                    if ( ((LA91_0 >= T_LPAREN && LA91_0 <= T_LSQPAREN)) ) {
+                        alt91=1;
                     }
-                    switch (alt90) {
+                    switch (alt91) {
                         case 1 :
-                            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:835:5: res= accessExpression[result]
+                            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:839:5: res= accessExpression[result]
                             {
                             pushFollow(FOLLOW_accessExpression_in_accessExpression4120);
                             res=accessExpression(result);
@@ -6038,7 +6063,7 @@
 
 
     // $ANTLR start "qualifiedIdentifier"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:839:1: qualifiedIdentifier returns [Expression top] : (self= T_SELF T_POINT )? idb= T_IDENTIFIER ( T_POINT idd= T_IDENTIFIER )* ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:843:1: qualifiedIdentifier returns [Expression top] : (self= T_SELF T_POINT )? idb= T_IDENTIFIER ( T_POINT idd= T_IDENTIFIER )* ;
     public final Expression qualifiedIdentifier() throws RecognitionException {
         Expression top = null;
 
@@ -6052,19 +6077,19 @@
         		top = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:845:2: ( (self= T_SELF T_POINT )? idb= T_IDENTIFIER ( T_POINT idd= T_IDENTIFIER )* )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:846:3: (self= T_SELF T_POINT )? idb= T_IDENTIFIER ( T_POINT idd= T_IDENTIFIER )*
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:849:2: ( (self= T_SELF T_POINT )? idb= T_IDENTIFIER ( T_POINT idd= T_IDENTIFIER )* )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:850:3: (self= T_SELF T_POINT )? idb= T_IDENTIFIER ( T_POINT idd= T_IDENTIFIER )*
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:846:3: (self= T_SELF T_POINT )?
-            int alt92=2;
-            final int LA92_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:850:3: (self= T_SELF T_POINT )?
+            int alt93=2;
+            final int LA93_0 = input.LA(1);
 
-            if ( (LA92_0==T_SELF) ) {
-                alt92=1;
+            if ( (LA93_0==T_SELF) ) {
+                alt93=1;
             }
-            switch (alt92) {
+            switch (alt93) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:846:4: self= T_SELF T_POINT
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:850:4: self= T_SELF T_POINT
                     {
                     self=(Token)match(input,T_SELF,FOLLOW_T_SELF_in_qualifiedIdentifier4159);
 
@@ -6082,20 +6107,20 @@
 
             top = createIdentifierAccessExpression(selfexpr,idb);
 
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:848:3: ( T_POINT idd= T_IDENTIFIER )*
-            loop93:
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:852:3: ( T_POINT idd= T_IDENTIFIER )*
+            loop94:
             do {
-                int alt93=2;
-                final int LA93_0 = input.LA(1);
+                int alt94=2;
+                final int LA94_0 = input.LA(1);
 
-                if ( (LA93_0==T_POINT) ) {
-                    alt93=1;
+                if ( (LA94_0==T_POINT) ) {
+                    alt94=1;
                 }
 
 
-                switch (alt93) {
+                switch (alt94) {
             	case 1 :
-            	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:848:4: T_POINT idd= T_IDENTIFIER
+            	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:852:4: T_POINT idd= T_IDENTIFIER
             	    {
             	    match(input,T_POINT,FOLLOW_T_POINT_in_qualifiedIdentifier4182);
 
@@ -6107,7 +6132,7 @@
             	    break;
 
             	default :
-            	    break loop93;
+            	    break loop94;
                 }
             } while (true);
 
@@ -6130,7 +6155,7 @@
 
 
     // $ANTLR start "methodCallParams"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:852:1: methodCallParams returns [ArrayList<Expression> result] : (expa= expression ( T_COMMA expb= expression )* )? ;
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:856:1: methodCallParams returns [ArrayList<Expression> result] : (expa= expression ( T_COMMA expb= expression )* )? ;
     public final ArrayList<Expression> methodCallParams() throws RecognitionException {
         ArrayList<Expression> result = null;
 
@@ -6144,19 +6169,19 @@
         		result = new ArrayList<Expression>();
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:857:2: ( (expa= expression ( T_COMMA expb= expression )* )? )
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:857:4: (expa= expression ( T_COMMA expb= expression )* )?
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:861:2: ( (expa= expression ( T_COMMA expb= expression )* )? )
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:861:4: (expa= expression ( T_COMMA expb= expression )* )?
             {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:857:4: (expa= expression ( T_COMMA expb= expression )* )?
-            int alt95=2;
-            final int LA95_0 = input.LA(1);
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:861:4: (expa= expression ( T_COMMA expb= expression )* )?
+            int alt96=2;
+            final int LA96_0 = input.LA(1);
 
-            if ( (LA95_0==T_ABS||(LA95_0 >= T_CARD && LA95_0 <= T_CBRL)||LA95_0==T_DCONC||LA95_0==T_DINTER||LA95_0==T_DOM||(LA95_0 >= T_DUNION && LA95_0 <= T_ELEMS)||(LA95_0 >= T_EXISTS && LA95_0 <= T_FALSE)||LA95_0==T_FLOATNUMBER||LA95_0==T_FORALL||(LA95_0 >= T_HEAD && LA95_0 <= T_IDENTIFIER)||LA95_0==T_IF||LA95_0==T_INDS||LA95_0==T_INTNUMBER||LA95_0==T_LEN||(LA95_0 >= T_LPAREN && LA95_0 <= T_LSQPAREN)||LA95_0==T_MERGE||LA95_0==T_MINUS||(LA95_0 >= T_NEW && LA95_0 <= T_NIL)||LA95_0==T_NOT||LA95_0==T_RNG||LA95_0==T_SELF||LA95_0==T_STRINGLITERAL||LA95_0==T_TAIL||LA95_0==T_TRUE) ) {
-                alt95=1;
+            if ( (LA96_0==T_ABS||(LA96_0 >= T_CARD && LA96_0 <= T_CBRL)||LA96_0==T_DCONC||LA96_0==T_DINTER||LA96_0==T_DOM||(LA96_0 >= T_DUNION && LA96_0 <= T_ELEMS)||(LA96_0 >= T_EXISTS && LA96_0 <= T_FALSE)||LA96_0==T_FLOATNUMBER||LA96_0==T_FORALL||(LA96_0 >= T_HEAD && LA96_0 <= T_IDENTIFIER)||LA96_0==T_IF||LA96_0==T_INDS||LA96_0==T_INTNUMBER||LA96_0==T_LEN||(LA96_0 >= T_LPAREN && LA96_0 <= T_LSQPAREN)||LA96_0==T_MERGE||LA96_0==T_MINUS||(LA96_0 >= T_NEW && LA96_0 <= T_NIL)||LA96_0==T_NOT||LA96_0==T_RNG||LA96_0==T_SELF||LA96_0==T_STRINGLITERAL||LA96_0==T_TAIL||LA96_0==T_TRUE) ) {
+                alt96=1;
             }
-            switch (alt95) {
+            switch (alt96) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:857:5: expa= expression ( T_COMMA expb= expression )*
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:861:5: expa= expression ( T_COMMA expb= expression )*
                     {
                     pushFollow(FOLLOW_expression_in_methodCallParams4219);
                     expa=expression();
@@ -6166,20 +6191,20 @@
 
                     result.add(expa);
 
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:857:41: ( T_COMMA expb= expression )*
-                    loop94:
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:861:41: ( T_COMMA expb= expression )*
+                    loop95:
                     do {
-                        int alt94=2;
-                        final int LA94_0 = input.LA(1);
+                        int alt95=2;
+                        final int LA95_0 = input.LA(1);
 
-                        if ( (LA94_0==T_COMMA) ) {
-                            alt94=1;
+                        if ( (LA95_0==T_COMMA) ) {
+                            alt95=1;
                         }
 
 
-                        switch (alt94) {
+                        switch (alt95) {
                     	case 1 :
-                    	    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:857:42: T_COMMA expb= expression
+                    	    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:861:42: T_COMMA expb= expression
                     	    {
                     	    match(input,T_COMMA,FOLLOW_T_COMMA_in_methodCallParams4224);
 
@@ -6195,7 +6220,7 @@
                     	    break;
 
                     	default :
-                    	    break loop94;
+                    	    break loop95;
                         }
                     } while (true);
 
@@ -6224,7 +6249,7 @@
 
 
     // $ANTLR start "op_un"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:867:1: op_un returns [UnaryOperator expr] : (r= op_un_set_list |r2= op_un_map | T_MINUS | T_NOT | T_ABS );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:871:1: op_un returns [UnaryOperator expr] : (r= op_un_set_list |r2= op_un_map | T_MINUS | T_NOT | T_ABS );
     public final UnaryOperator op_un() throws RecognitionException {
         UnaryOperator expr = null;
 
@@ -6238,8 +6263,8 @@
         		expr = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:872:2: (r= op_un_set_list |r2= op_un_map | T_MINUS | T_NOT | T_ABS )
-            int alt96=5;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:876:2: (r= op_un_set_list |r2= op_un_map | T_MINUS | T_NOT | T_ABS )
+            int alt97=5;
             switch ( input.LA(1) ) {
             case T_CARD:
             case T_DCONC:
@@ -6251,7 +6276,7 @@
             case T_LEN:
             case T_TAIL:
                 {
-                alt96=1;
+                alt97=1;
                 }
                 break;
             case T_DOM:
@@ -6258,35 +6283,35 @@
             case T_MERGE:
             case T_RNG:
                 {
-                alt96=2;
+                alt97=2;
                 }
                 break;
             case T_MINUS:
                 {
-                alt96=3;
+                alt97=3;
                 }
                 break;
             case T_NOT:
                 {
-                alt96=4;
+                alt97=4;
                 }
                 break;
             case T_ABS:
                 {
-                alt96=5;
+                alt97=5;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 96, 0, input);
+                    new NoViableAltException("", 97, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt96) {
+            switch (alt97) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:872:4: r= op_un_set_list
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:876:4: r= op_un_set_list
                     {
                     pushFollow(FOLLOW_op_un_set_list_in_op_un4267);
                     r=op_un_set_list();
@@ -6299,7 +6324,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:873:4: r2= op_un_map
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:877:4: r2= op_un_map
                     {
                     pushFollow(FOLLOW_op_un_map_in_op_un4276);
                     r2=op_un_map();
@@ -6312,7 +6337,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:874:4: T_MINUS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:878:4: T_MINUS
                     {
                     match(input,T_MINUS,FOLLOW_T_MINUS_in_op_un4284);
 
@@ -6321,7 +6346,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:875:4: T_NOT
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:879:4: T_NOT
                     {
                     match(input,T_NOT,FOLLOW_T_NOT_in_op_un4292);
 
@@ -6330,7 +6355,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:876:4: T_ABS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:880:4: T_ABS
                     {
                     match(input,T_ABS,FOLLOW_T_ABS_in_op_un4300);
 
@@ -6356,7 +6381,7 @@
 
 
     // $ANTLR start "op_un_set_list"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:880:1: op_un_set_list returns [UnaryOperator expr] : ( T_CARD | T_DCONC | T_DINTER | T_DUNION | T_ELEMS | T_HEAD | T_INDS | T_LEN | T_TAIL );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:884:1: op_un_set_list returns [UnaryOperator expr] : ( T_CARD | T_DCONC | T_DINTER | T_DUNION | T_ELEMS | T_HEAD | T_INDS | T_LEN | T_TAIL );
     public final UnaryOperator op_un_set_list() throws RecognitionException {
         UnaryOperator expr = null;
 
@@ -6365,65 +6390,65 @@
         		expr = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:885:2: ( T_CARD | T_DCONC | T_DINTER | T_DUNION | T_ELEMS | T_HEAD | T_INDS | T_LEN | T_TAIL )
-            int alt97=9;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:889:2: ( T_CARD | T_DCONC | T_DINTER | T_DUNION | T_ELEMS | T_HEAD | T_INDS | T_LEN | T_TAIL )
+            int alt98=9;
             switch ( input.LA(1) ) {
             case T_CARD:
                 {
-                alt97=1;
+                alt98=1;
                 }
                 break;
             case T_DCONC:
                 {
-                alt97=2;
+                alt98=2;
                 }
                 break;
             case T_DINTER:
                 {
-                alt97=3;
+                alt98=3;
                 }
                 break;
             case T_DUNION:
                 {
-                alt97=4;
+                alt98=4;
                 }
                 break;
             case T_ELEMS:
                 {
-                alt97=5;
+                alt98=5;
                 }
                 break;
             case T_HEAD:
                 {
-                alt97=6;
+                alt98=6;
                 }
                 break;
             case T_INDS:
                 {
-                alt97=7;
+                alt98=7;
                 }
                 break;
             case T_LEN:
                 {
-                alt97=8;
+                alt98=8;
                 }
                 break;
             case T_TAIL:
                 {
-                alt97=9;
+                alt98=9;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 97, 0, input);
+                    new NoViableAltException("", 98, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt97) {
+            switch (alt98) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:885:4: T_CARD
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:889:4: T_CARD
                     {
                     match(input,T_CARD,FOLLOW_T_CARD_in_op_un_set_list4327);
 
@@ -6432,7 +6457,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:887:4: T_DCONC
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:891:4: T_DCONC
                     {
                     match(input,T_DCONC,FOLLOW_T_DCONC_in_op_un_set_list4338);
 
@@ -6441,7 +6466,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:889:4: T_DINTER
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:893:4: T_DINTER
                     {
                     match(input,T_DINTER,FOLLOW_T_DINTER_in_op_un_set_list4349);
 
@@ -6450,7 +6475,7 @@
                     }
                     break;
                 case 4 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:891:4: T_DUNION
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:895:4: T_DUNION
                     {
                     match(input,T_DUNION,FOLLOW_T_DUNION_in_op_un_set_list4359);
 
@@ -6459,7 +6484,7 @@
                     }
                     break;
                 case 5 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:893:4: T_ELEMS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:897:4: T_ELEMS
                     {
                     match(input,T_ELEMS,FOLLOW_T_ELEMS_in_op_un_set_list4369);
 
@@ -6468,7 +6493,7 @@
                     }
                     break;
                 case 6 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:895:4: T_HEAD
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:899:4: T_HEAD
                     {
                     match(input,T_HEAD,FOLLOW_T_HEAD_in_op_un_set_list4380);
 
@@ -6477,7 +6502,7 @@
                     }
                     break;
                 case 7 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:897:4: T_INDS
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:901:4: T_INDS
                     {
                     match(input,T_INDS,FOLLOW_T_INDS_in_op_un_set_list4391);
 
@@ -6486,7 +6511,7 @@
                     }
                     break;
                 case 8 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:899:4: T_LEN
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:903:4: T_LEN
                     {
                     match(input,T_LEN,FOLLOW_T_LEN_in_op_un_set_list4402);
 
@@ -6495,7 +6520,7 @@
                     }
                     break;
                 case 9 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:901:4: T_TAIL
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:905:4: T_TAIL
                     {
                     match(input,T_TAIL,FOLLOW_T_TAIL_in_op_un_set_list4413);
 
@@ -6521,7 +6546,7 @@
 
 
     // $ANTLR start "op_un_map"
-    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:906:1: op_un_map returns [UnaryOperator expr] : ( T_DOM | T_RNG | T_MERGE );
+    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:910:1: op_un_map returns [UnaryOperator expr] : ( T_DOM | T_RNG | T_MERGE );
     public final UnaryOperator op_un_map() throws RecognitionException {
         UnaryOperator expr = null;
 
@@ -6530,35 +6555,35 @@
         		expr = null;
 
         try {
-            // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:911:2: ( T_DOM | T_RNG | T_MERGE )
-            int alt98=3;
+            // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:915:2: ( T_DOM | T_RNG | T_MERGE )
+            int alt99=3;
             switch ( input.LA(1) ) {
             case T_DOM:
                 {
-                alt98=1;
+                alt99=1;
                 }
                 break;
             case T_RNG:
                 {
-                alt98=2;
+                alt99=2;
                 }
                 break;
             case T_MERGE:
                 {
-                alt98=3;
+                alt99=3;
                 }
                 break;
             default:
                 final NoViableAltException nvae =
-                    new NoViableAltException("", 98, 0, input);
+                    new NoViableAltException("", 99, 0, input);
 
                 throw nvae;
 
             }
 
-            switch (alt98) {
+            switch (alt99) {
                 case 1 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:911:4: T_DOM
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:915:4: T_DOM
                     {
                     match(input,T_DOM,FOLLOW_T_DOM_in_op_un_map4442);
 
@@ -6567,7 +6592,7 @@
                     }
                     break;
                 case 2 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:913:4: T_RNG
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:917:4: T_RNG
                     {
                     match(input,T_RNG,FOLLOW_T_RNG_in_op_un_map4453);
 
@@ -6576,7 +6601,7 @@
                     }
                     break;
                 case 3 :
-                    // /home/willibald/svn/branches/1161_dynlistPerformance_willibald/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:915:4: T_MERGE
+                    // /home/willi/svn/trunk/ooascompiler/ooasCompiler/src/org/momut/ooas/parser/ooa.g:919:4: T_MERGE
                     {
                     match(input,T_MERGE,FOLLOW_T_MERGE_in_op_un_map4464);
 
@@ -6602,21 +6627,21 @@
     // Delegated rules
 
 
-    protected DFA67 dfa67 = new DFA67(this);
-    protected DFA84 dfa84 = new DFA84(this);
-    static final String DFA67_eotS =
+    protected DFA68 dfa68 = new DFA68(this);
+    protected DFA85 dfa85 = new DFA85(this);
+    static final String DFA68_eotS =
         "\101\uffff";
-    static final String DFA67_eofS =
+    static final String DFA68_eofS =
         "\101\uffff";
-    static final String DFA67_minS =
+    static final String DFA68_minS =
         "\1\21\1\uffff\1\10\76\uffff";
-    static final String DFA67_maxS =
+    static final String DFA68_maxS =
         "\1\156\1\uffff\1\167\76\uffff";
-    static final String DFA67_acceptS =
+    static final String DFA68_acceptS =
         "\1\uffff\1\1\1\uffff\1\2\5\uffff\1\3\2\uffff\1\4\1\5\63\uffff";
-    static final String DFA67_specialS =
+    static final String DFA68_specialS =
         "\101\uffff}>";
-    static final String[] DFA67_transitionS = {
+    static final String[] DFA68_transitionS = {
             "\1\11\27\uffff\1\14\1\3\1\uffff\1\3\2\uffff\1\14\3\uffff\1\1"+
             "\10\uffff\1\3\6\uffff\1\15\1\11\7\uffff\1\11\1\3\23\uffff\1"+
             "\2\5\uffff\1\3\6\uffff\1\3",
@@ -6691,53 +6716,53 @@
             ""
     };
 
-    static final short[] DFA67_eot = DFA.unpackEncodedString(DFA67_eotS);
-    static final short[] DFA67_eof = DFA.unpackEncodedString(DFA67_eofS);
-    static final char[] DFA67_min = DFA.unpackEncodedStringToUnsignedChars(DFA67_minS);
-    static final char[] DFA67_max = DFA.unpackEncodedStringToUnsignedChars(DFA67_maxS);
-    static final short[] DFA67_accept = DFA.unpackEncodedString(DFA67_acceptS);
-    static final short[] DFA67_special = DFA.unpackEncodedString(DFA67_specialS);
-    static final short[][] DFA67_transition;
+    static final short[] DFA68_eot = DFA.unpackEncodedString(DFA68_eotS);
+    static final short[] DFA68_eof = DFA.unpackEncodedString(DFA68_eofS);
+    static final char[] DFA68_min = DFA.unpackEncodedStringToUnsignedChars(DFA68_minS);
+    static final char[] DFA68_max = DFA.unpackEncodedStringToUnsignedChars(DFA68_maxS);
+    static final short[] DFA68_accept = DFA.unpackEncodedString(DFA68_acceptS);
+    static final short[] DFA68_special = DFA.unpackEncodedString(DFA68_specialS);
+    static final short[][] DFA68_transition;
 
     static {
-        final int numStates = DFA67_transitionS.length;
-        DFA67_transition = new short[numStates][];
+        final int numStates = DFA68_transitionS.length;
+        DFA68_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA67_transition[i] = DFA.unpackEncodedString(DFA67_transitionS[i]);
+            DFA68_transition[i] = DFA.unpackEncodedString(DFA68_transitionS[i]);
         }
     }
 
-    class DFA67 extends DFA {
+    class DFA68 extends DFA {
 
-        public DFA67(BaseRecognizer recognizer) {
+        public DFA68(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 67;
-            this.eot = DFA67_eot;
-            this.eof = DFA67_eof;
-            this.min = DFA67_min;
-            this.max = DFA67_max;
-            this.accept = DFA67_accept;
-            this.special = DFA67_special;
-            this.transition = DFA67_transition;
+            this.decisionNumber = 68;
+            this.eot = DFA68_eot;
+            this.eof = DFA68_eof;
+            this.min = DFA68_min;
+            this.max = DFA68_max;
+            this.accept = DFA68_accept;
+            this.special = DFA68_special;
+            this.transition = DFA68_transition;
         }
         @Override
 		public String getDescription() {
-            return "649:19: (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? )";
+            return "653:19: (e= identifierExpression |e= constant |e= initializedComplexType |e= quantifierExpression | T_LPAREN e= expression T_RPAREN ( ( T_POINT idn= T_IDENTIFIER )+ (res= accessExpression[e] )? |e= accessExpression[e] )? )";
         }
     }
-    static final String DFA84_eotS =
+    static final String DFA85_eotS =
         "\74\uffff";
-    static final String DFA84_eofS =
+    static final String DFA85_eofS =
         "\74\uffff";
-    static final String DFA84_minS =
+    static final String DFA85_minS =
         "\1\63\1\10\1\uffff\1\0\70\uffff";
-    static final String DFA84_maxS =
+    static final String DFA85_maxS =
         "\1\141\1\167\1\uffff\1\0\70\uffff";
-    static final String DFA84_acceptS =
+    static final String DFA85_acceptS =
         "\2\uffff\1\2\70\uffff\1\1";
-    static final String DFA84_specialS =
+    static final String DFA85_specialS =
         "\3\uffff\1\0\70\uffff}>";
-    static final String[] DFA84_transitionS = {
+    static final String[] DFA85_transitionS = {
             "\1\1\55\uffff\1\2",
             "\2\2\2\uffff\2\2\4\uffff\1\2\1\uffff\2\2\1\uffff\1\2\4\uffff"+
             "\1\2\2\uffff\2\2\1\uffff\2\2\2\uffff\3\2\4\uffff\2\2\1\uffff"+
@@ -6805,38 +6830,38 @@
             ""
     };
 
-    static final short[] DFA84_eot = DFA.unpackEncodedString(DFA84_eotS);
-    static final short[] DFA84_eof = DFA.unpackEncodedString(DFA84_eofS);
-    static final char[] DFA84_min = DFA.unpackEncodedStringToUnsignedChars(DFA84_minS);
-    static final char[] DFA84_max = DFA.unpackEncodedStringToUnsignedChars(DFA84_maxS);
-    static final short[] DFA84_accept = DFA.unpackEncodedString(DFA84_acceptS);
-    static final short[] DFA84_special = DFA.unpackEncodedString(DFA84_specialS);
-    static final short[][] DFA84_transition;
+    static final short[] DFA85_eot = DFA.unpackEncodedString(DFA85_eotS);
+    static final short[] DFA85_eof = DFA.unpackEncodedString(DFA85_eofS);
+    static final char[] DFA85_min = DFA.unpackEncodedStringToUnsignedChars(DFA85_minS);
+    static final char[] DFA85_max = DFA.unpackEncodedStringToUnsignedChars(DFA85_maxS);
+    static final short[] DFA85_accept = DFA.unpackEncodedString(DFA85_acceptS);
+    static final short[] DFA85_special = DFA.unpackEncodedString(DFA85_specialS);
+    static final short[][] DFA85_transition;
 
     static {
-        final int numStates = DFA84_transitionS.length;
-        DFA84_transition = new short[numStates][];
+        final int numStates = DFA85_transitionS.length;
+        DFA85_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA84_transition[i] = DFA.unpackEncodedString(DFA84_transitionS[i]);
+            DFA85_transition[i] = DFA.unpackEncodedString(DFA85_transitionS[i]);
         }
     }
 
-    class DFA84 extends DFA {
+    class DFA85 extends DFA {
 
-        public DFA84(BaseRecognizer recognizer) {
+        public DFA85(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 84;
-            this.eot = DFA84_eot;
-            this.eof = DFA84_eof;
-            this.min = DFA84_min;
-            this.max = DFA84_max;
-            this.accept = DFA84_accept;
-            this.special = DFA84_special;
-            this.transition = DFA84_transition;
+            this.decisionNumber = 85;
+            this.eot = DFA85_eot;
+            this.eof = DFA85_eof;
+            this.min = DFA85_min;
+            this.max = DFA85_max;
+            this.accept = DFA85_accept;
+            this.special = DFA85_special;
+            this.transition = DFA85_transition;
         }
         @Override
 		public String getDescription() {
-            return "788:1: identifierExpression returns [Expression result] : ({...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN |res= reference );";
+            return "792:1: identifierExpression returns [Expression result] : ({...}?aName= T_IDENTIFIER T_LPAREN m_params= methodCallParams T_RPAREN |res= reference );";
         }
         @Override
 		public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
@@ -6844,10 +6869,10 @@
         	final int _s = s;
             switch ( s ) {
                     case 0 :
-                        final int LA84_3 = input.LA(1);
+                        final int LA85_3 = input.LA(1);
 
 
-                        final int index84_3 = input.index();
+                        final int index85_3 = input.index();
                         input.rewind();
 
                         s = -1;
@@ -6856,13 +6881,13 @@
                         else if ( ((!isTuple(input.LT(1).getText()))) ) {s = 2;}
 
 
-                        input.seek(index84_3);
+                        input.seek(index85_3);
 
                         if ( s>=0 ) return s;
                         break;
             }
             final NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 84, _s, input);
+                new NoViableAltException(getDescription(), 85, _s, input);
             error(nvae);
             throw nvae;
         }
@@ -7003,63 +7028,63 @@
     public static final BitSet FOLLOW_T_CTRL_in_namedAction1446 = new BitSet(new long[]{0x0008000000000000L});
     public static final BitSet FOLLOW_T_OBS_in_namedAction1451 = new BitSet(new long[]{0x0008000000000000L});
     public static final BitSet FOLLOW_T_IDENTIFIER_in_namedAction1463 = new BitSet(new long[]{0x0000010000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_T_LPAREN_in_namedAction1471 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_T_LPAREN_in_namedAction1471 = new BitSet(new long[]{0x0008000000000000L,0x0000000080000000L});
     public static final BitSet FOLLOW_methodParameterList_in_namedAction1473 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_T_RPAREN_in_namedAction1477 = new BitSet(new long[]{0x0000010000000000L});
-    public static final BitSet FOLLOW_T_EQUAL_in_namedAction1484 = new BitSet(new long[]{0x0000000000000000L,0x0002000008000000L});
-    public static final BitSet FOLLOW_T_VAR_in_namedAction1490 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_localActionVars_in_namedAction1492 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
-    public static final BitSet FOLLOW_discreteActionBody_in_namedAction1503 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_T_IDENTIFIER_in_localActionVars1535 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_T_COLON_in_localActionVars1537 = new BitSet(new long[]{0x04080800000A4000L,0x000000000000003CL});
-    public static final BitSet FOLLOW_complexType_in_localActionVars1541 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_T_SEMICOLON_in_localActionVars1550 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_T_IDENTIFIER_in_localActionVars1554 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_T_COLON_in_localActionVars1556 = new BitSet(new long[]{0x04080800000A4000L,0x000000000000003CL});
-    public static final BitSet FOLLOW_complexType_in_localActionVars1560 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_discreteActionBody_in_anonymousAction1593 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_T_REQUIRES_in_discreteActionBody1624 = new BitSet(new long[]{0x512C963244030080L,0x000048821000B298L});
-    public static final BitSet FOLLOW_expression_in_discreteActionBody1628 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_T_COLON_in_discreteActionBody1630 = new BitSet(new long[]{0x2008000000008040L,0x0002002208000008L});
-    public static final BitSet FOLLOW_actionBody_in_discreteActionBody1637 = new BitSet(new long[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_T_END_in_discreteActionBody1642 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_actionBlockParallel_in_actionBlock1685 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_T_PRIO_in_actionBlock1689 = new BitSet(new long[]{0x0008000000000000L,0x0002002008000008L});
-    public static final BitSet FOLLOW_actionBlockParallel_in_actionBlock1691 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_actionBlockSequential_in_actionBlockParallel1724 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_T_NONDET_in_actionBlockParallel1728 = new BitSet(new long[]{0x0008000000000000L,0x0002002008000008L});
-    public static final BitSet FOLLOW_actionBlockSequential_in_actionBlockParallel1730 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
-    public static final BitSet FOLLOW_T_VAR_in_actionBlockSequential1764 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_blockvarlist_in_actionBlockSequential1768 = new BitSet(new long[]{0x0000000000100000L,0x0010000000000000L});
-    public static final BitSet FOLLOW_116_in_actionBlockSequential1772 = new BitSet(new long[]{0x512C963244030080L,0x000048821000B298L});
-    public static final BitSet FOLLOW_expression_in_actionBlockSequential1776 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_T_COLON_in_actionBlockSequential1783 = new BitSet(new long[]{0x0008000000000000L,0x0000002008000008L});
-    public static final BitSet FOLLOW_actionBlockParen_in_actionBlockSequential1792 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_T_SEMICOLON_in_actionBlockSequential1796 = new BitSet(new long[]{0x0008000000000000L,0x0000002008000008L});
-    public static final BitSet FOLLOW_actionBlockParen_in_actionBlockSequential1798 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_T_LPAREN_in_actionBlockParen1822 = new BitSet(new long[]{0x0008000000000000L,0x0002002008000008L});
-    public static final BitSet FOLLOW_actionBlock_in_actionBlockParen1824 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_T_RPAREN_in_actionBlockParen1827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_anonymousOrNamedAction_in_actionBlockParen1832 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_anonymousAction_in_anonymousOrNamedAction1849 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_T_IDENTIFIER_in_anonymousOrNamedAction1858 = new BitSet(new long[]{0x0000600000000002L,0x0000000000000008L});
-    public static final BitSet FOLLOW_T_LPAREN_in_anonymousOrNamedAction1872 = new BitSet(new long[]{0x512C963244030080L,0x000048829000B298L});
-    public static final BitSet FOLLOW_methodCallParams_in_anonymousOrNamedAction1877 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_T_RPAREN_in_anonymousOrNamedAction1879 = new BitSet(new long[]{0x0000600000000002L});
-    public static final BitSet FOLLOW_set_in_anonymousOrNamedAction1897 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
-    public static final BitSet FOLLOW_T_LPAREN_in_anonymousOrNamedAction1903 = new BitSet(new long[]{0x512C963244030080L,0x000048821000B298L});
-    public static final BitSet FOLLOW_expression_in_anonymousOrNamedAction1907 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
-    public static final BitSet FOLLOW_T_RPAREN_in_anonymousOrNamedAction1909 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_T_SKIP_in_anonymousOrNamedAction1920 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_blockvar_in_blockvarlist1936 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_T_SEMICOLON_in_blockvarlist1941 = new BitSet(new long[]{0x0008000000000000L});
-    public static final BitSet FOLLOW_blockvar_in_blockvarlist1943 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
-    public static final BitSet FOLLOW_T_IDENTIFIER_in_blockvar1963 = new BitSet(new long[]{0x0000000000100000L});
-    public static final BitSet FOLLOW_T_COLON_in_blockvar1966 = new BitSet(new long[]{0x04080800000A4000L,0x000000000000003CL});
-    public static final BitSet FOLLOW_complexType_in_blockvar1970 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_actionBodyParallel_in_actionBody2005 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
-    public static final BitSet FOLLOW_T_PRIO_in_actionBody2009 = new BitSet(new long[]{0x2008000000008040L,0x0002002208000008L});
-    public static final BitSet FOLLOW_actionBodyParallel_in_actionBody2011 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_T_RPAREN_in_namedAction1478 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_T_EQUAL_in_namedAction1485 = new BitSet(new long[]{0x0000000000000000L,0x0002000008000000L});
+    public static final BitSet FOLLOW_T_VAR_in_namedAction1491 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_localActionVars_in_namedAction1493 = new BitSet(new long[]{0x0000000000000000L,0x0000000008000000L});
+    public static final BitSet FOLLOW_discreteActionBody_in_namedAction1504 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_T_IDENTIFIER_in_localActionVars1536 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_T_COLON_in_localActionVars1538 = new BitSet(new long[]{0x04080800000A4000L,0x000000000000003CL});
+    public static final BitSet FOLLOW_complexType_in_localActionVars1542 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_T_SEMICOLON_in_localActionVars1551 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_T_IDENTIFIER_in_localActionVars1555 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_T_COLON_in_localActionVars1557 = new BitSet(new long[]{0x04080800000A4000L,0x000000000000003CL});
+    public static final BitSet FOLLOW_complexType_in_localActionVars1561 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_discreteActionBody_in_anonymousAction1594 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_T_REQUIRES_in_discreteActionBody1625 = new BitSet(new long[]{0x512C963244030080L,0x000048821000B298L});
+    public static final BitSet FOLLOW_expression_in_discreteActionBody1629 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_T_COLON_in_discreteActionBody1631 = new BitSet(new long[]{0x2008000000008040L,0x0002002208000008L});
+    public static final BitSet FOLLOW_actionBody_in_discreteActionBody1638 = new BitSet(new long[]{0x0000008000000000L});
+    public static final BitSet FOLLOW_T_END_in_discreteActionBody1643 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_actionBlockParallel_in_actionBlock1686 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_T_PRIO_in_actionBlock1690 = new BitSet(new long[]{0x0008000000000000L,0x0002002008000008L});
+    public static final BitSet FOLLOW_actionBlockParallel_in_actionBlock1692 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_actionBlockSequential_in_actionBlockParallel1725 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_T_NONDET_in_actionBlockParallel1729 = new BitSet(new long[]{0x0008000000000000L,0x0002002008000008L});
+    public static final BitSet FOLLOW_actionBlockSequential_in_actionBlockParallel1731 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
+    public static final BitSet FOLLOW_T_VAR_in_actionBlockSequential1765 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_blockvarlist_in_actionBlockSequential1769 = new BitSet(new long[]{0x0000000000100000L,0x0010000000000000L});
+    public static final BitSet FOLLOW_116_in_actionBlockSequential1773 = new BitSet(new long[]{0x512C963244030080L,0x000048821000B298L});
+    public static final BitSet FOLLOW_expression_in_actionBlockSequential1777 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_T_COLON_in_actionBlockSequential1784 = new BitSet(new long[]{0x0008000000000000L,0x0000002008000008L});
+    public static final BitSet FOLLOW_actionBlockParen_in_actionBlockSequential1793 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_T_SEMICOLON_in_actionBlockSequential1797 = new BitSet(new long[]{0x0008000000000000L,0x0000002008000008L});
+    public static final BitSet FOLLOW_actionBlockParen_in_actionBlockSequential1799 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_T_LPAREN_in_actionBlockParen1823 = new BitSet(new long[]{0x0008000000000000L,0x0002002008000008L});
+    public static final BitSet FOLLOW_actionBlock_in_actionBlockParen1825 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_T_RPAREN_in_actionBlockParen1828 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_anonymousOrNamedAction_in_actionBlockParen1833 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_anonymousAction_in_anonymousOrNamedAction1850 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_T_IDENTIFIER_in_anonymousOrNamedAction1859 = new BitSet(new long[]{0x0000600000000002L,0x0000000000000008L});
+    public static final BitSet FOLLOW_T_LPAREN_in_anonymousOrNamedAction1873 = new BitSet(new long[]{0x512C963244030080L,0x000048829000B298L});
+    public static final BitSet FOLLOW_methodCallParams_in_anonymousOrNamedAction1878 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_T_RPAREN_in_anonymousOrNamedAction1880 = new BitSet(new long[]{0x0000600000000002L});
+    public static final BitSet FOLLOW_set_in_anonymousOrNamedAction1898 = new BitSet(new long[]{0x0000000000000000L,0x0000000000000008L});
+    public static final BitSet FOLLOW_T_LPAREN_in_anonymousOrNamedAction1904 = new BitSet(new long[]{0x512C963244030080L,0x000048821000B298L});
+    public static final BitSet FOLLOW_expression_in_anonymousOrNamedAction1908 = new BitSet(new long[]{0x0000000000000000L,0x0000000080000000L});
+    public static final BitSet FOLLOW_T_RPAREN_in_anonymousOrNamedAction1910 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_T_SKIP_in_anonymousOrNamedAction1921 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_blockvar_in_blockvarlist1937 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_T_SEMICOLON_in_blockvarlist1942 = new BitSet(new long[]{0x0008000000000000L});
+    public static final BitSet FOLLOW_blockvar_in_blockvarlist1944 = new BitSet(new long[]{0x0000000000000002L,0x0000000400000000L});
+    public static final BitSet FOLLOW_T_IDENTIFIER_in_blockvar1964 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_T_COLON_in_blockvar1967 = new BitSet(new long[]{0x04080800000A4000L,0x000000000000003CL});
+    public static final BitSet FOLLOW_complexType_in_blockvar1971 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_actionBodyParallel_in_actionBody2006 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
+    public static final BitSet FOLLOW_T_PRIO_in_actionBody2010 = new BitSet(new long[]{0x2008000000008040L,0x0002002208000008L});
+    public static final BitSet FOLLOW_actionBodyParallel_in_actionBody2012 = new BitSet(new long[]{0x0000000000000002L,0x0000000001000000L});
     public static final BitSet FOLLOW_actionBodySequential_in_actionBodyParallel2046 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
     public static final BitSet FOLLOW_T_NONDET_in_actionBodyParallel2052 = new BitSet(new long[]{0x2008000000008040L,0x0002002208000008L});
     public static final BitSet FOLLOW_actionBodySequential_in_actionBodyParallel2056 = new BitSet(new long[]{0x0000000000000002L,0x0000000000004000L});
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaCompleteAstTraversalVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaCompleteAstTraversalVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaCompleteAstTraversalVisitor.java	(revision 12)
@@ -88,6 +88,7 @@
 import org.momut.ooas.ast.types.IntType;
 import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.MapType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.NullType;
 import org.momut.ooas.ast.types.OoActionSystemType;
 import org.momut.ooas.ast.types.OpaqueType;
@@ -365,6 +366,7 @@
 	@Override
 	public void visit(TypeExpression typeExpression)
 	{
+		VisitSub(typeExpression.referredType(), typeExpression);
 		VisitSub(typeExpression.type(), typeExpression);
 	}
 
@@ -503,6 +505,11 @@
 	}
 
 	@Override
+	public void visit(MetaType metaType) {
+		VisitSub(metaType.Type(), metaType);
+	}
+
+	@Override
 	public void visit(EnumType enumType)
 	{
 		for (final Identifier sym: enumType.listOfEnumSymbols())
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaDeepCloneVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaDeepCloneVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaDeepCloneVisitor.java	(revision 12)
@@ -223,11 +223,13 @@
 
 	private void UpdateScope(IScope aScope)
 	{
-		if (aScope.GetParentScope() != null && !mapping.containsKey(aScope.GetParentScope()))
-			throw new ArgumentException();
-		else if (aScope.GetParentScope() != null)
+		// this requires parents to be added before their children
+		if (aScope.GetParentScope() != null)
 		{
-			aScope.SetParentScope((IScope)mapping.get(aScope.GetParentScope()));
+			if(!mapping.containsKey(aScope.GetParentScope()))
+				throw new ArgumentException();
+			else
+				aScope.SetParentScope((IScope)mapping.get(aScope.GetParentScope()));
 		}
 	}
 
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaEmptyVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaEmptyVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaEmptyVisitor.java	(revision 12)
@@ -80,6 +80,7 @@
 import org.momut.ooas.ast.types.IntType;
 import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.MapType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.NullType;
 import org.momut.ooas.ast.types.OoActionSystemType;
 import org.momut.ooas.ast.types.OpaqueType;
@@ -206,5 +207,7 @@
 	@Override
 	public void visit(NullType nullType)                         {throw new UnsupportedOperationException();}
 	@Override
+	public void visit(MetaType metaType)                         {throw new UnsupportedOperationException();}
+	@Override
 	public void visit(MainModule mainModule)                     {throw new UnsupportedOperationException();}
 }
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaObjectInstantiationVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaObjectInstantiationVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaObjectInstantiationVisitor.java	(revision 12)
@@ -76,6 +76,7 @@
 		m_toReplace.putSafe(attributeIdentifier, newAttribute);
 
 		newAttribute.SetInitializer(newAttribute.initializer().Clone());
+		m_toReplace.putSafe(attributeIdentifier.initializer(), newAttribute.initializer());
 		final OoaDeepCloneVisitor cloner = new OoaDeepCloneVisitor(m_toReplace, self);
 		newAttribute.initializer().Accept(cloner);
 
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaPrintVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaPrintVisitor.java	(revision 11)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaPrintVisitor.java	(revision 12)
@@ -78,6 +78,7 @@
 import org.momut.ooas.ast.types.IntType;
 import org.momut.ooas.ast.types.ListType;
 import org.momut.ooas.ast.types.MapType;
+import org.momut.ooas.ast.types.MetaType;
 import org.momut.ooas.ast.types.NullType;
 import org.momut.ooas.ast.types.OoActionSystemType;
 import org.momut.ooas.ast.types.OpaqueType;
@@ -408,7 +409,13 @@
 		output.Append("nil");
 	}
 
+	@Override
+	public void visit(MetaType metaType) {
+		output.Append("type of ");
+		super.visit(metaType);
+	}
 
+
 	@Override
 	public void visit(AttributeIdentifier attributeIdentifier)
 	{
@@ -651,7 +658,7 @@
 	@Override
 	public void visit(TypeExpression typeExpression)
 	{
-		PrintSubElementOrNull(typeExpression.type());
+		PrintSubElementOrNull(typeExpression.referredType());
 	}
 
 	@Override
Index: trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaStaticListCastVisitor.java
===================================================================
--- trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaStaticListCastVisitor.java	(nonexistent)
+++ trunk/compiler/ooasCompiler/src/org/momut/ooas/visitors/OoaStaticListCastVisitor.java	(revision 12)
@@ -0,0 +1,63 @@
+package org.momut.ooas.visitors;
+
+import java.util.ArrayList;
+
+import org.momut.ooas.ast.expressions.Expression;
+import org.momut.ooas.ast.expressions.ExpressionKind;
+import org.momut.ooas.ast.expressions.ListConstructor;
+import org.momut.ooas.ast.expressions.UnaryOperator;
+import org.momut.ooas.ast.types.ListType;
+import org.momut.ooas.ast.types.Type;
+import org.momut.ooas.ast.types.TypeKind;
+
+public class OoaStaticListCastVisitor extends OoaExpressionVisitor
+{
+	private final Type m_leafType;
+	private ListType m_listType;
+
+	public OoaStaticListCastVisitor(ListType targetType)
+	{
+		m_leafType = leafType(targetType);
+		m_listType = targetType;
+	}
+
+	@Override
+	public void visit(ListConstructor listConstructor)
+	{
+		final ArrayList<Expression> casts = new ArrayList<>();
+		for (final Expression elems: listConstructor.elements()) {
+			if(elems.kind() == ExpressionKind.ListConstr){
+				final ListType parent = m_listType;
+				m_listType = (ListType) m_listType.innerType();
+				VisitSub(elems, listConstructor);
+				m_listType = parent;
+			}
+			else
+			{
+				if(elems.kind() == ExpressionKind.Cast)
+					elems.SetType(m_leafType);
+				else
+				{
+					final Expression cast = new UnaryOperator(ExpressionKind.Cast, elems, elems.line(), elems.pos());
+					cast.SetType(m_leafType);
+					casts.add(cast);
+				}
+			}
+		}
+		if(!casts.isEmpty())
+			listConstructor.SetElements(casts);
+
+		listConstructor.SetType(m_listType);
+	}
+
+	private Type leafType(Type type)
+	{
+		Type result = type;
+
+		while(result.kind() == TypeKind.ListType)
+			result = ((ListType)result).innerType();
+
+		return result;
+	}
+
+}
