object type handling improvements

Author: mcmonkey4eva

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

@@ -2,8 +2,7 @@
 
 import com.denizenscript.denizen2core.commands.CommandQueue;
 import com.denizenscript.denizen2core.tags.AbstractTagObject;
-import com.denizenscript.denizen2core.tags.objects.IntegerTag;
-import com.denizenscript.denizen2core.tags.objects.TextTag;
+import com.denizenscript.denizen2core.tags.objects.*;
 import com.denizenscript.denizen2core.DebugMode;
 import com.denizenscript.denizen2core.utilities.Action;
 
@@ -12,16 +11,42 @@
 public class TextArgumentBit extends ArgumentBit {
 
     public TextArgumentBit(String inputText, boolean quoted) {
-        AbstractTagObject obj;
+        wasQuoted = quoted;
         try {
-            Long l = Long.parseLong(inputText);
-            obj = new IntegerTag(l);
+            long l = Long.parseLong(inputText);
+            if (String.valueOf(l).equals(inputText)) {
+                value = new IntegerTag(l);
+                return;
+            }
         }
         catch (NumberFormatException ex) {
-            obj = new TextTag(inputText);
+            // Ignore
         }
-        value = obj;
-        wasQuoted = quoted;
+        try {
+            double d = Double.parseDouble(inputText);
+            if (String.valueOf(d).equals(inputText)) {
+                value = new NumberTag(d);
+                return;
+            }
+        }
+        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;
+        }
+        value = new TextTag(inputText);
+    }
+
+    public static void noAction(String err) {
+        // Ignore
     }
 
     public AbstractTagObject value;

src/main/java/com/denizenscript/denizen2core/tags/objects/ScriptTag.java

@@ -10,7 +10,6 @@
 import com.denizenscript.denizen2core.utilities.yaml.StringHolder;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Set;
 
 public class ScriptTag extends AbstractTagObject {
@@ -90,25 +89,21 @@ public CommandScript getInternal() {
             return new TextTag(val);
         });
         // <--ScriptTag
-        // @Name YamlTag.read_list[<TextTag>]
+        // @Name ScriptTag.yaml_list[<TextTag>]
         // @Updated 2017/04/27
         // @Group Identification
         // @ReturnType ListTag
-        // @Returns the contents of the YAML key, as a list of text.
+        // @Returns the contents of the YAML key, as a list of tag objects.
         // -->
         handlers.put("yaml_list", (dat, obj) -> {
-            List<String> val = ((ScriptTag) obj).internal.contents.getStringList(dat.getNextModifier().toString());
+            ListTag val = ((ScriptTag) obj).internal.contents.getListTag(dat.getNextModifier().toString());
             if (val == null) {
                 if (!dat.hasFallback()) {
                     dat.error.run("No valid list at the specified YAML key! Does it exist?");
                 }
                 return new NullTag();
             }
-            ListTag list = new ListTag();
-            for (String str : val) {
-                list.getInternal().add(new TextTag(str));
-            }
-            return list;
+            return val;
         });
         // <--[tag]
         // @Since 0.3.0

src/main/java/com/denizenscript/denizen2core/utilities/yaml/YAMLConfiguration.java

@@ -1,5 +1,10 @@
 package com.denizenscript.denizen2core.utilities.yaml;
 
+import com.denizenscript.denizen2core.arguments.TextArgumentBit;
+import com.denizenscript.denizen2core.tags.AbstractTagObject;
+import com.denizenscript.denizen2core.tags.objects.ListTag;
+import com.denizenscript.denizen2core.tags.objects.MapTag;
+import com.denizenscript.denizen2core.tags.objects.TextTag;
 import com.denizenscript.denizen2core.utilities.CoreUtilities;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -225,6 +230,36 @@ public boolean isList(String path) {
         return true;
     }
 
+    public AbstractTagObject objectFor(Object obj) {
+        if (obj instanceof List) {
+            return listify((List<Object>) obj);
+        }
+        if (obj instanceof Map) {
+            return mapify((Map<Object, Object>) obj);
+        }
+        return new TextArgumentBit(obj.toString(), false).value;
+    }
+
+    public MapTag mapify(Map<Object, Object> map) {
+        MapTag mt = new MapTag();
+        for (Map.Entry<Object, Object> entry : map.entrySet()) {
+            mt.getInternal().put(CoreUtilities.toLowerCase(entry.getKey().toString()), objectFor(entry.getValue()));
+        }
+        return mt;
+    }
+
+    public ListTag listify(List<Object> list) {
+        ListTag lt = new ListTag();
+        for (Object obj : list) {
+            lt.getInternal().add(objectFor(obj));
+        }
+        return lt;
+    }
+
+    public ListTag getListTag(String path) {
+        return listify(getList(path));
+    }
+
     public List<Object> getList(String path) {
         Object o = get(path);
         if (o == null) {