You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2022/02/28 19:15:05 UTC
[royale-compiler] branch develop updated (b4dda35 -> 26ec68f)
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from b4dda35 formatter: fix collapseEmptyBlocks
new e7dee33 BinaryOperatorEmitter: remove unnecessary space character from JS output
new 26ec68f SuperCallEmitter: remove unnecessary space character from JS output
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java | 2 +-
.../royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java | 2 +-
.../internal/codegen/js/royale/TestRoyaleAccessorMembers.java | 4 ++--
.../royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java | 2 +-
.../compiler/internal/codegen/js/royale/TestRoyaleExpressions.java | 4 ++--
compiler-jx/src/test/resources/royale/projects/super/Base_result.js | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
[royale-compiler] 02/02: SuperCallEmitter: remove unnecessary space character from JS output
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 26ec68f2593fc495053fcec1e695212d32a56c55
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Feb 28 11:14:46 2022 -0800
SuperCallEmitter: remove unnecessary space character from JS output
---
.../royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java | 2 +-
.../compiler/internal/codegen/js/royale/TestRoyaleExpressions.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java
index 3472752..98ad1c2 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/SuperCallEmitter.java
@@ -280,7 +280,7 @@ public class SuperCallEmitter extends JSSubEmitter
if (usingApply)
{
writeToken(ASEmitterTokens.COMMA);
- writeToken(ASEmitterTokens.SQUARE_OPEN);
+ write(ASEmitterTokens.SQUARE_OPEN);
}
int len = anodes.length;
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
index 388c1ec..155d923 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleExpressions.java
@@ -138,7 +138,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
{
IFunctionNode node = getMethod("function foo(){if (a) super.foo(a, b, c);}");
asBlockWalker.visitFunction(node);
- assertOut("RoyaleTest_A.prototype.foo = function() {\n if (a)\n RoyaleTest_A.superClass_.foo.apply(this, [ a, b, c] );\n}");
+ assertOut("RoyaleTest_A.prototype.foo = function() {\n if (a)\n RoyaleTest_A.superClass_.foo.apply(this, [a, b, c] );\n}");
}
@Test
@@ -147,7 +147,7 @@ public class TestRoyaleExpressions extends TestGoogExpressions
IFunctionNode node = (IFunctionNode)getNode("import custom.TestProxy;import custom.custom_namespace;use namespace custom_namespace;public class RoyaleTest_A extends TestProxy { custom_namespace function foo(){if (a) super.setProperty(a, b);}}",
IFunctionNode.class, WRAP_LEVEL_PACKAGE);
asBlockWalker.visitFunction(node);
- assertOut("/**\n */\nRoyaleTest_A.prototype.http_$$ns_apache_org$2017$custom$namespace__foo = function() {\n if (a)\n RoyaleTest_A.superClass_.http_$$ns_apache_org$2017$custom$namespace__setProperty.apply(this, [ a, b] );\n}");
+ assertOut("/**\n */\nRoyaleTest_A.prototype.http_$$ns_apache_org$2017$custom$namespace__foo = function() {\n if (a)\n RoyaleTest_A.superClass_.http_$$ns_apache_org$2017$custom$namespace__setProperty.apply(this, [a, b] );\n}");
}
@Test
[royale-compiler] 01/02: BinaryOperatorEmitter: remove unnecessary space character from JS output
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit e7dee33939f9a215fcdf4d4606f3fb6fc2174ed5
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Feb 28 11:09:45 2022 -0800
BinaryOperatorEmitter: remove unnecessary space character from JS output
---
.../royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java | 2 +-
.../internal/codegen/js/royale/TestRoyaleAccessorMembers.java | 4 ++--
.../royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java | 2 +-
compiler-jx/src/test/resources/royale/projects/super/Base_result.js | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
index d82d17b..4c8de56 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/BinaryOperatorEmitter.java
@@ -170,7 +170,7 @@ public class BinaryOperatorEmitter extends JSSubEmitter implements
write(ASEmitterTokens.PAREN_OPEN);
write(ASEmitterTokens.THIS);
writeToken(ASEmitterTokens.COMMA);
- writeToken(ASEmitterTokens.SQUARE_OPEN);
+ write(ASEmitterTokens.SQUARE_OPEN);
if (op.length() > 1) // += and things like that
{
write(getEmitter().formatQualifiedName(
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
index 958902d..09e577f 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleAccessorMembers.java
@@ -152,7 +152,7 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
IClassNode.class, WRAP_LEVEL_PACKAGE);
asBlockWalker.visitClass(node);
assertOut("/**\n * @constructor\n * @extends {A}\n */\nB = function() {\n B.base(this, 'constructor');\n};\ngoog.inherits(B, A);\n\n\n" +
- "B.prototype.set__foo = function(value) {\n B.superClass_.set__foo.apply(this, [ value] );\n};\n\n\n" +
+ "B.prototype.set__foo = function(value) {\n B.superClass_.set__foo.apply(this, [value] );\n};\n\n\n" +
"Object.defineProperties(B.prototype, /** @lends {B.prototype} */ {\n/**\n * @type {number}\n */\nfoo: {\nset: B.prototype.set__foo}}\n);");
}
@@ -176,7 +176,7 @@ public class TestRoyaleAccessorMembers extends TestGoogAccessorMembers
IClassNode.class, WRAP_LEVEL_PACKAGE);
asBlockWalker.visitClass(node);
assertOut("/**\n * @constructor\n * @extends {A}\n */\nB = function() {\n B.base(this, 'constructor');\n};\ngoog.inherits(B, A);\n\n\n" +
- "B.prototype.set__foo = function(value) {\n B.superClass_.set__foo.apply(this, [ value] );\n};\n\n\n" +
+ "B.prototype.set__foo = function(value) {\n B.superClass_.set__foo.apply(this, [value] );\n};\n\n\n" +
"Object.defineProperties(B.prototype, /** @lends {B.prototype} */ {\n/**\n * @type {number}\n */\nfoo: {\nget: A.prototype.get__foo,\nset: B.prototype.set__foo}}\n);");
}
diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
index 595dbdd..6388486 100644
--- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
+++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleClass.java
@@ -276,7 +276,7 @@ public class TestRoyaleClass extends TestGoogClass
IClassNode node = getClassNode("public class B extends A {public function B() {}; override public function set foo(value:Object):void {super.foo = value;};} class A {public function set foo(value:Object):void {}}");
asBlockWalker.visitClass(node);
String expected = "/**\n * @constructor\n * @extends {org.apache.royale.A}\n */\norg.apache.royale.B = function() {\n org.apache.royale.B.base(this, 'constructor');\n};\ngoog.inherits(org.apache.royale.B, org.apache.royale.A);\n\n\n" +
- "org.apache.royale.B.prototype.set__foo = function(value) {\n org.apache.royale.B.superClass_.set__foo.apply(this, [ value] );\n};\n\n\n" +
+ "org.apache.royale.B.prototype.set__foo = function(value) {\n org.apache.royale.B.superClass_.set__foo.apply(this, [value] );\n};\n\n\n" +
"Object.defineProperties(org.apache.royale.B.prototype, /** @lends {org.apache.royale.B.prototype} */ {\n/**\n * @type {Object}\n */\nfoo: {\nset: org.apache.royale.B.prototype.set__foo}}\n);";
assertOut(expected);
}
diff --git a/compiler-jx/src/test/resources/royale/projects/super/Base_result.js b/compiler-jx/src/test/resources/royale/projects/super/Base_result.js
index fcaa48c..0e3cec1 100644
--- a/compiler-jx/src/test/resources/royale/projects/super/Base_result.js
+++ b/compiler-jx/src/test/resources/royale/projects/super/Base_result.js
@@ -42,7 +42,7 @@ Base.prototype.get__text = function() {
Base.prototype.set__text = function(value) {
if (value != Base.superClass_.get__text.apply(this)) {
- Base.superClass_.set__text.apply(this, [ "B" + value] );
+ Base.superClass_.set__text.apply(this, ["B" + value] );
}
};