From 15572cdd7aee74b90c7abd05110294deb859f96f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 9 Aug 2020 18:33:59 -0400 Subject: [PATCH] Optional asm parameters for text --- .../mindustry/annotations/misc/LogicStatementProcessor.java | 3 ++- core/src/mindustry/logic/LExecutor.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java b/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java index 9286bffe85..8fb1bc6122 100644 --- a/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java +++ b/annotations/src/main/java/mindustry/annotations/misc/LogicStatementProcessor.java @@ -77,7 +77,8 @@ public class LogicStatementProcessor extends BaseProcessor{ ""); //reading primitives, strings and enums is supported; nothing else is - reader.addStatement("result.$L = $L(tokens[$L])$L", + reader.addStatement("if(tokens.length > $L) result.$L = $L(tokens[$L])$L", + index + 1, field.name(), field.mirror().toString().equals("java.lang.String") ? "" : (field.tname().isPrimitive() ? field.tname().box().toString() : diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java index d1af571fd8..9abe2b7f8e 100644 --- a/core/src/mindustry/logic/LExecutor.java +++ b/core/src/mindustry/logic/LExecutor.java @@ -244,7 +244,7 @@ public class LExecutor{ } public static class BinaryOpI implements LInstruction{ - public BinaryOp op; + public BinaryOp op = BinaryOp.add; public int a, b, dest; public BinaryOpI(BinaryOp op, int a, int b, int dest){ @@ -263,7 +263,7 @@ public class LExecutor{ } public static class UnaryOpI implements LInstruction{ - public UnaryOp op; + public UnaryOp op = UnaryOp.negate; public int value, dest; public UnaryOpI(UnaryOp op, int value, int dest){