You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2013/02/28 14:53:20 UTC

svn commit: r1451197 [3/4] - in /flex/falcon/trunk: compiler.jx.tests/src/org/apache/flex/compiler/internal/as/codegen/ compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/ compiler.jx.tests/src/org/apache/flex/compiler/internal/js/c...

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalClasses.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalClasses.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalClasses.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalClasses.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestGlobalClasses;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.tree.as.IFunctionNode;
@@ -37,7 +37,7 @@ public class TestGoogGlobalClasses exten
     public void testArgumentError()
     {
         IVariableNode node = getVariable("var a:ArgumentError = new ArgumentError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {ArgumentError} */ a = new ArgumentError()");
     }
 
@@ -46,7 +46,7 @@ public class TestGoogGlobalClasses exten
     public void testArguments()
     {
         IFunctionNode node = getMethod("function a():void {\ttrace(arguments);}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("A.prototype.a = function() {\n\tvar self = this;\n\ttrace(arguments);\n}");
     }
 
@@ -55,7 +55,7 @@ public class TestGoogGlobalClasses exten
     public void testArray()
     {
         IVariableNode node = getVariable("var a:Array = new Array(1);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Array} */ a = new Array(1)");
     }
 
@@ -64,7 +64,7 @@ public class TestGoogGlobalClasses exten
     public void testBoolean()
     {
         IVariableNode node = getVariable("var a:Boolean = new Boolean(1);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {boolean} */ a = new Boolean(1)");
     }
 
@@ -73,7 +73,7 @@ public class TestGoogGlobalClasses exten
     public void testClass()
     {
         IVariableNode node = getVariable("var a:Class = new Class();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Class} */ a = new Class()");
     }
 
@@ -82,7 +82,7 @@ public class TestGoogGlobalClasses exten
     public void testDate()
     {
         IVariableNode node = getVariable("var a:Date = new Date();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Date} */ a = new Date()");
     }
 
@@ -91,7 +91,7 @@ public class TestGoogGlobalClasses exten
     public void testDefinitionError()
     {
         IVariableNode node = getVariable("var a:DefinitionError = new DefinitionError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {DefinitionError} */ a = new DefinitionError()");
     }
 
@@ -100,7 +100,7 @@ public class TestGoogGlobalClasses exten
     public void testError()
     {
         IVariableNode node = getVariable("var a:Error = new Error();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Error} */ a = new Error()");
     }
 
@@ -109,7 +109,7 @@ public class TestGoogGlobalClasses exten
     public void testEvalError()
     {
         IVariableNode node = getVariable("var a:EvalError = new EvalError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {EvalError} */ a = new EvalError()");
     }
 
@@ -118,7 +118,7 @@ public class TestGoogGlobalClasses exten
     public void testFunction()
     {
         IVariableNode node = getVariable("var a:Function = new Function();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Function} */ a = new Function()");
     }
 
@@ -127,7 +127,7 @@ public class TestGoogGlobalClasses exten
     public void testInt()
     {
         IVariableNode node = getVariable("var a:int = new int(1.8);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = new int(1.8)");
     }
 
@@ -136,7 +136,7 @@ public class TestGoogGlobalClasses exten
     public void testJSON()
     {
         IVariableNode node = getVariable("var a:JSON = new JSON();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {JSON} */ a = new JSON()");
     }
 
@@ -145,7 +145,7 @@ public class TestGoogGlobalClasses exten
     public void testMath()
     {
         IVariableNode node = getVariable("var a:Number = Math.PI;");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = Math.PI");
     }
 
@@ -154,7 +154,7 @@ public class TestGoogGlobalClasses exten
     public void testNamespace()
     {
         IVariableNode node = getVariable("var a:Namespace = new Namespace(\"http://example.com\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Namespace} */ a = new Namespace(\"http://example.com\")");
     }
 
@@ -163,7 +163,7 @@ public class TestGoogGlobalClasses exten
     public void testNumber()
     {
         IVariableNode node = getVariable("var a:Number = new Number(\"1\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = new Number(\"1\")");
     }
 
@@ -172,7 +172,7 @@ public class TestGoogGlobalClasses exten
     public void testObject()
     {
         IVariableNode node = getVariable("var a:Object = new Object();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Object} */ a = new Object()");
     }
 
@@ -181,7 +181,7 @@ public class TestGoogGlobalClasses exten
     public void testQName()
     {
         IVariableNode node = getVariable("var a:QName = new QName();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {QName} */ a = new QName()");
     }
 
@@ -190,7 +190,7 @@ public class TestGoogGlobalClasses exten
     public void testRangeError()
     {
         IVariableNode node = getVariable("var a:RangeError = new RangeError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {RangeError} */ a = new RangeError()");
     }
 
@@ -199,7 +199,7 @@ public class TestGoogGlobalClasses exten
     public void testReferenceError()
     {
         IVariableNode node = getVariable("var a:ReferenceError = new ReferenceError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {ReferenceError} */ a = new ReferenceError()");
     }
 
@@ -211,7 +211,7 @@ public class TestGoogGlobalClasses exten
         // TODO (mschmalle) how to handle the escaping of backslashes in
         //                    strings in the tests?
         IVariableNode node = getVariable("var a:RegExp = new RegExp('test-\\d', 'i');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var a:RegExp = new RegExp('test-\\\\d', 'i')");
     }
 
@@ -220,7 +220,7 @@ public class TestGoogGlobalClasses exten
     public void testRegExp_Literal()
     {
         IVariableNode node = getVariable("var a:RegExp = /test-\\d/i;");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {RegExp} */ a = /test-\\d/i");
     }
 
@@ -229,7 +229,7 @@ public class TestGoogGlobalClasses exten
     public void testSecurityError()
     {
         IVariableNode node = getVariable("var a:SecurityError = new SecurityError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {SecurityError} */ a = new SecurityError()");
     }
 
@@ -238,7 +238,7 @@ public class TestGoogGlobalClasses exten
     public void testString()
     {
         IVariableNode node = getVariable("var a:String = new String(\"100\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {string} */ a = new String(\"100\")");
     }
 
@@ -247,7 +247,7 @@ public class TestGoogGlobalClasses exten
     public void testSyntaxError()
     {
         IVariableNode node = getVariable("var a:SyntaxError = new SyntaxError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {SyntaxError} */ a = new SyntaxError()");
     }
 
@@ -256,7 +256,7 @@ public class TestGoogGlobalClasses exten
     public void testTypeError()
     {
         IVariableNode node = getVariable("var a:TypeError = new TypeError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {TypeError} */ a = new TypeError()");
     }
 
@@ -265,7 +265,7 @@ public class TestGoogGlobalClasses exten
     public void testUint()
     {
         IVariableNode node = getVariable("var a:uint = new uint(-100);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = new uint(-100)");
     }
 
@@ -274,7 +274,7 @@ public class TestGoogGlobalClasses exten
     public void testURIError()
     {
         IVariableNode node = getVariable("var a:URIError = new URIError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {URIError} */ a = new URIError()");
     }
 
@@ -283,7 +283,7 @@ public class TestGoogGlobalClasses exten
     public void testVector()
     {
         IVariableNode node = getVariable("var a:Vector.<String> = new Vector.<String>(['Hello', 'World']);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Vector.<string>} */ a = new Vector(['Hello', 'World'])");
     }
 
@@ -292,7 +292,7 @@ public class TestGoogGlobalClasses exten
     public void testVerifyError()
     {
         IVariableNode node = getVariable("var a:VerifyError = new VerifyError();");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {VerifyError} */ a = new VerifyError()");
     }
 
@@ -301,7 +301,7 @@ public class TestGoogGlobalClasses exten
     public void testXML()
     {
         IVariableNode node = getVariable("var a:XML = new XML('@');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {XML} */ a = new XML('@')");
     }
 
@@ -310,7 +310,7 @@ public class TestGoogGlobalClasses exten
     public void testXMLList()
     {
         IVariableNode node = getVariable("var a:XMLList = new XMLList('<!-- comment -->');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {XMLList} */ a = new XMLList('<!-- comment -->')");
     }
 

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalConstants.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalConstants.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalConstants.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalConstants.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestGlobalConstants;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.tree.as.IVariableNode;
@@ -35,7 +35,7 @@ public class TestGoogGlobalConstants ext
     public void testInfinity()
     {
         IVariableNode node = getField("var a:Number = Infinity;");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("/**\n * @type {number}\n */\nA.prototype.a = Infinity");
     }
 
@@ -44,7 +44,7 @@ public class TestGoogGlobalConstants ext
     public void testNegativeInfinity()
     {
         IVariableNode node = getField("var a:Number = -Infinity;");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("/**\n * @type {number}\n */\nA.prototype.a = -Infinity");
     }
 
@@ -53,7 +53,7 @@ public class TestGoogGlobalConstants ext
     public void testNaN()
     {
         IVariableNode node = getField("var a:Number = NaN;");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("/**\n * @type {number}\n */\nA.prototype.a = NaN");
     }
 
@@ -62,7 +62,7 @@ public class TestGoogGlobalConstants ext
     public void testUndefined()
     {
         IVariableNode node = getField("var a:* = undefined;");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("/**\n * @type {*}\n */\nA.prototype.a = undefined");
     }
 

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalFunctions.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalFunctions.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalFunctions.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalFunctions.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestGlobalFunctions;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.tree.as.IFunctionCallNode;
@@ -36,7 +36,7 @@ public class TestGoogGlobalFunctions ext
     public void testArray()
     {
         IVariableNode node = getVariable("var a:Array = Array(1);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Array} */ a = Array(1)");
     }
 
@@ -45,7 +45,7 @@ public class TestGoogGlobalFunctions ext
     public void testBoolean()
     {
         IVariableNode node = getVariable("var a:Boolean = Boolean(1);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {boolean} */ a = Boolean(1)");
     }
 
@@ -54,7 +54,7 @@ public class TestGoogGlobalFunctions ext
     public void testDecodeURI()
     {
         IVariableNode node = getVariable("var a:String = decodeURI('http://whatever.com');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {string} */ a = decodeURI('http://whatever.com')");
     }
 
@@ -63,7 +63,7 @@ public class TestGoogGlobalFunctions ext
     public void testDecodeURIComponent()
     {
         IVariableNode node = getVariable("var a:String = decodeURIComponent('http://whatever.com');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {string} */ a = decodeURIComponent('http://whatever.com')");
     }
 
@@ -72,7 +72,7 @@ public class TestGoogGlobalFunctions ext
     public void testEncodeURI()
     {
         IVariableNode node = getVariable("var a:String = encodeURI('http://whatever.com');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {string} */ a = encodeURI('http://whatever.com')");
     }
 
@@ -81,7 +81,7 @@ public class TestGoogGlobalFunctions ext
     public void testEncodeURIComponent()
     {
         IVariableNode node = getVariable("var a:String = encodeURIComponent('http://whatever.com');");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {string} */ a = encodeURIComponent('http://whatever.com')");
     }
     
@@ -90,7 +90,7 @@ public class TestGoogGlobalFunctions ext
     public void testEscape()
     {
     	IVariableNode node = getVariable("var a:String = escape('http://whatever.com');");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {string} */ a = escape('http://whatever.com')");
     }
 
@@ -99,7 +99,7 @@ public class TestGoogGlobalFunctions ext
     public void testInt()
     {
     	IVariableNode node = getVariable("var a:int = int(1.8);");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {number} */ a = int(1.8)");
     }
     
@@ -108,7 +108,7 @@ public class TestGoogGlobalFunctions ext
     public void testIsFinite()
     {
         IVariableNode node = getVariable("var a:Boolean = isFinite(1000000.9);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {boolean} */ a = isFinite(1000000.9)");
     }
 
@@ -117,7 +117,7 @@ public class TestGoogGlobalFunctions ext
     public void testIsNaN()
     {
         IVariableNode node = getVariable("var a:Boolean = isNaN(NaN);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {boolean} */ a = isNaN(NaN)");
     }
 
@@ -126,7 +126,7 @@ public class TestGoogGlobalFunctions ext
     public void testIsXMLName()
     {
         IVariableNode node = getVariable("var a:Boolean = isXMLName(\"?\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {boolean} */ a = isXMLName(\"?\")");
     }
 
@@ -135,7 +135,7 @@ public class TestGoogGlobalFunctions ext
     public void testNumber()
     {
         IVariableNode node = getVariable("var a:Number = Number(\"1\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = Number(\"1\")");
     }
 
@@ -144,7 +144,7 @@ public class TestGoogGlobalFunctions ext
     public void testObject()
     {
         IVariableNode node = getVariable("var a:Object = Object(\"1\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Object} */ a = Object(\"1\")");
     }
 
@@ -153,7 +153,7 @@ public class TestGoogGlobalFunctions ext
     public void testParseFloat()
     {
         IVariableNode node = getVariable("var a:Number = parseFloat(\"1.8\");");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = parseFloat(\"1.8\")");
     }
 
@@ -162,7 +162,7 @@ public class TestGoogGlobalFunctions ext
     public void testParseInt()
     {
         IVariableNode node = getVariable("var a:Number = parseInt(\"666\", 10);");
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = parseInt(\"666\", 10)");
     }
     
@@ -171,7 +171,7 @@ public class TestGoogGlobalFunctions ext
     public void testString()
     {
     	IVariableNode node = getVariable("var a:String = String(100);");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {string} */ a = String(100)");
     }
 
@@ -181,7 +181,7 @@ public class TestGoogGlobalFunctions ext
     {
     	IFunctionCallNode node = (IFunctionCallNode) getNode(
                 "trace('Hello World');", IFunctionCallNode.class);
-    	visitor.visitFunctionCall(node);
+    	asBlockWalker.visitFunctionCall(node);
     	assertOut("trace('Hello World')");
     }
 
@@ -190,7 +190,7 @@ public class TestGoogGlobalFunctions ext
     public void testUint()
     {
     	IVariableNode node = getVariable("var a:uint = uint(-100);");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {number} */ a = uint(-100)");
     }
 
@@ -199,7 +199,7 @@ public class TestGoogGlobalFunctions ext
     public void testUnescape()
     {
     	IVariableNode node = getVariable("var a:String = unescape('%25');");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {string} */ a = unescape('%25')");
     }
 
@@ -208,7 +208,7 @@ public class TestGoogGlobalFunctions ext
     public void testVector()
     {
     	IVariableNode node = getVariable("var a:Vector.<String> = Vector.<String>(['Hello', 'World']);");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {Vector.<string>} */ a = Vector(['Hello', 'World'])");
     }
 
@@ -217,7 +217,7 @@ public class TestGoogGlobalFunctions ext
     public void testXML()
     {
     	IVariableNode node = getVariable("var a:XML = XML('@');");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {XML} */ a = XML('@')");
     }
 
@@ -226,7 +226,7 @@ public class TestGoogGlobalFunctions ext
     public void testXMLList()
     {
     	IVariableNode node = getVariable("var a:XMLList = XMLList('<!-- comment -->');");
-    	visitor.visitVariable(node);
+    	asBlockWalker.visitVariable(node);
     	assertOut("var /** @type {XMLList} */ a = XMLList('<!-- comment -->')");
     }
 

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogInterface.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogInterface.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogInterface.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogInterface.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestInterface;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.tree.as.IInterfaceNode;
@@ -38,7 +38,7 @@ public class TestGoogInterface extends T
     public void testSimple()
     {
         IInterfaceNode node = getInterfaceNode("public interface IA{}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n */\npublic interface IA {\n}");
     }
 
@@ -47,7 +47,7 @@ public class TestGoogInterface extends T
     public void testSimpleExtends()
     {
         IInterfaceNode node = getInterfaceNode("public interface IA extends IB{}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n * @extends {IB}\n */\npublic interface IA {\n}");
     }
 
@@ -56,7 +56,7 @@ public class TestGoogInterface extends T
     public void testSimpleExtendsMultiple()
     {
         IInterfaceNode node = getInterfaceNode("public interface IA extends IB, IC, ID {}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n * @extends {IB}\n * @extends {IC}\n * @extends {ID}\n */\npublic interface IA {\n}");
     }
 
@@ -65,7 +65,7 @@ public class TestGoogInterface extends T
     public void testQualifiedExtendsMultiple()
     {
         IInterfaceNode node = getInterfaceNode("public interface IA extends foo.bar.IB, baz.goo.IC, foo.ID {}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n * @extends {foo.bar.IB}\n * @extends {baz.goo.IC}\n * @extends {foo.ID}\n */\npublic interface IA {\n}");
     }
 
@@ -76,7 +76,7 @@ public class TestGoogInterface extends T
         IInterfaceNode node = getInterfaceNode("public interface IA {"
                 + "function get foo1():Object;"
                 + "function set foo1(value:Object):void;}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n */\npublic interface IA {\n}\nIA.prototype.foo1;");
     }
 
@@ -87,7 +87,7 @@ public class TestGoogInterface extends T
         IInterfaceNode node = getInterfaceNode("public interface IA {"
                 + "function baz1():Object;"
                 + "function baz2(value:Object):void;}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n */\npublic interface IA {\n}\nIA.prototype.baz1 = function();\nIA.prototype.baz2 = function(value);");
     }
 
@@ -100,7 +100,7 @@ public class TestGoogInterface extends T
                 + "function set foo1(value:Object):void;"
                 + "function baz1():Object;"
                 + "function baz2(value:Object):void;}");
-        visitor.visitInterface(node);
+        asBlockWalker.visitInterface(node);
         assertOut("/**\n * @interface\n */\npublic interface IA {\n}\nIA.prototype.foo1;\nIA.prototype.baz1 = function();\nIA.prototype.baz2 = function(value);");
     }
 

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogMethodMembers.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogMethodMembers.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogMethodMembers.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogMethodMembers.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestMethodMembers;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.tree.as.IFunctionNode;
@@ -39,7 +39,7 @@ public class TestGoogMethodMembers exten
     public void testMethod()
     {
         IFunctionNode node = getMethod("function foo(){}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("A.prototype.foo = function() {\n}");
     }
 
@@ -48,7 +48,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withReturnType()
     {
         IFunctionNode node = getMethod("function foo():int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @return {number}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\treturn -1;\n}");
     }
 
@@ -57,7 +57,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withParameterReturnType()
     {
         IFunctionNode node = getMethod("function foo(bar):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {*} bar\n * @return {number}\n */\nA.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
     }
 
@@ -66,7 +66,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withParameterTypeReturnType()
     {
         IFunctionNode node = getMethod("function foo(bar:String):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string} bar\n * @return {number}\n */\nA.prototype.foo = function(bar) {\n\tvar self = this;\n\treturn -1;\n}");
     }
 
@@ -75,7 +75,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withDefaultParameterTypeReturnType()
     {
         IFunctionNode node = getMethod("function foo(bar:String = \"baz\"):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string=} bar\n * @return {number}\n */\nA.prototype.foo = function(bar) {\n\tvar self = this;\n\tbar = typeof bar !== 'undefined' ? bar : \"baz\";\n\treturn -1;\n}");
     }
 
@@ -84,7 +84,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withMultipleDefaultParameterTypeReturnType()
     {
         IFunctionNode node = getMethod("function foo(bar:String, baz:int = null):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
@@ -93,7 +93,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withRestParameterTypeReturnType()
     {
         IFunctionNode node = getMethod("function foo(bar:String, ...rest):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string} bar\n * @param {...} rest\n * @return {number}\n */\nA.prototype.foo = function(bar, rest) {\n\tvar self = this;\n\trest = Array.prototype.slice.call(arguments, 1);\n\treturn -1;\n}");
     }
 
@@ -102,7 +102,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withNamespace()
     {
         IFunctionNode node = getMethod("public function foo(bar:String, baz:int = null):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         // we ignore the 'public' namespace completely
         assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
@@ -112,7 +112,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withNamespaceCustom()
     {
         IFunctionNode node = getMethod("mx_internal function foo(bar:String, baz:int = null):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
@@ -121,7 +121,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withNamespaceModifiers()
     {
         IFunctionNode node = getMethod("public static function foo(bar:String, baz:int = null):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         // (erikdebruin) here we actually DO want to declare the method
         //               directly on the 'class' constructor instead of the
         //               prototype!
@@ -133,7 +133,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withNamespaceModifierOverride()
     {
         IFunctionNode node = getMethod("public override function foo(bar:String, baz:int = null):int{\treturn -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
@@ -142,7 +142,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withNamespaceModifierOverrideBackwards()
     {
         IFunctionNode node = getMethod("override public function foo(bar:String, baz:int = null):int{return -1;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nA.prototype.foo = function(bar, baz) {\n\tvar self = this;\n\tbaz = typeof baz !== 'undefined' ? baz : null;\n\treturn -1;\n}");
     }
 
@@ -154,7 +154,7 @@ public class TestGoogMethodMembers exten
     public void testConstructor_withThisInBody()
     {
         IFunctionNode node = getMethod("public function A(){this.foo;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @constructor\n */\nA = function() {\n\tvar self = this;\n\tthis.foo;\n}");
     }
 
@@ -162,7 +162,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withThisInBody()
     {
         IFunctionNode node = getMethod("function foo(){this.foo;}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @this {A}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\tthis.foo;\n}");
     }
 
@@ -170,7 +170,7 @@ public class TestGoogMethodMembers exten
     public void testMethod_withThisInBodyComplex()
     {
         IFunctionNode node = getMethod("function foo(){if(true){while(i){this.bar(42);}}}");
-        visitor.visitFunction(node);
+        asBlockWalker.visitFunction(node);
         assertOut("/**\n * @this {A}\n */\nA.prototype.foo = function() {\n\tvar self = this;\n\tif (true) "
                 + "{\n\t\twhile (i) {\n\t\t\tthis.bar(42);\n\t\t}\n\t}\n}");
     }

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogPackage.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogPackage.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogPackage.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogPackage.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestPackage;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.tree.as.IFileNode;
@@ -38,7 +38,7 @@ public class TestGoogPackage extends Tes
     public void testPackage_Simple()
     {
         IFileNode node = compileAS("package{}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("");
     }
 
@@ -46,7 +46,7 @@ public class TestGoogPackage extends Tes
     public void testPackage_SimpleName()
     {
         IFileNode node = compileAS("package foo {}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("");
     }
 
@@ -55,7 +55,7 @@ public class TestGoogPackage extends Tes
     public void testPackage_Name()
     {
         IFileNode node = compileAS("package foo.bar.baz {}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("");
     }
 
@@ -73,7 +73,7 @@ public class TestGoogPackage extends Tes
         //               (if I understand the term correctly)
 
         IFileNode node = compileAS("package {public class A{}}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("goog.provide('A');\n\n/**\n * @constructor\n */\nA = function() {\n};");
     }
 
@@ -82,7 +82,7 @@ public class TestGoogPackage extends Tes
     public void testPackageQualified_Class()
     {
         IFileNode node = compileAS("package foo.bar.baz {public class A{}}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("goog.provide('foo.bar.baz.A');\n\n/**\n * @constructor\n */\nfoo.bar.baz.A = function() {\n};");
     }
 
@@ -91,7 +91,7 @@ public class TestGoogPackage extends Tes
     public void testPackageQualified_ClassBody()
     {
         IFileNode node = compileAS("package foo.bar.baz {public class A{public function A(){}}}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("goog.provide('foo.bar.baz.A');\n\n/**\n * @constructor\n */\nfoo.bar.baz.A = function() {\n};");
     }
 
@@ -100,7 +100,7 @@ public class TestGoogPackage extends Tes
     public void testPackageQualified_ClassBodyMethodContents()
     {
         IFileNode node = compileAS("package foo.bar.baz {public class A{public function A(){if (a){for (var i:Object in obj){doit();}}}}}");
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("goog.provide('foo.bar.baz.A');\n\n/**\n * @constructor\n */\nfoo.bar.baz.A = function() {\n\tvar self = this;\n\tif (a) {\n\t\tfor (var /** @type {Object} */ i in obj) {\n\t\t\tdoit();\n\t\t}\n\t}\n};");
     }
 

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogStatements.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogStatements.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogStatements.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogStatements.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.js.codegen.goog;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.TestStatements;
 import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
 import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
@@ -45,7 +45,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode("var a;",
                 IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {*} */ a");
     }
 
@@ -55,7 +55,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode("var a:int;",
                 IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a");
     }
 
@@ -65,7 +65,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode("var a:int = 42;",
                 IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = 42");
     }
 
@@ -75,7 +75,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode(
                 "var a:Foo = new Foo(42, 'goo');", IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {Foo} */ a = new Foo(42, 'goo')");
     }
 
@@ -85,7 +85,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode(
                 "var a:int = 4, b:int = 11, c:int = 42;", IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("var /** @type {number} */ a = 4, /** @type {number} */ b = 11, /** @type {number} */ c = 42");
     }
 
@@ -99,7 +99,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode("const a = 42;",
                 IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("\n/**\n * @const\n * @type {*}\n */\na = 42");
     }
 
@@ -109,7 +109,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode("const a:int = 42;",
                 IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("\n/**\n * @const\n * @type {number}\n */\na = 42");
     }
 
@@ -119,7 +119,7 @@ public class TestGoogStatements extends 
     {
         IVariableNode node = (IVariableNode) getNode(
                 "const a:int = 4, b:int = 11, c:int = 42;", IVariableNode.class);
-        visitor.visitVariable(node);
+        asBlockWalker.visitVariable(node);
         assertOut("\n/**\n * @const\n * @type {number}\n */\na = 4, \n/**\n * @const\n * @type {number}\n */\nb = 11, \n/**\n * @const\n * @type {number}\n */\nc = 42");
     }
 
@@ -134,7 +134,7 @@ public class TestGoogStatements extends 
         IForLoopNode node = (IForLoopNode) getNode(
                 "for (var i:int = 0; i < len; i++) { break; }",
                 IForLoopNode.class);
-        visitor.visitForLoop(node);
+        asBlockWalker.visitForLoop(node);
         assertOut("for (var /** @type {number} */ i = 0; i < len; i++) {\n\tbreak;\n}");
     }
 
@@ -144,7 +144,7 @@ public class TestGoogStatements extends 
     {
         IForLoopNode node = (IForLoopNode) getNode(
                 "for (var i:int = 0; i < len; i++) break;", IForLoopNode.class);
-        visitor.visitForLoop(node);
+        asBlockWalker.visitForLoop(node);
         assertOut("for (var /** @type {number} */ i = 0; i < len; i++)\n\tbreak;");
     }
 
@@ -154,7 +154,7 @@ public class TestGoogStatements extends 
     {
         IForLoopNode node = (IForLoopNode) getNode(
                 "for (var i:int in obj) { break; }", IForLoopNode.class);
-        visitor.visitForLoop(node);
+        asBlockWalker.visitForLoop(node);
         assertOut("for (var /** @type {number} */ i in obj) {\n\tbreak;\n}");
     }
 
@@ -164,7 +164,7 @@ public class TestGoogStatements extends 
     {
         IForLoopNode node = (IForLoopNode) getNode(
                 "for (var i:int in obj)  break; ", IForLoopNode.class);
-        visitor.visitForLoop(node);
+        asBlockWalker.visitForLoop(node);
         assertOut("for (var /** @type {number} */ i in obj)\n\tbreak;");
     }
 
@@ -176,7 +176,7 @@ public class TestGoogStatements extends 
         //                    into the header
         IForLoopNode node = (IForLoopNode) getNode(
                 "for each(var i:int in obj) { break; }", IForLoopNode.class);
-        visitor.visitForLoop(node);
+        asBlockWalker.visitForLoop(node);
         assertOut("goog.array.forEach(obj, function (i) {\n\tbreak;\n})");
     }
 
@@ -186,7 +186,7 @@ public class TestGoogStatements extends 
     {
         IForLoopNode node = (IForLoopNode) getNode(
                 "for each(var i:int in obj)  break; ", IForLoopNode.class);
-        visitor.visitForLoop(node);
+        asBlockWalker.visitForLoop(node);
         assertOut("goog.array.forEach(obj, function (i) {\n\tbreak;\n})");
     }
 
@@ -200,7 +200,7 @@ public class TestGoogStatements extends 
     {
         ITryNode node = (ITryNode) getNode("try { a; } catch (e:Error) { b; }",
                 ITryNode.class);
-        visitor.visitTry(node);
+        asBlockWalker.visitTry(node);
         assertOut("try {\n\ta;\n} catch (e) {\n\tb;\n}");
     }
 
@@ -211,7 +211,7 @@ public class TestGoogStatements extends 
         ITryNode node = (ITryNode) getNode(
                 "try { a; } catch (e:Error) { b; } finally { c; }",
                 ITryNode.class);
-        visitor.visitTry(node);
+        asBlockWalker.visitTry(node);
         assertOut("try {\n\ta;\n} catch (e) {\n\tb;\n} finally {\n\tc;\n}");
     }
 
@@ -223,7 +223,7 @@ public class TestGoogStatements extends 
         ITryNode node = (ITryNode) getNode(
                 "try { a; } catch (e:Error) { b; } catch (f:Error) { c; } finally { d; }",
                 ITryNode.class);
-        visitor.visitTry(node);
+        asBlockWalker.visitTry(node);
         assertOut("try {\n\ta;\n} catch (e) {\n\tb;\n} catch (f) {\n\tc;\n} finally {\n\td;\n}");
     }
 
@@ -233,7 +233,7 @@ public class TestGoogStatements extends 
     {
         ITryNode node = (ITryNode) getNode(
                 "try { a; } catch (e:Error) {  } finally {  }", ITryNode.class);
-        visitor.visitTry(node);
+        asBlockWalker.visitTry(node);
         assertOut("try {\n\ta;\n} catch (e) {\n} finally {\n}");
     }
 
@@ -248,7 +248,7 @@ public class TestGoogStatements extends 
         LabeledStatementNode node = (LabeledStatementNode) getNode(
                 "foo: for each(var i:int in obj) { break foo; }",
                 LabeledStatementNode.class);
-        visitor.visitLabeledStatement(node);
+        asBlockWalker.visitLabeledStatement(node);
         assertOut("foo : goog.array.forEach(obj, function (i) {\n\tbreak foo;\n})");
     }
 
@@ -260,7 +260,7 @@ public class TestGoogStatements extends 
         LabeledStatementNode node = (LabeledStatementNode) getNode(
                 "foo: for each(var i:int in obj) break foo;",
                 LabeledStatementNode.class);
-        visitor.visitLabeledStatement(node);
+        asBlockWalker.visitLabeledStatement(node);
         assertOut("foo : goog.array.forEach(obj, function (i) {\n\tbreak foo;\n})");
     }
 
@@ -284,7 +284,7 @@ public class TestGoogStatements extends 
                         + "  eee.dd; eee.dd; eee.dd; eee.dd;} }"
                         + "foo: for each(var i:int in obj) break foo;",
                 IFileNode.class);
-        visitor.visitFile(node);
+        asBlockWalker.visitFile(node);
         assertOut("goog.provide('A');\n\n/**\n * @constructor\n */\nA = function() {\n};\n\nA.prototype.a = function() {\n\tvar self = this;\n\ttry {\n\t\ta;\n\t} catch (e) {\n\t\tif (a) {\n\t\t\tif (b) {\n\t\t\t\tif (c)\n\t\t\t\t\tb;\n\t\t\t\telse if (f)\n\t\t\t\t\ta;\n\t\t\t\telse\n\t\t\t\t\te;\n\t\t\t}\n\t\t}\n\t} finally {\n\t}\n\tif (d)\n\t\tfor (var /** @type {number} */ i = 0; i < len; i++)\n\t\t\tbreak;\n\tif (a) {\n\t\twith (ab) {\n\t\t\tc();\n\t\t}\n\t\tdo {\n\t\t\ta++;\n\t\t\tdo\n\t\t\t\ta++;\n\t\t\twhile (a > b);\n\t\t} while (c > d);\n\t}\n\tif (b) {\n\t\ttry {\n\t\t\ta;\n\t\t\tthrow new Error('foo');\n\t\t} catch (e) {\n\t\t\tswitch (i) {\n\t\t\t\tcase 1:\n\t\t\t\t\tbreak;\n\t\t\t\tdefault:\n\t\t\t\t\treturn;\n\t\t\t}\n\t\t} finally {\n\t\t\td;\n\t\t\tvar /** @type {Object} */ a = function(foo, bar) {\n\t\t\t\tvar self = this;\n\t\t\t\tbar = typeof bar !== 'undefined' ? bar : 'goo';\n\t\t\t\treturn -1;\n\t\t\t};\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\t\teee.dd;\n\t\
 t\teee.dd;\n\t\t}\n\t}\n\tfoo : goog.array.forEach(obj, function (i) {\n\t\tbreak foo;\n\t});\n};");
     }
 

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/TestMXMLApplication.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/TestMXMLApplication.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/TestMXMLApplication.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/TestMXMLApplication.java Thu Feb 28 13:53:18 2013
@@ -1,6 +1,6 @@
 package org.apache.flex.compiler.internal.mxml.codegen;
 
-import org.apache.flex.compiler.test.MXMLTestBase;
+import org.apache.flex.compiler.internal.test.MXMLTestBase;
 import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -8,26 +8,36 @@ import org.junit.Test;
 public class TestMXMLApplication extends MXMLTestBase
 {
 
-    @Ignore
     @Test
     public void MXML_simple()
     {
-        String code = "<s:application />";
+        String code = "" +
+        		"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+        		"<s:Application xmlns:fx=\"http://ns.adobe.com/mxml/2009\" xmlns:s=\"library://ns.adobe.com/flex/spark\" xmlns:mx=\"library://ns.adobe.com/flex/mx\">\n" +
+                "\n" +
+                "\t<fx:Declarations />\n" +
+                "\n" +
+                "\t<s:Button id=\"myBtn\" label=\"Hello world\" />\n" +
+                "\n" +
+        		"</s:Application>";
         
         IMXMLFileNode node = compileMXML(code);
 
-        walker.visitFile(node);
+        mxmlBlockWalker.visitFile(node);
+        
+        assertOut("Hello World ;-)");
     }
 
     @Ignore
     @Test
     public void MXMLApplication_component()
     {
-        String code = "<component className=\"org.apache.flex.core:Application\" name=\"Application\" uri=\"library://ns.apache.org/flexjs/basic\"  />";
+        String code = "<component className=\"org.apache.flex.core:Application\" " +
+        		"name=\"Application\" uri=\"library://ns.apache.org/flexjs/basic\" />";
         
         IMXMLFileNode node = compileMXML(code);
 
-        walker.visitFile(node);
+        mxmlBlockWalker.visitFile(node);
     }
 
 }

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/flexjs/TestMXMLDocument.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/flexjs/TestMXMLDocument.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/flexjs/TestMXMLDocument.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/mxml/codegen/flexjs/TestMXMLDocument.java Thu Feb 28 13:53:18 2013
@@ -2,12 +2,12 @@ package org.apache.flex.compiler.interna
 
 import java.io.File;
 
-import org.apache.flex.compiler.test.MXMLTestBase;
+import org.apache.flex.compiler.internal.test.FlexJSTestBase;
 import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class TestMXMLDocument extends MXMLTestBase
+public class TestMXMLDocument extends FlexJSTestBase
 {
 
     @Ignore
@@ -21,7 +21,7 @@ public class TestMXMLDocument extends MX
         
         IMXMLFileNode node = compileMXML("FlexJSTest", true, path);
 
-        walker.visitFile(node);
+        mxmlBlockWalker.visitFile(node);
     }
 
 }

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java?rev=1451197&r1=1451144&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/AMDTestBase.java Thu Feb 28 13:53:18 2013
@@ -17,11 +17,11 @@
  *
  */
 
-package org.apache.flex.compiler.test;
+package org.apache.flex.compiler.internal.test;
 
 import java.io.File;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.js.driver.amd.AMDBackend;
 import org.apache.flex.compiler.tree.as.IClassNode;
 import org.apache.flex.compiler.tree.as.IDefinitionNode;
@@ -54,6 +54,9 @@ public abstract class AMDTestBase extend
     {
         super.setUp();
 
+        asEmitter = backend.createEmitter(writer);
+        asBlockWalker = backend.createWalker(project, errors, asEmitter);
+
         projectPath = "test-files/amd/simple-project/src";
         
         String target = getTypeUnderTest().replace(".", File.separator);

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java?rev=1451197&r1=1451144&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ASTestBase.java Thu Feb 28 13:53:18 2013
@@ -1,8 +1,8 @@
-package org.apache.flex.compiler.test;
+package org.apache.flex.compiler.internal.test;
 
 import java.io.File;
 
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.driver.ASBackend;
 import org.apache.flex.compiler.tree.as.IASNode;
 import org.apache.flex.compiler.tree.as.IAccessorNode;
@@ -22,6 +22,15 @@ public class ASTestBase extends TestBase
 {
 
     @Override
+    public void setUp()
+    {
+        super.setUp();
+        
+        asEmitter = backend.createEmitter(writer);
+        asBlockWalker = backend.createWalker(project, errors, asEmitter);
+    }
+
+    @Override
     public void addLibraries()
     {
         libraries.add(new File(FilenameNormalization.normalize(env.FPSDK
@@ -39,6 +48,7 @@ public class ASTestBase extends TestBase
     {
         return new ASBackend();
     }
+    
     //--------------------------------------------------------------------------
     // Node "factory"
     //--------------------------------------------------------------------------

Added: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java?rev=1451197&view=auto
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java (added)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java Thu Feb 28 13:53:18 2013
@@ -0,0 +1,56 @@
+package org.apache.flex.compiler.internal.test;
+
+import java.io.File;
+
+import org.apache.flex.compiler.common.driver.IBackend;
+import org.apache.flex.compiler.internal.mxml.driver.MXMLBackend;
+import org.apache.flex.compiler.mxml.MXMLNamespaceMapping;
+import org.apache.flex.utils.FilenameNormalization;
+import org.junit.Ignore;
+
+@Ignore
+public class FlexJSTestBase extends TestBase
+{
+
+    @Override
+    public void setUp()
+    {
+        super.setUp();
+
+        mxmlEmitter = backend.createMXMLEmitter(writer);
+        mxmlBlockWalker = backend.createMXMLWalker(project, errors, mxmlEmitter);
+    }
+
+    @Override
+    public void addLibraries()
+    {
+        libraries.add(new File(FilenameNormalization.normalize(env.FPSDK
+                + "/11.1/playerglobal.swc")));
+        libraries.add(new File(FilenameNormalization.normalize(env.SDK
+                + "/frameworks/libs/framework.swc")));
+        libraries.add(new File(FilenameNormalization.normalize(env.SDK
+                + "\\frameworks\\libs\\rpc.swc")));
+        libraries.add(new File(FilenameNormalization.normalize(env.SDK
+                + "/frameworks/libs/spark.swc")));
+        libraries.add(new File(tempDir, "libs/FlexJSUI.swc"));
+
+        super.addLibraries();
+    }
+
+    @Override
+    public void addNamespaceMappings()
+    {
+        namespaceMappings.add(new MXMLNamespaceMapping(
+                "library://ns.apache.org/flexjs/basic", new File(tempDir,
+                        "libs/manifest.xml").getAbsolutePath()));
+
+        super.addNamespaceMappings();
+    }
+
+    @Override
+    protected IBackend createBackend()
+    {
+        return new MXMLBackend();
+    }
+
+}

Propchange: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ITestBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ITestBase.java?rev=1451197&r1=1451144&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ITestBase.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/ITestBase.java Thu Feb 28 13:53:18 2013
@@ -1,4 +1,4 @@
-package org.apache.flex.compiler.test;
+package org.apache.flex.compiler.internal.test;
 
 public interface ITestBase
 {

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java?rev=1451197&r1=1451144&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/MXMLTestBase.java Thu Feb 28 13:53:18 2013
@@ -1,34 +1,33 @@
-package org.apache.flex.compiler.test;
+package org.apache.flex.compiler.internal.test;
 
 import java.io.File;
 
-import org.apache.flex.compiler.clients.IBackend;
-import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
+import org.apache.flex.compiler.internal.mxml.driver.MXMLBackend;
 import org.apache.flex.compiler.mxml.MXMLNamespaceMapping;
-import org.apache.flex.compiler.visitor.IASBlockWalker;
-import org.apache.flex.compiler.visitor.IMXMLBlockWalker;
+import org.apache.flex.utils.FilenameNormalization;
 import org.junit.Ignore;
 
 @Ignore
 public class MXMLTestBase extends TestBase
 {
 
-    protected IMXMLBlockWalker walker;
-
     @Override
     public void setUp()
     {
         super.setUp();
 
-        IASBlockWalker asWalker = (IASBlockWalker) visitor;
-        walker = backend.createMXMLWalker(asWalker.getEmitter(), project,
-                errors);
+        mxmlEmitter = backend.createMXMLEmitter(writer);
+        mxmlBlockWalker = backend.createMXMLWalker(project, errors, mxmlEmitter);
     }
 
     @Override
     public void addLibraries()
     {
-        libraries.add(new File(tempDir, "libs/FlexJSUI.swc"));
+        libraries.add(new File(FilenameNormalization.normalize(env.FPSDK
+                + "/11.1/playerglobal.swc")));
+        libraries.add(new File(FilenameNormalization.normalize(env.SDK
+                + "/frameworks/libs/spark.swc")));
         
         super.addLibraries();
     }
@@ -36,17 +35,24 @@ public class MXMLTestBase extends TestBa
     @Override
     public void addNamespaceMappings()
     {
+        namespaceMappings
+                .add(new MXMLNamespaceMapping("http://ns.adobe.com/mxml/2009",
+                        new File(env.SDK, "frameworks/mxml-2009-manifest.xml")
+                                .getAbsolutePath()));
         namespaceMappings.add(new MXMLNamespaceMapping(
-                "library://ns.apache.org/flexjs/basic", new File(tempDir,
-                        "libs/manifest.xml").getAbsolutePath()));
-        
+                "library://ns.adobe.com/flex/mx", new File(env.SDK,
+                        "frameworks/mx-manifest.xml").getAbsolutePath()));
+        namespaceMappings.add(new MXMLNamespaceMapping(
+                "library://ns.adobe.com/flex/spark", new File(env.SDK,
+                        "frameworks/spark-manifest.xml").getAbsolutePath()));
+
         super.addNamespaceMappings();
     }
-    
+
     @Override
     protected IBackend createBackend()
     {
-        return new GoogBackend();
+        return new MXMLBackend();
     }
 
 }

Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java?rev=1451197&r1=1451144&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/test/TestBase.java Thu Feb 28 13:53:18 2013
@@ -1,4 +1,4 @@
-package org.apache.flex.compiler.test;
+package org.apache.flex.compiler.internal.test;
 
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertNotNull;
@@ -16,20 +16,23 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.flex.compiler.as.codegen.IASEmitter;
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.internal.as.codegen.ASFilterWriter;
 import org.apache.flex.compiler.internal.projects.FlexProject;
 import org.apache.flex.compiler.internal.projects.FlexProjectConfigurator;
+import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
 import org.apache.flex.compiler.internal.tree.as.FunctionNode;
 import org.apache.flex.compiler.internal.workspaces.Workspace;
 import org.apache.flex.compiler.mxml.IMXMLNamespaceMapping;
+import org.apache.flex.compiler.mxml.codegen.IMXMLEmitter;
 import org.apache.flex.compiler.problems.ICompilerProblem;
 import org.apache.flex.compiler.tree.as.IASNode;
 import org.apache.flex.compiler.tree.as.IFileNode;
 import org.apache.flex.compiler.tree.mxml.IMXMLFileNode;
 import org.apache.flex.compiler.units.ICompilationUnit;
 import org.apache.flex.compiler.utils.EnvProperties;
-import org.apache.flex.compiler.visitor.IASBlockVisitor;
+import org.apache.flex.compiler.visitor.IASBlockWalker;
+import org.apache.flex.compiler.visitor.IMXMLBlockWalker;
 import org.apache.flex.utils.FilenameNormalization;
 import org.junit.After;
 import org.junit.Before;
@@ -45,10 +48,16 @@ public class TestBase implements ITestBa
     protected static Workspace workspace = new Workspace();
     protected FlexProject project;
 
-    protected IASBlockVisitor visitor;
     protected IBackend backend;
-    protected IASEmitter emitter;
     protected ASFilterWriter writer;
+    
+    protected IASEmitter asEmitter;
+    protected IMXMLEmitter mxmlEmitter;
+
+    protected IASBlockWalker asBlockWalker;
+    protected IMXMLBlockWalker mxmlBlockWalker;
+
+    protected String inputFileExtension;
 
     protected String mCode;
 
@@ -58,8 +67,6 @@ public class TestBase implements ITestBa
     protected List<File> libraries = new ArrayList<File>();
     protected List<IMXMLNamespaceMapping> namespaceMappings = new ArrayList<IMXMLNamespaceMapping>();
 
-    private boolean isMXML;
-
     @Before
     public void setUp()
     {
@@ -74,8 +81,16 @@ public class TestBase implements ITestBa
 
         backend = createBackend();
         writer = backend.createWriterBuffer(project);
-        emitter = backend.createEmitter(writer);
-        visitor = backend.createWalker(project, errors, emitter);
+
+        try
+        {
+            ISourceFileHandler sfh = backend.getSourceFileHandlerInstance();
+            inputFileExtension = "." + sfh.getExtensions()[0];
+        }
+        catch (Exception e)
+        {
+            inputFileExtension = ".as";
+        }
 
         sourcePaths = new ArrayList<File>();
         libraries = new ArrayList<File>();
@@ -89,8 +104,9 @@ public class TestBase implements ITestBa
     {
         backend = null;
         writer = null;
-        emitter = null;
-        visitor = null;
+        asEmitter = null;
+        asBlockWalker = null;
+        mxmlBlockWalker = null;
     }
 
     protected IBackend createBackend()
@@ -125,8 +141,6 @@ public class TestBase implements ITestBa
     protected IFileNode compileAS(String input, boolean isFileName,
             String inputDir, boolean useTempFile)
     {
-        isMXML = false;
-
         return (IFileNode) compile(input, isFileName, inputDir, useTempFile);
     }
 
@@ -135,17 +149,17 @@ public class TestBase implements ITestBa
     {
         File tempFile = (useTempFile) ? writeCodeToTempFile(input, isFileName,
                 inputDir) : new File(FilenameNormalization.normalize(inputDir
-                + File.separator + input + ((isMXML) ? ".mxml" : ".as")));
+                + File.separator + input + inputFileExtension));
 
         addDependencies();
 
-        ICompilationUnit cu = null;
-
         String normalizedMainFileName = FilenameNormalization
                 .normalize(tempFile.getAbsolutePath());
 
         Collection<ICompilationUnit> mainFileCompilationUnits = workspace
                 .getCompilationUnits(normalizedMainFileName, project);
+
+        ICompilationUnit cu = null;
         for (ICompilationUnit cu2 : mainFileCompilationUnits)
         {
             if (cu2 != null)
@@ -179,8 +193,6 @@ public class TestBase implements ITestBa
     protected IMXMLFileNode compileMXML(String input, boolean isFileName,
             String inputDir, boolean useTempFile)
     {
-        isMXML = true;
-
         return (IMXMLFileNode) compile(input, isFileName, inputDir, useTempFile);
     }
 
@@ -193,8 +205,8 @@ public class TestBase implements ITestBa
             String tempFileName = (isFileName) ? input : getClass()
                     .getSimpleName();
 
-            tempASFile = File.createTempFile(tempFileName, ((isMXML) ? ".mxml"
-                    : ".as"), tempDir);
+            tempASFile = File.createTempFile(tempFileName, inputFileExtension,
+                    tempDir);
             tempASFile.deleteOnExit();
 
             String code = "";
@@ -239,7 +251,7 @@ public class TestBase implements ITestBa
     public void addNamespaceMappings()
     {
     }
-    
+
     @Override
     public void addSourcePaths()
     {
@@ -253,7 +265,7 @@ public class TestBase implements ITestBa
 
         File testFile = new File(testFileDir
                 + File.separator + sourceDir + File.separator + fileName
-                + (isJS ? ".js" : ((isMXML) ? ".mxml" : ".as")));
+                + (isJS ? ".js" : inputFileExtension));
 
         String code = "";
         try

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IASEmitter.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IASEmitter.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IASEmitter.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IASEmitter.java Thu Feb 28 13:53:18 2013
@@ -21,6 +21,8 @@ package org.apache.flex.compiler.as.code
 
 import java.io.Writer;
 
+import org.apache.flex.compiler.common.codegen.IDocEmitter;
+import org.apache.flex.compiler.common.codegen.IEmitter;
 import org.apache.flex.compiler.definitions.IPackageDefinition;
 import org.apache.flex.compiler.internal.tree.as.FunctionObjectNode;
 import org.apache.flex.compiler.internal.tree.as.LabeledStatementNode;
@@ -81,18 +83,6 @@ public interface IASEmitter extends IEmi
 
     void setDocEmitter(IDocEmitter value);
 
-    /**
-     * Pushes an indent into the emitter so after newlines are emitted, the
-     * output is correctly formatted.
-     */
-    void indentPush();
-
-    /**
-     * Pops an indent from the emitter so after newlines are emitted, the output
-     * is correctly formatted.
-     */
-    void indentPop();
-
     void emitImport(IImportNode node);
 
     void emitPackageHeader(IPackageDefinition definition);

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/MXMLJSC.java Thu Feb 28 13:53:18 2013
@@ -37,6 +37,7 @@ import org.apache.flex.compiler.clients.
 import org.apache.flex.compiler.clients.problems.ProblemQuery;
 import org.apache.flex.compiler.clients.problems.WorkspaceProblemFormatter;
 import org.apache.flex.compiler.common.VersionInfo;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.config.Configuration;
 import org.apache.flex.compiler.config.ConfigurationBuffer;
 import org.apache.flex.compiler.config.Configurator;

Copied: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IDocEmitter.java (from r1451144, flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IDocEmitter.java)
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IDocEmitter.java?p2=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IDocEmitter.java&p1=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IDocEmitter.java&r1=1451144&r2=1451197&rev=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IDocEmitter.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IDocEmitter.java Thu Feb 28 13:53:18 2013
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.as.codegen;
+package org.apache.flex.compiler.common.codegen;
 
 /**
  * Base interface for documentation emitters.

Copied: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitter.java (from r1451144, flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IEmitter.java)
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitter.java?p2=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitter.java&p1=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IEmitter.java&r1=1451144&r2=1451197&rev=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IEmitter.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitter.java Thu Feb 28 13:53:18 2013
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.as.codegen;
+package org.apache.flex.compiler.common.codegen;
 
 import org.apache.flex.compiler.internal.as.codegen.ASEmitterTokens;
 
@@ -29,6 +29,18 @@ public interface IEmitter
 {
 
     /**
+     * Pushes an indent into the emitter so after newlines are emitted, the
+     * output is correctly formatted.
+     */
+    void indentPush();
+
+    /**
+     * Pops an indent from the emitter so after newlines are emitted, the output
+     * is correctly formatted.
+     */
+    void indentPop();
+
+    /**
      * Writes a string to the writer.
      * 
      * @param value The string to write to the output buffer.

Copied: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitterTokens.java (from r1451144, flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IEmitterTokens.java)
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitterTokens.java?p2=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitterTokens.java&p1=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IEmitterTokens.java&r1=1451144&r2=1451197&rev=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/as/codegen/IEmitterTokens.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/codegen/IEmitterTokens.java Thu Feb 28 13:53:18 2013
@@ -1,4 +1,4 @@
-package org.apache.flex.compiler.as.codegen;
+package org.apache.flex.compiler.common.codegen;
 
 public interface IEmitterTokens
 {

Copied: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/driver/IBackend.java (from r1451144, flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/IBackend.java)
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/driver/IBackend.java?p2=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/driver/IBackend.java&p1=flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/IBackend.java&r1=1451144&r2=1451197&rev=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/clients/IBackend.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/common/driver/IBackend.java Thu Feb 28 13:53:18 2013
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.clients;
+package org.apache.flex.compiler.common.driver;
 
 import java.io.File;
 import java.io.FilterWriter;
@@ -25,11 +25,13 @@ import java.util.List;
 
 import org.apache.flex.compiler.as.codegen.IASEmitter;
 import org.apache.flex.compiler.as.codegen.IASWriter;
-import org.apache.flex.compiler.as.codegen.IDocEmitter;
+import org.apache.flex.compiler.clients.MXMLJSC;
+import org.apache.flex.compiler.common.codegen.IDocEmitter;
 import org.apache.flex.compiler.config.Configurator;
 import org.apache.flex.compiler.internal.as.codegen.ASFilterWriter;
 import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
 import org.apache.flex.compiler.internal.targets.JSTarget;
+import org.apache.flex.compiler.mxml.codegen.IMXMLEmitter;
 import org.apache.flex.compiler.problems.ICompilerProblem;
 import org.apache.flex.compiler.projects.IASProject;
 import org.apache.flex.compiler.projects.ICompilerProject;
@@ -47,6 +49,7 @@ import org.apache.flex.compiler.visitor.
  */
 public interface IBackend
 {
+    
     /**
      * Returns the instance that is used to manage what type of
      * {@link ICompilationUnit} is created during parsing.
@@ -82,6 +85,8 @@ public interface IBackend
 
     IASEmitter createEmitter(FilterWriter writer);
 
+    IMXMLEmitter createMXMLEmitter(FilterWriter writer);
+
     ASFilterWriter createWriterBuffer(IASProject project);
 
     IASWriter createWriter(IASProject project, List<ICompilerProblem> errors,
@@ -98,11 +103,12 @@ public interface IBackend
      * first and pass that instance into this method's <code>walker</code>
      * parameter.
      * 
-     * @param emitter The current {@link IASEmitter} that is used for it's
-     * emitter and is available for callbacks to it's visit methods.
      * @param project The current {@link IASProject}.
      * @param errors The current {@link ICompilerProblem} list.
+     * @param emitter The current {@link IASEmitter} that is used for it's
+     * emitter and is available for callbacks to it's visit methods.
      */
-    IMXMLBlockWalker createMXMLWalker(IASEmitter emitter, IASProject project,
-            List<ICompilerProblem> errors);
+    IMXMLBlockWalker createMXMLWalker(IASProject project,
+            List<ICompilerProblem> errors, IMXMLEmitter emitter);
+
 }

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASAfterNodeStrategy.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASAfterNodeStrategy.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASAfterNodeStrategy.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASAfterNodeStrategy.java Thu Feb 28 13:53:18 2013
@@ -20,7 +20,7 @@
 package org.apache.flex.compiler.internal.as.codegen;
 
 import org.apache.flex.compiler.as.codegen.IASEmitter;
-import org.apache.flex.compiler.as.codegen.IEmitter;
+import org.apache.flex.compiler.common.codegen.IEmitter;
 import org.apache.flex.compiler.js.codegen.IJSEmitter;
 import org.apache.flex.compiler.tree.ASTNodeID;
 import org.apache.flex.compiler.tree.as.IASNode;

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASBeforeNodeStrategy.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASBeforeNodeStrategy.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASBeforeNodeStrategy.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASBeforeNodeStrategy.java Thu Feb 28 13:53:18 2013
@@ -20,7 +20,7 @@
 package org.apache.flex.compiler.internal.as.codegen;
 
 import org.apache.flex.compiler.as.codegen.IASEmitter;
-import org.apache.flex.compiler.as.codegen.IEmitter;
+import org.apache.flex.compiler.common.codegen.IEmitter;
 import org.apache.flex.compiler.tree.ASTNodeID;
 import org.apache.flex.compiler.tree.as.IASNode;
 import org.apache.flex.compiler.tree.as.IContainerNode;

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitter.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitter.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitter.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitter.java Thu Feb 28 13:53:18 2013
@@ -26,19 +26,19 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.flex.compiler.as.codegen.IASEmitter;
-import org.apache.flex.compiler.as.codegen.IDocEmitter;
-import org.apache.flex.compiler.as.codegen.IEmitter;
-import org.apache.flex.compiler.as.codegen.IEmitterTokens;
 import org.apache.flex.compiler.common.ASModifier;
-import org.apache.flex.compiler.common.ASNodeUtils;
 import org.apache.flex.compiler.common.IImportTarget;
 import org.apache.flex.compiler.common.ModifiersSet;
+import org.apache.flex.compiler.common.codegen.IDocEmitter;
+import org.apache.flex.compiler.common.codegen.IEmitter;
+import org.apache.flex.compiler.common.codegen.IEmitterTokens;
 import org.apache.flex.compiler.constants.IASKeywordConstants;
 import org.apache.flex.compiler.definitions.IDefinition;
 import org.apache.flex.compiler.definitions.IFunctionDefinition;
 import org.apache.flex.compiler.definitions.IPackageDefinition;
 import org.apache.flex.compiler.definitions.ITypeDefinition;
 import org.apache.flex.compiler.definitions.IVariableDefinition;
+import org.apache.flex.compiler.internal.as.utils.ASNodeUtils;
 import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
 import org.apache.flex.compiler.internal.tree.as.FunctionNode;
 import org.apache.flex.compiler.internal.tree.as.FunctionObjectNode;
@@ -137,20 +137,6 @@ public class ASEmitter implements IASEmi
         return problems;
     }
 
-    private IDocEmitter docEmitter;
-
-    @Override
-    public IDocEmitter getDocEmitter()
-    {
-        return docEmitter;
-    }
-
-    @Override
-    public void setDocEmitter(IDocEmitter value)
-    {
-        docEmitter = value;
-    }
-
     private int currentIndent = 0;
 
     protected int getCurrentIndent()
@@ -172,6 +158,17 @@ public class ASEmitter implements IASEmi
         walker = value;
     }
 
+    @Override
+    public IDocEmitter getDocEmitter()
+    {
+        return null;
+    }
+
+    @Override
+    public void setDocEmitter(IDocEmitter value)
+    {
+    }
+
     public ASEmitter(FilterWriter out)
     {
         this.out = out;

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitterTokens.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitterTokens.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitterTokens.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/codegen/ASEmitterTokens.java Thu Feb 28 13:53:18 2013
@@ -19,7 +19,7 @@
 
 package org.apache.flex.compiler.internal.as.codegen;
 
-import org.apache.flex.compiler.as.codegen.IEmitterTokens;
+import org.apache.flex.compiler.common.codegen.IEmitterTokens;
 
 /**
  * @author Michael Schmalle

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/driver/ASBackend.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/driver/ASBackend.java?rev=1451197&r1=1451196&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/driver/ASBackend.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/driver/ASBackend.java Thu Feb 28 13:53:18 2013
@@ -25,18 +25,20 @@ import java.util.List;
 
 import org.apache.flex.compiler.as.codegen.IASEmitter;
 import org.apache.flex.compiler.as.codegen.IASWriter;
-import org.apache.flex.compiler.as.codegen.IDocEmitter;
-import org.apache.flex.compiler.clients.IBackend;
+import org.apache.flex.compiler.common.codegen.IDocEmitter;
+import org.apache.flex.compiler.common.driver.IBackend;
 import org.apache.flex.compiler.config.Configurator;
+import org.apache.flex.compiler.internal.as.codegen.ASAfterNodeStrategy;
+import org.apache.flex.compiler.internal.as.codegen.ASBeforeNodeStrategy;
 import org.apache.flex.compiler.internal.as.codegen.ASBlockWalker;
 import org.apache.flex.compiler.internal.as.codegen.ASEmitter;
 import org.apache.flex.compiler.internal.as.codegen.ASFilterWriter;
 import org.apache.flex.compiler.internal.as.codegen.ASWriter;
-import org.apache.flex.compiler.internal.as.codegen.ASAfterNodeStrategy;
-import org.apache.flex.compiler.internal.as.codegen.ASBeforeNodeStrategy;
 import org.apache.flex.compiler.internal.as.visitor.ASNodeSwitch;
 import org.apache.flex.compiler.internal.as.visitor.BeforeAfterStrategy;
+import org.apache.flex.compiler.internal.mxml.codegen.MXMLEmitter;
 import org.apache.flex.compiler.internal.projects.ISourceFileHandler;
+import org.apache.flex.compiler.mxml.codegen.IMXMLEmitter;
 import org.apache.flex.compiler.problems.ICompilerProblem;
 import org.apache.flex.compiler.projects.IASProject;
 import org.apache.flex.compiler.targets.ITarget;
@@ -44,6 +46,7 @@ import org.apache.flex.compiler.targets.
 import org.apache.flex.compiler.targets.ITargetSettings;
 import org.apache.flex.compiler.tree.as.IFileNode;
 import org.apache.flex.compiler.units.ICompilationUnit;
+import org.apache.flex.compiler.visitor.IASBlockWalker;
 import org.apache.flex.compiler.visitor.IMXMLBlockWalker;
 
 /**
@@ -80,7 +83,7 @@ public class ASBackend implements IBacke
     }
 
     @Override
-    public ASBlockWalker createWalker(IASProject project,
+    public IASBlockWalker createWalker(IASProject project,
             List<ICompilerProblem> errors, IASEmitter emitter)
     {
         ASBlockWalker walker = new ASBlockWalker(errors, project, emitter);
@@ -95,6 +98,13 @@ public class ASBackend implements IBacke
     }
 
     @Override
+    public IMXMLBlockWalker createMXMLWalker(IASProject project,
+            List<ICompilerProblem> errors, IMXMLEmitter emitter)
+    {
+        return null;
+    }
+
+    @Override
     public ASFilterWriter createWriterBuffer(IASProject project)
     {
         StringWriter out = new StringWriter();
@@ -107,6 +117,12 @@ public class ASBackend implements IBacke
     {
         return new ASEmitter(writer);
     }
+    
+    @Override
+    public IMXMLEmitter createMXMLEmitter(FilterWriter writer)
+    {
+        return new MXMLEmitter(writer);
+    }
 
     @Override
     public IASWriter createWriter(IASProject project,
@@ -122,12 +138,4 @@ public class ASBackend implements IBacke
         return null;
     }
 
-    @Override
-    public IMXMLBlockWalker createMXMLWalker(IASEmitter emitter,
-            IASProject project, List<ICompilerProblem> errors)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
 }

Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/utils/ASNodeUtils.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/utils/ASNodeUtils.java?rev=1451197&r1=1451144&r2=1451197&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/utils/ASNodeUtils.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/as/utils/ASNodeUtils.java Thu Feb 28 13:53:18 2013
@@ -17,7 +17,7 @@
  *
  */
 
-package org.apache.flex.compiler.common;
+package org.apache.flex.compiler.internal.as.utils;
 
 import java.util.ArrayList;