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/01/17 09:58:08 UTC
svn commit: r1434595 - in /flex/falcon/trunk:
compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/
compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/
compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/
Author: erikdebruin
Date: Thu Jan 17 08:58:07 2013
New Revision: 1434595
URL: http://svn.apache.org/viewvc?rev=1434595&view=rev
Log:
- removed the 'nasty static debug field OUTPUT_JSDOC' from everywhere :-)
Modified:
flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/TestAMDEmiter.java
flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogEmiter.java
flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogGlobalConstants.java
flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSDocEmitter.java
flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSSharedData.java
Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/TestAMDEmiter.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/TestAMDEmiter.java?rev=1434595&r1=1434594&r2=1434595&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/TestAMDEmiter.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/amd/TestAMDEmiter.java Thu Jan 17 08:58:07 2013
@@ -21,7 +21,6 @@ package org.apache.flex.compiler.interna
import org.apache.flex.compiler.clients.IBackend;
import org.apache.flex.compiler.internal.as.codegen.TestWalkerBase;
-import org.apache.flex.compiler.internal.js.codegen.JSSharedData;
import org.apache.flex.compiler.internal.js.driver.amd.AMDBackend;
import org.apache.flex.compiler.tree.as.IFileNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
@@ -59,9 +58,7 @@ public class TestAMDEmiter extends TestW
public void testSimpleMethod()
{
IFunctionNode node = getMethod("function method1():void{\n}");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitFunction(node);
- JSSharedData.OUTPUT_JSDOC = true;
assertOut("A.prototype.method1 = function() {\n}");
}
@@ -69,9 +66,7 @@ public class TestAMDEmiter extends TestW
public void testSimpleParameterReturnType()
{
IFunctionNode node = getMethod("function method1(bar:int):int{\n}");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitFunction(node);
- JSSharedData.OUTPUT_JSDOC = true;
assertOut("A.prototype.method1 = function(bar) {\n}");
}
@@ -79,9 +74,7 @@ public class TestAMDEmiter extends TestW
public void testSimpleMultipleParameter()
{
IFunctionNode node = getMethod("function method1(bar:int, baz:String, goo:A):void{\n}");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitFunction(node);
- JSSharedData.OUTPUT_JSDOC = true;
assertOut("A.prototype.method1 = function(bar, baz, goo) {\n}");
}
@@ -100,9 +93,7 @@ public class TestAMDEmiter extends TestW
}
*/
IFunctionNode node = getMethod("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{return p1 + p2 + p3 + p4;}");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitFunction(node);
- JSSharedData.OUTPUT_JSDOC = true;
assertOut("A.prototype.method1 = function(p1, p2, p3, p4) {\n\tif (arguments.length < 4) "
+ "{\n\t\tif (arguments.length < 3) {\n\t\t\tp3 = 3;\n\t\t}\n\t\tp4 = 4;\n\t}"
+ "\n\treturn p1 + p2 + p3 + p4;\n}");
@@ -122,9 +113,7 @@ public class TestAMDEmiter extends TestW
}
*/
IFunctionNode node = getMethod("function method1(bar:int = 42, bax:int = 4):void{if (a) foo();}");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitFunction(node);
- JSSharedData.OUTPUT_JSDOC = true;
assertOut("A.prototype.method1 = function(bar, bax) {\n\tif (arguments.length < 2) {\n\t\t"
+ "if (arguments.length < 1) {\n\t\t\tbar = 42;\n\t\t}\n\t\tbax = 4;\n\t}\n\t"
+ "if (a)\n\t\tfoo();\n}");
@@ -144,9 +133,7 @@ public class TestAMDEmiter extends TestW
}
*/
IFunctionNode node = getMethod("function method1(bar:int = 42, bax:int = 4):void{\n}");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitFunction(node);
- JSSharedData.OUTPUT_JSDOC = true;
assertOut("A.prototype.method1 = function(bar, bax) {\n\tif (arguments.length < 2) {\n\t\t"
+ "if (arguments.length < 1) {\n\t\t\tbar = 42;\n\t\t}\n\t\tbax = 4;\n\t}\n}");
}
Modified: flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogEmiter.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogEmiter.java?rev=1434595&r1=1434594&r2=1434595&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogEmiter.java (original)
+++ flex/falcon/trunk/compiler.jx.tests/src/org/apache/flex/compiler/internal/js/codegen/goog/TestGoogEmiter.java Thu Jan 17 08:58:07 2013
@@ -21,7 +21,6 @@ package org.apache.flex.compiler.interna
import org.apache.flex.compiler.clients.IBackend;
import org.apache.flex.compiler.internal.as.codegen.TestWalkerBase;
-import org.apache.flex.compiler.internal.js.codegen.JSSharedData;
import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
import org.apache.flex.compiler.tree.as.IFileNode;
import org.apache.flex.compiler.tree.as.IFunctionNode;
@@ -56,31 +55,27 @@ public class TestGoogEmiter extends Test
@Test
public void testSimpleMethod()
{
- JSSharedData.OUTPUT_JSDOC = false;
IFunctionNode node = getMethod("function method1():void{\n}");
visitor.visitFunction(node);
assertOut("A.prototype.method1 = function() {\n}");
- JSSharedData.OUTPUT_JSDOC = true;
}
@Test
public void testSimpleParameterReturnType()
{
- JSSharedData.OUTPUT_JSDOC = false;
IFunctionNode node = getMethodWithPackage("function method1(bar:int):int{\n}");
visitor.visitFunction(node);
- assertOut("foo.bar.A.prototype.method1 = function(bar) {\n}");
- JSSharedData.OUTPUT_JSDOC = true;
+ assertOut("/**\n * @param {number} bar\n * @return {number}\n */\n"
+ + "foo.bar.A.prototype.method1 = function(bar) {\n}");
}
@Test
public void testSimpleMultipleParameter()
{
- JSSharedData.OUTPUT_JSDOC = false;
IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:A):void{\n}");
visitor.visitFunction(node);
- assertOut("foo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
- JSSharedData.OUTPUT_JSDOC = true;
+ assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {A} goo\n */\n"
+ + "foo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
}
@Test
@@ -88,45 +83,43 @@ public class TestGoogEmiter extends Test
{
IFunctionNode node = getMethodWithPackage("function method1(bar:int, baz:String, goo:A):void{\n}");
visitor.visitFunction(node);
- assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {A} goo\n */\nfoo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
+ assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {A} goo\n */\n"
+ + "foo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
}
@Test
public void testDefaultParameter()
{
- JSSharedData.OUTPUT_JSDOC = false;
IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{return p1 + p2 + p3 + p4;}");
visitor.visitFunction(node);
- assertOut("foo.bar.A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+ assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
+ + "foo.bar.A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+ "\tp3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
+ "\tp4 = typeof p4 !== 'undefined' ? p4 : 4;\n"
+ "\treturn p1 + p2 + p3 + p4;\n}");
- JSSharedData.OUTPUT_JSDOC = true;
}
@Test
public void testDefaultParameter_Body()
{
- JSSharedData.OUTPUT_JSDOC = false;
IFunctionNode node = getMethodWithPackage("function method1(bar:int = 42, bax:int = 4):void{if (a) foo();}");
visitor.visitFunction(node);
- assertOut("foo.bar.A.prototype.method1 = function(bar, bax) {\n"
- + "\tbar = typeof bar !== 'undefined' ? bar : 42;\n"
+ assertOut("/**\n * @param {number=} bar\n * @param {number=} bax\n */\n"
+ + "foo.bar.A.prototype.method1 = function(bar, bax) {\n"
+ + "\tbar = typeof bar !== 'undefined' ? bar : 42;\n"
+ "\tbax = typeof bax !== 'undefined' ? bax : 4;\n"
+ "\tif (a)\n\t\tfoo();\n}");
- JSSharedData.OUTPUT_JSDOC = true;
}
@Test
public void testDefaultParameter_NoBody()
{
- JSSharedData.OUTPUT_JSDOC = false;
IFunctionNode node = getMethodWithPackage("function method1(p1:int, p2:int, p3:int = 3, p4:int = 4):int{}");
visitor.visitFunction(node);
- assertOut("foo.bar.A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+ assertOut("/**\n * @param {number} p1\n * @param {number} p2\n * @param {number=} p3\n * @param {number=} p4\n * @return {number}\n */\n"
+ + "foo.bar.A.prototype.method1 = function(p1, p2, p3, p4) {\n"
+ "\tp3 = typeof p3 !== 'undefined' ? p3 : 3;\n"
+ "\tp4 = typeof p4 !== 'undefined' ? p4 : 4;\n}");
- JSSharedData.OUTPUT_JSDOC = true;
}
@Override
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=1434595&r1=1434594&r2=1434595&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 Jan 17 08:58:07 2013
@@ -21,7 +21,6 @@ package org.apache.flex.compiler.interna
import org.apache.flex.compiler.clients.IBackend;
import org.apache.flex.compiler.internal.as.codegen.TestGlobalConstants;
-import org.apache.flex.compiler.internal.js.codegen.JSSharedData;
import org.apache.flex.compiler.internal.js.driver.goog.GoogBackend;
import org.apache.flex.compiler.tree.as.IVariableNode;
import org.junit.Test;
@@ -36,10 +35,8 @@ public class TestGoogGlobalConstants ext
public void testInfinity()
{
IVariableNode node = getField("var a:Number = Infinity;");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitVariable(node);
- JSSharedData.OUTPUT_JSDOC = true;
- assertOut("A.prototype.a = Infinity");
+ assertOut("/**\n * @type {number}\n */\nA.prototype.a = Infinity");
}
@Override
@@ -47,10 +44,8 @@ public class TestGoogGlobalConstants ext
public void testNegativeInfinity()
{
IVariableNode node = getField("var a:Number = -Infinity;");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitVariable(node);
- JSSharedData.OUTPUT_JSDOC = true;
- assertOut("A.prototype.a = -Infinity");
+ assertOut("/**\n * @type {number}\n */\nA.prototype.a = -Infinity");
}
@Override
@@ -58,10 +53,8 @@ public class TestGoogGlobalConstants ext
public void testNaN()
{
IVariableNode node = getField("var a:Number = NaN;");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitVariable(node);
- JSSharedData.OUTPUT_JSDOC = true;
- assertOut("A.prototype.a = NaN");
+ assertOut("/**\n * @type {number}\n */\nA.prototype.a = NaN");
}
@Override
@@ -69,10 +62,8 @@ public class TestGoogGlobalConstants ext
public void testUndefined()
{
IVariableNode node = getField("var a:* = undefined;");
- JSSharedData.OUTPUT_JSDOC = false;
visitor.visitVariable(node);
- JSSharedData.OUTPUT_JSDOC = true;
- assertOut("A.prototype.a = undefined");
+ assertOut("/**\n * @type {*}\n */\nA.prototype.a = undefined");
}
@Override
Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSDocEmitter.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSDocEmitter.java?rev=1434595&r1=1434594&r2=1434595&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSDocEmitter.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSDocEmitter.java Thu Jan 17 08:58:07 2013
@@ -26,8 +26,7 @@ public class JSDocEmitter implements IJS
{
public void write(String value)
{
- if (JSSharedData.OUTPUT_JSDOC)
- emitter.write(value);
+ emitter.write(value);
}
private IJSEmitter emitter;
Modified: flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSSharedData.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSSharedData.java?rev=1434595&r1=1434594&r2=1434595&view=diff
==============================================================================
--- flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSSharedData.java (original)
+++ flex/falcon/trunk/compiler.jx/src/org/apache/flex/compiler/internal/js/codegen/JSSharedData.java Thu Jan 17 08:58:07 2013
@@ -39,9 +39,6 @@ public class JSSharedData
public final static JSSharedData instance = new JSSharedData();
- // TODO (mschmalle) Temp until I figure out the correct place for configuration
- public static boolean OUTPUT_JSDOC = true;
-
public static IBackend backend;
public static String OUTPUT_EXTENSION;
public static Workspace workspace;