- Rewrote the whole damn typecasting system. Now uses a more flexible and more structure casting rule system.

- Improved function literals. Function recipes are a thing!
- Added mirrored shaped recipes
- Fixed a few "any" type - related errors
- Added environment to the bracket handlers. Breaks existing bracket handlers!!
- Turned JavaMethod into an interface. Can now be used both for existing methods and generated ones. Makes a few things simpler :)
- Added creative and adventure getters to player info
This commit is contained in:
Stan Hebben committed 2014-08-20 11:59:49 +02:00
1 parent c67ad22270
commit 154c2242f9
172 files changed
+5400 -2134

No files matched your search

@@ -13,14 +13,14 @@ import stanhebben.zenscript.type.ZenType;
import stanhebben.zenscript.util.ZenPosition;
public abstract class Statement {
public static Statement read(ZenTokener parser, IEnvironmentGlobal environment) {
public static Statement read(ZenTokener parser, IEnvironmentGlobal environment, ZenType returnType) {
Token next = parser.peek();
switch (next.getType()) {
case T_AOPEN: {
Token t = parser.next();
ArrayList<Statement> statements = new ArrayList<Statement>();
while (parser.optional(T_ACLOSE) == null) {
statements.add(read(parser, environment));
statements.add(read(parser, environment, returnType));
}
return new StatementBlock(t.getPosition(), statements);
}
@@ -28,7 +28,7 @@ public abstract class Statement {
parser.next();
ParsedExpression expression = ParsedExpression.read(parser, environment);
parser.required(T_SEMICOLON, "; expected");
return new StatementReturn(next.getPosition(), expression);
return new StatementReturn(next.getPosition(), returnType, expression);
}
case T_VAR:
case T_VAL: {
@@ -49,10 +49,10 @@ public abstract class Statement {
case T_IF: {
Token t = parser.next();
ParsedExpression expression = ParsedExpression.read(parser, environment);
Statement onIf = read(parser, environment);
Statement onIf = read(parser, environment, returnType);
Statement onElse = null;
if (parser.optional(T_ELSE) != null) {
onElse = read(parser, environment);
onElse = read(parser, environment, returnType);
}
return new StatementIf(t.getPosition(), expression, onIf, onElse);
}
@@ -68,7 +68,7 @@ public abstract class Statement {
parser.required(T_IN, "in expected");
ParsedExpression source = ParsedExpression.read(parser, environment);
Statement content = read(parser, environment);
Statement content = read(parser, environment, null);
return new StatementForeach(
t.getPosition(),
names.toArray(new String[names.size()]),