You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/11/02 18:27:23 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - Array needs to
return Arrays
Repository: flex-falcon
Updated Branches:
refs/heads/develop b288371af -> e853162f7
Array needs to return Arrays
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/c94c0f18
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/c94c0f18
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/c94c0f18
Branch: refs/heads/develop
Commit: c94c0f18e2a14cbbfc7dab65bb9e11813f9a236d
Parents: b288371
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 2 09:29:00 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 2 09:29:00 2015 -0800
----------------------------------------------------------------------
.../flex/compiler/internal/codegen/externals/TestExternES3.java | 2 +-
.../compiler/internal/codegen/externals/utils/FunctionUtils.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c94c0f18/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
index 0f91b9c..9b47e9f 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java
@@ -90,7 +90,7 @@ public class TestExternES3 extends ExternalsTestBase
StringBuilder sb = new StringBuilder();
constructor.emitCode(sb);
String emit = sb.toString();
- assertEquals(" public function Array(...var_args):Object { return null; }\n", emit);
+ assertEquals(" public function Array(...var_args):Array { return null; }\n", emit);
}
@Override
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/c94c0f18/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 6bf3ac5..46b3797 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
@@ -61,7 +61,9 @@ public class FunctionUtils
if (hasTemplate(reference))
{
- returnType = "Object";
+ returnType = JSTypeUtils.toReturnTypeString(reference);
+ if (!returnType.equals("Array"))
+ returnType = "Object";
}
else
{
[2/2] git commit: [flex-falcon] [refs/heads/develop] - pick up some
missing files
Posted by ah...@apache.org.
pick up some missing files
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/e853162f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/e853162f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/e853162f
Branch: refs/heads/develop
Commit: e853162f7405eb5dd79cdb310c4a43ca1c86f5d6
Parents: c94c0f1
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 2 09:29:16 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 2 09:29:16 2015 -0800
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/e853162f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c47e830..591770c 100644
--- a/build.xml
+++ b/build.xml
@@ -461,6 +461,7 @@
<fileset dir="${basedir}/externs">
<include name="**/*.xml"/>
<include name="js/missing.js"/>
+ <include name="js/src/**"/>
</fileset>
</copy>
</target>