Tag system cleaning

Author: mcmonkey4eva

src/main/java/com/denizenscript/denizen2core/Denizen2Core.java

@@ -181,7 +181,7 @@ public static void init(Denizen2Implementation impl) {
         register(new WaitCommand());
         register(new WhileCommand());
         // Common Tag Handlers
-        register(new BooleanTagBase());
+        register(BooleanTag.getForBooleanBase());
         register(new DefExistsTagBase());
         register(new DefTagBase());
         register(new DurationTagBase());
@@ -236,7 +236,7 @@ public static AbstractTagObject loadFromSaved(Action<String> error, String str)
         if (!customSaveLoaders.containsKey(typed)) {
             error.run("No save loader for the specified type: " + ColorSet.emphasis + typed + ColorSet.warning + "! "
                     + "May be invalid input to a saves loader?");
-            return new NullTag();
+            return NullTag.NULL;
         }
         return customSaveLoaders.get(typed).apply(error, dat.get(1));
     }

src/main/java/com/denizenscript/denizen2core/arguments/Argument.java

@@ -55,7 +55,7 @@ public AbstractTagObject parse(CommandQueue queue, HashMap<String, AbstractTagOb
         }
         StringBuilder sb = new StringBuilder();
         for (ArgumentBit bit : bits) {
-            sb.append(bit.parse(queue, vars, mode, error));
+            sb.append(bit.parse(queue, vars, mode, error).toString());
         }
         return new TextTag(sb.toString());
     }

src/main/java/com/denizenscript/denizen2core/arguments/TagArgumentBit.java

@@ -58,7 +58,7 @@ public AbstractTagObject parse(CommandQueue queue, HashMap<String, AbstractTagOb
             if (fallback == null) {
                 error.run("Invalid tag bits -> empty tag, or invalid base: " + ColorSet.emphasis + (bits.length > 0 ? bits[0] : ""));
             }
-            res = new NullTag();
+            res = NullTag.NULL;
         }
         else {
             TagData data = new TagData(error, bits, fallback, vars, mode, queue);

src/main/java/com/denizenscript/denizen2core/arguments/TextArgumentBit.java

@@ -11,6 +11,10 @@
 public class TextArgumentBit extends ArgumentBit {
 
     public TextArgumentBit(String inputText, boolean quoted) {
+        this(inputText, quoted, true);
+    }
+
+    public TextArgumentBit(String inputText, boolean quoted, boolean depthAllowed) {
         wasQuoted = quoted;
         try {
             long l = Long.parseLong(inputText);
@@ -32,15 +36,17 @@ public TextArgumentBit(String inputText, boolean quoted) {
         catch (NumberFormatException ex) {
             // Ignore
         }
-        ListTag ltTest = ListTag.getFor(TextArgumentBit::noAction, inputText);
-        if (ltTest != null && ltTest.toString().equals(inputText)) {
-            value = ltTest;
-            return;
-        }
-        MapTag mtTest = MapTag.getFor(TextArgumentBit::noAction, inputText);
-        if (mtTest != null && mtTest.toString().equals(inputText)) {
-            value = mtTest;
-            return;
+        if (depthAllowed) {
+            ListTag ltTest = ListTag.getFor(TextArgumentBit::noAction, inputText);
+            if (ltTest != null && ltTest.toString().equals(inputText)) {
+                value = ltTest;
+                return;
+            }
+            MapTag mtTest = MapTag.getFor(TextArgumentBit::noAction, inputText);
+            if (mtTest != null && mtTest.toString().equals(inputText)) {
+                value = mtTest;
+                return;
+            }
         }
         value = new TextTag(inputText);
     }

src/main/java/com/denizenscript/denizen2core/commands/queuecommands/DetermineCommand.java

@@ -59,7 +59,7 @@ public boolean isProcedural() {
     @Override
     public void execute(CommandQueue queue, CommandEntry entry) {
         String det = CoreUtilities.toLowerCase(entry.getArgumentObject(queue, 0).toString());
-        AbstractTagObject ato = new BooleanTag(true);
+        AbstractTagObject ato = BooleanTag.getForBoolean(true);
         if (entry.arguments.size() > 1) {
             ato = entry.getArgumentObject(queue, 1);
         }

src/main/java/com/denizenscript/denizen2core/commands/queuecommands/ForeachCommand.java

@@ -86,7 +86,7 @@ public void execute(CommandQueue queue, CommandEntry entry) {
                 queue.commandStack.peek().goTo(entry.blockStart);
             }
             else {
-                queue.commandStack.peek().setDefinition(fcd.resName, new NullTag());
+                queue.commandStack.peek().removeDefinition(fcd.resName);
                 if (queue.shouldShowGood()) {
                     queue.outGood("Foreach completed!");
                 }

src/main/java/com/denizenscript/denizen2core/events/ScriptEvent.java

@@ -153,7 +153,7 @@ else if (loaded) {
     public HashMap<String, AbstractTagObject> getDefinitions(ScriptEventData data) {
         HashMap<String, AbstractTagObject> defs = new HashMap<>();
         defs.put("priority", new IntegerTag(data.priority));
-        defs.put("cancelled", new BooleanTag(cancelled));
+        defs.put("cancelled", BooleanTag.getForBoolean(cancelled));
         return defs;
     }
 

src/main/java/com/denizenscript/denizen2core/tags/AbstractTagObject.java

@@ -22,7 +22,7 @@ public AbstractTagObject handle(TagData data) {
         if (ato != null) {
             return ato.handle(data);
         }
-        return new NullTag();
+        return NullTag.NULL;
     }
 
     public abstract AbstractTagObject handleElseCase(TagData data);

src/main/java/com/denizenscript/denizen2core/tags/TagData.java

@@ -4,7 +4,9 @@
 import com.denizenscript.denizen2core.arguments.Argument;
 import com.denizenscript.denizen2core.arguments.TagBit;
 import com.denizenscript.denizen2core.commands.CommandQueue;
+import com.denizenscript.denizen2core.tags.objects.NullTag;
 import com.denizenscript.denizen2core.utilities.Action;
+import com.denizenscript.denizen2core.utilities.debugging.ColorSet;
 
 import java.util.HashMap;
 
@@ -43,6 +45,10 @@ public TagData shrink() {
         return this;
     }
 
+    public int currentIndex() {
+        return cInd;
+    }
+
     public int remaining() {
         return bits.length - cInd;
     }
@@ -56,6 +62,10 @@ public boolean hasNextModifier() {
     }
 
     public AbstractTagObject getNextModifier() {
+        if (bits[cInd].variable == null) {
+            error.run("No tag modifier given when required for tag part " + ColorSet.emphasis + bits[cInd].key);
+            return NullTag.NULL;
+        }
         return bits[cInd].variable.parse(currentQueue, variables, dbmode, error);
     }
 }

src/main/java/com/denizenscript/denizen2core/tags/handlers/DefExistsTagBase.java

@@ -28,8 +28,8 @@ public AbstractTagObject handle(TagData data) {
             obj = data.currentQueue.commandStack.peek().getDefinition(def);
         }
         if (obj == null) {
-            return new BooleanTag(false).handle(data.shrink());
+            return BooleanTag.getForBoolean(false).handle(data.shrink());
         }
-        return new BooleanTag(true).handle(data.shrink());
+        return BooleanTag.getForBoolean(true).handle(data.shrink());
     }
 }