goodguide-gibbon 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4966b52198fc8a5bb23039bb67ac3201b286d98a
-  data.tar.gz: 1e7f3acdbe0d171ade9781032d19e65fd8f73fa4
+  metadata.gz: d1cfc211611af030db79283ed6f89abec9957553
+  data.tar.gz: dbdfcd341d94df018b8c3a6b8c56598e11860415
 SHA512:
-  metadata.gz: 0c02143ccb73b5d76b63542699b23ea2c562a455ad95ed898ae1213f4ff91a8c281703ae4baac5c9f119332bc913059c06d94f20b267843378c86c78df151283
-  data.tar.gz: 3d28da0abe05c5c963de5b619028562bba9397aa50cda106ad0f4328c0c5e1683ab60f72443082b4be6f35e3a757285c666b2f2313849cc54e781efd07112eb7
+  metadata.gz: 6f3d7d5ace0c22e100983b29887c572e6bb88178dbee10c8b3710860b3ae782556dd1fa9f22035630e2a0403218b11ce12f82669b1d62736697657258ba8ccb3
+  data.tar.gz: 620680f65d6a32b9b29592a1bf8225441f040184e62a25d6151a91a4886ec0999df8c22b6a7b1953b6571712b4208f7ae2a93125f69b85c289578112c4e49679

data/Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org/'
 gemspec
 
 gem 'minitest', '~> 4.0'
+gem 'minitest-focus'
 gem 'wrong'
 
 gem 'pry'

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.7.0'
+      '0.7.1'
     end
   end
 end

data/lib/goodguide/gibbon.rb

@@ -120,8 +120,9 @@ module GoodGuide
     class SemanticError < StandardError
       include Util
 
-      def initialize(errors)
+      def initialize(errors, context)
         @errors = errors
+        @context = context
       end
 
       def messages
@@ -129,9 +130,8 @@ module GoodGuide
       end
 
     private
-      # needed for obj_to_js
       def gibbon
-        JS.default.gibbon
+        @context.gibbon
       end
 
       def inspect_expr(expr)
@@ -197,7 +197,7 @@ module GoodGuide
         syntax = context.parse(source)
         semantics, errors = context.analyze(syntax, global, client.to_js)
 
-        raise SemanticError.new(errors) if errors
+        raise SemanticError.new(errors, context) if errors
 
         compiled = context.compile(semantics)
 
@@ -222,7 +222,10 @@ module GoodGuide
       def as_json
         @as_json ||= {
           'syntax' => @context.send(:obj_to_ruby, @syntax),
-          'compiled' => @context.send(:obj_to_ruby, @compiled),
+          'compiled' => {
+            'semantics' => @context.send(:obj_to_ruby, @compiled.semantics),
+            'blocks' => @context.send(:obj_to_ruby, @compiled.blocks)
+          }
         }
       end
 
@@ -352,7 +355,7 @@ module GoodGuide
       def parse(str)
         obj_to_ruby self.gibbon.parse(str)
       rescue JSError => e
-        raise SemanticError.new([{'_tag' => 'parse', 'message' => e.value}])
+        raise SemanticError.new([{'_tag' => 'parse', 'message' => e.value}], self)
       end
 
       def compile(semantics)
@@ -379,12 +382,18 @@ module GoodGuide
       def capture(&b)
         output = nil
         error = nil
+        callback_called = false
+
         b.call do |*args|
+          callback_called = true
+
           # Rhino doesn't get "this", but V8 does.
           args.shift unless defined?(JRUBY_VERSION)
           error, output = args[0..1]
         end
 
+        raise "callback never called" unless callback_called
+
         [output, error]
       end
     end
@@ -395,11 +404,13 @@ module GoodGuide
       end
 
       class Console
-        def log
-          @log ||= if defined?(JRUBY_VERSION)
-            proc { |*a| puts a.map(&:to_s).join(' ') }
-          else
-            proc { |_, *a| puts a.map(&:to_s).join(' ') }
+        if defined?(JRUBY_VERSION)
+          def log
+            @log ||= proc { |*a| puts a.map(&:to_s).join(' ') }
+          end
+        else
+          def log
+            @log ||= proc { |_, *a| puts a.map(&:to_s).join(' ') }
           end
         end
       end

data/vendor/gibbon/lib/gibbon.browser.dev.js

@@ -420,7 +420,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   return Parsimmon;
 })()
 // Generated by CoffeeScript 1.6.3
-var AST, CachingPromise, CompMap, CompiledCode, ContinuationTrace, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, Promise, RVal, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, UnitPromise, Value, VarTrace, Variant, allocate, analyze, applyOp1, applyOp2, asyncMap, catLists, contIter, contMap, equalArrays, eval_, genId, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
+var AST, CachingPromise, CompiledCode, ContinuationTrace, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, Promise, RVal, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, UnitPromise, Value, VarTrace, Variant, allocate, analyze, applyOp1, applyOp2, asyncMap, catLists, contIter, contMap, equalArrays, eval_, genId, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
   __slice = [].slice,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
@@ -807,6 +807,15 @@ Map = (function() {
     });
   };
 
+  Map.prototype.size = function() {
+    var out;
+    out = 0;
+    this.each(function() {
+      return out += 1;
+    });
+    return out;
+  };
+
   Map.prototype.keys = function() {
     var out;
     out = [];
@@ -825,6 +834,25 @@ Map = (function() {
     return out;
   };
 
+  Map.prototype.eachAsync = function(f, cb) {
+    var isAsync, output, remaining, responder;
+    output = null;
+    remaining = this.size();
+    responder = function(k) {
+      return function() {
+        remaining -= 1;
+        if (remaining <= 0) {
+          return output = cb();
+        }
+      };
+    };
+    this.each(function(k, v) {
+      return f(k, v, responder(k));
+    });
+    isAsync = true;
+    return output;
+  };
+
   return Map;
 
 })();
@@ -873,9 +901,7 @@ Gibbon.Hash = Hash = (function(_super) {
     for (k in this) {
       if (!__hasProp.call(this, k)) continue;
       v = this[k];
-      if (k.slice(0, saltLen) === salt) {
-        _results.push(f(k.slice(saltLen), v));
-      }
+      _results.push(f(k.slice(saltLen), v));
     }
     return _results;
   };
@@ -921,124 +947,6 @@ Gibbon.ObjHash = ObjHash = (function(_super) {
 
   return ObjHash;
 
-})(Hash);
-
-CompMap = (function(_super) {
-  __extends(CompMap, _super);
-
-  function CompMap(fn) {
-    if (fn == null) {
-      fn = (function(x, y) {
-        return x === y;
-      });
-    }
-    CompMap.__super__.constructor.apply(this, arguments);
-    this.compare = fn;
-    this.keys = [];
-    this.values = [];
-  }
-
-  CompMap.prototype.addBinding = function(k, v) {
-    this.keys.push(k);
-    this.values.push(v);
-    return v;
-  };
-
-  CompMap.prototype.keyIndex = function(k) {
-    var i, key, _i, _len, _ref2;
-    _ref2 = this.keys;
-    for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-      key = _ref2[i];
-      if (this.compare(key, k)) {
-        return i;
-      }
-    }
-    return null;
-  };
-
-  CompMap.prototype.has = function(k) {
-    return this.keyIndex(k) != null;
-  };
-
-  CompMap.prototype.get = function(k) {
-    var index;
-    index = this.keyIndex(k);
-    return (index != null) && this.values[index];
-  };
-
-  CompMap.prototype.set = function(k, v) {
-    var index;
-    index = this.keyIndex(k);
-    if (index != null) {
-      return this.values[index] = v;
-    } else {
-      return this.addBinding(k, v);
-    }
-  };
-
-  CompMap.prototype.each = function(f) {
-    var i, k, _i, _len, _ref2, _results;
-    _ref2 = this.keys;
-    _results = [];
-    for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-      k = _ref2[i];
-      _results.push(f(k, this.values[i]));
-    }
-    return _results;
-  };
-
-  CompMap.prototype.eachAsync = function(f, cb) {
-    var i, k, keys, output, responder, seen, _i, _len;
-    keys = this.keys;
-    if (keys.length === 0) {
-      return;
-    }
-    output = null;
-    seen = 0;
-    responder = function(i) {
-      return function() {
-        seen += 1;
-        if (seen >= keys.length) {
-          return output = cb();
-        }
-      };
-    };
-    for (i = _i = 0, _len = keys.length; _i < _len; i = ++_i) {
-      k = keys[i];
-      f(k, this.values[i], responder(i));
-    }
-    return output;
-  };
-
-  CompMap.prototype.fetch = function(k, f) {
-    var index;
-    index = this.keyIndex(k);
-    if (index != null) {
-      return this.values[index];
-    } else {
-      return f();
-    }
-  };
-
-  CompMap.prototype.fetchAsync = function(k, f, cb) {
-    var index;
-    index = this.keyIndex(k);
-    if (index != null) {
-      return cb(this.values[index]);
-    } else {
-      return f(cb);
-    }
-  };
-
-  CompMap.prototype.cache = function(k, f) {
-    var _this = this;
-    return this.fetch(k, function() {
-      return _this.addBinding(k, f());
-    });
-  };
-
-  return CompMap;
-
 })(Map);
 
 List = (function(_super) {
@@ -1123,6 +1031,10 @@ Gibbon.AST = AST = (function(_super) {
     return out.join('');
   };
 
+  AST.prototype.hash = function() {
+    return "" + this.loc.start + "-" + this.loc.end;
+  };
+
   AST.prototype.inspect = function() {
     var useValue;
     useValue = function(_, x) {
@@ -1708,6 +1620,8 @@ Gibbon.Type = Type = (function(_super) {
 })(Variant);
 
 Gibbon.TypeExpr = TypeExpr = (function(_super) {
+  var uniqError;
+
   __extends(TypeExpr, _super);
 
   function TypeExpr() {
@@ -1717,7 +1631,7 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
 
   TypeExpr.variants({
     expr: ['expr'],
-    variable: ['name'],
+    variable: ['name', 'uniq'],
     query: ['input', 'scope', 'query'],
     destructure: ['constraint', 'name', 'argnum'],
     "native": ['id'],
@@ -1766,8 +1680,8 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
           return _results;
         })()).join(' ')) + ")";
       },
-      variable: function(name) {
-        return "%" + name;
+      variable: function(name, uniq) {
+        return "%" + name + uniq;
       },
       query: function(input, _, query) {
         return "" + (input.inspect()) + "[" + (query.inspect()) + "]";
@@ -1813,7 +1727,6 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
   };
 
   TypeExpr.prototype.equals = function(other) {
-    var _this = this;
     if (this._tag !== other._tag) {
       return false;
     }
@@ -1855,46 +1768,94 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
         }
         return constraint.equals(other.constraint);
       },
-      other: function() {
-        return _this === other;
+      any: function() {
+        return true;
+      },
+      variable: function(_, uniq) {
+        return uniq === other.uniq;
       }
     });
   };
 
-  TypeExpr.fromAST = function(typeAST, scope) {
-    var e, r;
-    r = function(ast) {
-      return TypeExpr.fromAST(ast, scope);
-    };
-    e = TypeExpr;
-    return typeAST.cases({
-      concrete: function(name) {
-        if (typeof Type[name] !== 'function') {
-          throw new Error("unknown type " + name);
+  uniqError = 0;
+
+  TypeExpr.prototype.hash = function() {
+    var recurse;
+    return this.__hash__ || (this.__hash__ = (recurse = function(texpr) {
+      return texpr.cases({
+        expr: function(e) {
+          return "<" + (e.hash()) + ">";
+        },
+        query: function(input, scope, query) {
+          return "" + (query.inspect()) + ":" + scope.uniq + "[" + (recurse(input)) + "]";
+        },
+        "native": function(id) {
+          return "!" + id;
+        },
+        param: function(name, constraints) {
+          var c;
+          return "(" + name + " " + (((function() {
+            var _i, _len, _results;
+            _results = [];
+            for (_i = 0, _len = constraints.length; _i < _len; _i++) {
+              c = constraints[_i];
+              _results.push(recurse(c));
+            }
+            return _results;
+          })()).join(' ')) + ")";
+        },
+        destructure: function(constraint, name, argnum) {
+          return "" + (recurse(constraint)) + "/" + name + "[" + argnum + "]";
+        },
+        any: function() {
+          return '*';
+        },
+        variable: function(name, uniq) {
+          return "%" + uniq;
+        },
+        error: function() {
+          return "!" + (uniqError += 1);
         }
-        return e.param(name, []);
-      },
-      variable: function(name) {
-        return scope.cache(name, function() {
-          return e.variable(name);
-        });
-      },
-      "native": function(id) {
-        return e["native"](id);
-      },
-      wildcard: function() {
-        return e.any();
-      },
-      list: function(el) {
-        return e.param('list', [r(el)]);
-      },
-      block: function(el) {
-        return e.param('block', [r(el.from), r(el.to)]);
-      },
-      pair: function(first, second) {
-        return e.param('pair', [r(first), r(second)]);
-      }
-    });
+      });
+    })(this));
+  };
+
+  TypeExpr.fromAST = function(typeAST, scope, genUniq) {
+    var r;
+    return (r = function(typeAST) {
+      var e;
+      e = TypeExpr;
+      return typeAST.cases({
+        concrete: function(name) {
+          DEBUG(function() {
+            if (typeof Type[name] !== 'function') {
+              throw new Error("unknown type " + name);
+            }
+          });
+          return TypeExpr.param(name, []);
+        },
+        variable: function(name) {
+          return scope.cache(name, function() {
+            return TypeExpr.variable(name, genUniq());
+          });
+        },
+        "native": function(id) {
+          return TypeExpr["native"](id);
+        },
+        wildcard: function() {
+          return TypeExpr.any();
+        },
+        list: function(el) {
+          return e.param('list', [r(el)]);
+        },
+        block: function(el) {
+          return e.param('block', [r(el.from), r(el.to)]);
+        },
+        pair: function(first, second) {
+          return e.param('pair', [r(first), r(second)]);
+        }
+      });
+    })(typeAST);
   };
 
   TypeExpr.fromType = function(t) {
@@ -1975,15 +1936,28 @@ analyze = Gibbon.analyze = (function() {
       function NativeContext(globalID, externalLookup) {
         this.globalID = globalID;
         this.externalLookup = externalLookup;
+        this.queryCache = new Hash;
+        this.genUniq = (function() {
+          var i;
+          i = 0;
+          return function() {
+            return i += 1;
+          };
+        })();
       }
 
       NativeContext.prototype.query = function(id, query, cb) {
+        var cacheKey,
+          _this = this;
+        cacheKey = "" + id + "/" + query.type + " " + (query.args.join(' '));
+        if (this.queryCache.has(cacheKey)) {
+          return Thunk.trampoline(cb(this.queryCache.get(cacheKey)));
+        }
         return this.externalLookup.call(null, id, query, Type, function(err, analysis) {
-          if (err) {
-            return Thunk.trampoline(cb(TypeLookup.error(err)));
-          } else {
-            return Thunk.trampoline(cb(TypeLookup.response(query, analysis)));
-          }
+          var result;
+          result = err ? TypeLookup.error(err) : TypeLookup.response(query, analysis);
+          _this.queryCache.set(cacheKey, result);
+          return Thunk.trampoline(cb(result));
         });
       };
 
@@ -2003,6 +1977,7 @@ analyze = Gibbon.analyze = (function() {
         this.frame = frame;
         this.context = context;
         this.bindings = new Hash;
+        this.uniq = this.context.genUniq();
       }
 
       Scope.prototype.extend = function(name, frame) {
@@ -2087,7 +2062,7 @@ analyze = Gibbon.analyze = (function() {
             return push(TypeExpr.expr(flow), TypeExpr.param('pair', [TypeExpr.expr(first), TypeExpr.expr(second)]));
           },
           func: function(_, name, args) {
-            var arg, ast, func, i, input, scope, _i, _len, _results;
+            var arg, ast, func, genUniq, i, input, scope, _i, _len, _results;
             if (!stdlib.hasOwnProperty(name)) {
               push(TypeExpr.expr(flow.head), TypeExpr.error('func', [flow.head]));
               return;
@@ -2096,17 +2071,18 @@ analyze = Gibbon.analyze = (function() {
             ast = func.type;
             scope = new Hash;
             flow.head.__scope__ = scope;
-            input = TypeExpr.fromAST(ast.input, scope);
+            genUniq = _this.context.genUniq;
+            input = TypeExpr.fromAST(ast.input, scope, genUniq);
             if (flow.tail) {
               push(TypeExpr.expr(flow.tail), input);
             } else {
               push(input, global);
             }
-            push(TypeExpr.expr(flow), TypeExpr.fromAST(ast.output, scope));
+            push(TypeExpr.expr(flow), TypeExpr.fromAST(ast.output, scope, genUniq));
             _results = [];
             for (i = _i = 0, _len = args.length; _i < _len; i = ++_i) {
               arg = args[i];
-              push(TypeExpr.expr(arg), TypeExpr.fromAST(ast.args[i], scope));
+              push(TypeExpr.expr(arg), TypeExpr.fromAST(ast.args[i], scope, genUniq));
               _results.push(_this.analyzeFlow(arg, global, push));
             }
             return _results;
@@ -2126,7 +2102,7 @@ analyze = Gibbon.analyze = (function() {
           },
           list: function(_, elements) {
             var el, elVar, _i, _len, _results;
-            elVar = TypeExpr.variable('el');
+            elVar = TypeExpr.variable('el', _this.context.genUniq());
             push(TypeExpr.expr(flow), TypeExpr.param('list', [elVar]));
             _results = [];
             for (_i = 0, _len = elements.length; _i < _len; _i++) {
@@ -2138,7 +2114,7 @@ analyze = Gibbon.analyze = (function() {
           },
           block: function(_, subFlow) {
             var input;
-            input = TypeExpr.variable('.input');
+            input = TypeExpr.variable('.input', _this.context.genUniq());
             push(TypeExpr.expr(flow), TypeExpr.param('block', [input, TypeExpr.expr(subFlow)]));
             return _this.analyzeFlow(subFlow, input, push);
           },
@@ -2236,9 +2212,7 @@ analyze = Gibbon.analyze = (function() {
     return function(constraintMap, finish) {
       var errors, frameTypes, initialCrumbs, k, locks, semantics, solutions, solveEntry;
       errors = [];
-      solutions = new CompMap(function(x, y) {
-        return x.equals(y);
-      });
+      solutions = new ObjHash;
       semantics = new Hash;
       frameTypes = new Hash;
       locks = new Hash;
@@ -2252,7 +2226,7 @@ analyze = Gibbon.analyze = (function() {
         _ref10 = constraintMap.get(key), frame = _ref10.frame, constraints = _ref10.constraints;
         DEBUG.log('locking', key);
         locks.set(key, true);
-        semanticAccessors = new CompMap;
+        semanticAccessors = new ObjHash;
         dependencies = [];
         DEBUG(function() {
           var lhs, rhs, _i, _len, _ref11, _results;
@@ -2264,9 +2238,11 @@ analyze = Gibbon.analyze = (function() {
           return _results;
         });
         substitute = function(texpr, cb) {
-          return solutions.fetchAsync(texpr, (function() {
+          if (solutions.has(texpr)) {
+            return cb(solutions.get(texpr));
+          } else {
             return texpr.mapAsync(substitute, cb);
-          }), cb);
+          }
         };
         fullSubstitute = function(texpr, cb) {
           return substitute(texpr, function(substituted) {

data/vendor/gibbon/lib/gibbon.browser.js

@@ -420,7 +420,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   return Parsimmon;
 })()
 // Generated by CoffeeScript 1.6.3
-var AST, CachingPromise, CompMap, CompiledCode, ContinuationTrace, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, Promise, RVal, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, UnitPromise, Value, VarTrace, Variant, allocate, analyze, applyOp1, applyOp2, asyncMap, catLists, contIter, contMap, equalArrays, eval_, genId, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
+var AST, CachingPromise, CompiledCode, ContinuationTrace, Core, DEBUG, Dependency, Failure, Gibbon, Hash, JS, List, Map, ObjHash, Promise, RVal, Semantic, Step, Thunk, Trace, Type, TypeAST, TypeExpr, TypeLookup, UnitPromise, Value, VarTrace, Variant, allocate, analyze, applyOp1, applyOp2, asyncMap, catLists, contIter, contMap, equalArrays, eval_, genId, isArray, nameGen, parse, stdlib, uniq, _ref, _ref1, _ref10, _ref11, _ref12, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
   __slice = [].slice,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
@@ -797,6 +797,15 @@ Map = (function() {
     });
   };
 
+  Map.prototype.size = function() {
+    var out;
+    out = 0;
+    this.each(function() {
+      return out += 1;
+    });
+    return out;
+  };
+
   Map.prototype.keys = function() {
     var out;
     out = [];
@@ -815,6 +824,25 @@ Map = (function() {
     return out;
   };
 
+  Map.prototype.eachAsync = function(f, cb) {
+    var isAsync, output, remaining, responder;
+    output = null;
+    remaining = this.size();
+    responder = function(k) {
+      return function() {
+        remaining -= 1;
+        if (remaining <= 0) {
+          return output = cb();
+        }
+      };
+    };
+    this.each(function(k, v) {
+      return f(k, v, responder(k));
+    });
+    isAsync = true;
+    return output;
+  };
+
   return Map;
 
 })();
@@ -863,9 +891,7 @@ Gibbon.Hash = Hash = (function(_super) {
     for (k in this) {
       if (!__hasProp.call(this, k)) continue;
       v = this[k];
-      if (k.slice(0, saltLen) === salt) {
-        _results.push(f(k.slice(saltLen), v));
-      }
+      _results.push(f(k.slice(saltLen), v));
     }
     return _results;
   };
@@ -911,124 +937,6 @@ Gibbon.ObjHash = ObjHash = (function(_super) {
 
   return ObjHash;
 
-})(Hash);
-
-CompMap = (function(_super) {
-  __extends(CompMap, _super);
-
-  function CompMap(fn) {
-    if (fn == null) {
-      fn = (function(x, y) {
-        return x === y;
-      });
-    }
-    CompMap.__super__.constructor.apply(this, arguments);
-    this.compare = fn;
-    this.keys = [];
-    this.values = [];
-  }
-
-  CompMap.prototype.addBinding = function(k, v) {
-    this.keys.push(k);
-    this.values.push(v);
-    return v;
-  };
-
-  CompMap.prototype.keyIndex = function(k) {
-    var i, key, _i, _len, _ref2;
-    _ref2 = this.keys;
-    for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-      key = _ref2[i];
-      if (this.compare(key, k)) {
-        return i;
-      }
-    }
-    return null;
-  };
-
-  CompMap.prototype.has = function(k) {
-    return this.keyIndex(k) != null;
-  };
-
-  CompMap.prototype.get = function(k) {
-    var index;
-    index = this.keyIndex(k);
-    return (index != null) && this.values[index];
-  };
-
-  CompMap.prototype.set = function(k, v) {
-    var index;
-    index = this.keyIndex(k);
-    if (index != null) {
-      return this.values[index] = v;
-    } else {
-      return this.addBinding(k, v);
-    }
-  };
-
-  CompMap.prototype.each = function(f) {
-    var i, k, _i, _len, _ref2, _results;
-    _ref2 = this.keys;
-    _results = [];
-    for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-      k = _ref2[i];
-      _results.push(f(k, this.values[i]));
-    }
-    return _results;
-  };
-
-  CompMap.prototype.eachAsync = function(f, cb) {
-    var i, k, keys, output, responder, seen, _i, _len;
-    keys = this.keys;
-    if (keys.length === 0) {
-      return;
-    }
-    output = null;
-    seen = 0;
-    responder = function(i) {
-      return function() {
-        seen += 1;
-        if (seen >= keys.length) {
-          return output = cb();
-        }
-      };
-    };
-    for (i = _i = 0, _len = keys.length; _i < _len; i = ++_i) {
-      k = keys[i];
-      f(k, this.values[i], responder(i));
-    }
-    return output;
-  };
-
-  CompMap.prototype.fetch = function(k, f) {
-    var index;
-    index = this.keyIndex(k);
-    if (index != null) {
-      return this.values[index];
-    } else {
-      return f();
-    }
-  };
-
-  CompMap.prototype.fetchAsync = function(k, f, cb) {
-    var index;
-    index = this.keyIndex(k);
-    if (index != null) {
-      return cb(this.values[index]);
-    } else {
-      return f(cb);
-    }
-  };
-
-  CompMap.prototype.cache = function(k, f) {
-    var _this = this;
-    return this.fetch(k, function() {
-      return _this.addBinding(k, f());
-    });
-  };
-
-  return CompMap;
-
 })(Map);
 
 List = (function(_super) {
@@ -1113,6 +1021,10 @@ Gibbon.AST = AST = (function(_super) {
     return out.join('');
   };
 
+  AST.prototype.hash = function() {
+    return "" + this.loc.start + "-" + this.loc.end;
+  };
+
   AST.prototype.inspect = function() {
     var useValue;
     useValue = function(_, x) {
@@ -1698,6 +1610,8 @@ Gibbon.Type = Type = (function(_super) {
 })(Variant);
 
 Gibbon.TypeExpr = TypeExpr = (function(_super) {
+  var uniqError;
+
   __extends(TypeExpr, _super);
 
   function TypeExpr() {
@@ -1707,7 +1621,7 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
 
   TypeExpr.variants({
     expr: ['expr'],
-    variable: ['name'],
+    variable: ['name', 'uniq'],
     query: ['input', 'scope', 'query'],
     destructure: ['constraint', 'name', 'argnum'],
     "native": ['id'],
@@ -1756,8 +1670,8 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
           return _results;
         })()).join(' ')) + ")";
       },
-      variable: function(name) {
-        return "%" + name;
+      variable: function(name, uniq) {
+        return "%" + name + uniq;
       },
       query: function(input, _, query) {
         return "" + (input.inspect()) + "[" + (query.inspect()) + "]";
@@ -1803,7 +1717,6 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
   };
 
   TypeExpr.prototype.equals = function(other) {
-    var _this = this;
     if (this._tag !== other._tag) {
       return false;
     }
@@ -1845,46 +1758,90 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
         }
         return constraint.equals(other.constraint);
       },
-      other: function() {
-        return _this === other;
+      any: function() {
+        return true;
+      },
+      variable: function(_, uniq) {
+        return uniq === other.uniq;
       }
     });
   };
 
-  TypeExpr.fromAST = function(typeAST, scope) {
-    var e, r;
-    r = function(ast) {
-      return TypeExpr.fromAST(ast, scope);
-    };
-    e = TypeExpr;
-    return typeAST.cases({
-      concrete: function(name) {
-        if (typeof Type[name] !== 'function') {
-          throw new Error("unknown type " + name);
+  uniqError = 0;
+
+  TypeExpr.prototype.hash = function() {
+    var recurse;
+    return this.__hash__ || (this.__hash__ = (recurse = function(texpr) {
+      return texpr.cases({
+        expr: function(e) {
+          return "<" + (e.hash()) + ">";
+        },
+        query: function(input, scope, query) {
+          return "" + (query.inspect()) + ":" + scope.uniq + "[" + (recurse(input)) + "]";
+        },
+        "native": function(id) {
+          return "!" + id;
+        },
+        param: function(name, constraints) {
+          var c;
+          return "(" + name + " " + (((function() {
+            var _i, _len, _results;
+            _results = [];
+            for (_i = 0, _len = constraints.length; _i < _len; _i++) {
+              c = constraints[_i];
+              _results.push(recurse(c));
+            }
+            return _results;
+          })()).join(' ')) + ")";
+        },
+        destructure: function(constraint, name, argnum) {
+          return "" + (recurse(constraint)) + "/" + name + "[" + argnum + "]";
+        },
+        any: function() {
+          return '*';
+        },
+        variable: function(name, uniq) {
+          return "%" + uniq;
+        },
+        error: function() {
+          return "!" + (uniqError += 1);
         }
-        return e.param(name, []);
-      },
-      variable: function(name) {
-        return scope.cache(name, function() {
-          return e.variable(name);
-        });
-      },
-      "native": function(id) {
-        return e["native"](id);
-      },
-      wildcard: function() {
-        return e.any();
-      },
-      list: function(el) {
-        return e.param('list', [r(el)]);
-      },
-      block: function(el) {
-        return e.param('block', [r(el.from), r(el.to)]);
-      },
-      pair: function(first, second) {
-        return e.param('pair', [r(first), r(second)]);
-      }
-    });
+      });
+    })(this));
+  };
+
+  TypeExpr.fromAST = function(typeAST, scope, genUniq) {
+    var r;
+    return (r = function(typeAST) {
+      var e;
+      e = TypeExpr;
+      return typeAST.cases({
+        concrete: function(name) {
+          
+          return TypeExpr.param(name, []);
+        },
+        variable: function(name) {
+          return scope.cache(name, function() {
+            return TypeExpr.variable(name, genUniq());
+          });
+        },
+        "native": function(id) {
+          return TypeExpr["native"](id);
+        },
+        wildcard: function() {
+          return TypeExpr.any();
+        },
+        list: function(el) {
+          return e.param('list', [r(el)]);
+        },
+        block: function(el) {
+          return e.param('block', [r(el.from), r(el.to)]);
+        },
+        pair: function(first, second) {
+          return e.param('pair', [r(first), r(second)]);
+        }
+      });
+    })(typeAST);
   };
 
   TypeExpr.fromType = function(t) {
@@ -1965,15 +1922,28 @@ analyze = Gibbon.analyze = (function() {
       function NativeContext(globalID, externalLookup) {
         this.globalID = globalID;
         this.externalLookup = externalLookup;
+        this.queryCache = new Hash;
+        this.genUniq = (function() {
+          var i;
+          i = 0;
+          return function() {
+            return i += 1;
+          };
+        })();
       }
 
       NativeContext.prototype.query = function(id, query, cb) {
+        var cacheKey,
+          _this = this;
+        cacheKey = "" + id + "/" + query.type + " " + (query.args.join(' '));
+        if (this.queryCache.has(cacheKey)) {
+          return Thunk.trampoline(cb(this.queryCache.get(cacheKey)));
+        }
         return this.externalLookup.call(null, id, query, Type, function(err, analysis) {
-          if (err) {
-            return Thunk.trampoline(cb(TypeLookup.error(err)));
-          } else {
-            return Thunk.trampoline(cb(TypeLookup.response(query, analysis)));
-          }
+          var result;
+          result = err ? TypeLookup.error(err) : TypeLookup.response(query, analysis);
+          _this.queryCache.set(cacheKey, result);
+          return Thunk.trampoline(cb(result));
         });
       };
 
@@ -1993,6 +1963,7 @@ analyze = Gibbon.analyze = (function() {
         this.frame = frame;
         this.context = context;
         this.bindings = new Hash;
+        this.uniq = this.context.genUniq();
       }
 
       Scope.prototype.extend = function(name, frame) {
@@ -2077,7 +2048,7 @@ analyze = Gibbon.analyze = (function() {
             return push(TypeExpr.expr(flow), TypeExpr.param('pair', [TypeExpr.expr(first), TypeExpr.expr(second)]));
           },
           func: function(_, name, args) {
-            var arg, ast, func, i, input, scope, _i, _len, _results;
+            var arg, ast, func, genUniq, i, input, scope, _i, _len, _results;
             if (!stdlib.hasOwnProperty(name)) {
               push(TypeExpr.expr(flow.head), TypeExpr.error('func', [flow.head]));
               return;
@@ -2086,17 +2057,18 @@ analyze = Gibbon.analyze = (function() {
             ast = func.type;
             scope = new Hash;
             flow.head.__scope__ = scope;
-            input = TypeExpr.fromAST(ast.input, scope);
+            genUniq = _this.context.genUniq;
+            input = TypeExpr.fromAST(ast.input, scope, genUniq);
             if (flow.tail) {
               push(TypeExpr.expr(flow.tail), input);
             } else {
               push(input, global);
             }
-            push(TypeExpr.expr(flow), TypeExpr.fromAST(ast.output, scope));
+            push(TypeExpr.expr(flow), TypeExpr.fromAST(ast.output, scope, genUniq));
             _results = [];
             for (i = _i = 0, _len = args.length; _i < _len; i = ++_i) {
               arg = args[i];
-              push(TypeExpr.expr(arg), TypeExpr.fromAST(ast.args[i], scope));
+              push(TypeExpr.expr(arg), TypeExpr.fromAST(ast.args[i], scope, genUniq));
               _results.push(_this.analyzeFlow(arg, global, push));
             }
             return _results;
@@ -2116,7 +2088,7 @@ analyze = Gibbon.analyze = (function() {
           },
           list: function(_, elements) {
             var el, elVar, _i, _len, _results;
-            elVar = TypeExpr.variable('el');
+            elVar = TypeExpr.variable('el', _this.context.genUniq());
             push(TypeExpr.expr(flow), TypeExpr.param('list', [elVar]));
             _results = [];
             for (_i = 0, _len = elements.length; _i < _len; _i++) {
@@ -2128,7 +2100,7 @@ analyze = Gibbon.analyze = (function() {
           },
           block: function(_, subFlow) {
             var input;
-            input = TypeExpr.variable('.input');
+            input = TypeExpr.variable('.input', _this.context.genUniq());
             push(TypeExpr.expr(flow), TypeExpr.param('block', [input, TypeExpr.expr(subFlow)]));
             return _this.analyzeFlow(subFlow, input, push);
           },
@@ -2224,9 +2196,7 @@ analyze = Gibbon.analyze = (function() {
     return function(constraintMap, finish) {
       var errors, frameTypes, initialCrumbs, k, locks, semantics, solutions, solveEntry;
       errors = [];
-      solutions = new CompMap(function(x, y) {
-        return x.equals(y);
-      });
+      solutions = new ObjHash;
       semantics = new Hash;
       frameTypes = new Hash;
       locks = new Hash;
@@ -2240,13 +2210,15 @@ analyze = Gibbon.analyze = (function() {
         _ref10 = constraintMap.get(key), frame = _ref10.frame, constraints = _ref10.constraints;
         
         locks.set(key, true);
-        semanticAccessors = new CompMap;
+        semanticAccessors = new ObjHash;
         dependencies = [];
         
         substitute = function(texpr, cb) {
-          return solutions.fetchAsync(texpr, (function() {
+          if (solutions.has(texpr)) {
+            return cb(solutions.get(texpr));
+          } else {
             return texpr.mapAsync(substitute, cb);
-          }), cb);
+          }
         };
         fullSubstitute = function(texpr, cb) {
           return substitute(texpr, function(substituted) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies: []
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email:
@@ -50,3 +50,4 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for the gibbon data language
 test_files: []
+has_rdoc: