You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by gr...@apache.org on 2016/10/11 07:17:16 UTC
[1/6] git commit: [flex-falcon] [refs/heads/develop] - [FIX] Do not
treat bindable const values in the same way as regular 'bindable' variables
Repository: flex-falcon
Updated Branches:
refs/heads/develop 557cd7978 -> 86644a94b
[FIX] Do not treat bindable const values in the same way as regular 'bindable' variables
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/ba963ac2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/ba963ac2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/ba963ac2
Branch: refs/heads/develop
Commit: ba963ac2377f638c968fb10b4e375b7626cbb2c2
Parents: 09b76c2
Author: greg-dove <gr...@gmail.com>
Authored: Mon Oct 10 17:37:12 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Mon Oct 10 17:37:12 2016 +1300
----------------------------------------------------------------------
.../flex/compiler/internal/codegen/js/jx/FieldEmitter.java | 9 +++++----
.../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ba963ac2/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
index 23459c4..b3b6bdb 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
@@ -31,9 +31,11 @@ import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
import org.apache.flex.compiler.internal.codegen.js.utils.EmitterUtils;
+import org.apache.flex.compiler.internal.definitions.VariableDefinition;
import org.apache.flex.compiler.internal.tree.as.ChainedVariableNode;
import org.apache.flex.compiler.internal.tree.as.GetterNode;
import org.apache.flex.compiler.internal.tree.as.SetterNode;
+import org.apache.flex.compiler.internal.tree.as.VariableNode;
import org.apache.flex.compiler.internal.tree.as.parts.FunctionContentsPart;
import org.apache.flex.compiler.parsing.IASToken;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -103,7 +105,7 @@ public class FieldEmitter extends JSSubEmitter implements
endMapping(node.getNameExpressionNode());
}
- if (node.getNodeID() == ASTNodeID.BindableVariableID)
+ if (node.getNodeID() == ASTNodeID.BindableVariableID && !node.isConst())
{
// add an underscore to convert this var to be the
// backing var for the get/set pair that will be generated later.
@@ -153,7 +155,7 @@ public class FieldEmitter extends JSSubEmitter implements
}
}
}
- if (node.getNodeID() == ASTNodeID.BindableVariableID)
+ if (node.getNodeID() == ASTNodeID.BindableVariableID && !node.isConst())
{
if (getModel().getBindableVars().get(node.getName()) == null) {
BindableVarInfo bindableVarInfo = new BindableVarInfo();
@@ -201,7 +203,7 @@ public class FieldEmitter extends JSSubEmitter implements
+ ASEmitterTokens.MEMBER_ACCESS.getToken());
write(node.getName());
- if (node.getNodeID() == ASTNodeID.BindableVariableID)
+ if (node.getNodeID() == ASTNodeID.BindableVariableID && !node.isConst())
{
// add an underscore to convert this var to be the
// backing var for the get/set pair that will be generated later.
@@ -211,7 +213,6 @@ public class FieldEmitter extends JSSubEmitter implements
writeToken(ASEmitterTokens.EQUAL);
write(vnodeString);
write(ASEmitterTokens.SEMICOLON);
-
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/ba963ac2/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index f42692f..3e8dfac 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -676,7 +676,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
for (IVariableNode varNode : vars)
{
String ns = varNode.getNamespace();
- if (ns == IASKeywordConstants.PUBLIC)
+ if (ns == IASKeywordConstants.PUBLIC && !varNode.isConst())
{
PackageFooterEmitter.VariableData data = asEmitter.packageFooterEmitter.new VariableData();
varData.add(data);
[3/6] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Posted by gr...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/fbd5d671
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/fbd5d671
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/fbd5d671
Branch: refs/heads/develop
Commit: fbd5d671ae05275360c0d4c11dd7c4f6f0c3704e
Parents: c474469 557cd79
Author: greg-dove <gr...@gmail.com>
Authored: Tue Oct 11 08:00:07 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Tue Oct 11 08:00:07 2016 +1300
----------------------------------------------------------------------
.../codegen/js/jx/IdentifierEmitter.java | 4 ++++
.../internal/codegen/js/utils/EmitterUtils.java | 5 ++++-
.../js/flexjs/TestFlexJSExpressions.java | 20 ++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/6] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Posted by gr...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-falcon into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c474469b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c474469b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c474469b
Branch: refs/heads/develop
Commit: c474469b34930c73603af8823ad276eed02e7c53
Parents: ba963ac 4a2a542
Author: greg-dove <gr...@gmail.com>
Authored: Mon Oct 10 17:37:28 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Mon Oct 10 17:37:28 2016 +1300
----------------------------------------------------------------------
.../src/main/java/flex2/tools/oem/Library.java | 48 +++++++++++---------
1 file changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[5/6] git commit: [flex-falcon] [refs/heads/develop] - [FIX] Fix for
static complex initializer from mxml script blocks,
tuning to newlines in the output.
Posted by gr...@apache.org.
[FIX] Fix for static complex initializer from mxml script blocks, tuning to newlines in the output.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e1a6e636
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e1a6e636
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e1a6e636
Branch: refs/heads/develop
Commit: e1a6e636a0f9fdeb92e7dddffac20cdf8156cf14
Parents: a7d6952
Author: greg-dove <gr...@gmail.com>
Authored: Tue Oct 11 18:58:22 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Tue Oct 11 18:58:22 2016 +1300
----------------------------------------------------------------------
.../internal/codegen/js/jx/ClassEmitter.java | 12 +++---
.../internal/codegen/js/jx/FieldEmitter.java | 7 +++-
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 42 ++++++++++++++++++--
3 files changed, 51 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e1a6e636/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java
index 3b28e5f..0a37cf4 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/ClassEmitter.java
@@ -149,20 +149,22 @@ public class ClassEmitter extends JSSubEmitter implements
if (fjs.getFieldEmitter().hasComplexStaticInitializers)
{
writeNewline();
-
+ boolean complexInitOutput = false;
for (IDefinitionNode dnode : dnodes)
{
if (dnode.getNodeID() == ASTNodeID.VariableID)
{
- writeNewline();
- fjs.getFieldEmitter().emitFieldInitializer((IVariableNode) dnode);
+ complexInitOutput = fjs.getFieldEmitter().emitFieldInitializer((IVariableNode) dnode) || complexInitOutput;
}
else if (dnode.getNodeID() == ASTNodeID.BindableVariableID)
{
- writeNewline();
- fjs.getFieldEmitter().emitFieldInitializer((IVariableNode) dnode);
+ complexInitOutput = fjs.getFieldEmitter().emitFieldInitializer((IVariableNode) dnode) || complexInitOutput;
}
}
+ if (complexInitOutput) {
+ writeNewline();
+ writeNewline();
+ }
}
fjs.getPackageFooterEmitter().emitClassInfo(node);
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e1a6e636/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
index b3b6bdb..8892220 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/FieldEmitter.java
@@ -26,6 +26,7 @@ import org.apache.flex.compiler.common.ASModifier;
import org.apache.flex.compiler.common.ModifiersSet;
import org.apache.flex.compiler.definitions.IDefinition;
import org.apache.flex.compiler.definitions.IVariableDefinition;
+import org.apache.flex.compiler.internal.codegen.Emitter;
import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
import org.apache.flex.compiler.internal.codegen.js.JSEmitterTokens;
import org.apache.flex.compiler.internal.codegen.js.JSSessionModel.BindableVarInfo;
@@ -173,7 +174,7 @@ public class FieldEmitter extends JSSubEmitter implements
}
}
- public void emitFieldInitializer(IVariableNode node)
+ public boolean emitFieldInitializer(IVariableNode node)
{
IDefinition definition = EmitterUtils.getClassDefinition(node);
@@ -199,6 +200,7 @@ public class FieldEmitter extends JSSubEmitter implements
className = getEmitter().formatQualifiedName(definition.getQualifiedName());
if (ndef.isStatic() && EmitterUtils.needsStaticInitializer(vnodeString, className) && !isPackageOrFileMember)
{
+ writeNewline();
write(className
+ ASEmitterTokens.MEMBER_ACCESS.getToken());
write(node.getName());
@@ -213,7 +215,10 @@ public class FieldEmitter extends JSSubEmitter implements
writeToken(ASEmitterTokens.EQUAL);
write(vnodeString);
write(ASEmitterTokens.SEMICOLON);
+ return true;
}
}
+
+ return false;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e1a6e636/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 3e8dfac..b128388 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -386,9 +386,9 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
fjs.getBindableEmitter().emit(cdef);
fjs.getAccessorEmitter().emit(cdef);
-
- emitEvents(cname);
+ emitEvents(cname);
+ emitComplexStaticInitializers(node);
emitPropertyGetterSetters(cname);
emitMXMLDescriptorFuncs(cname);
@@ -2510,13 +2510,15 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
{
IVariableNode varnode = (IVariableNode)schild;
IExpressionNode vnode = varnode.getAssignedValueNode();
- if (vnode != null && (!(varnode.isConst() || EmitterUtils.isScalar(vnode))))
+
+
+ if (vnode != null && (!EmitterUtils.isScalar(vnode)))
{
writeNewline();
write(ASEmitterTokens.THIS);
write(ASEmitterTokens.MEMBER_ACCESS);
write(varnode.getName());
- if (schildID == ASTNodeID.BindableVariableID)
+ if (schildID == ASTNodeID.BindableVariableID && !varnode.isConst())
write("_"); // use backing variable
write(ASEmitterTokens.SPACE);
writeToken(ASEmitterTokens.EQUAL);
@@ -2531,6 +2533,38 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements
}
}
}
+
+ public void emitComplexStaticInitializers(IASNode node){
+ JSFlexJSEmitter fjs = (JSFlexJSEmitter) ((IMXMLBlockWalker) getMXMLWalker())
+ .getASEmitter();
+
+ if (!fjs.getFieldEmitter().hasComplexStaticInitializers) return;
+ int n = node.getChildCount();
+ boolean sawOutput = false;
+ for (int i = 0; i < n; i++)
+ {
+ IASNode child = node.getChild(i);
+ if (child.getNodeID() == ASTNodeID.MXMLScriptID)
+ {
+ int m = child.getChildCount();
+ for (int j = 0; j < m; j++)
+ {
+ IASNode schild = child.getChild(j);
+ ASTNodeID schildID = schild.getNodeID();
+ if (schildID == ASTNodeID.VariableID ||
+ schildID == ASTNodeID.BindableVariableID)
+ {
+ sawOutput = fjs.getFieldEmitter().emitFieldInitializer((IVariableNode) schild) || sawOutput;
+ }
+ }
+ }
+ }
+
+ if (sawOutput) {
+ writeNewline();
+ writeNewline();
+ }
+ }
@Override
public void emitImplements(IMXMLImplementsNode node)
[4/6] git commit: [flex-falcon] [refs/heads/develop] - [FIX] Fix for
error with @export not allowed in release mode processing with custom
namespace - change to require 'public' for @export
Posted by gr...@apache.org.
[FIX] Fix for error with @export not allowed in release mode processing with custom namespace - change to require 'public' for @export
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a7d6952a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a7d6952a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a7d6952a
Branch: refs/heads/develop
Commit: a7d6952a0f6ccd4a7baddaa70edd78633ea8e744
Parents: fbd5d67
Author: greg-dove <gr...@gmail.com>
Authored: Tue Oct 11 18:55:46 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Tue Oct 11 18:55:46 2016 +1300
----------------------------------------------------------------------
.../compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a7d6952a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
index 152ba5d..80dde56 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
@@ -386,7 +386,7 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
{
emitProtected(node);
}
- else if (ns != null && ns != IASKeywordConstants.INTERNAL)
+ else if (ns != null && ns == IASKeywordConstants.PUBLIC)
{
emitPublic(node);
}
[6/6] git commit: [flex-falcon] [refs/heads/develop] - [Tests] Test
maintenance for recent changes
Posted by gr...@apache.org.
[Tests] Test maintenance for recent changes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/86644a94
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/86644a94
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/86644a94
Branch: refs/heads/develop
Commit: 86644a94be051f97e1728726926d6fa357162b60
Parents: e1a6e63
Author: greg-dove <gr...@gmail.com>
Authored: Tue Oct 11 18:58:51 2016 +1300
Committer: greg-dove <gr...@gmail.com>
Committed: Tue Oct 11 18:58:51 2016 +1300
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/TestFlexJSExpressions.java | 6 +++---
.../internal/codegen/js/flexjs/TestFlexJSFieldMembers.java | 2 +-
.../internal/codegen/js/flexjs/TestFlexJSMethodMembers.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/86644a94/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
index ff2d7fd..032683a 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSExpressions.java
@@ -99,7 +99,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
IFunctionNode node = (IFunctionNode)getNode("import flash.utils.Proxy;import flash.utils.flash_proxy;use namespace flash_proxy;public class FalconTest_A extends Proxy { flash_proxy function foo(){if (a) super.setProperty(a, b);}}",
IFunctionNode.class, WRAP_LEVEL_PACKAGE);
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @export\n */\nFalconTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function() {\n if (a)\n FalconTest_A.base(this, 'http://www.adobe.com/2006/actionscript/flash/proxy::setProperty', a, b);\n}");
+ assertOut("/**\n */\nFalconTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function() {\n if (a)\n FalconTest_A.base(this, 'http://www.adobe.com/2006/actionscript/flash/proxy::setProperty', a, b);\n}");
}
//----------------------------------
@@ -759,7 +759,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
"import flash.utils.flash_proxy; use namespace flash_proxy;public class B {flash_proxy function b() { function c(f:Function):void {}; var f:Function = b; c(f); }}",
IFunctionNode.class, WRAP_LEVEL_PACKAGE);
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @export\n */\nB.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"] = function() {\n var self = this;\n function c(f) {\n };\n var /** @type {Function} */ f = org.apache.flex.utils.Language.closure(this[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"], this, 'http://www.adobe.com/2006/actionscript/flash/proxy::b');\n c(f);\n}");
+ assertOut("/**\n */\nB.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"] = function() {\n var self = this;\n function c(f) {\n };\n var /** @type {Function} */ f = org.apache.flex.utils.Language.closure(this[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"], this, 'http://www.adobe.com/2006/actionscript/flash/proxy::b');\n c(f);\n}");
}
@Test
@@ -769,7 +769,7 @@ public class TestFlexJSExpressions extends TestGoogExpressions
"import flash.utils.flash_proxy; use namespace flash_proxy;public class B {flash_proxy function b():int { return this.b(); }}",
IFunctionNode.class, WRAP_LEVEL_PACKAGE);
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @export\n * @return {number}\n */\nB.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"] = function() {\n return this[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"]();\n}");
+ assertOut("/**\n * @return {number}\n */\nB.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"] = function() {\n return this[\"http://www.adobe.com/2006/actionscript/flash/proxy::b\"]();\n}");
}
@Test
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/86644a94/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
index dddfab6..7729981 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSFieldMembers.java
@@ -185,7 +185,7 @@ public class TestFlexJSFieldMembers extends TestGoogFieldMembers
IClassNode node = (IClassNode) getNode("import flash.utils.flash_proxy;use namespace flash_proxy;public static var foo:Object = initFoo(); flash_proxy static function initFoo():Object { return null; }",
IClassNode.class, WRAP_LEVEL_CLASS);
asBlockWalker.visitClass(node);
- assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * @export\n * @type {Object}\n */\nFalconTest_A.foo;\n\n\n/**\n * @export\n * @return {Object}\n */\nFalconTest_A[\"http://www.adobe.com/2006/actionscript/flash/proxy::initFoo\"] = function() {\n return null;\n};\n\nFalconTest_A.foo = FalconTest_A[\"http://www.adobe.com/2006/actionscript/flash/proxy::initFoo\"]();");
+ assertOut("/**\n * @constructor\n */\nFalconTest_A = function() {\n};\n\n\n/**\n * @export\n * @type {Object}\n */\nFalconTest_A.foo;\n\n\n/**\n * @return {Object}\n */\nFalconTest_A[\"http://www.adobe.com/2006/actionscript/flash/proxy::initFoo\"] = function() {\n return null;\n};\n\nFalconTest_A.foo = FalconTest_A[\"http://www.adobe.com/2006/actionscript/flash/proxy::initFoo\"]();\n\n");
}
@Test
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/86644a94/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
index 56dcd46..f1fc33a 100644
--- a/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
+++ b/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
@@ -92,7 +92,7 @@ public class TestFlexJSMethodMembers extends TestGoogMethodMembers
{
IFunctionNode node = getMethod("import flash.utils.flash_proxy;flash_proxy function foo(bar:String, baz:int = null):int{ return -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @export\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function(bar, baz) {\n baz = typeof baz !== 'undefined' ? baz : null;\n return -1;\n}");
+ assertOut("/**\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n */\nFalconTest_A.prototype[\"http://www.adobe.com/2006/actionscript/flash/proxy::foo\"] = function(bar, baz) {\n baz = typeof baz !== 'undefined' ? baz : null;\n return -1;\n}");
}
//--------------------------------------------------------------------------