Merge pull request #46 from gnembon/comments

pretty
This commit is contained in:
gnembon authored and GitHub committed 2019-07-03 22:28:27 -03:00
commit b56eb7403b
3 files changed
-8

No files matched your search

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