Add extender.

Author: Moderocky

pom.xml

@@ -47,19 +47,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.panteleyev</groupId>
-                <artifactId>jpackage-maven-plugin</artifactId>
-                <configuration>
-                    <name>ByteSkript</name>
-                    <appVersion>${project.version}</appVersion>
-                    <vendor>byteskript.org</vendor>
-                    <mainClass>org.byteskript.skript.app.ScriptLoader</mainClass>
-                    <mainJar>ByteSkript.jar</mainJar>
-                    <input>target/jar</input>
-                    <destination>target/dist</destination>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -81,7 +68,7 @@
         <dependency>
             <groupId>mx.kenzie</groupId>
             <artifactId>foundation</artifactId>
-            <version>1.1.5</version>
+            <version>1.1.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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

@@ -31,10 +31,7 @@
 import org.byteskript.skript.lang.syntax.dictionary.DictionaryMember;
 import org.byteskript.skript.lang.syntax.dictionary.ImportFunctionEffect;
 import org.byteskript.skript.lang.syntax.dictionary.ImportTypeEffect;
-import org.byteskript.skript.lang.syntax.entry.ReturnType;
-import org.byteskript.skript.lang.syntax.entry.Template;
-import org.byteskript.skript.lang.syntax.entry.Trigger;
-import org.byteskript.skript.lang.syntax.entry.Verify;
+import org.byteskript.skript.lang.syntax.entry.*;
 import org.byteskript.skript.lang.syntax.entry.syntax.*;
 import org.byteskript.skript.lang.syntax.event.AnyLoadEvent;
 import org.byteskript.skript.lang.syntax.event.CurrentEventExpression;
@@ -131,6 +128,7 @@ private SkriptLangSpec() {
             new FunctionMember(),
             new NoArgsFunctionMember(),
             new Template(),
+            new Extends(),
             new DictionaryMember(),
             new EveryMember()
         );

src/main/java/org/byteskript/skript/lang/syntax/entry/Extends.java

@@ -0,0 +1,69 @@
+/*
+ * 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.entry;
+
+import mx.kenzie.foundation.Type;
+import mx.kenzie.foundation.compiler.State;
+import org.byteskript.skript.api.note.Documentation;
+import org.byteskript.skript.api.syntax.SimpleEntry;
+import org.byteskript.skript.compiler.*;
+import org.byteskript.skript.lang.element.StandardElements;
+
+@Documentation(
+    name = "Extend Type",
+    description = "Specify a type this type can extend.",
+    examples = {
+        """
+            type Square:
+                extend: Shape
+            """
+    }
+)
+public class Extends extends SimpleEntry {
+    
+    public Extends() {
+        super(SkriptLangSpec.LIBRARY, StandardElements.METADATA, "extend: %Type%");
+    }
+    
+    @Override
+    public void compile(Context context, Pattern.Match match) {
+        final String name = match.meta();
+        final Type type = context.getType(name);
+        if (type != null) context.getBuilder().setSuperclass(type);
+        else context.getBuilder().setSuperclass(new Type(name.replace('.', '/')));
+        context.setState(CompileState.ROOT);
+    }
+    
+    @Override
+    public Pattern.Match match(String thing, Context context) {
+        if (!thing.startsWith("extend: ")) 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 'extend:' 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 allowAsInputFor(Type type) {
+        return false;
+    }
+    
+    @Override
+    public boolean allowedIn(State state, Context context) {
+        return context.getState() == CompileState.ROOT && context.hasFlag(AreaFlag.IN_TYPE);
+    }
+    
+    
+}

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

@@ -69,8 +69,17 @@ public void compile(Context context, Pattern.Match match) {
             .addValue("line", context.lineNumber())
             .addValue("compiled", Instant.now().getEpochSecond());
         builder.setModifiers(0x0001 | 0x0020);
+        final WriteInstruction instruction = (writer, visitor) -> {
+            final Type parent = builder.getSuperclass();
+            if (parent == null)
+                visitor.visitMethodInsn(183, "java/lang/Object", "<init>", "()V", false);
+            else {
+                final String internal = builder.getSuperclass().internalName();
+                visitor.visitMethodInsn(183, internal, "<init>", "()V", false);
+            }
+        };
         builder.addMethod("<init>")
-            .writeCode(WriteInstruction.loadThis(), WriteInstruction.superObject(), WriteInstruction.returnEmpty());
+            .writeCode(WriteInstruction.loadThis(), instruction, WriteInstruction.returnEmpty());
         context.useSubBuilder(builder);
         context.addFlag(AreaFlag.IN_TYPE);
         context.setState(CompileState.ROOT); // members can go inside this!

src/test/resources/config.csk

@@ -0,0 +1,5 @@
+key 1: value
+
+key 2: hello there!
+
+another key: another value :o

src/test/resources/types.bsk

@@ -28,6 +28,9 @@ type Box:
         trigger:
             return "Hello?"
 
+type Crate:
+    extend: Box
+
 function basic_use:
     trigger:
         set {thing} to a new Box
@@ -42,6 +45,11 @@ function basic_use:
         set {boolean} to bonk() from {thing}
         assert {boolean} is true: "Member function didn't return correctly."
         assert another_func() from {thing} is 10: "Template default function didn't return correctly."
+        set {thing} to a new Crate
+        assert {thing} exists: "Type creation failed."
+        assert {thing} is a Crate: "Type self-comparison failed."
+        assert {thing} is a Box: "Type super-comparison failed."
+        assert {thing} is a Thing: "Type super template-comparison failed."
 
 template type Shape:
     function get_sides: