Repository: flex-falcon Updated Branches: refs/heads/develop 9f20c1635 -> 893107ce0
fix MapSearch example Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/893107ce Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/893107ce Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/893107ce Branch: refs/heads/develop Commit: 893107ce0cca4a0f8a2b1d93d56c1ef7a987520b Parents: 9f20c16 Author: Alex Harui <[email protected]> Authored: Mon Nov 7 14:11:19 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Mon Nov 7 14:11:40 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/flex/compiler/clients/COMPJSC.java | 2 ++ .../internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 10 +++++++++- .../flex/compiler/internal/projects/FlexJSProject.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/893107ce/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java index 594ff45..bd9a3b1 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/clients/COMPJSC.java @@ -273,6 +273,8 @@ public class COMPJSC extends MXMLJSC String symbol = cu.getQualifiedNames().get(0); if (externs.contains(symbol)) continue; + if (project.isExternalLinkage(cu)) continue; + if (!packingSWC) { final File outputClassFile = getOutputClassFile( http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/893107ce/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 1f30509..f951b4d 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 @@ -180,12 +180,20 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements } else if (sawRequires) { + // append info() structure if main CU + ICompilerProject project = getMXMLWalker().getProject(); + FlexJSProject flexJSProject = null; + if (project instanceof FlexJSProject) + flexJSProject = (FlexJSProject) project; + stillSearching = false; for (String usedName :usedNames) { if (!foundRequires.contains(usedName)) { if (usedName.equals(classDefinition.getQualifiedName())) continue; if (((JSFlexJSEmitter) asEmitter).getModel().isInternalClass(usedName)) continue; if (subDocumentNames.contains(usedName)) continue; + if (flexJSProject != null && flexJSProject.isExternalLinkage(flexJSProject.resolveQNameToCompilationUnit(usedName))) + continue; namesToAdd.add(usedName); } } @@ -1377,7 +1385,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements indentPush(); writeNewline("{"); writeNewline("/** @type {Array} */"); - writeNewline("var arr = org.apache.flex.utils.Language.superGetter(" + formatQualifiedName(cname) + ",this, 'MXMLDescriptor');"); + writeNewline("var arr = " + formatQualifiedName(cname) + ".superClass_.get__MXMLDescriptor.apply(this);"); writeNewline("/** @type {Array} */"); indentPop(); indentPop(); http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/893107ce/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java ---------------------------------------------------------------------- diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java index 818355c..10f89ea 100644 --- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java +++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java @@ -196,7 +196,7 @@ public class FlexJSProject extends FlexProject return null; } - private boolean isExternalLinkage(ICompilationUnit cu) + public boolean isExternalLinkage(ICompilationUnit cu) { if (linkageChecker == null) {
