You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2016/01/11 21:14:43 UTC
git commit: [flex-falcon] [refs/heads/develop] - IdentifierEmitter:
fixed issue with wrong identifier used for package and internal
functions/variables after last merge
Repository: flex-falcon
Updated Branches:
refs/heads/develop 4550efc11 -> 3c24fe034
IdentifierEmitter: fixed issue with wrong identifier used for package and internal functions/variables after last merge
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/3c24fe03
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/3c24fe03
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/3c24fe03
Branch: refs/heads/develop
Commit: 3c24fe034e37590ad4eba9dbe1d1ff222b8152a9
Parents: 4550efc
Author: Josh Tynjala <jo...@apache.org>
Authored: Mon Jan 11 12:14:37 2016 -0800
Committer: Josh Tynjala <jo...@apache.org>
Committed: Mon Jan 11 12:14:37 2016 -0800
----------------------------------------------------------------------
.../codegen/js/jx/IdentifierEmitter.java | 31 ++++++++++++++++++++
1 file changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/3c24fe03/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
index 4ed97e7..33033c4 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/IdentifierEmitter.java
@@ -22,7 +22,10 @@ package org.apache.flex.compiler.internal.codegen.js.jx;
import org.apache.flex.compiler.codegen.ISubEmitter;
import org.apache.flex.compiler.codegen.js.IJSEmitter;
import org.apache.flex.compiler.definitions.IDefinition;
+import org.apache.flex.compiler.definitions.IFunctionDefinition;
import org.apache.flex.compiler.definitions.IFunctionDefinition.FunctionClassification;
+import org.apache.flex.compiler.definitions.IVariableDefinition;
+import org.apache.flex.compiler.definitions.IVariableDefinition.VariableClassification;
import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens;
import org.apache.flex.compiler.internal.codegen.js.JSSubEmitter;
import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens;
@@ -131,6 +134,34 @@ public class IdentifierEmitter extends JSSubEmitter implements
write(node.getName());
else if (nodeDef instanceof TypeDefinitionBase)
write(getEmitter().formatQualifiedName(qname));
+ else if (nodeDef instanceof IFunctionDefinition)
+ {
+ IFunctionDefinition func = (IFunctionDefinition) nodeDef;
+ FunctionClassification classification = func.getFunctionClassification();
+ if (classification == FunctionClassification.PACKAGE_MEMBER ||
+ classification == FunctionClassification.FILE_MEMBER)
+ {
+ write(getEmitter().formatQualifiedName(qname));
+ }
+ else
+ {
+ write(qname);
+ }
+ }
+ else if (nodeDef instanceof IVariableDefinition)
+ {
+ IVariableDefinition variable = (IVariableDefinition) nodeDef;
+ VariableClassification classification = variable.getVariableClassification();
+ if (classification == VariableClassification.PACKAGE_MEMBER ||
+ classification == VariableClassification.FILE_MEMBER)
+ {
+ write(getEmitter().formatQualifiedName(qname));
+ }
+ else
+ {
+ write(qname);
+ }
+ }
else
write(qname);
}