eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further minification

Browse Source
This commit is contained in:
konsoletyper 2015-02-13 22:58:44 +04:00
parent a4d948f26b
commit f35f06097c
2 changed files with 46 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
teavm-core/src/main/java/org/teavm/javascript/Renderer.java
View File

@ -40,6 +40,7 @@ import org.teavm.model.*;
*/ */
public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext { public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext {
private static final String variableNames = "abcdefghijkmnopqrstuvwxyz"; private static final String variableNames = "abcdefghijkmnopqrstuvwxyz";
private static final String variablePartNames = "abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
private NamingStrategy naming; private NamingStrategy naming;
private SourceWriter writer; private SourceWriter writer;
private ListableClassHolderSource classSource; private ListableClassHolderSource classSource;
@ -62,6 +63,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
private Associativity associativity; private Associativity associativity;
private boolean wasGrouped; private boolean wasGrouped;
private Deque<OperatorPrecedence> precedenceStack = new ArrayDeque<>(); private Deque<OperatorPrecedence> precedenceStack = new ArrayDeque<>();
private Map<String, String> blockIdMap = new HashMap<>();
private static class OperatorPrecedence { private static class OperatorPrecedence {
Priority priority; Priority priority;
@ -285,28 +287,37 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
try { try {
writer.append("function ").appendClass(cls.getName()).append("()").ws().append("{") writer.append("function ").appendClass(cls.getName()).append("()").ws().append("{")
.indent().softNewLine(); .indent().softNewLine();
if (cls.getParentName() != null) { boolean thisAliased = false;
writer.appendClass(cls.getParentName()).append(".call(this);").softNewLine(); List<FieldNode> nonStaticFields = new ArrayList<>();
} List<FieldNode> staticFields = new ArrayList<>();
for (FieldNode field : cls.getFields()) { for (FieldNode field : cls.getFields()) {
if (field.getModifiers().contains(NodeModifier.STATIC)) { if (field.getModifiers().contains(NodeModifier.STATIC)) {
continue; staticFields.add(field);
} else {
nonStaticFields.add(field);
} }
}
if (nonStaticFields.size() > 1) {
thisAliased = true;
writer.append("var a").ws().append("=").ws().append("this;").ws();
}
if (cls.getParentName() != null) {
writer.appendClass(cls.getParentName()).append(".call(").append(thisAliased ? "a" : "this")
.append(");").softNewLine();
}
for (FieldNode field : nonStaticFields) {
Object value = field.getInitialValue(); Object value = field.getInitialValue();
if (value == null) { if (value == null) {
value = getDefaultValue(field.getType()); value = getDefaultValue(field.getType());
} }
FieldReference fieldRef = new FieldReference(cls.getName(), field.getName()); FieldReference fieldRef = new FieldReference(cls.getName(), field.getName());
writer.append("this.").appendField(fieldRef).ws().append("=").ws().append(constantToString(value)) writer.append(thisAliased ? "a" : "this").append(".").appendField(fieldRef).ws()
.append(";").softNewLine(); .append("=").ws().append(constantToString(value)).append(";").softNewLine();
debugEmitter.addField(field.getName(), naming.getNameFor(fieldRef)); debugEmitter.addField(field.getName(), naming.getNameFor(fieldRef));
} }
writer.outdent().append("}").newLine(); writer.outdent().append("}").newLine();
for (FieldNode field : cls.getFields()) { for (FieldNode field : staticFields) {
if (!field.getModifiers().contains(NodeModifier.STATIC)) {
continue;
}
Object value = field.getInitialValue(); Object value = field.getInitialValue();
if (value == null) { if (value == null) {
value = getDefaultValue(field.getType()); value = getDefaultValue(field.getType());
@ -489,15 +500,15 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
writer.append(variableName(i)); writer.append(variableName(i));
} }
writer.append(")").ws().append("{").softNewLine().indent(); writer.append(")").ws().append("{").softNewLine().indent();
writer.append("var result").ws().append("=").ws().append("new ").appendClass( writer.append("var $r").ws().append("=").ws().append("new ").appendClass(
ref.getClassName()).append("();").softNewLine(); ref.getClassName()).append("();").softNewLine();
writer.append(naming.getFullNameFor(ref)).append("(result"); writer.append(naming.getFullNameFor(ref)).append("($r");
for (int i = 1; i <= ref.parameterCount(); ++i) { for (int i = 1; i <= ref.parameterCount(); ++i) {
writer.append(",").ws(); writer.append(",").ws();
writer.append(variableName(i)); writer.append(variableName(i));
} }
writer.append(");").softNewLine(); writer.append(");").softNewLine();
writer.append("return result;").softNewLine(); writer.append("return $r;").softNewLine();
writer.outdent().append("}").newLine(); writer.outdent().append("}").newLine();
debugEmitter.emitMethod(null); debugEmitter.emitMethod(null);
} }
@ -550,6 +561,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
} }
public void renderBody(MethodNode method, boolean inner) throws IOException { public void renderBody(MethodNode method, boolean inner) throws IOException {
blockIdMap.clear();
MethodReference ref = method.getReference(); MethodReference ref = method.getReference();
debugEmitter.emitMethod(ref.getDescriptor()); debugEmitter.emitMethod(ref.getDescriptor());
if (inner) { if (inner) {
@ -852,7 +864,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
pushLocation(statement.getValue().getLocation()); pushLocation(statement.getValue().getLocation());
} }
if (statement.getId() != null) { if (statement.getId() != null) {
writer.append(statement.getId()).append(": "); writer.append(mapBlockId(statement.getId())).append(":").ws();
} }
prevCallSite = debugEmitter.emitCallSite(); prevCallSite = debugEmitter.emitCallSite();
writer.append("switch").ws().append("("); writer.append("switch").ws().append("(");
@ -895,7 +907,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
pushLocation(statement.getCondition().getLocation()); pushLocation(statement.getCondition().getLocation());
} }
if (statement.getId() != null) { if (statement.getId() != null) {
writer.append(statement.getId()).append(":").ws(); writer.append(mapBlockId(statement.getId())).append(":").ws();
} }
writer.append("while").ws().append("("); writer.append("while").ws().append("(");
if (statement.getCondition() != null) { if (statement.getCondition() != null) {
@ -920,10 +932,25 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
} }
} }
private String mapBlockId(String id) {
String name = blockIdMap.get(id);
if (name == null) {
StringBuilder sb = new StringBuilder();
int index = blockIdMap.size();
do {
sb.append(variablePartNames.charAt(index % variableNames.length()));
index /= variablePartNames.length();
} while (index > 0);
name = "$b" + sb;
blockIdMap.put(id, name);
}
return name;
}
@Override @Override
public void visit(BlockStatement statement) { public void visit(BlockStatement statement) {
try { try {
writer.append(statement.getId()).append(":").ws().append("{").softNewLine().indent(); writer.append(mapBlockId(statement.getId())).append(":").ws().append("{").softNewLine().indent();
for (Statement part : statement.getBody()) { for (Statement part : statement.getBody()) {
part.acceptVisitor(this); part.acceptVisitor(this);
} }
@ -942,7 +969,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
} }
writer.append("break"); writer.append("break");
if (statement.getTarget() != null) { if (statement.getTarget() != null) {
writer.append(' ').append(statement.getTarget().getId()); writer.append(' ').append(mapBlockId(statement.getTarget().getId()));
} }
writer.append(";").softNewLine(); writer.append(";").softNewLine();
if (statement.getLocation() != null) { if (statement.getLocation() != null) {
@ -962,7 +989,7 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext
} }
writer.append("continue"); writer.append("continue");
if (statement.getTarget() != null) { if (statement.getTarget() != null) {
writer.append(' ').append(statement.getTarget().getId()); writer.append(' ').append(mapBlockId(statement.getTarget().getId()));
} }
writer.append(";").softNewLine(); writer.append(";").softNewLine();
if (statement.getLocation() != null) { if (statement.getLocation() != null) {

2
teavm-jso/src/main/java/org/teavm/jso/plugin/JSOAliasRenderer.java
View File

@ -61,6 +61,6 @@ class JSOAliasRenderer implements RendererListener {
.append(";").softNewLine(); .append(";").softNewLine();
} }
} }
writer.outdent().append("})();").softNewLine(); writer.outdent().append("})();").newLine();
} }
} }