From c35e3b1f78ee843a889b9ba524f668b6f9b52113 Mon Sep 17 00:00:00 2001 From: Skydark Chen Date: Mon, 30 Nov 2015 19:14:20 +0800 Subject: [PATCH] Squashed commit of the following: commit 0a3f5772b9450672fb033a6306fbf7fb0d972d5c Author: Skydark Chen Date: Fri Nov 27 10:54:46 2015 +0800 Fix for-each iterator It should not pop from stack at the end while compiling. commit 07c057e7502eb51ab3e6088eb2aee9ceb7d07576 Author: Skydark Chen Date: Tue Nov 24 11:45:07 2015 +0800 Fix non-int type arithmetic compare It was an error if we compare two double/float/long in scripts since the bytecode compiled in ExpressionArithmeticCompare.java were ICMPEQ/ICMPNE/... which assumed that two expressions had an int type. commit 941b32c8be2a1c668064b0f04955874bc35aec13 Author: Skydark Chen Date: Sun Nov 15 21:24:25 2015 +0800 Fix ZenGetter and ZenSetter annotations Before this commit, ZenGetter and ZenSetter in ZenExpansion could not be defined. Since ZenExpansion requires static methods to work, but the getters and setters will be invoked as virtual. commit bd55380b5a1814e454c519eb0651658d3d9aac2e Author: Skydark Chen Date: Sun Nov 15 19:58:21 2015 +0800 Fix block comments regexp Before this commit, comments like this could not be recognized: /* blah blah * blah / <- this slash failed */ commit 2924666ad4e245a116851edc1d4338f2b78ab329 Author: Skydark Chen Date: Sun Nov 15 19:44:02 2015 +0800 Add support to return void in a function * statement `return;` is valid now. * functions return void by default, an explicit return is not necessary now commit 33c2bd0c945c700c3d7cbb6c792a0862ed0bb438 Author: Skydark Chen Date: Sat Nov 14 13:48:53 2015 +0800 Add unicode support for zenscripts The unicode characters can be recognized in strings and comments. The encoding of scripts should be utf-8. commit 89b2548d020930983b0c0d6d1dfa533ab5d335ac Author: Skydark Chen Date: Thu Nov 12 23:39:25 2015 +0800 Fix nested foreach loop cause out of index --- .../src/main/java/minetweaker/runtime/MTTweaker.java | 2 +- .../main/java/stanhebben/zenscript/ZenTokener.java | 2 +- .../expression/ExpressionArithmeticCompare.java | 3 +++ .../zenscript/expression/ExpressionJavaLambda.java | 1 + .../main/java/stanhebben/zenscript/parser/NFA.java | 6 ++++++ .../java/stanhebben/zenscript/parser/TokenStream.java | 11 ++++++++--- .../stanhebben/zenscript/statements/Statement.java | 5 ++++- .../zenscript/statements/StatementForeach.java | 1 + .../zenscript/type/expand/ZenExpandMember.java | 4 ++-- .../zenscript/type/iterator/IteratorIterable.java | 1 - .../zenscript/type/iterator/IteratorList.java | 6 +++--- 11 files changed, 30 insertions(+), 12 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java index 324c138..1316c13 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java @@ -128,7 +128,7 @@ public class MTTweaker implements ITweaker { while (script.next()) { Reader reader = null; try { - reader = new InputStreamReader(new BufferedInputStream(script.open())); + reader = new InputStreamReader(new BufferedInputStream(script.open()), "UTF-8"); String filename = script.getName(); String className = extractClassName(filename); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java b/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java index e143163..aae6f6e 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/ZenTokener.java @@ -95,7 +95,7 @@ public class ZenTokener extends TokenStream { private static final String[] REGEXPS = { "#[^\n]*[\n\\e]", "//[^\n]*[\n\\e]", - "/\\*[^\\*]*(\\*[^/]*)*\\*/", + "/\\*[^\\*]*(\\*|\\*[^/\\*][^\\*]*)*\\*/", "[ \t\r\n]*", "[a-zA-Z_][a-zA-Z_0-9]*", "\\-?(0|[1-9][0-9]*)\\.[0-9]+([eE][\\+\\-]?[0-9]+)?", diff --git a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionArithmeticCompare.java b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionArithmeticCompare.java index 1381e9c..f40608d 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionArithmeticCompare.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionArithmeticCompare.java @@ -69,10 +69,13 @@ public class ExpressionArithmeticCompare extends Expression { if (a.getType() == ZenTypeLong.INSTANCE) { output.lCmp(); + output.iConst0(); } else if (a.getType() == ZenTypeFloat.INSTANCE) { output.fCmp(); + output.iConst0(); } else if (a.getType() == ZenTypeDouble.INSTANCE) { output.dCmp(); + output.iConst0(); } else if (a.getType() == ZenTypeByte.INSTANCE || a.getType() == ZenTypeShort.INSTANCE || a.getType() == ZenTypeInt.INSTANCE) { diff --git a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java index 2b23f87..4656124 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/expression/ExpressionJavaLambda.java @@ -90,6 +90,7 @@ public class ExpressionJavaLambda extends Expression { for (Statement statement : statements) { statement.compile(environmentMethod); } + output.ret(); output.end(); environment.putClass(clsName, cw.toByteArray()); diff --git a/ZenScript/src/main/java/stanhebben/zenscript/parser/NFA.java b/ZenScript/src/main/java/stanhebben/zenscript/parser/NFA.java index 8cf6ef9..c461dd0 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/parser/NFA.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/parser/NFA.java @@ -21,6 +21,10 @@ public class NFA { public static final int NOFINAL = Integer.MIN_VALUE; public static final int EPSILON = Integer.MIN_VALUE + 1; + /* UNICODE_ESCAPE should be between 128 and 256, so unicode chars can be + matched by regexp like '.' and '[^a]' and not by '[a-zA-Z]' */ + public static final int UNICODE_ESCAPE = 256; + private final NFAState initial; private HashMap converted; @@ -318,6 +322,8 @@ public class NFA { /* Processes a single character */ private int processChar(CharStream stream) { if (stream.optional('\\')) { + if (stream.optional('u')) + return UNICODE_ESCAPE; if (stream.optional('e')) return -1; if (stream.optional('r')) diff --git a/ZenScript/src/main/java/stanhebben/zenscript/parser/TokenStream.java b/ZenScript/src/main/java/stanhebben/zenscript/parser/TokenStream.java index ca3ca1a..21145e0 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/parser/TokenStream.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/parser/TokenStream.java @@ -212,12 +212,17 @@ public class TokenStream implements Iterator { StringBuilder value = new StringBuilder(); int tLine = line; int tLineOffset = lineOffset; - while (dfa.transitions[state].containsKey(nextChar)) { - value.append((char) nextChar); - state = dfa.transitions[state].get(nextChar); + int _fakeNextChar = nextChar > 127 ? NFA.UNICODE_ESCAPE : nextChar; + while (dfa.transitions[state].containsKey(_fakeNextChar)) { + if (nextChar < 0) + value.append((char) nextChar); + else + value.appendCodePoint(nextChar); + state = dfa.transitions[state].get(_fakeNextChar); line = reader.line; lineOffset = reader.lineOffset; nextChar = reader.read(); + _fakeNextChar = nextChar > 127 ? NFA.UNICODE_ESCAPE : nextChar; } if (line < 0) diff --git a/ZenScript/src/main/java/stanhebben/zenscript/statements/Statement.java b/ZenScript/src/main/java/stanhebben/zenscript/statements/Statement.java index 4ab266c..d78c24e 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/statements/Statement.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/statements/Statement.java @@ -26,7 +26,10 @@ public abstract class Statement { } case T_RETURN: { parser.next(); - ParsedExpression expression = ParsedExpression.read(parser, environment); + ParsedExpression expression = null; + if (parser.peek() != null && !parser.isNext(T_SEMICOLON)) { + expression = ParsedExpression.read(parser, environment); + } parser.required(T_SEMICOLON, "; expected"); return new StatementReturn(next.getPosition(), returnType, expression); } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java index 7fbbd66..12a244b 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/statements/StatementForeach.java @@ -57,5 +57,6 @@ public class StatementForeach extends Statement { body.compile(local); iterator.compilePostIterate(localVariables, exit, repeat); methodOutput.label(exit); + iterator.compileEnd(); } } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java b/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java index 1fdad05..2f9a468 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/expand/ZenExpandMember.java @@ -77,12 +77,12 @@ public class ZenExpandMember { @Override public Expression eval(IEnvironmentGlobal environment) { - return new ExpressionCallVirtual(position, environment, getter, value.eval(environment)); + return new ExpressionCallStatic(position, environment, getter, value.eval(environment)); } @Override public Expression assign(ZenPosition position, IEnvironmentGlobal environment, Expression other) { - return new ExpressionCallVirtual(position, environment, setter, value.eval(environment), other); + return new ExpressionCallStatic(position, environment, setter, value.eval(environment), other); } @Override diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorIterable.java b/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorIterable.java index 01fb718..855b7e0 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorIterable.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorIterable.java @@ -61,6 +61,5 @@ public class IteratorIterable implements IZenIterator { @Override public void compileEnd() { - methodOutput.pop(); } } diff --git a/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorList.java b/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorList.java index b75ef28..a4c231a 100644 --- a/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorList.java +++ b/ZenScript/src/main/java/stanhebben/zenscript/type/iterator/IteratorList.java @@ -39,15 +39,16 @@ public class IteratorList implements IZenIterator { @Override public void compilePreIterate(int[] locals, Label exit) { - methodOutput.dup(); + methodOutput.loadObject(iterator); methodOutput.invokeInterface( Iterator.class, "hasNext", boolean.class); methodOutput.ifEQ(exit); - methodOutput.dup(); + methodOutput.loadObject(iterator); methodOutput.invokeInterface(Iterator.class, "next", Object.class); + methodOutput.checkCast(iteratorType.toASMType().getInternalName()); methodOutput.store(iteratorType.toASMType(), locals[1]); } @@ -59,7 +60,6 @@ public class IteratorList implements IZenIterator { @Override public void compileEnd() { - methodOutput.pop(); } @Override