flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [02/19] git commit: [flex-falcon] [refs/heads/feature/maven-migration-test] - FLEX-35081 need to handle MXML case
Date Thu, 21 Apr 2016 11:35:32 GMT
FLEX-35081 need to handle MXML case


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/170ea47e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/170ea47e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/170ea47e

Branch: refs/heads/feature/maven-migration-test
Commit: 170ea47e6cf683b9304c1e4c34d3d9ee7c5bf9e3
Parents: 0b53749
Author: Alex Harui <aharui@apache.org>
Authored: Mon Apr 18 23:48:57 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Apr 18 23:49:08 2016 -0700

----------------------------------------------------------------------
 .../internal/codegen/js/jx/BinaryOperatorEmitter.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/170ea47e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
index aab9712..4beaf2f 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
@@ -115,8 +115,13 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements
                         write(ASEmitterTokens.PAREN_OPEN);
                         IClassNode cnode = (IClassNode) node
                                 .getAncestorOfType(IClassNode.class);
-                        write(getEmitter().formatQualifiedName(
+                        if (cnode != null)
+                        	write(getEmitter().formatQualifiedName(
                                 cnode.getQualifiedName()));
+                        else
+                        	write(getEmitter().formatQualifiedName(
+                        		getModel().getCurrentClass().getQualifiedName()));
+                        			
                         writeToken(ASEmitterTokens.COMMA);
                         write(ASEmitterTokens.THIS);
                         writeToken(ASEmitterTokens.COMMA);


Mime
View raw message