This commit is contained in:
gnembon committed 2019-07-03 22:14:24 -03:00
1 parent 8d61c6a969
commit ed915cbea6
3 files changed
-8

No files matched your search

@@ -147,7 +147,6 @@ public class CarpetScriptServer
setChatErrorSnooper(source); setChatErrorSnooper(source);
CarpetExpression ex = new CarpetExpression(module.getCode(), source, new BlockPos(0, 0, 0)); CarpetExpression ex = new CarpetExpression(module.getCode(), source, new BlockPos(0, 0, 0));
ex.getExpr().asAModule(); ex.getExpr().asAModule();
ex.scriptRunCommand(newHost, new BlockPos(source.getPosition())); ex.scriptRunCommand(newHost, new BlockPos(source.getPosition()));
} }
catch (CarpetExpressionException e) catch (CarpetExpressionException e)
@@ -2590,7 +2590,6 @@ public class Expression implements Cloneable
this.expression = expression.trim(). this.expression = expression.trim().
replaceAll("\\r\\n?", "\n"). replaceAll("\\r\\n?", "\n").
replaceAll(";+$", ""); replaceAll(";+$", "");
//this.expression = expression.replaceAll("\\$", "\n").trim();
VariablesAndConstants(); VariablesAndConstants();
UserDefinedFunctionsAndControlFlow(); UserDefinedFunctionsAndControlFlow();
Operators(); Operators();
@@ -13,7 +13,6 @@ import java.util.List;
*/ */
public class Tokenizer implements Iterator<Tokenizer.Token> public class Tokenizer implements Iterator<Tokenizer.Token>
{ {
/** What character to use for decimal separators. */ /** What character to use for decimal separators. */
private static final char decimalSeparator = '.'; private static final char decimalSeparator = '.';
/** What character to use for minus sign (negative values). */ /** What character to use for minus sign (negative values). */
@@ -24,8 +23,6 @@ public class Tokenizer implements Iterator<Tokenizer.Token>
private int linepos = 0; private int linepos = 0;
private boolean comments; private boolean comments;
private boolean newLinesMarkers; private boolean newLinesMarkers;
/** The original input expression. */ /** The original input expression. */
private String input; private String input;
/** The previous token or <code>null</code> if none. */ /** The previous token or <code>null</code> if none. */
@@ -41,8 +38,6 @@ public class Tokenizer implements Iterator<Tokenizer.Token>
this.newLinesMarkers = allowNewLineMakers; this.newLinesMarkers = allowNewLineMakers;
} }
@Override @Override
public boolean hasNext() public boolean hasNext()
{ {
@@ -226,7 +221,6 @@ public class Tokenizer implements Iterator<Tokenizer.Token>
ch = input.charAt(pos++); ch = input.charAt(pos++);
linepos++; linepos++;
greedyMatch += ch; greedyMatch += ch;
} }
if (ch=='\n') if (ch=='\n')
{ {