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/07/06 06:41:43 UTC
[3/3] git commit: [flex-falcon] [refs/heads/develop] - Merge branch
'noexpose' into develop
Merge branch 'noexpose' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2951d1a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2951d1a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2951d1a7
Branch: refs/heads/develop
Commit: 2951d1a71240fb6a1060b566fdafc3ddcf683162
Parents: d30b0c4 5307227
Author: Alex Harui <ah...@apache.org>
Authored: Sun Jul 5 21:38:16 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Jul 5 21:38:16 2015 -0700
----------------------------------------------------------------------
.../js/flexjs/TestFlexJSAccessorMembers.java | 20 +++++-----
.../codegen/js/flexjs/TestFlexJSAccessors.java | 8 ++--
.../codegen/js/flexjs/TestFlexJSClass.java | 30 +++++++-------
.../codegen/js/flexjs/TestFlexJSEmiter.java | 2 +-
.../js/flexjs/TestFlexJSExpressions.java | 18 ++++-----
.../js/flexjs/TestFlexJSFieldMembers.java | 26 ++++++------
.../js/flexjs/TestFlexJSGlobalConstants.java | 8 ++--
.../js/flexjs/TestFlexJSMethodMembers.java | 8 ++--
.../codegen/js/vf2js/TestVF2JSClass.java | 26 ++++++------
.../codegen/js/vf2js/TestVF2JSExpressions.java | 2 +-
.../mxml/flexjs/TestFlexJSMXMLScript.java | 2 +-
.../externals_unit_tests/constructor_params.js | 2 +-
.../externals_unit_tests/package_namespace.js | 2 +-
.../flexjs/files/FlexJSTest_again_result.js | 6 +--
.../flexjs/files/LocalFunction_result.js | 2 +-
.../flexjs/files/MyInitialView_result.js | 42 ++++++++++----------
.../flexjs/files/StockDataJSONItemConverter.js | 2 +-
.../files/controllers/MyController_result.js | 2 +-
.../flexjs/files/models/MyModel_result.js | 6 +--
.../flexjs/projects/interfaces/Test_result.js | 2 +-
.../projects/interfaces/interfaces/IE_result.js | 2 +-
.../flexjs/projects/super/Base_result.js | 2 +-
.../flexjs/projects/super/Super_result.js | 4 +-
.../test-files/goog/files/call-super_result.js | 2 +-
.../test-files/vf2js/files/SimpleMXML_result.js | 2 +-
.../vf2js/projects/interfaces/Test_result.js | 2 +-
.../projects/interfaces/classes/A_result.js | 2 +-
.../vf2js/projects/sdk/SomeSDKClass_result.js | 8 ++--
.../sdk/bases/HelperBaseClass_result.js | 2 +-
.../simpleMXML/src/SimpleMXML_Project_result.js | 2 +-
.../vf2js/projects/super/Base_result.js | 8 ++--
.../vf2js/projects/super/Super_result.js | 8 ++--
.../codegen/js/goog/IJSGoogDocEmitter.java | 4 +-
.../codegen/js/goog/JSGoogDocEmitter.java | 2 +-
.../codegen/js/goog/JSGoogDocEmitterTokens.java | 2 +-
.../internal/codegen/js/jx/AccessorEmitter.java | 4 +-
.../internal/codegen/js/jx/BindableEmitter.java | 2 +-
.../codegen/js/vf2js/JSVF2JSEmitter.java | 4 +-
.../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 8 ++--
.../codegen/mxml/vf2js/MXMLVF2JSEmitter.java | 10 ++---
.../utils/JSClosureCompilerWrapper.java | 4 +-
41 files changed, 151 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2951d1a7/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
----------------------------------------------------------------------
diff --cc compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
index 0ede063,b983329..e0aab7c
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSMethodMembers.java
@@@ -187,17 -187,9 +187,17 @@@ public class TestFlexJSMethodMembers ex
{
IFunctionNode node = getMethod("override public function foo(bar:String, baz:int = null):int{return -1;}");
asBlockWalker.visitFunction(node);
- assertOut("/**\n * @expose\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n baz = typeof baz !== 'undefined' ? baz : null;\n return -1;\n}");
+ assertOut("/**\n * @export\n * @param {string} bar\n * @param {number=} baz\n * @return {number}\n * @override\n */\nFalconTest_A.prototype.foo = function(bar, baz) {\n baz = typeof baz !== 'undefined' ? baz : null;\n return -1;\n}");
}
+ @Test
+ public void testMethod_withConstDeclaration()
+ {
+ IFunctionNode node = getMethod("public function foo():String{const A:String = 'Hello World'; return A;}");
+ asBlockWalker.visitFunction(node);
+ assertOut("/**\n * @expose\n * @return {string}\n */\nFalconTest_A.prototype.foo = function() {\n \n/**\n * @const\n * @type {string}\n */\nvar A = 'Hello World';\n return A;\n}");
+ }
+
@Override
protected IBackend createBackend()
{
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2951d1a7/compiler.jx/src/org/apache/flex/compiler/utils/JSClosureCompilerWrapper.java
----------------------------------------------------------------------