You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cz...@apache.org on 2013/04/16 17:52:21 UTC

[1/3] git commit: [flex-falcon] - type - renamed emitParamter to emitParameter

Updated Branches:
  refs/heads/develop c4b2cd27a -> 0e923fbf3


type - renamed emitParamter to emitParameter


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

Branch: refs/heads/develop
Commit: bdcc093e699029564450b836f04b1360ff0db29f
Parents: c4b2cd2
Author: cyrill.zadra <cy...@gmail.com>
Authored: Tue Apr 16 02:46:23 2013 +0800
Committer: cyrill.zadra <cy...@gmail.com>
Committed: Tue Apr 16 23:42:41 2013 +0800

----------------------------------------------------------------------
 .../compiler/internal/codegen/as/ASEmitter.java    |    8 +-
 .../compiler/internal/codegen/js/JSEmitter.java    |    4 +-
 .../internal/codegen/js/amd/JSAMDEmitter.java      |    6 +-
 .../codegen/js/flexjs/JSFlexJSEmitter.java         |    2 +-
 .../internal/codegen/js/goog/JSGoogEmitter.java    |   55 ++++++++-------
 5 files changed, 38 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bdcc093e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
index 68a595a..1e6a5ec 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/as/ASEmitter.java
@@ -598,7 +598,7 @@ public class ASEmitter implements IASEmitter, IEmitter
         }
 
         emitMemberName(node);
-        emitParamters(node.getParameterNodes());
+        emitParameters(node.getParameterNodes());
         emitType(node.getReturnTypeNode());
         if (node.getParent().getParent().getNodeID() == ASTNodeID.ClassID)
         {
@@ -640,7 +640,7 @@ public class ASEmitter implements IASEmitter, IEmitter
         write(ASEmitterTokens.FUNCTION);
         write(ASEmitterTokens.SPACE);
         write(fnode.getName());
-        emitParamters(fnode.getParameterNodes());
+        emitParameters(fnode.getParameterNodes());
         emitType(fnode.getTypeNode());
         emitFunctionScope(fnode.getScopedNode());
     }
@@ -650,7 +650,7 @@ public class ASEmitter implements IASEmitter, IEmitter
     {
         FunctionNode fnode = node.getFunctionNode();
         write(ASEmitterTokens.FUNCTION);
-        emitParamters(fnode.getParameterNodes());
+        emitParameters(fnode.getParameterNodes());
         emitType(fnode.getTypeNode());
         emitFunctionScope(fnode.getScopedNode());
     }
@@ -719,7 +719,7 @@ public class ASEmitter implements IASEmitter, IEmitter
         getWalker().walk(node.getNameExpressionNode());
     }
 
-    protected void emitParamters(IParameterNode[] nodes)
+    protected void emitParameters(IParameterNode[] nodes)
     {
         write(ASEmitterTokens.PAREN_OPEN);
         int len = nodes.length;

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bdcc093e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java
index 99e8b24..6fb5576 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/JSEmitter.java
@@ -46,7 +46,7 @@ public class JSEmitter extends ASEmitter implements IJSEmitter
         write(ASEmitterTokens.FUNCTION);
         write(ASEmitterTokens.SPACE);
         write(fnode.getName());
-        emitParamters(fnode.getParameterNodes());
+        emitParameters(fnode.getParameterNodes());
         emitFunctionScope(fnode.getScopedNode());
     }
     
@@ -55,7 +55,7 @@ public class JSEmitter extends ASEmitter implements IJSEmitter
     {
         FunctionNode fnode = node.getFunctionNode();
         write(ASEmitterTokens.FUNCTION);
-        emitParamters(fnode.getParameterNodes());
+        emitParameters(fnode.getParameterNodes());
         emitFunctionScope(fnode.getScopedNode());
     }
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bdcc093e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDEmitter.java
index cb3f38a..da2f959 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/amd/JSAMDEmitter.java
@@ -186,7 +186,7 @@ public class JSAMDEmitter extends JSEmitter implements IJSAMDEmitter
 
         write("function ");
         write(node.getName());
-        emitParamters(node.getParameterNodes());
+        emitParameters(node.getParameterNodes());
         if (!isImplicit((IContainerNode) node.getScopedNode()))
         {
             emitMethodScope(node.getScopedNode());
@@ -602,7 +602,7 @@ public class JSAMDEmitter extends JSEmitter implements IJSAMDEmitter
 
         write(kind + ": function ");
         write(definition.getBaseName() + "$" + kind);
-        emitParamters(fnode.getParameterNodes());
+        emitParameters(fnode.getParameterNodes());
         emitMethodScope(fnode.getScopedNode());
     }
 
@@ -624,7 +624,7 @@ public class JSAMDEmitter extends JSEmitter implements IJSAMDEmitter
         write(":");
         write(" function ");
         write(node.getName());
-        emitParamters(node.getParameterNodes());
+        emitParameters(node.getParameterNodes());
         emitMethodScope(node.getScopedNode());
     }
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bdcc093e/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 715a379..2372247 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
@@ -669,7 +669,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
         writeToken(node.getName());
         writeToken(ASEmitterTokens.EQUAL);
         write(ASEmitterTokens.FUNCTION);
-        emitParamters(node.getParameterNodes());
+        emitParameters(node.getParameterNodes());
         //writeNewline();
         emitMethodScope(node.getScopedNode());
     }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bdcc093e/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 3256506..d12c9d4 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
@@ -187,19 +187,19 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         IClassDefinition definition = node.getDefinition();
 
         IFunctionDefinition ctorDefinition = definition.getConstructor();
-        
+
         // Static-only (Singleton) classes may not have a constructor
         if (ctorDefinition != null)
         {
-        	IFunctionNode ctorNode = (IFunctionNode)ctorDefinition.getNode();
-        	if (ctorNode != null)
-        	{
-		        // constructor
-		        emitMethod(ctorNode);
-		        write(ASEmitterTokens.SEMICOLON);
-        	}
-        	else
-        	{
+            IFunctionNode ctorNode = (IFunctionNode) ctorDefinition.getNode();
+            if (ctorNode != null)
+            {
+                // constructor
+                emitMethod(ctorNode);
+                write(ASEmitterTokens.SEMICOLON);
+            }
+            else
+            {
                 String qname = definition.getQualifiedName();
                 if (qname != null && !qname.equals(""))
                 {
@@ -215,7 +215,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
                     write(ASEmitterTokens.BLOCK_CLOSE);
                     write(ASEmitterTokens.SEMICOLON);
                 }
-        	}
+            }
         }
 
         IDefinitionNode[] dnodes = node.getAllMemberNodes();
@@ -251,7 +251,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
 
     @Override
     public void emitInterface(IInterfaceNode node)
-    {	
+    {
         getDoc().emitInterfaceDoc(node);
 
         String qname = node.getQualifiedName();
@@ -296,7 +296,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
                     writeToken(ASEmitterTokens.EQUAL);
                     write(ASEmitterTokens.FUNCTION);
 
-                    emitParamters(((IFunctionNode) mnode).getParameterNodes());
+                    emitParameters(((IFunctionNode) mnode).getParameterNodes());
 
                     write(ASEmitterTokens.SPACE);
                     write(ASEmitterTokens.BLOCK_OPEN);
@@ -468,7 +468,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         writeToken(ASEmitterTokens.EQUAL);
         write(ASEmitterTokens.FUNCTION);
 
-        emitParamters(node.getParameterNodes());
+        emitParameters(node.getParameterNodes());
 
         boolean hasSuperClass = hasSuperClass(node);
 
@@ -585,7 +585,8 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         else
         {
             String pname = (type != null) ? type.getPackageName() : "";
-            if (cnode != null && pname != ""
+            if (cnode != null
+                    && pname != ""
                     && !pname.equalsIgnoreCase(cnode.getPackageName())
                     && inode != ASTNodeID.ArgumentID
                     && inode != ASTNodeID.VariableID
@@ -602,13 +603,13 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
     @Override
     public void emitFunctionBlockHeader(IFunctionNode node)
     {
-    	IDefinition def = node.getDefinition();
-    	boolean isStatic = false;
-    	if (def != null && def.isStatic())
-    		isStatic = true;
-    	boolean isLocal = false;
-    	if (node.getFunctionClassification() == IFunctionDefinition.FunctionClassification.LOCAL)
-    		isLocal = true;
+        IDefinition def = node.getDefinition();
+        boolean isStatic = false;
+        if (def != null && def.isStatic())
+            isStatic = true;
+        boolean isLocal = false;
+        if (node.getFunctionClassification() == IFunctionDefinition.FunctionClassification.LOCAL)
+            isLocal = true;
         if (hasBody(node) && !isStatic && !isLocal)
             emitSelfReference(node);
 
@@ -846,9 +847,9 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         writeToken(ASEmitterTokens.FUNCTION);
         write(ASEmitterTokens.PAREN_OPEN);
         if (childNode instanceof IVariableExpressionNode)
-        	write(((IVariableNode) childNode.getChild(0)).getName());
+            write(((IVariableNode) childNode.getChild(0)).getName());
         else
-        	write(((IIdentifierNode) childNode).getName());
+            write(((IIdentifierNode) childNode).getName());
         writeToken(ASEmitterTokens.PAREN_CLOSE);
         if (isImplicit(xnode))
             write(ASEmitterTokens.BLOCK_OPEN);
@@ -1002,7 +1003,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
                 : ASEmitterTokens.SET);
         write(ASEmitterTokens.COLON);
         write(ASEmitterTokens.FUNCTION);
-        emitParamters(node.getParameterNodes());
+        emitParameters(node.getParameterNodes());
 
         emitMethodScope(node.getScopedNode());
 
@@ -1039,7 +1040,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
     {
         emitBinaryOperator(node);
     }
-    
+
     @Override
     public void emitBinaryOperator(IBinaryOperatorNode node)
     {
@@ -1122,7 +1123,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         else
         {
             // MXML
-        	ClassDefinition cdefinition = (ClassDefinition) type;
+            ClassDefinition cdefinition = (ClassDefinition) type;
             String[] implicitImports = cdefinition.getImplicitImports();
             for (String imp : implicitImports)
             {


[2/3] git commit: [flex-falcon] - [FalconJX] fix issue where constructor with super() of a class that extends Object outputs goog.base(..)

Posted by cz...@apache.org.
[FalconJX] fix issue where constructor with super() of a class that extends Object outputs goog.base(..)


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

Branch: refs/heads/develop
Commit: 48bc21a716b75e56bba122d25f1aec049ddc3b20
Parents: bdcc093
Author: cyrill.zadra <cy...@gmail.com>
Authored: Tue Apr 16 11:39:35 2013 +0800
Committer: cyrill.zadra <cy...@gmail.com>
Committed: Tue Apr 16 23:42:43 2013 +0800

----------------------------------------------------------------------
 .../codegen/js/flexjs/TestFlexJSEmiter.java        |    7 ++---
 .../internal/codegen/js/goog/TestGoogClass.java    |   20 +++++++++++++-
 .../internal/codegen/js/goog/TestGoogEmiter.java   |   12 +++-----
 .../codegen/js/flexjs/JSFlexJSEmitter.java         |    3 ++
 .../internal/codegen/js/goog/JSGoogEmitter.java    |    5 +++-
 5 files changed, 33 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/48bc21a7/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java
index e5858aa..daa3a0f 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSEmiter.java
@@ -32,16 +32,15 @@ public class TestFlexJSEmiter extends TestGoogEmiter
     @Override
     public void setUp()
     {
-    	project = new FlexJSProject(workspace);
-    	
+        project = new FlexJSProject(workspace);
+
         super.setUp();
     }
-	
 
     @Override
     protected IBackend createBackend()
     {
         return new FlexJSBackend();
     }
-    
+
 }

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/48bc21a7/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
index bf59ae5..ed056d8 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogClass.java
@@ -142,9 +142,25 @@ public class TestGoogClass extends TestClass
     @Test
     public void testConstructor()
     {
-        IClassNode node = getClassNode("public class A {public function A() {super('foo', 42);}}");
+        IClassNode node = getClassNode("public class A {public function A() { }}");
         asBlockWalker.visitClass(node);
-        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\tgoog.base(this, 'foo', 42);\n};");
+        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n};");
+    }
+
+    @Test
+    public void testConstructor_super()
+    {
+        IClassNode node = getClassNode("public class A {public function A() { super(); }}");
+        asBlockWalker.visitClass(node);
+        assertOut("/**\n * @constructor\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\t;\n};");
+    }
+
+    @Test
+    public void testExtendsConstructor_super()
+    {
+        IClassNode node = getClassNode("public class A extends spark.components.Button { public function A() { super('foo', 42);}}");
+        asBlockWalker.visitClass(node);
+        assertOut("/**\n * @constructor\n * @extends {spark.components.Button}\n */\norg.apache.flex.A = function() {\n\tvar self = this;\n\tgoog.base(this, 'foo', 42);\n}\ngoog.inherits(org.apache.flex.A, spark.components.Button);");
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/48bc21a7/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
index b599919..8a6ca10 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogEmiter.java
@@ -54,24 +54,22 @@ public class TestGoogEmiter extends ASTestBase
         asBlockWalker.visitFile(node);
         assertOut("goog.provide('com.example.components.MyTextButton');\n\ngoog.require('spark.components.Button');\n\n/**\n * @constructor\n * @extends {spark.components.Button}\n */\ncom.example.components.MyTextButton = function() {\n\tvar self = this;\n\tgoog.base(this);\n\tif (foo() != 42) {\n\t\tbar();\n\t}\n}\ngoog.inherits(com.example.components.MyTextButton, spark.components.Button);\n\n/**\n * @private\n * @type {string}\n */\ncom.example.components.MyTextButton.prototype._privateVar = \"do \";\n\n/**\n * @type {number}\n */\ncom.example.components.MyTextButton.prototype.publicProperty = 100;\n\n/**\n * @param {string} value\n * @return {string}\n */\ncom.example.components.MyTextButton.prototype.myFunction = function(value) {\n\tvar self = this;\n\treturn \"Don't \" + self._privateVar + value;\n};");
     }
-    
+
     @Test
     public void testSimpleInterface()
     {
         String code = "package com.example.components {"
-                + "public interface TestInterface { }"
-                + "}";
+                + "public interface TestInterface { } }";
         IFileNode node = compileAS(code);
         asBlockWalker.visitFile(node);
         assertOut("goog.provide('com.example.components.TestInterface');\n\n/**\n * @interface\n */\ncom.example.components.TestInterface = function() {\n};");
     }
-    
+
     @Test
     public void testSimpleClass()
     {
         String code = "package com.example.components {"
-                + "public class TestClass { }"
-                + "}";
+                + "public class TestClass { } }";
         IFileNode node = compileAS(code);
         asBlockWalker.visitFile(node);
         assertOut("goog.provide('com.example.components.TestClass');\n\n/**\n * @constructor\n */\ncom.example.components.TestClass = function() {\n};");
@@ -111,7 +109,7 @@ public class TestGoogEmiter extends ASTestBase
         assertOut("/**\n * @param {number} bar\n * @param {string} baz\n * @param {foo.bar.A} goo\n */\n"
                 + "foo.bar.A.prototype.method1 = function(bar, baz, goo) {\n}");
     }
-    
+
     // XXX (mschmalle) () get back to this when more work is done
     @Ignore
     @Test

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/48bc21a7/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 2372247..0065ee6 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
@@ -507,6 +507,9 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
                 fnode = (IFunctionNode) fcnode
                         .getAncestorOfType(IFunctionNode.class);
         }
+        
+        if (fnode.isConstructor() && !hasSuperClass(fnode))
+            return;
 
         write(JSGoogEmitterTokens.GOOG_BASE);
         write(ASEmitterTokens.PAREN_OPEN);

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/48bc21a7/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 d12c9d4..28d5084 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
@@ -651,6 +651,9 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
                         .getAncestorOfType(IFunctionNode.class);
         }
 
+        if (fnode.isConstructor() && !hasSuperClass(fnode))
+            return;
+
         write(JSGoogEmitterTokens.GOOG_BASE);
         write(ASEmitterTokens.PAREN_OPEN);
         write(ASEmitterTokens.THIS);
@@ -925,7 +928,7 @@ public class JSGoogEmitter extends JSEmitter implements IJSGoogEmitter
         return superClass;
     }
 
-    private boolean hasSuperClass(IDefinitionNode node)
+    protected boolean hasSuperClass(IDefinitionNode node)
     {
         ICompilerProject project = getWalker().getProject();
         IClassDefinition superClassDefinition = getSuperClassDefinition(node,


[3/3] git commit: [flex-falcon] - [FalconJx] no goog.require for class Date

Posted by cz...@apache.org.
[FalconJx] no goog.require for class Date


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

Branch: refs/heads/develop
Commit: 0e923fbf3a9f0b412c9cded0e6b2ce771f398dd9
Parents: 48bc21a
Author: cyrill.zadra <cy...@gmail.com>
Authored: Tue Apr 16 11:51:16 2013 +0800
Committer: cyrill.zadra <cy...@gmail.com>
Committed: Tue Apr 16 23:42:45 2013 +0800

----------------------------------------------------------------------
 .../codegen/js/flexjs/JSFlexJSEmitter.java         |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0e923fbf/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 0065ee6..fd2d328 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
@@ -752,6 +752,8 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
                     continue;
                 if (imp.equals("uint"))
                     continue;
+                if (imp.equals("Date"))
+                    continue;
 
                 if (writtenInstances.indexOf(imp) == -1)
                 {