flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [4/4] git commit: [flex-falcon] [refs/heads/develop] - allow createjs to compile
Date Fri, 04 Dec 2015 23:25:06 GMT
allow createjs to compile


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

Branch: refs/heads/develop
Commit: a3ae178ecb53d8e29a1ce37125cf73a626d9cad9
Parents: 609bdb1
Author: Alex Harui <aharui@apache.org>
Authored: Fri Dec 4 15:22:13 2015 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Dec 4 15:22:13 2015 -0800

----------------------------------------------------------------------
 .../internal/codegen/externals/pass/ReferenceCompiler.java    | 5 +++++
 .../internal/codegen/externals/utils/FunctionUtils.java       | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a3ae178e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
index e5ac6c8..dc83314 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
@@ -22,6 +22,7 @@ package org.apache.flex.compiler.internal.codegen.externals.pass;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
@@ -52,6 +53,9 @@ public class ReferenceCompiler
 
         initializeCompiler();
     }
+    
+    String[] asdocTags = new String[] {"chainable", 
+    		"readOnly", "uses", "main"};
 
     private void initializeCompiler()
     {
@@ -67,6 +71,7 @@ public class ReferenceCompiler
         options.setIdeMode(true);
         options.setParseJsDocDocumentation(true);
         options.setExternExports(false);
+        options.setExtraAnnotationNames(Arrays.asList(asdocTags));
 
         options.addCustomPass(CustomPassExecutionTime.BEFORE_OPTIMIZATIONS, new NamespaceResolutionPass(model,
                 jscompiler));

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a3ae178e/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
index d683e64..82ff5ec 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/externals/utils/FunctionUtils.java
@@ -159,7 +159,12 @@ public class FunctionUtils
 
         String paramType;
 
-        if (parameterType.isVarArgs())
+        if (parameterType == null)
+        {
+        	System.out.println("no parameter type for " + paramName + " " + reference.getQualifiedName());
+            paramType = "Object";        	
+        }
+        else if (parameterType.isVarArgs())
         {
             sb.append("...").append(paramName);
         }


Mime
View raw message