Remove variable caches

Author: ngallagher

snap-compile/src/main/java/org/snapscript/compile/assemble/OperationBuilder.java

@@ -32,7 +32,7 @@ public Object create(Type type, Object[] arguments, Line line) throws Exception
       Callable<Result> callable = binder.bind(scope, type, TYPE_CONSTRUCTOR, arguments);
 
       if(callable == null) {
-         throw new InternalStateException("No constructor for " + type + " at line " + line);
+         throw new InternalStateException("No constructor for '" + type + "' at line " + line);
       }
       Result result = callable.call();
       Object value = result.getValue();

snap-compile/src/main/java/org/snapscript/compile/validate/ModuleValidator.java

@@ -21,14 +21,10 @@ public void validate(Module module) throws Exception {
       String resource = module.getPath();
 
       for(Type type : types) {
-         Module parent = type.getModule();
-         String prefix = parent.getName();
-         String name = type.getName();
-
          try {
             validator.validate(type);
          }catch(Exception e) {
-            throw new InternalStateException("Invalid reference to '" + prefix + "." + name +"' in '" + resource + "'", e);
+            throw new InternalStateException("Invalid reference to '" + type +"' in '" + resource + "'", e);
          }
       }
    }

snap-compile/src/main/java/org/snapscript/compile/validate/TypeValidator.java

@@ -66,11 +66,7 @@ private void validateHierarchy(Type type) throws Exception {
             }
          }
          if(matches == 0) {
-            Module module = type.getModule();
-            String resource = module.getName();
-            String name = type.getName();
-            
-            throw new InternalStateException("Type '" + resource + "." + name + "' not defined");
+            throw new InternalStateException("Type '" + type + "' not defined");
          }
       }
    }
@@ -91,11 +87,7 @@ private void validateProperties(Type type) throws Exception {
             properties.validate(property);
          }
          if(matches == 0) {
-            Module module = type.getModule();
-            String resource = module.getName();
-            String name = type.getName();
-            
-            throw new InternalStateException("Type '" + resource + "." + name + "' have property '" + require + "'");
+            throw new InternalStateException("Type '" + type + "' have property '" + require + "'");
          }
       }
    }

snap-compile/src/test/java/org/snapscript/compile/ClosureFunctionFinderTest.java

@@ -27,7 +27,7 @@ public void testFunctionFinder() throws Exception {
       Module module = new ContextModule(context, "/", "yy", 1);
       ClosureFunctionFinder finder = new ClosureFunctionFinder(loader);
       Signature signature = new Signature(Arrays.asList(new Parameter("n", loader.loadType(String.class))), module);
-      Type type = new InvocationFunction(signature, null, null, null, "xx").getDefinition();
+      Type type = new InvocationFunction(signature, null, null, null, "xx").getHandle();
       Function function = finder.find(type);
 
       assertNotNull(function);

snap-compile/src/test/java/org/snapscript/compile/ClosureMatcherTest.java

@@ -32,7 +32,7 @@ public void testClosureMatcher() throws Exception {
       TypeLoader loader = context.getLoader();
       ClosureFunctionFinder finder = new ClosureFunctionFinder(loader);
       Signature signature = new Signature(Arrays.asList(new Parameter("n", loader.loadType(String.class))), module);
-      Type type = new EmptyFunction(signature).getDefinition();
+      Type type = new EmptyFunction(signature).getHandle();
       ConstraintConverter converter = matcher.match(type);
       Function function = new InvocationFunction(signature, null, type, null, "xx");
       Score score = converter.score(function);

snap-compile/src/test/java/org/snapscript/compile/define/MockType.java

@@ -5,6 +5,7 @@
 
 import org.snapscript.core.Module;
 import org.snapscript.core.Scope;
+import org.snapscript.core.TypeDescription;
 import org.snapscript.core.TypeScope;
 import org.snapscript.core.Type;
 import org.snapscript.core.annotation.Annotation;
@@ -13,6 +14,7 @@
 
 public class MockType implements Type {
 
+   private final TypeDescription description;
    private final List<Annotation> annotations;
    private final List<Property> properties;
    private final List<Function> functions;
@@ -24,6 +26,7 @@ public class MockType implements Type {
    private final String name;
 
    public MockType(Module module, String name, Type entry, Class type){
+      this.description = new TypeDescription(this);
       this.annotations = new ArrayList<Annotation>();
       this.properties = new ArrayList<Property>();
       this.functions = new ArrayList<Function>();
@@ -87,6 +90,6 @@ public int getOrder(){
 
    @Override
    public String toString() {
-      return name;
+      return description.toString();
    }
 }

snap-core/src/main/java/org/snapscript/core/CompoundScope.java

@@ -22,6 +22,11 @@ public Scope getOuter() {
       return outer;
    }  
 
+   @Override
+   public Type getHandle() {
+      return outer.getType();
+   }
+   
    @Override
    public Type getType() {
       return outer.getType();
@@ -68,6 +73,11 @@ public Scope getInner() {
       public Scope getOuter() {
          return outer;
       }
+      
+      @Override
+      public Type getHandle() {
+         return outer.getType();
+      }
 
       @Override
       public Type getType() {

snap-core/src/main/java/org/snapscript/core/Handle.java

@@ -0,0 +1,5 @@
+package org.snapscript.core;
+
+public interface Handle extends Any {
+   Type getHandle();
+}

snap-core/src/main/java/org/snapscript/core/ModelScope.java

@@ -32,6 +32,11 @@ public State getState() {
       return state;
    }
 
+   @Override
+   public Type getHandle() {
+      return null;
+   }
+   
    @Override
    public Type getType() {
       return null;

snap-core/src/main/java/org/snapscript/core/ModuleScope.java

@@ -30,6 +30,11 @@ public Model getModel() {
       return null;
    }
 
+   @Override
+   public Type getHandle() {
+      return null;
+   }
+   
    @Override
    public Type getType() {
       return null;