Properties in user-defined types.

Moderocky · Moderocky · commit 1a2eab9b8cc0 · 2021-12-28T16:42:32.000Z
Also access fields from Java classes.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.byteskript</groupId>
     <artifactId>byteskript</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <name>ByteSkript</name>
 
     <properties>
diff --git a/src/main/java/org/byteskript/skript/api/syntax/Member.java b/src/main/java/org/byteskript/skript/api/syntax/Member.java
@@ -6,6 +6,7 @@
 
 package org.byteskript.skript.api.syntax;
 
+import mx.kenzie.foundation.Type;
 import org.byteskript.skript.api.LanguageElement;
 import org.byteskript.skript.api.Library;
 import org.byteskript.skript.compiler.CompileState;
@@ -30,4 +31,9 @@ public void onSectionExit(Context context, SectionMeta meta) {
         context.setState(CompileState.ROOT);
     }
     
+    @Override
+    public boolean allowAsInputFor(Type type) {
+        return false;
+    }
+    
 }
diff --git a/src/main/java/org/byteskript/skript/compiler/AreaFlag.java b/src/main/java/org/byteskript/skript/compiler/AreaFlag.java
@@ -11,6 +11,7 @@
 public enum AreaFlag implements Flag {
     IN_SYNTAX,
     IN_FUNCTION,
+    IN_PROPERTY,
     IN_TYPE,
     IN_ABSTRACT_TYPE,
     IN_EVENT
diff --git a/src/main/java/org/byteskript/skript/compiler/FileContext.java b/src/main/java/org/byteskript/skript/compiler/FileContext.java
@@ -359,6 +359,7 @@ public boolean hasHandle(String property, HandlerType type) {
     public MethodErasure useHandle(String property, HandlerType type) {
         this.usedProperties.putIfAbsent(type, new ArrayList<>());
         final List<PropertyAccessGenerator> list = this.usedProperties.get(type);
+        boolean unused = true;
         for (Library library : this.libraries) {
             sub:
             for (PropertyHandler handler : library.getProperties()) {
@@ -369,15 +370,26 @@ public MethodErasure useHandle(String property, HandlerType type) {
                     if (!generator.getName().equals(property)) continue;
                     if (!generator.getType().equals(type)) continue;
                     uses++;
+                    unused = false;
                     generator.addUse(handler.holder(), handler.method());
                 }
                 if (uses == 0) {
                     final PropertyAccessGenerator generator = new PropertyAccessGenerator(type, property);
                     generator.addUse(handler.holder(), handler.method());
                     list.add(generator);
+                    unused = false;
                 }
             }
         }
+        if (unused) check:{
+            for (PropertyAccessGenerator generator : list) {
+                if (!generator.getName().equals(property)) continue;
+                if (!generator.getType().equals(type)) continue;
+                break check;
+            }
+            final PropertyAccessGenerator generator = new PropertyAccessGenerator(type, property);
+            list.add(generator);
+        }
         final Type ret = type.expectReturn() ? CommonTypes.OBJECT : new Type(void.class);
         final Type[] params = type.expectInputs() ? new Type[]{CommonTypes.OBJECT, CommonTypes.OBJECT} : new Type[]{CommonTypes.OBJECT};
         return new MethodErasure(ret, "property_" + type.name() + "$" + property, params);
diff --git a/src/main/java/org/byteskript/skript/compiler/SkriptLangSpec.java b/src/main/java/org/byteskript/skript/compiler/SkriptLangSpec.java
@@ -55,6 +55,10 @@
 import org.byteskript.skript.lang.syntax.maths.*;
 import org.byteskript.skript.lang.syntax.timing.*;
 import org.byteskript.skript.lang.syntax.type.*;
+import org.byteskript.skript.lang.syntax.type.property.FinalEntry;
+import org.byteskript.skript.lang.syntax.type.property.LocalEntry;
+import org.byteskript.skript.lang.syntax.type.property.PropertyMember;
+import org.byteskript.skript.lang.syntax.type.property.TypeEntry;
 import org.byteskript.skript.lang.syntax.variable.AtomicVariableExpression;
 import org.byteskript.skript.lang.syntax.variable.GlobalVariableExpression;
 import org.byteskript.skript.lang.syntax.variable.ThreadVariableExpression;
@@ -116,6 +120,7 @@ private SkriptLangSpec() {
         registerSyntax(CompileState.ROOT,
             new TypeMember(),
             new TemplateTypeMember(),
+            new PropertyMember(),
             new FunctionMember(),
             new NoArgsFunctionMember(),
             new Template()
@@ -128,7 +133,10 @@ private SkriptLangSpec() {
             new EffectEntry(),
             new ExpressionEntry(),
             new PropertyEntry(),
-            new ModeEntry()
+            new ModeEntry(),
+            new TypeEntry(),
+            new LocalEntry(),
+            new FinalEntry()
         );
         registerSyntax(CompileState.CODE_BODY,
             new PrintEffect(),
diff --git a/src/main/java/org/byteskript/skript/compiler/structure/PropertyAccessGenerator.java b/src/main/java/org/byteskript/skript/compiler/structure/PropertyAccessGenerator.java
@@ -12,6 +12,7 @@
 import org.byteskript.skript.api.HandlerType;
 import org.byteskript.skript.compiler.CommonTypes;
 import org.byteskript.skript.compiler.Context;
+import org.byteskript.skript.lang.handler.StandardHandlers;
 import org.byteskript.skript.runtime.data.HandlerData;
 import org.objectweb.asm.Label;
 
@@ -85,6 +86,24 @@ public void compile(Context context) {
             else method.writeCode(WriteInstruction.returnEmpty()); // return empty
             method.writeCode((writer, visitor) -> visitor.visitLabel(jump)); // end
         }
+        field_property:
+        {
+            if (this.type == StandardHandlers.GET) method.writeCode((writer, visitor) -> {
+                visitor.visitVarInsn(25, 0); // load holder
+                visitor.visitLdcInsn(name);
+                visitor.visitMethodInsn(184, "skript", "get_java_field", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", false);
+                visitor.visitInsn(176); // areturn
+                return;
+            });
+            else if (this.type == StandardHandlers.SET) method.writeCode((writer, visitor) -> {
+                visitor.visitVarInsn(25, 0); // load holder
+                visitor.visitLdcInsn(name);
+                visitor.visitVarInsn(25, 1); // load value
+                visitor.visitMethodInsn(184, "skript", "set_java_field", "(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Void;", false);
+                visitor.visitInsn(177); // return top
+                return;
+            });
+        }
         if (this.type.expectReturn()) { // return null if requires result
             method.writeCode(WriteInstruction.pushNull());
             method.writeCode(WriteInstruction.returnObject());
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/entry/Template.java b/src/main/java/org/byteskript/skript/lang/syntax/entry/Template.java
@@ -12,8 +12,6 @@
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.lang.element.StandardElements;
 
-import java.util.regex.Matcher;
-
 public class Template extends SimpleEntry {
     
     public Template() {
@@ -41,17 +39,14 @@ public Pattern.Match match(String thing, Context context) {
         if (match == null) return null;
         final String name = match.groups()[0].trim();
         if (name.isEmpty()) {
-            context.getError().addHint(this, "A type should be specified after the 'type:' entry.");
+            context.getError().addHint(this, "A type should be specified after the 'template:' entry.");
             return null;
         }
         if (name.contains("\"")) {
             context.getError().addHint(this, "Type names should not be written inside quotation marks.");
             return null;
         }
-        final String quote = java.util.regex.Pattern.quote(thing);
-        final Matcher matcher = java.util.regex.Pattern.compile(quote).matcher(thing);
-        matcher.find();
-        return new Pattern.Match(matcher, name);
+        return new Pattern.Match(Pattern.fakeMatcher(thing), name);
     }
     
     @Override
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/generic/PropertyExpression.java b/src/main/java/org/byteskript/skript/lang/syntax/generic/PropertyExpression.java
@@ -53,7 +53,7 @@ public Pattern.Match match(String thing, Context context) {
         final Matcher matcher = pattern.matcher(thing);
         if (!matcher.find()) return null;
         final String name = matcher.group("name");
-        if (!context.hasHandle(name, context.getHandlerMode())) return null;
+//        if (!context.hasHandle(name, context.getHandlerMode())) return null;
         final Matcher dummy = createDummy(thing, i, matcher);
         dummy.find();
         return new Pattern.Match(dummy, name, CommonTypes.OBJECT);
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/type/property/FinalEntry.java b/src/main/java/org/byteskript/skript/lang/syntax/type/property/FinalEntry.java
@@ -0,0 +1,47 @@
+/*
+ * 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.type.property;
+
+import mx.kenzie.foundation.compiler.State;
+import org.byteskript.skript.api.syntax.SimpleEntry;
+import org.byteskript.skript.compiler.*;
+import org.byteskript.skript.lang.element.StandardElements;
+
+public class FinalEntry extends SimpleEntry {
+    
+    public FinalEntry() {
+        super(SkriptLangSpec.LIBRARY, StandardElements.METADATA, "final: %Boolean%");
+    }
+    
+    @Override
+    public void compile(Context context, Pattern.Match match) {
+        final String name = (String) match.meta();
+        final boolean value = Boolean.parseBoolean(name);
+        if (value) context.getField().addModifiers(0x0010);
+        else context.getField().removeModifiers(0x0010);
+        context.setState(CompileState.MEMBER_BODY);
+    }
+    
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        if (!thing.startsWith("final: ")) return null;
+        if (!thing.equals("final: true") && !thing.equals("final: false")) {
+            context.getError().addHint(this, "A true/false value goes after the 'final:' entry.");
+            return null;
+        }
+        return new Pattern.Match(Pattern.fakeMatcher(thing), thing.substring(7));
+    }
+    
+    @Override
+    public boolean allowedIn(State state, Context context) {
+        return context.getState() == CompileState.MEMBER_BODY
+            && context.hasFlag(AreaFlag.IN_TYPE)
+            && context.hasFlag(AreaFlag.IN_PROPERTY);
+    }
+    
+    
+}
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/type/property/LocalEntry.java b/src/main/java/org/byteskript/skript/lang/syntax/type/property/LocalEntry.java
@@ -0,0 +1,52 @@
+/*
+ * 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.type.property;
+
+import mx.kenzie.foundation.compiler.State;
+import org.byteskript.skript.api.syntax.SimpleEntry;
+import org.byteskript.skript.compiler.*;
+import org.byteskript.skript.lang.element.StandardElements;
+
+public class LocalEntry extends SimpleEntry {
+    
+    public LocalEntry() {
+        super(SkriptLangSpec.LIBRARY, StandardElements.METADATA, "local: %Boolean%");
+    }
+    
+    @Override
+    public void compile(Context context, Pattern.Match match) {
+        final String name = (String) match.meta();
+        final boolean value = Boolean.parseBoolean(name);
+        if (value) {
+            context.getField().removeModifiers(0x0001);
+            context.getField().addModifiers(0x0002);
+        } else {
+            context.getField().removeModifiers(0x0002);
+            context.getField().addModifiers(0x0001);
+        }
+        context.setState(CompileState.MEMBER_BODY);
+    }
+    
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        if (!thing.startsWith("local: ")) return null;
+        if (!thing.equals("local: true") && !thing.equals("local: false")) {
+            context.getError().addHint(this, "A true/false value goes after the 'local:' entry.");
+            return null;
+        }
+        return new Pattern.Match(Pattern.fakeMatcher(thing), thing.substring(7));
+    }
+    
+    @Override
+    public boolean allowedIn(State state, Context context) {
+        return context.getState() == CompileState.MEMBER_BODY
+            && context.hasFlag(AreaFlag.IN_TYPE)
+            && context.hasFlag(AreaFlag.IN_PROPERTY);
+    }
+    
+    
+}
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/type/property/PropertyMember.java b/src/main/java/org/byteskript/skript/lang/syntax/type/property/PropertyMember.java
@@ -0,0 +1,62 @@
+/*
+ * 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.type.property;
+
+import mx.kenzie.foundation.FieldBuilder;
+import org.byteskript.skript.api.syntax.Member;
+import org.byteskript.skript.compiler.*;
+import org.byteskript.skript.compiler.structure.SectionMeta;
+import org.byteskript.skript.error.ScriptError;
+import org.byteskript.skript.lang.element.StandardElements;
+
+import java.util.regex.Matcher;
+
+public class PropertyMember extends Member {
+    private static final java.util.regex.Pattern PATTERN = java.util.regex.Pattern.compile("property (?<name>" + SkriptLangSpec.IDENTIFIER.pattern() + ")");
+    
+    public PropertyMember() {
+        super(SkriptLangSpec.LIBRARY, StandardElements.MEMBER, "property");
+    }
+    
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        if (!thing.startsWith("property ")) return null;
+        if (context.hasFlag(AreaFlag.IN_PROPERTY)) return null;
+        if (!context.hasFlag(AreaFlag.IN_TYPE)) {
+            context.getError().addHint(this, "Properties can be declared only in types.");
+            return null;
+        }
+        if (thing.length() < 12) {
+            context.getError().addHint(this, "Property names must be at least 3 characters long.");
+            return null;
+        }
+        final Matcher matcher = PATTERN.matcher(thing);
+        if (matcher.find() && matcher.group("name") != null)
+            return new Pattern.Match(matcher);
+        context.getError()
+            .addHint(this, "Property names must be " + ScriptError.ANSI_CYAN + "[a-z0-9_]" + ScriptError.ANSI_RESET + " and start with a letter.");
+        return null;
+    }
+    
+    @Override
+    public void onSectionExit(Context context, SectionMeta meta) {
+        context.removeFlag(AreaFlag.IN_PROPERTY);
+        super.onSectionExit(context, meta);
+    }
+    
+    @Override
+    public void compile(Context context, Pattern.Match match) {
+        final String name = match.matcher().group("name");
+        final FieldBuilder field = context.getBuilder().addField(name);
+        context.setField(field);
+        field.setModifiers(0x0001);
+        field.setType(CommonTypes.OBJECT);
+        context.addFlag(AreaFlag.IN_PROPERTY);
+        context.setState(CompileState.MEMBER_BODY);
+    }
+    
+}
diff --git a/src/main/java/org/byteskript/skript/lang/syntax/type/property/TypeEntry.java b/src/main/java/org/byteskript/skript/lang/syntax/type/property/TypeEntry.java
@@ -0,0 +1,55 @@
+/*
+ * 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.type.property;
+
+import mx.kenzie.foundation.Type;
+import mx.kenzie.foundation.compiler.State;
+import org.byteskript.skript.api.syntax.SimpleEntry;
+import org.byteskript.skript.compiler.*;
+import org.byteskript.skript.lang.element.StandardElements;
+
+public class TypeEntry extends SimpleEntry {
+    
+    public TypeEntry() {
+        super(SkriptLangSpec.LIBRARY, StandardElements.METADATA, "type: %Type%");
+    }
+    
+    @Override
+    public void compile(Context context, Pattern.Match match) {
+        final String name = (String) match.meta();
+        final Type type = context.getType(name);
+        if (type != null) context.getField().setType(type);
+        else context.getField().setType(new Type(name.replace('.', '/')));
+        context.setState(CompileState.MEMBER_BODY);
+    }
+    
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        if (!thing.startsWith("type: ")) return null;
+        final Pattern.Match match = super.match(thing, context);
+        if (match == null) return null;
+        final String name = match.groups()[0].trim();
+        if (name.isEmpty()) {
+            context.getError().addHint(this, "A type should be specified after the 'type:' entry.");
+            return null;
+        }
+        if (name.contains("\"")) {
+            context.getError().addHint(this, "Type names should not be written inside quotation marks.");
+            return null;
+        }
+        return new Pattern.Match(Pattern.fakeMatcher(thing), name);
+    }
+    
+    @Override
+    public boolean allowedIn(State state, Context context) {
+        return context.getState() == CompileState.MEMBER_BODY
+            && context.hasFlag(AreaFlag.IN_TYPE)
+            && context.hasFlag(AreaFlag.IN_PROPERTY);
+    }
+    
+    
+}
diff --git a/src/main/java/org/byteskript/skript/runtime/threading/ScriptExceptionHandler.java b/src/main/java/org/byteskript/skript/runtime/threading/ScriptExceptionHandler.java
@@ -16,6 +16,7 @@ public void uncaughtException(Thread source, Throwable throwable) {
         if (source instanceof ScriptThread thread) {
             final Class<?> start = thread.initiator;
             System.err.println("An error occurred while running a script.");
+            System.err.println("\t" + throwable.getMessage());
             if (start != null)
                 System.err.println("This program started in: " + BLACK_BACKGROUND + ANSI_YELLOW + start.getName()
                     .replace('.', '/') + ".bsk" + ANSI_RESET);
diff --git a/src/main/java/skript.java b/src/main/java/skript.java
diff --git a/src/test/java/org/byteskript/skript/test/PropertiesTest.java b/src/test/java/org/byteskript/skript/test/PropertiesTest.java
diff --git a/src/test/java/org/byteskript/skript/test/TestingLibrary.java b/src/test/java/org/byteskript/skript/test/TestingLibrary.java
diff --git a/src/test/resources/properties.bsk b/src/test/resources/properties.bsk

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`package org.byteskript.skript.api.syntax;`
`8`	`8`
	`9`	`+import mx.kenzie.foundation.Type;`
`9`	`10`	`import org.byteskript.skript.api.LanguageElement;`
`10`	`11`	`import org.byteskript.skript.api.Library;`
`11`	`12`	`import org.byteskript.skript.compiler.CompileState;`
`@@ -30,4 +31,9 @@ public void onSectionExit(Context context, SectionMeta meta) {`
`30`	`31`	`context.setState(CompileState.ROOT);`
`31`	`32`	`}`
`32`	`33`
	`34`	`+ @Override`
	`35`	`+ public boolean allowAsInputFor(Type type) {`
	`36`	`+ return false;`
	`37`	`+ }`
	`38`	`+`
`33`	`39`	`}`