azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent JS AST nodes of several types to be shared

Browse Source
This commit is contained in:
Alexey Andreev
2017-05-05 17:42:43 +03:00
parent 3077a0f640
commit e9a2c8c0f1
73 changed files with 537 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.parser/src/com/google/gwt/dev/js/JsAstMapper.java
+14 -16
View File
@@ -16,7 +16,7 @@
package com.google.gwt.dev.js;
import org.jetbrains.kotlin.js.backend.ast.*;
import org.jetbrains.kotlin.js.backend.ast.JsLiteral.JsBooleanLiteral;
import org.jetbrains.kotlin.js.backend.ast.JsBooleanLiteral;
import org.jetbrains.kotlin.js.backend.ast.metadata.HasMetadata;
import com.google.gwt.dev.js.parserExceptions.JsParserException;
import com.google.gwt.dev.js.rhino.*;
@@ -29,7 +29,6 @@ import java.util.List;
public class JsAstMapper {
private final JsProgram program;
private final ScopeContext scopeContext;
@NotNull
@@ -37,7 +36,6 @@ public class JsAstMapper {
public JsAstMapper(@NotNull JsScope scope, @NotNull String fileName) {
scopeContext = new ScopeContext(scope);
program = scope.getProgram();
this.fileName = fileName;
}
@@ -126,7 +124,7 @@ public class JsAstMapper {
return mapConditional(node);
case TokenStream.STRING:
return program.getStringLiteral(node.getString());
return new JsStringLiteral(node.getString());
case TokenStream.NUMBER_INT:
return mapIntNumber(node);
@@ -348,7 +346,7 @@ public class JsAstMapper {
// Iterate over and map the arguments.
//
List<JsExpression> arguments = new SmartList<JsExpression>();
List<JsExpression> arguments = new SmartList<>();
from = from.getNext();
while (from != null) {
arguments.add(mapExpression(from));
@@ -696,12 +694,12 @@ public class JsAstMapper {
return newExpr;
}
private JsExpression mapIntNumber(Node numberNode) {
return program.getNumberLiteral((int) numberNode.getDouble());
private static JsExpression mapIntNumber(Node numberNode) {
return new JsIntLiteral((int) numberNode.getDouble());
}
private JsExpression mapDoubleNumber(Node numberNode) {
return program.getNumberLiteral(numberNode.getDouble());
private static JsExpression mapDoubleNumber(Node numberNode) {
return new JsDoubleLiteral(numberNode.getDouble());
}
private JsExpression mapObjectLit(Node objLitNode) throws JsParserException {
@@ -762,22 +760,22 @@ public class JsAstMapper {
return new JsPrefixOperation(op, to);
}
private JsExpression mapPrimary(Node node) throws JsParserException {
private static JsExpression mapPrimary(Node node) throws JsParserException {
switch (node.getIntDatum()) {
case TokenStream.THIS:
return JsLiteral.THIS;
return new JsThisRef();
case TokenStream.TRUE:
return JsBooleanLiteral.TRUE;
return new JsBooleanLiteral(true);
case TokenStream.FALSE:
return JsBooleanLiteral.FALSE;
return new JsBooleanLiteral(false);
case TokenStream.NULL:
return JsNullLiteral.NULL;
return new JsNullLiteral();
case TokenStream.UNDEFINED:
return JsLiteral.UNDEFINED;
return new JsNameRef("undefined");
default:
throw createParserException("Unknown primary: " + node.getIntDatum(),
@@ -926,7 +924,7 @@ public class JsAstMapper {
public List<JsStatement> mapStatements(Node nodeStmts)
throws JsParserException {
List<JsStatement> stmts = new ArrayList<JsStatement>();
List<JsStatement> stmts = new ArrayList<>();
mapStatements(stmts, nodeStmts);
return stmts;
}