You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/04 09:31:55 UTC
[5/5] git commit: [flex-falcon]
[refs/heads/feature-autobuild/closure-classpath-sources] - - Merged latest
changes from develop - Hopefully fixed an issue if the closure-lib is
specified on the commandline/ant
- Merged latest changes from develop
- Hopefully fixed an issue if the closure-lib is specified on the commandline/ant
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a36a8005
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a36a8005
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a36a8005
Branch: refs/heads/feature-autobuild/closure-classpath-sources
Commit: a36a80053f2b6ec663c3aecf60bce877ac26a629
Parents: d47ac92 2c8becb
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Fri Nov 4 10:31:42 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Fri Nov 4 10:31:42 2016 +0100
----------------------------------------------------------------------
.../internal/codegen/js/JSEmitterTokens.java | 1 +
.../codegen/js/jx/BinaryOperatorEmitter.java | 28 ++--
.../codegen/js/jx/MemberAccessEmitter.java | 13 +-
.../codegen/js/jx/SuperCallEmitter.java | 159 +++++++++++++------
.../js/flexjs/TestFlexJSAccessorMembers.java | 8 +-
.../codegen/js/flexjs/TestFlexJSClass.java | 6 +-
.../js/flexjs/TestFlexJSExpressions.java | 16 +-
.../mxml/flexjs/TestFlexJSMXMLScript.java | 2 +-
.../flexjs/projects/super/Base_result.js | 6 +-
.../internal/mxml/MXMLTagAttributeData.java | 2 +
.../compiler/internal/mxml/MXMLTagData.java | 4 +
.../compiler/internal/mxml/MXMLTextData.java | 2 +
.../resources/config/compile-extern-config.xml | 4 +
13 files changed, 167 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a36a8005/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java
----------------------------------------------------------------------
diff --cc compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java
index 7be2c42,657bf72..915aacf
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/js/jx/SuperCallEmitter.java
@@@ -228,11 -274,22 +274,22 @@@ public class SuperCallEmitter extends J
if (writeArguments)
{
- for (IASNode anode : anodes) {
+ if (usingApply)
+ {
writeToken(ASEmitterTokens.COMMA);
+ writeToken(ASEmitterTokens.SQUARE_OPEN);
+ }
-
++
+ int len = anodes.length;
+ for (int i = 0; i < len; i++)
+ {
+ if (!usingApply || i > 0)
+ writeToken(ASEmitterTokens.COMMA);
- getWalker().walk(anode);
+ getWalker().walk(anodes[i]);
}
+ if (usingApply)
+ writeToken(ASEmitterTokens.SQUARE_CLOSE);
}
write(ASEmitterTokens.PAREN_CLOSE);