List and collection tests.

Author: Moderocky

src/main/java/org/byteskript/skript/compiler/SkriptLangSpec.java

@@ -51,10 +51,7 @@
 import org.byteskript.skript.lang.syntax.flow.loop.WhileSection;
 import org.byteskript.skript.lang.syntax.function.*;
 import org.byteskript.skript.lang.syntax.generic.*;
-import org.byteskript.skript.lang.syntax.list.ClearList;
-import org.byteskript.skript.lang.syntax.list.ImplicitArrayCreator;
-import org.byteskript.skript.lang.syntax.list.IndexOfList;
-import org.byteskript.skript.lang.syntax.list.ListCreator;
+import org.byteskript.skript.lang.syntax.list.*;
 import org.byteskript.skript.lang.syntax.literal.*;
 import org.byteskript.skript.lang.syntax.map.KeyInMap;
 import org.byteskript.skript.lang.syntax.map.MapCreator;
@@ -240,6 +237,7 @@ private SkriptLangSpec() {
             new ThreadExpression(),
             new NewLineExpression(),
             new ResultOfExpression(), // must try before property
+            new SizeOfList(), // must try before property
             new PropertyExpression(),
             new ConverterExpression(),
             new SystemInputExpression(),

src/main/java/org/byteskript/skript/lang/syntax/list/IndexOfList.java

@@ -27,15 +27,15 @@
         """,
     examples = {
         """
-            set {var} index 0 of {list}
-            set {var} index 1 of {array}
+            set {var} index 0 in {list}
+            set {var} index 1 in {array}
                 """
     }
 )
 public class IndexOfList extends RelationalExpression implements Referent {
 
     public IndexOfList() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "index %Number% in [list ]%List%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "index %Number% in [list] %List%");
         try {
             handlers.put(StandardHandlers.GET, ExtractedSyntaxCalls.class.getMethod("getListValue", Object.class, Object.class));
             handlers.put(StandardHandlers.FIND, ExtractedSyntaxCalls.class.getMethod("getListValue", Object.class, Object.class));

src/main/java/org/byteskript/skript/lang/syntax/list/SizeOfList.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021 ByteSkript org (Moderocky)
+ * View the full licence information and permissions:
+ * https://github.com/Moderocky/ByteSkript/blob/master/LICENSE
+ */
+
+package org.byteskript.skript.lang.syntax.list;
+
+import mx.kenzie.foundation.Type;
+import org.byteskript.skript.api.Referent;
+import org.byteskript.skript.api.note.Documentation;
+import org.byteskript.skript.api.syntax.RelationalExpression;
+import org.byteskript.skript.compiler.CommonTypes;
+import org.byteskript.skript.compiler.Context;
+import org.byteskript.skript.compiler.Pattern;
+import org.byteskript.skript.compiler.SkriptLangSpec;
+import org.byteskript.skript.lang.element.StandardElements;
+import org.byteskript.skript.lang.handler.StandardHandlers;
+import org.byteskript.skript.runtime.internal.ExtractedSyntaxCalls;
+
+@Documentation(
+    name = "Size of Collection",
+    description = """
+        Returns the size of a collection.
+        Indices of the collection start at *zero*.
+        """,
+    examples = {
+        """
+            print size of {list}
+                """
+    }
+)
+public class SizeOfList extends RelationalExpression implements Referent {
+    
+    public SizeOfList() {
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "size of [list] %Object%");
+        try {
+            handlers.put(StandardHandlers.GET, ExtractedSyntaxCalls.class.getMethod("getListSize", Object.class));
+            handlers.put(StandardHandlers.FIND, ExtractedSyntaxCalls.class.getMethod("getListSize", Object.class));
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        if (!thing.startsWith("size of ")) return null;
+        return super.match(thing, context);
+    }
+    
+    @Override
+    public boolean allowAsInputFor(Type type) {
+        return super.allowAsInputFor(type);
+    }
+    
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.OBJECT;
+    }
+    
+    @Override
+    public Type getHolderType() {
+        return CommonTypes.LIST;
+    }
+    
+    
+}

src/main/java/org/byteskript/skript/runtime/internal/ExtractedSyntaxCalls.java

@@ -19,6 +19,7 @@
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.lang.reflect.Method;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Future;
@@ -112,18 +113,23 @@ public static void runOnAsyncThread(final Instruction<?> runnable) {
         thread.skript.runOnAsyncThread(runnable);
     }
 
+    public static Object getListSize(Object target) {
+        if (target instanceof Collection list) return list.size();
+        if (target instanceof Object[] list) return list.length;
+        if (target instanceof Map map) return map.size();
+        throw new ScriptRuntimeError("The given collection must be a list.");
+    }
+    
     public static Object getListValue(Object key, Object target) {
-        if (!(key instanceof Number number))
-            throw new ScriptRuntimeError("The given index must be a number.");
+        final Number number = Skript.convert(key, Number.class);
         if (target instanceof List list) return list.get(number.intValue());
         if (target instanceof Object[] list) return list[number.intValue()];
         throw new ScriptRuntimeError("The given collection must be a list.");
     }
 
     @SuppressWarnings("unchecked")
     public static void setListValue(Object key, Object target, Object value) {
-        if (!(key instanceof Number number))
-            throw new ScriptRuntimeError("The given index must be a number.");
+        final Number number = Skript.convert(key, Number.class);
         if (target instanceof List list) {
             list.remove(number.intValue());
             list.add(number.intValue(), value);
@@ -136,8 +142,7 @@ public static void setListValue(Object key, Object target, Object value) {
     }
 
     public static void deleteListValue(Object key, Object target) {
-        if (!(key instanceof Number number))
-            throw new ScriptRuntimeError("The given index must be a number.");
+        final Number number = Skript.convert(key, Number.class);
         if (target instanceof List list) {
             list.remove(number.intValue());
             return;

src/test/resources/tests/clearlist.bsk

@@ -0,0 +1,11 @@
+
+function test:
+    trigger:
+        set {var} to a new list
+        add 1 to {var}
+        assert {var} contains 1
+        clear {var}
+        assert {var} exists
+        assert {var} is a list
+        assert ({var} contains 1) is false
+        return true

src/test/resources/tests/implicitarray.bsk

@@ -0,0 +1,12 @@
+
+function test:
+    trigger:
+        set {var} to (1, 2, 3)
+        assert {var} contains 1
+        try:
+            add 1 to {var}
+        catch {error}:
+        assert {error} exists
+        loop {number} in (1, 2, 3):
+        assert {number} exists
+        return true

src/test/resources/tests/indexinlist.bsk

@@ -0,0 +1,12 @@
+
+function test:
+    trigger:
+        set {var} to a new list
+        add 1 to {var}
+        assert {var} contains 1
+        assert index 0 in {var} is 1
+        add "hello" to {var}
+        assert index 1 in {var} is "hello"
+        set index 1 in {var} to "hello there"
+        assert index 1 in {var} is "hello there"
+        return true

src/test/resources/tests/sizeoflist.bsk

@@ -0,0 +1,11 @@
+
+function test:
+    trigger:
+        set {var} to a new list
+        add 1 to {var}
+        assert {var} contains 1
+        assert size of {var} is 1
+        add "hello" to {var}
+        assert size of {var} is 2
+        assert size of (1, 2, 3) is 3
+        return true