archive-gh-me/jsweet
1
0
Fork 0
mirror of https://github.com/cincheo/jsweet.git synced 2025-12-14 23:09:22 +00:00
Code Issues Projects Releases Wiki Activity

support for $noarrow macro

Browse Source 
By default, JSweet generates arrow functions for Java lambda (the 'this'
semantics is closer to Java). Wrapping a function in $noarrow will force
JSweet to produce a plain old JavaScript function rather than an arrow
function.
This commit is contained in:
Renaud Pawlak 2017-05-11 17:31:32 +02:00
parent e39ded506f
commit a91bd7ec8f
6 changed files with 1205 additions and 1165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1174
core-lib/es5/src/main/java/jsweet/util/Lang.java
View File

File diff suppressed because it is too large Load Diff

1174
core-lib/es6/src/main/java/jsweet/util/Lang.java
View File

File diff suppressed because it is too large Load Diff

3
transpiler/src/main/java/org/jsweet/transpiler/Java2TypeScriptTranslator.java
View File

@ -4508,7 +4508,8 @@ public class Java2TypeScriptTranslator extends AbstractTreePrinter {
public void visitLambda(JCLambda lamba) {
boolean regularFunction = false;
if (getParent() instanceof JCMethodInvocation
&& ((JCMethodInvocation) getParent()).meth.toString().endsWith("function")) {
&& ((JCMethodInvocation) getParent()).meth.toString().endsWith("function") && getParentOfParent() instanceof JCMethodInvocation
&& ((JCMethodInvocation) getParentOfParent()).meth.toString().endsWith("$noarrow")) {
MethodInvocationElement invocation = (MethodInvocationElement) ExtendedElementFactory.INSTANCE
.create(getParent());
if (JSweetConfig.UTIL_CLASSNAME.equals(invocation.getMethod().getEnclosingElement().toString())) {

4
transpiler/src/main/java/org/jsweet/transpiler/extension/Java2TypeScriptAdapter.java
View File

@ -495,6 +495,10 @@ public class Java2TypeScriptAdapter extends PrinterAdapter {
print("typeof ").print(invocationElement.getArgument(0));
return true;
case "$noarrow":
print(invocationElement.getArgument(0));
return true;
case "equalsStrict":
print("(").print(invocationElement.getArgument(0)).print(" === ")
.print(invocationElement.getArgument(1)).print(")");

11
transpiler/src/main/java/org/jsweet/transpiler/util/AbstractTreeScanner.java
View File

@ -266,6 +266,17 @@ public abstract class AbstractTreeScanner extends TreeScanner {
}
}
/**
* Returns the parent of the immediate parent in the printer's scanning stack.
*/
public JCTree getParentOfParent() {
if (this.stack.size() >= 3) {
return this.stack.get(this.stack.size() - 3);
} else {
return null;
}
}
/**
* Gets the parent element in the printer's scanning stack.
*/

4
transpiler/src/test/java/source/decorator/SimpleDecorator.java
View File

@ -46,7 +46,7 @@ class Globals {
Function originalMethod = (Function) descriptor.$get("value");
// editing the descriptor/value parameter
descriptor.$set("value", function(() -> {
descriptor.$set("value", $noarrow(function(() -> {
Array<Object> args = $array();
for (int _i = 0; _i < arguments.length; _i++) {
array(args)[_i - 0] = arguments[_i];
@ -58,7 +58,7 @@ class Globals {
console.log("Call: " + key + "(" + a + ") => " + r);
trace.push("Call: " + key + "(" + a + ") => " + r);
return result;
}));
})));
// return edited descriptor as opposed to overwriting the descriptor
return descriptor;