flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [7/7] git commit: Minor fix and update
Date Wed, 27 Mar 2013 15:30:53 GMT
Minor fix and update

Fixed issue with null pointer and made overrides to handle 'goog' way of handling 'is' and
'as' operators.

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>


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

Branch: refs/heads/develop
Commit: e4320233b5c4c498f0ea8feae58f66f355a28a0c
Parents: 06664de
Author: Erik de Bruin <erik@ixsoftware.nl>
Authored: Wed Mar 27 16:14:58 2013 +0100
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Wed Mar 27 16:29:59 2013 +0100

----------------------------------------------------------------------
 .../internal/codegen/js/goog/JSGoogEmitter.java    |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e4320233/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
index 3c39caf..c29fef5 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/goog/JSGoogEmitter.java
@@ -546,7 +546,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         else
         {
             String pname = (type != null) ? type.getPackageName() : "";
-            if (pname != ""
+            if (cnode != null && pname != ""
                     && !pname.equalsIgnoreCase(cnode.getPackageName())
                     && inode != ASTNodeID.ArgumentID
                     && inode != ASTNodeID.VariableID
@@ -980,6 +980,18 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
     }
 
     @Override
+    public void emitAsOperator(IBinaryOperatorNode node)
+    {
+        emitBinaryOperator(node);
+    }
+
+    @Override
+    public void emitIsOperator(IBinaryOperatorNode node)
+    {
+        emitBinaryOperator(node);
+    }
+    
+    @Override
     public void emitBinaryOperator(IBinaryOperatorNode node)
     {
         if (ASNodeUtils.hasParenOpen(node))


Mime
View raw message