Update literals.

Moderocky · Moderocky · commit c219f77daf57 · 2022-03-30T14:33:36.000+01:00
diff --git a/src/main/java/org/byteskript/skript/compiler/Context.java b/src/main/java/org/byteskript/skript/compiler/Context.java
@@ -103,8 +103,6 @@ public void setStoredVariableName(String storedVariableName) {
     
     public abstract void createTree(ProgrammaticSplitTree tree);
     
-    public abstract <Tree extends ProgrammaticSplitTree> Tree findTree(Class<Tree> type);
-    
     public abstract void closeAllTrees();
     
     public abstract void removeTree(ProgrammaticSplitTree tree);
@@ -154,6 +152,14 @@ public SectionMeta getSection(int index) {
         return sections.get(index);
     }
     
+    public SectionMeta getTriggerSection() {
+        final TriggerTree tree = this.findTree(TriggerTree.class);
+        if (tree == null) return null;
+        return tree.owner();
+    }
+    
+    public abstract <Tree extends ProgrammaticSplitTree> Tree findTree(Class<Tree> type);
+    
     public Section getParent() {
         if (sections.isEmpty()) return null;
         return sections.get(0).handler();
diff --git a/src/main/java/org/byteskript/skript/compiler/ElementTree.java b/src/main/java/org/byteskript/skript/compiler/ElementTree.java
@@ -108,6 +108,22 @@ public void disableCompilation() {
         }
     }
     
+    public void disableChildren() {
+        for (final ElementTree tree : nested) {
+            tree.disableCompilation();
+        }
+    }
+    
+    public <Type> Type getLiteralValue() {
+        if (current instanceof Literal<?> literal) {
+            final Object meta = match.meta();
+            if (meta instanceof String string)
+                return (Type) literal.parse(string);
+            return (Type) meta;
+        }
+        return null;
+    }
+    
     public SyntaxElement current() {
         return current;
     }
diff --git a/src/main/java/org/byteskript/skript/compiler/FileContext.java b/src/main/java/org/byteskript/skript/compiler/FileContext.java
@@ -288,14 +288,6 @@ public void createTree(ProgrammaticSplitTree tree) {
         this.trees.add(0, tree);
     }
     
-    @Override
-    public <Tree extends ProgrammaticSplitTree> Tree findTree(Class<Tree> type) {
-        for (final ProgrammaticSplitTree tree : this.trees) {
-            if (type.isInstance(tree)) return (Tree) tree;
-        }
-        return null;
-    }
-    
     @Override
     public synchronized void closeAllTrees() {
         for (final ProgrammaticSplitTree tree : trees.toArray(new ProgrammaticSplitTree[0])) {
@@ -404,6 +396,14 @@ public ProgrammaticSplitTree getCurrentTree() {
         return trees.isEmpty() ? null : trees.get(0);
     }
     
+    @Override
+    public <Tree extends ProgrammaticSplitTree> Tree findTree(Class<Tree> type) {
+        for (final ProgrammaticSplitTree tree : this.trees) {
+            if (type.isInstance(tree)) return (Tree) tree;
+        }
+        return null;
+    }
+    
     @Override
     public ProgrammaticSplitTree getTree(SectionMeta meta) {
         for (final ProgrammaticSplitTree tree : trees) {
diff --git a/src/main/java/org/byteskript/skript/compiler/Pattern.java b/src/main/java/org/byteskript/skript/compiler/Pattern.java
@@ -119,7 +119,7 @@ public java.util.regex.Pattern[] getCompiledPatterns() {
     }
     
     public Match match(final String thing, final Context context) {
-        return match(thing, context, null);
+        return match(thing, context, thing);
     }
     
     public Match match(final String thing, final Context context, final Object meta) {
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/dictionary/ImportFunctionEffect.java b/src/main/java/org/byteskript/skript/lang/syntax/dictionary/ImportFunctionEffect.java
@@ -12,6 +12,7 @@
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.compiler.structure.Function;
 import org.byteskript.skript.lang.element.StandardElements;
+import org.byteskript.skript.lang.syntax.literal.StringLiteral;
 
 @Documentation(
     name = "Import Function",
@@ -50,7 +51,7 @@ public Pattern.Match match(String thing, Context context) {
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final ElementTree tree = context.getCompileCurrent();
-        final String name = tree.nested()[0].match().meta();
+        final String name = new StringLiteral().parse(tree.nested()[0].match().meta());
         final Type type = tree.nested()[1].match().meta();
         context.registerFunction(new Function(name, type));
         context.setState(CompileState.CODE_BODY);
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/literal/DoubleLiteral.java b/src/main/java/org/byteskript/skript/lang/syntax/literal/DoubleLiteral.java
@@ -68,7 +68,7 @@ public Pattern.Match match(String thing, Context context) {
         final char c = thing.charAt(0);
         if (c != '-' && (c < LOW || c > HIGH)) return null;
         final Matcher matcher = PATTERN.matcher(thing);
-        if (matcher.find()) return new Pattern.Match(matcher);
+        if (matcher.find()) return new Pattern.Match(matcher, thing);
         return null;
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/literal/FloatLiteral.java b/src/main/java/org/byteskript/skript/lang/syntax/literal/FloatLiteral.java
@@ -67,7 +67,7 @@ public Pattern.Match match(String thing, Context context) {
         final char c = thing.charAt(0);
         if (c != '-' && (c < LOW || c > HIGH)) return null;
         final Matcher matcher = PATTERN.matcher(thing);
-        if (matcher.find()) return new Pattern.Match(matcher);
+        if (matcher.find()) return new Pattern.Match(matcher, thing);
         return null;
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/literal/IntegerLiteral.java b/src/main/java/org/byteskript/skript/lang/syntax/literal/IntegerLiteral.java
@@ -71,7 +71,7 @@ public Pattern.Match match(String thing, Context context) {
         final char c = thing.charAt(0);
         if (c != '-' && (c < LOW || c > HIGH)) return null;
         final Matcher matcher = PATTERN.matcher(thing);
-        if (matcher.find()) return new Pattern.Match(matcher);
+        if (matcher.find()) return new Pattern.Match(matcher, thing);
         return null;
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/literal/LongLiteral.java b/src/main/java/org/byteskript/skript/lang/syntax/literal/LongLiteral.java
@@ -68,7 +68,7 @@ public Pattern.Match match(String thing, Context context) {
         final char c = thing.charAt(0);
         if (c != '-' && (c < LOW || c > HIGH)) return null;
         final Matcher matcher = PATTERN.matcher(thing);
-        if (matcher.find()) return new Pattern.Match(matcher);
+        if (matcher.find()) return new Pattern.Match(matcher, thing);
         return null;
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/literal/RegexLiteral.java b/src/main/java/org/byteskript/skript/lang/syntax/literal/RegexLiteral.java
@@ -65,7 +65,7 @@ public Pattern.Match match(String thing, Context context) {
         if (thing.charAt(0) != '/') return null;
         if (thing.charAt(thing.length() - 1) != '/') return null;
         final Matcher matcher = PATTERN.matcher(thing);
-        if (matcher.find()) return new Pattern.Match(matcher);
+        if (matcher.find()) return new Pattern.Match(matcher, thing);
         return null;
     }
     
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/literal/StringLiteral.java b/src/main/java/org/byteskript/skript/lang/syntax/literal/StringLiteral.java
@@ -84,7 +84,7 @@ public Pattern.Match match(String thing, Context context) {
         if (thing.charAt(thing.length() - 1) != '"') return null;
         final String contents = thing.substring(1, thing.length() - 1);
         if (!matches(contents)) return null;
-        return new Pattern.Match(Pattern.fakeMatcher(thing), contents);
+        return new Pattern.Match(Pattern.fakeMatcher(thing), thing);
     }
     
     @Override
diff --git a/src/main/java/org/byteskript/skript/runtime/Skript.java b/src/main/java/org/byteskript/skript/runtime/Skript.java
@@ -323,16 +323,6 @@ public <From, To> Converter<From, To> getConverter(Class<From> from, Class<To> t
         return null;
     }
     
-    public <From, To> void registerConverter(Class<From> from, Class<To> to, Converter<From, To> converter) {
-        final Converter.Data data = new Converter.Data(from, to);
-        this.converters.put(data, converter);
-    }
-    
-    public <From, To> void unregisterConverter(Class<From> from, Class<To> to) {
-        final Converter.Data data = new Converter.Data(from, to);
-        this.converters.remove(data);
-    }
-    
     @Description("""
         Gets the parent class-loader attached to this Skript runtime.
         This is used to search available libraries and scripts for classes.
@@ -555,6 +545,11 @@ public boolean registerLibrary(Library library) {
         return compiler.addLibrary(library);
     }
     
+    public <From, To> void registerConverter(Class<From> from, Class<To> to, Converter<From, To> converter) {
+        final Converter.Data data = new Converter.Data(from, to);
+        this.converters.put(data, converter);
+    }
+    
     @Description("""
         Removes a library instance from the current compiler.
         """)
@@ -567,6 +562,11 @@ public boolean unregisterLibrary(Library library) {
         return compiler.removeLibrary(library);
     }
     
+    public <From, To> void unregisterConverter(Class<From> from, Class<To> to) {
+        final Converter.Data data = new Converter.Data(from, to);
+        this.converters.remove(data);
+    }
+    
     @Description("""
         Returns the provided script compiler.
         """)
diff --git a/src/test/java/org/byteskript/skript/test/SyntaxTest.java b/src/test/java/org/byteskript/skript/test/SyntaxTest.java
@@ -29,7 +29,6 @@ public class SyntaxTest extends SkriptTest {
         = new Skript();
 //    = new Skript(new DebugSkriptCompiler(Stream.controller(System.out)));
     
-    
     @Test
     public void all() throws Throwable {
         final URI uri = SyntaxTest.class.getClassLoader().getResource("tests").toURI();

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public java.util.regex.Pattern[] getCompiledPatterns() {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public Match match(final String thing, final Context context) {`
`122`		`- return match(thing, context, null);`
	`122`	`+ return match(thing, context, thing);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`public Match match(final String thing, final Context context, final Object meta) {`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public Pattern.Match match(String thing, Context context) {`
`68`	`68`	`final char c = thing.charAt(0);`
`69`	`69`	`if (c != '-' && (c < LOW \|\| c > HIGH)) return null;`
`70`	`70`	`final Matcher matcher = PATTERN.matcher(thing);`
`71`		`- if (matcher.find()) return new Pattern.Match(matcher);`
	`71`	`+ if (matcher.find()) return new Pattern.Match(matcher, thing);`
`72`	`72`	`return null;`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public Pattern.Match match(String thing, Context context) {`
`67`	`67`	`final char c = thing.charAt(0);`
`68`	`68`	`if (c != '-' && (c < LOW \|\| c > HIGH)) return null;`
`69`	`69`	`final Matcher matcher = PATTERN.matcher(thing);`
`70`		`- if (matcher.find()) return new Pattern.Match(matcher);`
	`70`	`+ if (matcher.find()) return new Pattern.Match(matcher, thing);`
`71`	`71`	`return null;`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public Pattern.Match match(String thing, Context context) {`
`71`	`71`	`final char c = thing.charAt(0);`
`72`	`72`	`if (c != '-' && (c < LOW \|\| c > HIGH)) return null;`
`73`	`73`	`final Matcher matcher = PATTERN.matcher(thing);`
`74`		`- if (matcher.find()) return new Pattern.Match(matcher);`
	`74`	`+ if (matcher.find()) return new Pattern.Match(matcher, thing);`
`75`	`75`	`return null;`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public Pattern.Match match(String thing, Context context) {`
`65`	`65`	`if (thing.charAt(0) != '/') return null;`
`66`	`66`	`if (thing.charAt(thing.length() - 1) != '/') return null;`
`67`	`67`	`final Matcher matcher = PATTERN.matcher(thing);`
`68`		`- if (matcher.find()) return new Pattern.Match(matcher);`
	`68`	`+ if (matcher.find()) return new Pattern.Match(matcher, thing);`
`69`	`69`	`return null;`
`70`	`70`	`}`
`71`	`71`