functions are values

src/APL/Scope.java

@@ -344,8 +344,8 @@ private class Optimizer extends Builtin {
     @Override
     public Value call(Value w) {
       String name = w.asString();
-      if (!(get(name) instanceof Value)) return Num.MINUS_ONE;
-      Value v = (Value) get(name);
+      if (!(Scope.this.get(name) instanceof Value)) return Num.MINUS_ONE;
+      Value v = (Value) Scope.this.get(name);
       Value optimized = v.squeeze();
       if (v == optimized) return Num.ZERO;
       update(name, optimized);
@@ -553,7 +553,7 @@ private class NC extends Fun {
     }
 
     @Override public Value call(Value w) {
-      Obj obj = get(w.asString());
+      Obj obj = Scope.this.get(w.asString());
       if (obj == null) return Num.ZERO;
       if (obj instanceof Value) return Num.NUMS[2];
       if (obj instanceof Fun  ) return Num.NUMS[3];

src/APL/types/Callable.java

@@ -1,10 +1,15 @@
 package APL.types;
 
 import APL.Scope;
+import APL.types.arrs.*;
 
-public abstract class Callable extends Obj {
+public abstract class Callable extends Primitive {
   final public Scope sc;
   protected Callable(Scope sc) {
     this.sc = sc;
   }
+  public Value ofShape(int[] sh) {
+    if (sh.length==0) return this;
+    return new SingleItemArr(this, sh);
+  }
 }

src/APL/types/Fun.java

@@ -566,6 +566,9 @@ else if ((a instanceof BigValue|an) & (w instanceof BigValue|wn))
     }
   }
 
+
+
+
   @Override
   public Type type() {
     return Type.fn;
@@ -578,15 +581,15 @@ public Type type() {
     return repr();
   }
 
+  public Fun asFun() {
+    return this;
+  }
+
   // functions are equal per-object basis
   @Override public int hashCode() {
     return actualHashCode();
   }
   @Override public boolean equals(Obj o) {
     return this == o;
   }
-
-  public Fun asFun() {
-    return this;
-  }
 }

src/APL/types/functions/Dop.java

@@ -65,15 +65,16 @@ protected Fun isFn(Obj o, char c) {
     return (Fun) o;
   }
 
+
+  public Fun asFun() {
+    throw new Error("can't do");
+  }
+
   // functions are equal per-object basis
   @Override public int hashCode() {
     return actualHashCode();
   }
   @Override public boolean equals(Obj o) {
     return this == o;
   }
-
-  public Fun asFun() {
-    throw new Error("can't do");
-  }
 }

src/APL/types/functions/Mop.java

@@ -65,15 +65,16 @@ protected Fun isFn(Obj o) {
     return (Fun) o;
   }
 
+
+  public Fun asFun() {
+    throw new Error("can't do");
+  }
+
   // functions are equal per-object basis
   @Override public int hashCode() {
     return actualHashCode();
   }
   @Override public boolean equals(Obj o) {
     return this == o;
   }
-
-  public Fun asFun() {
-    throw new Error("can't do");
-  }
 }