Johannes/java-commons
Johannes
/
java-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

muScript: support contains on lists
ci/woodpecker/push/woodpecker Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-03-12 16:48:16 +01:00
parent 60fdea1457
commit 5a1329b884
Signed by: Johannes
GPG Key ID: E76429612C2929F4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
muscript/src/main/java/io/gitlab/jfronny/muscript/StandardLib.java
View File

@ -121,7 +121,8 @@ public class StandardLib {
public static DBool contains(DList args) {
if (args.size() != 2) throw new IllegalArgumentException("Invalid number of arguments for contains: expected 2 but got " + args.size());
return of(args.get(0).asString().getValue().contains(args.get(1).asString().getValue()));
if (args.get(0) instanceof DList list) return of(list.getValue().contains(args.get(1)));
else return of(args.get(0).asString().getValue().contains(args.get(1).asString().getValue()));
}
public static DString replace(DList args) {

8
muscript/src/test/java/io/gitlab/jfronny/muscript/test/ListTest.java
View File

@ -12,4 +12,12 @@ class ListTest {
assertTrue(bool("list[1] < 3"));
assertTrue(bool("list[2] || list[0] == '3true'"));
}
@Test
void contains() {
assertFalse(bool("numbers::contains(',')"));
assertFalse(bool("numbers::contains('1,')"));
assertFalse(bool("numbers::contains('1')"));
assertTrue(bool("numbers::contains(1)"));
}
}