Regenerate TCL parser from model.

Change-Id: I96fe6ba17b7f6a891ca3ce7bcd259df2e6cbe90a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

56 files changed, 431 insertions, 477 deletions

diff --git a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java
index 87f0f88a..4b89804a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.core/src/org/eclipse/dltk/tcl/structure/AbstractTclCommandModelBuilder.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2009 xored software, Inc.  
+ * Copyright (c) 2009, 2018 xored software, Inc.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html  
+ * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     xored software, Inc. - initial API and Implementation (Alex Panchenko)
@@ -36,8 +36,8 @@ import org.eclipse.emf.common.util.EList;
 /**
  * @since 2.0
  */
-public abstract class AbstractTclCommandModelBuilder extends
-		TclModelBuilderUtil implements ITclModelBuilder {
+public abstract class AbstractTclCommandModelBuilder extends TclModelBuilderUtil
+		implements ITclModelBuilder {
 
 	protected static abstract class FieldInitializer {
 
@@ -57,7 +57,8 @@ public abstract class AbstractTclCommandModelBuilder extends
 	}
 
 	protected void processField(TclCommand command, TclArgument nameArg,
-			String varName, final int modifiers, ITclModelBuildContext context) {
+			String varName, final int modifiers,
+			ITclModelBuildContext context) {
 		processField(command, nameArg, varName, modifiers, context, null, null);
 	}
 
@@ -119,7 +120,8 @@ public abstract class AbstractTclCommandModelBuilder extends
 			return;
 		}
 		final String varName = asSymbol(nameArg);
-		final int modifiers = TclVisibilityUtils.isPrivate(varName) ? Modifiers.AccPrivate
+		final int modifiers = TclVisibilityUtils.isPrivate(varName)
+				? Modifiers.AccPrivate
 				: Modifiers.AccPublic;
 		processField(command, nameArg, varName, modifiers, context);
 	}
@@ -170,8 +172,8 @@ public abstract class AbstractTclCommandModelBuilder extends
 			return Collections.singletonList(new Parameter(argument));
 		} else if (argument instanceof TclArgumentList) {
 			final TclArgumentList list = (TclArgumentList) argument;
-			final List<Parameter> parameters = new ArrayList<Parameter>(list
-					.getArguments().size());
+			final List<Parameter> parameters = new ArrayList<>(
+					list.getArguments().size());
 			for (TclArgument arg : list.getArguments()) {
 				if (arg instanceof StringArgument) {
 					parameters.add(new Parameter(arg));
@@ -180,14 +182,17 @@ public abstract class AbstractTclCommandModelBuilder extends
 							.getArguments();
 					final TclArgument pName = argWithInitializer.get(0);
 					if (argWithInitializer.size() >= 2) {
-						parameters.add(new Parameter(asSymbol(pName), pName
-								.getStart(), pName.getEnd(), TclProcessorUtil
-								.asString(argWithInitializer.get(1), false)));
+						parameters
+								.add(new Parameter(asSymbol(pName),
+										pName.getStart(), pName.getEnd(),
+										TclProcessorUtil.asString(
+												argWithInitializer.get(1),
+												false)));
 					} else if (argWithInitializer.size() == 1) {
 						parameters.add(new Parameter(pName));
 					} else {
-						parameters.add(new Parameter(Util.EMPTY_STRING, arg
-								.getStart(), arg.getEnd()));
+						parameters.add(new Parameter(Util.EMPTY_STRING,
+								arg.getStart(), arg.getEnd()));
 					}
 				} else {
 					parameters.add(new Parameter(arg));
@@ -254,13 +259,13 @@ public abstract class AbstractTclCommandModelBuilder extends
 				content = value;
 			}
 		} else {
-			content = SimpleCodePrinter.getArgumentString(argument, argument
-					.getStart());
+			content = SimpleCodePrinter.getArgumentString(argument,
+					argument.getStart());
 		}
 		TclParser parser = new TclParser();
 		parser.setGlobalOffset(offset);
 		List<TclCommand> commands = parser.parse(content);
-		List<TclArgument> result = new ArrayList<TclArgument>();
+		List<TclArgument> result = new ArrayList<>();
 		for (TclCommand c : commands) {
 			result.add(c.getName());
 			result.addAll(c.getArguments());
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF b/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF
index 27f61b7f..4edec3dc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/META-INF/MANIFEST.MF
@@ -20,8 +20,8 @@ Export-Package: org.eclipse.dltk.tcl.ast,
  org.eclipse.dltk.tcl.parser.definitions,
  org.eclipse.dltk.tcl.parser.printer
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.dltk.core;bundle-version="0.0.0"
 Bundle-Activator: org.eclipse.dltk.tcl.internal.parser.TclParserCore
 Bundle-ActivationPolicy: lazy
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java
index 8318de04..3334e9d6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ArgumentMatch.java
@@ -22,11 +22,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.ArgumentMatch#getDefinition <em>Definition</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.ArgumentMatch#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getArgumentMatch()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java
index 90d34720..124132db 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/ComplexString.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.ComplexString#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.ComplexString#getKind <em>Kind</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getComplexString()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java
index 781848f5..ac50a9ff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Node.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.Node#getStart <em>Start</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.Node#getEnd <em>End</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getNode()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java
index 158089b8..f90ee359 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Script.java
@@ -20,12 +20,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.Script#getCommands <em>Commands</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.Script#getContentStart <em>Content Start</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.Script#getContentEnd <em>Content End</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getScript()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java
index b3aa80f9..6a63fbdb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/StringArgument.java
@@ -18,11 +18,11 @@ package org.eclipse.dltk.tcl.ast;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.StringArgument#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.StringArgument#getRawValue <em>Raw Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getStringArgument()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java
index bf311d6c..f57c69c0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/Substitution.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.Substitution#getCommands <em>Commands</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getSubstitution()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java
index bb5891c3..6260d954 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclArgumentList.java
@@ -21,12 +21,12 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclArgumentList#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclArgumentList#getDefinitionArgument <em>Definition Argument</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclArgumentList#getKind <em>Kind</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getTclArgumentList()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCodeModel.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCodeModel.java
index 6efcf387..be7a0ccc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCodeModel.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCodeModel.java
@@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclCodeModel#getDelimeters <em>Delimeters</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclCodeModel#getLineOffsets <em>Line Offsets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getTclCodeModel()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java
index ce343dda..13053447 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclCommand.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclCommand#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclCommand#getArguments <em>Arguments</em>}</li>
@@ -30,7 +31,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclCommand#getQualifiedName <em>Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclCommand#isMatched <em>Matched</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getTclCommand()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclModule.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclModule.java
index beae6729..dc425d58 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclModule.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclModule.java
@@ -17,12 +17,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclModule#getStatements <em>Statements</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclModule#getSize <em>Size</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclModule#getCodeModel <em>Code Model</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getTclModule()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblem.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblem.java
index 4c4b8d37..34c00918 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblem.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblem.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclProblem#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclProblem#getId <em>Id</em>}</li>
@@ -28,7 +29,6 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclProblem#getFileName <em>File Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclProblem#getLineNumber <em>Line Number</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getTclProblem()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblemModel.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblemModel.java
index 4b783040..2a8d4021 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblemModel.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/TclProblemModel.java
@@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.TclProblemModel#getProblems <em>Problems</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getTclProblemModel()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java
index 73fc8869..70fbfa9a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/VariableReference.java
@@ -18,11 +18,11 @@ package org.eclipse.dltk.tcl.ast;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.VariableReference#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.VariableReference#getIndex <em>Index</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.ast.AstPackage#getVariableReference()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java
index 6f835e0f..4156f8ec 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ArgumentMatchImpl.java
@@ -31,11 +31,11 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ArgumentMatchImpl#getDefinition <em>Definition</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ArgumentMatchImpl#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java
index dff25609..5f3ed73f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstFactoryImpl.java
@@ -37,7 +37,7 @@ public class AstFactoryImpl extends EFactoryImpl implements AstFactory {
 	public static AstFactory init() {
 		try {
 			AstFactory theAstFactory = (AstFactory) EPackage.Registry.INSTANCE
-					.getEFactory("http:///org/eclipse/dltk/tcl/ast.ecore"); //$NON-NLS-1$ 
+					.getEFactory(AstPackage.eNS_URI);
 			if (theAstFactory != null) {
 				return theAstFactory;
 			}
@@ -94,8 +94,8 @@ public class AstFactoryImpl extends EFactoryImpl implements AstFactory {
 		case AstPackage.TCL_PROBLEM:
 			return createTclProblem();
 		default:
-			throw new IllegalArgumentException(
-					"The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+			throw new IllegalArgumentException("The class '" + eClass.getName() //$NON-NLS-1$
+					+ "' is not a valid classifier"); //$NON-NLS-1$
 		}
 	}
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java
index 709766ec..d43fbd00 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/AstPackageImpl.java
@@ -180,7 +180,7 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
+	 *
 	 * <p>This method is used to initialize {@link AstPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
@@ -196,17 +196,18 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 					.getEPackage(AstPackage.eNS_URI);
 
 		// Obtain or create and register package
-		AstPackageImpl theAstPackage = (AstPackageImpl) (EPackage.Registry.INSTANCE
-				.get(eNS_URI) instanceof AstPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI)
-				: new AstPackageImpl());
+		Object registeredAstPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		AstPackageImpl theAstPackage = registeredAstPackage instanceof AstPackageImpl
+				? (AstPackageImpl) registeredAstPackage
+				: new AstPackageImpl();
 
 		isInited = true;
 
 		// Obtain or create and register interdependencies
-		DefinitionsPackageImpl theDefinitionsPackage = (DefinitionsPackageImpl) (EPackage.Registry.INSTANCE
-				.getEPackage(DefinitionsPackage.eNS_URI) instanceof DefinitionsPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(DefinitionsPackage.eNS_URI)
+		Object registeredPackage = EPackage.Registry.INSTANCE
+				.getEPackage(DefinitionsPackage.eNS_URI);
+		DefinitionsPackageImpl theDefinitionsPackage = (DefinitionsPackageImpl) (registeredPackage instanceof DefinitionsPackageImpl
+				? registeredPackage
 				: DefinitionsPackage.eINSTANCE);
 
 		// Create package meta-data objects
@@ -422,8 +423,8 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 	 * @generated
 	 */
 	public EReference getTclArgumentList_Arguments() {
-		return (EReference) tclArgumentListEClass.getEStructuralFeatures().get(
-				0);
+		return (EReference) tclArgumentListEClass.getEStructuralFeatures()
+				.get(0);
 	}
 
 	/**
@@ -432,8 +433,8 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 	 * @generated
 	 */
 	public EReference getTclArgumentList_DefinitionArgument() {
-		return (EReference) tclArgumentListEClass.getEStructuralFeatures().get(
-				1);
+		return (EReference) tclArgumentListEClass.getEStructuralFeatures()
+				.get(1);
 	}
 
 	/**
@@ -442,8 +443,8 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 	 * @generated
 	 */
 	public EAttribute getTclArgumentList_Kind() {
-		return (EAttribute) tclArgumentListEClass.getEStructuralFeatures().get(
-				2);
+		return (EAttribute) tclArgumentListEClass.getEStructuralFeatures()
+				.get(2);
 	}
 
 	/**
@@ -616,8 +617,8 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 	 * @generated
 	 */
 	public EReference getTclProblemModel_Problems() {
-		return (EReference) tclProblemModelEClass.getEStructuralFeatures().get(
-				0);
+		return (EReference) tclProblemModelEClass.getEStructuralFeatures()
+				.get(0);
 	}
 
 	/**
@@ -855,247 +856,212 @@ public class AstPackageImpl extends EPackageImpl implements AstPackage {
 		variableReferenceEClass.getESuperTypes().add(this.getISubstitution());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(
-				nodeEClass,
-				Node.class,
-				"Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getNode_Start(),
-				ecorePackage.getEInt(),
-				"start", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getNode_End(),
-				ecorePackage.getEInt(),
-				"end", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				scriptEClass,
-				Script.class,
-				"Script", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getScript_Commands(),
-				this.getTclCommand(),
-				null,
-				"commands", null, 0, -1, Script.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getScript_ContentStart(),
-				ecorePackage.getEInt(),
-				"contentStart", null, 0, 1, Script.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getScript_ContentEnd(),
-				ecorePackage.getEInt(),
-				"contentEnd", null, 0, 1, Script.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				stringArgumentEClass,
-				StringArgument.class,
-				"StringArgument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getStringArgument_Value(),
-				ecorePackage.getEString(),
-				"value", null, 0, 1, StringArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getStringArgument_RawValue(),
-				ecorePackage.getEString(),
-				"rawValue", null, 0, 1, StringArgument.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				substitutionEClass,
-				Substitution.class,
-				"Substitution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getSubstitution_Commands(),
-				this.getTclCommand(),
-				null,
-				"commands", null, 0, -1, Substitution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				tclArgumentEClass,
-				TclArgument.class,
-				"TclArgument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				tclCommandEClass,
-				TclCommand.class,
-				"TclCommand", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTclCommand_Name(),
-				this.getTclArgument(),
-				null,
-				"name", null, 0, 1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTclCommand_Arguments(),
-				this.getTclArgument(),
-				null,
-				"arguments", null, 0, -1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTclCommand_Definition(),
-				theDefinitionsPackage.getCommand(),
-				null,
-				"definition", null, 0, 1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTclCommand_Matches(),
-				this.getArgumentMatch(),
-				null,
-				"matches", null, 0, -1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclCommand_QualifiedName(),
-				ecorePackage.getEString(),
-				"qualifiedName", null, 0, 1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclCommand_Matched(),
-				ecorePackage.getEBoolean(),
-				"matched", null, 0, 1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				tclArgumentListEClass,
-				TclArgumentList.class,
-				"TclArgumentList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTclArgumentList_Arguments(),
-				this.getTclArgument(),
-				null,
-				"arguments", null, 0, -1, TclArgumentList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTclArgumentList_DefinitionArgument(),
-				theDefinitionsPackage.getComplexArgument(),
-				null,
-				"definitionArgument", null, 0, 1, TclArgumentList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclArgumentList_Kind(),
-				ecorePackage.getEInt(),
-				"kind", null, 0, 1, TclArgumentList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				argumentMatchEClass,
-				ArgumentMatch.class,
-				"ArgumentMatch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getArgumentMatch_Definition(),
-				theDefinitionsPackage.getArgument(),
-				null,
-				"definition", null, 0, 1, ArgumentMatch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getArgumentMatch_Arguments(),
-				this.getTclArgument(),
-				null,
-				"arguments", null, 0, -1, ArgumentMatch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				complexStringEClass,
-				ComplexString.class,
-				"ComplexString", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getComplexString_Arguments(),
-				this.getTclArgument(),
-				null,
-				"arguments", null, 0, -1, ComplexString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getComplexString_Kind(),
-				ecorePackage.getEInt(),
-				"kind", null, 0, 1, ComplexString.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				variableReferenceEClass,
-				VariableReference.class,
-				"VariableReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getVariableReference_Name(),
-				ecorePackage.getEString(),
-				"name", null, 0, 1, VariableReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getVariableReference_Index(),
-				this.getTclArgument(),
-				null,
-				"index", null, 0, 1, VariableReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				iSubstitutionEClass,
-				ISubstitution.class,
-				"ISubstitution", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
-		initEClass(
-				tclModuleEClass,
-				TclModule.class,
-				"TclModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTclModule_Statements(),
-				this.getTclCommand(),
-				null,
-				"statements", null, 0, -1, TclModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclModule_Size(),
-				ecorePackage.getEInt(),
-				"size", null, 0, 1, TclModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-				getTclModule_CodeModel(),
-				this.getTclCodeModel(),
-				null,
-				"codeModel", null, 0, 1, TclModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				tclCodeModelEClass,
-				TclCodeModel.class,
-				"TclCodeModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getTclCodeModel_Delimeters(),
-				ecorePackage.getEString(),
-				"delimeters", null, 0, -1, TclCodeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclCodeModel_LineOffsets(),
-				ecorePackage.getEInt(),
-				"lineOffsets", null, 0, -1, TclCodeModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				tclProblemModelEClass,
-				TclProblemModel.class,
-				"TclProblemModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-				getTclProblemModel_Problems(),
-				this.getTclProblem(),
-				null,
-				"problems", null, 0, -1, TclProblemModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(
-				tclProblemEClass,
-				TclProblem.class,
-				"TclProblem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_Arguments(),
-				ecorePackage.getEString(),
-				"arguments", null, 0, -1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_Id(),
-				ecorePackage.getEInt(),
-				"id", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_Message(),
-				ecorePackage.getEString(),
-				"message", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_SourceStart(),
-				ecorePackage.getEInt(),
-				"sourceStart", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_SourceEnd(),
-				ecorePackage.getEInt(),
-				"sourceEnd", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_Error(),
-				ecorePackage.getEBoolean(),
-				"error", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_Warning(),
-				ecorePackage.getEBoolean(),
-				"warning", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_FileName(),
-				ecorePackage.getEString(),
-				"fileName", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-				getTclProblem_LineNumber(),
-				ecorePackage.getEInt(),
-				"lineNumber", null, 0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getNode_Start(), ecorePackage.getEInt(), "start", null, //$NON-NLS-1$
+				0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getNode_End(), ecorePackage.getEInt(), "end", null, 0, 1, //$NON-NLS-1$
+				Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(scriptEClass, Script.class, "Script", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getScript_Commands(), this.getTclCommand(), null,
+				"commands", null, 0, -1, Script.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getScript_ContentStart(), ecorePackage.getEInt(),
+				"contentStart", null, 0, 1, Script.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getScript_ContentEnd(), ecorePackage.getEInt(),
+				"contentEnd", null, 0, 1, Script.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(stringArgumentEClass, StringArgument.class, "StringArgument", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStringArgument_Value(), ecorePackage.getEString(),
+				"value", null, 0, 1, StringArgument.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getStringArgument_RawValue(), ecorePackage.getEString(),
+				"rawValue", null, 0, 1, StringArgument.class, IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(substitutionEClass, Substitution.class, "Substitution", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSubstitution_Commands(), this.getTclCommand(), null,
+				"commands", null, 0, -1, Substitution.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(tclArgumentEClass, TclArgument.class, "TclArgument", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(tclCommandEClass, TclCommand.class, "TclCommand", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTclCommand_Name(), this.getTclArgument(), null,
+				"name", null, 0, 1, TclCommand.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTclCommand_Arguments(), this.getTclArgument(), null,
+				"arguments", null, 0, -1, TclCommand.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTclCommand_Definition(),
+				theDefinitionsPackage.getCommand(), null, "definition", null, 0, //$NON-NLS-1$
+				1, TclCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEReference(getTclCommand_Matches(), this.getArgumentMatch(), null,
+				"matches", null, 0, -1, TclCommand.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclCommand_QualifiedName(), ecorePackage.getEString(),
+				"qualifiedName", null, 0, 1, TclCommand.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclCommand_Matched(), ecorePackage.getEBoolean(),
+				"matched", null, 0, 1, TclCommand.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(tclArgumentListEClass, TclArgumentList.class,
+				"TclArgumentList", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTclArgumentList_Arguments(), this.getTclArgument(),
+				null, "arguments", null, 0, -1, TclArgumentList.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getTclArgumentList_DefinitionArgument(),
+				theDefinitionsPackage.getComplexArgument(), null,
+				"definitionArgument", null, 0, 1, TclArgumentList.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getTclArgumentList_Kind(), ecorePackage.getEInt(),
+				"kind", null, 0, 1, TclArgumentList.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(argumentMatchEClass, ArgumentMatch.class, "ArgumentMatch", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getArgumentMatch_Definition(),
+				theDefinitionsPackage.getArgument(), null, "definition", null, //$NON-NLS-1$
+				0, 1, ArgumentMatch.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getArgumentMatch_Arguments(), this.getTclArgument(),
+				null, "arguments", null, 0, -1, ArgumentMatch.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(complexStringEClass, ComplexString.class, "ComplexString", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getComplexString_Arguments(), this.getTclArgument(),
+				null, "arguments", null, 0, -1, ComplexString.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getComplexString_Kind(), ecorePackage.getEInt(), "kind", //$NON-NLS-1$
+				null, 0, 1, ComplexString.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(variableReferenceEClass, VariableReference.class,
+				"VariableReference", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getVariableReference_Name(), ecorePackage.getEString(),
+				"name", null, 0, 1, VariableReference.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEReference(getVariableReference_Index(), this.getTclArgument(),
+				null, "index", null, 0, 1, VariableReference.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(iSubstitutionEClass, ISubstitution.class, "ISubstitution", //$NON-NLS-1$
+				IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(tclModuleEClass, TclModule.class, "TclModule", !IS_ABSTRACT, //$NON-NLS-1$
+				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTclModule_Statements(), this.getTclCommand(), null,
+				"statements", null, 0, -1, TclModule.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclModule_Size(), ecorePackage.getEInt(), "size", //$NON-NLS-1$
+				null, 0, 1, TclModule.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEReference(getTclModule_CodeModel(), this.getTclCodeModel(), null,
+				"codeModel", null, 0, 1, TclModule.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(tclCodeModelEClass, TclCodeModel.class, "TclCodeModel", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTclCodeModel_Delimeters(), ecorePackage.getEString(),
+				"delimeters", null, 0, -1, TclCodeModel.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclCodeModel_LineOffsets(), ecorePackage.getEInt(),
+				"lineOffsets", null, 0, -1, TclCodeModel.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+
+		initEClass(tclProblemModelEClass, TclProblemModel.class,
+				"TclProblemModel", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+				IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTclProblemModel_Problems(), this.getTclProblem(),
+				null, "problems", null, 0, -1, TclProblemModel.class, //$NON-NLS-1$
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+
+		initEClass(tclProblemEClass, TclProblem.class, "TclProblem", //$NON-NLS-1$
+				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTclProblem_Arguments(), ecorePackage.getEString(),
+				"arguments", null, 0, -1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_Id(), ecorePackage.getEInt(), "id", null, //$NON-NLS-1$
+				0, 1, TclProblem.class, !IS_TRANSIENT, !IS_VOLATILE,
+				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+				IS_ORDERED);
+		initEAttribute(getTclProblem_Message(), ecorePackage.getEString(),
+				"message", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_SourceStart(), ecorePackage.getEInt(),
+				"sourceStart", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_SourceEnd(), ecorePackage.getEInt(),
+				"sourceEnd", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_Error(), ecorePackage.getEBoolean(),
+				"error", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_Warning(), ecorePackage.getEBoolean(),
+				"warning", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_FileName(), ecorePackage.getEString(),
+				"fileName", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTclProblem_LineNumber(), ecorePackage.getEInt(),
+				"lineNumber", null, 0, 1, TclProblem.class, !IS_TRANSIENT, //$NON-NLS-1$
+				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				!IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java
index fd522983..a52e9c1b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ComplexStringImpl.java
@@ -31,15 +31,16 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ComplexStringImpl#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ComplexStringImpl#getKind <em>Kind</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class ComplexStringImpl extends TclArgumentImpl implements ComplexString {
+public class ComplexStringImpl extends TclArgumentImpl
+		implements ComplexString {
 	/**
 	 * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -221,7 +222,7 @@ public class ComplexStringImpl extends TclArgumentImpl implements ComplexString
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (kind: "); //$NON-NLS-1$
 		result.append(kind);
 		result.append(')');
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java
index 9337f140..b88ef5eb 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/NodeImpl.java
@@ -24,11 +24,11 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.NodeImpl#getStart <em>Start</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.NodeImpl#getEnd <em>End</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -214,7 +214,7 @@ public class NodeImpl extends EObjectImpl implements Node {
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (start: "); //$NON-NLS-1$
 		result.append(start);
 		result.append(", end: "); //$NON-NLS-1$
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java
index 48dfb14c..a3a4e608 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/ScriptImpl.java
@@ -31,12 +31,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ScriptImpl#getCommands <em>Commands</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ScriptImpl#getContentStart <em>Content Start</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.ScriptImpl#getContentEnd <em>Content End</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -114,8 +114,8 @@ public class ScriptImpl extends TclArgumentImpl implements Script {
 	 */
 	public EList<TclCommand> getCommands() {
 		if (commands == null) {
-			commands = new EObjectContainmentEList<TclCommand>(
-					TclCommand.class, this, AstPackage.SCRIPT__COMMANDS);
+			commands = new EObjectContainmentEList<TclCommand>(TclCommand.class,
+					this, AstPackage.SCRIPT__COMMANDS);
 		}
 		return commands;
 	}
@@ -271,7 +271,7 @@ public class ScriptImpl extends TclArgumentImpl implements Script {
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (contentStart: "); //$NON-NLS-1$
 		result.append(contentStart);
 		result.append(", contentEnd: "); //$NON-NLS-1$
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java
index 2156de43..61086489 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/StringArgumentImpl.java
@@ -23,16 +23,16 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.StringArgumentImpl#getValue <em>Value</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.StringArgumentImpl#getRawValue <em>Raw Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class StringArgumentImpl extends TclArgumentImpl implements
-		StringArgument {
+public class StringArgumentImpl extends TclArgumentImpl
+		implements StringArgument {
 	/**
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -198,8 +198,8 @@ public class StringArgumentImpl extends TclArgumentImpl implements
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 		case AstPackage.STRING_ARGUMENT__VALUE:
-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT
-					.equals(value);
+			return VALUE_EDEFAULT == null ? value != null
+					: !VALUE_EDEFAULT.equals(value);
 		case AstPackage.STRING_ARGUMENT__RAW_VALUE:
 			return RAW_VALUE_EDEFAULT == null ? rawValue != null
 					: !RAW_VALUE_EDEFAULT.equals(rawValue);
@@ -217,7 +217,7 @@ public class StringArgumentImpl extends TclArgumentImpl implements
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (value: "); //$NON-NLS-1$
 		result.append(value);
 		result.append(", rawValue: "); //$NON-NLS-1$
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java
index b5674da7..6e12fbed 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/SubstitutionImpl.java
@@ -30,10 +30,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.SubstitutionImpl#getCommands <em>Commands</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -74,8 +74,8 @@ public class SubstitutionImpl extends TclArgumentImpl implements Substitution {
 	 */
 	public EList<TclCommand> getCommands() {
 		if (commands == null) {
-			commands = new EObjectContainmentEList<TclCommand>(
-					TclCommand.class, this, AstPackage.SUBSTITUTION__COMMANDS);
+			commands = new EObjectContainmentEList<TclCommand>(TclCommand.class,
+					this, AstPackage.SUBSTITUTION__COMMANDS);
 		}
 		return commands;
 	}
@@ -155,7 +155,7 @@ public class SubstitutionImpl extends TclArgumentImpl implements Substitution {
 		}
 		return super.eIsSet(featureID);
 	}
-	
+
 	@Override
 	public String toString() {
 		if (eIsProxy())
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java
index daa047c7..d8f2fa6b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentImpl.java
@@ -19,8 +19,6 @@ import org.eclipse.emf.ecore.EClass;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Tcl Argument</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java
index db6f0734..34842508 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclArgumentListImpl.java
@@ -32,17 +32,17 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclArgumentListImpl#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclArgumentListImpl#getDefinitionArgument <em>Definition Argument</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclArgumentListImpl#getKind <em>Kind</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class TclArgumentListImpl extends TclArgumentImpl implements
-		TclArgumentList {
+public class TclArgumentListImpl extends TclArgumentImpl
+		implements TclArgumentList {
 	/**
 	 * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -124,7 +124,8 @@ public class TclArgumentListImpl extends TclArgumentImpl implements
 	public ComplexArgument getDefinitionArgument() {
 		if (definitionArgument != null && definitionArgument.eIsProxy()) {
 			InternalEObject oldDefinitionArgument = (InternalEObject) definitionArgument;
-			definitionArgument = (ComplexArgument) eResolveProxy(oldDefinitionArgument);
+			definitionArgument = (ComplexArgument) eResolveProxy(
+					oldDefinitionArgument);
 			if (definitionArgument != oldDefinitionArgument) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -288,7 +289,7 @@ public class TclArgumentListImpl extends TclArgumentImpl implements
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (kind: "); //$NON-NLS-1$
 		result.append(kind);
 		result.append(')');
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCodeModelImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCodeModelImpl.java
index 405ad382..97447c38 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCodeModelImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCodeModelImpl.java
@@ -21,11 +21,11 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclCodeModelImpl#getDelimeters <em>Delimeters</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclCodeModelImpl#getLineOffsets <em>Line Offsets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -176,7 +176,7 @@ public class TclCodeModelImpl extends EObjectImpl implements TclCodeModel {
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (delimeters: "); //$NON-NLS-1$
 		result.append(delimeters);
 		result.append(", lineOffsets: "); //$NON-NLS-1$
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java
index 9bab21b9..377d9ec1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclCommandImpl.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <em><b>Tcl Command</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclCommandImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclCommandImpl#getArguments <em>Arguments</em>}</li>
@@ -41,7 +42,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclCommandImpl#getQualifiedName <em>Qualified Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclCommandImpl#isMatched <em>Matched</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -306,8 +306,8 @@ public class TclCommandImpl extends NodeImpl implements TclCommand {
 			return ((InternalEList<?>) getArguments()).basicRemove(otherEnd,
 					msgs);
 		case AstPackage.TCL_COMMAND__MATCHES:
-			return ((InternalEList<?>) getMatches())
-					.basicRemove(otherEnd, msgs);
+			return ((InternalEList<?>) getMatches()).basicRemove(otherEnd,
+					msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclModuleImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclModuleImpl.java
index 884db4c6..0751e9c4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclModuleImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclModuleImpl.java
@@ -33,12 +33,12 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <em><b>Tcl Module</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclModuleImpl#getStatements <em>Statements</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclModuleImpl#getSize <em>Size</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclModuleImpl#getCodeModel <em>Code Model</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -164,13 +164,15 @@ public class TclModuleImpl extends EObjectImpl implements TclModule {
 		if (newCodeModel != codeModel) {
 			NotificationChain msgs = null;
 			if (codeModel != null)
-				msgs = ((InternalEObject) codeModel)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- AstPackage.TCL_MODULE__CODE_MODEL, null, msgs);
+				msgs = ((InternalEObject) codeModel).eInverseRemove(this,
+						EOPPOSITE_FEATURE_BASE
+								- AstPackage.TCL_MODULE__CODE_MODEL,
+						null, msgs);
 			if (newCodeModel != null)
-				msgs = ((InternalEObject) newCodeModel)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- AstPackage.TCL_MODULE__CODE_MODEL, null, msgs);
+				msgs = ((InternalEObject) newCodeModel).eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE
+								- AstPackage.TCL_MODULE__CODE_MODEL,
+						null, msgs);
 			msgs = basicSetCodeModel(newCodeModel, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -287,7 +289,8 @@ public class TclModuleImpl extends EObjectImpl implements TclModule {
 		result.append(" (size: "); //$NON-NLS-1$
 		result.append(size);
 		result.append(')');
-		result.append(SimpleCodePrinter.getCommandsString(getStatements(),false));
+		result.append(
+				SimpleCodePrinter.getCommandsString(getStatements(), false));
 		return result.toString();
 	}
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemImpl.java
index 0b3620a6..26b17283 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclProblemImpl#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclProblemImpl#getId <em>Id</em>}</li>
@@ -34,7 +35,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList;
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclProblemImpl#getFileName <em>File Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclProblemImpl#getLineNumber <em>Line Number</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -327,7 +327,8 @@ public class TclProblemImpl extends EObjectImpl implements TclProblem {
 		sourceEnd = newSourceEnd;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-					AstPackage.TCL_PROBLEM__SOURCE_END, oldSourceEnd, sourceEnd));
+					AstPackage.TCL_PROBLEM__SOURCE_END, oldSourceEnd,
+					sourceEnd));
 	}
 
 	/**
@@ -571,7 +572,7 @@ public class TclProblemImpl extends EObjectImpl implements TclProblem {
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (arguments: "); //$NON-NLS-1$
 		result.append(arguments);
 		result.append(", id: "); //$NON-NLS-1$
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemModelImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemModelImpl.java
index 5455a8dd..436436c9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemModelImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/TclProblemModelImpl.java
@@ -30,14 +30,15 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.TclProblemModelImpl#getProblems <em>Problems</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class TclProblemModelImpl extends EObjectImpl implements TclProblemModel {
+public class TclProblemModelImpl extends EObjectImpl
+		implements TclProblemModel {
 	/**
 	 * The cached value of the '{@link #getProblems() <em>Problems</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -74,9 +75,8 @@ public class TclProblemModelImpl extends EObjectImpl implements TclProblemModel
 	 */
 	public EList<TclProblem> getProblems() {
 		if (problems == null) {
-			problems = new EObjectContainmentEList<TclProblem>(
-					TclProblem.class, this,
-					AstPackage.TCL_PROBLEM_MODEL__PROBLEMS);
+			problems = new EObjectContainmentEList<TclProblem>(TclProblem.class,
+					this, AstPackage.TCL_PROBLEM_MODEL__PROBLEMS);
 		}
 		return problems;
 	}
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java
index 708fcb98..1c5c81df 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/impl/VariableReferenceImpl.java
@@ -27,16 +27,16 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.VariableReferenceImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.ast.impl.VariableReferenceImpl#getIndex <em>Index</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VariableReferenceImpl extends TclArgumentImpl implements
-		VariableReference {
+public class VariableReferenceImpl extends TclArgumentImpl
+		implements VariableReference {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -147,13 +147,13 @@ public class VariableReferenceImpl extends TclArgumentImpl implements
 			if (index != null)
 				msgs = ((InternalEObject) index).eInverseRemove(this,
 						EOPPOSITE_FEATURE_BASE
-								- AstPackage.VARIABLE_REFERENCE__INDEX, null,
-						msgs);
+								- AstPackage.VARIABLE_REFERENCE__INDEX,
+						null, msgs);
 			if (newIndex != null)
 				msgs = ((InternalEObject) newIndex).eInverseAdd(this,
 						EOPPOSITE_FEATURE_BASE
-								- AstPackage.VARIABLE_REFERENCE__INDEX, null,
-						msgs);
+								- AstPackage.VARIABLE_REFERENCE__INDEX,
+						null, msgs);
 			msgs = basicSetIndex(newIndex, msgs);
 			if (msgs != null)
 				msgs.dispatch();
@@ -238,8 +238,8 @@ public class VariableReferenceImpl extends TclArgumentImpl implements
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
 		case AstPackage.VARIABLE_REFERENCE__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
-					.equals(name);
+			return NAME_EDEFAULT == null ? name != null
+					: !NAME_EDEFAULT.equals(name);
 		case AstPackage.VARIABLE_REFERENCE__INDEX:
 			return index != null;
 		}
@@ -256,7 +256,7 @@ public class VariableReferenceImpl extends TclArgumentImpl implements
 		if (eIsProxy())
 			return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(')');
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java
index e2906cba..52477fe9 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/ast/org/eclipse/dltk/tcl/ast/util/AstSwitch.java
@@ -23,6 +23,8 @@ import org.eclipse.dltk.tcl.ast.TclArgument;
 import org.eclipse.dltk.tcl.ast.TclCommand;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,7 +39,7 @@ import org.eclipse.emf.ecore.EObject;
  * @see org.eclipse.dltk.tcl.ast.AstPackage
  * @generated
  */
-public class AstSwitch<T> {
+public class AstSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -59,31 +61,16 @@ public class AstSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		} else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(
-					eSuperTypes.get(0), theEObject);
-		}
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
 	}
 
 	/**
@@ -93,6 +80,7 @@ public class AstSwitch<T> {
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
+	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 		case AstPackage.NODE: {
@@ -475,6 +463,7 @@ public class AstSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
+	@Override
 	public T defaultCase(EObject object) {
 		return null;
 	}
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java
index 57f18c84..de15c712 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Argument.java
@@ -20,12 +20,12 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Argument#getLowerBound <em>Lower Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Argument#getUpperBound <em>Upper Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Argument#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getArgument()
  * @model interface="true" abstract="true"
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java
index 0abca172..8d8738bf 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ArgumentType.java
@@ -361,6 +361,8 @@ public enum ArgumentType implements Enumerator {
 	 * Returns the '<em><b>Argument Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ArgumentType get(String literal) {
@@ -377,6 +379,8 @@ public enum ArgumentType implements Enumerator {
 	 * Returns the '<em><b>Argument Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ArgumentType getByName(String name) {
@@ -393,6 +397,8 @@ public enum ArgumentType implements Enumerator {
 	 * Returns the '<em><b>Argument Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ArgumentType get(int value) {
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java
index 32b430cd..31c0c0ff 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Command.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Command#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Command#getArguments <em>Arguments</em>}</li>
@@ -27,7 +28,6 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Command#getScope <em>Scope</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Command#getDeprecated <em>Deprecated</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getCommand()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java
index 75aa7e0a..a2b2d12f 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/ComplexArgument.java
@@ -20,10 +20,10 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.ComplexArgument#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getComplexArgument()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java
index f2485540..e723fb6c 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Constant.java
@@ -19,10 +19,10 @@ package org.eclipse.dltk.tcl.definitions;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Constant#isStrictMatch <em>Strict Match</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getConstant()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java
index bac1c805..b449add8 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Group.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Group#getConstant <em>Constant</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Group#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getGroup()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java
index 9962690d..e65d03c1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Namespace.java
@@ -19,10 +19,10 @@ package org.eclipse.dltk.tcl.definitions;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Namespace#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getNamespace()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java
index 69f05647..bd4a3215 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Scope.java
@@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Scope#getChildren <em>Children</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getScope()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java
index e69f78d6..4d9a723b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/Switch.java
@@ -20,11 +20,11 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Switch#getGroups <em>Groups</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.Switch#isCheckPrefix <em>Check Prefix</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getSwitch()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java
index 466575b9..f8558657 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/TypedArgument.java
@@ -19,10 +19,10 @@ package org.eclipse.dltk.tcl.definitions;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.TypedArgument#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage#getTypedArgument()
  * @model
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java
index 9c56d77b..a1312a4b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/CommandImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.CommandImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.CommandImpl#getArguments <em>Arguments</em>}</li>
@@ -44,7 +45,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.CommandImpl#getScope <em>Scope</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.CommandImpl#getDeprecated <em>Deprecated</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -359,7 +359,7 @@ public class CommandImpl extends ScopeImpl implements Command {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(", version: ");
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java
index cdd1cabe..d7e5362e 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ComplexArgumentImpl.java
@@ -37,13 +37,13 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ComplexArgumentImpl#getLowerBound <em>Lower Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ComplexArgumentImpl#getUpperBound <em>Upper Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ComplexArgumentImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ComplexArgumentImpl#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -235,9 +235,9 @@ public class ComplexArgumentImpl extends EObjectImpl implements ComplexArgument
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case DefinitionsPackage.COMPLEX_ARGUMENT__LOWER_BOUND:
-				return new Integer(getLowerBound());
+				return getLowerBound();
 			case DefinitionsPackage.COMPLEX_ARGUMENT__UPPER_BOUND:
-				return new Integer(getUpperBound());
+				return getUpperBound();
 			case DefinitionsPackage.COMPLEX_ARGUMENT__NAME:
 				return getName();
 			case DefinitionsPackage.COMPLEX_ARGUMENT__ARGUMENTS:
@@ -256,10 +256,10 @@ public class ComplexArgumentImpl extends EObjectImpl implements ComplexArgument
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case DefinitionsPackage.COMPLEX_ARGUMENT__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
+				setLowerBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.COMPLEX_ARGUMENT__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
+				setUpperBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.COMPLEX_ARGUMENT__NAME:
 				setName((String)newValue);
@@ -325,7 +325,7 @@ public class ComplexArgumentImpl extends EObjectImpl implements ComplexArgument
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (lowerBound: ");
 		result.append(lowerBound);
 		result.append(", upperBound: ");
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java
index 7f264dff..efc35943 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ConstantImpl.java
@@ -27,13 +27,13 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ConstantImpl#getLowerBound <em>Lower Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ConstantImpl#getUpperBound <em>Upper Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ConstantImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ConstantImpl#isStrictMatch <em>Strict Match</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -230,13 +230,13 @@ public class ConstantImpl extends EObjectImpl implements Constant {
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case DefinitionsPackage.CONSTANT__LOWER_BOUND:
-				return new Integer(getLowerBound());
+				return getLowerBound();
 			case DefinitionsPackage.CONSTANT__UPPER_BOUND:
-				return new Integer(getUpperBound());
+				return getUpperBound();
 			case DefinitionsPackage.CONSTANT__NAME:
 				return getName();
 			case DefinitionsPackage.CONSTANT__STRICT_MATCH:
-				return isStrictMatch() ? Boolean.TRUE : Boolean.FALSE;
+				return isStrictMatch();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -250,16 +250,16 @@ public class ConstantImpl extends EObjectImpl implements Constant {
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case DefinitionsPackage.CONSTANT__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
+				setLowerBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.CONSTANT__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
+				setUpperBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.CONSTANT__NAME:
 				setName((String)newValue);
 				return;
 			case DefinitionsPackage.CONSTANT__STRICT_MATCH:
-				setStrictMatch(((Boolean)newValue).booleanValue());
+				setStrictMatch((Boolean)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -318,7 +318,7 @@ public class ConstantImpl extends EObjectImpl implements Constant {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (lowerBound: ");
 		result.append(lowerBound);
 		result.append(", upperBound: ");
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java
index b5b68dad..7510ff67 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsFactoryImpl.java
@@ -37,7 +37,7 @@ public class DefinitionsFactoryImpl extends EFactoryImpl implements DefinitionsF
 	 */
 	public static DefinitionsFactory init() {
 		try {
-			DefinitionsFactory theDefinitionsFactory = (DefinitionsFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/dltk/tcl/parserules.ecore"); 
+			DefinitionsFactory theDefinitionsFactory = (DefinitionsFactory)EPackage.Registry.INSTANCE.getEFactory(DefinitionsPackage.eNS_URI);
 			if (theDefinitionsFactory != null) {
 				return theDefinitionsFactory;
 			}
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java
index f774e675..f0b231c1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/DefinitionsPackageImpl.java
@@ -136,20 +136,10 @@ public class DefinitionsPackageImpl extends EPackageImpl implements DefinitionsP
 	private static boolean isInited = false;
 
 	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 *
+	 * <p>This method is used to initialize {@link DefinitionsPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #eNS_URI
@@ -161,7 +151,8 @@ public class DefinitionsPackageImpl extends EPackageImpl implements DefinitionsP
 		if (isInited) return (DefinitionsPackage)EPackage.Registry.INSTANCE.getEPackage(DefinitionsPackage.eNS_URI);
 
 		// Obtain or create and register package
-		DefinitionsPackageImpl theDefinitionsPackage = (DefinitionsPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DefinitionsPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DefinitionsPackageImpl());
+		Object registeredDefinitionsPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		DefinitionsPackageImpl theDefinitionsPackage = registeredDefinitionsPackage instanceof DefinitionsPackageImpl ? (DefinitionsPackageImpl)registeredDefinitionsPackage : new DefinitionsPackageImpl();
 
 		isInited = true;
 
@@ -174,6 +165,8 @@ public class DefinitionsPackageImpl extends EPackageImpl implements DefinitionsP
 		// Mark meta-data to indicate it can't be changed
 		theDefinitionsPackage.freeze();
 
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(DefinitionsPackage.eNS_URI, theDefinitionsPackage);
 		return theDefinitionsPackage;
 	}
 
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java
index 1e5a6a1d..86de36c3 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/GroupImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.GroupImpl#getLowerBound <em>Lower Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.GroupImpl#getUpperBound <em>Upper Bound</em>}</li>
@@ -44,7 +45,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.GroupImpl#getConstant <em>Constant</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.GroupImpl#getArguments <em>Arguments</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -277,9 +277,9 @@ public class GroupImpl extends EObjectImpl implements Group {
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case DefinitionsPackage.GROUP__LOWER_BOUND:
-				return new Integer(getLowerBound());
+				return getLowerBound();
 			case DefinitionsPackage.GROUP__UPPER_BOUND:
-				return new Integer(getUpperBound());
+				return getUpperBound();
 			case DefinitionsPackage.GROUP__NAME:
 				return getName();
 			case DefinitionsPackage.GROUP__CONSTANT:
@@ -300,10 +300,10 @@ public class GroupImpl extends EObjectImpl implements Group {
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case DefinitionsPackage.GROUP__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
+				setLowerBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.GROUP__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
+				setUpperBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.GROUP__NAME:
 				setName((String)newValue);
@@ -377,7 +377,7 @@ public class GroupImpl extends EObjectImpl implements Group {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (lowerBound: ");
 		result.append(lowerBound);
 		result.append(", upperBound: ");
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java
index 34395c58..6d9516c6 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/NamespaceImpl.java
@@ -26,10 +26,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.NamespaceImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -161,7 +161,7 @@ public class NamespaceImpl extends ScopeImpl implements Namespace {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (name: ");
 		result.append(name);
 		result.append(')');
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java
index 0d656c91..cec3e02b 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/ScopeImpl.java
@@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.ScopeImpl#getChildren <em>Children</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java
index 0e7194c8..fea2b007 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/SwitchImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.SwitchImpl#getLowerBound <em>Lower Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.SwitchImpl#getUpperBound <em>Upper Bound</em>}</li>
@@ -44,7 +45,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.SwitchImpl#getGroups <em>Groups</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.SwitchImpl#isCheckPrefix <em>Check Prefix</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -277,15 +277,15 @@ public class SwitchImpl extends EObjectImpl implements Switch {
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case DefinitionsPackage.SWITCH__LOWER_BOUND:
-				return new Integer(getLowerBound());
+				return getLowerBound();
 			case DefinitionsPackage.SWITCH__UPPER_BOUND:
-				return new Integer(getUpperBound());
+				return getUpperBound();
 			case DefinitionsPackage.SWITCH__NAME:
 				return getName();
 			case DefinitionsPackage.SWITCH__GROUPS:
 				return getGroups();
 			case DefinitionsPackage.SWITCH__CHECK_PREFIX:
-				return isCheckPrefix() ? Boolean.TRUE : Boolean.FALSE;
+				return isCheckPrefix();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -300,10 +300,10 @@ public class SwitchImpl extends EObjectImpl implements Switch {
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case DefinitionsPackage.SWITCH__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
+				setLowerBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.SWITCH__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
+				setUpperBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.SWITCH__NAME:
 				setName((String)newValue);
@@ -313,7 +313,7 @@ public class SwitchImpl extends EObjectImpl implements Switch {
 				getGroups().addAll((Collection<? extends Group>)newValue);
 				return;
 			case DefinitionsPackage.SWITCH__CHECK_PREFIX:
-				setCheckPrefix(((Boolean)newValue).booleanValue());
+				setCheckPrefix((Boolean)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -377,7 +377,7 @@ public class SwitchImpl extends EObjectImpl implements Switch {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (lowerBound: ");
 		result.append(lowerBound);
 		result.append(", upperBound: ");
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java
index 10f8efdd..38e94056 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/impl/TypedArgumentImpl.java
@@ -28,13 +28,13 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.TypedArgumentImpl#getLowerBound <em>Lower Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.TypedArgumentImpl#getUpperBound <em>Upper Bound</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.TypedArgumentImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.dltk.tcl.definitions.impl.TypedArgumentImpl#getType <em>Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -231,9 +231,9 @@ public class TypedArgumentImpl extends EObjectImpl implements TypedArgument {
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case DefinitionsPackage.TYPED_ARGUMENT__LOWER_BOUND:
-				return new Integer(getLowerBound());
+				return getLowerBound();
 			case DefinitionsPackage.TYPED_ARGUMENT__UPPER_BOUND:
-				return new Integer(getUpperBound());
+				return getUpperBound();
 			case DefinitionsPackage.TYPED_ARGUMENT__NAME:
 				return getName();
 			case DefinitionsPackage.TYPED_ARGUMENT__TYPE:
@@ -251,10 +251,10 @@ public class TypedArgumentImpl extends EObjectImpl implements TypedArgument {
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
 			case DefinitionsPackage.TYPED_ARGUMENT__LOWER_BOUND:
-				setLowerBound(((Integer)newValue).intValue());
+				setLowerBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.TYPED_ARGUMENT__UPPER_BOUND:
-				setUpperBound(((Integer)newValue).intValue());
+				setUpperBound((Integer)newValue);
 				return;
 			case DefinitionsPackage.TYPED_ARGUMENT__NAME:
 				setName((String)newValue);
@@ -319,7 +319,7 @@ public class TypedArgumentImpl extends EObjectImpl implements TypedArgument {
 	public String toString() {
 		if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
+		StringBuilder result = new StringBuilder(super.toString());
 		result.append(" (lowerBound: ");
 		result.append(lowerBound);
 		result.append(", upperBound: ");
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java
index ad99b51b..ec4e27e0 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/definitions/org/eclipse/dltk/tcl/definitions/util/DefinitionsSwitch.java
@@ -17,6 +17,8 @@ import org.eclipse.dltk.tcl.definitions.*;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,7 +33,7 @@ import org.eclipse.emf.ecore.EObject;
  * @see org.eclipse.dltk.tcl.definitions.DefinitionsPackage
  * @generated
  */
-public class DefinitionsSwitch<T> {
+public class DefinitionsSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -53,34 +55,16 @@ public class DefinitionsSwitch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @param ePackage the package in question.
+	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
 	}
 
 	/**
@@ -90,6 +74,7 @@ public class DefinitionsSwitch<T> {
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
+	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 			case DefinitionsPackage.ARGUMENT: {
@@ -126,7 +111,7 @@ public class DefinitionsSwitch<T> {
 				return result;
 			}
 			case DefinitionsPackage.SWITCH: {
-				Switch switch_ = (Switch)theEObject;
+				org.eclipse.dltk.tcl.definitions.Switch switch_ = (org.eclipse.dltk.tcl.definitions.Switch)theEObject;
 				T result = caseSwitch(switch_);
 				if (result == null) result = caseArgument(switch_);
 				if (result == null) result = defaultCase(theEObject);
@@ -243,7 +228,7 @@ public class DefinitionsSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseSwitch(Switch object) {
+	public T caseSwitch(org.eclipse.dltk.tcl.definitions.Switch object) {
 		return null;
 	}
 
@@ -303,6 +288,7 @@ public class DefinitionsSwitch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
+	@Override
 	public T defaultCase(EObject object) {
 		return null;
 	}
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/models/ast.genmodel b/tcl/plugins/org.eclipse.dltk.tcl.parser/models/ast.genmodel
index 21a2f292..d4e41653 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/models/ast.genmodel
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/models/ast.genmodel
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.dltk.tcl.parser/ast"
-    modelPluginID="org.eclipse.dltk.tcl.parser" templateDirectory="" modelName="Ast"
-    nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" language="">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.dltk.tcl.parser/ast" modelPluginID="org.eclipse.dltk.tcl.parser"
+    templateDirectory="" modelName="Ast" nonNLSMarkers="true" codeFormatting="true"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    language="">
   <foreignModel>ast.ecore</foreignModel>
   <foreignModel>definitions.ecore</foreignModel>
   <genPackages prefix="Ast" basePackage="org.eclipse.dltk.tcl" disposableProviderFactory="true"
@@ -20,6 +19,7 @@
     </genClasses>
     <genClasses ecoreClass="ast.ecore#//StringArgument">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//StringArgument/value"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute ast.ecore#//StringArgument/rawValue"/>
     </genClasses>
     <genClasses ecoreClass="ast.ecore#//Substitution">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ast.ecore#//Substitution/commands"/>
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/models/definitions.genmodel b/tcl/plugins/org.eclipse.dltk.tcl.parser/models/definitions.genmodel
index 1ce6f4a1..9e6fbea4 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/models/definitions.genmodel
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/models/definitions.genmodel
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.dltk.tcl.parser/definitions"
-    modelPluginID="org.eclipse.dltk.tcl.parser" modelName="Definitions" importerID="org.eclipse.emf.importer.java"
-    complianceLevel="5.0" copyrightFields="false">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.dltk.tcl.parser/definitions" modelPluginID="org.eclipse.dltk.tcl.parser"
+    modelName="Definitions" importerID="org.eclipse.emf.importer.java" complianceLevel="5.0"
+    copyrightFields="false">
   <foreignModel>@model</foreignModel>
   <genPackages prefix="Definitions" basePackage="org.eclipse.dltk.tcl" resource="XML"
       disposableProviderFactory="true" contentTypeIdentifier="" fileExtensions="definitions"
@@ -25,6 +24,7 @@
     <genClasses image="false" ecoreClass="definitions.ecore#//Argument">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Argument/lowerBound"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Argument/upperBound"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Argument/name"/>
     </genClasses>
     <genClasses ecoreClass="definitions.ecore#//Command">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Command/name"/>
@@ -37,8 +37,7 @@
       <genFeatures property="None" children="true" createChild="true" propertyCategory=""
           propertySortChoices="true" ecoreFeature="ecore:EReference definitions.ecore#//Scope/children"/>
     </genClasses>
-    <genClasses ecoreClass="definitions.ecore#//Constant" labelFeature="#//definitions/Constant/value">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Constant/value"/>
+    <genClasses ecoreClass="definitions.ecore#//Constant">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Constant/strictMatch"/>
     </genClasses>
     <genClasses ecoreClass="definitions.ecore#//Group" labelFeature="#//definitions/Group/constant">
@@ -49,9 +48,8 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference definitions.ecore#//Switch/groups"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Switch/checkPrefix"/>
     </genClasses>
-    <genClasses ecoreClass="definitions.ecore#//TypedArgument" labelFeature="#//definitions/TypedArgument/name">
+    <genClasses ecoreClass="definitions.ecore#//TypedArgument">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//TypedArgument/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//TypedArgument/name"/>
     </genClasses>
     <genClasses ecoreClass="definitions.ecore#//Namespace">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute definitions.ecore#//Namespace/name"/>
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.xml b/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.xml
index ca5b2382..9a7eebbc 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.xml
+++ b/tcl/plugins/org.eclipse.dltk.tcl.parser/plugin.xml
@@ -10,6 +10,13 @@
             class="org.eclipse.dltk.tcl.definitions.DefinitionsPackage"
             genModel="models/definitions.genmodel"/>
    </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated definitions -->
+      <parser
+            type="definitions"
+            class="org.eclipse.dltk.tcl.definitions.util.DefinitionsResourceFactoryImpl"/>
+   </extension>
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http:///org/eclipse/dltk/tcl/ast.ecore"