Repository: flex-falcon Updated Branches: refs/heads/develop 982ecfb9b -> c899a8da7
FLEX-34771 some super calls weren't being emitted in the cross-compiler Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c899a8da Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c899a8da Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c899a8da Branch: refs/heads/develop Commit: c899a8da7c792b3247bd66f3e6401bf1ce77d4e2 Parents: 982ecfb Author: Alex Harui <aha...@apache.org> Authored: Fri Feb 27 15:57:28 2015 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Fri Feb 27 15:57:28 2015 -0800 ---------------------------------------------------------------------- .../codegen/js/flexjs/JSFlexJSEmitter.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c899a8da/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java ---------------------------------------------------------------------- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java index 9d92c4a..7968c21 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java @@ -30,6 +30,7 @@ import java.util.Set; import org.apache.flex.compiler.asdoc.flexjs.ASDocComment; import org.apache.flex.compiler.clients.MXMLJSC; +import org.apache.flex.compiler.clients.MXMLJSC.JSOutputType; import org.apache.flex.compiler.codegen.IASGlobalFunctionConstants; import org.apache.flex.compiler.codegen.IDocEmitter; import org.apache.flex.compiler.codegen.js.flexjs.IJSFlexJSEmitter; @@ -815,10 +816,13 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter .getAncestorOfType(IClassNode.class); // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation - if (cnode == null) + if (cnode == null && MXMLJSC.jsOutputType == JSOutputType.VF2JS) return; - - write(formatQualifiedName(cnode.getQualifiedName())); + + if (cnode == null && thisClass != null) + write(formatQualifiedName(thisClass.getQualifiedName())); + else + write(formatQualifiedName(cnode.getQualifiedName())); write(ASEmitterTokens.MEMBER_ACCESS); write(JSGoogEmitterTokens.GOOG_BASE); write(ASEmitterTokens.PAREN_OPEN); @@ -887,10 +891,13 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter .getAncestorOfType(IClassNode.class); // ToDo (erikdebruin): add VF2JS conditional -> only use check during full SDK compilation - if (cnode == null) + if (cnode == null && MXMLJSC.jsOutputType == JSOutputType.VF2JS) return; - - write(formatQualifiedName(cnode.getQualifiedName())); + + if (cnode == null && thisClass != null) + write(formatQualifiedName(thisClass.getQualifiedName())); + else + write(formatQualifiedName(cnode.getQualifiedName())); write(ASEmitterTokens.MEMBER_ACCESS); write(JSGoogEmitterTokens.GOOG_BASE); write(ASEmitterTokens.PAREN_OPEN);
