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
The following commit(s) were added to refs/heads/develop by this push:
new 5427a40 BinaryOperatorEmitter, SuperCallEmitter: remove more
unnecessary spaces from generated JS
5427a40 is described below
commit 5427a4046e7c00e4dc4281e7b31ebbafa9c5ce14
Author: Josh Tynjala <[email protected]>
AuthorDate: Mon Feb 28 11:33:36 2022 -0800
BinaryOperatorEmitter, SuperCallEmitter: remove more unnecessary spaces
from generated JS
---
.../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(-)
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 4c8de56..674b198 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
@@ -188,7 +188,7 @@ public class BinaryOperatorEmitter extends JSSubEmitter
implements
}
getWalker().walk(node.getRightOperandNode());
- writeToken(ASEmitterTokens.SQUARE_CLOSE);
+ write(ASEmitterTokens.SQUARE_CLOSE);
write(ASEmitterTokens.PAREN_CLOSE);
return;
}
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 98ad1c2..51cacfc 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
@@ -292,7 +292,7 @@ public class SuperCallEmitter extends JSSubEmitter
getWalker().walk(anodes[i]);
}
if (usingApply)
- writeToken(ASEmitterTokens.SQUARE_CLOSE);
+ write(ASEmitterTokens.SQUARE_CLOSE);
}
write(ASEmitterTokens.PAREN_CLOSE);
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 09e577f..56185c3 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 6388486..0088173 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/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 155d923..38260fa 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
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 0e3cec1..8084e1d 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]);
}
};
