fast-experimental-3.0.diff

Index: modules/antTasks/src/flex/ant/config/NestedAttributeElement.java
===================================================================
--- modules/antTasks/src/flex/ant/config/NestedAttributeElement.java	(revision 3507)
+++ modules/antTasks/src/flex/ant/config/NestedAttributeElement.java	(working copy)
@@ -93,7 +93,7 @@
         }
         else
         {
-            StringBuffer stringBuffer = new StringBuffer();
+            StringBuilder stringBuffer = new StringBuilder();
 
             for (int i = 0; i < attribs.length; i++)
             {
Index: modules/antTasks/src/flex/ant/FlexTask.java
===================================================================
--- modules/antTasks/src/flex/ant/FlexTask.java	(revision 3507)
+++ modules/antTasks/src/flex/ant/FlexTask.java	(working copy)
@@ -262,6 +262,7 @@
 
             super.setClassname(toolClassName);
             super.setClasspath(new Path(getProject(), fileName));
+            StringBuilder stringBuffer = new StringBuilder();
 
             //converts arguments into a string for use by executeJava()
             for (int i = 0; i < temp.length; i++)
Index: modules/asc/build/java/src/Downgrader.java
===================================================================
--- modules/asc/build/java/src/Downgrader.java	(revision 3507)
+++ modules/asc/build/java/src/Downgrader.java	(working copy)
@@ -42,7 +42,7 @@
  * make JDK 1.5 classfiles (version 49.0) compatible with JDK 1.3 (version 47.0)
  * by making the following changes:
  *
- * 1. replace references to java.lang.StringBuilder with java.lang.StringBuffer
+ * 1. replace references to java.lang.StringBuilder with java.lang.StringBuilder
  * 2. replace Integer.valueOf(int) with macromedia.asc.util.Boxing.valueOf(int)
  * 3. reorder this$outer and super() code snippets in inner class constructors,
  *    to please the 1.3 verifier.
@@ -65,15 +65,15 @@
 
     static
     {
-        // replace StringBuilder with StringBuffer
-        strings.put("java/lang/StringBuilder", "java/lang/StringBuffer");
-        strings.put("(Ljava/lang/String;)Ljava/lang/StringBuilder;", "(Ljava/lang/String;)Ljava/lang/StringBuffer;");
-        strings.put("(Ljava/lang/Object;)Ljava/lang/StringBuilder;", "(Ljava/lang/Object;)Ljava/lang/StringBuffer;");
-        strings.put("(I)Ljava/lang/StringBuilder;", "(I)Ljava/lang/StringBuffer;");
-        strings.put("(C)Ljava/lang/StringBuilder;", "(C)Ljava/lang/StringBuffer;");
-        strings.put("(Z)Ljava/lang/StringBuilder;", "(Z)Ljava/lang/StringBuffer;");
-        strings.put("(D)Ljava/lang/StringBuilder;", "(D)Ljava/lang/StringBuffer;");
-        strings.put("(J)Ljava/lang/StringBuilder;", "(J)Ljava/lang/StringBuffer;");
+        // replace StringBuilder with StringBuilder
+        strings.put("java/lang/StringBuilder", "java/lang/StringBuilder");
+        strings.put("(Ljava/lang/String;)Ljava/lang/StringBuilder;", "(Ljava/lang/String;)Ljava/lang/StringBuilder;");
+        strings.put("(Ljava/lang/Object;)Ljava/lang/StringBuilder;", "(Ljava/lang/Object;)Ljava/lang/StringBuilder;");
+        strings.put("(I)Ljava/lang/StringBuilder;", "(I)Ljava/lang/StringBuilder;");
+        strings.put("(C)Ljava/lang/StringBuilder;", "(C)Ljava/lang/StringBuilder;");
+        strings.put("(Z)Ljava/lang/StringBuilder;", "(Z)Ljava/lang/StringBuilder;");
+        strings.put("(D)Ljava/lang/StringBuilder;", "(D)Ljava/lang/StringBuilder;");
+        strings.put("(J)Ljava/lang/StringBuilder;", "(J)Ljava/lang/StringBuilder;");
 
         // replace java.lang.AssertionError with java/lang/Error
         strings.put("java/lang/AssertionError", "java/lang/Error");
Index: modules/asc/src/java/macromedia/abc/AbcParser.java
===================================================================
--- modules/asc/src/java/macromedia/abc/AbcParser.java	(revision 3507)
+++ modules/asc/src/java/macromedia/abc/AbcParser.java	(working copy)
@@ -509,7 +509,7 @@
 
         // Calculate the internal name - this matter because with get/set properties you can end up with
         // multiple methods with the same name, but they must each have different internal names.
-        StringBuffer internal_name = new StringBuffer(methName.length() + 5);
+        StringBuilder internal_name = new StringBuilder(methName.length() + 5);
         if( !fun_names.containsKey(methName) )
         {
             fun_names.put(methName,0);
Index: modules/asc/src/java/macromedia/abc/MultiName.java
===================================================================
--- modules/asc/src/java/macromedia/abc/MultiName.java	(revision 3507)
+++ modules/asc/src/java/macromedia/abc/MultiName.java	(working copy)
@@ -89,7 +89,7 @@
 	public String toString()
 	{
 		// return "multiname{...}::" + localPart;
-		StringBuffer b = new StringBuffer("{");
+		StringBuilder b = new StringBuilder("{");
 		for (int i = 0, length = (namespaceURI == null) ? 0 : namespaceURI.length; i < length; i++)
 		{
 			b.append(namespaceURI[i]);
Index: modules/asc/src/java/macromedia/asc/embedding/avmplus/ActionBlockEmitter.java
===================================================================
--- modules/asc/src/java/macromedia/asc/embedding/avmplus/ActionBlockEmitter.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/embedding/avmplus/ActionBlockEmitter.java	(working copy)
@@ -7754,7 +7754,7 @@
 
     public String il_str()
     {
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
 
         if (bytecodeFactory.show_bytecode)
         {
@@ -7772,7 +7772,7 @@
     
     private static String cleanupString(ByteList bl)
     {
-    	StringBuffer b = new StringBuffer();
+    	StringBuilder b = new StringBuilder();
     	for (int i=0, n=bl.size(); i < n; i++)
     	{
     		char c = (char) bl.get(i);
Index: modules/asc/src/java/macromedia/asc/embedding/avmplus/ByteCodeFactory.java
===================================================================
--- modules/asc/src/java/macromedia/asc/embedding/avmplus/ByteCodeFactory.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/embedding/avmplus/ByteCodeFactory.java	(working copy)
@@ -407,7 +407,7 @@
 	{
 		if (show_bytecode)
 		{
-			StringBuffer numStr = new StringBuffer();
+			StringBuilder numStr = new StringBuilder();
 			IL_FormatDoubleAsString(value,numStr);
             cpool_out.write("\n      ConstantDoubleInfo "+numStr.toString());
 		}
@@ -1283,7 +1283,7 @@
 	//  be consistent between the c++ and java based compilers.  (which allows diffing
 	//  of a java produced .il file vs a c++ produced .il).
 	// Only used by PushNumber() when show_instructions is true.
-	public static StringBuffer IL_FormatDoubleAsString(double val, StringBuffer buff)
+	public static StringBuilder IL_FormatDoubleAsString(double val, StringBuilder buff)
 	{
 		if (val == 0.0)
 		{
Index: modules/asc/src/java/macromedia/asc/embedding/Compiler.java
===================================================================
--- modules/asc/src/java/macromedia/asc/embedding/Compiler.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/embedding/Compiler.java	(working copy)
@@ -247,7 +247,7 @@
 			MetaDataEvaluator printer = new MetaDataEvaluator();
 			node.evaluate(cx,printer);
 
-			StringBuffer out = new StringBuffer();
+			StringBuilder out = new StringBuilder();
 			out.append("<asdoc>").append(newline);
 
 			ObjectList<DocCommentNode> comments = printer.doccomments;
Index: modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java
===================================================================
--- modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/embedding/LintEvaluator.java	(working copy)
@@ -493,7 +493,7 @@
 
         if( slot != null && !in_with  )
         {
-            warning(node.expr.pos()-1, cx.input, kWarning_DeleteOfFixedProperty, node.ref.name);
+            warning(node.expr.pos(), cx.input, kWarning_DeleteOfFixedProperty, node.ref.name);
         }
 
 		return (node.void_result ? cx.voidType() : cx.booleanType() );
@@ -2799,7 +2799,7 @@
 		{
 			for(WarningRecord pRec : locMap.values())
 			{
-				StringBuffer sb = new StringBuffer();
+				StringBuilder sb = new StringBuilder();
 				InputBuffer input = pRec.loc.input;
 				
 				createErrorMessage(pRec, sb, pRec.code);
@@ -2831,7 +2831,7 @@
 		}
 		else
 		{
-			StringBuffer        out = new StringBuffer();
+			StringBuilder        out = new StringBuilder();
 			out.append(newline).append("Warning Report:").append(newline);
 			out.append("---------------").append(newline).append(newline);
 	
@@ -2880,7 +2880,7 @@
 		}
 	}
 
-	private void createWarning(WarningRecord pRec, StringBuffer out, Integer code)
+	private void createWarning(WarningRecord pRec, StringBuilder out, Integer code)
 	{
 		InputBuffer input = pRec.loc.input;
 
@@ -2893,7 +2893,7 @@
 		out.append("    ").append(InputBuffer.getLinePointer(pRec.colNum)).append(newline);
 	}
 	
-	private void createErrorMessage(WarningRecord pRec, StringBuffer out, Integer code)
+	private void createErrorMessage(WarningRecord pRec, StringBuilder out, Integer code)
 	{
 		// Just the arguments for sanities, no message (since they chang often)
 		if(ContextStatics.useSanityStyleErrors) {
@@ -2940,16 +2940,12 @@
 		{
 			//TODO Review this for removal/revising later
 			// remove this when there is no longer problems with sometimes having a
-			// large and wrong loc.pos as well as it being off by one
+			// large and wrong loc.pos
 			int colPos = input.getColPos(loc.pos);
 			if (colPos > 300)
 			{
 				colPos = 1;
 			}
-			else
-			{
-				colPos = colPos - 1;
-			}
 
 			WarningRecord rec = new WarningRecord( loc,
 					input.getLnNum(loc.pos), colPos, code,
Index: modules/asc/src/java/macromedia/asc/embedding/Main.java
===================================================================
--- modules/asc/src/java/macromedia/asc/embedding/Main.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/embedding/Main.java	(working copy)
@@ -374,7 +374,7 @@
 			if (!f.exists())
 			{
                 Context cx = new Context(new ContextStatics());
-				StringBuffer error_msg = new StringBuffer();
+				StringBuilder error_msg = new StringBuilder();
 				Context.replaceStringArg(error_msg, cx
 						.errorString(ErrorConstants.kError_UnableToOpenFile),
 						0, filename);
Index: modules/asc/src/java/macromedia/asc/embedding/Shell.java
===================================================================
--- modules/asc/src/java/macromedia/asc/embedding/Shell.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/embedding/Shell.java	(working copy)
@@ -327,7 +327,7 @@
 	{
 		Target s = (Target) targets.get(target);
 		System.out.println("id: " + s.id);
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 		for (int i = 0, size = s.args.length; i < size; i++)
 		{
 			b.append(s.args[i]);
@@ -483,7 +483,7 @@
 	public static String readFile(File f)
 	{
 		BufferedReader file = null;
-		StringBuffer buffer = new StringBuffer((int) f.length());
+		StringBuilder buffer = new StringBuilder((int) f.length());
 		String lineSep = System.getProperty("line.separator");
 
 		try
Index: modules/asc/src/java/macromedia/asc/parser/DocCommentNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/DocCommentNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/DocCommentNode.java	(working copy)
@@ -39,7 +39,7 @@
 			return null;
 	    }
 
-    private StringBuffer emitMetaDataComment(StringBuffer buf, String debugName, MetaDataNode meta, boolean isAttributeOfDefinition)
+    private StringBuilder emitMetaDataComment(StringBuilder buf, String debugName, MetaDataNode meta, boolean isAttributeOfDefinition)
 	{
 		buf.append("\n<metadata>\n");
 		String tagname = meta.id;
@@ -113,7 +113,7 @@
 		return buf;
 	}
 
-	public StringBuffer emit(Context cx,StringBuffer buf)
+	public StringBuilder emit(Context cx,StringBuilder buf)
 	{
 		String tagname = "";
 		StatementListNode metaData = null;
@@ -528,7 +528,7 @@
 
     public static String escapeXml(String s)
     {
-        StringBuffer out = new StringBuffer(s.length() + 16);
+        StringBuilder out = new StringBuilder(s.length() + 16);
         int length = s.length();
         for(int i = 0; i < length; i++)
         {
Index: modules/asc/src/java/macromedia/asc/parser/FunctionSignatureNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/FunctionSignatureNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/FunctionSignatureNode.java	(working copy)
@@ -79,7 +79,7 @@
 		return "FunctionSignature";
 	}
 
-	public StringBuffer toCanonicalString(Context cx, StringBuffer buff)
+	public StringBuilder toCanonicalString(Context cx, StringBuilder buff)
 	{
 		if (parameter != null)
 			parameter.toCanonicalString(cx, buff);
Index: modules/asc/src/java/macromedia/asc/parser/IdentifierNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/IdentifierNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/IdentifierNode.java	(working copy)
@@ -27,20 +27,46 @@
  */
 public class IdentifierNode extends Node
 {
+	private static final String ASTERISK = "*".intern();
+
 	public String name;
     public ReferenceValue ref;
 
 	public IdentifierNode(String name, int pos)
 	{
+        this(name, true, pos);
+	}
+
+	/**
+	 * This constructor is used by Flex direct AST generation.
+	 *
+	 * @param intern Controls whether value will be interned.  If
+	 *				 <code>name</code> is an interned constant,
+	 *				 <code>intern</code> should be false.  Otherwise,
+	 *				 it should be true.
+	 */
+	public IdentifierNode(String name, boolean intern, int pos)
+	{
 		super(pos);
-		this.name = name.intern();
-        
-        if (name.equals("*"))
-        {
-            setAny(true);
-        }
-    }
 
+		if (intern)
+		{
+            this.name = name.intern();
+		}
+		else
+		{
+            assert name.intern() == name;
+			this.name = name;
+		}
+
+		// It's safe to use == here, because name is interned above
+		// and ASTERISK is interned.
+		if (name == ASTERISK)
+		{
+			setAny(true);
+		}
+	}
+
 	int authOrigTypeToken = -1;
 	
 	public void setOrigTypeToken(int token){
@@ -74,7 +100,8 @@
 
 	public boolean hasAttribute(String name)
 	{
-		if (this.name.equals(name))
+		assert name.intern() == name;
+		if (this.name == name)
 		{
 			return true;
 		}
Index: modules/asc/src/java/macromedia/asc/parser/InputBuffer.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/InputBuffer.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/InputBuffer.java	(working copy)
@@ -39,7 +39,7 @@
  */
 public final class InputBuffer
 {
-	private StringBuffer text;
+	private StringBuilder text;
 	private IntList line_breaks;
 	private boolean atEOF = false;
 	
@@ -47,9 +47,9 @@
 	private int pushBackChar = -1;
 	public String origin;
 
-	public StringBuffer curr_line;
-	public StringBuffer prev_line;
-	public StringBuffer raw_curr_line; // un-normalized verison of curr_line
+	public StringBuilder curr_line;
+	public StringBuilder prev_line;
+	public StringBuilder raw_curr_line; // un-normalized verison of curr_line
 
 	public int curr_line_offset;
 	public int prev_line_offset;
@@ -66,7 +66,7 @@
 	public InputBuffer(InputStream in, String encoding, String origin) // Init lineA to make distinct from curr_line (see nextchar)
 	{
 		this.in = createReader(in, encoding);
-		this.text = new StringBuffer(8192);
+		this.text = new StringBuilder(8192);
 
 		init(origin, 0);
 	}
@@ -74,7 +74,7 @@
 	public InputBuffer(String in, String origin)
 	{
 		this.in = new StringReader(in);
-		this.text = new StringBuffer(in.length() + 10);
+		this.text = new StringBuilder(in.length() + 10);
 
 		init(origin, 0);
 	}
@@ -82,13 +82,13 @@
 	private void init(String origin, int pos)
 	{
 		this.origin = origin;
-		curr_line = new StringBuffer(80);
-		prev_line = new StringBuffer(80);
+		curr_line = new StringBuilder(80);
+		prev_line = new StringBuilder(80);
 		prev_line_offset = -1;
 		this.pos = pos;
 		lnNum = -1;
 		colPos = 0;
-		raw_curr_line = new StringBuffer(80);
+		raw_curr_line = new StringBuilder(80);
 
 		has_unixnewlines = false;
 
@@ -255,7 +255,7 @@
 			// If the current character is a newline, then read
 			// the next line of input into the other input buffer.
 
-			StringBuffer prevSave = prev_line;
+			StringBuilder prevSave = prev_line;
 			prev_line = curr_line;
 			prev_line_offset = curr_line_offset;
 
@@ -384,7 +384,7 @@
 	{
 		if ((--colPos) < 0)
 		{
-			StringBuffer currSave = curr_line;
+			StringBuilder currSave = curr_line;
 			curr_line = prev_line;
 			prev_line = currSave;
 			prev_line.setLength(0);
@@ -560,10 +560,10 @@
   		  Functionality split off from copy() so that we can call it on Parser's
   		  string_literal_buffer as well
   	 */
-	public String escapeString(StringBuffer source, int from, int to)
+	public String escapeString(StringBuilder source, int from, int to)
 	{
 		// C: only 1 string in 1000 needs escaping and the lengths of these strings are usually small,
-		//    so we can cut StringBuffer usage if we check '\\' up front.
+		//    so we can cut StringBuilder usage if we check '\\' up front.
 		int stop = to+1;
 		boolean required = false;
 
@@ -581,7 +581,7 @@
 			return source.substring(from, stop);
 		}
 
-		final StringBuffer buf = new StringBuffer(stop-from);
+		final StringBuilder buf = new StringBuilder(stop-from);
 		for (int i = from; i < stop; i++)
 		{
 			char c = source.charAt(i);
@@ -800,7 +800,7 @@
 
 	public static String getLinePointer(int pos)
 	{
-		final StringBuffer padding = new StringBuffer(pos);
+		final StringBuilder padding = new StringBuilder(pos);
 		for (int i = 0; i < pos - 1; ++i)
 		{
 			padding.append(".");
@@ -812,7 +812,7 @@
 	public void clearUnusedBuffers() 
 	{
 		// TODO: remove this and pre-size text
-        text = new StringBuffer(text.toString());
+        text = new StringBuilder(text.toString());
 		try { in.close(); } catch (IOException e) {}
 		in = null;
 		curr_line = null;
Index: modules/asc/src/java/macromedia/asc/parser/LiteralStringNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/LiteralStringNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/LiteralStringNode.java	(working copy)
@@ -30,11 +30,11 @@
 	public String value;
 
 	// consts used to identify string delimiter type.
-	static final int SINGLE_QUOTE_DELIMITER = 2;
-	static final int DOUBLE_QUOTE_DELIMITER = 1;
-	static final int OTHER_DELIMITER=0; // this can occur in an xml literal expression, or in LiteralStringNodes synthesized by the compiler
+	private static final int SINGLE_QUOTE_DELIMITER = 2;
+	private static final int DOUBLE_QUOTE_DELIMITER = 1;
+	private static final int OTHER_DELIMITER=0; // this can occur in an xml literal expression, or in LiteralStringNodes synthesized by the compiler
 	
-	int delimiterType; // one of the above delim types
+	private int delimiterType; // one of the above delim types
 	
 	public boolean isSingleQuote()
 	{
@@ -46,7 +46,6 @@
 		return delimiterType == DOUBLE_QUOTE_DELIMITER;
 	}
 
-
 	public LiteralStringNode(String value)
 	{
 		void_result = false;
@@ -56,8 +55,31 @@
 
 	public LiteralStringNode(String value, boolean singleQuoted)
 	{
+		this(value, singleQuoted, true);
+	}
+
+	/**
+	 * This constructor is used by Flex direct AST generation.
+	 *
+	 * @param intern Controls whether value will be interned.  If
+	 *				 <code>value</code> is an interned constant,
+	 *				 <code>intern</code> should be false.  Otherwise,
+	 *				 it should be true.
+	 */
+	public LiteralStringNode(String value, boolean singleQuoted, boolean intern)
+	{
 		void_result = false;
-		this.value = value.intern();
+
+		if (intern)
+		{
+			this.value = value.intern();
+		}
+		else
+		{
+			assert value.intern() == value;
+			this.value = value;
+		}
+
 		delimiterType = singleQuoted ? SINGLE_QUOTE_DELIMITER : DOUBLE_QUOTE_DELIMITER;
 	}
 
Index: modules/asc/src/java/macromedia/asc/parser/MemberExpressionNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/MemberExpressionNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/MemberExpressionNode.java	(working copy)
@@ -127,7 +127,7 @@
         return false;
     }
 
-    public StringBuffer toCanonicalString(Context cx, StringBuffer buf)
+    public StringBuilder toCanonicalString(Context cx, StringBuilder buf)
     {
         Slot s = ref.getSlot(cx, GET_TOKEN);
         buf.append( (s == null || s.getDebugName().length() == 0) ? ref.name : s.getDebugName() );
Index: modules/asc/src/java/macromedia/asc/parser/MetaDataEvaluator.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/MetaDataEvaluator.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/MetaDataEvaluator.java	(working copy)
@@ -102,7 +102,7 @@
 		}
 		else if (node.data.elementlist.size() > 1)
 		{
-			cx.error(node.pos()-1, kError_MetaDataAttributesHasMoreThanOneElement);
+			cx.error(node.pos(), kError_MetaDataAttributesHasMoreThanOneElement);
 		}
 		else if( node.data.elementlist.items.get(0) instanceof MemberExpressionNode )
 		{
@@ -132,7 +132,7 @@
 							Value value = n.evaluate(cx, this);
 							if (value == null)
 							{
-								cx.error(n.pos() - 1, kError_InvalidMetaData);
+								cx.error(n.pos(), kError_InvalidMetaData);
 							}
 							node.values[i] = value;
 						}
@@ -158,11 +158,11 @@
         {
             if( node.data.elementlist.items.get(0) != null )
             {
-                cx.error(node.data.elementlist.items.get(0).pos() - 1, kError_InvalidMetaData);
+                cx.error(node.data.elementlist.items.get(0).pos(), kError_InvalidMetaData);
             }
             else
             {
-                cx.error(node.pos() - 1, kError_InvalidMetaData);
+                cx.error(node.pos(), kError_InvalidMetaData);
             }
         }
 
Index: modules/asc/src/java/macromedia/asc/parser/Node.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/Node.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/Node.java	(working copy)
@@ -124,7 +124,7 @@
          return "Node";
 	}
 
-	public StringBuffer toCanonicalString(Context cx, StringBuffer buf)    
+	public StringBuilder toCanonicalString(Context cx, StringBuilder buf)    
 	{
 		return buf;
 	}
Index: modules/asc/src/java/macromedia/asc/parser/NodeFactory.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/NodeFactory.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/NodeFactory.java	(working copy)
@@ -738,7 +738,7 @@
 			else
 				identifier = this.identifier("anonymous",pos);
 		}
-		StringBuffer internal_name = new StringBuffer(identifier.name.length() + 6);
+		StringBuilder internal_name = new StringBuilder(identifier.name.length() + 6);
 
 		if (!fun_names.containsKey(identifier.name))
 		{
@@ -876,14 +876,30 @@
 		return identifier(name, -1);
 	}
 
+	public IdentifierNode identifier(String name, boolean intern)
+	{
+		IdentifierNode node = new IdentifierNode(name, intern, -1);
+		return node;
+	}
+
+	public IdentifierNode identifier(String name, boolean intern, int pos)
+	{
+		IdentifierNode node = new IdentifierNode(name, intern, pos);
+		return node;
+	}
+
+	private static final String ARGUMENTS = "arguments".intern();
+
 	public IdentifierNode identifier(String name, int pos)
 	{
-		if ("arguments".equals(name))
+		IdentifierNode node = new IdentifierNode(name, pos);
+		node.setPositionTerminal(pos);
+
+		if (ARGUMENTS == node.name)
 		{
 			this.has_arguments = true;
 		}
-		IdentifierNode node = new IdentifierNode(name, pos);
-		node.setPositionTerminal(pos);
+
 		return node;
 	}
 
@@ -1178,12 +1194,17 @@
         return node;
     }
 
-
 	public LiteralStringNode literalString(String value)
 	{
 		return literalString(value, 0);
 	}
 
+	public LiteralStringNode literalString(String value, boolean intern)
+	{
+		LiteralStringNode node = new LiteralStringNode(value, false, intern);
+		return node;
+	}
+
 	public LiteralStringNode literalString(String value, int pos)
 	{
 		LiteralStringNode node = new LiteralStringNode(value);
@@ -1268,7 +1289,7 @@
                         }
 						if( base_name != null && pname != null )
 						{
-							String compound_name = new StringBuffer(base_name.length() + pname.name.length() + 1).append(base_name).append(".").append(pname.name).toString();
+							String compound_name = new StringBuilder(base_name.length() + pname.name.length() + 1).append(base_name).append(".").append(pname.name).toString();
 							if( compound_names.contains(compound_name) )
 							{
 								selector = this.getExpression(this.identifier(compound_name,selector.pos()));
@@ -1277,7 +1298,7 @@
 							}
 							else if( compound_names.contains(base_name) )
 							{
-								LiteralStringNode nsn = literalString(bname.name,memb.pos()-1);
+								LiteralStringNode nsn = literalString(bname.name,memb.pos());
 								selector = this.getExpression(this.qualifiedIdentifier(nsn,pname,selector.pos()));
 								base = memb.base;
 							}
@@ -1417,7 +1438,7 @@
     public PackageDefinitionNode startPackage(Context cx,AttributeListNode attrs, PackageNameNode name)
     {
     	if (cx.scriptAssistParsing)
-    		 return startPackage(cx, attrs, name, cx.input.pos);
+    		 return startPackage(cx, attrs, name, cx.input.getCurrentPos());
     	else
     		return startPackage(cx, attrs, name, -1);
     }
@@ -1637,7 +1658,7 @@
 		else
 		{
 			node = this.error(expr.getPosition(), kError_IncrementOperatorNotAReference);// todo: should be an cx.error, not an ErrorNode?
-			node.setPosition(node.getPosition() - 1);  // since increment has two characters.
+			node.setPosition(node.getPosition());
 		}
 
 		return node;
Index: modules/asc/src/java/macromedia/asc/parser/PackageIdentifiersNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/PackageIdentifiersNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/PackageIdentifiersNode.java	(working copy)
@@ -82,13 +82,15 @@
         }
     }
 
+    private static final String ASTERISK = "*".intern();
+
     public String toIdentifierString()
     {
         if( pkg_part == null )
         {
         	boolean isDefinition = (flags & IS_DEFINITION_FLAG) != 0;
         	
-            StringBuffer buf = new StringBuffer();
+            StringBuiler buf = new StringBuilder();
             //ListIterator<IdentifierNode> it = list.listIterator();            
             //while( it.hasNext() )
 			int len = list.size();
@@ -98,7 +100,7 @@
 				if (x == len - 1 && isDefinition)
 				{
 					def_part = "";
-					if (!"*".equals(item.name))
+					if (ASTERISK != item.name)
 						def_part = item.name;
 				}
 				else
Index: modules/asc/src/java/macromedia/asc/parser/ParameterListNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/ParameterListNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/ParameterListNode.java	(working copy)
@@ -68,7 +68,7 @@
         return "ParameterList";
     }
 
-	public StringBuffer toCanonicalString(Context cx, StringBuffer buf)
+	public StringBuilder toCanonicalString(Context cx, StringBuilder buf)
 	{       
 		{			        
 			buf.append(" param_names='");
Index: modules/asc/src/java/macromedia/asc/parser/Parser.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/Parser.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/Parser.java	(working copy)
@@ -21,6 +21,8 @@
 import java.util.HashSet;
 import java.util.ListIterator;
 
+import macromedia.asc.semantics.NamespaceValue;
+import macromedia.asc.semantics.ReferenceValue;
 import macromedia.asc.util.*;
 import static macromedia.asc.parser.Tokens.*;
 import static macromedia.asc.embedding.avmplus.RuntimeConstants.*;
@@ -40,6 +42,19 @@
 {
     private static final boolean debug = false;
 
+    private static final String PUBLIC = "public".intern();
+    private static final String PRIVATE = "private".intern();
+    private static final String PROTECTED = "protected".intern();
+    private static final String ASTERISK = "*".intern();
+    private static final String DEFAULT = "default".intern();
+    private static final String AS3 = "AS3".intern();
+    private static final String CONFIG = "CONFIG".intern();
+    private static final String GET = "get".intern();
+    private static final String NAMESPACE = "namespace".intern();
+    private static final String SET = "set".intern();
+    private static final String VEC = "vec".intern();
+    private static final String VECTOR = "Vector".intern();
+    private static final String __AS3__ = "__AS3__".intern();
 
     private static final int abbrevIfElse_mode    = ELSE_TOKEN;  // lookahead uses this value. don't change.
     private static final int abbrevDoWhile_mode = WHILE_TOKEN; // ditto.
@@ -153,7 +168,7 @@
     private Node error(int kind, int errCode, String arg1, String arg2,int pos)
     {
         String origin = this.scanner.input.origin;
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
         
         if(debug) out.append("[Parser] ");
         
@@ -175,16 +190,10 @@
         int column;
         if( pos < 0 )
         {
-            lineno = scanner.input.markLn + 1;
-            column = scanner.input.markCol;
             pos = scanner.input.positionOfMark();
-
         }
-        else
-        {
-            lineno = scanner.input.getLnNum(pos);
-            column = scanner.input.getColPos(pos);
-        }
+        lineno = scanner.input.getLnNum(pos);
+        column = scanner.input.getColPos(pos);
 
         if (kind == syntax_error || kind == syntax_eos_error )
         {
@@ -204,11 +213,6 @@
      * whitespace or end of input.
      */
 
-    private void skiperror()
-    {
-        skiperror(syntax_error);
-    }
-
     private void skiperror(int kind)
     {
         // If kind is < 0 then it is a token class to be advanced to,
@@ -353,7 +357,7 @@
     public Parser(Context cx, InputStream in, String origin, String encoding, boolean emit_doc_info, boolean save_comment_nodes, IntList block_kind_stack)
     {
 	    init(cx, origin, emit_doc_info, save_comment_nodes, block_kind_stack);
-        scanner = new Scanner(cx, in, encoding, origin);
+        scanner = new Scanner(cx, in, encoding, origin, save_comment_nodes);
         this.encoding = encoding;
     }
 
@@ -366,7 +370,7 @@
 	public Parser(Context cx, String in, String origin)
 	{
 		init(cx, origin, false, false, null);
-	    scanner = new Scanner(cx, in, origin);
+	    scanner = new Scanner(cx, in, origin, false);
 	}
 
 	public Parser(Context cx, String in, String origin, boolean emit_doc_info, boolean save_comment_nodes)
@@ -377,14 +381,23 @@
 	public Parser(Context cx, String in, String origin, boolean emit_doc_info, boolean save_comment_nodes, IntList block_kind_stack)
 	{
 		init(cx, origin, emit_doc_info, save_comment_nodes, block_kind_stack);
-	    scanner = new Scanner(cx, in, origin);
+	    scanner = new Scanner(cx, in, origin, save_comment_nodes);
 	}
 
     public Parser(Context cx, String in, String origin, boolean emit_doc_info, boolean save_comment_nodes, IntList block_kind_stack, boolean is_include)
     {
         this(cx, in, origin, emit_doc_info, save_comment_nodes, block_kind_stack);
         this.parsing_include = is_include;
+    }
 
+    /**
+     * This contructor is used by Flex direct AST generation.  It
+     * allows Flex to pass in a specialized InputBuffer.
+     */
+    public Parser(Context cx, InputBuffer inputBuffer, String origin)
+    {
+        init(cx, origin, false, false, null);
+        scanner = new Scanner(cx, inputBuffer);
     }
 
     public boolean newline()
@@ -725,17 +738,17 @@
         if (lookahead(GET_TOKEN))
         {
             match(GET_TOKEN);
-            result = nodeFactory.identifier("get",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(GET,false,ctx.input.positionOfMark());
         }
         else if (lookahead(SET_TOKEN))
         {
             match(SET_TOKEN);
-            result = nodeFactory.identifier("set",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(SET,false,ctx.input.positionOfMark());
         }
         else if (lookahead(NAMESPACE_TOKEN))
         {
             match(NAMESPACE_TOKEN);
-            result = nodeFactory.identifier("namespace",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(NAMESPACE,false,ctx.input.positionOfMark());
         }
         else
         {
@@ -768,27 +781,27 @@
         if (lookahead(DEFAULT_TOKEN))
         {
             match(DEFAULT_TOKEN);
-            result = nodeFactory.identifier("default",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(DEFAULT,false,ctx.input.positionOfMark());
         }
         else if (lookahead(GET_TOKEN))
         {
             match(GET_TOKEN);
-            result = nodeFactory.identifier("get",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(GET,false,ctx.input.positionOfMark());
         }
         else if (lookahead(SET_TOKEN))
         {
             match(SET_TOKEN);
-            result = nodeFactory.identifier("set",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(SET,false,ctx.input.positionOfMark());
         }
         else if (lookahead(NAMESPACE_TOKEN))
         {
             match(NAMESPACE_TOKEN);
-            result = nodeFactory.identifier("namespace",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(NAMESPACE,false,ctx.input.positionOfMark());
         }
         else if (HAS_WILDCARDSELECTOR && lookahead(MULT_TOKEN))
         {
             match(MULT_TOKEN);
-            result = nodeFactory.identifier("*",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(ASTERISK,false,ctx.input.positionOfMark());
         }
         else
         {
@@ -821,17 +834,17 @@
         if (lookahead(PUBLIC_TOKEN))
         {
             match(PUBLIC_TOKEN);
-            result = nodeFactory.identifier("public",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PUBLIC,false,ctx.input.positionOfMark());
         }
         else if (lookahead(PRIVATE_TOKEN))
         {
             match(PRIVATE_TOKEN);
-            result = nodeFactory.identifier("private",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PRIVATE,false,ctx.input.positionOfMark());
         }
         else if (lookahead(PROTECTED_TOKEN))
         {
             match(PROTECTED_TOKEN);
-            result = nodeFactory.identifier("protected",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PROTECTED,false,ctx.input.positionOfMark());
         }
         else
         {
@@ -1018,17 +1031,17 @@
         else if (lookahead(PRIVATE_TOKEN))
         {
             match(PRIVATE_TOKEN);
-            result = nodeFactory.identifier("private",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PRIVATE,false,ctx.input.positionOfMark());
         }
         else if (lookahead(PUBLIC_TOKEN))
         {
             match(PUBLIC_TOKEN);
-            result = nodeFactory.identifier("public",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PUBLIC,false,ctx.input.positionOfMark());
         }
         else if (lookahead(PROTECTED_TOKEN))
         {
             match(PROTECTED_TOKEN);
-            result = nodeFactory.identifier("protected",ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PROTECTED,false,ctx.input.positionOfMark());
         }
         else if (lookahead(NUMBERLITERAL_TOKEN))
         {
@@ -1178,14 +1191,14 @@
             {
                 scanner.exitSlashDivContext();
                 error(kError_Lexical_NoMatchingTag);
-                return nodeFactory.error(ctx.input.positionOfMark()-1,kError_Lexical_NoMatchingTag);
+                return nodeFactory.error(ctx.input.positionOfMark(),kError_Lexical_NoMatchingTag);
             }
             match(XMLTAGSTARTEND_TOKEN); // "</"
             if( lookahead(GREATERTHAN_TOKEN) )
             {
                 if( !is_xmllist )
                 {
-                    ctx.error(ctx.input.positionOfMark()-1,kError_MissingXMLTagName);
+                    ctx.error(ctx.input.positionOfMark(),kError_MissingXMLTagName);
                 }
             }
             else
@@ -2205,7 +2218,7 @@
                 IdentifierNode id = memb.selector.expr instanceof IdentifierNode ? (IdentifierNode) memb.selector.expr : null;
                 if( id != null )
                 {
-                    ctx.error(memb.selector.expr.pos()-1,kError_IllegalPackageReference, id.name);
+                    ctx.error(memb.selector.expr.pos(),kError_IllegalPackageReference, id.name);
                 }
                 memb.selector.is_package = false; // hack, to avoid reporting same error later
             }
@@ -2247,7 +2260,7 @@
                 IdentifierNode ident = memb.selector.expr instanceof IdentifierNode ? (IdentifierNode) memb.selector.expr : null;
                 if( ident != null )
                 {
-                    ctx.error(memb.selector.expr.pos()-1,kError_IllegalPackageReference, ident.name);
+                    ctx.error(memb.selector.expr.pos(),kError_IllegalPackageReference, ident.name);
                     memb.selector.is_package = false; // to avoid redundant errors
                 }
             }
@@ -2263,7 +2276,7 @@
                 IdentifierNode ident = memb.selector.expr instanceof IdentifierNode ? (IdentifierNode) memb.selector.expr : null;
                 if( ident != null )
                 {
-                    ctx.error(memb.selector.expr.pos()-1,kError_IllegalPackageReference, ident.name);
+                    ctx.error(memb.selector.expr.pos(),kError_IllegalPackageReference, ident.name);
                 }
             }
 */
@@ -2450,7 +2463,7 @@
                 IdentifierNode ident = memb.selector.expr instanceof IdentifierNode ? (IdentifierNode) memb.selector.expr : null;
                 if( ident != null )
                 {
-                    ctx.error(memb.selector.expr.pos()-1,kError_IllegalPackageReference, ident.name);
+                    ctx.error(memb.selector.expr.pos(),kError_IllegalPackageReference, ident.name);
                 }
             }
 */
@@ -2555,7 +2568,7 @@
             {
                 scanner.enterSlashRegExpContext();
                 match(LEFTPAREN_TOKEN);
-                result = nodeFactory.filterOperator(first,parseListExpression(allowIn_mode),first.pos()-1);
+                result = nodeFactory.filterOperator(first,parseListExpression(allowIn_mode),first.pos());
                 match(RIGHTPAREN_TOKEN);
                 scanner.exitSlashRegExpContext();
             }
@@ -5811,33 +5824,33 @@
         {
             if( node.hasAttribute("private") )
             {
-                ctx.error(node.pos()-1, kError_InvalidPrivate);
+                ctx.error(node.pos(), kError_InvalidPrivate);
             }
             else
             if( node.hasAttribute("protected") )
             {
-                ctx.error(node.pos()-1, kError_InvalidProtected);
+                ctx.error(node.pos(), kError_InvalidProtected);
             }
             else
             if( node.hasAttribute("static") )
             {
-                ctx.error(node.pos()-1, kError_InvalidStatic);
+                ctx.error(node.pos(), kError_InvalidStatic);
             }
             else
             if( block_kind_stack.last() != PACKAGE_TOKEN && block_kind_stack.last() != EMPTY_TOKEN && node.hasAttribute("internal") )
             {
-                ctx.error(node.pos()-1, kError_InvalidInternal);
+                ctx.error(node.pos(), kError_InvalidInternal);
             }
             else
             if( block_kind_stack.last() != PACKAGE_TOKEN && node.hasAttribute("public") )
             {
-                ctx.error(node.pos()-1, kError_InvalidPublic);
+                ctx.error(node.pos(), kError_InvalidPublic);
             }
         }
 
         if( node.hasAttribute("prototype") )
         {
-            ctx.error(node.pos()-1,kError_PrototypeIsAnInvalidAttribute);
+            ctx.error(node.pos(),kError_PrototypeIsAnInvalidAttribute);
         }
 
         return node.hasAttribute("static") ||
@@ -5919,7 +5932,7 @@
         else if (lookahead(PRIVATE_TOKEN))
         {
             match(PRIVATE_TOKEN);
-            result = nodeFactory.identifier("private", ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PRIVATE, false, ctx.input.positionOfMark());
             if (lookahead(DOUBLECOLON_TOKEN))
             {
                 match(DOUBLECOLON_TOKEN);
@@ -5929,7 +5942,7 @@
         else if (lookahead(PROTECTED_TOKEN))
         {
             match(PROTECTED_TOKEN);
-            result = nodeFactory.identifier("protected", ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PROTECTED, false, ctx.input.positionOfMark());
             if (lookahead(DOUBLECOLON_TOKEN))
             {
                 match(DOUBLECOLON_TOKEN);
@@ -5939,7 +5952,7 @@
         else if (lookahead(PUBLIC_TOKEN))
         {
             match(PUBLIC_TOKEN);
-            result = nodeFactory.identifier("public", ctx.input.positionOfMark());
+            result = nodeFactory.identifier(PUBLIC, false, ctx.input.positionOfMark());
             if (lookahead(DOUBLECOLON_TOKEN))
             {
                 match(DOUBLECOLON_TOKEN);
@@ -6205,7 +6218,7 @@
             {
                 match(MULT_TOKEN);
                 if (ctx.scriptAssistParsing){
-                	second = nodeFactory.identifier("*");
+                	second = nodeFactory.identifier(ASTERISK, false);
                 }
                 else
                 	second = null;
@@ -6393,7 +6406,7 @@
             match(GET_TOKEN);
             if (lookahead(LEFTPAREN_TOKEN))  // function get(...) {...}
             {
-                result = nodeFactory.functionName(EMPTY_TOKEN, nodeFactory.identifier("get",ctx.input.positionOfMark()));
+                result = nodeFactory.functionName(EMPTY_TOKEN, nodeFactory.identifier(GET,false,ctx.input.positionOfMark()));
             }
             else
             {
@@ -6405,7 +6418,7 @@
             match(SET_TOKEN);
             if (lookahead(LEFTPAREN_TOKEN))  // function set(...) {...}
             {
-                result = nodeFactory.functionName(EMPTY_TOKEN, nodeFactory.identifier("set",ctx.input.positionOfMark()));
+                result = nodeFactory.functionName(EMPTY_TOKEN, nodeFactory.identifier(SET,false,ctx.input.positionOfMark()));
             }
             else
             {
@@ -6648,7 +6661,7 @@
         else
         {
             // error
-            ctx.error(first.pos()-1, kError_Parser_DefinitionOrDirectiveExpected);
+            ctx.error(first.pos(), kError_Parser_DefinitionOrDirectiveExpected);
         }
         
         result = nodeFactory.assignmentExpression(first, ASSIGN_TOKEN, second);
@@ -6895,7 +6908,7 @@
             {
                 match(MULT_TOKEN);
                 if (ctx.scriptAssistParsing)
-                	result = nodeFactory.identifier("*",ctx.input.positionOfMark());
+                	result = nodeFactory.identifier(ASTERISK,false,ctx.input.positionOfMark());
                 else
                 	result = null;
             }
@@ -7400,12 +7413,23 @@
         return result;
     }
     
+    private UseDirectiveNode generateAs3UseDirective(Context ctx)
+    {
+        IdentifierNode as3Identifier = nodeFactory.identifier(AS3, false);
+        Namespaces namespaces = new Namespaces();
+        NamespaceValue namespaceValue = new NamespaceValue();
+        namespaces.add(namespaceValue);
+        ReferenceValue referenceValue = new ReferenceValue(ctx, null, AS3, namespaces);
+        referenceValue.setIsAttributeIdentifier(false);
+        as3Identifier.ref = referenceValue;
+        return nodeFactory.useDirective(null,nodeFactory.memberExpression(null,nodeFactory.getExpression(as3Identifier)));
+    }
+
     /*
      * PackageDefinition
      *     package Block
      *     package PackageName Block
      */
-
     public PackageDefinitionNode parsePackageDefinition()
     {
 
@@ -7436,7 +7460,8 @@
         if (lookahead(LEFTBRACE_TOKEN))
         {
             result = nodeFactory.startPackage(ctx, null, null);
-            Node udn = nodeFactory.useDirective(null,nodeFactory.memberExpression(null,nodeFactory.getExpression(nodeFactory.identifier("AS3"))));
+            Node udn = generateAs3UseDirective(ctx);
+
             result = nodeFactory.finishPackage(ctx, parseBlock());
             if ((ctx.dialect(10) /*|| ctx.dialect(11)*/) && result != null)
         	{
@@ -7447,7 +7472,7 @@
         {
             PackageNameNode first = parsePackageName(false);
             result = nodeFactory.startPackage(ctx, null, first);
-            Node udn = nodeFactory.useDirective(null,nodeFactory.memberExpression(null,nodeFactory.getExpression(nodeFactory.identifier("AS3"))));
+            Node udn = generateAs3UseDirective(ctx);
             result = nodeFactory.finishPackage(ctx, parseBlock());
             if ((ctx.dialect(10) /*|| ctx.dialect(11)*/) && result != null)
             {
@@ -7575,7 +7600,7 @@
         if( !parsing_include )
         {
             config_namespaces.push_back(new HashSet<String>());
-            config_namespaces.last().add("CONFIG");
+            config_namespaces.last().add(CONFIG);
             configs = parseConfigValues();
         }
 
@@ -7613,7 +7638,7 @@
 
         if( (ctx.dialect(10) /*|| ctx.dialect(11)*/) && !parsing_include && second != null )  // don't insert a statement for includes because will screw up metadata parsing
         {
-            Node udn = nodeFactory.useDirective(null,nodeFactory.memberExpression(null,nodeFactory.getExpression(nodeFactory.identifier("AS3"))));
+            Node udn = generateAs3UseDirective(ctx);
             second.items.add(0,udn);
         }
         ProgramNode result = nodeFactory.program(ctx,second,ctx.input.positionOfMark());
@@ -7636,7 +7661,7 @@
             	// Add tool chain added values
             	if( configs != null )
             		result.statements.items.addAll(0, configs.items);
-            	NamespaceDefinitionNode configdef = nodeFactory.configNamespaceDefinition(null, nodeFactory.identifier("CONFIG"), -1);
+            	NamespaceDefinitionNode configdef = nodeFactory.configNamespaceDefinition(null, nodeFactory.identifier(CONFIG, false), -1);
             	// Add the default CONFIG namespace
             	result.statements.items.add(0, configdef);
             }
Index: modules/asc/src/java/macromedia/asc/parser/Scanner.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/Scanner.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/Scanner.java	(working copy)
@@ -16,7 +16,7 @@
  */
 
 package macromedia.asc.parser;
-
+import java.util.concurrent.*;
 import macromedia.asc.util.*;
 import macromedia.asc.embedding.ErrorConstants;
 
@@ -41,73 +41,200 @@
     private ObjectList<Token> tokens;   // vector of token instances.
     private IntList slash_context = new IntList();  // slashdiv_context or slashregexp_context
     private boolean isFirstTokenOnLine;
-    //private Writer err;
+    private boolean save_comments;
     private Context ctx;
 
     public InputBuffer input;
 
+    private static final String[][] rsvd = {
+        {"as"},
+        {"break"},
+        {"case","catch","class","const","continue"},
+        {"default","delete","do"},
+        {"else","extends"},
+        {"false","finally","for","function"},
+        {"get"},
+        {""},//h
+        {"if","implements","import","in","include","instanceof","interface","is"},
+        {""},//j
+        {""},//k
+        {""},//l
+        {""},//m
+        {"namespace","new","null"},
+        {""},//o
+        {"package","private","protected","public"},
+        {""},//q
+        {"return"},
+        {"set","super","switch"},
+        {"this","throw","true","try","typeof"},
+        {"use"},
+        {"var","void"},
+        {"while","with"},
+        {""},//x
+        {""},//y
+        {""}//z
+    };
+    
+    // ??? too fragile...come up with a better way
+    
+    private static final int[][] rsvd_token = {
+        {AS_TOKEN},
+        {BREAK_TOKEN},
+        {CASE_TOKEN,CATCH_TOKEN,CLASS_TOKEN,CONST_TOKEN,CONTINUE_TOKEN},
+        {DEFAULT_TOKEN,DELETE_TOKEN,DO_TOKEN},
+        {ELSE_TOKEN,EXTENDS_TOKEN},
+        {FALSE_TOKEN,FINALLY_TOKEN,FOR_TOKEN,FUNCTION_TOKEN},
+        {GET_TOKEN},
+        {},//h
+        {IF_TOKEN,IMPLEMENTS_TOKEN,IMPORT_TOKEN,IN_TOKEN,INCLUDE_TOKEN,INSTANCEOF_TOKEN,INTERFACE_TOKEN,IS_TOKEN},
+        {},//j
+        {},//k
+        {},//l
+        {},//m
+        {NAMESPACE_TOKEN,NEW_TOKEN,NULL_TOKEN},
+        {},//o
+        {PACKAGE_TOKEN,PRIVATE_TOKEN,PROTECTED_TOKEN,PUBLIC_TOKEN},
+        {},//q
+        {RETURN_TOKEN},
+        {SET_TOKEN,SUPER_TOKEN,SWITCH_TOKEN},
+        {THIS_TOKEN,THROW_TOKEN,TRUE_TOKEN,TRY_TOKEN,TYPEOF_TOKEN},
+        {USE_TOKEN},
+        {VAR_TOKEN,VOID_TOKEN},
+        {WHILE_TOKEN,WITH_TOKEN},
+        {},//x
+        {},//y
+        {}//z
+    };
+    
+    private final int screen_rsvd()
+    {
+        char c;
+        int row;
+        int row_length;
+        int text_length = input.markLength();
+        int i,j;
+        
+        if ( text_length < 2 )
+            return 0;
+        
+        c = input.markCharAt(0);
+        assert(c >= 'a' && c <= 'z');
+        row = (int) c - 'a';
+        assert(row >= 0 && row < rsvd.length);
+        row_length = rsvd[row].length;
+        
+        for (i = 0; i < row_length; i++ )
+        {
+            if ( rsvd[row][i].length() != text_length )
+                continue;
+            
+            for ( j = 1; j < text_length; j++ )
+            {
+                c = input.markCharAt(j);
+                if ( c != rsvd[row][i].charAt(j) )
+                    break;
+            }
+            if ( j == text_length )
+                return rsvd_token[row][i];
+        }
+        return 0;
+    }
+    
+    private static final ConcurrentHashMap<String,Integer> reservedWord;
+    
+    static {
+    	reservedWord = new ConcurrentHashMap<String,Integer>(64);
+    	reservedWord.put("as",AS_TOKEN); // ??? predicated on HAS_ASOPERATOR
+    	reservedWord.put("break",BREAK_TOKEN);
+    	reservedWord.put("case",CASE_TOKEN);
+    	reservedWord.put("catch",CATCH_TOKEN);
+    	reservedWord.put("class",CLASS_TOKEN);
+    	reservedWord.put("const",CONST_TOKEN);
+    	reservedWord.put("continue",CONTINUE_TOKEN);
+    	reservedWord.put("default",DEFAULT_TOKEN);
+    	reservedWord.put("delete",DELETE_TOKEN);
+    	reservedWord.put("do",DO_TOKEN);
+    	reservedWord.put("else",ELSE_TOKEN);
+    	reservedWord.put("extends",EXTENDS_TOKEN);
+    	reservedWord.put("false",FALSE_TOKEN);
+    	reservedWord.put("finally",FINALLY_TOKEN);
+    	reservedWord.put("for",FOR_TOKEN);
+    	reservedWord.put("function",FUNCTION_TOKEN);
+    	reservedWord.put("get",GET_TOKEN);
+    	reservedWord.put("if",IF_TOKEN);
+    	reservedWord.put("implements",IMPLEMENTS_TOKEN);
+    	reservedWord.put("import",IMPORT_TOKEN);
+    	reservedWord.put("in",IN_TOKEN);
+    	reservedWord.put("include",INCLUDE_TOKEN);  
+    	reservedWord.put("instanceof",INSTANCEOF_TOKEN);
+    	reservedWord.put("interface",INTERFACE_TOKEN);
+    	reservedWord.put("is",IS_TOKEN); //??? predicated on HAS_ISOPERATOR
+    	reservedWord.put("namespace",NAMESPACE_TOKEN);
+    	reservedWord.put("new",NEW_TOKEN);
+    	reservedWord.put("null",NULL_TOKEN);
+    	reservedWord.put("package",PACKAGE_TOKEN);
+    	reservedWord.put("private",PRIVATE_TOKEN);
+    	reservedWord.put("protected",PROTECTED_TOKEN);
+    	reservedWord.put("public",PUBLIC_TOKEN);
+    	reservedWord.put("return",RETURN_TOKEN);
+    	reservedWord.put("set",SET_TOKEN);
+    	reservedWord.put("super",SUPER_TOKEN);
+    	reservedWord.put("switch",SWITCH_TOKEN);
+    	reservedWord.put("this",THIS_TOKEN);
+    	reservedWord.put("throw",THROW_TOKEN);
+    	reservedWord.put("true",TRUE_TOKEN);
+    	reservedWord.put("try",TRY_TOKEN);
+    	reservedWord.put("typeof",TYPEOF_TOKEN);
+    	reservedWord.put("use",USE_TOKEN);
+    	reservedWord.put("var",VAR_TOKEN);
+    	reservedWord.put("void",VOID_TOKEN);
+    	reservedWord.put("while",WHILE_TOKEN);
+    	reservedWord.put("with",WITH_TOKEN);
+    }
+    
     /*
      * Scanner constructors.
      */
 
-    private void init(Context cx)
+    private void init(Context cx, boolean save_comments)
     {
         ctx = cx;
-        tokens = new ObjectList<Token>(200);
+        tokens = new ObjectList<Token>(2048);
         state = start_state;
         level = 0;
         slash_context.add(slashregexp_context);
         states = new IntList();
         levels = new IntList();
         slashcontexts = new ObjectList<IntList>();
+        this.save_comments = save_comments;
     }
 
-    public Scanner(Context cx, InputStream in, String encoding, String origin)
+    
+    public Scanner(Context cx, InputStream in, String encoding, String origin){this(cx,in,encoding,origin,true);}
+    public Scanner(Context cx, InputStream in, String encoding, String origin, boolean save_comments)
     {
-        init(cx);
-
+        init(cx,save_comments);
         this.input = new InputBuffer(in, encoding, origin);
         cx.input = this.input;
     }
-
-    public Scanner(Context cx, String in, String origin)
+    
+    public Scanner(Context cx, String in, String origin){this(cx,in,origin,true);}
+    public Scanner(Context cx, String in, String origin, boolean save_comments)
     {
-        init(cx);
-
+        init(cx,save_comments);
         this.input = new InputBuffer(in, origin);
         cx.input = this.input;
     }
-
-    /*
-     * nextchar() --
-     * Get the next character that has lexical significance. If get_unnormalized == false,
-     * WhiteSpace, LineTerminators are normalized to various combinations
-     * of ' ' and '\n'. Unicode format control character are not significant
-     * in the lexical grammar and so are removed from the character stream.
-     * If the end of the input stream is reached, then 0 is returned.
-     * 
-     * TODO: Unicode format control characters may be significant to string literals, and
-     *  thus should be included when get_unnormalized=true.  That requires supporting two
-     *  seperate colPos indicies in InputBuffer, however.  For now, get_unnormalized only
-     *  avoids the normalization of whitespace, allowing us to use the same colPos for both
-     *  the normalized and unnormalized buffers. 
+    
+    /**
+     * nextchar() --just fetch the next char 
      */
 
-    public char nextchar()
+    private char nextchar()
     {
-        return (char) input.nextchar(false);
+        return (char) input.nextchar();
     }
-    public char nextchar(boolean get_unnormalized)
-    {
-        return (char) input.nextchar(get_unnormalized);
-    }
-
-
-    public String lexeme()
-    {
-        return input.copy(); // Copies text since last mark.
-    }
-
+  
     /*
      * retract() --
      * Causes one character of input to be 'put back' onto the
@@ -119,13 +246,28 @@
         input.retract();
     }
 
+    /**
+     * @return +1 from current char pos in InputBuffer
+     */
+    
+    private int pos()
+    {
+        return input.textPos();
+    }
+    
+    /**
+     * set mark position
+     */
+    private void mark()
+    {
+        input.textMark();
+    }
+    
     /*
      * Various helper methods for managing and testing the
      * scanning context for slashes.
      */
 
-
-
     public void enterSlashDivContext()
     {
         slash_context.add(slashdiv_context);
@@ -151,7 +293,7 @@
         return slash_context.last() == slashdiv_context;
     }
 
-    public boolean isSlashRegexpContext()
+    public boolean isSlashRegexpContext()   // ???  this method is not used.
     {
         return slash_context.last() == slashregexp_context;
     }
@@ -162,12 +304,12 @@
      * Return the index of the token which is its identifier.
      */
 
-    public int makeTokenInstance(int token_class, String lexeme)
+    private int makeTokenInstance(int token_class, String lexeme)
     {
         tokens.add(new Token(token_class, lexeme));
         return tokens.size() - 1; /* return the tokenid */
     }
-
+    
     /*
      * getTokenClass() --
      * Get the class of a token instance.
@@ -175,7 +317,6 @@
 
     public int getTokenClass(int token_id)
     {
-
         // if the token id is negative, it is a token_class.
         if (token_id < 0)
         {
@@ -189,12 +330,10 @@
     /*
      * getTokenText() --
      * Get the text of a token instance.
-     *
      */
 
     public String getTokenText(int token_id)
     {
-
         // if the token id is negative, it is a token_class.
         if (token_id < 0)
         {
@@ -210,7 +349,8 @@
      * Get text of literal string token as well as info about whether it was single quoted or not
      *
      */
-    String getStringTokenText( int token_id, boolean[] is_single_quoted )
+    
+    public String getStringTokenText( int token_id, boolean[] is_single_quoted )
     {
         // if the token id is negative, it is a token_class.
         if( token_id < 0 )
@@ -228,27 +368,18 @@
     }
 
     /*
-     * getLinePointer() --
-     * Generate a string that contains a carat character at
-     * a specified position.
-     */
-
-    public String getLinePointer()
-    {
-        return InputBuffer.getLinePointer(0);
-    }
-
-    /*
      * Record an error.
      */
 
-    public void error(int kind, String arg, int tokenid)
+    private void error(int kind, String arg, int tokenid)
     {
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
 
         String origin = this.input.origin;
-        int ln  = this.input.markLn + 1;
-        int col = this.input.markCol;
+        
+        int errPos = input.positionOfMark();    // note use of source adjusted position
+        int ln  = input.getLnNum(errPos);
+        int col = input.getColPos(errPos);
 
         String msg = (ContextStatics.useVerboseErrors ? "[Compiler] Error #" + kind + ": " : "") + ctx.errorString(kind);
         
@@ -261,17 +392,17 @@
         if (nextLoc != -1) // append msg remainder after replacement point, if any
             out.append(msg.substring(nextLoc, msg.length()));
 
-        ctx.localizedError(origin,ln,col,out.toString(),input.getLineText(input.positionOfMark()), kind);
+        ctx.localizedError(origin,ln,col,out.toString(),input.getLineText(errPos), kind);
         skiperror(kind);
     }
 
-    public void error(String msg)
+    private void error(String msg)
     {
         ctx.internalError(msg);
         error(kError_Lexical_General, msg, ERROR_TOKEN);
     }
 
-    public void error(int kind)
+    private void error(int kind)
     {
         error(kind, "", ERROR_TOKEN);
     }
@@ -281,12 +412,12 @@
      * whitespace or end of input.
      */
 
-    public void skiperror()
+    private void skiperror()
     {
         skiperror(kError_Lexical_General);
     }
 
-    public void skiperror(int kind)
+    private void skiperror(int kind)
     {
         //Debugger::trace("skipping error\n");
         switch (kind)
@@ -319,7 +450,7 @@
                 while (true)
                 {
                     char nc = nextchar();
-                    if (nc == ';' || nc == '\n' || nc == 0)
+                    if (nc == ';' || nc == '\n' || nc == '\r' || nc == 0)
                     {
                         return;
                     }
@@ -329,16 +460,7 @@
 
     /*
      *
-     */
-
-    public boolean test_skiperror()
-    {
-        return true;
-    }
-
-    /*
      *
-     *
      */
 
     public boolean followsLineTerminator()
@@ -386,43 +508,54 @@
         slash_context = slashcontexts.removeLast();
     }
 
-    private StringBuffer getDocTextBuffer(String doctagname)
+    private StringBuilder getDocTextBuffer(String doctagname)
     {
-        StringBuffer doctextbuf = new StringBuffer();
+        StringBuilder doctextbuf = new StringBuilder();
         doctextbuf.append("<").append(doctagname).append("><![CDATA[");
         return doctextbuf;
     }
 
-    String getXMLText(int begin, int end)
+    private String getXMLText(int begin, int end)
     {
-        int len = end-begin; 
+        int len = (end-begin)+1; 
 
         String xmltext = null;
         if( len > 0 )
         {
-	        xmltext = input.source(begin,end);
+	        xmltext = input.copy(begin,end);
         }
         return xmltext;
     }
+
+    public void clearUnusedBuffers() {
+     //   input.clearUnusedBuffers();
+        input = null;
+    } 
     
+    /*
+     * 
+     * 
+     */
+
     public int nexttoken(boolean resetState)
     {
+        String xmltagname = null, doctagname = "description";
+        StringBuilder doctextbuf = null;
+        int startofxml = pos();
+        StringBuilder blockcommentbuf = null;
+        char regexp_flags =0; // used to track option flags encountered in a regexp expression.  Initialized in regexp_state
+        boolean maybe_reserved = false;
+
         if (resetState)
         {
             isFirstTokenOnLine = false;
         }
-        String xmltagname = null, doctagname = "description";
-        StringBuffer doctextbuf = null;
-        int startofxml = input.positionOfNext()+1;
-        StringBuffer blockcommentbuf = null;
-        StringBuffer stringliteralbuf = null;
-        char regexp_flags =0; // used to track option flags encountered in a regexp expression.  Initialized in regexp_state
-
+        
         while (true)
         {
             if (debug)
             {
-                System.out.println("state = " + state + ", next = " + input.positionOfNext());
+                System.out.println("state = " + state + ", next = " + pos());
             }
 
             switch (state)
@@ -431,37 +564,123 @@
                 case start_state:
                     {
                         int c = nextchar();
-                        input.mark();
+                        mark();
+                        
                         switch (c)
                         {
+                        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j':
+                        case 'k': case 'l': case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': case 's': case 't':
+                        case 'u': case 'v': case 'w': case 'x': case 'y': case 'z': 
+                            maybe_reserved = true;
+                        case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J':
+                        case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T':
+                        case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z': 
+                        case '_': case '$':
+                            state = A_state;
+                            continue;
+                            
                             case 0xffffffef:
                                 state = utf8sig_state;
                                 continue;
+                                
                             case '@':
-                                state = start_state;
                                 return AMPERSAND_TOKEN;
+                              
                             case '\'':
-                                stringliteralbuf = new StringBuffer();
-                                stringliteralbuf.append((char)c);
-                                state = singlequote_state;
-                                continue;
                             case '\"':
-                                stringliteralbuf = new StringBuffer();
-                                stringliteralbuf.append((char)c);
-                                state = doublequote_state;
-                                continue;
-                            case '-':
-                                state = minus_state;
-                                continue;
-                            case '!':
-                                state = not_state;
-                                continue;
-                            case '%':
-                                state = remainder_state;
-                                continue;
-                            case '&':
-                                state = and_state;
-                                continue;
+                            {
+                                char startquote = (char) c;
+                                boolean needs_escape = false;
+
+                                while ( (c=nextchar()) != startquote )
+                                {         
+                                    if ( c == '\\' )
+                                    {
+                                        needs_escape = true;
+                                        c = nextchar();
+
+                                        // special case: escaped eol strips crlf or lf
+                                         
+                                        if ( c  == '\r' )
+                                            c = nextchar();
+                                        if ( c == '\n' )
+                                            continue;
+                                    }
+                                    else if ( c == '\r' || c == '\n' )
+                                    {
+                                        if ( startquote == '\'' )
+                                            error(kError_Lexical_LineTerminatorInSingleQuotedStringLiteral);
+                                        else
+                                            error(kError_Lexical_LineTerminatorInDoubleQuotedStringLiteral);
+                                        break;
+                                    }
+                                    else if ( c == 0 )
+                                    {
+                                        error(kError_Lexical_EndOfStreamInStringLiteral);
+                                        return EOS_TOKEN;
+                                    }
+                                }
+                                return makeTokenInstance(STRINGLITERAL_TOKEN, input.copy(needs_escape));
+                            }
+
+                            case '-':   // tokens: -- -= -
+                                switch (nextchar())
+                                {
+                                    case '-':
+                                        return MINUSMINUS_TOKEN;
+                                    case '=':
+                                        return MINUSASSIGN_TOKEN;
+                                    default:
+                                        retract();
+                                        return MINUS_TOKEN;
+                                }
+                                
+                            case '!':   // tokens: ! != !===
+                                switch (nextchar())
+                                {
+                                    case '=':
+                                        switch (nextchar())
+                                        {
+                                            case '=':
+                                                return STRICTNOTEQUALS_TOKEN;
+                                            default:
+                                                retract();
+                                                return NOTEQUALS_TOKEN;
+                                        }
+                                    default:
+                                        retract();
+                                        return NOT_TOKEN;
+                                }
+                                
+                            case '%':   // tokens: % %=
+                                switch (nextchar())
+                                {
+                                    case '=':
+                                        return MODULUSASSIGN_TOKEN;
+                                    default:
+                                        retract();
+                                        return MODULUS_TOKEN;
+                                }
+                                
+                            case '&':   // tokens: & &= && &&=
+                                switch (nextchar())
+                                {
+                                    case '&':
+                                        switch (nextchar())
+                                        {
+                                            case '=':
+                                                return LOGICALANDASSIGN_TOKEN;
+                                            default:
+                                                retract();
+                                                return LOGICALAND_TOKEN;
+                                        }
+                                    case '=':
+                                        return BITWISEANDASSIGN_TOKEN;
+                                    default:
+                                        retract();
+                                        return BITWISEAND_TOKEN;
+                                }
+                                
                             case '#':
                                 if (HAS_HASHPRAGMAS)
                                 {
@@ -472,182 +691,150 @@
                                     state = error_state;
                                     continue;
                                 }  // # is short for use
+                                
                             case '(':
-                                state = start_state;
                                 return LEFTPAREN_TOKEN;
+                                
                             case ')':
-                                state = start_state;
                                 return RIGHTPAREN_TOKEN;
-                            case '*':
-                                state = star_state;
-                                continue;
+                                
+                            case '*':   // tokens: *=  *
+                                switch (nextchar())
+                                {
+                                    case '=':
+                                        return MULTASSIGN_TOKEN;
+                                    default:
+                                        retract();
+                                        return MULT_TOKEN;
+                                }
+
                             case ',':
-                                state = start_state;
                                 return COMMA_TOKEN;
+                                
                             case '.':
                                 state = dot_state;
                                 continue;
+                                
                             case '/':
                                 state = slash_state;
                                 continue;
-                            case ':':
-                                state = colon_state;
-                                continue;
+
+                            case ':':   // tokens: : ::
+                                switch (nextchar())
+                                {
+                                    case ':':
+                                        return DOUBLECOLON_TOKEN;
+                                    default:
+                                        retract();
+                                        return COLON_TOKEN;
+                                }
+                             
                             case ';':
-                                state = start_state;
                                 return SEMICOLON_TOKEN;
+                                
                             case '?':
-                                state = start_state;
                                 return QUESTIONMARK_TOKEN;
+                                
                             case '[':
-                                state = start_state;
                                 return LEFTBRACKET_TOKEN;
+                                
                             case ']':
-                                state = start_state;
                                 return RIGHTBRACKET_TOKEN;
+                                
                             case '^':
                                 state = bitwisexor_state;
                                 continue;
+                                
                             case '{':
-                                state = start_state;
                                 return LEFTBRACE_TOKEN;
-                            case '|':
-                                state = or_state;
-                                continue;
+                                
+                            case '|':   // tokens: | |= || ||=
+                                switch (nextchar())
+                                {
+                                    case '|':
+                                        switch (nextchar())
+                                        {
+                                            case '=':
+                                                return LOGICALORASSIGN_TOKEN;
+                                            default:
+                                                retract();
+                                                return LOGICALOR_TOKEN;
+                                        }
+                                    case '=':
+                                        return BITWISEORASSIGN_TOKEN;
+                                    default:
+                                        retract();
+                                        return BITWISEOR_TOKEN;
+                                }
+                                
                             case '}':
-                                state = start_state;
                                 return RIGHTBRACE_TOKEN;
+                                
                             case '~':
-                                state = start_state;
                                 return BITWISENOT_TOKEN;
-                            case '+':
-                                state = plus_state;
-                                continue;
+                                
+                            case '+':   // tokens: ++ += +
+                                switch (nextchar())
+                                {
+                                    case '+':
+                                        return PLUSPLUS_TOKEN;
+                                    case '=':
+                                        return PLUSASSIGN_TOKEN;
+                                    default:
+                                        retract();
+                                        return PLUS_TOKEN;
+                                }
+                                
                             case '<':
                                 state = lessthan_state;
                                 continue;
-                            case '=':
-                                state = equal_state;
-                                continue;
+                                
+                            case '=':   // tokens: === == =
+                                switch (nextchar())
+                                {
+                                    case '=':                            
+                                        switch (nextchar())
+                                        {
+                                            case '=':
+                                                return STRICTEQUALS_TOKEN;
+                                            default:
+                                                retract();
+                                                return EQUALS_TOKEN;
+                                        }
+                                    default:
+                                        retract();
+                                        return ASSIGN_TOKEN;
+                                }
+                                
                             case '>':
                                 state = greaterthan_state;
-                                continue;
-                            case 'a':
-                                state = a_state;
-                                continue;
-                            case 'b':
-                                state = b_state;
-                                continue;
-                            case 'c':
-                                state = c_state;
-                                continue;
-                            case 'd':
-                                state = d_state;
-                                continue;
-                            case 'e':
-                                state = e_state;
-                                continue;
-                            case 'f':
-                                state = f_state;
-                                continue;
-                            case 'g':
-                                state = g_state;
-                                continue;
-                            case 'i':
-                                state = i_state;
-                                continue;
-                            case 'l':
-                                state = l_state;
-                                continue;
-                            case 'n':
-                                state = n_state;
-                                continue;
-                            case 'p':
-                                state = p_state;
-                                continue;
-                            case 'r':
-                                state = r_state;
-                                continue;
-                            case 's':
-                                state = s_state;
-                                continue;
-                            case 't':
-                                state = t_state;
-                                continue;
-                            case 'u':
-                                state = u_state;
-                                continue;
-                            case 'v':
-                                state = v_state;
-                                continue;
-                            case 'w':
-                                state = w_state;
-                                continue;
-                            case 'x':
-                                state = x_state;
-                                continue;
-                            case 'A':
-                            case 'B':
-                            case 'C':
-                            case 'D':
-                            case 'E':
-                            case 'F':
-                            case 'G':
-                            case 'H':
-                            case 'h':
-                            case 'I':
-                            case 'J':
-                            case 'j':
-                            case 'K':
-                            case 'k':
-                            case 'L':
-                            case 'M':
-                            case 'm':
-                            case 'N':
-                            case 'O':
-                            case 'o':
-                            case 'P':
-                            case 'Q':
-                            case 'q':
-                            case 'R':
-                            case 'S':
-                            case 'T':
-                            case 'U':
-                            case 'V':
-                            case 'W':
-                            case 'X':
-                            case 'Y':
-                            case 'y':
-                            case 'Z':
-                            case 'z':
-                            case '$':
-                            case '_':
-                                state = A_state;
-                                continue;
+                                continue;            
+                                
                             case '0':
                                 state = zero_state;
                                 continue;
-                            case '1':
-                            case '2':
-                            case '3':
-                            case '4':
-                            case '5':
-                            case '6':
-                            case '7':
-                            case '8':
-                            case '9':
+                                
+                            case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
                                 state = decimalinteger_state;
                                 continue;
-                            case ' ':
-                                state = start_state;
+                                
+                            case ' ': // White space
+                            case 0x0009:
+                            case 0x000b:
+                            case 0x000c:
+                            case 0x00a0:
                                 continue;
-                            case '\n':
-                                state = start_state;
+                                
+                            case '\n': // Line terminators.
+                            case '\r':
+                            case 0x2028:
+                            case 0x2029:
                                 isFirstTokenOnLine = true;
                                 continue;
+                                
                             case 0:
-                                state = start_state;
                                 return EOS_TOKEN;
+                                
                             default:
                                 switch (input.classOfNext())
                                 {
@@ -657,6 +844,7 @@
                                     case Lm:
                                     case Lo:
                                     case Nl:
+                                        maybe_reserved = false;
                                         state = A_state;
                                         continue;
                                     default:
@@ -666,252 +854,75 @@
                         }
                     }
 
-                    /*
-                     * prefix: <letter>
-                     */
+                /*
+                 * prefix: <letter>
+                 */
 
                 case A_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
+               
+                    while ( true ){
+                        int c = nextchar();
+                        if ( c >= 'a' && c <= 'z' )
+                        {
                             continue;
-                        case 0:
-                        case ' ':
-                        case '\n':
-                        default:
-                            switch (input.classOfNext())
-                            {
-                                case Lu:
-                                case Ll:
-                                case Lt:
-                                case Lm:
-                                case Lo:
-                                case Nl:
-                                case Mn:
-                                case Mc:
-                                case Nd:
-                                case Pc:
-                                    state = A_state;
-                                    continue;
-                                default:
-                                    retract();
-                                    state = start_state;
-                                    return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                            }
-                    }
-
-                    /*
-                     * prefix: <eol>
-                     */
-
-                case eol_state:
-                    isFirstTokenOnLine = true;
-                    switch (nextchar())
-                    {
-                        case '\n':
-                            System.err.println("eating eol");
-                            state = eol_state;
-                            continue; /* eat extra eols */
-                        default:
-                            System.err.println("returning eol");
-                            state = start_state; /*first = input.positionOfNext();*/
-                            retract();
-                            state = start_state;
+                        }
+                        if ( (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '$' || c == '_' ){
+                            maybe_reserved = false;
                             continue;
-                    }
+                        }
+                        if ( c == 0 )
+                        {
+                            break;
+                        }
 
-                    /*
-                     * prefix: '
-                     */
-
-                case singlequote_state:
-                {
-                    int c = nextchar(true /*get unnormalized*/);
-                    // string literals can span multiple lines, which InputBuffer doesn't handle
-                    //  copy all characters in the string literal into a local buffer instead.
-                    stringliteralbuf.append((char)c);
-
-                    switch (c)
-                    {
-                        case '\'':
-                            state = start_state;
-                            return makeTokenInstance(STRINGLITERAL_TOKEN, input.escapeString(stringliteralbuf, 0, stringliteralbuf.length()-1) );
-                        case '\\':
-                            c = nextchar(true /*get unnormalized*/);
-                            if (c == '\r') // escaped newline is the line continuation character.  Continue string with input from next line.
-                            {
-                                c = nextchar(true /*get unnormalized*/);
-                                if (c != '\n')
-                                    stringliteralbuf.deleteCharAt(stringliteralbuf.length()-1);
-                            }
-                            if (c == '\n') // escaped newline (or escacped CR,NL) is the line continuation character.  Continue string with input from next line.
-                            {
-                                stringliteralbuf.deleteCharAt(stringliteralbuf.length()-1);
-                                c = nextchar(true /*get unnormalized*/);
-                            }
-                            stringliteralbuf.append((char)c); 
-                            state = singlequote_state;
+                        switch (input.classOfNext())
+                        {
+                        case Lu: case Ll: case Lt: case Lm: case Lo: case Nl: case Mn: case Mc: case Nd: case Pc:
+                            maybe_reserved = false;
                             continue;
-                        case '\n':
-                            error(kError_Lexical_LineTerminatorInSingleQuotedStringLiteral);
-                            state = start_state;
-                            continue;
-                        case 0:
-                            error(kError_Lexical_EndOfStreamInStringLiteral);
-                            state = start_state;
-                            return EOS_TOKEN;
-                        default:
-                            state = singlequote_state;
-                            continue;
+                        }
+                        break;
                     }
-                }
-
-                    /*
-                     * prefix: "
-                     */
-
-                case doublequote_state:
-                {
-                    int c = nextchar(true /*get unnormalized*/);
-                    // string literals can span multiple lines, which InputBuffer doesn't handle
-                    //  copy all characters in the string literal into a local buffer instead.
-                    stringliteralbuf.append((char)c);
-
-                    switch (c)
+                    retract();
+                    state = start_state;   
+                    String s = input.copy(); 
+                    if ( maybe_reserved )
                     {
-                        case '\"':
-                            state = start_state;
-                            return makeTokenInstance(STRINGLITERAL_TOKEN, input.escapeString(stringliteralbuf, 0, stringliteralbuf.length()-1));
-                            // case '\\': error(kError_Lexical_BackSlashInDoubleQuotedString); state = start_state; continue;
-                        case '\\':
-                            c = nextchar(true /*get unnormalized*/);
-                            if (c == '\r') // escaped newline is the line continuation character.  Continue string with input from next line.
-                            {
-                                c = nextchar(true /*get unnormalized*/);
-                                if (c != '\n')
-                                    stringliteralbuf.deleteCharAt(stringliteralbuf.length()-1);
-                            }
-                            if (c == '\n') // escaped newline (or escaped CR,NL) is the line continuation character.  Continue string with input from next line.
-                            {
-                                stringliteralbuf.deleteCharAt(stringliteralbuf.length()-1);
-                                c = nextchar(true /*get unnormalized*/);
-                            }
-                            stringliteralbuf.append((char)c); 
-                            state = doublequote_state;
-                            continue;
-                        case '\n':
-                            error(kError_Lexical_LineTerminatorInDoubleQuotedStringLiteral);
-                            state = start_state;
-                            continue;
-                        case 0:
-                            error(kError_Lexical_EndOfStreamInStringLiteral);
-                            state = start_state;
-                            return EOS_TOKEN;
-                        default:
-                            state = doublequote_state;
-                            continue;
+                        Integer i = reservedWord.get(s); 
+                        if ( i != null )
+                            return (int) i;
+
+                        //int r = screen_rsvd();
+                        //if ( r != 0 )
+                        //    return r;
                     }
-                }
-                    /*
-                     * prefix: 0
-                     * accepts: 0x... | 0X... | 01... | 0... | 0
-                     */
+                    //String s = input.copy(); 
+                    return makeTokenInstance(IDENTIFIER_TOKEN,s);
+               
+                /*
+                 * prefix: 0
+                 * accepts: 0x... | 0X... | 01... | 0... | 0
+                 */
 
                 case zero_state:
                     switch (nextchar())
                     {
                         case 'x':
                         case 'X':
-                        switch(nextchar()) // check that first character is legal
+                            switch(nextchar())
                             {
-                                case '0': case '1': case '2': case '3': 
-                                 case '4': case '5': case '6': case '7': 
-                                 case '8': case '9': case 'a': case 'b': 
-                                 case 'c': case 'd': case 'e': case 'f':
-                                 case 'A': case 'B': case 'C': case 'D': 
-                                 case 'E': case 'F':
-                                     retract();
-                                    state = hexinteger_state; 
-                                    continue;
-                                default:
-                                     error(kError_Lexical_General); 
-                                    state = start_state; 
-                                    continue;
+                            case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
+                            case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'A': case 'B': case 'C': case 'D': 
+                            case 'E': case 'F':
+                                state = hexinteger_state;
+                                break;
+                            default:
+                                state = start_state;
+                                error(kError_Lexical_General); 
                             }
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
+                            continue;
+  
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
                         case '.':
                             state = decimalinteger_state;
                             continue;
@@ -933,28 +944,9 @@
                 case hexinteger_state:
                     switch (nextchar())
                     {
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                        case 'a':
-                        case 'b':
-                        case 'c':
-                        case 'd':
-                        case 'e':
-                        case 'f':
-                        case 'A':
-                        case 'B':
-                        case 'C':
-                        case 'D':
-                        case 'E':
-                        case 'F':
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
+                        case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'A': case 'B': case 'C': case 'D': 
+                        case 'E': case 'F':
                             state = hexinteger_state;
                             continue;
                         default:  
@@ -971,16 +963,7 @@
                 case dot_state:
                     switch (nextchar())
                     {
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
                             state = decimal_state;
                             continue;
                         case '.':
@@ -997,17 +980,13 @@
                      */
 
                 case doubledot_state:
-                    switch (nextchar())
-                    {
-                        case '.':
-                            state = start_state;
+                    state = start_state;
+                    if ( nextchar() == '.' )
                             return TRIPLEDOT_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return DOUBLEDOT_TOKEN;
-                    }
 
+                    retract();
+                    return DOUBLEDOT_TOKEN;
+
                     /*
                      * prefix: N
                      * accepts: 0.123 | 1.23 | 123 | 1e23 | 1e-23
@@ -1016,16 +995,7 @@
                 case decimalinteger_state:
                     switch (nextchar())
                     {
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
                             state = decimalinteger_state;
                             continue;
                         case '.':
@@ -1049,16 +1019,7 @@
                 case decimal_state:
                     switch (nextchar())
                     {
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
                             state = decimal_state;
                             continue;
                         case 'E':
@@ -1079,16 +1040,7 @@
                 case exponentstart_state:
                     switch (nextchar())
                     {
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
                         case '+':
                         case '-':
                             state = exponent_state;
@@ -1108,16 +1060,7 @@
                 case exponent_state:
                     switch (nextchar())
                     {
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
+                        case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': 
                             state = exponent_state;
                             continue;
                         default:
@@ -1127,125 +1070,6 @@
                     }
 
                     /*
-                     * tokens: --  -=  -
-                     */
-
-                case minus_state:
-                    switch (nextchar())
-                    {
-                        case '-':
-                            state = start_state;
-                            return MINUSMINUS_TOKEN;
-                        case '=':
-                            state = start_state;
-                            return MINUSASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return MINUS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: !
-                     */
-
-                case not_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = notequals_state;
-                            continue;
-                        default:
-                            retract();
-                            state = start_state;
-                            return NOT_TOKEN;
-                    }
-
-                    /*
-                     * prefix: !=
-                     */
-
-                case notequals_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return STRICTNOTEQUALS_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return NOTEQUALS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: %
-                     * tokens: %= %
-                     */
-
-                case remainder_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return MODULUSASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return MODULUS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: &
-                     */
-
-                case and_state:
-                    switch (nextchar())
-                    {
-                        case '&':
-                            state = logicaland_state;
-                            continue;
-                        case '=':
-                            state = start_state;
-                            return BITWISEANDASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return BITWISEAND_TOKEN;
-                    }
-
-                    /*
-                     * prefix: &&
-                     */
-
-                case logicaland_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return LOGICALANDASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return LOGICALAND_TOKEN;
-                    }
-
-                    /*
-                     * tokens: *=  *
-                     */
-
-                case star_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return MULTASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return MULT_TOKEN;
-                    }
-
-                    /*
                      * prefix: /
                      */
 
@@ -1253,18 +1077,17 @@
                     switch (nextchar())
                     {
                         case '/':
-                            if (blockcommentbuf == null) blockcommentbuf = new StringBuffer();
+                            if (blockcommentbuf == null) blockcommentbuf = new StringBuilder();
                             state = linecomment_state;
                             continue;
                         case '*':
-                            if (blockcommentbuf == null) blockcommentbuf = new StringBuffer();
+                            if (blockcommentbuf == null) blockcommentbuf = new StringBuilder();
                             blockcommentbuf.append("/*");
                             state = blockcommentstart_state;
                             continue;
                         default:
                         {
-                            retract(); /* since we didn't use the current character
-                                        for this decision. */
+                            retract(); // since we didn't use the current character for this decision.
                             if (isSlashDivContext())
                             {
                                 state = slashdiv_state;
@@ -1282,37 +1105,19 @@
                      */
 
                 case slashdiv_state:
+                    state = start_state; 
                     switch (nextchar())
                     {
                         case '>':
-                            state = start_state; 
                             return XMLTAGENDEND_TOKEN;
                         case '=':
-                            state = start_state;
                             return DIVASSIGN_TOKEN;
                         default:
                             retract();
-                            state = start_state;
                             return DIV_TOKEN;
                     }
 
                     /*
-                     * tokens: : ::
-                     */
-
-                case colon_state:
-                    switch (nextchar())
-                    {
-                        case ':':
-                            state = start_state;
-                            return DOUBLECOLON_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return COLON_TOKEN;
-                    }
-
-                    /*
                      * tokens: /<regexpbody>/<regexpflags>
                      */
 
@@ -1328,6 +1133,7 @@
                             continue;
                         case 0:
                         case '\n':
+                        case '\r':
                             error(kError_Lexical_General);
                             state = start_state;
                             continue;
@@ -1457,13 +1263,11 @@
                         error(kError_Lexical_General); 
                         state = start_state; 
                         continue;
-                    case 0: 
-                    case ' ': 
-                    case '\n': 
+                        
                     default: 
                         retract(); 
                         state = start_state; 
-                        return makeTokenInstance( REGEXPLITERAL_TOKEN, input.copyWithoutInterpretingEscapedChars() );
+                        return makeTokenInstance( REGEXPLITERAL_TOKEN, input.copy(false) );
                 }
                     /*
                      * tokens: ^^ ^^= ^=  ^
@@ -1503,61 +1307,6 @@
                     }
 
                     /*
-                     * prefix: |
-                     */
-
-                case or_state:
-                    switch (nextchar())
-                    {
-                        case '|':
-                            state = logicalor_state;
-                            continue;
-                        case '=':
-                            state = start_state;
-                            return BITWISEORASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return BITWISEOR_TOKEN;
-                    }
-
-                    /*
-                     * prefix: ||
-                     */
-
-                case logicalor_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return LOGICALORASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return LOGICALOR_TOKEN;
-                    }
-
-                    /*
-                     * tokens: ++  += +
-                     */
-
-                case plus_state:
-                    switch (nextchar())
-                    {
-                        case '+':
-                            state = start_state;
-                            return PLUSPLUS_TOKEN;
-                        case '=':
-                            state = start_state;
-                            return PLUSASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return PLUS_TOKEN;
-                    }
-
-
-                    /*
                      * prefix: <
                      */
 
@@ -1608,8 +1357,9 @@
                     }
 
                 /*
-                    * prefix: <!
-                */
+                 * prefix: <!
+                 */
+                    
                 case xmlcommentorcdatastart_state:
                     switch ( nextchar() )        
                     {
@@ -1678,7 +1428,7 @@
                         case '>':  
                         {
                             state = start_state;
-                            return makeTokenInstance(XMLMARKUP_TOKEN,getXMLText(startofxml,input.positionOfNext()+1));
+                            return makeTokenInstance(XMLMARKUP_TOKEN,getXMLText(startofxml,pos()-1));
                         }
                         default:   state = xmlcdata_state; continue;
                     }
@@ -1710,7 +1460,7 @@
                         case '>':  
                         {
                             state = start_state;
-                            return makeTokenInstance(XMLMARKUP_TOKEN,getXMLText(startofxml,input.positionOfNext()+1));
+                            return makeTokenInstance(XMLMARKUP_TOKEN,getXMLText(startofxml,pos()-1));
                         }
                         default:   error(kError_Lexical_General); state = start_state; continue;
                     }
@@ -1729,7 +1479,7 @@
                         case '>':  
                         {
                             state = start_state;
-                            return makeTokenInstance(XMLMARKUP_TOKEN,getXMLText(startofxml,input.positionOfNext()+1));
+                            return makeTokenInstance(XMLMARKUP_TOKEN,getXMLText(startofxml,pos()-1));
                         }
                         default:   error(kError_Lexical_General); state = start_state; continue;
                     }
@@ -1740,7 +1490,7 @@
                         case '<': case '{':  
                         {
                             retract();
-                            String xmltext = getXMLText(startofxml,input.positionOfNext()+1);
+                            String xmltext = getXMLText(startofxml,pos()-1);
                             if( xmltext != null )
                             {
                                 state = start_state;
@@ -1758,12 +1508,19 @@
                                         case '?': state = xmlpi_state; continue;
                                         default: retract(); state = start_state; return LESSTHAN_TOKEN;
                                     }
-                                    case '{': state = start_state; return LEFTBRACE_TOKEN;
+                                    case '{': 
+                                        state = start_state; 
+                                        return LEFTBRACE_TOKEN;
                                 }
                             }
                         }
-                        case 0:   state = start_state; return EOS_TOKEN;
-                        default:  state = xmltext_state; continue;
+                        case 0:   
+                            state = start_state; 
+                            return EOS_TOKEN;
+                            
+                        default:  
+                            state = xmltext_state; 
+                        continue;
                     }
                 }
 
@@ -1772,7 +1529,7 @@
                     {
                         case '{':  // return XMLPART_TOKEN
                             {
-	                            String xmltext = input.source(startofxml, input.positionOfNext());
+	                            String xmltext = input.copy(startofxml, pos()-2);
                                 return makeTokenInstance(XMLPART_TOKEN, xmltext);
                             }
                         case '<':
@@ -1781,13 +1538,13 @@
                                 case '/':
                                     --level;
                                     nextchar();
-                                    input.mark();
+                                    mark();
                                     retract();
                                     state = endxmlname_state;
                                     continue;
                                 default:
                                     ++level;
-                                    state = xmlliteral_state; /*first = input.positionOfNext();*/
+                                    state = xmlliteral_state;
                                     continue;
                             }
                         case '/':
@@ -1799,7 +1556,7 @@
                                             --level;
                                             if (level == 0)
                                             {
-	                                            String xmltext = input.source(startofxml, input.positionOfNext() + 2);
+	                                            String xmltext = input.copy(startofxml, pos());
                                                 state = start_state;
                                                 return makeTokenInstance(XMLLITERAL_TOKEN, xmltext);
                                             }
@@ -1817,6 +1574,7 @@
                             error(kError_Lexical_NoMatchingTag);
                             state = start_state;
                             continue;
+                            
                         default:
                             continue;
                     }
@@ -1824,18 +1582,12 @@
                 case endxmlname_state:  // scan name and compare it to start name
                     switch (nextchar())
                     {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
+                        case 'A': case 'a':
+                        case 'B': case 'b':
+                        case 'C': case 'c':
+                        case 'D': case 'd':
+                        case 'E': case 'e':
+                        case 'F': case 'f':
                         case 'G':
                         case 'g':
                         case 'H':
@@ -1909,7 +1661,7 @@
                                 {
                                     xmltagname = null;
                                 }
-	                            String xmltext = input.source(startofxml, input.positionOfNext());
+	                            String xmltext = input.copy(startofxml, pos()-2);
                                 return makeTokenInstance(XMLPART_TOKEN, xmltext);
                             }
                         case '>':
@@ -1923,14 +1675,14 @@
                                     {
                                         if (temp.equals(xmltagname))
                                         {
-	                                        String xmltext = input.source(startofxml, input.positionOfNext() + 2);
+	                                        String xmltext = input.copy(startofxml, pos());
                                             state = start_state;
                                             return makeTokenInstance(XMLLITERAL_TOKEN, xmltext);
                                         }
                                     }
                                     else
                                     {
-	                                    String xmltext = input.source(startofxml, input.positionOfNext() + 2);
+	                                    String xmltext = input.copy(startofxml, pos());
                                         state = start_state;
                                         return makeTokenInstance(XMLLITERAL_TOKEN, xmltext);
                                     }
@@ -1960,38 +1712,6 @@
                     }
 
                     /*
-                     * tokens: ==  =
-                     */
-
-                case equal_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = equalequal_state;
-                            break;
-                        default:
-                            retract();
-                            state = start_state;
-                            return ASSIGN_TOKEN;
-                    }
-
-                    /*
-                     * tokens: ===  ==
-                     */
-
-                case equalequal_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return STRICTEQUALS_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return EQUALS_TOKEN;
-                    }
-
-                    /*
                      * prefix: >
                      */
 
@@ -2013,8265 +1733,30 @@
                     }
 
                     /*
-                     * prefix: >>
+                     * prefix: >> >>> >>>=
                      */
 
                 case rightshift_state:
+                    state = start_state;
                     switch (nextchar())
                     {
                         case '>':
-                            state = unsignedrightshift_state;
-                            break;
+                            switch (nextchar())
+                            {
+                                case '=':
+                                    return UNSIGNEDRIGHTSHIFTASSIGN_TOKEN;
+                                default:
+                                    retract();
+                                    return UNSIGNEDRIGHTSHIFT_TOKEN;
+                            }
                         case '=':
-                            state = start_state;
                             return RIGHTSHIFTASSIGN_TOKEN;
                         default:
                             retract();
-                            state = start_state;
                             return RIGHTSHIFT_TOKEN;
                     }
-
-                    /*
-                     * prefix: >>>
-                     */
-
-                case unsignedrightshift_state:
-                    switch (nextchar())
-                    {
-                        case '=':
-                            state = start_state;
-                            return UNSIGNEDRIGHTSHIFTASSIGN_TOKEN;
-                        default:
-                            retract();
-                            state = start_state;
-                            return UNSIGNEDRIGHTSHIFT_TOKEN;
-                    }
-
-                    /*
-                     * prefix: a
-                     */
-
-                case a_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = as_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: as
-                     */
-
-                case as_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                    state = A_state;
-                                    continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return (HAS_ASOPERATOR) ? AS_TOKEN : makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: b
-                     */
-
-                case b_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = br_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: bo
-                     */
-
-                case bo_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = boo_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: boo
-                     */
-
-                case boo_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = bool_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: bool
-                     */
-
-                case bool_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = boole_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: boole
-                     */
-
-                case boole_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = boolea_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: boolea
-                     */
-
-                case boolea_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = boolean_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                    * prefix: boolean
-                    */
-
-                case boolean_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: br
-                     */
-
-                case br_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = bre_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: bre
-                     */
-
-                case bre_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = brea_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: brea
-                     */
-
-                case brea_state:
-                    switch (nextchar())
-                    {
-                        case 'k':
-                            state = break_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: break
-                     */
-
-                case break_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return BREAK_TOKEN;
-                    }
-
-                    /*
-                     * prefix: by
-                     */
-
-                case by_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = byt_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: byt
-                     */
-
-                case byt_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = byte_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: byte
-                     */
-
-                case byte_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: c
-                     */
-
-                case c_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = ca_state;
-                            continue;
-                        case 'l':
-                            state = cl_state;
-                            continue;
-                        case 'o':
-                            state = co_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: ca
-                     */
-
-                case ca_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = cas_state;
-                            continue;
-                        case 't':
-                            state = cat_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: cas
-                     */
-
-                case cas_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = case_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: case
-                     */
-
-                case case_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return CASE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: cat
-                     */
-
-                case cat_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = catc_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: catc
-                     */
-
-                case catc_state:
-                    switch (nextchar())
-                    {
-                        case 'h':
-                            state = catch_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: catch
-                     */
-
-                case catch_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return CATCH_TOKEN;
-                    }
-
-                    /*
-                     * prefix: ch
-                     */
-
-                case ch_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = cha_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: cha
-                     */
-
-                case cha_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = char_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: char
-                     */
-
-                case char_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: cl
-                     */
-
-                case cl_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = cla_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: cla
-                     */
-
-                case cla_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = clas_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: clas
-                     */
-
-                case clas_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = class_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: class
-                     */
-
-                case class_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return CLASS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: co
-                     */
-
-                case co_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = con_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: con
-                     */
-
-                case con_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = cons_state;
-                            continue;
-                        case 't':
-                            state = cont_state;
-                            continue;
-/*                        case 'f':
-                            state = conf_state;
-                            continue;
-*/                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: cons
-                     */
-
-                case cons_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = const_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: const
-                     */
-
-                case const_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return CONST_TOKEN;
-                    }
-
-                    /*
-                     * prefix: conf
-                     */
-                case conf_state:
-                    switch(nextchar())
-                    {
-                        case 'i':
-                            state = confi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: confi
-                     */
-                case confi_state:
-                    switch(nextchar())
-                    {
-                        case 'g':
-                            state = config_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: config
-                     */
-
-                case config_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return CONFIG_TOKEN;
-                    }
-
-                    /*
-                     * prefix: cont
-                     */
-
-                case cont_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = conti_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: conti
-                     */
-
-                case conti_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = contin_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: contin
-                     */
-
-                case contin_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = continu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: continu
-                     */
-
-                case continu_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = continue_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: continue
-                     */
-
-                case continue_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return CONTINUE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: d
-                     */
-
-                case d_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = de_state;
-                            continue;
-                        case 'o':
-                            state = do_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: de
-                     */
-
-                case de_state:
-                    switch (nextchar())
-                    {
-                        case 'b':
-                            state = deb_state;
-                            continue;
-                        case 'f':
-                            state = def_state;
-                            continue;
-                        case 'l':
-                            state = del_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: deb
-                     */
-
-                case deb_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = debu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: debu
-                     */
-
-                case debu_state:
-                    switch (nextchar())
-                    {
-                        case 'g':
-                            state = debug_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: debug
-                     */
-
-                case debug_state:
-                    switch (nextchar())
-                    {
-                        case 'g':
-                            state = debugg_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: debugg
-                     */
-
-                case debugg_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = debugge_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: debugge
-                     */
-
-                case debugge_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = debugger_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: debugger
-                     */
-
-                case debugger_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: def
-                     */
-
-                case def_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = defa_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: defa
-                     */
-
-                case defa_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = defau_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: defau
-                     */
-
-                case defau_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = defaul_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: defaul
-                     */
-
-                case defaul_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = default_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: default
-                     */
-
-                case default_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return DEFAULT_TOKEN;
-                    }
-
-                    /*
-                     * prefix: del
-                     */
-
-                case del_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = dele_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: dele
-                     */
-
-                case dele_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = delet_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: delet
-                     */
-
-                case delet_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = delete_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: delete
-                     */
-
-                case delete_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return DELETE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: do
-                     */
-
-                case do_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return DO_TOKEN;
-                    }
-
-                    /*
-                     * prefix: dou
-                     */
-
-                case dou_state:
-                    switch (nextchar())
-                    {
-                        case 'b':
-                            state = doub_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: doub
-                     */
-
-                case doub_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = doubl_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: doubl
-                     */
-
-                case doubl_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = double_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: double
-                     */
-
-                case double_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: e
-                     */
-
-                case e_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = el_state;
-                            continue;
-                        case 'v':
-                            state = ev_state;
-                            continue;
-                        case 'x':
-                            state = ex_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: el
-                     */
-
-                case el_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = els_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: els
-                     */
-
-                case els_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = else_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: else
-                     */
-
-                case else_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return ELSE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: ev
-                     */
-
-                case ev_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = eva_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: eva
-                     */
-
-                case eva_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = eval_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: eval
-                     */
-
-                case eval_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: ex
-                     */
-
-                case ex_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = ext_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: ext
-                     */
-
-                case ext_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = exte_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: exte
-                     */
-
-                case exte_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = exten_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: exten
-                     */
-
-                case exten_state:
-                    switch (nextchar())
-                    {
-                        case 'd':
-                            state = extend_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: extend
-                     */
-
-                case extend_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = extends_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: extends
-                     */
-
-                case extends_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return EXTENDS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: f
-                     */
-
-                case f_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = fa_state;
-                            continue;
-                        case 'i': 
-                            state = fi_state; 
-                            continue;
-                        case 'o':
-                            state = fo_state;
-                            continue;
-                        case 'u':
-                            state = fu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: fa
-                     */
-
-                case fa_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = fal_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: fal
-                     */
-
-                case fal_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = fals_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: fals
-                     */
-
-                case fals_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = false_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: false
-                     */
-
-                case false_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return FALSE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: fi
-                     */
-
-                case fi_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = fin_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: fin
-                     */
-
-                case fin_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = fina_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: fina
-                     */
-
-                case fina_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = final_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: final
-                     */
-
-                case final_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = finall_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: finall
-                     */
-
-                case finall_state:
-                    switch (nextchar())
-                    {
-                        case 'y':
-                            state = finally_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: finally
-                     */
-
-                case finally_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return FINALLY_TOKEN;
-                    }
-
-                    /*
-                     * prefix: fl
-                     */
-
-                case fl_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = flo_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: flo
-                     */
-
-                case flo_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = floa_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: floa
-                     */
-
-                case floa_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = float_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: float
-                     */
-
-                case float_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: fo
-                     */
-
-                case fo_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = for_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: for
-                     */
-
-                case for_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return FOR_TOKEN;
-                    }
-
-                    /*
-                     * prefix: fu
-                     */
-
-                case fu_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = fun_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: fun
-                     */
-
-                case fun_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = func_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: func
-                     */
-
-                case func_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = funct_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: funct
-                     */
-
-                case funct_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = functi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: functi
-                     */
-
-                case functi_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = functio_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: functio
-                     */
-
-                case functio_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = function_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: function
-                     */
-
-                case function_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return FUNCTION_TOKEN;
-                    }
-
-                    /*
-                     * prefix: g
-                     */
-
-                case g_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = ge_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: ge
-                     */
-
-                case ge_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = get_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: get
-                     */
-
-                case get_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return GET_TOKEN;
-                    }
-
-                    /*
-                     * prefix: i
-                     */
-
-                case i_state:
-                    switch (nextchar())
-                    {
-                        case 'f':
-                            state = if_state;
-                            continue;
-                        case 'm':
-                            state = im_state;
-                            continue;
-                        case 'n':
-                            state = in_state;
-                            continue;
-                        case 's':
-                            state = is_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: if
-                     */
-
-                case if_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return IF_TOKEN;
-                    }
-
-                    /*
-                     * prefix: im
-                     */
-
-                case im_state:
-                    switch (nextchar())
-                    {
-                        case 'p':
-                            state = imp_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: imp
-                     */
-
-                case imp_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = impl_state;
-                            continue;
-                        case 'o':
-                            state = impo_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: impl
-                     */
-
-                case impl_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = imple_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: imple
-                     */
-
-                case imple_state:
-                    switch (nextchar())
-                    {
-                        case 'm':
-                            state = implem_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: implem
-                     */
-
-                case implem_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = impleme_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: impleme
-                     */
-
-                case impleme_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = implemen_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: implemen
-                     */
-
-                case implemen_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = implement_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: implement
-                     */
-
-                case implement_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = implements_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: implements
-                     */
-
-                case implements_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return IMPLEMENTS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: impo
-                     */
-
-                case impo_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = impor_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: impor
-                     */
-
-                case impor_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = import_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: import
-                     */
-
-                case import_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return IMPORT_TOKEN;
-                    }
-
-                    /*
-                     * prefix: in
-                     */
-
-                case in_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 'T':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        case 'c':
-                            state = inc_state;
-                            continue;
-                        case 's':
-                            state = ins_state;
-                            continue;
-                        case 't':
-                            state = int_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return IN_TOKEN;
-                    }
-
-                    /*
-                     * prefix: inc
-                     */
-
-                case inc_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = incl_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: incl
-                     */
-
-                case incl_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = inclu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: inclu
-                     */
-
-                case inclu_state:
-                    switch (nextchar())
-                    {
-                        case 'd':
-                            state = includ_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: includ
-                     */
-
-                case includ_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = include_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: include
-                     */
-
-                case include_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return INCLUDE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: ins
-                     */
-
-                case ins_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = inst_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: inst
-                     */
-
-                case inst_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = insta_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: insta
-                     */
-
-                case insta_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = instan_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: instan
-                     */
-
-                case instan_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = instanc_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: instanc
-                     */
-
-                case instanc_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = instance_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: instance
-                     */
-
-                case instance_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = instanceo_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: instanceo
-                     */
-
-                case instanceo_state:
-                    switch (nextchar())
-                    {
-                        case 'f':
-                            state = instanceof_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: instanceof
-                     */
-
-                case instanceof_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return INSTANCEOF_TOKEN;
-                    }
-
-                    /*
-                     * prefix: int
-                     */
-
-                case int_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = inte_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: inte
-                     */
-
-                case inte_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = inter_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: inter
-                     */
-
-                case inter_state:
-                    switch (nextchar())
-                    {
-                        case 'f':
-                            state = interf_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: interf
-                     */
-
-                case interf_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = interfa_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: interfa
-                     */
-
-                case interfa_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = interfac_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: interfac
-                     */
-
-                case interfac_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = interface_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: interface
-                     */
-
-                case interface_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return INTERFACE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: is
-                     */
-
-                case is_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return (HAS_ISOPERATOR) ? IS_TOKEN : makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: l
-                     */
-
-                case l_state:
-                    switch (nextchar())
-                    {
-                        case '\0':
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: lo
-                     */
-
-                case lo_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = lon_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: lon
-                     */
-
-                case lon_state:
-                    switch (nextchar())
-                    {
-                        case 'g':
-                            state = long_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: long
-                     */
-
-                case long_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: n
-                     */
-
-                case n_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = na_state;
-                            continue;
-                        case 'e':
-                            state = ne_state;
-                            continue;
-                        case 'u':
-                            state = nu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: na
-                     */
-
-                case na_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = nat_state;
-                            continue;
-                        case 'm':
-                            state = nam_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: nam
-                     */
-
-                case nam_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = name_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: name
-                     */
-
-                case name_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = names_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: names
-                     */
-
-                case names_state:
-                    switch (nextchar())
-                    {
-                        case 'p':
-                            state = namesp_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: namesp
-                     */
-
-                case namesp_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = namespa_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: namespa
-                     */
-
-                case namespa_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = namespac_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: namespac
-                     */
-
-                case namespac_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = namespace_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: namespace
-                     */
-
-                case namespace_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return NAMESPACE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: nat
-                     */
-
-                case nat_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = nati_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: nati
-                     */
-
-                case nati_state:
-                    switch (nextchar())
-                    {
-                        case 'v':
-                            state = nativ_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: nativ
-                     */
-
-                case nativ_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = native_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: native
-                     */
-
-                case native_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());//return native_token;
-                    }
-
-                    /*
-                     * prefix: ne
-                     */
-
-                case ne_state:
-                    switch (nextchar())
-                    {
-                        case 'w':
-                            state = new_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: new
-                     */
-
-                case new_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return NEW_TOKEN;
-                    }
-
-                    /*
-                     * prefix: nu
-                     */
-
-                case nu_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = nul_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: nul
-                     */
-
-                case nul_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = null_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: null
-                     */
-
-                case null_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return NULL_TOKEN;
-                    }
-
-                    /*
-                     * prefix: p
-                     */
-
-                case p_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = pa_state;
-                            continue;
-                        case 'r':
-                            state = pr_state;
-                            continue;
-                        case 'u':
-                            state = pu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: pa
-                     */
-
-                case pa_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = pac_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: pac
-                     */
-
-                case pac_state:
-                    switch (nextchar())
-                    {
-                        case 'k':
-                            state = pack_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: pack
-                     */
-
-                case pack_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = packa_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: packa
-                     */
-
-                case packa_state:
-                    switch (nextchar())
-                    {
-                        case 'g':
-                            state = packag_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: packag
-                     */
-
-                case packag_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = package_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: package
-                     */
-
-                case package_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return PACKAGE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: pr
-                     */
-
-                case pr_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = pri_state;
-                            continue;
-                        case 'o':
-                            state = pro_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: pri
-                     */
-
-                case pri_state:
-                    switch (nextchar())
-                    {
-                        case 'v':
-                            state = priv_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: priv
-                     */
-
-                case priv_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = priva_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: priva
-                     */
-
-                case priva_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = privat_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: privat
-                     */
-
-                case privat_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = private_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: private
-                     */
-
-                case private_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return PRIVATE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: pro
-                     */
-
-                case pro_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = prot_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: prot
-                     */
-
-                case prot_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = prote_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: prote
-                     */
-
-                case prote_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = protec_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: protec
-                     */
-
-                case protec_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = protect_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: protect
-                     */
-
-                case protect_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = protecte_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: protecte
-                     */
-
-                case protecte_state:
-                    switch (nextchar())
-                    {
-                        case 'd':
-                            state = protected_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: protected
-                     */
-
-                case protected_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return PROTECTED_TOKEN;
-                    }
-
-                    /*
-                     * prefix: public
-                     */
-
-                case pu_state:
-                    switch (nextchar())
-                    {
-                        case 'b':
-                            state = pub_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: pub
-                     */
-
-                case pub_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = publ_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: publ
-                     */
-
-                case publ_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = publi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: publi
-                     */
-
-                case publi_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = public_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: public
-                     */
-
-                case public_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return PUBLIC_TOKEN;
-                    }
-
-                    /*
-                     * prefix: r
-                     */
-
-                case r_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = re_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: re
-                     */
-
-                case re_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = ret_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: ret
-                     */
-
-                case ret_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = retu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: retu
-                     */
-
-                case retu_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = retur_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: retur
-                     */
-
-                case retur_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = return_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: return
-                     */
-
-                case return_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return RETURN_TOKEN;
-                    }
-
-                    /*
-                     * prefix: s
-                     */
-
-                case s_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = se_state;
-                            continue;
-                        case 't':
-                            state = st_state;
-                            continue;
-                        case 'u':
-                            state = su_state;
-                            continue;
-                        case 'w':
-                            state = sw_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: se
-                     */
-
-                case se_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = set_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: get
-                     */
-
-                case set_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return SET_TOKEN;
-                    }
-
-                    /*
-                     * prefix: sh
-                     */
-
-                case sh_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = sho_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: sho
-                     */
-
-                case sho_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = shor_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: shor
-                     */
-
-                case shor_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = short_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: short
-                     */
-
-                case short_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: st
-                     */
-
-                case st_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = sta_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: sta
-                     */
-
-                case sta_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = stat_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: stat
-                     */
-
-                case stat_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = stati_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: stati
-                     */
-
-                case stati_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = static_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: static
-                     */
-
-                case static_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return makeTokenInstance(IDENTIFIER_TOKEN, input.copy());
-                    }
-
-                    /*
-                     * prefix: su
-                     */
-
-                case su_state:
-                    switch (nextchar())
-                    {
-                        case 'p':
-                            state = sup_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: sup
-                     */
-
-                case sup_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = supe_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: supe
-                     */
-
-                case supe_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = super_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: super
-                     */
-
-                case super_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return SUPER_TOKEN;
-                    }
-
-                    /*
-                     * prefix: sw
-                     */
-
-                case sw_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = swi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: swi
-                     */
-
-                case swi_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = swit_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: swit
-                     */
-
-                case swit_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = switc_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: switc
-                     */
-
-                case switc_state:
-                    switch (nextchar())
-                    {
-                        case 'h':
-                            state = switch_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: switch
-                     */
-
-                case switch_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return SWITCH_TOKEN;
-                    }
-
-                    /*
-                     * prefix: t
-                     */
-
-                case t_state:
-                    switch (nextchar())
-                    {
-                        case 'h':
-                            state = th_state;
-                            continue;
-                        case 'r':
-                            state = tr_state;
-                            continue;
-                        case 'y':
-                            state = ty_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: th
-                     */
-
-                case th_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = thi_state;
-                            continue;
-                        case 'r':
-                            state = thr_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: thi
-                     */
-
-                case thi_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = this_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: this
-                     */
-
-                case this_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return THIS_TOKEN;
-                    }
-
-                    /*
-                     * prefix: thr
-                     */
-
-                case thr_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = thro_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: thro
-                     */
-
-                case thro_state:
-                    switch (nextchar())
-                    {
-                        case 'w':
-                            state = throw_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: throw
-                     */
-
-                case throw_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return THROW_TOKEN;
-                    }
-
-                    /*
-                     * prefix: tr
-                     */
-
-                case tr_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = tru_state;
-                            continue;
-                        case 'y':
-                            state = try_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: tru
-                     */
-
-                case tru_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = true_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: true
-                     */
-
-                case true_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return TRUE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: try
-                     */
-
-                case try_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return TRY_TOKEN;
-                    }
-
-                    /*
-                     * prefix: ty
-                     */
-
-                case ty_state:
-                    switch (nextchar())
-                    {
-                        case 'p':
-                            state = typ_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: typ
-                     */
-
-                case typ_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = type_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: type
-                     */
-
-                case type_state:
-                    switch (nextchar())
-                    {
-                        case 'o':
-                            state = typeo_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: typeo
-                     */
-
-                case typeo_state:
-                    switch (nextchar())
-                    {
-                        case 'f':
-                            state = typeof_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: typeof
-                     */
-
-                case typeof_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return TYPEOF_TOKEN;
-                    }
-
-                    /*
-                     * prefix: u
-                     */
-
-                case u_state:
-                    switch (nextchar())
-                    {
-                        case 's':
-                            state = us_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: us
-                     */
-
-                case us_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = use_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: use
-                     */
-
-                case use_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return USE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: v
-                     */
-
-                case v_state:
-                    switch (nextchar())
-                    {
-                        case 'a':
-                            state = va_state;
-                            continue;
-                        case 'o':
-                            state = vo_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: va
-                     */
-
-                case va_state:
-                    switch (nextchar())
-                    {
-                        case 'r':
-                            state = var_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: var
-                     */
-
-                case var_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return VAR_TOKEN;
-                    }
-
-                    /*
-                     * prefix: vo
-                     */
-
-                case vo_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = voi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: voi
-                     */
-
-                case voi_state:
-                    switch (nextchar())
-                    {
-                        case 'd':
-                            state = void_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: void
-                     */
-
-                case void_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return VOID_TOKEN;
-                    }
-
-                    /*
-                     * prefix: w
-                     */
-
-                case w_state:
-                    switch (nextchar())
-                    {
-                        case 'h':
-                            state = wh_state;
-                            continue;
-                        case 'i':
-                            state = wi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: wh
-                     */
-
-                case wh_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = whi_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: whi
-                     */
-
-                case whi_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = whil_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: whil
-                     */
-
-                case whil_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = while_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: while
-                     */
-
-                case while_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return WHILE_TOKEN;
-                    }
-
-                    /*
-                     * prefix: wi
-                     */
-
-                case wi_state:
-                    switch (nextchar())
-                    {
-                        case 't':
-                            state = wit_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: wit
-                     */
-
-                case wit_state:
-                    switch (nextchar())
-                    {
-                        case 'h':
-                            state = with_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: with
-                     */
-
-                case with_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = A_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return WITH_TOKEN;
-                    }
-
-
-                    /*
-                     * prefix: x
-                     */
-
-                    case x_state:
-                    switch ( nextchar() )
-                    {
-                        case 'm': state = xm_state; continue;
-                        default:  retract(); state = A_state; continue;
-                    }
-
-                        /*
-                        * prefix: xm
-                        */
-
-                    case xm_state:
-                    switch ( nextchar() )
-                    {
-                        case 'l': state = xml_state; continue;
-                        default:  retract(); state = A_state; continue;
-                    }
-
-                        /*
-                        * prefix: xml
-                        */
-
-                    case xml_state:
-                    switch ( nextchar() )
-                    {
-                        case 'A': case 'a': case 'B': case 'b': case 'C': case 'c': 
-                        case 'D': case 'd': case 'E': case 'e': case 'F': case 'f':
-                        case 'G': case 'g': case 'H': case 'h': case 'I': case 'i': 
-                        case 'J': case 'j': case 'K': case 'k': case 'L': case 'l': 
-                        case 'M': case 'm': case 'N': case 'n': case 'O': case 'o':
-                        case 'P': case 'p': case 'Q': case 'q': case 'R': case 'r': 
-                        case 'S': case 's': case 'T': case 't': case 'U': case 'u': 
-                        case 'V': case 'v': case 'W': case 'w': case 'X': case 'x': 
-                        case 'Y': case 'y': case 'Z': case 'z': case '$': case '_':
-                        case '0': case '1': case '2': case '3': case '4': case '5': 
-                        case '6': case '7': case '8': case '9':
-                            state = A_state; continue;
-                        default: retract(); state = start_state; return makeTokenInstance( IDENTIFIER_TOKEN, input.copy() );
-                    }
-
-                    /*
-                     * prefix: #
-                     */
-
-                case pound_state:
-                    switch (nextchar())
-                    {
-                        case 'i':
-                            state = pound_i_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #i
-                     */
-
-                case pound_i_state:
-                    switch (nextchar())
-                    {
-                        case 'n':
-                            state = pound_in_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #in
-                     */
-
-                case pound_in_state:
-                    switch (nextchar())
-                    {
-                        case 'c':
-                            state = pound_inc_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #inc
-                     */
-
-                case pound_inc_state:
-                    switch (nextchar())
-                    {
-                        case 'l':
-                            state = pound_incl_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #incl
-                     */
-
-                case pound_incl_state:
-                    switch (nextchar())
-                    {
-                        case 'u':
-                            state = pound_inclu_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #inclu
-                     */
-
-                case pound_inclu_state:
-                    switch (nextchar())
-                    {
-                        case 'd':
-                            state = pound_includ_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #includ
-                     */
-
-                case pound_includ_state:
-                    switch (nextchar())
-                    {
-                        case 'e':
-                            state = pound_include_state;
-                            continue;
-                        default:
-                            retract();
-                            state = A_state;
-                            continue;
-                    }
-
-                    /*
-                     * prefix: #include
-                     */
-
-                case pound_include_state:
-                    switch (nextchar())
-                    {
-                        case 'A':
-                        case 'a':
-                        case 'B':
-                        case 'b':
-                        case 'C':
-                        case 'c':
-                        case 'D':
-                        case 'd':
-                        case 'E':
-                        case 'e':
-                        case 'F':
-                        case 'f':
-                        case 'G':
-                        case 'g':
-                        case 'H':
-                        case 'h':
-                        case 'I':
-                        case 'i':
-                        case 'J':
-                        case 'j':
-                        case 'K':
-                        case 'k':
-                        case 'L':
-                        case 'l':
-                        case 'M':
-                        case 'm':
-                        case 'N':
-                        case 'n':
-                        case 'O':
-                        case 'o':
-                        case 'P':
-                        case 'p':
-                        case 'Q':
-                        case 'q':
-                        case 'R':
-                        case 'r':
-                        case 'S':
-                        case 's':
-                        case 'T':
-                        case 't':
-                        case 'U':
-                        case 'u':
-                        case 'V':
-                        case 'v':
-                        case 'W':
-                        case 'w':
-                        case 'X':
-                        case 'x':
-                        case 'Y':
-                        case 'y':
-                        case 'Z':
-                        case 'z':
-                        case '$':
-                        case '_':
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            state = error_state;
-                            continue;
-                        default:
-                            if( isNextIdentifierPart() )
-                            {
-                                state = A_state;
-                                continue;
-                            }
-                            retract();
-                            state = start_state;
-                            return INCLUDE_TOKEN;
-                    }
-
-                /*
+                    
+               /*
                 * prefix: /*
                 */
 
@@ -10281,47 +1766,53 @@
                     blockcommentbuf.append(c);
                     switch ( c )
                     {
-                        case '*':
-                            switch(nextchar())
-                            {
-                                case '/':
-                                {
-                                    state = start_state;
-                                    return makeTokenInstance( BLOCKCOMMENT_TOKEN, new String());
-                                }
-                                default: retract(); state = doccomment_state; continue;
-                            }
-                        case '\n': isFirstTokenOnLine = true; 
-                            state = blockcomment_state; continue;
-                        case 0:    error(kError_BlockCommentNotTerminated); state = start_state; continue;
-                        default:   state = blockcomment_state; continue;
+                    case '*':
+                        if ( nextchar() == '/' ){
+                            state = start_state;
+                            return makeTokenInstance( BLOCKCOMMENT_TOKEN, new String());
+                        }
+                        retract(); 
+                        state = doccomment_state; 
+                        continue;
+                        
+                    case 0:    
+                        error(kError_BlockCommentNotTerminated); 
+                        state = start_state; 
+                        continue;
+                        
+                    case '\n': 
+                    case '\r':
+                        isFirstTokenOnLine = true; 
+                    default:
+                        state = blockcomment_state;
+                        continue;
                     }
                 }
 
                 /*
-                * prefix: /**
-                */
+                 * prefix: /**
+                 */
 
                 case doccomment_state:
-                    {
+                {
                     int c = nextchar();
                     blockcommentbuf.append(c);
                     switch ( c )
                     {
-                        case '*':  state = doccommentstar_state; continue;
-                        case '@':
-                            if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
-                            if( doctagname.length() > 0 ) { doctextbuf.append("]]></").append(doctagname).append(">"); };
-                            doctagname = "";
-                            state = doccommenttag_state; continue;
-                        case '\n': isFirstTokenOnLine = true;
-                            if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
-                            doctextbuf.append('\n');
-                            state = doccomment_state; continue;
-                        case 0:    error(kError_BlockCommentNotTerminated); state = start_state; continue;
-                        default:
-                            if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
-                            doctextbuf.append((char)(c)); state = doccomment_state; continue;
+                    case '*':  state = doccommentstar_state; continue;
+                    case '@':
+                        if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
+                        if( doctagname.length() > 0 ) { doctextbuf.append("]]></").append(doctagname).append(">"); };
+                        doctagname = "";
+                        state = doccommenttag_state; continue;
+                    case '\r': case '\n': isFirstTokenOnLine = true;
+                    if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
+                    doctextbuf.append('\n');
+                    state = doccomment_state; continue;
+                    case 0:    error(kError_BlockCommentNotTerminated); state = start_state; continue;
+                    default:
+                        if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
+                    doctextbuf.append((char)(c)); state = doccomment_state; continue;
                     }
                 }
 
@@ -10355,7 +1846,7 @@
                     switch ( c )
                     {
                         case '*':  state = doccommentstar_state; continue;
-                        case ' ': case '\n': 
+                        case ' ': case '\r': case '\n': 
                             {
                             if (doctextbuf == null) doctextbuf = getDocTextBuffer(doctagname);
                             if( doctagname.length() > 0 ) { doctextbuf.append("\n<").append(doctagname).append("><![CDATA["); };
@@ -10375,7 +1866,7 @@
                 {
                     case '*':  state = doccommentstar_state; continue;
                     case '@':  state = doccommenttag_state; continue;
-                    case '\n': state = doccomment_state; continue;
+                    case '\r': case '\n': state = doccomment_state; continue;
                     case 0:    error(kError_BlockCommentNotTerminated); state = start_state; continue;
                     default:   state = doccomment_state; continue;
                 }
@@ -10391,7 +1882,7 @@
                     switch ( c )                    
                     {
                         case '*':  state = blockcommentstar_state; continue;
-                        case '\n': isFirstTokenOnLine = true; 
+                        case '\r': case '\n': isFirstTokenOnLine = true; 
                             state = blockcomment_state; continue;
                         case 0:    error(kError_BlockCommentNotTerminated); state = start_state; continue;
                         default:   state = blockcomment_state; continue;
@@ -10423,17 +1914,26 @@
                 */
 
                 case linecomment_state:
-                switch ( nextchar() )
                 {
-                    case '\n': // don't include newline in line comment. (Sec 7.3)
-                        retract(); 
-                        state = start_state;
-                        return makeTokenInstance( SLASHSLASHCOMMENT_TOKEN, input.copy() );
- 
-                    case 0:    state = start_state; return EOS_TOKEN;
-                    default:   state = linecomment_state; continue;
-                }
+                    state = start_state;
+                    end_of_comment: while (true)
+                    {
+                        int c = nextchar();
+                        switch ( c )
+                        {
+                        case '\r': case '\n': // don't include newline in line comment. (Sec 7.3)
+                            retract(); 
+                            if ( save_comments == false )
+                                break end_of_comment;
+                            return makeTokenInstance( SLASHSLASHCOMMENT_TOKEN, input.copy() );
 
+                        case 0:    
+                            return EOS_TOKEN;
+                        }
+                    }
+                    continue;
+                }
+              
                 /*
                 * utf8sigstart_state
                 */
@@ -10456,8 +1956,8 @@
                     continue;
 
                 /*
-                * skip error
-                */
+                 * skip error
+                 */
 
                 case error_state:
                     error(kError_Lexical_General);
@@ -10473,29 +1973,4 @@
             }
         }
     }
-
-    private boolean isNextIdentifierPart()
-    {
-        switch (input.classOfNext())
-        {
-            case Lu:
-            case Ll:
-            case Lt:
-            case Lm:
-            case Lo:
-            case Nl:
-            case Mn:
-            case Mc:
-            case Nd:
-            case Pc:
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    public void clearUnusedBuffers() {
-        input.clearUnusedBuffers();
-        input = null;
-    }
 }
Index: modules/asc/src/java/macromedia/asc/parser/Token.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/Token.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/Token.java	(working copy)
@@ -35,11 +35,15 @@
 
 	public Token(int tokenClass, String lexeme)
 	{
+        
+        // ??? FIXME --not the token constructors problem --should be done in Scanner
+        
+        
         // InputBuffer's escapeString handles all escapes in a string, including u's
 		// RegExp literals should not escape the u's either
         if (tokenClass != STRINGLITERAL_TOKEN && lexeme.indexOf("\\u") != -1) // contains a unicode escape char?
         {
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             int len = lexeme.length();
             for(int x =0; x < len; x++)
             {
@@ -101,7 +105,7 @@
 	{
 		if (tokenClass == STRINGLITERAL_TOKEN)
 		{
-			return (lexeme.length() == 1) ? "" : lexeme.substring(1, lexeme.length() - 1);
+			return (lexeme.length() <= 1) ? "" : lexeme.substring(1, lexeme.length() - 1);
 		}
 
 		return lexeme;
Index: modules/asc/src/java/macromedia/asc/parser/TypeExpressionNode.java
===================================================================
--- modules/asc/src/java/macromedia/asc/parser/TypeExpressionNode.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/parser/TypeExpressionNode.java	(working copy)
@@ -80,7 +80,7 @@
         return this.expr.isLValue();
     }
 
-    public StringBuffer toCanonicalString(Context cx, StringBuffer buf)
+    public StringBuilder toCanonicalString(Context cx, StringBuilder buf)
     {
         return this.expr != null ? this.expr.toCanonicalString(cx, buf) : buf;
     }
Index: modules/asc/src/java/macromedia/asc/semantics/CodeGenerator.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/CodeGenerator.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/CodeGenerator.java	(working copy)
@@ -1185,7 +1185,7 @@
             }
             else
             {
-                cx.internalError(node.pos()-1,"internal error: lhs is not a reference");
+                cx.internalError(node.pos(),"internal error: lhs is not a reference");
             }
 
             if (!node.void_result)
@@ -1242,7 +1242,7 @@
 
                 if (btyp.isFinal() && !btyp.isDynamic())
                 {
-                    cx.error(node.pos()-1, kError_UnknownPropertyInNonDynamicInstance, node.ref.name);
+                    cx.error(node.pos(), kError_UnknownPropertyInNonDynamicInstance, node.ref.name);
                 }
 */
                 {
@@ -1412,7 +1412,7 @@
 
             if( is_super )
             {
-                cx.error(node.pos()-1, kError_CannotDeleteSuperDecendants);
+                cx.error(node.pos(), kError_CannotDeleteSuperDecendants);
             }
 
             if( node.base != null )
@@ -1663,7 +1663,7 @@
 
                 if( node.ref.getSlot(cx,SET_TOKEN) != null )
                 {
-                    cx.error(node.pos()-1, kError_PropertyIsWriteOnly);
+                    cx.error(node.pos(), kError_PropertyIsWriteOnly);
                 }
 
                 // If the base_index is 0 then push the base object
@@ -4143,7 +4143,7 @@
                         {
                             baseClassNode.deferred_subclasses = new ObjectList<ClassDefinitionNode>();
                         }
-                        cx.error(node.baseclass.pos()-1, kError_ForwardReferenceToBaseClass,baseClassNode.name.name);
+                        cx.error(node.baseclass.pos(), kError_ForwardReferenceToBaseClass,baseClassNode.name.name);
                         baseClassNode.deferred_subclasses.add(node);
                         return null;
                     }
@@ -4744,10 +4744,14 @@
 
     public boolean checkFeature(Context cx, Node node)
     {
-        int pos = node.pos();
-        int line = cx.input.getLnNum(pos);
-        int col = cx.input.getColPos(pos, line);
-        setPosition(line,col,pos);
+        if (cx.input != null)
+        {
+            int pos = node.pos();
+            int line = cx.input.getLnNum(pos);
+            int col = cx.input.getColPos(pos);
+            setPosition(line,col,pos);
+        }
+
         return true; //Evaluator::checkFeature(cx,node);
     }
 
Index: modules/asc/src/java/macromedia/asc/semantics/ConfigurationEvaluator.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/ConfigurationEvaluator.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/ConfigurationEvaluator.java	(working copy)
@@ -1134,7 +1134,7 @@
         {
             if( !isTopLevel() )
             {
-                cx.error(node.pos()-1, kError_InvalidConfigLocation);
+                cx.error(node.pos(), kError_InvalidConfigLocation);
                 return null;
             }
 
@@ -1150,12 +1150,12 @@
                 Slot slot = obj.getSlot(cx,slot_id);
                 if( node.kind != Tokens.CONST_TOKEN)
                 {
-                	cx.error(node.attrs.pos()-1,kError_NonConstConfigVar );
+                	cx.error(node.attrs.pos(),kError_NonConstConfigVar );
                 }
                 slot.setConst(true);
         		if( node.initializer == null )
         		{
-                	cx.error(node.pos()-1, kError_NonConstantConfigInit);
+                	cx.error(node.pos(), kError_NonConstantConfigInit);
         		}
         		else
         		{
@@ -1166,7 +1166,7 @@
 	                fold_expressions = old_fold;
 	                if( init_val == null || !init_val.hasValue() )
 	                {
-	                	cx.error(node.initializer.pos()-1, kError_NonConstantConfigInit);
+	                	cx.error(node.initializer.pos(), kError_NonConstantConfigInit);
 	                }
 		        	slot.setValue(init_val);
         		}
@@ -1174,7 +1174,7 @@
     		}
             else
             {
-                cx.error(node.variable.identifier.pos()-1, kError_ConflictingNameInNamespace, ref.name, ref.namespaces.at(0).name);
+                cx.error(node.variable.identifier.pos(), kError_ConflictingNameInNamespace, ref.name, ref.namespaces.at(0).name);
             }
         }
         else
@@ -1280,7 +1280,7 @@
         
         if( !isTopLevel() )
         {
-            cx.error(node.pos()-1, kError_InvalidConfigLocation);
+            cx.error(node.pos(), kError_InvalidConfigLocation);
             return null;
         }
         Namespaces namespaces = new Namespaces();
Index: modules/asc/src/java/macromedia/asc/semantics/ConstantEvaluator.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/ConstantEvaluator.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/ConstantEvaluator.java	(working copy)
@@ -478,7 +478,7 @@
                         ObjectValue base = node.ref.getBase();
                         if( base == null )
                         {
-                            if( cx.statics.withDepth == -1 ) cx.error(node.pos()-1, kError_Strict_PlainUndefinedMethod,node.ref.name);
+                            if( cx.statics.withDepth == -1 ) cx.error(node.pos(), kError_Strict_PlainUndefinedMethod,node.ref.name);
                         }
                         //  Note: Function is dynamic, but methods of a class are MethodClosures, a non-dynamic subclass of Function.
                         //  The compiler doesn't have an internal representation of MethodClosure, though the only reason it would
@@ -492,9 +492,9 @@
 								String className = (base instanceof TypeValue) ? "Class" : base.getType(cx).getName(cx).toString();
 
 								if (base.hasNameUnqualified(cx, node.ref.name, GET_TOKEN))
-									cx.error(node.pos()-1, kError_InaccessibleMethodReference, node.ref.name, className);
+									cx.error(node.pos(), kError_InaccessibleMethodReference, node.ref.name, className);
 								else
-									cx.error(node.pos()-1, kError_Strict_UndefinedMethod, node.ref.name, className);
+									cx.error(node.pos(), kError_Strict_UndefinedMethod, node.ref.name, className);
 							}
                         }
                     }
@@ -513,7 +513,7 @@
                 if ( callSlot != null && getSlot != null && getSlot.declaredBy != null &&
                      ((getSlot.declaredBy.builder instanceof ClassBuilder) || (getSlot.declaredBy.builder instanceof InstanceBuilder)) )
                 {
-                    cx.error(node.pos()-1, kError_MethodIsNotAConstructor);
+                    cx.error(node.pos(), kError_MethodIsNotAConstructor);
                 }
             }
             type = type != null ? type : cx.noType().getDefaultTypeInfo();
@@ -522,7 +522,7 @@
                     Builder bui = slot.getType().getBuilder();
                     if (bui instanceof ClassBuilder && ((ClassBuilder)bui).is_interface)
                     {
-                        cx.error(node.pos()-1, kError_CannotInstantiateInterface);
+                        cx.error(node.pos(), kError_CannotInstantiateInterface);
                     }
             }
         }
@@ -587,7 +587,7 @@
                      if (slot.getDeclStyles().at(expected_num_args-1) == PARAM_Required)
                          break;
                  }
-                StringBuffer err_arg_buf = new StringBuffer();
+                StringBuilder err_arg_buf = new StringBuilder();
                 err_arg_buf.append(expected_num_args);
                 cx.error(node.pos(), kError_WrongNumberOfArguments, err_arg_buf.toString());
             }
@@ -675,9 +675,9 @@
                     if( base != null && (!base.isDynamic() || (base.getType(cx).getTypeValue() == cx.functionType() && !(base.builder instanceof GlobalBuilder)) ) )
                     {
                         if (base.hasNameUnqualified(cx, node.ref.name, GET_TOKEN))
-                            cx.error(node.expr.pos()-1, kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
+                            cx.error(node.expr.pos(), kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
                         else
-                            cx.error(node.expr.pos()-1, kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
+                            cx.error(node.expr.pos(), kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
                     }
                 }
 
@@ -686,7 +686,7 @@
 
                 if( slot != null && !in_with && !isDynamic )
                 {
-                    cx.error(node.expr.pos()-1, kError_Strict_AttemptToDeleteFixedProperty, node.ref.name);
+                    cx.error(node.expr.pos(), kError_Strict_AttemptToDeleteFixedProperty, node.ref.name);
                 }
 
             }
@@ -743,9 +743,9 @@
                     if( base != null && (!base.isDynamic() || (base.getType(cx).getTypeValue() == cx.functionType() && !(base.builder instanceof GlobalBuilder)) ) )
                     {
                         if (base.hasNameUnqualified(cx, node.ref.name, GET_TOKEN))
-                            cx.error(node.pos()-1, kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
+                            cx.error(node.pos(), kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
                         else
-                            cx.error(node.pos()-1, kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
+                            cx.error(node.pos(), kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
                     }
                 }
             }
@@ -770,7 +770,7 @@
 
         if (node.base == null && !node.expr.isLValue())
         {
-            cx.error(node.pos()-1,kError_AssignmentToNonRefVar);
+            cx.error(node.pos(),kError_AssignmentToNonRefVar);
         }
         else
         {
@@ -852,7 +852,7 @@
                 {
                     if (slot.getObjectValue() != null) // slot will only have a value if this is a class slot
                     {
-                        cx.error(node.pos()-1, kError_AssignmentToDefinedClass, node.ref.name);
+                        cx.error(node.pos(), kError_AssignmentToDefinedClass, node.ref.name);
                     }
                 }
             }
@@ -874,13 +874,13 @@
                     }
                     if (!isXMLProp && slot.getObjectValue() != null)
                     {
-                        cx.error(node.pos()-1, kError_AssignmentToDefinedFunction, node.ref.name);
+                        cx.error(node.pos(), kError_AssignmentToDefinedFunction, node.ref.name);
                     }
                 }
             }
             else if( slot != null && slot.isConst() && (slot.isImported() || scope_index != base_index || val.hasValue() || rchkill_bits_count > 0) )
             {
-                cx.error(node.pos()-1, kError_AssignmentToConstVar);
+                cx.error(node.pos(), kError_AssignmentToConstVar);
             }
             else if( cx.useStaticSemantics() && slot == null )
             {
@@ -912,7 +912,7 @@
                     }
                     else
                     {
-                        cx.error(node.pos()-1, kError_PropertyIsReadOnly);
+                        cx.error(node.pos(), kError_PropertyIsReadOnly);
                     }
                 }
                 else
@@ -922,9 +922,9 @@
                     if( base != null && (!base.isDynamic() || (base.getType(cx).getTypeValue() == cx.functionType() && !(base.builder instanceof GlobalBuilder)) ) )
                     {
                         if (base.hasNameUnqualified(cx, node.ref.name, GET_TOKEN))
-                            cx.error(node.expr.pos()-1, kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
+                            cx.error(node.expr.pos(), kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
                         else
-                            cx.error(node.expr.pos()-1, kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
+                            cx.error(node.expr.pos(), kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
                     }
                 }
             }
@@ -1145,7 +1145,7 @@
                                  !(node.selector.expr instanceof QualifiedIdentifierNode) &&  // If it was qualified then fall through to the normal unfound property error
                                  scope.hasNameUnqualified(cx, node.ref.name, GET_TOKEN)  )
                             {
-                                cx.error(node.selector.expr.pos()-1, kError_InaccessiblePropertyReference,node.ref.name, scope.type.getName(cx).toString());
+                                cx.error(node.selector.expr.pos(), kError_InaccessiblePropertyReference,node.ref.name, scope.type.getName(cx).toString());
                                 break;
                             }
                         }
@@ -1167,18 +1167,18 @@
                                 if( !( slot != null && slot.getType()!= null && slot.getType().getTypeValue() == cx.functionType() && slot.getObjectValue() != null) )
                                 {
                                     if( qualified_pkg_name != null )
-                                        cx.error(node.selector.expr.pos()-1, kError_UnfoundPackageProperty, node.ref.name, qualified_pkg_name);
+                                        cx.error(node.selector.expr.pos(), kError_UnfoundPackageProperty, node.ref.name, qualified_pkg_name);
                                     else
                                         // Attempting to set a function will be caught by the SetExpressionNode
-                                        cx.error(node.selector.expr.pos()-1, kError_UnfoundProperty,node.ref.name);
+                                        cx.error(node.selector.expr.pos(), kError_UnfoundProperty,node.ref.name);
                                 }
                             }
                             else
                             {
                                 if( qualified_pkg_name != null )
-                                    cx.error(node.selector.expr.pos()-1, kError_UnfoundPackageProperty, node.ref.name, qualified_pkg_name);
+                                    cx.error(node.selector.expr.pos(), kError_UnfoundPackageProperty, node.ref.name, qualified_pkg_name);
                                 else
-                                    cx.error(node.selector.expr.pos()-1, kError_UnfoundProperty,node.ref.name);
+                                    cx.error(node.selector.expr.pos(), kError_UnfoundProperty,node.ref.name);
                             }
                         }
                     }
@@ -1186,7 +1186,7 @@
             }
             if( node.selector.is_package && node.ref.getSlotIndex(GET_TOKEN) < 0 )
             {
-                cx.error(node.selector.expr.pos()-1,kError_IllegalPackageReference,node.ref.name);
+                cx.error(node.selector.expr.pos(),kError_IllegalPackageReference,node.ref.name);
             }
         }
 
@@ -1304,9 +1304,9 @@
                     if( base != null && (!base.isDynamic() || (base.getType(cx).getTypeValue() == cx.functionType() && !(base.builder instanceof GlobalBuilder))) )
                     {
                         if (base.hasNameUnqualified(cx, node.ref.name, GET_TOKEN))
-                            cx.error(node.pos()-1, kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
+                            cx.error(node.pos(), kError_InaccessiblePropertyReference, node.ref.name, base.getType(cx).getName(cx).toString());
                         else
-                            cx.error(node.pos()-1, kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
+                            cx.error(node.pos(), kError_UndefinedProperty,node.ref.name,base.getType(cx).getName(cx).toString());
                     }
                 }
             }
@@ -1315,7 +1315,7 @@
             	!(slot instanceof VariableSlot) && // FIXME: tpr added this since var's don't get a set slot,   
             	node.ref.getSlot(cx,SET_TOKEN) == null)
             {
-                cx.error(node.pos()-1, node.op == PLUSPLUS_TOKEN ? kError_InvalidIncrementOperand : kError_InvalidDecrementOperand);
+                cx.error(node.pos(), node.op == PLUSPLUS_TOKEN ? kError_InvalidIncrementOperand : kError_InvalidDecrementOperand);
             }
         }
         else
@@ -1323,7 +1323,7 @@
             QualifiedExpressionNode qen = node.getIdentifier() instanceof QualifiedExpressionNode? (QualifiedExpressionNode)node.getIdentifier() : null;
             if (qen != null && qen.nss != null )
             {
-                cx.error(node.pos()-1, node.op == PLUSPLUS_TOKEN ? kError_InvalidIncrementOperand : kError_InvalidDecrementOperand);
+                cx.error(node.pos(), node.op == PLUSPLUS_TOKEN ? kError_InvalidIncrementOperand : kError_InvalidDecrementOperand);
                      // this is a case we just don't handle. might need a more descriptive message
             }
 
@@ -1432,14 +1432,14 @@
                             (rhstype[0].getTypeValue() == cx.numberType() || rhstype[0].getTypeValue() == cx.intType() ||
                              rhstype[0].getTypeValue() == cx.uintType()   || rhstype[0].getTypeValue() == cx.booleanType() ))
                         {
-                            cx.error(node.pos()-1, kError_IncompatableValueComparison, lhstype[0].getName(cx).toString(), rhstype[0].getName(cx).toString());
+                            cx.error(node.pos(), kError_IncompatableValueComparison, lhstype[0].getName(cx).toString(), rhstype[0].getName(cx).toString());
                         }
                             // yes, this could be combined with the above, but it would be hard to read
                         else if (rhstype[0].getTypeValue() == cx.nullType() &&
                                  (lhstype[0].getTypeValue() == cx.numberType() || lhstype[0].getTypeValue() == cx.intType() ||
                                   lhstype[0].getTypeValue() == cx.uintType()   || lhstype[0].getTypeValue() == cx.booleanType() ))
                         {
-                            cx.error(node.pos()-1, kError_IncompatableValueComparison, lhstype[0].getName(cx).toString(), rhstype[0].getName(cx).toString());
+                            cx.error(node.pos(), kError_IncompatableValueComparison, lhstype[0].getName(cx).toString(), rhstype[0].getName(cx).toString());
                         }
                         // else no problem
                     }
@@ -1453,7 +1453,7 @@
                     else if ( !((lhstype[0].getTypeValue() == cx.numberType() || lhstype[0].getTypeValue() == cx.intType() || lhstype[0].getTypeValue() == cx.uintType()) &&
                         (rhstype[0].getTypeValue() == cx.numberType() || rhstype[0].getTypeValue() == cx.intType() || rhstype[0].getTypeValue() == cx.uintType())) )
                     {
-                        cx.error(node.pos()-1, kError_IncompatableValueComparison, lhstype[0].getName(cx).toString(), rhstype[0].getName(cx).toString());
+                        cx.error(node.pos(), kError_IncompatableValueComparison, lhstype[0].getName(cx).toString(), rhstype[0].getName(cx).toString());
                     }
 
                     break;
@@ -1825,7 +1825,7 @@
 
                 if ( tooManyArgs || tooFewArgs)
                 {
-                    StringBuffer err_arg_buf = new StringBuffer();
+                    StringBuilder err_arg_buf = new StringBuilder();
                     int expected_num_args = node.decl_styles.at(0) == PARAM_Void?0:types_size;
                     if (tooFewArgs)
                     {
@@ -2242,7 +2242,7 @@
             Slot typeSlot = node.typeref.getSlot(cx);
             if (typeSlot == null  || typeSlot.getValue() == null)
             {
-                cx.error(node.variable.type.pos()-1, kError_UnknownType, node.typeref.name);
+                cx.error(node.variable.type.pos(), kError_UnknownType, node.typeref.name);
                 slot.setType(type = cx.noType().getDefaultTypeInfo());
             }
             else
@@ -2260,7 +2260,7 @@
                 else
                 {
                     // The value of the slot is not a type, so it's an unknown type
-                    cx.error(node.variable.type.pos()-1, kError_UnknownType, node.typeref.name);
+                    cx.error(node.variable.type.pos(), kError_UnknownType, node.typeref.name);
                     slot.setType(type = cx.noType().getDefaultTypeInfo());
                 }
             }
@@ -2291,7 +2291,7 @@
                 ObjectValue checked = checkDefaultValue(cx, type, ov);
                 if( checked == null )
                 {
-                    cx.error(node.initializer.pos()-1, kError_IncompatibleDefaultValue,ov.type.getName(cx).toString(),type.getName(cx).toString());
+                    cx.error(node.initializer.pos(), kError_IncompatibleDefaultValue,ov.type.getName(cx).toString(),type.getName(cx).toString());
                 }
                 slot.setObjectValue((ObjectValue) val);
             }
@@ -2352,7 +2352,7 @@
                         //String kind_str = node.name.kind == GET_TOKEN ? "Getter" : "Setter";
                         //String otherkind_str = node.name.kind == GET_TOKEN ? "setter" : "getter";
                         node.ref.getSlot(cx,SET_TOKEN);
-                        cx.error(pos-1, kError_AccessorTypesMustMatch);
+                        cx.error(pos, kError_AccessorTypesMustMatch);
                     }
                 }
             }
@@ -2365,19 +2365,19 @@
                     if( node.fexpr.signature.result != null && rt2.getTypeValue() != cx.voidType() )
                     {
                         int pos = node.fexpr.signature.result.pos();
-                        cx.error(pos-1, kError_BadSetterReturnType);
+                        cx.error(pos, kError_BadSetterReturnType);
                     }
                 }
                 ParameterListNode parameter = node.fexpr.signature.parameter;
                 if (parameter == null || parameter.items.size() != 1)
                 {
                     int pos = (parameter != null) ? parameter.pos() : node.fexpr.signature.pos();
-                    cx.error(pos-1, kError_SetterMustHaveOneParameter);
+                    cx.error(pos, kError_SetterMustHaveOneParameter);
                 }
                 else if (parameter.items.at(0).init != null)
                 {
                     int pos = node.fexpr.signature.parameter.pos();
-                    cx.error(pos-1, kError_SetterCannotHaveOptional);
+                    cx.error(pos, kError_SetterCannotHaveOptional);
                 }
             }
             else if( node.name.kind == GET_TOKEN )
@@ -2385,13 +2385,13 @@
                 if (node.fexpr.signature.void_anno)
                 {
                     int pos = node.fexpr.signature.pos();
-                    cx.error(pos-1, kError_BadGetterReturnType);
+                    cx.error(pos, kError_BadGetterReturnType);
                 }
                 ParameterListNode parameter = node.fexpr.signature.parameter;
                 if (parameter != null && parameter.items.size() != 0)
                 {
                     int pos = node.fexpr.signature.parameter.pos();
-                    cx.error(pos-1, kError_GetterCannotHaveParameters);
+                    cx.error(pos, kError_GetterCannotHaveParameters);
                 }
             }
         }
@@ -2483,7 +2483,7 @@
                     if (slot != null && size(slot.getDeclStyles()) != 0 && slot.getDeclStyles().at(0) == PARAM_Required)
                     {
                         // found a slot, and it has required params
-                        cx.error(node.pos()-1, kError_NoDefaultBaseclassCtor, ib.basebui.classname.toString());
+                        cx.error(node.pos(), kError_NoDefaultBaseclassCtor, ib.basebui.classname.toString());
                     }
                 }
             }
@@ -2602,7 +2602,7 @@
             }
             else
             {
-                cx.error(node.result.pos()-1, kError_UnknownType, node.typeref.name);
+                cx.error(node.result.pos(), kError_UnknownType, node.typeref.name);
             }
         }
         else
@@ -2643,7 +2643,7 @@
             }
             else
             {
-                cx.error(node.result.pos()-1, kError_UnknownType, node.typeref.name);
+                cx.error(node.result.pos(), kError_UnknownType, node.typeref.name);
             }
         }
         else
@@ -2798,7 +2798,7 @@
             }
             else
             {
-                cx.error(node.type.pos()-1, kError_UnknownType, node.typeref.name);
+                cx.error(node.type.pos(), kError_UnknownType, node.typeref.name);
                 slot.setType(type = cx.noType().getDefaultTypeInfo());
             }
         }
@@ -2821,13 +2821,13 @@
                 ObjectValue checked = checkDefaultValue(cx,type,ov);
                 if( checked == null )
                 {
-                    cx.error(node.init.pos()-1, kError_IncompatibleDefaultValue,ov.type.getName(cx).toString(),type.getName(cx).toString());
+                    cx.error(node.init.pos(), kError_IncompatibleDefaultValue,ov.type.getName(cx).toString(),type.getName(cx).toString());
                 }
                 slot.setValue(checked);
             }
             else
             {
-                cx.error(node.init.pos()-1, kError_NonConstantParamInitializer);
+                cx.error(node.init.pos(), kError_NonConstantParamInitializer);
             }
         }
         return type.getPrototype();
@@ -2864,7 +2864,7 @@
             }
             else
             {
-                cx.error(node.type.pos()-1, kError_UnknownType, node.typeref.name);
+                cx.error(node.type.pos(), kError_UnknownType, node.typeref.name);
                 slot.setType(type = cx.noType().getDefaultTypeInfo());
             }
         }
@@ -3365,7 +3365,7 @@
                         propType = "set ";
                     else if (orig_getter)
                         propType = "get ";
-                    cx.error(classNode.pos()-1, errorID, propType + name, namespaceString, classNode.iframe.type.getTypeValue().name.toString());
+                    cx.error(classNode.pos(), errorID, propType + name, namespaceString, classNode.iframe.type.getTypeValue().name.toString());
                 }
             }
         }
@@ -3425,7 +3425,7 @@
                     else if(names.getType(i) == Names.GET_NAMES)
                         propType = "get ";
 
-                    cx.error(classNode.pos()-1, kError_ConflictingInheritedNameInInterface, propType + name,
+                    cx.error(classNode.pos(), kError_ConflictingInheritedNameInInterface, propType + name,
                         interfaceIFrame.type.getTypeValue().name.toString());
                 }
             }
@@ -3510,7 +3510,7 @@
 
 	        if (definitionName != null && definitionName.length() > 0)
 	        {
-                StringBuffer b = new StringBuffer(packageName == null ? 0 : packageName.length() +
+                StringBuilder b = new StringBuilder(packageName == null ? 0 : packageName.length() +
                                                   definitionName.length() + 1);
                 if (packageName != null && packageName.length() > 0)
                 {
@@ -3528,7 +3528,7 @@
                     Slot slot = ref.getSlot(cx,GET_TOKEN);
                     if (slot == null)
                     {
-                        cx.error(node.name.pos()-1, kError_DefinitionNotFound, import_name);
+                        cx.error(node.name.pos(), kError_DefinitionNotFound, import_name);
                     }
                     else
                     {
@@ -3542,7 +3542,7 @@
 		        ObjectValue ns = cx.getNamespace(packageName.intern());
 		        if (!ns.isPackage())
 		        {
-		            cx.error(node.name.pos()-1, kError_DefinitionNotFound, packageName);
+		            cx.error(node.name.pos(), kError_DefinitionNotFound, packageName);
 		        }
 	        }
         }
@@ -3609,7 +3609,7 @@
         }
         else if (cx.useStaticSemantics() && slot != null && size(slot.getDeclStyles()) != 0 && slot.getDeclStyles().at(0) == PARAM_Required)
         {
-            StringBuffer err_arg_buf = new StringBuffer();
+            StringBuilder err_arg_buf = new StringBuilder();
             int expected_num_args = slot.getDeclStyles().size();
             for(; expected_num_args > 0; expected_num_args--)
             {
Index: modules/asc/src/java/macromedia/asc/semantics/FlowAnalyzer.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/FlowAnalyzer.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/FlowAnalyzer.java	(working copy)
@@ -38,6 +38,14 @@
  */
 public final class FlowAnalyzer extends Emitter implements Evaluator, ErrorConstants
 {
+    private static final String INTRINSIC = "intrinsic".intern();
+    private static final String INTERNAL = "internal".intern();
+    private static final String PUBLIC = "public".intern();
+    private static final String PRIVATE = "private".intern();
+    private static final String PROTECTED = "protected".intern();
+    private static final String PROTOTYPE = "prototype".intern();
+    private static final String STATIC = "static".intern();
+
     private Names interfaceMethods = null;
     private boolean define_cv;
     private boolean errorNodeSeen = false;
@@ -254,16 +262,16 @@
                         else
                         {
                             IdentifierNode id = memb.selector.getIdentifier();
-                            if( id != null && id.name.equals("internal") )
+                            if( id != null && (id.name == INTERNAL) )
                             {
                                 ns = default_namespaces.back();
                             }
                             else
-                            if( id != null && id.name.equals("private") )
+                            if( id != null && (id.name == PRIVATE) )
                             {
                                 if( private_namespaces.size() == 0 )
                                 {
-                                    cx.error(node.qualifier.pos()-1, kError_InvalidPrivate);
+                                    cx.error(node.qualifier.pos(), kError_InvalidPrivate);
                                 }
                                 else
                                 {
@@ -271,11 +279,11 @@
                                 }
                             }
                             else
-                            if( id != null && id.name.equals("protected") )
+                            if( id != null && (id.name == PROTECTED) )
                             {
                                 if( static_protected_namespaces.size() == 0 )
                                 {
-                                    cx.error(node.qualifier.pos()-1, kError_InvalidProtected);
+                                    cx.error(node.qualifier.pos(), kError_InvalidProtected);
                                 }
                                 else
                                 {
@@ -295,7 +303,7 @@
                                 }
                             }
                             else
-                            if( id != null && id.name.equals("public") )
+                            if( id != null && (id.name == PUBLIC) )
                             {
                                 ns = public_namespaces.back();
                             }
@@ -320,17 +328,18 @@
                     }
                     else if( ref != null )
                     {
-                        ns = ((ref.getValue(cx) instanceof ObjectValue) ? (ObjectValue)ref.getValue(cx) : null);
+                        Value value = ref.getValue(cx);
+                        ns = ((value instanceof ObjectValue) ? (ObjectValue) value : null);
                         if( ns == null )
                         {
                             return null;
-                            // cx.error(node.qualifier.pos()-1, kError_UndefinedNamespace );
+                            // cx.error(node.qualifier.pos(), kError_UndefinedNamespace );
                         }
                     }
                     else
                     if( ns == null && nss == null )
                     {
-                        cx.error(node.qualifier.pos()-1, kError_UndefinedNamespace);
+                        cx.error(node.qualifier.pos(), kError_UndefinedNamespace);
                     }
                 }
             }
@@ -406,10 +415,10 @@
         case error_this:
         case cinit_this:
         case package_this:
-            cx.error(node.pos()-1, kError_ThisUsedInStaticFunction);
+            cx.error(node.pos(), kError_ThisUsedInStaticFunction);
             break;
         case init_this:
-        	cx.error(node.pos()-1, kError_ThisUsedInInitializer);
+        	cx.error(node.pos(), kError_ThisUsedInInitializer);
         	break;
         default:
             // valid use of this
@@ -539,8 +548,24 @@
 
         if (node.name != null)
         {
-            Value value = node.name.evaluate(cx,this);
-            node.ref = ((value instanceof ReferenceValue) ? (ReferenceValue)value : null);
+            // For LiteralFieldNode's with a name of type
+            // IdentifierNode, ReferenceValue.findUnqualified() always
+            // returns false, so speed up the process by creating a
+            // ReferenceValue with no namespaces.
+            if (node.name instanceof IdentifierNode)
+            {
+                IdentifierNode identifier = (IdentifierNode) node.name;
+                Namespaces namespaces = new Namespaces();
+                ReferenceValue referenceValue = new ReferenceValue(cx, null, identifier.name, namespaces);
+                referenceValue.setIsAttributeIdentifier(false);
+                referenceValue.setPosition(node.pos());
+                node.ref = referenceValue;
+            }
+            else
+            {
+                Value value = node.name.evaluate(cx,this);
+                node.ref = ((value instanceof ReferenceValue) ? (ReferenceValue)value : null);
+            }
         }
         node.value.evaluate(cx, this);
 
@@ -1078,7 +1103,7 @@
                             // value at the beginning of the block.
 
                             hoisted_defs.push_back(def);
-                            if( def.attrs != null && def.attrs.hasAttribute("intrinsic") )
+                            if( def.attrs != null && def.attrs.hasAttribute(INTRINSIC) )
                             {
                                 if (label == null)
                                     node.items.set(i, nodeFactory.emptyStatement());
@@ -1329,7 +1354,7 @@
 
         if (ref == null)
         {
-            cx.error(node.pos()-1, kError_InvalidLabel);
+            cx.error(node.pos(), kError_InvalidLabel);
         }
         else
         {
@@ -1340,12 +1365,12 @@
         {
             if (obj.defineName(cx, GET_TOKEN, labelName, ObjectValue.labelNamespace, loop_index) == 0)
             {
-                cx.error(node.pos()-1, kError_DuplicateLabel);
+                cx.error(node.pos(), kError_DuplicateLabel);
             }
             // and if it is a loop label, add a name for the loop label namespace too
             if (node.is_loop_label && obj.defineName(cx, GET_TOKEN, labelName, ObjectValue.loopLabelNamespace, loop_index) == 0)
             {
-                cx.error(node.pos()-1, kError_DuplicateLabel);
+                cx.error(node.pos(), kError_DuplicateLabel);
             }
         }
 
@@ -1787,7 +1812,7 @@
 
         if( node.loop_index < 0 )
         {
-            cx.error(node.pos()-1, kError_ContinueHasNoTarget);
+            cx.error(node.pos(), kError_ContinueHasNoTarget);
         }
 
         Continue(node.loop_index);
@@ -1834,7 +1859,7 @@
         //TODO improve this error to suggest {} blocks
         if( node.loop_index < 0 )
         {
-            cx.error(node.pos()-1, kError_BreakHasNoTarget);
+            cx.error(node.pos(), kError_BreakHasNoTarget);
         }
 
         Break(node.loop_index);
@@ -2738,7 +2763,7 @@
                 // output errors against the nodes in dependency cycles...
                 if (!tsort.contains(clsdef))
                 {
-                    cx.error(clsdef.pos() - 1, kError_CircularReference, clsdef.cframe.builder.classname.name);
+                    cx.error(clsdef.pos(), kError_CircularReference, clsdef.cframe.builder.classname.name);
                     found_circular_or_duplicate_class_definition = true;
                 }
             }
@@ -2771,7 +2796,7 @@
         {
             if( doingPackage() && import_context.back() != true )
             {
-                cx.error(node.pos()-1, kError_NestedPackage);
+                cx.error(node.pos(), kError_NestedPackage);
                 return null;
             }
 
@@ -2901,17 +2926,17 @@
 
         if (is_dynamic)
         {
-            cx.error(node.pos()-1, kError_InvalidDynamic);
+            cx.error(node.pos(), kError_InvalidDynamic);
         }
 
         if (is_final)
         {
-            cx.error(node.pos()-1, kError_InvalidFinalUsage);
+            cx.error(node.pos(), kError_InvalidFinalUsage);
         }
 
         if (is_override)
         {
-            cx.error(node.pos()-1, kError_InvalidOverrideUsage);
+            cx.error(node.pos(), kError_InvalidOverrideUsage);
         }
 
         if( is_static )
@@ -2922,7 +2947,7 @@
             }
             else
             {
-                cx.error(node.attrs.pos()-1, kError_InvalidStatic);
+                cx.error(node.attrs.pos(), kError_InvalidStatic);
             }
         }
         else
@@ -2947,54 +2972,54 @@
     {
         if( attrs != null )
         {
-            if( attrs.hasAttribute("private") )
+            if( attrs.hasPrivate )
             {
                 if( private_namespaces.size() == 0 )
                 {
-                    cx.error(attrs.pos()-1, kError_InvalidPrivate);
+                    cx.error(attrs.pos(), kError_InvalidPrivate);
                     attrs.namespaces.push_back(cx.publicNamespace()); // for graceful failure
-                    attrs.namespace_ids.push_back("private");
+                    attrs.namespace_ids.push_back(PRIVATE);
                 }
                 else
                 {
                     attrs.namespaces.push_back(private_namespaces.back());
-                    attrs.namespace_ids.push_back("private");
+                    attrs.namespace_ids.push_back(PRIVATE);
                 }
             }
             else
-            if( attrs.hasAttribute("protected") )
+            if( attrs.hasProtected )
             {
                 if (cx.scope().builder instanceof InstanceBuilder)
                 {
                     if( protected_namespaces.size() == 0 )
                     {
-                        cx.error(attrs.pos()-1, kError_InvalidProtected);
+                        cx.error(attrs.pos(), kError_InvalidProtected);
                         attrs.namespaces.push_back(cx.publicNamespace());
-                        attrs.namespace_ids.push_back("protected");
+                        attrs.namespace_ids.push_back(PROTECTED);
                     }
                     else
                     {
                         attrs.namespaces.push_back(protected_namespaces.back());
-                        attrs.namespace_ids.push_back("protected");
+                        attrs.namespace_ids.push_back(PROTECTED);
                     }
                 }
                 else
                 {
                     if( static_protected_namespaces.size() == 0 )
                     {
-                        cx.error(attrs.pos()-1, kError_InvalidProtected);
+                        cx.error(attrs.pos(), kError_InvalidProtected);
                         attrs.namespaces.push_back(cx.publicNamespace());
-                        attrs.namespace_ids.push_back("protected");
+                        attrs.namespace_ids.push_back(PROTECTED);
                     }
                     else
                     {
                         attrs.namespaces.push_back(static_protected_namespaces.back());
-                        attrs.namespace_ids.push_back("protected");
+                        attrs.namespace_ids.push_back(PROTECTED);
                     }
                 }
             }
             else
-            if( attrs.hasAttribute("public") )
+            if( attrs.hasPublic )
             {
                 if( public_namespaces.size() == 0 )
                 {
@@ -3009,7 +3034,7 @@
                 }
             }
             else
-            if( attrs.hasAttribute("internal") )
+            if( attrs.hasInternal )
             {
                 if( public_namespaces.size() == 0 ) // use public namespaces to determine if we are in a valid context for internal
                 {
@@ -3078,7 +3103,7 @@
             namespace_ids.push_back(ns.name);
             NodeFactory nf = cx.getNodeFactory();
             boolean isPublic = ns == cx.publicNamespace();
-            AttributeListNode aln = nf.attributeList(nf.identifier(isPublic?"public":"internal",node.variable.pos()),null);
+            AttributeListNode aln = nf.attributeList(nf.identifier(isPublic?PUBLIC:INTERNAL,false,node.variable.pos()),null);
             if (isPublic)
             {
                 aln.hasPublic = true;
@@ -3107,8 +3132,8 @@
 
             if (node.inPackage() == false && cx.getScopes().size() == 1 && node.attrs != null)
             {
-                if( node.attrs.hasAttribute("public") )
-                    cx.error(node.attrs.pos()-1, kError_InvalidPublic);
+                if( node.attrs.hasAttribute(PUBLIC) )
+                    cx.error(node.attrs.pos(), kError_InvalidPublic);
             }
         }
 
@@ -3141,7 +3166,7 @@
 
         if( bui instanceof InstanceBuilder && node.ref.name.equals(fun_name_stack.back()))
         {
-            cx.error(node.pos()-1, kError_ConstructorsMustBeInstanceMethods);
+            cx.error(node.pos(), kError_ConstructorsMustBeInstanceMethods);
         }
 
         Namespaces open_definition_namespaces ;
@@ -3183,7 +3208,7 @@
             else
             {
                 // If the type didn't resolve to a reference value then it's clearly going to be unknown
-                cx.error(node.variable.type.pos()-1, kError_UnknownType, "");
+                cx.error(node.variable.type.pos(), kError_UnknownType, "");
             }
         }
 
@@ -3237,20 +3262,20 @@
 
                 if (ns.name.length() == 0)
                 {
-                    nsstr += "public";
+                    nsstr += PUBLIC;
                 }
                 else
                 {
                     switch( ns.getNamespaceKind() )
                     {
                         case Context.NS_PRIVATE:
-                            nsstr += "private";
+                            nsstr += PRIVATE;
                             break;
                         case Context.NS_INTERNAL:
-                            nsstr += "internal";
+                            nsstr += INTERNAL;
                             break;
                         case Context.NS_PROTECTED:
-                            nsstr += "protected";
+                            nsstr += PROTECTED;
                             break;
                         default:
                             nsstr += ns.name;
@@ -3271,7 +3296,7 @@
                 if( orig.getType().getTypeValue() == cx.typeType() || orig.isConst() )
                 {
                     // attempting to declare a var with the same name as a class, don't allow that
-                    cx.error(node.variable.identifier.pos()-1, kError_ConflictingNameInNamespace, node.ref.name, "internal");
+                    cx.error(node.variable.identifier.pos(), kError_ConflictingNameInNamespace, node.ref.name, "internal");
                 }
                 else
                 {
@@ -3299,7 +3324,7 @@
             if( orig.declaredBy != obj )
             {
                 String fullname = getFullNameForInheritedSlot(cx, orig.declaredBy, node.ref.name);
-                cx.error(node.variable.identifier.pos()-1, kError_ConflictingInheritedNameInNamespace, fullname, nsstr);
+                cx.error(node.variable.identifier.pos(), kError_ConflictingInheritedNameInNamespace, fullname, nsstr);
             }
             else
             {
@@ -3309,7 +3334,7 @@
                 }
                 else
                 {
-                    cx.error(node.variable.identifier.pos()-1, kError_ConflictingNameInNamespace, node.ref.name, "internal");
+                    cx.error(node.variable.identifier.pos(), kError_ConflictingNameInNamespace, node.ref.name, "internal");
                 }
             }
             if( (node.block != null) ||  // node.block is null for defintions at the top level of the method 
@@ -3399,19 +3424,19 @@
         {
             if( node.attrs.hasVirtual && node.attrs.hasFinal )
             {
-                cx.error(node.attrs.pos()-1, kError_FuncIsVirtualAndFinal);
+                cx.error(node.attrs.pos(), kError_FuncIsVirtualAndFinal);
             }
             if( node.attrs.hasStatic && node.attrs.hasVirtual )
             {
-                cx.error(node.attrs.pos()-1, kError_FuncIsStaticAndVirtual);
+                cx.error(node.attrs.pos(), kError_FuncIsStaticAndVirtual);
             }
             if( node.attrs.hasStatic && node.attrs.hasOverride )
             {
-                cx.error(node.attrs.pos()-1, kError_FuncIsStaticAndOverride);
+                cx.error(node.attrs.pos(), kError_FuncIsStaticAndOverride);
             }
             if( node.attrs.hasStatic && node.attrs.hasDynamic )
             {
-                cx.error(node.attrs.pos()-1, kError_InvalidDynamic);
+                cx.error(node.attrs.pos(), kError_InvalidDynamic);
             }
 
             is_static = node.attrs.hasStatic;
@@ -3433,8 +3458,8 @@
         computeNamespaces(cx,node.attrs,namespaces,namespace_ids);
         if (node.pkgdef == null && cx.getScopes().size() == 1 && node.attrs != null )
         {
-            if( node.attrs.hasAttribute("public") )
-                cx.error(node.attrs.pos()-1, kError_InvalidPublic);
+            if( node.attrs.hasAttribute(PUBLIC) )
+                cx.error(node.attrs.pos(), kError_InvalidPublic);
         }
 
         NodeFactory nodeFactory = cx.getNodeFactory();
@@ -3516,18 +3541,18 @@
         {
             if (is_interface_method && is_native)
             {
-                cx.error(node.pos()-1, kError_InvalidInterfaceNative);
+                cx.error(node.pos(), kError_InvalidInterfaceNative);
             }
             if( node.fexpr.isUserDefinedBody() )
             {
-                cx.error(node.pos()-1, is_interface_method ? kError_InterfaceMethodWithBody : kError_NativeMethodWithBody);
+                cx.error(node.pos(), is_interface_method ? kError_InterfaceMethodWithBody : kError_NativeMethodWithBody);
             }
         }
         else
         {
             if( !node.fexpr.isUserDefinedBody() && !is_ctor && !is_native && !is_dynamic ) //ctors and native and dynamic methods don't need bodies
             {
-                cx.error(node.pos()-1, kError_FunctionWithoutBody);
+                cx.error(node.pos(), kError_FunctionWithoutBody);
             }
         }
 
@@ -3535,12 +3560,12 @@
         {
             if( node.attrs.hasFinal && (!is_instance_method || is_interface_method) )
             {
-                cx.error(node.pos()-1, kError_InvalidFinalUsage);
+                cx.error(node.pos(), kError_InvalidFinalUsage);
             }
             if( is_interface_method && (node.attrs.hasPrivate || node.attrs.hasProtected || node.attrs.hasInternal || node.attrs.hasPublic) && (!node.ref.name.equals("$construct") ))
             {
                 // todo fix error msg
-                cx.error(node.pos()-1, kError_BadAccessInterfaceMember);
+                cx.error(node.pos(), kError_BadAccessInterfaceMember);
             }
         }
 
@@ -3548,7 +3573,7 @@
         {
             if (is_interface_method)
             {
-                cx.error(node.pos()-1, kError_InvalidStatic);
+                cx.error(node.pos(), kError_InvalidStatic);
             }
         }
 
@@ -3557,7 +3582,7 @@
             // Namespace attributes are not allowed on interface methods
             if (node.attrs != null && node.attrs.getUserNamespace() != null)
             {
-                cx.error(node.pos()-1, kError_InterfaceNamespaceAttribute);
+                cx.error(node.pos(), kError_InterfaceNamespaceAttribute);
             }
         }
 
@@ -3642,14 +3667,14 @@
                     {
                     	if( !( namespaces.size() == 1 && hasNamespaces.size() == 1 && namespaces.at(0).isProtected() && hasNamespaces.at(0).isProtected() ) )
                     	{
-                    		cx.error(node.pos()-1, kError_IncompatibleOverride);
+                    		cx.error(node.pos(), kError_IncompatibleOverride);
                     	}
                     }
 
                     int overridden_kind = (slot_id == implied_id) ? kind : EMPTY_TOKEN;
                     if (overridden_kind != node.name.kind && !is_ctor)
                     {
-                        cx.error(node.pos()-1, kError_IncompatibleOverride);
+                        cx.error(node.pos(), kError_IncompatibleOverride);
                     }
 
                     if( true /* check signature and final */ )
@@ -3662,13 +3687,13 @@
                             if( node.name.kind == SET_TOKEN || node.name.kind == GET_TOKEN)
                                 cx.error(node.pos(), kError_OverrideFinalAccessor);
                             else
-                                cx.error(node.pos()-1, kError_FinalMethodRedefinition);
+                                cx.error(node.pos(), kError_FinalMethodRedefinition);
                         }
 
                         if( slot.declaredBy == obj )
                         {
                             // This was already defined at this level, it was not inherited from a base class
-                            cx.error(node.pos()-1, kError_DuplicateFunction);
+                            cx.error(node.pos(), kError_DuplicateFunction);
                         }
                         else if( is_prototype || is_dynamic )
                         {
@@ -3676,7 +3701,7 @@
                         }
                         else if( !is_override && !is_ctor )
                         {
-                            cx.error(node.pos()-1, kError_OverrideOfFuncNotMarkedForOverride);
+                            cx.error(node.pos(), kError_OverrideOfFuncNotMarkedForOverride);
                         }
 
                         if( node.name.kind == GET_TOKEN )
@@ -3727,12 +3752,12 @@
             else
             if (bui instanceof GlobalBuilder && (node.pkgdef != null || namespaces.at(0) != hasNamespaces.at(0)) && is_first_time )
             {
-                cx.error(node.pos()-1, kError_DuplicateFunction);
+                cx.error(node.pos(), kError_DuplicateFunction);
             }
             else
             if( cx.useStaticSemantics() && is_first_time ) // ISSUE: remove use of this flag by not evaluating this code twice
             {
-                cx.error(node.pos()-1, kError_DuplicateFunction);
+                cx.error(node.pos(), kError_DuplicateFunction);
             }
             else
             {
@@ -3745,7 +3770,7 @@
             {
                 if (is_interface_method)
                 {
-                    cx.error(node.pos()-1, kError_InvalidOverrideUsage);
+                    cx.error(node.pos(), kError_InvalidOverrideUsage);
                 }
                 else
                 {
@@ -3753,11 +3778,11 @@
                     UnresolvedNamespace un = n instanceof UnresolvedNamespace ? (UnresolvedNamespace) n : null;
                     if( un == null || un.resolved )
                     {
-                        cx.error(node.pos()-1, kError_OverrideNotFound);
+                        cx.error(node.pos(), kError_OverrideNotFound);
                     }
                     else
                     {
-                        cx.error(un.node.pos()-1, kError_Unknown_Namespace);
+                        cx.error(un.node.pos(), kError_Unknown_Namespace);
                     }
                 }
             }
@@ -3943,7 +3968,7 @@
             node.typeref = ((val instanceof ReferenceValue) ? (ReferenceValue)val : null);
             if( node.typeref == null )
             {
-                cx.error(node.result.pos()-1, kError_UnknownType);
+                cx.error(node.result.pos(), kError_UnknownType);
             }
             else
             {
@@ -4013,7 +4038,7 @@
             }
             else
             {
-                cx.error(node.type.pos()-1, kError_UnknownType);
+                cx.error(node.type.pos(), kError_UnknownType);
             }
         }
 
@@ -4207,22 +4232,22 @@
                 is_intrinsic = node.attrs.hasIntrinsic;
                 if( node.attrs.hasNative )
                 {
-                    cx.error(node.pos()-1, kError_InvalidNative);
+                    cx.error(node.pos(), kError_InvalidNative);
                 }
 				// Note: node.attrs.hasOverride will have already been checked
 				// by the hoisted_defs test in StatementListNode
                 /*if( node.attrs.hasOverride )
                 {
-                    cx.error(node.pos()-1, kError_InvalidOverride);
+                    cx.error(node.pos(), kError_InvalidOverride);
                 }*/
             }
 
             if( cx.getScopes().size() > 1 )
             {
                 if (node.isInterface())
-                    cx.error(node.pos()-1, kError_InvalidInterfaceNesting);
+                    cx.error(node.pos(), kError_InvalidInterfaceNesting);
                 else
-                    cx.error(node.pos()-1, kError_InvalidClassNesting);
+                    cx.error(node.pos(), kError_InvalidClassNesting);
             }
 
             // Only do the following once
@@ -4240,8 +4265,8 @@
                 computeNamespaces(cx,node.attrs,node.namespaces,namespace_ids);
                 if (node.pkgdef == null && cx.getScopes().size() == 1 && node.attrs != null)
                 {
-                    if( node.attrs.hasAttribute("public") )
-                        cx.error(node.attrs.pos()-1, kError_InvalidPublic);
+                    if( node.attrs.hasAttribute(PUBLIC) )
+                        cx.error(node.attrs.pos(), kError_InvalidPublic);
                 }
 
                 Value val = node.name.evaluate(cx,this);
@@ -4268,7 +4293,7 @@
                     node.cframe.type = cx.typeType().getDefaultTypeInfo();
                     if( node.cframe.prototype != null )
                     {
-                    	node.cframe.prototype.clearInstance(cx,new InstanceBuilder(fullname),node.cframe, "",true);
+                    	node.cframe.prototype.clearInstance(cx,new InstanceBuilder(fullname),node.cframe, ObjectValue.EMPTY_STRING, true);
                     	node.iframe = node.cframe.prototype;
                     }
                     else
@@ -4324,11 +4349,11 @@
                 {
                     if( node.isInterface() )
                     {
-                        cx.error( node.name.pos()-1, kError_DuplicateInterfaceDefinition, node.ref.name);
+                        cx.error( node.name.pos(), kError_DuplicateInterfaceDefinition, node.ref.name);
                     }
                     else
                     {
-                        cx.error( node.name.pos()-1, kError_DuplicateClassDefinition, node.ref.name);
+                        cx.error( node.name.pos(), kError_DuplicateClassDefinition, node.ref.name);
                         found_circular_or_duplicate_class_definition = true;
                     }
                 }
@@ -4414,7 +4439,7 @@
                     if( node.baseref == null )
                     {
                         // uh oh, didn't resolve to anything, but we have a baseclass expression
-                        cx.error(node.baseclass.pos()-1, kError_InvalidBaseTypeExpression);
+                        cx.error(node.baseclass.pos(), kError_InvalidBaseTypeExpression);
                     }
                 }
             }
@@ -4427,19 +4452,19 @@
                 if (type == null)
                 {
                     // stay silent. we'll report this in the else part...
-                    // cx.error(node.baseclass.pos()-1, kError_UnknownBaseClass);
+                    // cx.error(node.baseclass.pos(), kError_UnknownBaseClass);
                 }
                 else
                 if( type.builder.is_final )
                 {
                     // stay silent. we'll report this in the else part...
-                    // cx.error(node.baseclass.pos()-1, kError_BaseClassIsFinal);
+                    // cx.error(node.baseclass.pos(), kError_BaseClassIsFinal);
                 }
                 else
                 if ( type.builder instanceof ClassBuilder && ((ClassBuilder)type.builder).is_interface )
                 {
                     // stay silent. we'll report this in the else part...
-                    // cx.error(node.baseclass.pos()-1, node.isInterface() ? kError_CannotExtendClass : kError_CannotExtendInterface);
+                    // cx.error(node.baseclass.pos(), node.isInterface() ? kError_CannotExtendClass : kError_CannotExtendInterface);
                 }
                 else
                 {
@@ -4472,7 +4497,7 @@
                         if (t == null)
                         {
                             // stay silent. we'll report this in the else part...
-                            // cx.error(node.baseclass.pos()-1, kError_UnknownBaseClass);
+                            // cx.error(node.baseclass.pos(), kError_UnknownBaseClass);
                         }
                         else
                         {
@@ -4518,17 +4543,17 @@
 
                 if (type == null)
                 {
-                    cx.error(node.baseclass.pos()-1, kError_UnknownBaseClass, node.baseref.name);
+                    cx.error(node.baseclass.pos(), kError_UnknownBaseClass, node.baseref.name);
                 }
                 else
                 if( type.builder.is_final )
                 {
-                    cx.error(node.baseclass.pos()-1, kError_BaseClassIsFinal);
+                    cx.error(node.baseclass.pos(), kError_BaseClassIsFinal);
                 }
                 else
                 if ( type.builder instanceof ClassBuilder && ((ClassBuilder)type.builder).is_interface )
                 {
-                    cx.error(node.baseclass.pos()-1, kError_CannotExtendInterface);
+                    cx.error(node.baseclass.pos(), kError_CannotExtendInterface);
                 }
                 else
                 {
@@ -4573,7 +4598,7 @@
 
                         if (t == null )
                         {
-                            cx.error(node.interfaces.items.get(i).pos()-1, kError_UnknownInterface, ref.name);
+                            cx.error(node.interfaces.items.get(i).pos(), kError_UnknownInterface, ref.name);
                         }
                         else
                         {
@@ -4581,13 +4606,13 @@
                             {
                                 if (!(((ClassBuilder)t.builder).is_interface))
                                 {
-                                    cx.error(node.interfaces.items.get(i).pos()-1, kError_CannotExtendClass, ref.name);
+                                    cx.error(node.interfaces.items.get(i).pos(), kError_CannotExtendClass, ref.name);
                                 }
                                 else
                                 {
                                     if( seen_interfs.contains(t) )
                                     {
-                                        cx.error(node.interfaces.items.get(i).pos()-1, kError_DuplicateImplements, node.ref.name, ref.name);
+                                        cx.error(node.interfaces.items.get(i).pos(), kError_DuplicateImplements, node.ref.name, ref.name);
                                     }
                                     else
                                     {
@@ -4604,14 +4629,14 @@
                             }
                             else
                             {
-                                cx.error(node.interfaces.items.get(i).pos()-1, kError_UnknownInterface, ref.name);
+                                cx.error(node.interfaces.items.get(i).pos(), kError_UnknownInterface, ref.name);
                             }
                         }
                     }
                     else
                     {
                         // uh oh, didn't resolve to anything, but we have a baseclass expression
-                        cx.error(node.interfaces.items.get(i).pos()-1, kError_InvalidInterfaceTypeExpression);
+                        cx.error(node.interfaces.items.get(i).pos(), kError_InvalidInterfaceTypeExpression);
                     }
                 }
             }
@@ -4739,7 +4764,7 @@
                 nf.has_arguments = false;
 
                 FunctionCommonNode fexpr = nf.functionCommon(cx, fname.identifier, nf.functionSignature(null, null, 0), null, 0);
-                AttributeListNode attrs = nf.attributeList(nf.identifier("public",0),null);
+                AttributeListNode attrs = nf.attributeList(nf.identifier(PUBLIC,false,0),null);
                 attrs.evaluate(cx,this);
                 FunctionDefinitionNode fdef = nf.functionDefinition(cx, attrs, fname, fexpr);
                 fdef.pkgdef = node.pkgdef;
@@ -4887,19 +4912,19 @@
 		            if (type == null)
 		            {
 		                // stay silent. we'll report this in the else part...
-		                // cx.error(node.baseclass.pos()-1, kError_UnknownBaseClass);
+		                // cx.error(node.baseclass.pos(), kError_UnknownBaseClass);
 		            }
 		            else
 		            if( type.builder.is_final )
 		            {
 		                // stay silent. we'll report this in the else part...
-		                // cx.error(node.baseclass.pos()-1, kError_BaseClassIsFinal);
+		                // cx.error(node.baseclass.pos(), kError_BaseClassIsFinal);
 		            }
 	                else
 	                if ( type.builder instanceof ClassBuilder && ((ClassBuilder)type.builder).is_interface )
 	                {
 	                    // stay silent. we'll report this in the else part...
-	                    // cx.error(node.baseclass.pos()-1, node.isInterface() ? kError_CannotExtendClass : kError_CannotExtendInterface);
+	                    // cx.error(node.baseclass.pos(), node.isInterface() ? kError_CannotExtendClass : kError_CannotExtendInterface);
 	                }
 	                else
 	                {
@@ -4934,7 +4959,7 @@
 							// the library with the parent class (e.g., playerglobal.swc)
 							// ... it's a fatal error, because we'd just throw a NullPointerException
 							// in the scanInterfaceMethods call below. (srj)
-							cx.error(node.pos()-1, kError_UnknownType, ref.toMultiName());
+							cx.error(node.pos(), kError_UnknownType, ref.toMultiName());
 							continue;
 						}
                         interface_refs.push_back(ref);
@@ -5110,7 +5135,7 @@
         Slot slot = ref!=null?ref.getSlot(cx):null;
         if( slot == null )
         {
-            cx.internalError(node.pos()-1, "internal error in FA::InterfaceDefinitionNode has no slot");
+            cx.internalError(node.pos(), "internal error in FA::InterfaceDefinitionNode has no slot");
             return null;
         }
         slot.setImplNode(node);  // use this to validate class definitions during CE
@@ -5121,23 +5146,23 @@
         {
             if (node.attrs.hasFinal)
             {
-                cx.error(node.pos()-1,kError_InvalidInterfaceAttribute, "final");
+                cx.error(node.pos(),kError_InvalidInterfaceAttribute, "final");
             }
             if (node.attrs.hasDynamic)
             {
-                cx.error(node.pos()-1,kError_InvalidInterfaceAttribute, "dynamic");
+                cx.error(node.pos(),kError_InvalidInterfaceAttribute, "dynamic");
             }
             if (node.attrs.hasNative)
             {
-                cx.error(node.pos()-1,kError_InvalidInterfaceAttribute, "native");
+                cx.error(node.pos(),kError_InvalidInterfaceAttribute, "native");
             }
             if (node.attrs.hasPrivate)
             {
-                cx.error(node.pos()-1,kError_InvalidInterfaceAttribute, "private");
+                cx.error(node.pos(),kError_InvalidInterfaceAttribute, PRIVATE);
             }
             if (node.attrs.hasProtected)
             {
-                cx.error(node.pos()-1,kError_InvalidInterfaceAttribute, "protected");
+                cx.error(node.pos(),kError_InvalidInterfaceAttribute, PROTECTED);
             }
         }
 
@@ -5200,48 +5225,48 @@
             Node n = node.items.get(i);
             if( n != null )
             {
-                if( n.hasAttribute("private") )
+                if( n.hasAttribute(PRIVATE) )
                 {
                     if( setPrivate )
                     {
-                        cx.error(n.pos()-1, kError_DuplicateAttribute, "private");
+                        cx.error(n.pos(), kError_DuplicateAttribute, PRIVATE);
                     }
                     setPrivate = node.hasPrivate = true;
                 }
                 else
-                if( n.hasAttribute("protected") )
+                if( n.hasAttribute(PROTECTED) )
                 {
                     if( setProtected )
                     {
-                        cx.error(n.pos()-1, kError_DuplicateAttribute, "protected");
+                        cx.error(n.pos(), kError_DuplicateAttribute, PROTECTED);
                     }
                     setProtected = node.hasProtected = true;
                 }
                 else
-                if( n.hasAttribute("public") )
+                if( n.hasAttribute(PUBLIC) )
                 {
                     if( setPublic )
                     {
-                        cx.error(n.pos()-1, kError_DuplicateAttribute, "public");
+                        cx.error(n.pos(), kError_DuplicateAttribute, PUBLIC);
                     }
                     setPublic = node.hasPublic = true;
                 }
                 else
-                if( n.hasAttribute("internal") )
+                if( n.hasAttribute(INTERNAL) )
                 {
                     if( setInternal )
                     {
-                        cx.error(n.pos()-1, kError_DuplicateAttribute, "internal");
+                        cx.error(n.pos(), kError_DuplicateAttribute, INTERNAL);
                     }
                     setInternal = node.hasInternal = true;
                 }
                 else
                 {
-                    if( n.hasAttribute("prototype") )
+                    if( n.hasAttribute(PROTOTYPE) )
                     {
                         if( setPrototype )
                         {
-                            cx.error(n.pos()-1, kError_DuplicateAttribute, "prototype");
+                            cx.error(n.pos(), kError_DuplicateAttribute, PROTOTYPE);
                         }
                         setPrototype = node.hasPrototype = true;
                     }
@@ -5263,25 +5288,25 @@
                         {
                             if( obj == ObjectValue.intrinsicAttribute ) {
                                 node.hasIntrinsic = true;
-                                cx.error(n.pos()-1, kError_Unsupported_Intrinsic);
+                                cx.error(n.pos(), kError_Unsupported_Intrinsic);
                             }
                             else
                             if( obj == ObjectValue.staticAttribute ) {
                                 if( setStatic )
                                 {
-                                    cx.error(n.pos()-1, kError_DuplicateAttribute, "static");
+                                    cx.error(n.pos(), kError_DuplicateAttribute, STATIC);
                                 }
                                 setStatic = node.hasStatic = true;
                                 if( !(cx.scope().builder instanceof InstanceBuilder) && !(cx.scope().builder instanceof ClassBuilder))
                                 {
-                                    cx.error(n.pos()-1, kError_InvalidStatic);
+                                    cx.error(n.pos(), kError_InvalidStatic);
                                 }
                             }
                             else
                             if( obj == ObjectValue.dynamicAttribute ) {
                                 if( setDynamic )
                                 {
-                                    cx.error(n.pos()-1, kError_DuplicateAttribute, "dynamic");
+                                    cx.error(n.pos(), kError_DuplicateAttribute, "dynamic");
                                 }
                                 setDynamic = node.hasDynamic = true;
                             }
@@ -5289,19 +5314,19 @@
                             if( obj == ObjectValue.virtualAttribute ) {
                                 if( setVirtual )
                                 {
-                                    cx.error(n.pos()-1, kError_DuplicateAttribute, "virtual");
+                                    cx.error(n.pos(), kError_DuplicateAttribute, "virtual");
                                 }
                                 setVirtual = node.hasVirtual = true;   // error if has final too
                                 if( !(cx.scope().builder instanceof InstanceBuilder) && !(cx.scope().builder instanceof ClassBuilder) )
                                 {
-                                    cx.error(n.pos()-1, kError_InvalidVirtual);
+                                    cx.error(n.pos(), kError_InvalidVirtual);
                                 }
                             }
                             else
                             if( obj == ObjectValue.finalAttribute ) {
                                 if( setFinal )
                                 {
-                                    cx.error(n.pos()-1, kError_DuplicateAttribute, "final");
+                                    cx.error(n.pos(), kError_DuplicateAttribute, "final");
                                 }
                                 setFinal = node.hasFinal = true;    // error if has virtual too
                             }
@@ -5309,19 +5334,19 @@
                             if( obj == ObjectValue.overrideAttribute ) {
                                 if( setOverride )
                                 {
-                                    cx.error(n.pos()-1, kError_DuplicateAttribute, "override");
+                                    cx.error(n.pos(), kError_DuplicateAttribute, "override");
                                 }
                                 setOverride = node.hasOverride = true;
                                 if( !(cx.scope().builder instanceof InstanceBuilder) && !(cx.scope().builder instanceof ClassBuilder) )
                                 {
-                                    cx.error(n.pos()-1, kError_InvalidOverride);
+                                    cx.error(n.pos(), kError_InvalidOverride);
                                 }
                             }
                             else
                             if( obj == ObjectValue.nativeAttribute ) {
                                 if( setNative )
                                 {
-                                    cx.error(n.pos()-1, kError_DuplicateAttribute, "native");
+                                    cx.error(n.pos(), kError_DuplicateAttribute, "native");
                                 }
                                 setNative = node.hasNative = true;
                             }
@@ -5334,7 +5359,7 @@
                                         node.hasFalse = true;
                                     }
                                     if( !(cx.scope().builder instanceof ClassBuilder || cx.scope().builder instanceof InstanceBuilder) )                                    {
-                                        cx.error(node.pos()-1, kError_InvalidNamespace);
+                                        cx.error(node.pos(), kError_InvalidNamespace);
                                     }
                                     else
                                     {
@@ -5348,7 +5373,7 @@
                         {
                             if( !(cx.scope().builder instanceof ClassBuilder || cx.scope().builder instanceof InstanceBuilder) )
                             {
-                                cx.error(node.pos()-1, kError_InvalidNamespace);
+                                cx.error(node.pos(), kError_InvalidNamespace);
                             }
                             else
                             {
@@ -5373,7 +5398,7 @@
                 if (!(ns instanceof NamespaceValue))
                 {
                     // Error: Not a namespace attribute
-                    cx.error(node.pos()-1, kError_InvalidAttribute);
+                    cx.error(node.pos(), kError_InvalidAttribute);
                 }
                 else if (!foundUserNamespace)
                 {
@@ -5382,7 +5407,7 @@
                 }
                 else
                 {
-                    cx.error(node.pos()-1, kError_MultipleNamespaceAttributes);
+                    cx.error(node.pos(), kError_MultipleNamespaceAttributes);
                     break;
                 }
             }
@@ -5391,12 +5416,12 @@
         // Only one of public, private, protected, internal may be used.
         if (((node.hasPrivate?1:0) + (node.hasPublic?1:0) + (node.hasProtected?1:0) + (node.hasInternal?1:0)) > 1)
         {
-            cx.error(node.pos()-1, kError_ConflictingAccessSpecifiers);
+            cx.error(node.pos(), kError_ConflictingAccessSpecifiers);
         }
 
         if (node.hasUserNamespace() && (node.hasPrivate || node.hasPublic || node.hasProtected || node.hasInternal))
         {
-               cx.error(node.pos()-1, kError_NamespaceAccessSpecifiers);
+               cx.error(node.pos(), kError_NamespaceAccessSpecifiers);
         }
 
         return null;
@@ -5639,7 +5664,7 @@
             }
             else
             {
-                cx.error(node.name.pos()-1, kError_Unknown_Namespace);
+                cx.error(node.name.pos(), kError_Unknown_Namespace);
             }
         }
         return null;
@@ -5698,14 +5723,14 @@
                     super_context.set(super_context.size()-1, super_error2);
                     break;
             case super_error2:
-                cx.error(node.pos()-1,kError_IllegalSuperStatement);
+                cx.error(node.pos(),kError_IllegalSuperStatement);
                 break;
             case super_error_es4:
-            	cx.error(node.pos()-1, kError_InvalidES4SuperStatement);
+            	cx.error(node.pos(), kError_InvalidES4SuperStatement);
             	break;
             case super_error:
             default:
-                cx.error(node.pos()-1,kError_InvalidSuperStatement);
+                cx.error(node.pos(),kError_InvalidSuperStatement);
                 break;
         }
 
@@ -5741,9 +5766,9 @@
 
         // If this is a toplevel definition (pkgdef!=null), then set up access namespaces
 
-        if( node.attrs != null && node.attrs.hasAttribute("static") )
+        if( node.attrs != null && node.attrs.hasAttribute(STATIC) )
         {
-            cx.error(node.attrs.pos()-1, kError_StaticModifiedNamespace);
+            cx.error(node.attrs.pos(), kError_StaticModifiedNamespace);
         }
 
         if( node.pkgdef != null && cx.getScopes().size() == 1 )
@@ -5778,7 +5803,7 @@
         Namespaces hasNamespaces = obj.hasNames(cx,GET_TOKEN,node.ref.name,namespaces);
         if( hasNamespaces != null )
         {
-    		cx.error(node.pos()-1, kError_DuplicateNamespaceDefinition);
+            cx.error(node.pos(), kError_DuplicateNamespaceDefinition);
         }
         else
         {
@@ -5839,7 +5864,7 @@
             slot.setConst(true);
             if( slot.getObjectValue() == null )
             {
-                cx.error(node.value.pos()-1, kError_InvalidNamespaceInitializer);
+                cx.error(node.value.pos(), kError_InvalidNamespaceInitializer);
             }
 
             node.needs_init = true; // need to re-evaluate to get this definition into the def_bits for the block
@@ -5876,7 +5901,8 @@
             unresolved.clear();
 
             node.ref = (ReferenceValue)node.expr.evaluate(cx,this);
-            obj = ((node.ref.getValue(cx) instanceof ObjectValue) ? (ObjectValue)node.ref.getValue(cx) : null);
+            Value value = node.ref.getValue(cx);
+            obj = ((value instanceof ObjectValue) ? (ObjectValue) value : null);
 
             ns_unresolved_sets.last().addAll(unresolved);
             unresolved.clear();
Index: modules/asc/src/java/macromedia/asc/semantics/ObjectValue.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/ObjectValue.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/ObjectValue.java	(working copy)
@@ -60,6 +60,8 @@
 
 public class ObjectValue extends Value implements Comparable
 {
+    static final String EMPTY_STRING = "".intern();
+
     public static void NamespacesFromQualifiers(Qualifiers quals,Namespaces namespaces)
     {
         namespaces.clear();
@@ -141,15 +143,15 @@
 
     public Builder builder;
     public TypeInfo type;
-    private String value = "";
+    private String value = EMPTY_STRING;
 
     private Names names;  // Names table
     public Slots slots;         // Slots table, null=empty
 //    private Values values;       // Values table, null=empty
     public ObjectValue _proto_;
-    public String name = "";
-    public String classname = "";
-    public String debug_name = "";
+    public String name = EMPTY_STRING;
+    public String classname = EMPTY_STRING;
+    public String debug_name = EMPTY_STRING;
     
     ObjectList<ObjectValue> base_objs; // can be interfaces, or base class
     private ObjectValue protected_ns;
@@ -219,13 +221,13 @@
 
     public ObjectValue(Context cx, Builder builder, TypeValue type)
     {
-        clearInstance(cx, builder, type, "", false);
+        clearInstance(cx, builder, type, EMPTY_STRING, false);
     }
 
     public void clearInstance(Context cx, Builder builder, TypeValue type, String name, boolean save_slot_ids)
     {
         flags = 0;
-        value = "";
+        value = EMPTY_STRING;
         names = null;
         if( save_slot_ids && slots != null && slots.size() > 0)
         {
@@ -233,8 +235,8 @@
         }
         slots = null;
 //        values = null;
-        classname = "";
-        debug_name = "";
+        classname = EMPTY_STRING;
+        debug_name = EMPTY_STRING;
 //        baseMethodNames = null;
         deferredClassMap = null;
         base_objs = null;
@@ -250,7 +252,8 @@
         method_info = -1;
         initInstance(null, type);
         builder.build(cx, this);
-        this.name = name.intern();
+        assert name.intern() == name;
+        this.name = name;
     }
 
     static Slot nullSlot = new MethodSlot((TypeValue)null, 0);
@@ -800,8 +803,8 @@
 
     public String toString() {
        if(Node.useDebugToStrings)
-          return ("ObjVal: <" + type + "> " + (name != null ? name.toString() : "")
-              + ((names != null && names.size()>0) ? "\nmethods: " + names.toString() : ""));
+          return ("ObjVal: <" + type + "> " + (name != null ? name.toString() : EMPTY_STRING)
+              + ((names != null && names.size()>0) ? "\nmethods: " + names.toString() : EMPTY_STRING));
        else
           return getValue();
     }
Index: modules/asc/src/java/macromedia/asc/semantics/ReferenceValue.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/ReferenceValue.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/ReferenceValue.java	(working copy)
@@ -46,7 +46,7 @@
     public boolean is_nullable = true;
     public boolean has_nullable_anno = false;
 
-    public void setPosition(int pos) { src_position = pos-1; }
+    public void setPosition(int pos) { src_position = pos; }
     public int getPosition() { return src_position; }
 
     public ReferenceValue(Context cx, ObjectValue base, String name, ObjectValue qualifier)
Index: modules/asc/src/java/macromedia/asc/semantics/TypeValue.java
===================================================================
--- modules/asc/src/java/macromedia/asc/semantics/TypeValue.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/semantics/TypeValue.java	(working copy)
@@ -34,20 +34,20 @@
 	{
 	}
 
-	public static TypeValue newTypeValue(Context cx, Builder builder, QName name, int type_id)
-	{
-		String fullname = name.toString();
-		TypeValue type = cx.userDefined(fullname);
-		if (type == null)
-		{
-			type = new TypeValue(cx, builder, name, type_id);
-			cx.setUserDefined(fullname, type);
-		}
-		else
-		{
-			type.clearInstance(cx, builder, null, name.toString(), false);
-			type.type_id = type_id;
-			// Don't clear the prototype, we can reuse the object value
+    public static TypeValue newTypeValue(Context cx, Builder builder, QName name, int type_id)
+    {
+        String fullname = name.toString();
+        TypeValue type = cx.userDefined(fullname);
+        if (type == null)
+        {
+            type = new TypeValue(cx, builder, name, type_id);
+            cx.setUserDefined(fullname, type);
+        }
+        else
+        {
+            type.clearInstance(cx, builder, null, fullname.intern(), false);
+            type.type_id = type_id;
+            // Don't clear the prototype, we can reuse the object value
 //			type.prototype.clearInstance() = null;
 			type.name = name;
 			type.type = null;
Index: modules/asc/src/java/macromedia/asc/util/BitSet.java
===================================================================
--- modules/asc/src/java/macromedia/asc/util/BitSet.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/util/BitSet.java	(working copy)
@@ -258,7 +258,7 @@
     
     public String toString()
     {
-    	StringBuffer b = new StringBuffer("{");
+    	StringBuilder b = new StringBuilder("{");
     	if (bits != null)
 			for (int i=0, n=bits.length<<6; i < n; i++)
 			{
Index: modules/asc/src/java/macromedia/asc/util/Context.java
===================================================================
--- modules/asc/src/java/macromedia/asc/util/Context.java	(revision 3507)
+++ modules/asc/src/java/macromedia/asc/util/Context.java	(working copy)
@@ -212,7 +212,7 @@
 
     // This method implements sprintf-like functionality for %s string argument insertions.  Using sprintf would
     //  be easier, but java doesn't have an equivalent.  c++ matches java implementation to make it easier to keep both in sync.
-    public static int replaceStringArg(StringBuffer out, String templateStr, int startLoc, String arg)
+    public static int replaceStringArg(StringBuilder out, String templateStr, int startLoc, String arg)
     {
         if (startLoc == -1) // there are no more %'s to replace in templateStr
             return -1;
@@ -247,7 +247,7 @@
     public void error(int pos, int error, String arg1, String arg2) { error(pos, error, arg1, arg2, ""); }
     public void error(int pos, int error, String arg1, String arg2, String arg3)
     {
-        StringBuffer out = new StringBuffer();
+        StringBuilder out = new StringBuilder();
 
         // Just the arguments for sanities, no message (since they change often)
         if(ContextStatics.useSanityStyleErrors)
@@ -765,7 +765,7 @@
                 {
                     if ( !isExplicit && actual[0].getTypeValue() != noType()) // always allow coercion from Object.  Just too common a problem without this
                     {
-                        error(expr.pos()-1, kError_ImplicitCoercionToSubtype, actual[0].getName(this).toString(), expected.getName(this).toString());
+                        error(expr.pos(), kError_ImplicitCoercionToSubtype, actual[0].getName(this).toString(), expected.getName(this).toString());
                     }
                 }
                 else if ( expected.getTypeValue() == stringType() && (actual[0].getTypeValue() == xmlType() || actual[0].getTypeValue() == xmlListType()) )
@@ -777,7 +777,7 @@
                     (expected.getTypeValue() == uintType() && (actual[0].getTypeValue() == intType() || actual[0].getTypeValue() == numberType())) ||
                     (expected.getTypeValue() == intType() && (actual[0].getTypeValue() == uintType() || actual[0].getTypeValue() == numberType())) )) // always allow coercion between number types
                 {
-                    error(expr.pos()-1, kError_ImplicitCoercisionOfUnrelatedType, actual[0].getName(this).toString(), expected.getName(this).toString());
+                    error(expr.pos(), kError_ImplicitCoercisionOfUnrelatedType, actual[0].getName(this).toString(), expected.getName(this).toString());
                 }
             }
         }
@@ -1417,7 +1417,7 @@
                 else
                 {
                     // must use the context in effect when the unresolvedNamespace was created.  The node may have come from an included file.
-                    ns.cx.error(ns.node.pos()-1, kError_Unknown_Namespace);
+                    ns.cx.error(ns.node.pos(), kError_Unknown_Namespace);
                 }
 
                 // null out the Context object. it's no longer used. UnresolvedNamespace instances may be referenced
@@ -1435,7 +1435,7 @@
     public String debugName(String region_part, String name, ObjectList<String> namespace_ids, int kind )
     {
         String kind_part = kind==GET_TOKEN?"/get":(kind==SET_TOKEN?"/set":"");
-        StringBuffer namespace_part = new StringBuffer(region_part.length() + name.length() + kind_part.length() + ((namespace_ids != null ? namespace_ids.size() * 8 : 0)));
+        StringBuilder namespace_part = new StringBuilder(region_part.length() + name.length() + kind_part.length() + ((namespace_ids != null ? namespace_ids.size() * 8 : 0)));
         namespace_part.append(region_part);
         int region_part_length = region_part.length();
         if (region_part_length > 0)
@@ -1500,12 +1500,12 @@
     
     public String getConfigVarCode() {
         String code = null;
-        StringBuffer code_buffer;
+        StringBuilder code_buffer;
         if( config_vars != null && config_vars.size() > 0)
         {
         	HashSet<String> namespaces = new HashSet<String>();
         	// guesstimate.  Should avoid resizing too many times.
-            code_buffer = new StringBuffer(config_vars.size()*10);
+            code_buffer = new StringBuilder(config_vars.size()*10);
             for( int i = 0, size = config_vars.size(); i < size; ++i )
             {
                 ConfigVar cv = config_vars.at(i);
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ClassInstantiationErr3.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ClassInstantiationErr3.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ClassInstantiationErr3.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1139: Variable declarations are not permitted in interfaces.
-   ClassInstantiationErr3.as, Ln 6, Col 8: 
-   	 var a = new A();
-   .......^
-
+\[Compiler\] Error #1139: Variable declarations are not permitted in interfaces.
+.*ClassInstantiationErr3.as, Ln 6, Col 7:
+var a = new A\(\);
+......^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ClassInstantiationErr5.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ClassInstantiationErr5.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ClassInstantiationErr5.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1105: Target of assignment must be a reference value.
-   ClassInstantiationErr5.as, Ln 7, Col 7: 
-   	new A() = new B();
-   ......^
-
+\[Compiler\] Error #1105: Target of assignment must be a reference value.
+.*ClassInstantiationErr5.as, Ln 7, Col 6:
+new A\(\) = new B\(\);
+.....^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ConstructorReturnTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ConstructorReturnTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/ConstructorReturnTypeErr.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1130: A constructor cannot specify a return type.
-   ConstructorReturnTypeErr.as, Ln 18, Col 20: 
-   		public function Bar():Bar{}
-   ...................^
-
+\[Compiler\] Error #1130: A constructor cannot specify a return type.
+.*ConstructorReturnTypeErr.as, Ln 18, Col 19:
+public function Bar\(\):Bar\{\}
+..................^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynClassWithConsWithReturnTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynClassWithConsWithReturnTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynClassWithConsWithReturnTypeErr.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1130: A constructor cannot specify a return type.
-   dynClassWithConsWithReturnTypeErr.as, Ln 7, Col 34: 
-                   public function dynClassWithConsWithReturnTypeErr\(a:Nu...
-   .................................^
-
+\[Compiler\] Error #1130: A constructor cannot specify a return type.
+.*dynClassWithConsWithReturnTypeErr.as, Ln 7, Col 33:
+public function dynClassWithConsWithReturnTypeErr\(a:Nu...
+................................^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynClassWithParamConsWithReturnErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynClassWithParamConsWithReturnErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynClassWithParamConsWithReturnErr.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1051: Return value must be undefined.
-   dynClassWithParamConsWithReturnErr.as, Ln 11, Col 87: 
-                                                                            return z=x\+y;
-   ......................................................................................^
-
+\[Compiler\] Error #1051: Return value must be undefined.
+.*dynClassWithParamConsWithReturnErr.as, Ln 11, Col 86:
+return z=x\+y;
+.....................................................................................^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynpubClassWithintConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynpubClassWithintConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynpubClassWithintConsErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1153: A constructor can only be declared public.
-   dynpubClassWithintConsErr.as, Ln 5, Col 36: 
+   dynpubClassWithintConsErr.as, Ln 5, Col 35: 
                    internal function dynpubClassWithintCons(){
-   ...................................^
+   ..................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynpubClassWithPrivConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynpubClassWithPrivConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/dynpubClassWithPrivConsErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1153: A constructor can only be declared public.
-   dynpubClassWithPrivConsErr.as, Ln 6, Col 35: 
+   dynpubClassWithPrivConsErr.as, Ln 6, Col 34: 
                    private function dynpubClassWithPrivCons(){
-   ..................................^
+   .................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/intClassWithConsWithReturnTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/intClassWithConsWithReturnTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/intClassWithConsWithReturnTypeErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1130: A constructor cannot specify a return type.
-   intClassWithConsWithReturnTypeErr.as, Ln 7, Col 34: 
+   intClassWithConsWithReturnTypeErr.as, Ln 7, Col 33: 
                    public function intClassWithConsWithReturnTypeErr\(a:Nu...
-   .................................^
+   ................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/intClassWithParamConsWithReturnErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/intClassWithParamConsWithReturnErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/intClassWithParamConsWithReturnErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1051: Return value must be undefined.
-   intClassWithParamConsWithReturnErr.as, Ln 10, Col 87: 
+   intClassWithParamConsWithReturnErr.as, Ln 10, Col 86: 
                                                                             return z=x\+y; 
-   ......................................................................................^
+   .....................................................................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/internalClassWithPrivConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/internalClassWithPrivConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/internalClassWithPrivConsErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1153: A constructor can only be declared public.
-   internalClassWithPrivConsErr.as, Ln 6, Col 35: 
+   internalClassWithPrivConsErr.as, Ln 6, Col 34: 
                    private function internalClassWithPrivCons(){
-   ..................................^
+   .................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/pubClassWithConsWithReturnTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/pubClassWithConsWithReturnTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/pubClassWithConsWithReturnTypeErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1130: A constructor cannot specify a return type.
-   pubClassWithConsWithReturnTypeErr.as, Ln 7, Col 34: 
+   pubClassWithConsWithReturnTypeErr.as, Ln 7, Col 33: 
                    public function pubClassWithConsWithReturnTypeErr\(a:Nu...
-   .................................^
+   ................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/pubClassWithParamConsWithReturnErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/pubClassWithParamConsWithReturnErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/pubClassWithParamConsWithReturnErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1051: Return value must be undefined.
-   pubClassWithParamConsWithReturnErr.as, Ln 12, Col 87: 
+   pubClassWithParamConsWithReturnErr.as, Ln 12, Col 86: 
                                                                             return z=x\+y;
-   ......................................................................................^
+   .....................................................................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/publicClassWithinternalConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/publicClassWithinternalConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/publicClassWithinternalConsErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1153: A constructor can only be declared public.
-   publicClassWithinternalConsErr.as, Ln 7, Col 36: 
+   publicClassWithinternalConsErr.as, Ln 7, Col 35: 
                    internal function publicClassWithinternalCons(){
-   ...................................^
+   ..................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/publicClassWithPrivConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/publicClassWithPrivConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/publicClassWithPrivConsErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1153: A constructor can only be declared public.
-   publicClassWithPrivConsErr.as, Ln 7, Col 35: 
+   publicClassWithPrivConsErr.as, Ln 7, Col 34: 
                    private function publicClassWithPrivCons(){
-   ..................................^
+   .................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/wrapinternalClassWithinternalConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/wrapinternalClassWithinternalConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/wrapinternalClassWithinternalConsErr.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1153: A constructor can only be declared public.
-   wrapinternalClassWithinternalConsErr.as, Ln 7, Col 36: 
+\[Compiler\] Error #1153: A constructor can only be declared public.
+.*wrapinternalClassWithinternalConsErr.as, Ln 7, Col 35:
                    internal function internalClassWithinternalCons\(a:Numb...
-   ...................................^
-
+   ..................................^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/wrapinternalClassWithPrivConsErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/wrapinternalClassWithPrivConsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ClassDef/wrapinternalClassWithPrivConsErr.err	(working copy)
@@ -1,7 +1,5 @@
-
 [Compiler] Error #1153: A constructor can only be declared public.
-   wrapinternalClassWithPrivConsErr.as, Ln 6, Col 35: 
+   wrapinternalClassWithPrivConsErr.as, Ln 6, Col 34:
                    private function internalClassWithPrivCons(){
-   ..................................^
-
+   .................................^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/ExtImpl/PublicSubClassErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/ExtImpl/PublicSubClassErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/ExtImpl/PublicSubClassErr.err	(working copy)
@@ -1,7 +1,5 @@
-
 [Compiler] Error #1000: Ambiguous reference to MyString.
-   PublicSubClassErr.as, Ln 53, Col 9: 
-   PubInt3.MyString();//This should throw an ambiguous reference error --...
-   ........^
-
+   PublicSubClassErr.as, Ln 53, Col 9:
+PubInt3.MyString();//This should throw an ambiguous reference error --...
+........^
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffParamsErr1.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffParamsErr1.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffParamsErr1.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideDiffParamsErr1.as, Ln 7, Col 29: 
+   OverrideDiffParamsErr1.as, Ln 7, Col 28: 
    		override public function setString\( s:Boolean \) : void {}
-   ............................^
+   ...........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffParamsErr2.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffParamsErr2.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffParamsErr2.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideDiffParamsErr2.as, Ln 7, Col 29: 
+   OverrideDiffParamsErr2.as, Ln 7, Col 28: 
    		override public function setString\( n:Number, s:String \) : void {}
-   ............................^
+   ...........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffReturnTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffReturnTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideDiffReturnTypeErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideDiffReturnTypeErr.as, Ln 7, Col 29: 
+   OverrideDiffReturnTypeErr.as, Ln 7, Col 28: 
    		override public function returnString() : Boolean {}
-   ............................^
+   ...........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideParamTypeErr1.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideParamTypeErr1.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideParamTypeErr1.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideParamTypeErr1.as, Ln 7, Col 22: 
+   OverrideParamTypeErr1.as, Ln 7, Col 21: 
    		override function foo\( s:String \){}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideParamTypeErr2.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideParamTypeErr2.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideParamTypeErr2.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideParamTypeErr2.as, Ln 7, Col 22: 
+   OverrideParamTypeErr2.as, Ln 7, Col 21: 
    		override function foo\( s \){}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideReturnTypeErr1.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideReturnTypeErr1.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideReturnTypeErr1.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideReturnTypeErr1.as, Ln 7, Col 22: 
+   OverrideReturnTypeErr1.as, Ln 7, Col 21: 
    		override function foo() { return "foo" }
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideReturnTypeErr2.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideReturnTypeErr2.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideReturnTypeErr2.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideReturnTypeErr2.as, Ln 7, Col 22: 
+   OverrideReturnTypeErr2.as, Ln 7, Col 21: 
    		override function foo() : String{ return "foo" }
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideWithOptionalParamsErr1.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideWithOptionalParamsErr1.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideWithOptionalParamsErr1.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideWithOptionalParamsErr1.as, Ln 7, Col 22: 
+   OverrideWithOptionalParamsErr1.as, Ln 7, Col 21: 
    		override function foo\( s:String \){}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideWithOptionalParamsErr2.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideWithOptionalParamsErr2.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Classes/Override/OverrideWithOptionalParamsErr2.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideWithOptionalParamsErr2.as, Ln 7, Col 22: 
+   OverrideWithOptionalParamsErr2.as, Ln 7, Col 21: 
    		override function foo\( s:String = "default" \){}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/EmptyNameErr17.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/EmptyNameErr17.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/EmptyNameErr17.err	(working copy)
@@ -1,22 +1,9 @@
-
-[Compiler] Error #1094: Syntax error: A string literal must be terminated before the line break.
-   EmptyNameErr17.as, Ln 5, Col 15: 
-       function a'b () {}
-   ..............^
-
-[Compiler] Error #1084: Syntax error: expecting leftparen before end of program.
-   EmptyNameErr17.as, Ln 8, Col 1: 
-
-[Compiler] Error #1084: Syntax error: expecting identifier before end of program.
-   EmptyNameErr17.as, Ln 8, Col 1: 
-
-[Compiler] Error #1084: Syntax error: expecting rightparen before end of program.
-   EmptyNameErr17.as, Ln 8, Col 1: 
-
-[Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-   EmptyNameErr17.as, Ln 8, Col 1: 
-
-[Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-   EmptyNameErr17.as, Ln 8, Col 1: 
-
-6 errors found
+\[Compiler\] Error #1094: Syntax error: A string literal must be terminated before the line break.
+.*EmptyNameErr17.as, Ln 5, Col 15:
+function a'b \(\) \{\}
+..............^
+\[Compiler\] Error #1084: Syntax error: expecting rightbrace before end of program.
+.*EmptyNameErr17.as, Ln 8, Col 1:
+\[Compiler\] Error #1084: Syntax error: expecting rightbrace before end of program.
+.*EmptyNameErr17.as, Ln 8, Col 1:
+3 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/FreeFloatingFuncBodyErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/FreeFloatingFuncBodyErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/FreeFloatingFuncBodyErr.err	(working copy)
@@ -10,8 +10,8 @@
    .........^
 
 [Compiler] Error #1177: The return statement cannot be used in global initialization code.
-   FreeFloatingFuncBodyErr.as, Ln 3, Col 36: 
+   FreeFloatingFuncBodyErr.as, Ln 3, Col 35: 
     	return "this should not compile";
-   ...................................^
+   ..................................^
 
 3 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/OneOptArgFunctionErr2.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/OneOptArgFunctionErr2.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/OneOptArgFunctionErr2.err	(working copy)
@@ -1,17 +1,13 @@
-
-[Compiler] Error #1030: Must specify name of variable arguments array.
-as3.Definitions.Function.OneOptArgFunctionErr2.as, Ln 50, Col 74:
-function returnStringInner\(s:String = "inside class inside package",...\):String { ...
-.........................................................................^
-
-[Compiler] Error #1030: Must specify name of variable arguments array.
-as3.Definitions.Function.OneOptArgFunctionErr2.as, Ln 56, Col 51:
-function returnBooleanInner\(b:Boolean = true,...\):Boolean { return b...
-..................................................^
-
-[Compiler] Error #1030: Must specify name of variable arguments array.
-as3.Definitions.Function.OneOptArgFunctionErr2.as, Ln 62, Col 48:
-function returnNumberInner\(b:Number = 100,...\):Number { return n; }
-...............................................^
-
+\[Compiler\] Error #1030: Must specify name of variable arguments array.
+.*OneOptArgFunctionErr2.as, Ln 50, Col 73:
+function returnStringInner\(s:String = "inside class inside package",...\):String \{...
+........................................................................^
+\[Compiler\] Error #1030: Must specify name of variable arguments array.
+.*OneOptArgFunctionErr2.as, Ln 56, Col 50:
+function returnBooleanInner\(b:Boolean = true,...\):Boolean \{ return b...
+.................................................^
+\[Compiler\] Error #1030: Must specify name of variable arguments array.
+.*OneOptArgFunctionErr2.as, Ln 62, Col 47:
+function returnNumberInner\(b:Number = 100,...\):Number \{ return n; \}
+..............................................^
 3 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/OverrideErr10.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/OverrideErr10.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/OverrideErr10.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideErr10.as, Ln 8, Col 22: 
+   OverrideErr10.as, Ln 8, Col 21: 
    		override function f\(x\) {}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/OverrideErr11.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/OverrideErr11.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/OverrideErr11.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideErr11.as, Ln 8, Col 22: 
+   OverrideErr11.as, Ln 8, Col 21: 
    		override function f\(x = 0\) {}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/OverrideErr12.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/OverrideErr12.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/OverrideErr12.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideErr12.as, Ln 8, Col 22: 
+   OverrideErr12.as, Ln 8, Col 21: 
    		override function f\(... rest\) {}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/OverrideErr13.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/OverrideErr13.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/OverrideErr13.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideErr13.as, Ln 8, Col 22: 
+   OverrideErr13.as, Ln 8, Col 21: 
    		override function f\(x, y\) {}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/OverrideErr14.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/OverrideErr14.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/OverrideErr14.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   OverrideErr14.as, Ln 8, Col 22: 
+   OverrideErr14.as, Ln 8, Col 21: 
    		override function f\(x, y, z\) {}
-   .....................^
+   ....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/PrivStaticBodyErr4.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/PrivStaticBodyErr4.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/PrivStaticBodyErr4.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1021: Duplicate function definition.
-   PrivStaticBodyErr4.as, Ln 5, Col 30: 
+   PrivStaticBodyErr4.as, Ln 5, Col 29: 
        private static function setX\(x\) {}
-   .............................^
+   ............................^
 
 [Compiler] Error #1021: Duplicate function definition.
-   PrivStaticBodyErr4.as, Ln 6, Col 30: 
+   PrivStaticBodyErr4.as, Ln 6, Col 29: 
        private static function setX\(x,y\) {}
-   .............................^
+   ............................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/PubStaticBodyErr4.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/PubStaticBodyErr4.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/PubStaticBodyErr4.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1021: Duplicate function definition.
-   PubStaticBodyErr4.as, Ln 5, Col 29: 
+   PubStaticBodyErr4.as, Ln 5, Col 28: 
        public static function setX\(x\) {}
-   ............................^
+   ...........................^
 
 [Compiler] Error #1021: Duplicate function definition.
-   PubStaticBodyErr4.as, Ln 6, Col 29: 
+   PubStaticBodyErr4.as, Ln 6, Col 28: 
        public static function setX\(x,y\) {}
-   ............................^
+   ...........................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/PubStatNameErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/PubStatNameErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/PubStatNameErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1026: Constructor functions must be instance methods.
-   PubStatNameErr.as, Ln 6, Col 29: 
+   PubStatNameErr.as, Ln 6, Col 28: 
        public static function PubStatNameErr() {}
-   ............................^
+   ...........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/RestArgumentBooleanType.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/RestArgumentBooleanType.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/RestArgumentBooleanType.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1140: Parameters specified after the ...rest parameter definition keyword can only be an Array data type.
-   RestArgumentBooleanType.as, Ln 1, Col 33: 
+   RestArgumentBooleanType.as, Ln 1, Col 32: 
    function foo\( ... rest:Boolean \){}
-   ................................^
+   ...............................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/StaticNameErr17.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StaticNameErr17.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StaticNameErr17.err	(working copy)
@@ -1,32 +1,9 @@
-
-[Compiler] Error #1094: Syntax error: A string literal must be terminated before the line break.
-   StaticNameErr17.as, Ln 5, Col 22: 
-       static function a'b () {}
-   .....................^
-
-[Compiler] Error #1084: Syntax error: expecting leftparen before end of program.
-   StaticNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting identifier before end of program.
-   StaticNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting rightparen before end of program.
-   StaticNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-   StaticNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-   StaticNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-6 errors found
+\[Compiler\] Error #1094: Syntax error: A string literal must be terminated before the line break.
+.*StaticNameErr17.as, Ln 5, Col 22:
+static function a'b \(\) \{\}
+.....................^
+\[Compiler\] Error #1084: Syntax error: expecting rightbrace before end of program.
+.*StaticNameErr17.as, Ln 8, Col 1:
+\[Compiler\] Error #1084: Syntax error: expecting rightbrace before end of program.
+.*StaticNameErr17.as, Ln 8, Col 1:
+3 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/StaticNameErr75.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StaticNameErr75.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StaticNameErr75.err	(working copy)
@@ -5,13 +5,13 @@
    ....^
 
 [Compiler] Error #1026: Constructor functions must be instance methods.
-   StaticNameErr75.as, Ln 6, Col 29: 
+   StaticNameErr75.as, Ln 6, Col 28: 
        static static function StaticNameErr75() {}
-   ............................^
+   ...........................^
 
 [Compiler] Error #1153: A constructor can only be declared public.
-   StaticNameErr75.as, Ln 6, Col 29: 
+   StaticNameErr75.as, Ln 6, Col 28: 
        static static function StaticNameErr75() {}
-   ............................^
+   ...........................^
 
 3 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/StaticPrivBodyErr4.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StaticPrivBodyErr4.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StaticPrivBodyErr4.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1021: Duplicate function definition.
-   StaticPrivBodyErr4.as, Ln 5, Col 30: 
+   StaticPrivBodyErr4.as, Ln 5, Col 29: 
        static private function setX\(x\) {}
-   .............................^
+   ............................^
 
 [Compiler] Error #1021: Duplicate function definition.
-   StaticPrivBodyErr4.as, Ln 6, Col 30: 
+   StaticPrivBodyErr4.as, Ln 6, Col 29: 
        static private function setX\(x,y\) {}
-   .............................^
+   ............................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/StaticPubBodyErr4.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StaticPubBodyErr4.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StaticPubBodyErr4.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1021: Duplicate function definition.
-   StaticPubBodyErr4.as, Ln 5, Col 29: 
+   StaticPubBodyErr4.as, Ln 5, Col 28: 
        static public function setX\(x\) {}
-   ............................^
+   ...........................^
 
 [Compiler] Error #1021: Duplicate function definition.
-   StaticPubBodyErr4.as, Ln 6, Col 29: 
+   StaticPubBodyErr4.as, Ln 6, Col 28: 
        static public function setX\(x,y\) {}
-   ............................^
+   ...........................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/StaticPublicNameErr17.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StaticPublicNameErr17.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StaticPublicNameErr17.err	(working copy)
@@ -1,32 +1,9 @@
-
-[Compiler] Error #1094: Syntax error: A string literal must be terminated before the line break.
-   StaticPublicNameErr17.as, Ln 5, Col 29: 
-       static public function a'b () {}
-   ............................^
-
-[Compiler] Error #1084: Syntax error: expecting leftparen before end of program.
-   StaticPublicNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting identifier before end of program.
-   StaticPublicNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting rightparen before end of program.
-   StaticPublicNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-   StaticPublicNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-   StaticPublicNameErr17.as, Ln 7, Col 1: 
-   }
-   ^
-
-6 errors found
+\[Compiler\] Error #1094: Syntax error: A string literal must be terminated before the line break.
+.*StaticPublicNameErr17.as, Ln 5, Col 29:
+static public function a'b \(\) \{\}
+............................^
+\[Compiler\] Error #1084: Syntax error: expecting rightbrace before end of program.
+.*StaticPublicNameErr17.as, Ln 8, Col 1:
+\[Compiler\] Error #1084: Syntax error: expecting rightbrace before end of program.
+.*StaticPublicNameErr17.as, Ln 8, Col 1:
+3 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/StaticPublicNameErr75.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StaticPublicNameErr75.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StaticPublicNameErr75.err	(working copy)
@@ -5,8 +5,8 @@
    ....^
 
 [Compiler] Error #1026: Constructor functions must be instance methods.
-   StaticPublicNameErr75.as, Ln 6, Col 36: 
+   StaticPublicNameErr75.as, Ln 6, Col 35: 
        static static public function StaticNameErr75() {}
-   ...................................^
+   ..................................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/Function/StatOverLoadFunctionErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/StatOverLoadFunctionErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/StatOverLoadFunctionErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1021: Duplicate function definition.
-   StatOverLoadFunctionErr.as, Ln 4, Col 20: 
+   StatOverLoadFunctionErr.as, Ln 4, Col 19: 
    		static function EmptyOverLoadErr\(x\) {}
-   ...................^
+   ..................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Function/ThreeOptArgFunctionErr4.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Function/ThreeOptArgFunctionErr4.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Function/ThreeOptArgFunctionErr4.err	(working copy)
@@ -1,17 +1,17 @@
 
 [Compiler] Error #1140: Parameters specified after the ...rest parameter definition keyword can only be an Array data type.
-as3.Definitions.Function.ThreeOptArgFunctionErr4.as, Ln 49, Col 64:
+as3.Definitions.Function.ThreeOptArgFunctionErr4.as, Ln 49, Col 63:
 function returnArgumentsInner\(n:Number = 10, ...rest:Number\) {
-...............................................................^
+..............................................................^
 
 [Compiler] Error #1140: Parameters specified after the ...rest parameter definition keyword can only be an Array data type.
-as3.Definitions.Function.ThreeOptArgFunctionErr4.as, Ln 57, Col 66:
+as3.Definitions.Function.ThreeOptArgFunctionErr4.as, Ln 57, Col 65:
 function returnArgumentsInner\(b:Boolean = false, ...rest:String\) {
-.................................................................^
+................................................................^
 
 [Compiler] Error #1140: Parameters specified after the ...rest parameter definition keyword can only be an Array data type.
-as3.Definitions.Function.ThreeOptArgFunctionErr4.as, Ln 68, Col 69:
+as3.Definitions.Function.ThreeOptArgFunctionErr4.as, Ln 68, Col 68:
 function returnArgumentsNoPackage\(s:String = "Str4", ...rest:String\) {...
-....................................................................^
+...................................................................^
 
 3 errors found
Index: modules/asc/test/compiler/as3/Definitions/FunctionAccessors/EmptyNameErr17.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/FunctionAccessors/EmptyNameErr17.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/FunctionAccessors/EmptyNameErr17.err	(working copy)
@@ -1,12 +1,13 @@
 
-[Compiler] Error #1094: Syntax error: A string literal must be terminated before the line break.
-   EmptyNameErr17.as, Ln 5, Col 19: 
-       function get a'b () {}
-   ..................^
+\[Compiler\] Error #1094: Syntax error: A string literal must be terminated before the line break.
+.*EmptyNameErr17.as, Ln 5, Col 19:
+function get a'b \(\) \{\}
+..................\^
 
-[Compiler] Error #1084: Syntax error: expecting leftparen before b.
-   EmptyNameErr17.as, Ln 6, Col 20: 
-       function set a'b\(e\) {}
-   ...................^
+\[Compiler\] Error #1084: Syntax error: expecting leftparen before b () {}
+function set a.
+.*EmptyNameErr17.as, Ln 5, Col 19:
+function get a'b \(\) \{\}
+..................\^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/FunctionAccessors/GetSetNestedErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/FunctionAccessors/GetSetNestedErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/FunctionAccessors/GetSetNestedErr.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1155: Accessors cannot be nested inside other functions.
-   GetSetNestedErr.as, Ln 5, Col 15: 
+   GetSetNestedErr.as, Ln 5, Col 14: 
    function get x():int {
-   ..............^
+   .............^
 
 [Compiler] Error #1155: Accessors cannot be nested inside other functions.
-   GetSetNestedErr.as, Ln 5, Col 15: 
+   GetSetNestedErr.as, Ln 5, Col 14: 
    function get x():int {
-   ..............^
+   .............^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/FunctionAccessors/GetterAsConstructorErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/FunctionAccessors/GetterAsConstructorErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/FunctionAccessors/GetterAsConstructorErr.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1146: A constructor cannot be a getter or setter method.
-   GetterAsConstructorErr.as, Ln 5, Col 24: 
+   GetterAsConstructorErr.as, Ln 5, Col 23: 
    		public function get GetterName():String { 
-   .......................^
+   ......................^
 
 [Compiler] Error #1130: A constructor cannot specify a return type.
-   GetterAsConstructorErr.as, Ln 5, Col 24: 
+   GetterAsConstructorErr.as, Ln 5, Col 23: 
    		public function get GetterName():String { 
-   .......................^
+   ......................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/FunctionAccessors/NestedGetterErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/FunctionAccessors/NestedGetterErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/FunctionAccessors/NestedGetterErr.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1155: Accessors cannot be nested inside other functions.
-   NestedGetterErr.as, Ln 5, Col 15: 
+   NestedGetterErr.as, Ln 5, Col 14: 
    function get x():int {
-   ..............^
+   .............^
 
 [Compiler] Error #1155: Accessors cannot be nested inside other functions.
-   NestedGetterErr.as, Ln 5, Col 15: 
+   NestedGetterErr.as, Ln 5, Col 14: 
    function get x():int {
-   ..............^
+   .............^
 
 2 errors found
Index: modules/asc/test/compiler/as3/Definitions/FunctionAccessors/overrideVarWithGetterErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/FunctionAccessors/overrideVarWithGetterErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/FunctionAccessors/overrideVarWithGetterErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-   overrideVarWithGetterErr.as, Ln 8, Col 26: 
+   overrideVarWithGetterErr.as, Ln 8, Col 25: 
    		override function get a():Object{
-   .........................^
+   ........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/FunctionAccessors/SetterAsConstructorErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/FunctionAccessors/SetterAsConstructorErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/FunctionAccessors/SetterAsConstructorErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1146: A constructor cannot be a getter or setter method.
-   SetterAsConstructorErr.as, Ln 5, Col 24: 
+   SetterAsConstructorErr.as, Ln 5, Col 23: 
    		public function set SetterName\(s\) { 
-   .......................^
+   ......................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Interfaces/InterfaceWithNamespaceErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Interfaces/InterfaceWithNamespaceErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Interfaces/InterfaceWithNamespaceErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1166: Namespace declarations are not permitted in interfaces.
-   InterfaceWithNamespaceErr.as, Ln 10, Col 21: 
+   InterfaceWithNamespaceErr.as, Ln 10, Col 20: 
    		public namespace ns1;
-   ....................^
+   ...................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Interfaces/InterfaceWithVariableErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Interfaces/InterfaceWithVariableErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Interfaces/InterfaceWithVariableErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1139: Variable declarations are not permitted in interfaces.
-   InterfaceWithVariableErr.as, Ln 10, Col 15: 
+   InterfaceWithVariableErr.as, Ln 10, Col 14: 
    		public var string:String;
-   ..............^
+   .............^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Packages/ReturnInPackageErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Packages/ReturnInPackageErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Packages/ReturnInPackageErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1159: The return statement cannot be used in package initialization code.
-as3.Definitions.Packages.ReturnInPackageErr.as, Ln 24, Col 15:
+as3.Definitions.Packages.ReturnInPackageErr.as, Ln 24, Col 14:
 return false;
-..............^
+.............^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Super/SuperInStaticErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Super/SuperInStaticErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Super/SuperInStaticErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1006: A super expression can be used only inside class instance methods.
-   SuperInStaticErr.as, Ln 9, Col 5: 
+   SuperInStaticErr.as, Ln 9, Col 4: 
    			super.f()	// illegal in a static method
-   ....^
+   ...^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Variable/CreateNativeClassVariableErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Variable/CreateNativeClassVariableErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Variable/CreateNativeClassVariableErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1034: Variables cannot be native.
-   CreateNativeClassVariableErr.as, Ln 5, Col 21: 
+   CreateNativeClassVariableErr.as, Ln 5, Col 20: 
            native var item1;
-   ....................^
+   ...................^
 
 1 error found
Index: modules/asc/test/compiler/as3/Definitions/Variable/CreateNativePackageVariableErr.err
===================================================================
--- modules/asc/test/compiler/as3/Definitions/Variable/CreateNativePackageVariableErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/Definitions/Variable/CreateNativePackageVariableErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1034: Variables cannot be native.
-   CreateNativePackageVariableErr.as, Ln 3, Col 17: 
+   CreateNativePackageVariableErr.as, Ln 3, Col 16: 
        native var item1;
-   ................^
+   ...............^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1006-SuperExprInClassMethodErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1006-SuperExprInClassMethodErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1006-SuperExprInClassMethodErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1006: A super expression can be used only inside class instance methods.
-1006-SuperExprInClassMethodErr.as, Ln 9, Col 2:
+1006-SuperExprInClassMethodErr.as, Ln 9, Col 1:
 super.a();
-.^
+^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1011-VirtualOnlyClass.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1011-VirtualOnlyClass.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1011-VirtualOnlyClass.err	(working copy)
@@ -5,8 +5,8 @@
 ^
 
 [Compiler] Error #1033: Virtual variables are not supported.
-1011-VirtualOnlyClass.as, Ln 5, Col 14:
+1011-VirtualOnlyClass.as, Ln 5, Col 13:
 virtual var a;
-.............^
+............^
 
 2 errors found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1022-FinalOverrideErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1022-FinalOverrideErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1022-FinalOverrideErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1022: Cannot override a final accessor.
-1022-FinalOverrideErr.as, Ln 21, Col 32:
+1022-FinalOverrideErr.as, Ln 21, Col 31:
 override final function get val():Number
-...............................^
+..............................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1023-IncompatibleOverride.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1023-IncompatibleOverride.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1023-IncompatibleOverride.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1023: Incompatible override.
-1023-IncompatibleOverride.as, Ln 11, Col 22:
+1023-IncompatibleOverride.as, Ln 11, Col 21:
 override function a():void {
-.....................^
+....................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1026-ConstructorInstanceMethod.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1026-ConstructorInstanceMethod.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1026-ConstructorInstanceMethod.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1026: Constructor functions must be instance methods.
-1026-ConstructorInstanceMethod.as, Ln 5, Col 27:
+1026-ConstructorInstanceMethod.as, Ln 5, Col 26:
 public static function A() {}
-..........................^
+.........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1030-NameVariableArgArray.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1030-NameVariableArgArray.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1030-NameVariableArgArray.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1030: Must specify name of variable arguments array.
-1030-NameVariableArgArray.as, Ln 5, Col 29:
+1030-NameVariableArgArray.as, Ln 5, Col 28:
 function a\(x:String, ...\):void {}
-............................^
+...........................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1033-IllegalVirtualVar.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1033-IllegalVirtualVar.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1033-IllegalVirtualVar.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1033: Virtual variables are not supported.
-1033-IllegalVirtualVar.as, Ln 7, Col 18:
+1033-IllegalVirtualVar.as, Ln 7, Col 17:
 virtual var a;
-.................^
+................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1034-NativeVariables.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1034-NativeVariables.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1034-NativeVariables.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1034: Variables cannot be native.
-1034-NativeVariables.as, Ln 5, Col 17:
+1034-NativeVariables.as, Ln 5, Col 16:
 native var a;
-................^
+...............^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1035-FinalVirtualVariables.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1035-FinalVirtualVariables.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1035-FinalVirtualVariables.err	(working copy)
@@ -5,13 +5,13 @@
 ......................^
 
 [Compiler] Error #1035: Variables cannot be both final and virtual.
-1035-FinalVirtualVariables.as, Ln 5, Col 24:
+1035-FinalVirtualVariables.as, Ln 5, Col 23:
 final virtual var a;
-.......................^
+......................^
 
 [Compiler] Error #1033: Virtual variables are not supported.
-1035-FinalVirtualVariables.as, Ln 5, Col 24:
+1035-FinalVirtualVariables.as, Ln 5, Col 23:
 final virtual var a;
-.......................^
+......................^
 
 3 errors found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1041-IncorrectAttributeCall.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1041-IncorrectAttributeCall.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1041-IncorrectAttributeCall.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1041: Attributes are not callable.
-1041-IncorrectAttributeCall.as, Ln 9, Col 6:
+1041-IncorrectAttributeCall.as, Ln 9, Col 5:
 x.@nast();
-.....^
+....^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1051-ReturnInVoidMethod.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1051-ReturnInVoidMethod.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1051-ReturnInVoidMethod.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1051: Return value must be undefined.
-1051-ReturnInVoidMethod.as, Ln 6, Col 21:
+1051-ReturnInVoidMethod.as, Ln 6, Col 20:
 return true;
-....................^
+...................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1084-ExpectTokenBeforeErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1084-ExpectTokenBeforeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1084-ExpectTokenBeforeErr.err	(working copy)
@@ -1,32 +1,21 @@
-
 [Compiler] Error #1084: Syntax error: expecting leftparen before fact.
-1084-ExpectTokenBeforeErr.as, Ln 8, Col 4:
+   1084-ExpectTokenBeforeErr.as, Ln 8, Col 4:
 if fact > 2 {
 ...^
-
 [Compiler] Error #1084: Syntax error: expecting identifier before var.
-1084-ExpectTokenBeforeErr.as, Ln 9, Col 2:
+   1084-ExpectTokenBeforeErr.as, Ln 9, Col 2:
 var bigger:Boolean = true;
 .^
-
 [Compiler] Error #1084: Syntax error: expecting colon before rightbrace.
-1084-ExpectTokenBeforeErr.as, Ln 10, Col 1:
+   1084-ExpectTokenBeforeErr.as, Ln 10, Col 1:
 }
 ^
-
 [Compiler] Error #1084: Syntax error: expecting identifier before rightbrace.
-1084-ExpectTokenBeforeErr.as, Ln 10, Col 1:
+   1084-ExpectTokenBeforeErr.as, Ln 10, Col 1:
 }
 ^
-
 [Compiler] Error #1084: Syntax error: expecting rightparen before end of program.
-1084-ExpectTokenBeforeErr.as, Ln 10, Col 2:
-}
-.^
-
+   1084-ExpectTokenBeforeErr.as, Ln 11, Col 1:
 [Compiler] Error #1084: Syntax error: expecting identifier before end of program.
-1084-ExpectTokenBeforeErr.as, Ln 10, Col 2:
-}
-.^
-
+   1084-ExpectTokenBeforeErr.as, Ln 11, Col 1:
 6 errors found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1105-AssignmentTargetNotRefValErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1105-AssignmentTargetNotRefValErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1105-AssignmentTargetNotRefValErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1105: Target of assignment must be a reference value.
-1105-AssignmentTargetNotRefValErr.as, Ln 13, Col 7:
+1105-AssignmentTargetNotRefValErr.as, Ln 13, Col 6:
 new A() = new A();
-......^
+.....^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1109-ExpectingExpression.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1109-ExpectingExpression.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1109-ExpectingExpression.err	(working copy)
@@ -1,22 +1,9 @@
-
-[Compiler] Error #1084: Syntax error: expecting leftparen before end of program.
-1109-ExpectingExpression.as, Ln 6, Col 3:
-if
-..^
-
-[Compiler] Error #1084: Syntax error: expecting identifier before end of program.
-1109-ExpectingExpression.as, Ln 6, Col 3:
-if
-..^
-
-[Compiler] Error #1084: Syntax error: expecting rightparen before end of program.
-1109-ExpectingExpression.as, Ln 6, Col 3:
-if
-..^
-
-[Compiler] Error #1084: Syntax error: expecting identifier before end of program.
-1109-ExpectingExpression.as, Ln 6, Col 3:
-if
-..^
-
+\[Compiler\] Error #1084: Syntax error: expecting leftparen before end of program.
+   1109-ExpectingExpression.as, Ln 7, Col 1:
+\[Compiler\] Error #1084: Syntax error: expecting identifier before end of program.
+   1109-ExpectingExpression.as, Ln 7, Col 1:
+\[Compiler\] Error #1084: Syntax error: expecting rightparen before end of program.
+   1109-ExpectingExpression.as, Ln 7, Col 1:
+\[Compiler\] Error #1084: Syntax error: expecting identifier before end of program.
+   1109-ExpectingExpression.as, Ln 7, Col 1:
 4 errors found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1130-ConstructorReturnTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1130-ConstructorReturnTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1130-ConstructorReturnTypeErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1130: A constructor cannot specify a return type.
-1130-ConstructorReturnTypeErr.as, Ln 8, Col 30:
+1130-ConstructorReturnTypeErr.as, Ln 8, Col 29:
 public function ConstructorReturnTypeErr():String{}
-.............................^
+............................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1136-IncorrectArgsErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1136-IncorrectArgsErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1136-IncorrectArgsErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1136: Incorrect number of arguments.  Expected 4.
-1136-IncorrectArgsErr.as, Ln 6, Col 15:
+1136-IncorrectArgsErr.as, Ln 6, Col 14:
 myfunction\(1,3\);
-..............^
+.............^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1137-IncorrectArgsNoMoreThanErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1137-IncorrectArgsNoMoreThanErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1137-IncorrectArgsNoMoreThanErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1137: Incorrect number of arguments.  Expected no more than 1.
-1137-IncorrectArgsNoMoreThanErr.as, Ln 5, Col 50:
+1137-IncorrectArgsNoMoreThanErr.as, Ln 5, Col 49:
 Date.parse\("Wed Apr 12 15:30:17 GMT-0700 2006", "extra_arg"\);
-.................................................^
+................................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1138-OptParamAfterReqParamError.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1138-OptParamAfterReqParamError.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1138-OptParamAfterReqParamError.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1138: Required parameters are not permitted after optional parameters.
-1138-OptParamAfterReqParamError.as, Ln 11, Col 67:
+1138-OptParamAfterReqParamError.as, Ln 11, Col 66:
 public function OptionalParametersErr\( myString:String='string',myint...
-..................................................................^
+.................................................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1139-NoVarInInterfaceErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1139-NoVarInInterfaceErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1139-NoVarInInterfaceErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1139: Variable declarations are not permitted in interfaces.
-1139-NoVarInInterfaceErr.as, Ln 4, Col 15:
+1139-NoVarInInterfaceErr.as, Ln 4, Col 14:
 var a:Number = 100;
-..............^
+.............^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1140-RestParamNotArrTypeErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1140-RestParamNotArrTypeErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1140-RestParamNotArrTypeErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1140: Parameters specified after the ...rest parameter definition keyword can only be an Array data type.
-1140-RestParamNotArrTypeErr.as, Ln 5, Col 48:
+1140-RestParamNotArrTypeErr.as, Ln 5, Col 47:
 public function myfunction\(... rest:String\){
-...............................................^
+..............................................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1146-ConsAsGetterErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1146-ConsAsGetterErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1146-ConsAsGetterErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1146: A constructor cannot be a getter or setter method.
-1146-ConsAsGetterErr.as, Ln 9, Col 32:
+1146-ConsAsGetterErr.as, Ln 9, Col 31:
 public function get ConsAsGetterErr(){}
-...............................^
+..............................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1149-ReturnErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1149-ReturnErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1149-ReturnErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1149: The return statement cannot be used in static initialization code.
-1149-ReturnErr.as, Ln 9, Col 20:
+1149-ReturnErr.as, Ln 9, Col 19:
 return 'a';
-...................^
+..................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1153-PublicConstructor.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1153-PublicConstructor.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1153-PublicConstructor.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1153: A constructor can only be declared public.
-1153-PublicConstructor.as, Ln 5, Col 21:
+1153-PublicConstructor.as, Ln 5, Col 20:
 private function A() {}
-....................^
+...................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1155-AccErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1155-AccErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1155-AccErr.err	(working copy)
@@ -1,12 +1,12 @@
 
 [Compiler] Error #1155: Accessors cannot be nested inside other functions.
-1155-AccErr.as, Ln 4, Col 27:
+1155-AccErr.as, Ln 4, Col 26:
 function get myacc():String{
-..........................^
+.........................^
 
 [Compiler] Error #1155: Accessors cannot be nested inside other functions.
-1155-AccErr.as, Ln 4, Col 27:
+1155-AccErr.as, Ln 4, Col 26:
 function get myacc():String{
-..........................^
+.........................^
 
 2 errors found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1159-ReturnInPackageErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1159-ReturnInPackageErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1159-ReturnInPackageErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1159: The return statement cannot be used in package initialization code.
-1159-ReturnInPackageErr.as, Ln 2, Col 15:
+1159-ReturnInPackageErr.as, Ln 2, Col 14:
 return 'a';
-..............^
+.............^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1166-NamespaceInInterfaceErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1166-NamespaceInInterfaceErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1166-NamespaceInInterfaceErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1166: Namespace declarations are not permitted in interfaces.
-1166-NamespaceInInterfaceErr.as, Ln 10, Col 18:
+1166-NamespaceInInterfaceErr.as, Ln 10, Col 17:
 namespace N1;
-.................^
+................^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1177-ReturnInGlobalErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1177-ReturnInGlobalErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1177-ReturnInGlobalErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1177: The return statement cannot be used in global initialization code.
-1177-ReturnInGlobalErr.as, Ln 7, Col 10:
+1177-ReturnInGlobalErr.as, Ln 7, Col 9:
 return 1;
-.........^
+........^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1185-TwoDefaultSwitchErr.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1185-TwoDefaultSwitchErr.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1185-TwoDefaultSwitchErr.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1185: The switch has more than one default, but only one default is allowed.
-1185-TwoDefaultSwitchErr.as, Ln 25, Col 10:
+1185-TwoDefaultSwitchErr.as, Ln 25, Col 9:
 default:
-.........^
+........^
 
 1 error found
Index: modules/asc/test/compiler/as3/LocalizedErrors/1196-NoExpressionAfterThrow.err
===================================================================
--- modules/asc/test/compiler/as3/LocalizedErrors/1196-NoExpressionAfterThrow.err	(revision 3507)
+++ modules/asc/test/compiler/as3/LocalizedErrors/1196-NoExpressionAfterThrow.err	(working copy)
@@ -1,7 +1,7 @@
 
 [Compiler] Error #1196: Syntax error: expecting an expression after the throw.
-1196-NoExpressionAfterThrow.as, Ln 13, Col 6:
+1196-NoExpressionAfterThrow.as, Ln 13, Col 5:
 }
-.....^
+....^
 
 1 error found
Index: modules/asc/test/compiler/e4x/Expressions/EmbeddedExpressionNotClosedErr.err
===================================================================
--- modules/asc/test/compiler/e4x/Expressions/EmbeddedExpressionNotClosedErr.err	(revision 3507)
+++ modules/asc/test/compiler/e4x/Expressions/EmbeddedExpressionNotClosedErr.err	(working copy)
@@ -1,22 +1,11 @@
-
 [Compiler] Error #1084: Syntax error: expecting identifier before xmltagstartend.
-EmbeddedExpressionNotClosedErr.as, Ln 4, Col 37:
+   EmbeddedExpressionNotClosedErr.as, Ln 4, Col 37:
 var xml = <><{myVar}>hello</{myVar></>;
 ....................................^
-
 [Compiler] Error #1084: Syntax error: expecting greaterthan before end of program.
-EmbeddedExpressionNotClosedErr.as, Ln 5, Col 2:
-}
-.^
-
+   EmbeddedExpressionNotClosedErr.as, Ln 6, Col 1:
 [Compiler] Error #1100: Syntax error: XML does not have matching begin and end tags.
-EmbeddedExpressionNotClosedErr.as, Ln 5, Col 2:
-}
-.^
-
+   EmbeddedExpressionNotClosedErr.as, Ln 6, Col 1:
 [Compiler] Error #1084: Syntax error: expecting rightbrace before end of program.
-EmbeddedExpressionNotClosedErr.as, Ln 5, Col 2:
-}
-.^
-
-4 errors found
\ No newline at end of file
+   EmbeddedExpressionNotClosedErr.as, Ln 6, Col 1:
+4 errors found
Index: modules/asc/test/compiler/e4x/Regress/InvalidXMLNameErr.err
===================================================================
--- modules/asc/test/compiler/e4x/Regress/InvalidXMLNameErr.err	(revision 3507)
+++ modules/asc/test/compiler/e4x/Regress/InvalidXMLNameErr.err	(working copy)
@@ -1,17 +1,9 @@
-
-[Compiler] Error #1104: invalid xml name
-   InvalidXMLNameErr.as, Ln 5, Col 1: 
-   </blah>
-   ^
-
-[Compiler] Error #1084: Syntax error: expecting xmltagendend before end of program.
-   InvalidXMLNameErr.as, Ln 6, Col 9: 
-   </root>;
-   ........^
-
-[Compiler] Error #1100: Syntax error: XML does not have matching begin and end tags.
-   InvalidXMLNameErr.as, Ln 6, Col 9: 
-   </root>;
-   ........^
-
+\[Compiler\] Error #1104: invalid xml name
+   InvalidXMLNameErr.as, Ln 5, Col 1:
+</blah>
+^
+\[Compiler\] Error #1084: Syntax error: expecting xmltagendend before end of program.
+   InvalidXMLNameErr.as, Ln 7, Col 1:
+\[Compiler\] Error #1100: Syntax error: XML does not have matching begin and end tags.
+   InvalidXMLNameErr.as, Ln 7, Col 1:
 3 errors found
Index: modules/asc/test/compiler/ecma3/e12_9_1_Err.err
===================================================================
--- modules/asc/test/compiler/ecma3/e12_9_1_Err.err	(revision 3507)
+++ modules/asc/test/compiler/ecma3/e12_9_1_Err.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1177: The return statement cannot be used in global initialization code.
-ecma3.e12_9_1_Err.as, Ln 30, Col 8:
+\[Compiler\] Error #1177: The return statement cannot be used in global initialization code.
+   e12_9_1_Err.as, Ln 30, Col 7:
 return;
-.......^
-
+......^
 1 error found
Index: modules/asc/test/compiler/ecma3/ekeywords_001_Err.err
===================================================================
--- modules/asc/test/compiler/ecma3/ekeywords_001_Err.err	(revision 3507)
+++ modules/asc/test/compiler/ecma3/ekeywords_001_Err.err	(working copy)
@@ -1,7 +1,5 @@
-
-[Compiler] Error #1006: A super expression can be used only inside class instance methods.
-.*ekeywords_001_Err.as, Ln 38, Col 4: 
-   		super;
-   ...^
-
-1 error found
\ No newline at end of file
+\[Compiler\] Error #1006: A super expression can be used only inside class instance methods.
+.*ekeywords_001_Err.as, Ln 38, Col 3:
+super;
+..^
+1 error found
Index: modules/asc/test/compiler/es4/conditionalcompilation/standardnamespace.err
===================================================================
--- modules/asc/test/compiler/es4/conditionalcompilation/standardnamespace.err	(revision 3507)
+++ modules/asc/test/compiler/es4/conditionalcompilation/standardnamespace.err	(working copy)
@@ -1,8 +1,8 @@
 
 [Compiler] Error #1211: Namespace NS1 conflicts with a configuration namespace.
-.*standardnamespace.as, Ln 4, Col 23:
+.*standardnamespace.as, Ln 4, Col 22:
 public namespace NS1
-......................^
+.....................^
 
 [Compiler] Error #1210: A configuration value must be declared at the top level of a program or package.
 .*standardnamespace.as, Ln 5, Col 13:
Index: modules/compiler/src/java/flash/css/Descriptor.java
===================================================================
--- modules/compiler/src/java/flash/css/Descriptor.java	(revision 3507)
+++ modules/compiler/src/java/flash/css/Descriptor.java	(working copy)
@@ -201,7 +201,7 @@
 
 	public String getIdentAsString()
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		LexicalUnit lexicalUnit = value;
 
 		while (lexicalUnit != null)
@@ -264,7 +264,7 @@
             }
         case LexicalUnit.SAC_RGBCOLOR:
             {
-                StringBuffer stringBuffer = new StringBuffer("0x");
+                StringBuilder stringBuffer = new StringBuilder("0x");
 
                 LexicalUnit parameter = lexicalUnit.getParameters();
 
@@ -418,7 +418,7 @@
     private static String getListAsString(String name, LexicalUnit value, boolean quoteIdentifier)
         throws CompilerError
     {
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
 
         LexicalUnit current = value;
 
Index: modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/as3/binding/DataBindingExtension.java	(working copy)
@@ -43,6 +43,56 @@
     private static final String WATCHER_SETUP_UTIL_TEMPLATE = TEMPLATE_PATH + "WatcherSetupUtil.vm";
     private static final String DATA_BINDING_INFO_KEY = "dataBindingInfo";
 
+    private static final String CX = "cx";
+    private static final String DOT = ".";
+    private static final String DOT_AS = ".as";
+    private static final String EMPTY_STRING = "";
+
+    // intern all identifier constants
+    private static final String ADD_CHILD = "addChild".intern();
+    private static final String APPLY = "apply".intern();
+    private static final String ARRAY = "Array".intern();
+    private static final String ARRAY_ELEMENT_WATCHER = "ArrayElementWatcher".intern();
+    private static final String ARRAY_WATCHER = "arrayWatcher".intern();
+    private static final String BINDINGS = "bindings".intern();
+    private static final String EXCLUDE_CLASS = "ExcludeClass".intern();
+    private static final String FBS = "fbs".intern();
+    private static final String FUNCTION = "Function".intern();
+    private static final String FUNCTION_RETURN_WATCHER = "FunctionReturnWatcher".intern();
+    private static final String IFLEX_MODULE_FACTORY = "IFlexModuleFactory".intern();
+    private static final String INIT = "init".intern();
+    private static final String IWATCHER_SETUP_UTIL = "IWatcherSetupUtil".intern();
+    private static final String MIXIN = "Mixin".intern();
+    private static final String MX_BINDING = "mx.binding".intern();
+    private static final String OBJECT = "Object".intern();
+    private static final String PARENT_WATCHER = "parentWatcher".intern();
+    private static final String PROPERTY_GETTER = "propertyGetter".intern();
+    private static final String PROPERTY_WATCHER = "PropertyWatcher".intern();
+    private static final String REPEATER_COMPONENT_WATCHER = "RepeaterComponentWatcher".intern();
+    private static final String REPEATER_ITEM_WATCHER = "RepeaterItemWatcher".intern();
+    private static final String SETUP = "setup".intern();
+    private static final String SPRITE = "Sprite".intern();
+    private static final String STATIC_PROPERTY_WATCHER = "StaticPropertyWatcher".intern();
+    private static final String TARGET = "target".intern();
+    private static final String UPDATE_PARENT = "updateParent".intern();
+    private static final String WATCHERS = "watchers".intern();
+    private static final String WATCHER_SETUP_UTIL = "watcherSetupUtil".intern();
+    private static final String XML_WATCHER = "XMLWatcher".intern();
+
+    private static final String[] IMPORTS = new String[] {
+        "flash.display.Sprite",
+        "mx.core.IFlexModuleFactory",
+        "mx.binding.ArrayElementWatcher",
+        "mx.binding.FunctionReturnWatcher",
+        "mx.binding.IWatcherSetupUtil",
+        "mx.binding.PropertyWatcher",
+        "mx.binding.RepeaterComponentWatcher",
+        "mx.binding.RepeaterItemWatcher",
+        "mx.binding.StaticPropertyWatcher",
+        "mx.binding.XMLWatcher",
+        "mx.binding.Watcher"
+    };
+
     private String generatedOutputDirectory;
     private boolean showBindingWarnings;
 
Index: modules/compiler/src/java/flex2/compiler/as3/MetaDataParser.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/as3/MetaDataParser.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/as3/MetaDataParser.java	(working copy)
@@ -33,7 +33,7 @@
 	 */
 	public static MetaData parse(Object perCompileData, Source file, final int beginLine, String md)
 	{
-		StringBuffer stringBuffer = new StringBuffer();
+		StringBuilder stringBuffer = new StringBuilder();
 
 		stringBuffer.append("[");
 		stringBuffer.append(md);
Index: modules/compiler/src/java/flex2/compiler/as3/OffsetInputBuffer.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/as3/OffsetInputBuffer.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/as3/OffsetInputBuffer.java	(working copy)
@@ -20,21 +20,10 @@
  * @author Paul Reilly
  */
 class OffsetInputBuffer extends InputBuffer
-{
-    private int offset;
-
+{   
     public OffsetInputBuffer(String in, String origin, int offset)
     {
-        super(in, origin);
-        this.offset = offset;
-        pos = offset;
+        super(in, origin, offset, 0);
     }
 
-    /**
-     * Override to handle removing the offset before doing the lookup.
-     */
-    public String source(int begin, int end)
-    {
-        return super.source(begin - offset, end - offset);
-    }
 }
Index: modules/compiler/src/java/flex2/compiler/as3/reflect/NodeMagic.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/as3/reflect/NodeMagic.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/as3/reflect/NodeMagic.java	(working copy)
@@ -262,7 +262,7 @@
     public static String getSortedMetaDataParamString(MetaDataNode node)
     {
         final Set params = new TreeSet(metaDataValueComparator);
-        final StringBuffer parameters = new StringBuffer(32);
+        final StringBuilder parameters = new StringBuilder(32);
         
         if(node.values != null)
         {
@@ -395,7 +395,7 @@
     
     public static String setToString(Set set, String delimiter)
     {
-        final StringBuffer attributes = new StringBuffer(32);
+        final StringBuilder attributes = new StringBuilder(32);
         
         final Iterator iter = set.iterator();
         while (iter.hasNext())
@@ -456,7 +456,7 @@
      */
     public static String getDottedImportName(ImportDirectiveNode node)
     {
-        final StringBuffer buf = new StringBuffer();
+        final StringBuilder buf = new StringBuilder();
         if (node.name != null && node.name.id.list != null)
         {
             for(final Iterator iter = node.name.id.list.iterator(); iter.hasNext(); )
@@ -689,7 +689,7 @@
         }
         else
         {
-            StringBuffer stringBuffer = new StringBuffer(getPackageName(classDefinition));
+            StringBuilder stringBuffer = new StringBuilder(getPackageName(classDefinition));
             if (stringBuffer.length() > 0)
             {
                 stringBuffer.append(":");
@@ -720,7 +720,7 @@
             }
             else
             {
-                StringBuffer fullyQualifiedClassName = new StringBuffer();
+                StringBuilder fullyQualifiedClassName = new StringBuilder();
 
                 fullyQualifiedClassName.append(NodeMagic.getPackageName(node));
                 if (fullyQualifiedClassName.length() > 0)
Index: modules/compiler/src/java/flex2/compiler/as3/reflect/TypeTable.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/as3/reflect/TypeTable.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/as3/reflect/TypeTable.java	(working copy)
@@ -50,7 +50,7 @@
 		ObjectValue ns = (ObjectValue) typeref.namespaces.first();
 		if( ns != null && ns.name.length() > 0 )
 		{
-			StringBuffer value = new StringBuffer(ns.name.length() + 1 + typeref.name.length());
+			StringBuilder value = new StringBuilder(ns.name.length() + 1 + typeref.name.length());
 		    value.append(ns.name).append(':').append(typeref.name);
 			return value.toString();
 		}
Index: modules/compiler/src/java/flex2/compiler/asdoc/ASDocExtension.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/asdoc/ASDocExtension.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/asdoc/ASDocExtension.java	(working copy)
@@ -67,7 +67,7 @@
 	private static String EXCLUDE_CLASS = "ExcludeClass";
 	private static boolean useNewCode = true;
     
-	private StringBuffer out;
+	private StringBuilder out;
 	private String xml;
 	private List excludeClasses;
 	private Set includeOnly;
@@ -85,7 +85,7 @@
 		this.packages = packages;
         if (!useNewCode)
         {
-            out = new StringBuffer();
+            out = new StringBuilder();
             out.append("<asdoc>\n");
             classes = new LinkedHashMap();
         }
@@ -377,12 +377,12 @@
         }
         
         /**
-         * Writes the final output into a StringBuffer.
+         * Writes the final output into a StringBuilder.
          * 
-         * @return Returns original StringBuffer if class is excluded. Otherwise,
-         * it returns a StringBuffer with all the entries of docTable appended. 
+         * @return Returns original StringBuilder if class is excluded. Otherwise,
+         * it returns a StringBuilder with all the entries of docTable appended. 
          */
-        public StringBuffer writeTopLevel(StringBuffer s)
+        public StringBuilder writeTopLevel(StringBuilder s)
         {
             if (exclude) //excluded class so don't write anything
                 return s;
@@ -425,7 +425,7 @@
         {
             private boolean exclude;
             private String id;
-            private StringBuffer emitme;
+            private StringBuilder emitme;
             
             public KeyPair key;
             private boolean inherit = false;
@@ -433,7 +433,7 @@
             public CommentEntry(DocCommentNode comment, boolean exclude)
             {
                 this.exclude = exclude;
-                emitme = new StringBuffer();
+                emitme = new StringBuilder();
                 
                 //prevents formatting errors
                 if (comment.id == null)
@@ -1062,10 +1062,10 @@
             }
             
             /**
-             * @param sb StringBuffer to append to
-             * @return Appends the full comment onto the StringBuffer
+             * @param sb StringBuilder to append to
+             * @return Appends the full comment onto the StringBuilder
              */
-            public StringBuffer emit(StringBuffer sb)
+            public StringBuilder emit(StringBuilder sb)
             {
                 return sb.append(emitme);
             }
Index: modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/asdoc/TopLevelGenerator.java	(working copy)
@@ -17,11 +17,11 @@
 
 public class TopLevelGenerator implements DocCommentGenerator
 {
-    StringBuffer xml;
+    StringBuilder xml;
     
     public TopLevelGenerator()
     {
-        xml = new StringBuffer();
+        xml = new StringBuilder();
     }
     
     /**
@@ -418,7 +418,7 @@
     }
     
     /**
-     * Appends a specific comment to the StringBuffer.
+     * Appends a specific comment to the StringBuilder.
      * @param comment
      */
     private void emitDocComment(DocComment comment)
Index: modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/common/MetadataConfiguration.java	(working copy)
@@ -47,7 +47,7 @@
 		    return null;
 	    }
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 	    sb.append("<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>");
 	    sb.append("<rdf:Description rdf:about='' xmlns:dc='http://purl.org/dc/elements/1.1'>");
 	    sb.append("<dc:format>application/x-shockwave-flash</dc:format>");
Index: modules/compiler/src/java/flex2/compiler/CompilerSwcContext.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/CompilerSwcContext.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/CompilerSwcContext.java	(working copy)
@@ -547,7 +547,7 @@
     private List defaultsStyles = new LinkedList();    // VirtualFile
     private List themeStyles = new LinkedList();    // VirtualFile
     private List errlocations = new LinkedList();
-	private StringBuffer ts = new StringBuffer(); // last modified time of all the swc and css files...
+	private StringBuilder ts = new StringBuilder(); // last modified time of all the swc and css files...
 	private boolean fullCompile; // whether or not this CompilerSwcContext participates in a full compilation...
 	private boolean enableIncrementalCompile; // if true, we setup storage for intermediate type info objects when doing incremental compilation...
 
Index: modules/compiler/src/java/flex2/compiler/config/CommandLineConfigurator.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/config/CommandLineConfigurator.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/config/CommandLineConfigurator.java	(working copy)
@@ -428,7 +428,7 @@
         if (syntax)
         {
             List lines = ConfigurationBuffer.formatText( getSyntaxDescription( program, defaultVar, advanced, lmgr,  l10nPrefix ), 78 );
-            StringBuffer text = new StringBuffer( 512 );
+            StringBuilder text = new StringBuilder( 512 );
             for (Iterator it = lines.iterator(); it.hasNext();)
             {
                 text.append( it.next() );
@@ -479,7 +479,7 @@
             }
         }
 
-        StringBuffer output = new StringBuffer( 1024 );
+        StringBuilder output = new StringBuilder( 1024 );
 
         if (printSet.size() == 0)
         {
@@ -535,7 +535,7 @@
 
             if (details)
             {
-                StringBuffer description = new StringBuffer( 160 );
+                StringBuilder description = new StringBuilder( 160 );
                 if (printaliases)
                 {
                     if (aliases.containsKey( avar ))
Index: modules/compiler/src/java/flex2/compiler/config/ConfigurationBuffer.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/config/ConfigurationBuffer.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/config/ConfigurationBuffer.java	(working copy)
@@ -375,7 +375,7 @@
      */
     protected static String c2h( String camel )
     {
-        StringBuffer b = new StringBuffer(camel.length() + 5);
+        StringBuilder b = new StringBuilder(camel.length() + 5);
         for (int i = 0; i < camel.length(); ++i)
         {
             char c = camel.charAt(i);
@@ -400,7 +400,7 @@
      */
     protected static String h2c( String hyphenated, boolean studly )
     {
-        StringBuffer b = new StringBuffer( hyphenated.length() );
+        StringBuilder b = new StringBuilder( hyphenated.length() );
         boolean capNext = studly;
         for (int i = 0; i < hyphenated.length(); ++i)
         {
@@ -1110,10 +1110,10 @@
 	}
 	
 	private String defaultVar;
-	private StringBuffer compile_checksum = new StringBuffer();
-	private StringBuffer compile_checksum_ts = new StringBuffer();
-	private StringBuffer link_checksum = new StringBuffer();
-	private StringBuffer link_checksum_ts = new StringBuffer();
+	private StringBuilder compile_checksum = new StringBuilder();
+	private StringBuilder compile_checksum_ts = new StringBuilder();
+	private StringBuilder link_checksum = new StringBuilder();
+	private StringBuilder link_checksum_ts = new StringBuilder();
 
 	private void calculateChecksum(Object targetConfig, ConfigurationInfo info, String var, Object[] args)
 		throws Exception
Index: modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/config/FileConfigurator.java	(working copy)
@@ -315,7 +315,7 @@
             	if (ctx.item.equals(element))
             	{
             		contextStack.pop();
-            		text = new StringBuffer();	// ignore any text read
+            		text = new StringBuilder();	// ignore any text read
             	}
             	
             	return;
@@ -340,7 +340,7 @@
                 v.value = text.toString();
                 v.line = locator.getLineNumber();
                 ctx.argList.add( v );
-                text = new StringBuffer();
+                text = new StringBuilder();
                 ctx.item = null;
             }
             else if (ctx.var != null)
@@ -359,7 +359,7 @@
                     v.value = text.toString();
                     v.line = locator.getLineNumber();
                     ctx.argList.add( v );
-                    text = new StringBuffer();
+                    text = new StringBuilder();
                 }
                 else
                 {
@@ -475,7 +475,7 @@
         private final boolean ignoreUnknownItems;
         
         private Locator locator;
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
     }
 
     private static String name( String var, String base )
@@ -540,7 +540,7 @@
                                          LocalizationManager lmgr,
                                          String prefix )
     {
-        StringBuffer buf = new StringBuffer( 1024 );
+        StringBuilder buf = new StringBuilder( 1024 );
 
         buf.append( indent + "<" + node.shortname + ">\n" );
         if (node.children != null) {
Index: modules/compiler/src/java/flex2/compiler/css/StyleDef.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/css/StyleDef.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/css/StyleDef.java	(working copy)
@@ -128,7 +128,7 @@
      */
     public static String dehyphenize(String string)
     {
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
 
         int start = 0;
         int end = string.indexOf('-');
Index: modules/compiler/src/java/flex2/compiler/i18n/PropertyText.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/i18n/PropertyText.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/i18n/PropertyText.java	(working copy)
@@ -160,7 +160,7 @@
 	    if(index == -1)
 	        return str;
 
-	    StringBuffer buf = new StringBuffer(str.length());
+	    StringBuilder buf = new StringBuilder(str.length());
 	    int lastIndex = 0;
 		boolean errorMessage = false;
 	    while(index != -1) {
Index: modules/compiler/src/java/flex2/compiler/io/FileUtil.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/io/FileUtil.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/io/FileUtil.java	(working copy)
@@ -348,7 +348,7 @@
 	public static String readFile(File f)
 	{
 		BufferedReader file = null;
-		StringBuffer buffer = new StringBuffer((int) f.length());
+		StringBuilder buffer = new StringBuilder((int) f.length());
 		String lineSep = System.getProperty("line.separator");
 
 		try
Index: modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/media/MovieTranscoder.java	(working copy)
@@ -245,7 +245,7 @@
         String resolvedSource = asset.assetSource.getName().replace('\\', '/');
         ThreadLocalToolkit.addResolvedPath(resolvedSource, asset.assetSource);
 
-        StringBuffer source = new StringBuffer( 1024 );
+        StringBuilder source = new StringBuilder( 1024 );
         source.append( "package " );
         source.append( packageName );
         source.append( "\n{\nimport mx.core.MovieClipLoaderAsset;\n" );
Index: modules/compiler/src/java/flex2/compiler/media/XMLTranscoder.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/media/XMLTranscoder.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/media/XMLTranscoder.java	(working copy)
@@ -68,7 +68,7 @@
             className = fullClassName.substring( dot + 1 );
         }
 
-        StringBuffer source = new StringBuffer( 1024 );
+        StringBuilder source = new StringBuilder( 1024 );
         source.append( "package " );
         source.append( packageName );
         source.append( " { public class " );
Index: modules/compiler/src/java/flex2/compiler/mxml/builder/XMLBuilder.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/builder/XMLBuilder.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/builder/XMLBuilder.java	(working copy)
@@ -401,7 +401,7 @@
 				
 				if (getElementsByLocalName != null)
 				{
-					StringBuffer e4xbuffer = new StringBuffer(getElementsByLocalName);
+					StringBuilder e4xbuffer = new StringBuilder(getElementsByLocalName);
 					String destProp = child.getLocalPart();
 					if (child.getNamespace().length() > 0)
 					{
@@ -426,7 +426,7 @@
 				String classNamespaceUtil = NameFormatter.toDot(StandardDefs.CLASS_NAMESPACEUTIL);
 				document.addImport(classNamespaceUtil, node.beginLine);
 
-				StringBuffer buffer = new StringBuffer(classNamespaceUtil + ".getElementsByLocalName(");
+				StringBuilder buffer = new StringBuilder(classNamespaceUtil + ".getElementsByLocalName(");
 				buffer.append((getElementsByLocalName == null) ? xml.getId() : getElementsByLocalName);
 				buffer.append(", \"").append(child.getLocalPart()).append("\")[").append(child.getIndex()).append("]");
 
@@ -495,7 +495,7 @@
 
 	private String createExpression(Stack stack)
 	{
-		StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 
 		for (int i = 0, count = stack.size(); i < count; i++)
 		{
Index: modules/compiler/src/java/flex2/compiler/mxml/builder/XMLListBuilder.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/builder/XMLListBuilder.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/builder/XMLListBuilder.java	(working copy)
@@ -297,7 +297,7 @@
 
                 if (e4xElementsByLocalName != null)
                 {
-	                StringBuffer e4xbuffer = new StringBuffer(e4xElementsByLocalName);
+	                StringBuilder e4xbuffer = new StringBuilder(e4xElementsByLocalName);
 					String destProp = child.getLocalPart();
 					if (child.getNamespace().length() > 0)
 					{
@@ -312,7 +312,7 @@
                 }
                 else
                 {
-	                StringBuffer e4xbuffer = new StringBuffer(xmlList.getId());
+	                StringBuilder e4xbuffer = new StringBuilder(xmlList.getId());
                     e4xbuffer.append("[").append(i).append("]");
 
 	                destinationProperty.push(child.getLocalPart());
@@ -445,7 +445,7 @@
 
     private String createExpression(Stack stack)
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         for (int i = 0, count = stack.size(); i < count; i++)
         {
Index: modules/compiler/src/java/flex2/compiler/mxml/gen/CodeFragmentList.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/gen/CodeFragmentList.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/gen/CodeFragmentList.java	(working copy)
@@ -31,11 +31,11 @@
 		return super.add(new Script(fragment, line));
 	}
 
-	// add these new add() methods in order to set exact-size StringBuffer
+	// add these new add() methods in order to set exact-size StringBuilder
 
 	public final boolean add(String s1, String s2, int line)
 	{
-		StringBuffer fragment = new StringBuffer(s1.length() + s2.length());
+		StringBuilder fragment = new StringBuilder(s1.length() + s2.length());
 		fragment.append(s1);
 		fragment.append(s2);
 		return add(fragment.toString(), line);
@@ -43,7 +43,7 @@
 
 	public final boolean add(String s1, String s2, String s3, int line)
 	{
-		StringBuffer fragment = new StringBuffer(s1.length() + s2.length() + s3.length());
+		StringBuilder fragment = new StringBuilder(s1.length() + s2.length() + s3.length());
 		fragment.append(s1);
 		fragment.append(s2);
 		fragment.append(s3);
@@ -52,7 +52,7 @@
 
 	public final boolean add(String s1, String s2, String s3, String s4, int line)
 	{
-		StringBuffer fragment = new StringBuffer(s1.length() + s2.length() + s3.length() + s4.length());
+		StringBuilder fragment = new StringBuilder(s1.length() + s2.length() + s3.length() + s4.length());
 		fragment.append(s1);
 		fragment.append(s2);
 		fragment.append(s3);
@@ -62,7 +62,7 @@
 
 	public final boolean add(String s1, String s2, String s3, String s4, String s5, int line)
 	{
-		StringBuffer fragment = new StringBuffer(s1.length() + s2.length() + s3.length() + s4.length() + s5.length());
+		StringBuilder fragment = new StringBuilder(s1.length() + s2.length() + s3.length() + s4.length() + s5.length());
 		fragment.append(s1);
 		fragment.append(s2);
 		fragment.append(s3);
Index: modules/compiler/src/java/flex2/compiler/mxml/gen/TextGen.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/gen/TextGen.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/gen/TextGen.java	(working copy)
@@ -33,7 +33,7 @@
 	 */
 	public static String toSepList(Iterator stringIter, String sep)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		if (stringIter.hasNext())
 		{
@@ -62,7 +62,7 @@
 	 */
 	public static String prefix(Iterator stringIter, String prefix)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		while (stringIter.hasNext())
 		{
Index: modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/InterfaceCompiler.java	(working copy)
@@ -660,13 +660,29 @@
 		}
 
 		//	seed import name set with the unconditional imports present in all generated MXML classes
-		info.addImportNames(StandardDefs.implicitImports, app.beginLine);
-		if (mxmlConfiguration.getCompilingForAIR())
-		{
-			info.addImportNames(StandardDefs.airOnlyImplicitImports, app.beginLine);
-		}
-		info.addImportNames(StandardDefs.standardMxmlImports, app.beginLine);
+        if (mxmlConfiguration.getGenerateAbstractSyntaxTree())
+        {
+            info.addSplitImportNames(StandardDefs.splitImplicitImports);
 
+            if (mxmlConfiguration.getCompilingForAIR())
+            {
+                info.addSplitImportNames(StandardDefs.splitAirOnlyImplicitImports);
+            }
+
+            info.addSplitImportNames(StandardDefs.splitStandardMxmlImports);
+        }
+        else
+        {
+            info.addImportNames(StandardDefs.implicitImports, app.beginLine);
+
+            if (mxmlConfiguration.getCompilingForAIR())
+            {
+                info.addImportNames(StandardDefs.airOnlyImplicitImports, app.beginLine);
+            }
+
+            info.addImportNames(StandardDefs.standardMxmlImports, app.beginLine);
+        }
+
 		return info;
 	}
 
Index: modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/lang/StandardDefs.java	(working copy)
@@ -139,7 +139,8 @@
 	public static final String PROP_CLASSFACTORY_GENERATOR = "generator";
 	public static final String PROP_CLASSFACTORY_PROPERTIES = "properties";
 	public static final String PROP_UICOMPONENT_STATES = "states";
-	public static final String PROP_CONTAINER_CHILDREPEATERS = "childRepeaters";
+	// intern, because it's used as an identifier.
+	public static final String PROP_CONTAINER_CHILDREPEATERS = "childRepeaters".intern();
 
 	//	metadata
 	//	TODO still lots of string constants for these in TypeTable
@@ -219,6 +220,22 @@
 		implicitImports.add(NameFormatter.toDotStar(PACKAGE_FLASH_XML));
 	}
 
+    public static final Set<String[]> splitImplicitImports = new HashSet<String[]>();
+    static
+    {
+        for (String implicitImport : implicitImports)
+        {
+            String[] splitImplicitImport = implicitImport.split("\\.");
+
+            for (int i = 0; i < splitImplicitImport.length; i++)
+            {
+                splitImplicitImport[i] = splitImplicitImport[i].intern();
+            }
+
+            splitImplicitImports.add(splitImplicitImport);
+        }
+    }
+
 	/**
 	 * implicit imports that exist only in AIR
 	 */
@@ -232,6 +249,22 @@
 		airOnlyImplicitImports.add(NameFormatter.toDotStar(PACKAGE_FLASH_HTML_SCRIPT));
 	}
 
+    public static final Set<String[]> splitAirOnlyImplicitImports = new HashSet<String[]>();
+    static
+    {
+        for (String airOnlyImplicitImport : airOnlyImplicitImports)
+        {
+            String[] splitAirOnlyImplicitImport = airOnlyImplicitImport.split("\\.");
+
+            for (int i = 0; i < splitAirOnlyImplicitImport.length; i++)
+            {
+                splitAirOnlyImplicitImport[i] = splitAirOnlyImplicitImport[i].intern();
+            }
+
+            splitAirOnlyImplicitImports.add(splitAirOnlyImplicitImport);
+        }
+    }
+
 	/**
 	 * standard (framework-independent) MXML support imports
 	 */
@@ -252,6 +285,22 @@
 		standardMxmlImports.add(NameFormatter.toDot(CLASS_DEFERREDINSTANCEFROMFUNCTION));
 	}
 
+    public static final Set<String[]> splitStandardMxmlImports = new HashSet<String[]>();
+    static
+    {
+        for (String standardMxmlImport : standardMxmlImports)
+        {
+            String[] splitStandardMxmlImport = standardMxmlImport.split("\\.");
+
+            for (int i = 0; i < splitStandardMxmlImport.length; i++)
+            {
+                splitStandardMxmlImport[i] = splitStandardMxmlImport[i].intern();
+            }
+
+            splitStandardMxmlImports.add(splitStandardMxmlImport);
+        }
+    }
+
 	/**
 	 * AS3 reserved words, illegal as var names
 	 * NOTE: this list is hand-assembled from the constants in macromedia.asc.parser.Tokens and needs to be updated
Index: modules/compiler/src/java/flex2/compiler/mxml/lang/TextParser.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/lang/TextParser.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/lang/TextParser.java	(working copy)
@@ -324,7 +324,7 @@
 		}
 
 		Collection result = new ArrayList();
-		StringBuffer buffer = new StringBuffer();
+		StringBuilder buffer = new StringBuilder();
 		char quoteChar = '\'';
 		boolean inQuotes = false;
 
@@ -372,7 +372,7 @@
 				else
 				{
 					String elementText = buffer.toString().trim();
-					buffer = new StringBuffer();
+					buffer = new StringBuilder();
 
 					//	NOTE clear any special-processing flags, on the interpretation that they only apply to top-level scalars.
 					//	TODO multi-level typed arrays? :)
@@ -662,7 +662,7 @@
 			return null;
 		}
 
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 
 		//first attach the leading part of the string, all the way up to the opening brace
 		String lead = s.substring(0, openBraceIdx);
Index: modules/compiler/src/java/flex2/compiler/mxml/reflect/TypeTable.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/reflect/TypeTable.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/reflect/TypeTable.java	(working copy)
@@ -1088,7 +1088,7 @@
 			}
 
 			this.name = name;
-			this.type = NameFormatter.toColon(type).intern();
+			this.type = NameFormatter.toColon(type);
 			if (enumeration != null)
 			{
 				StringTokenizer t = new StringTokenizer(enumeration, ",");
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/AtEmbed.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/AtEmbed.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/AtEmbed.java	(working copy)
@@ -240,7 +240,7 @@
 	 */
 	public static String createMangledName(Source source, String path, boolean strType, Map attrs, String prefix)
 	{
-		StringBuffer buf = new StringBuffer(128);
+		StringBuilder buf = new StringBuilder(128);
 		if (prefix != null) buf.append(prefix);
 
         int hash = attrs.hashCode();
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/AtResource.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/AtResource.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/AtResource.java	(working copy)
@@ -56,6 +56,33 @@
         return "ResourceManager.getInstance()." + methodName + "(\"" + bundle + "\", \"" + key + "\")";
     }
 
+    // intern, because it's used as an identifier
+    private static final String RESOURCE_MANAGER = "ResourceManager".intern();
+    private static final String GET_INSTANCE = "getInstance".intern();
+
+    public MemberExpressionNode getValueExpression(NodeFactory nodeFactory)
+    {
+        MemberExpressionNode resourceManagerMemberExpression =
+            AbstractSyntaxTreeUtil.generateGetterSelector(nodeFactory, RESOURCE_MANAGER, false);
+        IdentifierNode getInstanceIdentifier = nodeFactory.identifier(GET_INSTANCE, false);
+        CallExpressionNode getInstanceCallExpression =
+            (CallExpressionNode) nodeFactory.callExpression(getInstanceIdentifier, null);
+        getInstanceCallExpression.setRValue(false);
+        MemberExpressionNode base = nodeFactory.memberExpression(resourceManagerMemberExpression,
+                                                                 getInstanceCallExpression);
+
+        IdentifierNode methodNameIdentifier = nodeFactory.identifier(methodName);
+        LiteralStringNode bundleLiteralString = nodeFactory.literalString(bundle);
+        ArgumentListNode argumentList = nodeFactory.argumentList(null, bundleLiteralString);
+        LiteralStringNode keyLiteralString = nodeFactory.literalString(key);
+        argumentList = nodeFactory.argumentList(argumentList, keyLiteralString);
+        CallExpressionNode selector =
+            (CallExpressionNode) nodeFactory.callExpression(methodNameIdentifier, argumentList);
+        selector.setRValue(false);
+
+        return nodeFactory.memberExpression(base, selector);
+    }
+
     public int getXmlLineNumber()
     {
         return lineNumber;
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/BindingExpression.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/BindingExpression.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/BindingExpression.java	(working copy)
@@ -150,7 +150,7 @@
 
     public String getDestinationPath(boolean doXML)
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         if (!(doXML && (isDestinationXMLAttribute || isDestinationXMLNode)))
         {
@@ -202,7 +202,7 @@
             return "";
         }
 
-        StringBuffer destinationRoot = new StringBuffer();
+        StringBuilder destinationRoot = new StringBuilder();
 
         Stack destinationStack = generateDestinationStack();
 
@@ -334,7 +334,7 @@
         {
             Model repeater = (Model) iterator.next();
             int repeaterLevel = repeater.getRepeaterLevel();
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             int i;
 
             for (i = 0; i < repeaterLevel; i++)
@@ -504,7 +504,7 @@
 	{
 		if (namespaces != null)
 		{
-			StringBuffer b = new StringBuffer();
+			StringBuilder b = new StringBuilder();
 			for (Iterator i = namespaces.keySet().iterator(); i.hasNext();)
 			{
 				String uri = (String) i.next();
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/DocumentInfo.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/DocumentInfo.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/DocumentInfo.java	(working copy)
@@ -33,11 +33,12 @@
 	private String packageName;
 	private QName qname;
 	private String qualifiedSuperClassName;
-	private Set interfaceNames;
-	private Set importNames;
-	private Map varDecls;	// key=id, value=className
-	private List scripts;
-	private List metadata;
+	private Set<NameInfo> interfaceNames;
+	private Set<NameInfo> importNames;
+	private List<String[]> splitImportNames;
+	private Map<String, VarDecl> varDecls;	// key=id, value=className
+	private List<Script> scripts;
+	private List<Script> metadata;
 
 	public DocumentInfo(String path)
 	{
@@ -174,7 +175,7 @@
 	public void addImportNames(Collection names, int line)
 	{
 		for (Iterator iter = names.iterator(); iter.hasNext(); )
-			addImportName((String)iter.next(), line);
+			addImportName((String) iter.next(), line);
 	}
 
 	/**
@@ -185,7 +186,26 @@
 		return importNames != null ? importNames : Collections.EMPTY_SET;
 	}
 
+	public void addSplitImportName(String[] splitImportName)
+	{
+        (splitImportNames != null ? splitImportNames : (splitImportNames = new ArrayList<String[]>())).add(splitImportName);
+	}
+
 	/**
+	 * add presplit definition names to import set
+	 */
+	public void addSplitImportNames(Collection names)
+	{
+		for (Iterator iter = names.iterator(); iter.hasNext(); )
+			addSplitImportName((String[]) iter.next());
+	}
+
+	public List<String[]> getSplitImportNames()
+	{
+		return splitImportNames != null ? splitImportNames : Collections.<String[]>emptyList();
+	}
+
+	/**
 	 * add name -> className mapping.
 	 * <br>This set is built as InterfaceCompiler.InterfaceAnalyzer traverses the DOM, collecting items needed
 	 * to generate the public signature of the class to be generated.
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/EventHandler.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/EventHandler.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/EventHandler.java	(working copy)
@@ -50,7 +50,7 @@
     public String getDocumentFunctionName() {
         if (documentFunctionName == null)
         {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
             buf.append("__");
             buildNameChain(buf, model);
             buf.append("_");
@@ -60,7 +60,7 @@
         return documentFunctionName;
     }
 
-    private boolean buildNameChain(StringBuffer buf, Model mod)
+    private boolean buildNameChain(StringBuilder buf, Model mod)
     {
         if (mod != null)
         {
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/init/EffectInitializer.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/init/EffectInitializer.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/init/EffectInitializer.java	(working copy)
@@ -50,4 +50,20 @@
 		return lvalueBase + ".setStyle(" + TextGen.quoteWord(getName()) + ", " + getValueExpr() + ")";
 	}
 
+    // intern all identifier constants
+    private static final String SET_STYLE = "setStyle".intern();
+
+	public ExpressionStatementNode generateAssignExpr(NodeFactory nodeFactory, Node lvalueBase)
+    {
+        IdentifierNode identifier = nodeFactory.identifier(SET_STYLE, false);
+        LiteralStringNode literalString = nodeFactory.literalString(getName());
+        ArgumentListNode argumentList = nodeFactory.argumentList(null, literalString);
+        argumentList = nodeFactory.argumentList(argumentList, generateValueExpr(nodeFactory));
+        CallExpressionNode callExpression =
+            (CallExpressionNode) nodeFactory.callExpression(identifier, argumentList);
+        callExpression.setRValue(false);
+        MemberExpressionNode memberExpression = nodeFactory.memberExpression(lvalueBase, callExpression);
+        ListNode list = nodeFactory.list(null, memberExpression);
+        return nodeFactory.expressionStatement(list);
+    }
 }
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/init/EventInitializer.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/init/EventInitializer.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/init/EventInitializer.java	(working copy)
@@ -25,6 +25,8 @@
  */
 public class EventInitializer implements Initializer
 {
+    private static final String EVENT = "event".intern();
+
 	private final EventHandler handler;
 
 	public EventInitializer(EventHandler handler)
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/init/ValueInitializer.java	(working copy)
@@ -40,6 +40,28 @@
  */
 public abstract class ValueInitializer implements Initializer
 {
+    // intern all identifier constants
+    private static final String BINDING_MANAGER = "BindingManager".intern();
+    private static final String CD = "cd".intern();
+    private static final String CHILD_DESCRIPTORS = "childDescriptors".intern();
+    private static final String CREATE_XML_DOCUMENT = "createXMLDocument".intern();
+    private static final String DEFERRED_INSTANCE_FROM_CLASS = "DeferredInstanceFromClass".intern();
+    private static final String DEFERRED_INSTANCE_FROM_FUNCTION = "DeferredInstanceFromFunction".intern();
+    private static final String DOCUMENT = "document".intern();
+    private static final String EXECUTE_BINDINGS = "executeBindings".intern();
+    private static final String FIRST_CHILD = "firstChild".intern();
+    private static final String I = "i".intern();
+    private static final String ID = "id".intern();
+    private static final String INITIALIZED = "initialized".intern();
+    private static final String INITIALIZE_REPEATER = "initializeRepeater".intern();
+    private static final String LENGTH = "length".intern();
+    private static final String MX_BINDING = "mx.binding".intern();
+    private static final String MX_UTILS = "mx.utils".intern();
+    private static final String REGISTER_EFFECTS = "registerEffects".intern();
+    private static final String TEMP = "temp".intern();
+    private static final String UNDEFINED = "undefined".intern();
+    private static final String XML_UTIL = "XMLUtil".intern();
+
 	protected final Object value;
 	protected final int line;
 
@@ -542,7 +564,7 @@
 	 */
 	private static StringBuffer fixupXMLString(String orig)
 	{
-		StringBuffer result = new StringBuffer();
+		StringBuilder result = new StringBuilder();
 
 		for (int i = 0; i < orig.length(); i++)
 		{
@@ -577,21 +599,65 @@
 		}
 		else
 		{
-			StringBuffer buf = new StringBuffer(NameFormatter.toDot(StandardDefs.CLASS_XMLUTIL) + ".createXMLDocument(\"");
+			StringBuilder buf = new StringBuilder(NameFormatter.toDot(StandardDefs.CLASS_XMLUTIL) + ".createXMLDocument(\"");
 			buf.append(fixupXMLString(xml).toString());
 			buf.append("\").firstChild");
 			return buf.toString();
 		}
 	}
 
-    private static String asXMLList(XMLList component)
-    {
-        StringBuffer buf = new StringBuffer("<>");
-        buf.append(component.getLiteralXML());
-        buf.append("</>");
-        return buf.toString();
-    }
+	/**
+	 *
+	 */
+	private static Node asXmlLiteral(NodeFactory nodeFactory, XML component)
+	{
+		String xml = component.getLiteralXML();
+		if (component.getIsE4X())
+		{
+			LiteralStringNode literalString = nodeFactory.literalString(component.getLiteralXML());
+			ListNode list = nodeFactory.list(null, literalString);
+			return nodeFactory.literalXML(list, false, -1);
+		}
+		else
+		{
+			//StringBuilder buf = new StringBuilder(NameFormatter.toDot(StandardDefs.CLASS_XMLUTIL) + ".createXMLDocument(\"");
+			//buf.append(fixupXMLString(xml));
+			//buf.append("\").firstChild");
+			//return buf.toString();
+			MemberExpressionNode base =
+                AbstractSyntaxTreeUtil.generateGetterSelector(nodeFactory, MX_UTILS, XML_UTIL, false);
+			IdentifierNode createXMLDocumentIdentifier = nodeFactory.identifier(CREATE_XML_DOCUMENT, false);
+			LiteralStringNode literalString = nodeFactory.literalString(xml);
+			ArgumentListNode argumentList = nodeFactory.argumentList(null, literalString);
+			CallExpressionNode selector =
+				(CallExpressionNode) nodeFactory.callExpression(createXMLDocumentIdentifier,
+																argumentList);
+			selector.setRValue(false);
+			MemberExpressionNode memberExpression = nodeFactory.memberExpression(base, selector);
 
+			IdentifierNode firstChildIdentifier = nodeFactory.identifier(FIRST_CHILD, false);
+			GetExpressionNode getExpression = nodeFactory.getExpression(firstChildIdentifier);
+			return nodeFactory.memberExpression(memberExpression, getExpression);
+		}
+	}
+
+	private static String asXMLList(XMLList component)
+	{
+		StringBuilder buf = new StringBuilder("<>");
+		buf.append(component.getLiteralXML());
+		buf.append("</>");
+		return buf.toString();
+	}
+
+	private static LiteralXMLNode asXMLList(NodeFactory nodeFactory, XMLList component)
+	{
+		LiteralStringNode literalString = nodeFactory.literalString(component.getLiteralXML());
+		ListNode list = nodeFactory.list(null, literalString);
+		LiteralXMLNode literalXML = nodeFactory.literalXML(list, false, -1);
+		literalXML.is_xmllist = true;
+		return literalXML;
+	}
+
 	/**
 	 * NOTE this class should NOT contain Errors or Warnings. This exception is a late-stage patch to replace
 	 * an intolerably obscure error from generated AS (due to an outstanding bug) with a more specific error,
Index: modules/compiler/src/java/flex2/compiler/mxml/rep/MxmlDocument.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/mxml/rep/MxmlDocument.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/mxml/rep/MxmlDocument.java	(working copy)
@@ -413,6 +413,11 @@
 		return info.getImportNames();
 	}
 
+	public final List<String[]> getSplitImports()
+	{
+		return info.getSplitImportNames();
+	}
+
 	//	HACK: because essential stuff in a BindingExpression is set up *after* addBindingExpression() is called
 	//	on it, we have to wait until the last minute before adding their destination types to the import list.
 	//	TODO clean up BindingExpression setup. A BE should be completely configured by the time it's added here.
@@ -615,7 +620,7 @@
 	 */
     public String getWatcherSetupUtilClassName()
     {
-        StringBuffer stringBuffer = new StringBuffer("_");
+        StringBuilder stringBuffer = new StringBuilder("_");
 
         String packageName = getPackageName();
 
Index: modules/compiler/src/java/flex2/compiler/SourceList.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/SourceList.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/SourceList.java	(working copy)
@@ -177,7 +177,7 @@
 
 	private String constructClassName(String namespaceURI, String localPart)
 	{
-		return (namespaceURI.length() == 0) ? localPart : new StringBuffer(namespaceURI.length() + localPart.length() + 1).append(namespaceURI).append(":").append(localPart).toString();
+		return (namespaceURI.length() == 0) ? localPart : new StringBuilder(namespaceURI.length() + localPart.length() + 1).append(namespaceURI).append(":").append(localPart).toString();
 	}
 
 	public Source findSource(String namespaceURI, String localPart)
Index: modules/compiler/src/java/flex2/compiler/SourcePath.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/SourcePath.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/SourcePath.java	(working copy)
@@ -291,7 +291,7 @@
 
 	protected String constructClassName(String namespaceURI, String localPart)
 	{
-		return (namespaceURI.length() == 0) ? localPart : new StringBuffer(namespaceURI.length() + localPart.length() + 1).append(namespaceURI).append(":").append(localPart).toString();
+		return (namespaceURI.length() == 0) ? localPart : new StringBuilder(namespaceURI.length() + localPart.length() + 1).append(namespaceURI).append(":").append(localPart).toString();
 	}
 
 	public Source findSource(String namespaceURI, String localPart) throws CompilerException
@@ -517,6 +517,20 @@
 	{
 		return sources;
 	}
+
+    public String toString()
+    {
+        StringBuilder buffer = new StringBuilder();
+		Iterator<Source> iterator = sources.values().iterator();
+
+        while (iterator.hasNext())
+		{
+            Source source = iterator.next();
+            buffer.append("source = " + source + ", cu = " + source.getCompilationUnit() + "\n");
+		}
+
+        return buffer.toString();
+    }
 	
 	public void displayWarnings()
 	{
Index: modules/compiler/src/java/flex2/compiler/swc/catalog/CatalogReader.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/swc/catalog/CatalogReader.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/swc/catalog/CatalogReader.java	(working copy)
@@ -587,7 +587,7 @@
      */
     public static Object createDigestHashValue(String hashType, boolean isSigned) 
     {
-    	StringBuffer sb = new StringBuffer(hashType);
+    	StringBuilder sb = new StringBuilder(hashType);
     	sb.append(isSigned);
     	return sb.toString();
     }
Index: modules/compiler/src/java/flex2/compiler/swc/Digest.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/swc/Digest.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/swc/Digest.java	(working copy)
@@ -114,7 +114,7 @@
 		}
 
 		byte[] digestBytes = digest.digest(byteArray);
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		for (int i = 0; i < digestBytes.length; i++)
 		{
 			String s = Integer.toHexString(((int)digestBytes[i] & 0xff));
Index: modules/compiler/src/java/flex2/compiler/util/AbstractLogger.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/AbstractLogger.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/AbstractLogger.java	(working copy)
@@ -82,7 +82,7 @@
     public String formatPrefix( LocalizationManager l10n, ILocalizableMessage m )
     {
         init( l10n );
-        StringBuffer prefix = new StringBuffer();
+        StringBuilder prefix = new StringBuilder();
         if (m.getPath() != null)
         {
             prefix.append( m.getPath() );
Index: modules/compiler/src/java/flex2/compiler/util/LocalLogger.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/LocalLogger.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/LocalLogger.java	(working copy)
@@ -569,7 +569,7 @@
 		
 		if (result)
 		{
-			return (new StringBuffer(" [")
+			return (new StringBuilder(" [")
 				.append(new GeneratedCodeMarker().getMessage())).append(": ")
 				.append(new PathInfo(p).getMessage()).append(", ")
 				.append(new LineInfo(line.intValue()).getMessage()).append(", ")
Index: modules/compiler/src/java/flex2/compiler/util/MD5Crypt.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/MD5Crypt.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/MD5Crypt.java	(working copy)
@@ -65,7 +65,7 @@
 
 	private static String cryptTo64(long v, int n)
 	{
-		StringBuffer result = new StringBuffer();
+		StringBuilder result = new StringBuilder();
 		while (--n >= 0)
 		{
 			result.append(itoa64[(int) v & 0x3f]);
@@ -106,7 +106,7 @@
 	 */
 	private static String crypt_md5(byte[] pw, String salt) throws NoSuchAlgorithmException, UnsupportedEncodingException
 	{
-		StringBuffer passwd = new StringBuffer();
+		StringBuilder passwd = new StringBuilder();
 		String sp, ep;
 		byte[] finalState = new byte[MD5_SIZE];
 
@@ -265,7 +265,7 @@
 			return false;
 		}
 
-		StringBuffer salt = new StringBuffer(2);
+		StringBuilder salt = new StringBuilder(2);
 		salt.append(ciphertext.charAt(3));
 		salt.append(ciphertext.charAt(4));
 
@@ -293,7 +293,7 @@
 		int numSaltChars = saltChars.length;
 
 		// Generate a random salt
-		StringBuffer salt = new StringBuffer(2);
+		StringBuilder salt = new StringBuilder(2);
 		SecureRandom rand = new SecureRandom();
 		salt.append(saltChars[rand.nextInt(Integer.MAX_VALUE) % numSaltChars]);
 		salt.append(saltChars[rand.nextInt(Integer.MAX_VALUE) % numSaltChars]);
Index: modules/compiler/src/java/flex2/compiler/util/MultiName.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/MultiName.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/MultiName.java	(working copy)
@@ -171,7 +171,7 @@
 
 	public String toString()
 	{
-		StringBuffer b = new StringBuffer("[");
+		StringBuilder b = new StringBuilder("[");
 		for (int i = 0, length = namespaceURI.length; i < length; i++)
 		{
 			b.append(namespaceURI[i]);
Index: modules/compiler/src/java/flex2/compiler/util/OrderedProperties.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/OrderedProperties.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/OrderedProperties.java	(working copy)
@@ -312,7 +312,7 @@
     	
         //BufferedReader br = new BufferedReader(new InputStreamReader(is));
         String line;
-        StringBuffer buffer = new StringBuffer(100);
+        StringBuilder buffer = new StringBuilder(100);
     	int lineNumber = 0;
         int comment_length=0;
         String sep = System.getProperty("line.separator");
@@ -524,7 +524,7 @@
         return null;
 
 
-        StringBuffer buffer = new StringBuffer(string.length()+10);
+        StringBuilder buffer = new StringBuilder(string.length()+10);
 
         for(int i=0; i<string.length(); i++) {
             char current=string.charAt(i);
@@ -566,7 +566,7 @@
 	    if(string==null)
 		    return null;
 
-	    StringBuffer buffer = new StringBuffer(string.length());
+	    StringBuilder buffer = new StringBuilder(string.length());
 	    int string_index=0;
 
 	    while(string_index < string.length()) {
Index: modules/compiler/src/java/flex2/compiler/util/QName.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/QName.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/QName.java	(working copy)
@@ -152,7 +152,7 @@
 		}
 		else
 		{
-			StringBuffer b = new StringBuffer(namespaceURI.length() + localPart.length() + 1);
+			StringBuilder b = new StringBuilder(namespaceURI.length() + localPart.length() + 1);
 			b.append(namespaceURI).append(':').append(localPart);
 			fullName = b.toString();
 			return fullName;
Index: modules/compiler/src/java/flex2/compiler/util/QNameList.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/QNameList.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/QNameList.java	(working copy)
@@ -131,7 +131,7 @@
 
     public String toString()
     {
-        StringBuffer sb = new StringBuffer(20 * size());
+        StringBuilder sb = new StringBuilder(20 * size());
 
 	    for (int i = 0, s = size();i < s; i++)
 	    {
Index: modules/compiler/src/java/flex2/compiler/util/QNameSet.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/QNameSet.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/QNameSet.java	(working copy)
@@ -78,7 +78,7 @@
 
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (Iterator it = this.iterator(); it.hasNext();)
         {
             sb.append( it.next().toString() );
Index: modules/compiler/src/java/flex2/compiler/util/XMLStringSerializer.java
===================================================================
--- modules/compiler/src/java/flex2/compiler/util/XMLStringSerializer.java	(revision 3507)
+++ modules/compiler/src/java/flex2/compiler/util/XMLStringSerializer.java	(working copy)
@@ -237,7 +237,7 @@
 		        if (!(map.getNamespaceURI().equals(NS_URI_XMLNS) && map.getPrefix().equals("xmlns")) &&
 		            !(map.getNamespaceURI().equals(NS_URI_XML) && map.getPrefix().equals("xml")))
 		        {
-		            StringBuffer sb = new StringBuffer("xmlns");
+		            StringBuilder sb = new StringBuilder("xmlns");
 		            if (map.getPrefix().length() > 0) {
 		                sb.append(':');
 		                sb.append(map.getPrefix());
Index: modules/compiler/src/java/flex2/linker/DependencyWalker.java
===================================================================
--- modules/compiler/src/java/flex2/linker/DependencyWalker.java	(revision 3507)
+++ modules/compiler/src/java/flex2/linker/DependencyWalker.java	(working copy)
@@ -256,7 +256,7 @@
 
     public static String dump(  LinkState state )
     {
-        StringBuffer buf = new StringBuffer( 2048 );
+        StringBuilder buf = new StringBuilder( 2048 );
         buf.append( "<report>\n" );
         buf.append( "  <scripts>\n" );
         for (Iterator scripts = state.getVisitedLinkables().iterator(); scripts.hasNext();)
Index: modules/compiler/src/java/flex2/linker/FlexMovie.java
===================================================================
--- modules/compiler/src/java/flex2/linker/FlexMovie.java	(revision 3507)
+++ modules/compiler/src/java/flex2/linker/FlexMovie.java	(working copy)
@@ -274,7 +274,7 @@
 
 	public static String dumpRBList(Set bundles)
 	{
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 	    b.append("bundles = ");
 	    for (Iterator iterator = bundles.iterator(); iterator.hasNext();)
 	    {
Index: modules/compiler/src/java/flex2/tools/Compiler.java
===================================================================
--- modules/compiler/src/java/flex2/tools/Compiler.java	(revision 3507)
+++ modules/compiler/src/java/flex2/tools/Compiler.java	(working copy)
@@ -241,7 +241,7 @@
                                                         configuration, compilers, new PreLink(), licenseMap, new ArrayList());
 
                 // link
-                Movie movie = flex2.linker.API.link(units, new PostLink(configuration), configuration);
+                //Movie movie = flex2.linker.API.link(units, new PostLink(configuration), configuration);
 
                 // output SWF
                 String name = configuration.getOutput();
Index: modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java
===================================================================
--- modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java	(revision 3507)
+++ modules/compiler/src/java/flex2/tools/oem/internal/OEMConfiguration.java	(working copy)
@@ -319,7 +319,7 @@
 				RslPathList valueList = (RslPathList)value;
 				for (Iterator iter = valueList.iterator(); iter.hasNext();) 
 				{
-					StringBuffer sb = new StringBuffer(RUNTIME_SHARED_LIBRARY_PATH);
+					StringBuilder sb = new StringBuilder(RUNTIME_SHARED_LIBRARY_PATH);
 					sb.append("=");
 					String[] cdArgs = (String[])iter.next();
 					sb.append(cdArgs[0]);
@@ -1930,7 +1930,7 @@
 	public String toString()
 	{
 		String[] args = getCompilerOptions();
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 		for (int i = 0; i < args.length; i++)
 		{
 			b.append(args[i]);
@@ -2067,7 +2067,7 @@
 
 	private String toCommaSeparatedString(String[] strings)
 	{
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 		for (int i = 0, length = strings == null ? 0 : strings.length; i < length; i++)
 		{
 			b.append(strings[i]);
@@ -2081,7 +2081,7 @@
 
 	private String toCommaSeparatedString(File[] files)
 	{
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 		for (int i = 0, length = files == null ? 0 : files.length; i < length; i++)
 		{
 			b.append(files[i].getPath());
@@ -2095,7 +2095,7 @@
 
 	private String toCommaSeparatedString(URL[] urls)
 	{
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 		for (int i = 0, length = urls == null ? 0 : urls.length; i < length; i++)
 		{
 			b.append(urls[i].toExternalForm());
Index: modules/compiler/src/java/flex2/tools/PreLink.java
===================================================================
--- modules/compiler/src/java/flex2/tools/PreLink.java	(revision 3507)
+++ modules/compiler/src/java/flex2/tools/PreLink.java	(working copy)
@@ -334,7 +334,7 @@
         CompilerConfiguration compilerConfig = configuration.getCompilerConfiguration();
         ServicesDependencies servicesDependencies = compilerConfig.getServicesDependencies();
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("package {\n");
 		sb.append("import flash.utils.*;\n");
 		sb.append("import mx.core.IFlexModuleFactory;\n");
@@ -619,7 +619,7 @@
 
 	private String codegenAccessibilityImports(Set accessibilityImplementations)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		sb.append("import flash.system.*\n");
 		if (accessibilityImplementations != null)
@@ -667,7 +667,7 @@
 			return "[]";
 		}
 		
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		buf.append("[");
 		for (Iterator iter = cdRsls.iterator(); iter.hasNext();)
 		{
@@ -722,12 +722,12 @@
 	 * 
 	 * @param swcContext 
 	 * @param info cross-domain rsl info
-	 * @param buf StringBuffer to append info to
+	 * @param buf StringBuilder to append info to
 	 */
 	private static void codegenDigestArrays(CompilerSwcContext swcContext,
 									 Configuration configuration,
 									 Configuration.RslPathInfo info,
-									 StringBuffer buf) {
+									 StringBuilder buf) {
 		// get the swc for current rsl
 		Swc swc = swcContext.getSwc(info.getSwcVirtualFile().getName());
 		
@@ -741,9 +741,9 @@
 		boolean secureRsls = configuration.getVerifyDigests();
 		boolean haveDigest = false;		// true if write a digest to the startup info
 		boolean haveUnsignedRsl = false;   // true if we wrote an unsigned rsl to the startup info
-		StringBuffer digestBuffer = new StringBuffer("\"digests\":[");
-		StringBuffer typeBuffer = new StringBuffer("\"types\":[");
-		StringBuffer signedBuffer = new StringBuffer("\"isSigned\":[");
+		StringBuilder digestBuffer = new StringBuilder("\"digests\":[");
+		StringBuilder typeBuffer = new StringBuilder("\"types\":[");
+		StringBuilder signedBuffer = new StringBuilder("\"isSigned\":[");
 		
 		for (Iterator iter2 = info.getSignedFlags().iterator(); iter2.hasNext();) {
 			Boolean isSigned = (Boolean)iter2.next();
@@ -824,7 +824,7 @@
     {
         if ((rsls != null) && (rsls.size() > 0))
         {
-            StringBuffer rb = new StringBuffer();
+            StringBuilder rb = new StringBuilder();
 
             rb.append("[");
             for (Iterator it = rsls.iterator(); it.hasNext();)
@@ -852,7 +852,7 @@
     private static String codegenFrameClassList(List frames)
     {
         assert frames != null && frames.size() > 0;
-        StringBuffer mb = new StringBuffer();
+        StringBuilder mb = new StringBuilder();
         mb.append("{");
 
         for (Iterator it = frames.iterator(); it.hasNext();)
@@ -906,7 +906,7 @@
             fi.italic |= font.italic;
         }
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		sb.append("      {\n");
 
@@ -938,7 +938,7 @@
 			return "";
 		}
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		if ((accessibilityImplementations != null) && (accessibilityImplementations.size() != 0))
 		{
@@ -969,7 +969,7 @@
 
     private String codegenRemoteClassImports( Map remoteClassAliases )
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         if (remoteClassAliases.size() > 0)
             sb.append( "import flash.net.registerClassAlias;\n" );
@@ -984,7 +984,7 @@
     }
     private String codegenRemoteClassAliases( Map remoteClassAliases )
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         for (Iterator it = remoteClassAliases.entrySet().iterator(); it.hasNext(); )
         {
@@ -1011,7 +1011,7 @@
 
 	private String codegenEffectTriggerRegistration( Map effectTriggers )
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		for (Iterator it = effectTriggers.entrySet().iterator(); it.hasNext(); )
         {
@@ -1027,7 +1027,7 @@
 
     private String codegenInheritingStyleRegistration( Set inheritingStyles )
     {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("      var styleNames:Array = [");
 
         Iterator iterator = inheritingStyles.iterator();
@@ -1240,7 +1240,7 @@
     	}
 		String lineSep = System.getProperty("line.separator");
 		
-		StringBuffer codePieces = new StringBuffer();
+		StringBuilder codePieces = new StringBuilder();
 		for (Iterator i = resourceBundleNames.iterator(); i.hasNext(); )
 		{
 			codePieces.append("[ResourceBundle(\"" + i.next() + "\")]" + lineSep);
Index: modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java
===================================================================
--- modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java	(revision 3507)
+++ modules/debugger/src/java/flash/tools/debugger/concrete/DManager.java	(working copy)
@@ -1903,7 +1903,7 @@
 	public static String convertToURI(String playerURL)
 	{
 		int index = playerURL.indexOf('|');
-		StringBuffer sb = new StringBuffer(playerURL);
+		StringBuilder sb = new StringBuilder(playerURL);
 		while(index > 0)
 		{
 			sb.setCharAt(index, ':');
Index: modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java
===================================================================
--- modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java	(revision 3507)
+++ modules/debugger/src/java/flash/tools/debugger/concrete/DMessage.java	(working copy)
@@ -179,7 +179,7 @@
 	int    m_type;		/* one of OutXXX or InXXX integer constants */
 
 	/* Debugging only: The contents of this message, formatted as a string for display */
-	private StringBuffer m_debugFormatted;
+	private StringBuilder m_debugFormatted;
 	/* Debugging only: The number of bytes from the input that we have formatted into m_debugFormatted */
 	private int m_debugFormattedThroughIndex;
 
@@ -187,7 +187,7 @@
 	public DMessage(int size)
 	{
 		m_content = new byte[size];
-		m_debugFormatted = new StringBuffer();
+		m_debugFormatted = new StringBuilder();
 		m_debugFormattedThroughIndex = 0;
 		clear();
 	}
@@ -394,7 +394,7 @@
 	{
 		if (PlayerSession.m_debugMsgOn || PlayerSession.m_debugMsgFileOn)
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			sb.append("0x"); //$NON-NLS-1$
 			FieldFormat.formatLongToHex(sb, value, numBytes * 2, true);
 			debugAppend(sb.toString());
@@ -428,7 +428,7 @@
 
 	public String inToString(int maxContentBytes)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append(getInTypeName());
 		sb.append('[');
 		sb.append(getSize());
@@ -443,7 +443,7 @@
 
 	public String outToString(int maxContentBytes)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append(getOutTypeName());
 		sb.append('[');
 		sb.append(getSize());
@@ -454,7 +454,7 @@
 		return sb.toString();
 	}
 
-	public StringBuffer appendContent(StringBuffer sb, int max)
+	public StringBuilder appendContent(StringBuilder sb, int max)
 	{
 		int size = getSize();
 		byte[] data = getData();
Index: modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java
===================================================================
--- modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java	(revision 3507)
+++ modules/debugger/src/java/flash/tools/debugger/concrete/DModule.java	(working copy)
@@ -262,7 +262,7 @@
 		return s.trim();
 	}
 
-	public void lineMapping(StringBuffer sb)
+	public void lineMapping(StringBuilder sb)
 	{
 		Map args = new HashMap();
 		args.put("fileName", getName() ); //$NON-NLS-1$
@@ -695,7 +695,7 @@
         BufferedReader f = null;
         try
         {
-        	StringBuffer sb = new StringBuffer();
+        	StringBuilder sb = new StringBuilder();
         	Reader reader = null;
         	if (encoding == null)
         		reader = new InputStreamReader(in);
Index: modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java
===================================================================
--- modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java	(revision 3507)
+++ modules/debugger/src/java/flash/tools/debugger/concrete/DValue.java	(working copy)
@@ -374,7 +374,7 @@
 
 	public String membersToString()
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		/* find out the size of the array */
 		if (m_members == null)
Index: modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java
===================================================================
--- modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java	(revision 3507)
+++ modules/debugger/src/java/flash/tools/debugger/concrete/PlayerSession.java	(working copy)
@@ -346,7 +346,7 @@
 	 */
 	private String executeAppleScript(String[] appleScript, String[] argv)
 	{
-		StringBuffer retval = new StringBuffer();
+		StringBuilder retval = new StringBuilder();
 		try
 		{
 			List execArgs = new LinkedList();
Index: modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java
===================================================================
--- modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java	(revision 3507)
+++ modules/debugger/src/java/flash/tools/debugger/DebuggerLocalizer.java	(working copy)
@@ -59,7 +59,7 @@
 			{
 				public String format(Map parameters)
 				{
-					StringBuffer sb = new StringBuffer();
+					StringBuilder sb = new StringBuilder();
 					sb.append('!');
 					sb.append(id);
 					sb.append('!');
Index: modules/debugger/src/java/flash/util/URLEncoder.java
===================================================================
--- modules/debugger/src/java/flash/util/URLEncoder.java	(revision 3507)
+++ modules/debugger/src/java/flash/util/URLEncoder.java	(working copy)
@@ -42,7 +42,7 @@
 
 		int length = s.length();
 
-		StringBuffer out = new StringBuffer(length);
+		StringBuilder out = new StringBuilder(length);
 
 		ByteArrayOutputStream buf = new ByteArrayOutputStream(10); // why 10? w3c says so.
 
@@ -93,7 +93,7 @@
 		return out.toString();
 	}
 
-	private static final void toHex(StringBuffer buffer, byte[] b)
+	private static final void toHex(StringBuilder buffer, byte[] b)
 	{
 		for (int i = 0; i < b.length; i++)
 		{
Index: modules/debugger/src/java/flash/util/URLHelper.java
===================================================================
--- modules/debugger/src/java/flash/util/URLHelper.java	(revision 3507)
+++ modules/debugger/src/java/flash/util/URLHelper.java	(working copy)
@@ -202,7 +202,7 @@
 	{
 		if ((parameterMap != null) && (!parameterMap.isEmpty()))
 		{
-			StringBuffer queryString = new StringBuffer();
+			StringBuilder queryString = new StringBuilder();
 
 			Iterator it = parameterMap.entrySet().iterator();
 			while (it.hasNext())
@@ -241,7 +241,7 @@
 	 */
 	public static String escapeCharacter(String uri, char c, String to)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		int size = uri.length();
 		int at = uri.indexOf(':');
Index: modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java
===================================================================
--- modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java	(revision 3507)
+++ modules/debugger/src/java/flex/tools/debugger/cli/DebugCLI.java	(working copy)
@@ -620,7 +620,7 @@
 	}
 
 	// add the given character n times to sb
-	void repeat(StringBuffer sb, char c, int n)
+	void repeat(StringBuilder sb, char c, int n)
 	{
 		while(n-- > 0)
 			sb.append(c);
@@ -871,7 +871,7 @@
 		// dump the URI that the player has sent us
 		try
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			sb.append("URI = "); //$NON-NLS-1$
 			sb.append( m_session.getURI() );
 			out( sb.toString() );
@@ -889,7 +889,7 @@
 	{
 		try
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			Iterator itr = m_fileInfo.getAllFiles();
 
 			while(itr.hasNext())
@@ -922,7 +922,7 @@
 
 	void doShowLocations()
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("Num Type           Disp Enb Address    What"+m_newline);
 
 		// our list of breakpoints
@@ -1032,7 +1032,7 @@
 			out(getLocalizationManager().getLocalizedTextString("playerRunning")); //$NON-NLS-1$
 	}
 
-	public void appendReason(StringBuffer sb, int reason)
+	public void appendReason(StringBuilder sb, int reason)
 	{
 		switch(reason)
 		{
@@ -1149,7 +1149,7 @@
 	{
 		waitTilHalted();
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		Frame[] stack = m_session.getFrames();
 		if (stack == null || stack.length == 0)
 			sb.append(getLocalizationManager().getLocalizedTextString("noStackAvailable")); //$NON-NLS-1$
@@ -1174,7 +1174,7 @@
 	/**
 	 * Spit out frame information for a given frame number 
 	 */
-	boolean appendFrameInfo(StringBuffer sb, Frame ctx, int frameNumber, boolean showThis, boolean showFileId) throws PlayerDebugException
+	boolean appendFrameInfo(StringBuilder sb, Frame ctx, int frameNumber, boolean showThis, boolean showFileId) throws PlayerDebugException
 	{
 		boolean validFrame = true;
 
@@ -1263,7 +1263,7 @@
 		waitTilHalted();
 
 		// dump a set of locals
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		// use our expression cache formatting routine
 		try
@@ -1292,7 +1292,7 @@
 
 	void doInfoDisplay()
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("Num Enb Expression"+m_newline); //$NON-NLS-1$
 
 		// our list of displays
@@ -1323,7 +1323,7 @@
 		waitTilHalted();
 
 		// dump a set of locals
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		// use our expression cache formatting routine
 		try
@@ -1354,7 +1354,7 @@
 		waitTilHalted();
 
 		// dump a set of locals
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		// use our expression cache formatting routine
 		try
@@ -1394,7 +1394,7 @@
 		waitTilHalted();
 
 		// dump the scope chain
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		// use our expression cache formatting routine
 		try
@@ -1453,7 +1453,7 @@
     {
 		try
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			SwfInfo[] swfs = m_fileInfo.getSwfs();
 			for(int i=0; i<swfs.length; i++)
 			{
@@ -1528,7 +1528,7 @@
 			return AUTHORED_FILE;
 	}
 
-	void buildFileList(StringBuffer sb, boolean authoredFilesOnly)
+	void buildFileList(StringBuilder sb, boolean authoredFilesOnly)
 	{
 		SourceFile[] ar = m_fileInfo.getFileList();
 		if (ar == null)
@@ -1598,7 +1598,7 @@
 	 * If flow is set then the strings are placed
 	 * on a single line and wrapped at $columnwidth
 	 */
-	void appendStrings(StringBuffer sb, Vector v, boolean flow)
+	void appendStrings(StringBuilder sb, Vector<String> v, boolean flow)
 	{
 		int count = v.size();
 		int width = 0;
@@ -1634,7 +1634,7 @@
 	{
 		try
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
             if (hasMoreTokens())
             {
                 String arg = nextToken();
@@ -1763,7 +1763,7 @@
 		else
 		{
 			// dump them all
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 
 			appendFaultTitles(sb);
 
@@ -1779,7 +1779,7 @@
 
 	void doInfoFuncs()
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		String arg = null;
 
@@ -1836,7 +1836,7 @@
 		}
 	}
 
-	void listFunctionsFor(StringBuffer sb, SourceFile m)
+	void listFunctionsFor(StringBuilder sb, SourceFile m)
 	{
 		String[] names = m.getFunctionNames(m_session);
 		if (names == null)
@@ -1860,7 +1860,7 @@
 		}
 	}
 
-    void listFilesMatching(StringBuffer sb, String match)
+    void listFilesMatching(StringBuilder sb, String match)
     {
         SourceFile[] sourceFiles = m_fileInfo.getFiles(match);
 
@@ -1878,7 +1878,7 @@
 	{
 		try
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			buildFileList(sb, true);
 			out(sb.toString());
 		}
@@ -1892,7 +1892,7 @@
 	{
 //		waitTilHalted();
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("Num Type           Disp Enb Address    What"+m_newline);
 
 		// our list of breakpoints
@@ -2081,7 +2081,7 @@
 			if (m_session.isSuspended())
 			{
 				// capture our break location / information
-				StringBuffer sbLine = new StringBuffer();
+				StringBuilder sbLine = new StringBuilder();
 				dumpBreakLine(postStep, sbLine);
 
 				// Process our breakpoints.
@@ -2092,10 +2092,10 @@
 				// was set to true in the call or one or more breakpoints that
 				// hit contained the keyword silent in their command list.
 				//
-				StringBuffer sbBreak = new StringBuffer();
+				StringBuilder sbBreak = new StringBuilder();
 				boolean silent = processBreak(postStep, sbBreak);
 
-				StringBuffer sb = new StringBuffer();
+				StringBuilder sb = new StringBuilder();
 				if (silent)
 				{
 					// silent means we only spit out our current location
@@ -2140,7 +2140,7 @@
 		return where;
 	}
 
-	void dumpBreakLine(boolean postStep, StringBuffer sb) throws NotConnectedException
+	void dumpBreakLine(boolean postStep, StringBuilder sb) throws NotConnectedException
 	{
 		int bp = -1;
 		String name = getLocalizationManager().getLocalizedTextString("unknownFilename"); //$NON-NLS-1$
@@ -2210,7 +2210,7 @@
 				String reasonForHalting;
 				if ( reason == SuspendReason.Fault || reason == SuspendReason.StopRequest)
 				{
-					StringBuffer s = new StringBuffer();
+					StringBuilder s = new StringBuilder();
 					appendReason(s, reason);
 					reasonForHalting = s.toString();
 				}
@@ -2254,7 +2254,7 @@
 		}
 	}
 
-	void appendFullnamePosition(StringBuffer sb, SourceFile file, int lineNbr)
+	void appendFullnamePosition(StringBuilder sb, SourceFile file, int lineNbr)
 	{
         // fullname option means we dump 'path:line:col?:offset', which is used for emacs !
 		String name = file.getFullPath();
@@ -2279,7 +2279,7 @@
 	// pretty print a trace statement to the console
 	void dumpTraceLine(String s)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("[trace] "); //$NON-NLS-1$
 		sb.append(s);
 		out(sb.toString());
@@ -2288,7 +2288,7 @@
 	// pretty print a fault statement to the console
 	void dumpFaultLine(FaultEvent e)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		// use a slightly different format for ConsoleErrorFaults
 		if (e instanceof ConsoleErrorFault)
@@ -2329,7 +2329,7 @@
 		int at = e.path.lastIndexOf('?');
 		String name = (at > -1) ? e.path.substring(0, at) : e.path;
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append(getLocalizationManager().getLocalizedTextString("linePrefixWhenSwfLoaded")); //$NON-NLS-1$
 		sb.append(' ');
 		sb.append(name);
@@ -2401,7 +2401,7 @@
 		int at = e.path.lastIndexOf('?');
 		String name = (at > -1) ? e.path.substring(0, at) : e.path;
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append(getLocalizationManager().getLocalizedTextString("linePrefixWhenSwfUnloaded")); //$NON-NLS-1$
 		sb.append(' ');
 		sb.append(name);
@@ -3109,7 +3109,7 @@
 	 * an error, and the return value is 'false' (indicating that the
 	 * debugger should halt).
 	 */
-	private boolean resolveBreakpoints(StringBuffer sb)
+	private boolean resolveBreakpoints(StringBuilder sb)
 	{
 		int count = breakpointCount();
 		boolean success = true;
@@ -3139,13 +3139,13 @@
 	 * Try to resolve one breakpoint.  We do this every time a new ABC or
 	 * SWF is loaded.
 	 * @param b the breakpoint to resolve (it's okay if it's already resolved)
-	 * @param sb a StringBuffer to which any messages for are appended;
+	 * @param sb a StringBuilder to which any messages for are appended;
 	 * 			to the user.
 	 * @return true if the breakpoint is resolved
 	 * @throws AmbiguousException
 	 * @throws NullPointerException 
 	 */
-	private boolean tryResolveBreakpoint(BreakAction b, StringBuffer sb) throws AmbiguousException
+	private boolean tryResolveBreakpoint(BreakAction b, StringBuilder sb) throws AmbiguousException
 	{
 		int status = b.getStatus();
 		boolean resolved = (status == BreakAction.RESOLVED);
@@ -3525,7 +3525,7 @@
 			int which = m_exprCache.add(result);
 
 			/* dump the output */
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			sb.append('$');
 			sb.append(which);
 			sb.append(" = "); //$NON-NLS-1$
@@ -3685,7 +3685,7 @@
 			ValueExp expr = parseExpression(var);
 			result = evalExpression(expr);
 
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 
 			if (result instanceof Variable)
 			{
@@ -3850,7 +3850,7 @@
     // @throws ArrayIndexOutOfBoundsException if frame 'frm' doesn't exist
 	void dumpFrame(int frm) throws PlayerDebugException, ArrayIndexOutOfBoundsException
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		Frame[] ar = m_session.getFrames();
 		appendFrameInfo(sb, ar[frm], frm, false, true);
 
@@ -3886,7 +3886,7 @@
             SourceFile f = m_fileInfo.getFile(module);
             if (f != null)
             {
-                StringBuffer sb = new StringBuffer();
+                StringBuilder sb = new StringBuilder();
                 appendFullnamePosition(sb, f, line);
                 sb.append('\n'); // not sure why this is needed but it seems to address some emacs bugs
                 out(sb.toString());
@@ -3967,7 +3967,7 @@
 		}
 	}
 
-	StringBuffer treeResults(StringBuffer sb, List e, String memName, boolean fullName)
+	StringBuilder treeResults(StringBuilder sb, List<Object> e, String memName, boolean fullName)
 	{
 		// walk the list
 		Iterator i = e.iterator();
@@ -3997,12 +3997,12 @@
 	 */
 	public void outputSource(int module, int line, String s)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		appendSource(sb, module, line, s, true);
 		out( sb.toString() );
 	}
 
-	void appendSource(StringBuffer sb, int module, int line, String s, boolean markCurrent)
+	void appendSource(StringBuilder sb, int module, int line, String s, boolean markCurrent)
 	{
 		String lineS = String.valueOf(line);
 		int padding = 6 - lineS.length();
@@ -4385,7 +4385,7 @@
 			result = evalExpression(expr);
 
 			/* dump the output */
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 
 			if (result instanceof Variable)
 			{
@@ -4732,14 +4732,14 @@
 
 	void listFault(String f)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		appendFaultTitles(sb);
 		appendFault(sb, f);
 
 		out( sb.toString() );
 	}
 
-	void appendFault(StringBuffer sb, String f)
+	void appendFault(StringBuilder sb, String f)
 	{
 		sb.append(f);
 
@@ -4765,7 +4765,7 @@
 		sb.append(m_newline);
 	}
 
-	void appendFaultTitles(StringBuffer sb)
+	void appendFaultTitles(StringBuilder sb)
 	{
 		sb.append("Fault                         Stop    Print     Description"+m_newline);
 		sb.append("-----                         ----    -----     -----------"+m_newline);
@@ -4964,7 +4964,7 @@
 	{
 		try
 		{
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 
 			/* pull the rest of the line */
 			String s = restOfLine();
@@ -5497,7 +5497,7 @@
              }
 
             SourceFile sourceFile = m_fileInfo.getFile(module);
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			sb.append(sourceFile.getName());
 			sb.append('#');
 			sb.append(sourceFile.getId());
@@ -5854,7 +5854,7 @@
 	 *
 	 * @return some hit breakpoint requested silence, shhhh!
 	 */
-	boolean processBreak(boolean postStep, StringBuffer sb) throws NotConnectedException
+	boolean processBreak(boolean postStep, StringBuilder sb) throws NotConnectedException
 	{
 		Location l = getCurrentLocation();
 		if (l == null || l.getFile() == null)
@@ -5943,7 +5943,7 @@
 	}
 
 	// iterate through our display list entries
-	void processDisplay(StringBuffer sb)
+	void processDisplay(StringBuilder sb)
 	{
 		int count = displayCount();
 		for(int i=0;i<count; i++)
@@ -6029,7 +6029,7 @@
 	 *
 	 * This io redirection crap is really UGLY!!!
 	 */
-	void issueCommand(String cmd, StringBuffer output)
+	void issueCommand(String cmd, StringBuilder output)
 	{
 		ByteArrayOutputStream ba = new ByteArrayOutputStream();
 		PrintStream ps = new PrintStream(ba);
@@ -6245,7 +6245,7 @@
 			a.setStatus(BreakAction.UNRESOLVED);
 		}
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		resolveBreakpoints(sb);
 		out(sb.toString());
 	}
@@ -6499,7 +6499,7 @@
         // Concatenate the lines, leaving out the first and last ones
         // which are supposed to be blank. They're only there to make
         // fdbhelp*.txt more readable.
-        StringBuffer helpText = new StringBuffer();
+        StringBuilder helpText = new StringBuilder();
         int n = lines.size();
         for (int i = 1; i < n - 1; i++)
         {
@@ -6613,7 +6613,7 @@
 			else
 			{
 				// matches more than one command dump message and go
-				StringBuffer sb = new StringBuffer();
+				StringBuilder sb = new StringBuilder();
 				Map args = new HashMap();
 				args.put("input", input); //$NON-NLS-1$
 				sb.append(getLocalizationManager().getLocalizedTextString("ambiguousCommand", args)); //$NON-NLS-1$
@@ -6830,7 +6830,7 @@
 	 * in them).
 	 * -------------------------------------------------------------------------
 	 */
-	void appendBreakInfo(StringBuffer sb) throws NotConnectedException	{ Extensions.appendBreakInfo(this, sb, false);	}
+	void appendBreakInfo(StringBuilder sb) throws NotConnectedException	{ Extensions.appendBreakInfo(this, sb, false);	}
 	void doShowStats()													{ Extensions.doShowStats(this);					}
 	void doShowFuncs()													{ Extensions.doShowFuncs(this);					}
 	void doShowProperties()												{ Extensions.doShowProperties(this);			}
Index: modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java
===================================================================
--- modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java	(revision 3507)
+++ modules/debugger/src/java/flex/tools/debugger/cli/ExpressionCache.java	(working copy)
@@ -168,7 +168,7 @@
 	/**
 	 * Formatting function for variable
 	 */
-	public static void appendVariable(StringBuffer sb, Variable v)
+	public static void appendVariable(StringBuilder sb, Variable v)
 	{
 		//sb.append('\'');
 		String name = v.getName();
@@ -179,9 +179,9 @@
 		//appendVariableAttributes(sb, v);
 	}
 
-	public static void appendVariableValue(StringBuffer sb, Value val) { appendVariableValue(sb,val,""); } //$NON-NLS-1$
+	public static void appendVariableValue(StringBuilder sb, Value val) { appendVariableValue(sb,val,""); } //$NON-NLS-1$
 
-	public static void appendVariableValue(StringBuffer sb, Value val, String variableName)
+	public static void appendVariableValue(StringBuilder sb, Value val, String variableName)
 	{
 		int type = val.getType();
 		String typeName = val.getTypeName();
@@ -334,7 +334,7 @@
 		return DebugCLI.getLocalizationManager();
 	}
 
-	public static void appendVariableAttributes(StringBuffer sb, Variable v)
+	public static void appendVariableAttributes(StringBuilder sb, Variable v)
 	{
 		if (v.getAttributes() == 0)
 			return;
Index: modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java
===================================================================
--- modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java	(revision 3507)
+++ modules/debugger/src/java/flex/tools/debugger/cli/ExpressionContext.java	(working copy)
@@ -57,7 +57,7 @@
 	public String getName() 
 	{ 
 		int size = m_namedPath.size();
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for(int i=0; i<size; i++)
 		{
 			String s = (String) m_namedPath.get(i);
@@ -221,7 +221,7 @@
 			throw new NoSuchVariableException(o); // not quite right...
 		}
 
-  		StringBuffer sb = new StringBuffer();
+  		StringBuilder sb = new StringBuilder();
 
   		if (var != null)
   			ExpressionCache.appendVariable(sb, var);
@@ -518,7 +518,7 @@
 	 */
 	Value locateParentForNamed(int id, String name, boolean traverseProto) throws PlayerDebugException
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		Variable var = null;
 		Value val = null;
Index: modules/debugger/src/java/flex/tools/debugger/cli/Extensions.java
===================================================================
--- modules/debugger/src/java/flex/tools/debugger/cli/Extensions.java	(revision 3507)
+++ modules/debugger/src/java/flex/tools/debugger/cli/Extensions.java	(working copy)
@@ -55,7 +55,7 @@
 	{
 		/* we do some magic casting */
 		Session session = cli.getSession();
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		try
 		{
 			PlayerSession p = (PlayerSession)session;
@@ -101,7 +101,7 @@
 
 	public static void doShowFuncs(DebugCLI cli)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		String arg = null;
 		FileInfoCache fileInfo = cli.getFileCache();
@@ -164,7 +164,7 @@
 	 */
 	public static void doShowProperties(DebugCLI cli)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		Session session = cli.getSession();
 		Iterator keys = cli.propertyKeys().iterator();
@@ -224,7 +224,7 @@
 		try
 		{
 			Session session = cli.getSession();
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			if (session.isSuspended())
 			{
 				sb.append(getLocalizationManager().getLocalizedTextString("stopped")); //$NON-NLS-1$
@@ -243,7 +243,7 @@
 	}
 
 	// Extended low level break information
-	public static void appendBreakInfo(DebugCLI cli, StringBuffer sb, boolean includeFault) throws NotConnectedException
+	public static void appendBreakInfo(DebugCLI cli, StringBuilder sb, boolean includeFault) throws NotConnectedException
 	{
 		Session session = cli.getSession();
 		FileInfoCache fileInfo = cli.getFileCache();
@@ -269,7 +269,7 @@
 		if (includeFault)
 		{
 			args = new HashMap();
-			StringBuffer reasonBuffer = new StringBuffer();
+			StringBuilder reasonBuffer = new StringBuilder();
 			cli.appendReason(reasonBuffer, reason);
 			args.put("fault", reasonBuffer.toString() ); //$NON-NLS-1$
 			sb.append(' ');
@@ -288,7 +288,7 @@
 			int id = cli.nextIntToken();
 			String name = (cli.hasMoreTokens()) ? cli.nextToken() : null;
 
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			sb.append(name);
 			sb.append(" = "); //$NON-NLS-1$
 			Value v = ((PlayerSession)session).getValue(id, name);
Index: modules/debugger/src/java/flex/tools/debugger/cli/ExtensionsDisabled.java
===================================================================
--- modules/debugger/src/java/flex/tools/debugger/cli/ExtensionsDisabled.java	(revision 3507)
+++ modules/debugger/src/java/flex/tools/debugger/cli/ExtensionsDisabled.java	(working copy)
@@ -25,7 +25,7 @@
 	public static void doShowFuncs(DebugCLI cli) { cli.out("Command not supported."); }
 	public static void doShowProperties(DebugCLI cli) { cli.out("Command not supported."); }
 	public static void doShowBreak(DebugCLI cli) { cli.out("Command not supported."); }
-	public static void appendBreakInfo(DebugCLI cli, StringBuffer sb, boolean includeFault) { cli.out("Command not supported."); }
+	public static void appendBreakInfo(DebugCLI cli, StringBuilder sb, boolean includeFault) { cli.out("Command not supported."); }
 	public static void doShowVariable(DebugCLI cli) { cli.out("Command not supported."); }
  	public static void doDisassemble(DebugCLI cli) { cli.out("Command not supported."); }
 }
Index: modules/debugger/src/java/flex/tools/debugger/cli/Help.java
===================================================================
--- modules/debugger/src/java/flex/tools/debugger/cli/Help.java	(revision 3507)
+++ modules/debugger/src/java/flex/tools/debugger/cli/Help.java	(working copy)
@@ -57,7 +57,7 @@
             //The locale is "", "", "".
             return names;
         }
-        final StringBuffer temp = new StringBuffer(baseName);
+        final StringBuilder temp = new StringBuilder(baseName);
         temp.append('_');
         temp.append(language);
         if (language.length() > 0) {
Index: modules/swfutils/src/java/flash/fonts/FontManager.java
===================================================================
--- modules/swfutils/src/java/flash/fonts/FontManager.java	(revision 3507)
+++ modules/swfutils/src/java/flash/fonts/FontManager.java	(working copy)
@@ -160,4 +160,126 @@
         return manager;
     }
 
+
+    public static void throwFontNotFound(String alias, String fontFamily, int style, String location)
+    {
+        StringBuilder message = new StringBuilder("Font for alias '");
+        message.append(alias).append("' ");
+        if (style == FontFace.BOLD)
+        {
+            message.append("with bold weight ");
+        }
+        else if (style == FontFace.ITALIC)
+        {
+            message.append("with italic style ");
+        }
+        else if (style == (FontFace.BOLD + FontFace.ITALIC))
+        {
+            message.append("with bold weight and italic style ");
+        }
+        else
+        {
+            message.append("with plain weight and style ");
+        }
+
+        if (location != null)
+        {
+            message.append("was not found at: ").append(location.toString());
+        }
+        else
+        {
+            message.append("was not found by family name '").append(fontFamily).append("'");
+        }
+        throw new FontNotFoundException(message.toString());
+    }
+
+    /**
+     * Values are expressed as hexadecimal numbers, prefixed with
+     * &quot;U+&quot;. For single numbers, the character '?' is assumed to mean
+     * 'any value' which creates a range of character positions. Otherwise, the
+     * range can be specified explicitly using a hyphen, e.g. U+00A0-U+00FF
+     * 
+     * @param st
+     * @param ranges
+     */
+    private static void parseRanges(StringTokenizer st, char[][] ranges)
+    {
+        int i = 0;
+        while (st.hasMoreElements())
+        {
+            String element = ((String)st.nextElement()).trim().toUpperCase();
+
+            if (element.startsWith("U+"))
+            {
+                String range = element.substring(2).trim();
+                String low;
+                String high;
+
+                if (range.indexOf('?') > 0) // Wild-Card Range, e.g. U+00??
+                {
+                    low = range.replace('?', '0');
+                    high = range.replace('?', 'F');
+                }
+                else if (range.indexOf('-') > 0) // Basic Range, e.g.
+                // U+0020-U+007E
+                {
+                    low = range.substring(0, range.indexOf('-'));
+                    String temp = range.substring(range.indexOf('-') + 1).trim();
+                    if (temp.startsWith("U+"))
+                    {
+                        high = temp.substring(2).trim();
+                    }
+                    else
+                    {
+                        throw new InvalidUnicodeRangeException(temp);
+                    }
+                }
+                else if (range.length() <= 4) // Single Char, e.g. U+0041
+                {
+                    low = range;
+                    high = range;
+                }
+                else
+                {
+                    throw new InvalidUnicodeRangeException(range);
+                }
+
+                ranges[i][0] = (char)Integer.parseInt(low, 16);
+                ranges[i][1] = (char)Integer.parseInt(high, 16);
+
+                i++;
+            }
+            else if (element.length() == 0)
+            {
+                continue;
+            }
+            else
+            {
+                throw new InvalidUnicodeRangeException(element);
+            }
+        }
+    }
+
+    public static final class FontNotFoundException extends RuntimeException
+    {
+        private static final long serialVersionUID = -2385779348825570473L;
+
+        public FontNotFoundException(String message)
+        {
+            super(message);
+        }
+    }
+
+    public static final class InvalidUnicodeRangeException extends
+            RuntimeException
+    {
+        private static final long serialVersionUID = 3173208110428813980L;
+
+        public InvalidUnicodeRangeException(String range)
+        {
+            this.range = range;
+        }
+
+        public String range;
+    }
 }
Index: modules/swfutils/src/java/flash/localization/XLRLocalizer.java
===================================================================
--- modules/swfutils/src/java/flash/localization/XLRLocalizer.java	(revision 3507)
+++ modules/swfutils/src/java/flash/localization/XLRLocalizer.java	(working copy)
@@ -251,7 +251,7 @@
         }
         public String format( Map parameters )
         {
-            StringBuffer buffer = new StringBuffer();
+            StringBuilder buffer = new StringBuilder();
             String s = node.execute( buffer, node.locale, parameters )? buffer.toString() : null;
             if (s != null)
             {
@@ -265,7 +265,7 @@
     private abstract class XLRNode
     {
         public LinkedList children = new LinkedList();
-        public boolean execute( StringBuffer buffer, String locale, Map parameters )
+        public boolean execute( StringBuilder buffer, String locale, Map parameters )
         {
             boolean success = false;
             for (Iterator it = children.iterator(); it.hasNext(); )
@@ -283,7 +283,7 @@
 
     private class XLRChoiceNode extends XLRNode
     {
-        public boolean execute( StringBuffer buffer, String locale, Map parameters )
+        public boolean execute( StringBuilder buffer, String locale, Map parameters )
         {
             for (Iterator it = children.iterator(); it.hasNext(); )
             {
@@ -331,7 +331,7 @@
             return (((this.locale == null) && (locale == null)) || locale.equalsIgnoreCase( this.locale ));
 
         }
-        public boolean execute( StringBuffer buffer, String locale, Map parameters )
+        public boolean execute( StringBuilder buffer, String locale, Map parameters )
         {
             if (matchesLocale( locale ))
             {
@@ -348,7 +348,7 @@
         {
             this.text = text;
         }
-        public boolean execute( StringBuffer buffer, String locale, Map parameters )
+        public boolean execute( StringBuilder buffer, String locale, Map parameters )
         {
             boolean success = false;
             if (text != null)
@@ -368,7 +368,7 @@
         {
             this.varname = name;
         }
-        public boolean execute( StringBuffer buffer, String locale, Map parameters )
+        public boolean execute( StringBuilder buffer, String locale, Map parameters )
         {
             boolean success = false;
             if (varname != null)
@@ -395,7 +395,7 @@
             this.varname = varname;
             this.pattern = pattern;
         }
-        public boolean execute( StringBuffer buffer, String locale, Map parameters )
+        public boolean execute( StringBuilder buffer, String locale, Map parameters )
         {
             String value = null;
 
@@ -450,7 +450,7 @@
         private String fileLocale = null;
         private String base = null;
         private Map nodedict;
-        StringBuffer textBuffer = new StringBuffer(128);
+        StringBuilder textBuffer = new StringBuilder(128);
         protected boolean inCDATA = false;
         public void startElement (String uri, String localName,
                                   String qName, Attributes attributes)
Index: modules/swfutils/src/java/flash/swf/actions/ConstantPool.java
===================================================================
--- modules/swfutils/src/java/flash/swf/actions/ConstantPool.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/actions/ConstantPool.java	(working copy)
@@ -58,7 +58,7 @@
 
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("ConstantPool[ pool = { ");
         for (int i = 0; i < pool.length; i++)
         {
Index: modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java
===================================================================
--- modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/debug/RegisterRecord.java	(working copy)
@@ -62,7 +62,7 @@
 
     public String toString()
     {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append(offset);
 		sb.append(" ");
 		for(int i=0; i<registerNumbers.length; i++)
Index: modules/swfutils/src/java/flash/swf/MovieMetaData.java
===================================================================
--- modules/swfutils/src/java/flash/swf/MovieMetaData.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/MovieMetaData.java	(working copy)
@@ -811,7 +811,7 @@
 				{
 					if (f.name == null || f.name.length() == 0)
 					{
-						StringBuffer buffer = new StringBuffer();
+						StringBuilder buffer = new StringBuilder();
 						int depth = evalStack.size();
 						for (int k = depth - 1; k >= 0; k--)
 						{
Index: modules/swfutils/src/java/flash/swf/SwfDecoder.java
===================================================================
--- modules/swfutils/src/java/flash/swf/SwfDecoder.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/SwfDecoder.java	(working copy)
@@ -303,7 +303,7 @@
 
     private String readUTF() throws IOException
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         int c, c2, c3;
 
         while ((c = readUI8()) > 0)
Index: modules/swfutils/src/java/flash/swf/SwfUtils.java
===================================================================
--- modules/swfutils/src/java/flash/swf/SwfUtils.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/SwfUtils.java	(working copy)
@@ -95,7 +95,7 @@
 
     public static String toUnicodePoint(char c)
     {
-        StringBuffer sb = new StringBuffer(5);
+        StringBuilder sb = new StringBuilder(5);
         for (int i = 3; i >= 0; i--)
         {
             sb.append(Character.forDigit((c >> (4 * i)) & 15, 16));
Index: modules/swfutils/src/java/flash/swf/tags/DefineSprite.java
===================================================================
--- modules/swfutils/src/java/flash/swf/tags/DefineSprite.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/tags/DefineSprite.java	(working copy)
@@ -125,7 +125,7 @@
 
     public String toString()
     {
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
 
         stringBuffer.append("DefineSprite: name = " + name +
                             ", framecount = " + framecount +
Index: modules/swfutils/src/java/flash/swf/tools/AbcPrinter.java
===================================================================
--- modules/swfutils/src/java/flash/swf/tools/AbcPrinter.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/tools/AbcPrinter.java	(working copy)
@@ -506,7 +506,7 @@
 	
 	String hex(byte b)
 	{
-		return new StringBuffer().append(hexChars[(b >> 4) & 0xF]).append(hexChars[b & 0xF]).toString();
+		return new StringBuilder().append(hexChars[(b >> 4) & 0xF]).append(hexChars[b & 0xF]).toString();
 	}
 	
 	void printOffset()
Index: modules/swfutils/src/java/flash/swf/tools/Disassembler.java
===================================================================
--- modules/swfutils/src/java/flash/swf/tools/Disassembler.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/tools/Disassembler.java	(working copy)
@@ -223,7 +223,7 @@
 
 	protected void startFormatted(String action)
 	{
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		boolean leadingZeros = false;
 		int width = -1;
 		
@@ -242,7 +242,7 @@
 						c = format.charAt(++i);
 					}
 
-					StringBuffer number = new StringBuffer();
+					StringBuilder number = new StringBuilder();
 					while(Character.isDigit(c))
 					{
 						number.append(c);
@@ -990,7 +990,7 @@
 
     public static String quoteString(String s, char qc)
     {
-        StringBuffer b = new StringBuffer(s.length() + 2);
+        StringBuilder b = new StringBuilder(s.length() + 2);
 
         b.append(qc);
         for (int i=0; i < s.length(); i++)
Index: modules/swfutils/src/java/flash/swf/tools/SwfxParser.java
===================================================================
--- modules/swfutils/src/java/flash/swf/tools/SwfxParser.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/tools/SwfxParser.java	(working copy)
@@ -91,7 +91,7 @@
     private TagHandler tagHandler;
     private DefineSprite sprite;
     private Locator locator;
-    private StringBuffer text;
+    private StringBuilder text;
     private Header header;
     private Stack stack;
     private ArrayList fillstyles;
@@ -233,7 +233,7 @@
             if (hasAttribute(attributes, "src"))
                 fatalError(new SAXParseException("can only specify one of src or encoding attributes", locator));
 
-            text = new StringBuffer();
+            text = new StringBuilder();
         }
         else
         {
@@ -317,7 +317,7 @@
             if (hasAttribute(attributes, "src"))
                 fatalError(new SAXParseException("can only specify one of src or encoding attributes", locator));
 
-            text = new StringBuffer();
+            text = new StringBuilder();
         }
         else
         {
@@ -425,7 +425,7 @@
 
     public void DoAction(Attributes attributes)
     {
-        text = new StringBuffer();
+        text = new StringBuilder();
         startLineNumber = locator.getLineNumber();
     }
 
@@ -510,7 +510,7 @@
 
     public void Package(Attributes attributes) throws SAXParseException
     {
-        text = new StringBuffer();
+        text = new StringBuilder();
         DefineSprite pkg = new DefineSprite();
         DoInitAction initAction = new DoInitAction(pkg);
         // get id for this package
@@ -557,7 +557,7 @@
 
     public void DoInitAction(Attributes attributes) throws SAXParseException
     {
-        text = new StringBuffer();
+        text = new StringBuilder();
         DoInitAction initAction = new DoInitAction();
         // get id of previous DefineSprite
         int idref = parseInt(getAttribute(attributes, "idref"));
@@ -777,7 +777,7 @@
 
     public void JPEGTables(Attributes attributes) throws SAXParseException
     {
-        text = new StringBuffer();
+        text = new StringBuilder();
         if (hasAttribute(attributes, "encoding"))
         {
             if (!getAttribute(attributes, "encoding").equals("base64"))
@@ -899,7 +899,7 @@
         }
 
         stack.push(tag);
-        text = new StringBuffer();
+        text = new StringBuilder();
     }
 
     public void PlaceObject2() throws SAXException
Index: modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java
===================================================================
--- modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/tools/SwfxPrinter.java	(working copy)
@@ -337,7 +337,7 @@
      */
     public String printRGB(int rgb)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         b.append('#');
         int red = (rgb >> 16) & 255;
         b.append(digits[(red >> 4) & 15]);
@@ -357,7 +357,7 @@
      */
     public String printRGBA(int rgb)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         b.append('#');
         int red = (rgb >> 16) & 255;
         b.append(digits[(red >> 4) & 15]);
@@ -963,7 +963,7 @@
 
     private String formatGradient(GradRecord[] records, boolean alpha)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         for (int i = 0; i < records.length; i++)
         {
             b.append(records[i].ratio);
@@ -977,7 +977,7 @@
 
     private String formatMorphGradient(MorphGradRecord[] records)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         for (int i = 0; i < records.length; i++)
         {
             b.append(records[i].startRatio);
@@ -1117,7 +1117,7 @@
 
     private String printClipEventFlags(int flags)
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
 
         if ((flags & ClipActionRecord.unused31) != 0) b.append("res31,");
         if ((flags & ClipActionRecord.unused30) != 0) b.append("res30,");
@@ -1322,7 +1322,7 @@
         if (s == null)
             return null;
 
-        StringBuffer b = new StringBuffer(s.length());
+        StringBuilder b = new StringBuilder(s.length());
         for (int i = 0; i < s.length(); i++)
         {
             char c = s.charAt(i);
@@ -1848,7 +1848,7 @@
 
     private String hexify(byte[] id)
     {
-        StringBuffer b = new StringBuffer(id.length * 2);
+        StringBuilder b = new StringBuilder(id.length * 2);
         for (int i = 0; i < id.length; i++)
         {
             b.append(Character.forDigit((id[i] >> 4) & 15, 16));
Index: modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java
===================================================================
--- modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/tools/SyntaxTreeDumper.java	(working copy)
@@ -743,7 +743,7 @@
 
 	public Value evaluate(Context cx, AttributeListNode node)
 	{
-        StringBuffer buffer = new StringBuffer("<AttributeListNode");
+        StringBuilder buffer = new StringBuilder("<AttributeListNode");
         if (node.hasIntrinsic)
         {
             buffer.append(" intrinsic='true'");
@@ -1465,7 +1465,7 @@
 	
     private String indent()
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         for (int i = 0; i < indent; i++)
         {
Index: modules/swfutils/src/java/flash/swf/types/ActionList.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/ActionList.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/ActionList.java	(working copy)
@@ -218,7 +218,7 @@
 
     public String toString()
     {
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
 
         stringBuffer.append("ActionList: count = " + actions.length);
         stringBuffer.append(", actions = ");
Index: modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/ButtonCondAction.java	(working copy)
@@ -85,7 +85,7 @@
 	public String toString()
 	{
 		// return the flags as a string
-		StringBuffer b = new StringBuffer();
+		StringBuilder b = new StringBuilder();
 
         if (keyPress != 0)      b.append("keyPress<"+keyPress+">,");
 		if (overDownToIdle)		b.append("overDownToIdle,");
Index: modules/swfutils/src/java/flash/swf/types/ButtonRecord.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/ButtonRecord.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/ButtonRecord.java	(working copy)
@@ -84,7 +84,7 @@
     
     public String getFlags()
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
         if (blendMode != -1) b.append("hasBlendMode,");
         if (filters != null) b.append("hasFilterList,");
         if (hitTest) b.append("hitTest,");
Index: modules/swfutils/src/java/flash/swf/types/Matrix.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/Matrix.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/Matrix.java	(working copy)
@@ -70,7 +70,7 @@
 
     public String toString()
     {
-        StringBuffer b = new StringBuffer();
+        StringBuilder b = new StringBuilder();
 
         if (hasScale)
         {
Index: modules/swfutils/src/java/flash/swf/types/MD5.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/MD5.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/MD5.java	(working copy)
@@ -46,7 +46,7 @@
 
     public static String stringify(byte buf[])
     {
-        StringBuffer sb = new StringBuffer(2 * buf.length);
+        StringBuilder sb = new StringBuilder(2 * buf.length);
         for (int i = 0; i < buf.length; i++)
         {
             int h = (buf[i] & 0xf0) >> 4;
Index: modules/swfutils/src/java/flash/swf/types/Rect.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/Rect.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/Rect.java	(working copy)
@@ -51,7 +51,7 @@
         }
         else
         {
-		    return new StringBuffer().append(xMax).append('x').append(yMax).toString();
+		    return new StringBuilder().append(xMax).append('x').append(yMax).toString();
         }
 	}
 
Index: modules/swfutils/src/java/flash/swf/types/TagList.java
===================================================================
--- modules/swfutils/src/java/flash/swf/types/TagList.java	(revision 3507)
+++ modules/swfutils/src/java/flash/swf/types/TagList.java	(working copy)
@@ -55,7 +55,7 @@
 
     public String toString()
     {
-        StringBuffer stringBuffer = new StringBuffer();
+        StringBuilder stringBuffer = new StringBuilder();
 
         stringBuffer.append("TagList:\n");
 
Index: modules/swfutils/src/java/flash/util/Base64.java
===================================================================
--- modules/swfutils/src/java/flash/util/Base64.java	(revision 3507)
+++ modules/swfutils/src/java/flash/util/Base64.java	(working copy)
@@ -137,17 +137,17 @@
         private int work[] = { 0, 0, 0 };
         private int count = 0;
         private int line = 0;
-        private StringBuffer output;
+        private StringBuilder output;
         private int wrap = 76;
 
         public Encoder( int size )
         {
-            output = new StringBuffer( size );
+            output = new StringBuilder( size );
         }
 
         public Encoder( int size, int wrap )
         {
-            output = new StringBuffer( size );
+            output = new StringBuilder( size );
             this.wrap = wrap;
         }
 
Index: modules/swfutils/src/java/flash/util/ExceptionUtil.java
===================================================================
--- modules/swfutils/src/java/flash/util/ExceptionUtil.java	(revision 3507)
+++ modules/swfutils/src/java/flash/util/ExceptionUtil.java	(working copy)
@@ -72,7 +72,7 @@
     public static String getStackTraceUpTo(Throwable t, String prefix) {
 	StringTokenizer tokens = new StringTokenizer(toString(t), "\n\r");
         
-        StringBuffer trace = new StringBuffer();
+        StringBuilder trace = new StringBuilder();
 
         boolean done = false;
 
@@ -98,7 +98,7 @@
     public static String getStackTraceLines(Throwable t, int numLines) {
 	StringTokenizer tokens = new StringTokenizer(toString(t), "\n\r");
         
-        StringBuffer trace = new StringBuffer();
+        StringBuilder trace = new StringBuilder();
 
         for (int i=0; i<numLines; i++)
         {
@@ -125,7 +125,7 @@
 	    String token = tokens.nextToken();
 	    int index1 = token.indexOf(' ');
 	    int index2 = token.indexOf('(');
-	    StringBuffer call = new StringBuffer();
+	    StringBuilder call = new StringBuilder();
 	    call.append(token.substring(index1 < 0 ? 0 : index1 + 1, index2 < 0 ? call.length() : index2));
 
 	    int index3 = token.indexOf(':', index2 < 0 ? 0 : index2);
Index: modules/swfutils/src/java/flash/util/FieldFormat.java
===================================================================
--- modules/swfutils/src/java/flash/util/FieldFormat.java	(revision 3507)
+++ modules/swfutils/src/java/flash/util/FieldFormat.java	(working copy)
@@ -23,23 +23,23 @@
 	public static final int ALIGN_CENTER	= 3;
 
 	 // Right justifies a long value into a hex field with leading zeros
-	public static StringBuffer formatLongToHex(StringBuffer sb, long v, int length) { return formatLongToHex(sb,v,length,true); }
+	public static StringBuilder formatLongToHex(StringBuilder sb, long v, int length) { return formatLongToHex(sb,v,length,true); }
 
 	 // Right justifies a long value into a field optionally zero filling the opening. 
-	public static StringBuffer formatLongToHex(StringBuffer sb, long v, int length, boolean leadingZeros)
+	public static StringBuilder formatLongToHex(StringBuilder sb, long v, int length, boolean leadingZeros)
 	{
 		return format(sb, Long.toHexString(v), length, ALIGN_RIGHT, ((leadingZeros) ? '0' : ' '), ' ');
 	}
 
 	 // Right justifies a long value into a fixed length field
-	public static StringBuffer formatLong(StringBuffer sb, long v, int length) { return formatLong(sb,v,length,false); }
-	public static StringBuffer formatLong(StringBuffer sb, long v, int length, boolean leadingZeros)	
+	public static StringBuilder formatLong(StringBuilder sb, long v, int length) { return formatLong(sb,v,length,false); }
+	public static StringBuilder formatLong(StringBuilder sb, long v, int length, boolean leadingZeros)	
 	{ 
 		return format(sb, Long.toString(v), length, ((leadingZeros) ? ALIGN_RIGHT : ALIGN_LEFT), ((leadingZeros) ? '0' : ' '), ' '); 
 	}
 
 	// basis for all formats 
-	public static StringBuffer format(StringBuffer sb, String chars, int length, int alignment, char preFieldCharacter, char postFieldCharacter)
+	public static StringBuilder format(StringBuilder sb, String chars, int length, int alignment, char preFieldCharacter, char postFieldCharacter)
 	{
 		// find the length of our string 
 		int charsCount = chars.length();
Index: modules/swfutils/src/java/flash/util/FileUtils.java
===================================================================
--- modules/swfutils/src/java/flash/util/FileUtils.java	(revision 3507)
+++ modules/swfutils/src/java/flash/util/FileUtils.java	(working copy)
@@ -110,7 +110,7 @@
 
 		try
 		{
-            StringBuffer returnVal = new StringBuffer((int) file.length() );
+            StringBuilder returnVal = new StringBuilder((int) file.length() );
             BufferedInputStream in = new BufferedInputStream(fileInputStream);
             in.mark(3);
             
Index: modules/swfutils/src/java/flash/util/StringJoiner.java
===================================================================
--- modules/swfutils/src/java/flash/util/StringJoiner.java	(revision 3507)
+++ modules/swfutils/src/java/flash/util/StringJoiner.java	(working copy)
@@ -23,7 +23,7 @@
 	public static String join(Object[] array, String separator,
     						  ItemStringer itemStringer)
     {
-    	StringBuffer sb = new StringBuffer();
+    	StringBuilder sb = new StringBuilder();
     	
     	int n = array.length;
     	for (int i = 0; i < n; i++)
@@ -50,7 +50,7 @@
     public static String join(Collection collection, String separator,
     						  ItemStringer itemStringer)
     {
-    	StringBuffer sb = new StringBuffer();
+    	StringBuilder sb = new StringBuilder();
     	
      	for (Iterator iter = collection.iterator(); iter.hasNext(); )
     	{
Index: modules/swfutils/src/java/flash/util/StringUtils.java
===================================================================
--- modules/swfutils/src/java/flash/util/StringUtils.java	(revision 3507)
+++ modules/swfutils/src/java/flash/util/StringUtils.java	(working copy)
@@ -119,7 +119,7 @@
         if(index == -1)
             return str;
 
-        StringBuffer buf = new StringBuffer(str.length());
+        StringBuilder buf = new StringBuilder(str.length());
         int lastIndex = 0;
 
         while(index != -1) {
@@ -196,7 +196,7 @@
         {
             return toClean;
         }
-        StringBuffer buf = new StringBuffer(toClean.length());
+        StringBuilder buf = new StringBuilder(toClean.length());
         char[] chars = toClean.toCharArray();
         for (int i = 0; i < chars.length - 1; ++i)
         {
@@ -221,7 +221,7 @@
         {
             return toClean;
         }
-        StringBuffer buf = new StringBuffer(toClean.length());
+        StringBuilder buf = new StringBuilder(toClean.length());
         char[] chars = toClean.toCharArray();
         int i;
         for (i = 0; i < chars.length - 1; ++i)
@@ -380,7 +380,7 @@
 	{
 		if (buffer == null) return buffer;
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < buffer.length(); i++)
 		{
 			char c = buffer.charAt(i);
@@ -403,7 +403,7 @@
     {
         if (buffer == null) return buffer;
 
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for (int i = 0; i < buffer.length(); i++)
 		{
 			char c = buffer.charAt(i);
@@ -430,7 +430,7 @@
 	 */
 	public static String formatString(String s)
 	{
-		StringBuffer result = new StringBuffer(s.length() + 2);
+		StringBuilder result = new StringBuilder(s.length() + 2);
 
 		result.append('"');
 		for (int i = 0; i < s.length(); i++)
@@ -486,7 +486,7 @@
 	//
     public static String collapseWhitespace(String in, char replacementChar)
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 		int size = in.length();
 		boolean lastWasSpace = true;
 		int i = 0;
@@ -530,7 +530,7 @@
     {
         int cur = 0;
 
-        StringBuffer buf = new StringBuffer( 1024 );
+        StringBuilder buf = new StringBuilder( 1024 );
         while (cur < data.length)
         {
             for (int i = 0; i < 16; ++i)