Add stackindex keyword

tomdodd4598 · Dec 11, 2023 · 02a1415 · 02a1415
1 parent b3f1a1c
commit 02a1415
Show file tree

Hide file tree

Showing 14 changed files with 201 additions and 97 deletions.
diff --git a/run/classes.dssl b/run/classes.dssl
@@ -86,32 +86,60 @@ item .printRecursive
 # ------------------- #
 
 /Person {
+	/__init__ {
+		"Constructing Person!" println
+		Person .supers { .__init__ } foreach
+	} macro
+
 	/talk {
 		type " talked." ~ println
 	} macro
 } class
 
 /Worker Person {
+	/__init__ {
+		"Constructing Worker!" println
+		Worker .supers { .__init__ } foreach
+	} macro
+
 	/work {
 		type " worked." ~ println
 	} macro
 } class
 
 /Miner Worker {
+	/__init__ {
+		"Constructing Miner!" println
+		Miner .supers { .__init__ } foreach
+	} macro
+
 	/mine {
 		type " mined." ~ println
 	} macro
 } class
 
 /Programmer Worker {
+	/__init__ {
+		"Constructing Programmer!" println
+		Programmer .supers { .__init__ } foreach
+	} macro
+
 	/code {
 		type " coded." ~ println
 	} macro
 } class
 
-/Satoshi Miner Programmer { } class
+/Satoshi Programmer Miner {
+	/__init__ {
+		"Constructing Satoshi!" println
+		Satoshi .supers { .__init__ } foreach
+	} macro
+} class
 
 /satoshi Satoshi new def
+
+'\n' print
+
 satoshi .talk
 satoshi .work
 satoshi .mine

diff --git a/src/dssl.sable b/src/dssl.sable
@@ -78,6 +78,7 @@ Tokens
 	dup = 'dup';
 
 	stacksize = 'stacksize';
+	stackindex = 'stackindex';
 
 	read = 'read';
 	print = 'print';

diff --git a/src/dssl/analysis/Analysis.java b/src/dssl/analysis/Analysis.java
@@ -41,6 +41,7 @@ public interface Analysis extends Switch
     void caseTPop(TPop node);
     void caseTDup(TDup node);
     void caseTStacksize(TStacksize node);
+    void caseTStackindex(TStackindex node);
     void caseTRead(TRead node);
     void caseTPrint(TPrint node);
     void caseTPrintln(TPrintln node);

diff --git a/src/dssl/analysis/AnalysisAdapter.java b/src/dssl/analysis/AnalysisAdapter.java
@@ -248,6 +248,12 @@ public void caseTStacksize(TStacksize node)
         defaultCase(node);
     }
 
+    @Override
+    public void caseTStackindex(TStackindex node)
+    {
+        defaultCase(node);
+    }
+
     @Override
     public void caseTRead(TRead node)
     {

diff --git a/src/dssl/interpret/BuiltIn.java b/src/dssl/interpret/BuiltIn.java
@@ -42,7 +42,7 @@ public class BuiltIn {
 	public static final Map<@NonNull String, Clazz> CLAZZ_MAP = new HashMap<>();
 	public static final Map<@NonNull String, Clazz> MODULE_MAP = new HashMap<>();
 
-	public static final @NonNull Clazz OBJECT_CLAZZ = clazz(Clazz.objectClazz());
+	public static final @NonNull Clazz OBJECT_CLAZZ = clazz(new Clazz(null, OBJECT, ClazzType.INTERNAL, null, null));
 
 	public static final @NonNull Clazz CLASS_CLAZZ = clazz(new Clazz(CLASS, ClazzType.INTERNAL));
 	public static final @NonNull Clazz LABEL_CLAZZ = clazz(new Clazz(LABEL, ClazzType.INTERNAL));

diff --git a/src/dssl/interpret/Clazz.java b/src/dssl/interpret/Clazz.java
@@ -29,34 +29,30 @@ public Clazz(@NonNull String identifier, @NonNull ClazzType type, Clazz... super
 		this(null, identifier, type, null, new ArrayList<>(Arrays.asList(supers)));
 	}
 
-	public Clazz(String prev, @NonNull String extension, @NonNull ClazzType type, HierarchicalScope base, ArrayList<Clazz> supers) {
+	public Clazz(String prev, @NonNull String extension, @NonNull ClazzType type, @Nullable HierarchicalScope base, @Nullable ArrayList<Clazz> supers) {
 		fullIdentifier = Helpers.extendedIdentifier(prev, extension);
 		shallowIdentifier = extension;
 		this.type = type;
 
-		if (!objectClazzInit) {
-			supers.add(BuiltIn.OBJECT_CLAZZ);
+		if (supers == null) {
+			this.supers = new ArrayList<>();
+		}
+		else {
+			if (supers.isEmpty()) {
+				supers.add(BuiltIn.OBJECT_CLAZZ);
+			}
+			this.supers = supers.stream().distinct().collect(Collectors.toList());
 		}
-		this.supers = supers.stream().distinct().collect(Collectors.toList());
 
 		defHierarchy = getHierarchy(base, HierarchicalScope::getDefHierarchy);
 		macroHierarchy = getHierarchy(base, HierarchicalScope::getMacroHierarchy);
 		clazzHierarchy = getHierarchy(base, HierarchicalScope::getClazzHierarchy);
 	}
 
-	protected <K, V> Hierarchy<K, V> getHierarchy(HierarchicalScope base, Function<HierarchicalScope, Hierarchy<K, V>> function) {
+	protected <K, V> Hierarchy<K, V> getHierarchy(@Nullable HierarchicalScope base, Function<HierarchicalScope, Hierarchy<K, V>> function) {
 		return (base == null ? new Hierarchy<K, V>() : function.apply(base)).branch(Helpers.map(supers, function));
 	}
 
-	private static boolean objectClazzInit = false;
-
-	public static @NonNull Clazz objectClazz() {
-		objectClazzInit = true;
-		@NonNull Clazz clazz = new Clazz(BuiltIn.OBJECT, ClazzType.INTERNAL);
-		objectClazzInit = false;
-		return clazz;
-	}
-
 	@SuppressWarnings("null")
 	public @NonNull Element clazzElement() {
 		if (elem == null) {

diff --git a/src/dssl/interpret/HierarchicalScope.java b/src/dssl/interpret/HierarchicalScope.java
@@ -2,7 +2,7 @@
 
 import java.util.*;
 
-import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.*;
 
 import dssl.Hierarchy;
 import dssl.interpret.element.*;
@@ -78,7 +78,7 @@ public default Clazz setClazz(@NonNull String shallowIdentifier, @NonNull Clazz
 	}
 
 	@Override
-	public default Clazz setClazz(@NonNull String shallowIdentifier, @NonNull ClazzType type, HierarchicalScope base, ArrayList<Clazz> supers) {
+	public default Clazz setClazz(@NonNull String shallowIdentifier, @NonNull ClazzType type, @Nullable HierarchicalScope base, @NonNull ArrayList<Clazz> supers) {
 		return setClazz(shallowIdentifier, new Clazz(scopeIdentifier(), shallowIdentifier, type, base, supers), true);
 	}
 

diff --git a/src/dssl/interpret/Scope.java b/src/dssl/interpret/Scope.java
@@ -55,7 +55,7 @@ else if (hasClazz(identifier, true)) {
 
 	public Clazz getClazz(@NonNull String shallowIdentifier);
 
-	public Clazz setClazz(@NonNull String shallowIdentifier, @NonNull ClazzType type, HierarchicalScope base, ArrayList<Clazz> supers);
+	public Clazz setClazz(@NonNull String shallowIdentifier, @NonNull ClazzType type, @Nullable HierarchicalScope base, @NonNull ArrayList<Clazz> supers);
 
 	public Clazz removeClazz(@NonNull String shallowIdentifier);
 

diff --git a/src/dssl/interpret/TokenExecutor.java b/src/dssl/interpret/TokenExecutor.java
@@ -272,6 +272,7 @@ protected <T extends Token> TokenFunction get(Class<T> clazz) {
 		TOKEN_FUNCTION_MAP.put(TDup.class, TokenExecutor::onDup);
 
 		TOKEN_FUNCTION_MAP.put(TStacksize.class, TokenExecutor::onStacksize);
+		TOKEN_FUNCTION_MAP.put(TStackindex.class, TokenExecutor::onStackindex);
 
 		TOKEN_FUNCTION_MAP.put(TRead.class, TokenExecutor::onRead);
 		TOKEN_FUNCTION_MAP.put(TPrint.class, TokenExecutor::onPrint);
@@ -582,6 +583,22 @@ protected <T extends Token> TokenFunction get(Class<T> clazz) {
 		return TokenResult.PASS;
 	}
 
+	protected @NonNull TokenResult onStackindex(@NonNull Token token) {
+		@NonNull Element elem = pop();
+		IntElement intElem = elem.asInt(this);
+		if (intElem == null) {
+			throw new IllegalArgumentException(String.format("Keyword \"stackindex\" requires %s element as argument!", Helpers.NON_NEGATIVE_INT));
+		}
+
+		int primitiveInt = intElem.primitiveInt();
+		if (primitiveInt < 0) {
+			throw new IllegalArgumentException(String.format("Keyword \"stackindex\" requires %s element as argument!", Helpers.NON_NEGATIVE_INT));
+		}
+
+		push(peekAt(primitiveInt));
+		return TokenResult.PASS;
+	}
+
 	protected @NonNull TokenResult onRead(@NonNull Token token) {
 		String str = interpreter.hooks.read();
 		push(str == null ? NullElement.INSTANCE : new StringElement(str));

diff --git a/src/dssl/interpret/element/LabelElement.java b/src/dssl/interpret/element/LabelElement.java
@@ -70,7 +70,7 @@ public Clazz getClazz() {
 		return scope.getClazz(shallowIdentifier);
 	}
 
-	public void setClazz(@NonNull ClazzType type, HierarchicalScope base, ArrayList<Clazz> supers) {
+	public void setClazz(@NonNull ClazzType type, @Nullable HierarchicalScope base, @NonNull ArrayList<Clazz> supers) {
 		Clazz prev = scope.setClazz(shallowIdentifier, type, base, supers);
 		if (prev != null && !scope.canShadow()) {
 			throw shadowError("class");

diff --git a/src/dssl/interpret/element/clazz/InstanceElement.java b/src/dssl/interpret/element/clazz/InstanceElement.java
@@ -99,7 +99,7 @@ public Clazz getClazz(@NonNull String shallowIdentifier) {
 	}
 
 	@Override
-	public Clazz setClazz(@NonNull String shallowIdentifier, @NonNull ClazzType type, HierarchicalScope base, ArrayList<Clazz> supers) {
+	public Clazz setClazz(@NonNull String shallowIdentifier, @NonNull ClazzType type, @Nullable HierarchicalScope base, @NonNull ArrayList<Clazz> supers) {
 		checkCollision(shallowIdentifier);
 		return clazzMap.put(shallowIdentifier, new Clazz(scopeIdentifier, shallowIdentifier, type, base, supers));
 	}