GH-392 Implement type instance in REPL

panda-lang · Mar 14, 2020 · e22c70f · e22c70f
1 parent dd21282
commit e22c70f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 32 deletions.
diff --git a/...ramework/src/main/java/org/panda_lang/framework/language/architecture/type/TypeScope.java b/...ramework/src/main/java/org/panda_lang/framework/language/architecture/type/TypeScope.java
@@ -74,8 +74,10 @@ public TypeInstance createInstance(ProcessStack stack, Class<?>[] parameterTypes
 
     @SuppressWarnings("unchecked")
     private Constructor<? extends TypeInstance> getConstructor(Class<?>[] parameterTypes) {
+        parameterTypes = ArrayUtils.merge(TypeFrame.class, parameterTypes, Class[]::new);
+
         try {
-            return (Constructor<? extends TypeInstance>) type.getAssociatedClass().fetchImplementation().getConstructor(ArrayUtils.merge(TypeFrame.class, parameterTypes, Class[]::new));
+            return (Constructor<? extends TypeInstance>) type.getAssociatedClass().fetchImplementation().getConstructor(parameterTypes);
         } catch (NoSuchMethodException e) {
             throw new PandaFrameworkException(type.getAssociatedClass().fetchImplementation() + " does not implement " + Arrays.toString(parameterTypes) + " constructor");
         }

diff --git a/...rk/src/main/java/org/panda_lang/framework/language/resource/internal/java/JavaModule.java b/...rk/src/main/java/org/panda_lang/framework/language/resource/internal/java/JavaModule.java
@@ -70,12 +70,8 @@ private void type(Module module, String name, Class<?> primitiveClass) {
     }
 
     private Type generate(Module module, Class<?> primitiveClass, String name) {
-        Type primitiveType = PandaTypeUtils.generateOf(module, "Primitive" + name, primitiveClass);
-
-        Type type = PandaTypeUtils.generateOf(module, name, ClassUtils.getNonPrimitiveClass(primitiveClass));
-        type.addBase(primitiveType);
-
-        return type;
+        PandaTypeUtils.generateOf(module, "Primitive" + name, primitiveClass);
+        return PandaTypeUtils.generateOf(module, name, ClassUtils.getNonPrimitiveClass(primitiveClass));
     }
 
 }
diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplCreator.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplCreator.java
@@ -26,6 +26,7 @@
 import org.panda_lang.framework.design.runtime.Process;
 import org.panda_lang.framework.design.runtime.ProcessStack;
 import org.panda_lang.framework.language.architecture.statement.PandaVariableData;
+import org.panda_lang.framework.language.architecture.type.PandaConstructor;
 import org.panda_lang.framework.language.architecture.type.PandaMethod;
 import org.panda_lang.framework.language.architecture.type.PandaType;
 import org.panda_lang.framework.language.architecture.type.TypeComponents;
@@ -65,6 +66,12 @@ public final class ReplCreator {
         context.withComponent(TypeComponents.PROTOTYPE, type);
         this.typeScope = new TypeScope(PandaSourceLocationUtils.unknownLocation("repl"), type);
 
+        type.getConstructors().declare(PandaConstructor.builder()
+                .type(type)
+                .callback((frame, instance, arguments) -> typeScope.createInstance(frame, new Class<?>[0], arguments))
+                .location(type.getLocation())
+                .build());
+
         this.replScope = new ReplScope(typeScope.getSourceLocation(), Collections.emptyList());
         context.withComponent(Components.SCOPE, replScope);
     }

diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplFrame.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplFrame.java
@@ -20,6 +20,7 @@
 import org.panda_lang.framework.design.architecture.dynamic.Frame;
 import org.panda_lang.framework.design.architecture.type.PropertyFrame;
 import org.panda_lang.framework.design.architecture.statement.StandardizedFramedScope;
+import org.panda_lang.framework.language.architecture.type.TypeInstance;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,9 +31,9 @@ final class ReplFrame implements Frame, PropertyFrame {
     private final Frame instance;
     private final Map<Integer, Object> memory = new HashMap<>();
 
-    protected ReplFrame(ReplScope scope, Frame instance) {
+    protected ReplFrame(ReplScope scope, TypeInstance instance) {
         this.scope = scope;
-        this.instance = instance;
+        this.instance = instance.__panda__get_frame();
     }
 
     @Override

diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplScope.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplScope.java
@@ -23,6 +23,7 @@
 import org.panda_lang.framework.design.interpreter.source.SourceLocation;
 import org.panda_lang.framework.design.runtime.ProcessStack;
 import org.panda_lang.framework.language.architecture.statement.AbstractPropertyFramedScope;
+import org.panda_lang.framework.language.architecture.type.TypeInstance;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -42,7 +43,7 @@ final class ReplScope extends AbstractPropertyFramedScope {
 
     @Override
     public Frame revive(ProcessStack stack, Object instance) {
-        ReplFrame frame = new ReplFrame(this, (Frame) instance);
+        ReplFrame frame = new ReplFrame(this, (TypeInstance) instance);
 
         for (Entry<Integer, Object> entry : defaultValues.entrySet()) {
             frame.set(entry.getKey(), entry.getValue());

diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/ShellType.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/ShellType.java