Tons of changes:

- Added interface to game, client and server
- Added transformations
- Made ingredient conditions more practical to use, no longer requires imports
- Started implementation of event handling
- Moved commands and logic to the common API code
- Added common interface to MineTweaker recipes
- Added string methods
- Moved the logger from static value to static getter
- Fixed crashes on dedicated servers
- Fixed bracket resolution for <id:meta> values in 1.6.4
- Fixed scripts not being sent to multiplayer clients in 1.6.4
This commit is contained in:
Stan Hebben committed 2014-07-04 22:03:03 +02:00
1 parent 7f6235f30d
commit 115593efa5
131 files changed
+3215 -1930

No files matched your search

@@ -12,18 +12,35 @@ import stanhebben.zenscript.ZenParsedFile;
* @author Stan
*/
public class ParseException extends RuntimeException {
private final ZenParsedFile file;
private final int line;
private final int lineOffset;
private final Token token;
private final String message;
public ParseException(Token token, String error) {
super(token == null ? "Error at end of file - " + error : "Error parsing line " + token.getPosition().getLine() + ":" + token.getPosition().getLineOffset() + " - " + error + " (last token: " + token.getValue() + ")");
this.file = token.getPosition().getFile();
this.line = token.getPosition().getLine();
this.lineOffset = token.getPosition().getLineOffset();
this.token = token;
this.message = error;
}
public ParseException(ZenParsedFile file, int line, int lineOffset, String error) {
this.file = file;
this.line = line;
this.lineOffset = lineOffset;
token = null;
message = error;
}
public ZenParsedFile getFile() {
return token == null ? null : token.getPosition().getFile();
return file;
}
public int getLine() {
@@ -76,6 +76,14 @@ public class TokenStream implements Iterator<Token> {
public ZenParsedFile getFile() {
return file;
}
public int getLine() {
return line;
}
public int getLineOffset() {
return lineOffset;
}
public Token peek() {
if (tokenMemoryCurrent < tokenMemoryOffset + tokenMemory.size()) {
@@ -102,7 +110,7 @@ public class TokenStream implements Iterator<Token> {
if (t != null && t.getType() == type) {
return next();
} else {
throw new ParseException(t, error);
throw new ParseException(file, line, lineOffset, error);
}
}
@@ -42,10 +42,24 @@ public abstract class ParsedExpression {
}
private static ParsedExpression readAssignExpression(ZenTokener parser, IEnvironmentGlobal environment) {
ZenPosition position = parser.peek().getPosition();
Token token = parser.peek();
if (token == null) {
ZenPosition position = new ZenPosition(parser.getFile(), parser.getLine(), parser.getLineOffset());
environment.error(position, "unexpected end of file; expression expected");
return new ParsedExpressionInvalid(position);
}
ZenPosition position = token.getPosition();
ParsedExpression left = readConditionalExpression(position, parser, environment);
switch (parser.peek() == null ? -1 : parser.peek().getType()) {
if (parser.peek() == null) {
ZenPosition position2 = new ZenPosition(parser.getFile(), parser.getLine(), parser.getLineOffset());
environment.error(position2, "unexpected end of file - ; expected");
return new ParsedExpressionInvalid(position2);
}
switch (parser.peek().getType()) {
case T_ASSIGN:
parser.next();
return new ParsedExpressionAssign(position, left, readAssignExpression(parser, environment));