Use direct accessors in type properties.

Since we have the information available, we can switch to direct accessors if a type uses a property from `this object`.

Author: Moderocky

TODO.md

@@ -20,6 +20,10 @@ Tasks are categorised by importance and marked by difficulty.
 
 ### Medium Importance
 
+- Move some common syntax to the runtime. \
+  A lot of extracted syntax should be in the runtime. \
+  This would reduce the size of the output files. \
+  Difficulty: easy
 - Create a library for Java GUIs. \
   This will probably need to interact with JavaFX. \
   This should be handled by somebody with experience using Java front-end. \

pom.xml

@@ -113,7 +113,7 @@
         <dependency>
             <groupId>mx.kenzie</groupId>
             <artifactId>foundation</artifactId>
-            <version>1.1.3</version>
+            <version>1.1.4</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -19,6 +19,7 @@ public final class ElementTree {
     private final Pattern.Match match;
     private ElementTree[] nested;
     public boolean compile = true;
+    public boolean treasure = false;
     public boolean takeAtomic = false;
     public HandlerType type = StandardHandlers.GET;
 
@@ -28,7 +29,36 @@ public ElementTree(SyntaxElement current, Pattern.Match match, ElementTree... ne
         this.nested = nested;
     }
 
+    public ElementTree[] falseCopy() {
+        final ElementTree[] trees = new ElementTree[nested.length];
+        for (int i = 0; i < nested.length; i++) {
+            trees[i] = nested[i].deepCopy();
+            trees[i].treasure = true;
+        }
+        return trees;
+    }
+    
+    public ElementTree shallowCopy() {
+        final ElementTree tree = new ElementTree(current, match, nested);
+        tree.compile = compile;
+        tree.takeAtomic = takeAtomic;
+        tree.type = type;
+        return tree;
+    }
+    
+    public ElementTree deepCopy() {
+        final ElementTree tree = new ElementTree(current, match, nested);
+        tree.compile = compile;
+        tree.takeAtomic = takeAtomic;
+        tree.type = type;
+        for (int i = 0; i < nested.length; i++) {
+            tree.nested[i] = nested[i].deepCopy();
+        }
+        return tree;
+    }
+    
     public void preCompile(Context context) { // Pre-compilation is (outer -> inner)
+        if (treasure) return;
         context.setCompileCurrent(this);
         final HandlerType previous = context.getHandlerMode();
         context.setHandlerMode(type);
@@ -46,6 +76,7 @@ public void preCompile(Context context) { // Pre-compilation is (outer -> inner)
     }
 
     public void compile(Context context) { // Post-compilation is (inner -> outer)
+        if (treasure) return;
         for (ElementTree tree : nested) {
             tree.compile(context);
         }
@@ -62,6 +93,13 @@ public void compile(Context context) { // Post-compilation is (inner -> outer)
         context.setHandlerMode(previous);
     }
 
+    public void disableCompilation() {
+        this.compile = false;
+        for (final ElementTree tree : nested) {
+            tree.disableCompilation();
+        }
+    }
+    
     public SyntaxElement current() {
         return current;
     }
@@ -87,10 +125,11 @@ public ElementTree[] nested() {
     public boolean equals(Object obj) {
         if (obj == this) return true;
         if (obj == null || obj.getClass() != this.getClass()) return false;
-        var that = (ElementTree) obj;
+        final ElementTree that = (ElementTree) obj;
         return Objects.equals(this.current, that.current) &&
             Objects.equals(this.match, that.match) &&
-            Objects.equals(this.nested, that.nested);
+            Arrays.equals(this.nested, that.nested) &&
+            this.compile == that.compile;
     }
 
     public void emptyNest() {
@@ -109,9 +148,9 @@ public int hashCode() {
     @Override
     public String toString() {
         return "ElementTree{" +
-            "current=" + current.getClass().getSimpleName() + ", " +
-            "nested=" + Arrays.toString(nested) + '}';
+            "current=" + current.name() +
+            ", nested=" + Arrays.toString(nested) +
+            ", compile=" + compile +
+            '}';
     }
-    
-    
 }

src/main/java/org/byteskript/skript/lang/syntax/control/SetEffect.java

@@ -36,12 +36,13 @@ public void preCompile(Context context, Pattern.Match match) throws Throwable {
         if (!(inputs[0].current() instanceof Referent))
             throw new ScriptParseError(context.lineNumber(), "Syntax '" + inputs[0].current()
                 .name() + "' cannot be set.");
-        final ElementTree[] replacement = Arrays.copyOf(inputs[0].nested(), inputs[0].nested().length + 2);
-        replacement[replacement.length - 2] = inputs[1];
         inputs[0].type = StandardHandlers.SET;
-        inputs[0].emptyNest();
+        final ElementTree[] trees = inputs[0].falseCopy();
+        final ElementTree[] replacement = Arrays.copyOf(inputs[0].nested(), trees.length + 2);
+        replacement[replacement.length - 2] = inputs[1];
         replacement[replacement.length - 1] = inputs[0];
         tree.replaceNest(replacement);
+        inputs[0].replaceNest(trees);
         super.preCompile(context, match);
     }
 

src/main/java/org/byteskript/skript/lang/syntax/generic/PropertyExpression.java

@@ -6,17 +6,14 @@
 
 package org.byteskript.skript.lang.syntax.generic;
 
-import mx.kenzie.foundation.MethodErasure;
-import mx.kenzie.foundation.Type;
-import mx.kenzie.foundation.WriteInstruction;
+import mx.kenzie.foundation.*;
 import org.byteskript.skript.api.HandlerType;
 import org.byteskript.skript.api.Referent;
 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.compiler.*;
 import org.byteskript.skript.lang.element.StandardElements;
+import org.byteskript.skript.lang.handler.StandardHandlers;
+import org.byteskript.skript.lang.syntax.type.ThisThingExpression;
 
 import java.util.regex.Matcher;
 
@@ -89,6 +86,25 @@ public Type getHolderType() {
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         final String name = (String) match.meta();
+        final MethodBuilder method = context.getMethod();
+        final ElementTree tree = context.getCompileCurrent().nested()[0];
+        if (tree != null && context.hasFlag(AreaFlag.IN_TYPE) && tree.current() instanceof ThisThingExpression) {
+            if (context.getHandlerMode() == StandardHandlers.SET)
+                for (final FieldBuilder field : context.getBuilder().getFields()) {
+                    if (!field.getErasure().name().equals(name)) continue;
+                    method.writeCode(WriteInstruction.loadThis());
+                    method.writeCode(WriteInstruction.swap());
+                    method.writeCode(WriteInstruction.setField(context.getBuilder().getType(), field.getErasure()));
+                    return;
+                }
+            if (context.getHandlerMode() == StandardHandlers.GET)
+                for (final FieldBuilder field : context.getBuilder().getFields()) {
+                    if (!field.getErasure().name().equals(name)) continue;
+                    method.writeCode(WriteInstruction.loadThis());
+                    method.writeCode(WriteInstruction.getField(context.getBuilder().getType(), field.getErasure()));
+                    return;
+                }
+        }
         final HandlerType type = context.getHandlerMode();
         final MethodErasure target = context.useHandle(name, type);
         context.getMethod().writeCode(WriteInstruction.invokeStatic(context.getType(), target));

src/main/java/org/byteskript/skript/lang/syntax/type/ThisThingExpression.java

@@ -15,7 +15,7 @@
 
 public class ThisThingExpression extends SimpleExpression {
 
-    public ThisThingExpression() { // todo test this
+    public ThisThingExpression() {
         super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "this (thing|object)");
     }
 

src/main/java/org/byteskript/skript/lang/syntax/type/property/PropertyMember.java

@@ -30,6 +30,10 @@ public Pattern.Match match(String thing, Context context) {
             context.getError().addHint(this, "Properties can be declared only in types.");
             return null;
         }
+        if (context.hasFlag(AreaFlag.IN_ABSTRACT_TYPE)) {
+            context.getError().addHint(this, "Abstract types cannot hold properties.");
+            return null;
+        }
         if (thing.length() < 12) {
             context.getError().addHint(this, "Property names must be at least 3 characters long.");
             return null;

src/main/java/org/byteskript/skript/runtime/Skript.java

@@ -99,10 +99,6 @@ public Collection<OperationController> getProcesses() {
         return processes;
     }
 
-    private OperationController createController() {
-        return new OperationController(this, factory); // todo
-    }
-    
     public Future<?> runScript(final ScriptRunner runner) {
         return runScript(runner, null);
     }
@@ -126,18 +122,6 @@ public Future<?> runScript(final ScriptRunner runner, final Event event) {
         };
         factory.newThread(controller, runnable, true).start();
         return future;
-//        return executor.submit(() -> {
-//            final ScriptThread thread = (ScriptThread) Thread.currentThread();
-//            thread.variables.clear();
-//            thread.initiator = runner.owner();
-//            thread.event = event;
-//            try {
-//                runner.run();
-//            } catch (ThreadDeath ignore) {
-//            } catch (Throwable ex) {
-//                ex.printStackTrace(); // todo
-//            }
-//        });
     }
 
     public boolean runEvent(final Event event) {
@@ -360,7 +344,7 @@ public Script loadScript(final InputStream stream)
     public Script loadScript(final File source)
         throws IOException {
         try (InputStream stream = new FileInputStream(source)) {
-            return loadScript(stream, source.getName()); // todo
+            return loadScript(stream, source.getName());
         }
     }
 

src/test/java/org/byteskript/skript/test/PropertiesTest.java

@@ -23,6 +23,7 @@ public static void start() throws Throwable {
         final PostCompileClass[] classes = skript.compileComplexScript(TypesTest.class.getClassLoader()
             .getResourceAsStream("properties.bsk"), "skript.properties");
         for (PostCompileClass cls : classes) {
+            debug(cls);
             if (script == null)
                 script = skript.loadScript(cls);
             else skript.loadScript(cls);
@@ -40,6 +41,7 @@ public void basic_use() throws Throwable {
     public void simple_example() throws Throwable {
         final Member function = script.getFunction("simple_example");
         assert function != null;
+        function.run(skript).get();
         function.invoke();
     }
 

src/test/resources/properties.bsk

@@ -40,11 +40,19 @@ type Blob:
         type: String
     property age:
         type: Number
+    property house:
+        local: true
+    function set_house(house):
+        trigger:
+            set (house of (this object)) to {house}
+            assert house of this object is {house}: "Set comparison failed."
 
-function simple_example:
+function simple_example: // todo - check other property accessors inside types
     trigger:
         set {thing} to a new Blob
         set name of {thing} to "Thing"
         set age of {thing} to 62
         assert name of {thing} is "Thing": "Name property set/access failed."
         assert age of {thing} is 62: "Age property set/access failed."
+        run set_house("hello") from {thing}
+        assert house of {thing} is "hello": "Local set failed."