goodguide-gibbon 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57ae9392c5410133c5f4ada1b4246a722a072238
-  data.tar.gz: 394c30d1756a87b8c9a8792374d0092502b03960
+  metadata.gz: 7bfe6e644dc8dbda3f8054e1c36b805956387529
+  data.tar.gz: 33de5acdaf0e4a3f489b8cdaab289ec96a63c1eb
 SHA512:
-  metadata.gz: 6f565286601f57bd33b64b2078138b72839a97ca5071220c6143fb511fed5ce08ee72841543f34cf83a8c48a93d991c6b26aa77a7cc39a13125953fde3d5c01a
-  data.tar.gz: 128ce3a70b585711f7d5cfd20f5ca2d4ce41f66d58035c80fedb821564b95ef1aae86e190fdb80ce46f959864c7f8d6d7af647a25fed521555ecddda225dfae4
+  metadata.gz: 267c82933e85a791ce21c1a940f68c6ec1983c5cb4144dae9cd523bc602794150f4e717e72e08ea7d20ab16e967a3b5fbbb27edb9dbef78d608a673bb78272bc
+  data.tar.gz: e1187c03ea3bbe127376c01fac81e0a9d45870947d7889d5659c93a518d175ba399f126b4a194b63f25097a325ad56ad4920b364b9e89ada50a96177877fc8d7

data/Gemfile

@@ -8,7 +8,6 @@ gem 'wrong'
 gem 'pry'
 
 platforms :ruby do
-  gem 'pry-debugger'
   gem 'therubyracer', '= 0.12.1'
 end
 

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.10.1'
+      '0.10.2'
     end
   end
 end

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

@@ -116,46 +116,53 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
     }
   }
 
-  function parseError(stream, result) {
-    var expected = result.expected;
-    var i = result.furthest;
+  function assertParser(p) {
+    if (!(p instanceof Parser)) throw new Error('not a parser: '+p);
+  }
+
+  var formatError = Parsimmon.formatError = function(stream, error) {
+    var expected = error.expected;
+    var i = error.index;
 
     if (i === stream.length) {
-      var message = 'expected ' + expected + ', got the end of the string';
-    }
-    else {
-      var prefix = (i > 0 ? "'..." : "'");
-      var suffix = (stream.length - i > 12 ? "...'" : "'");
-      var message = 'expected ' + expected + ' at character ' + i + ', got '
-        + prefix + stream.slice(i, i+12) + suffix;
+      return 'expected ' + expected + ', got the end of the string';
     }
-    throw 'Parse Error: ' + message + "\n    parsing: '" + stream + "'";
-  }
+
+    var prefix = (i > 0 ? "'..." : "'");
+    var suffix = (stream.length - i > 12 ? "...'" : "'");
+    return (
+      'expected ' + expected + ' at character ' + i + ', got ' +
+      prefix + stream.slice(i, i+12) + suffix
+    );
+  };
 
   _.init = function(body) { this._ = body; };
 
   _.parse = function(stream) {
     var result = this.skip(eof)._(stream, 0);
 
-    return result.status ? result.value : parseError(stream, result);
+    return result.status ? {
+      status: true,
+      value: result.value
+    } : {
+      status: false,
+      index: result.furthest,
+      expected: result.expected
+    };
   };
 
   // -*- primitive combinators -*- //
   _.or = function(alternative) {
-    return alt([this, alternative]);
+    return alt(this, alternative);
   };
 
   _.then = function(next) {
-    var self = this;
-
-    return Parser(function(stream, i) {
-      var result = self._(stream, i);
-
-      if (!result.status) return result;
+    if (typeof next === 'function') {
+      throw new Error('chaining features of .then are no longer supported');
+    }
 
-      var nextParser = (next instanceof Parser ? next : next(result.value));
-      return furthestBacktrackFor(nextParser._(stream, result.index), result);
-    });
+    assertParser(next);
+    return seq(this, next).map(function(results) { return results[1]; });
   };
 
   // -*- optimized iterative combinators -*- //
@@ -257,7 +264,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   _.atMost = function(n) { return this.times(0, n); };
   _.atLeast = function(n) {
     var self = this;
-    return seq([this.times(n), this.many()]).map(function(results) {
+    return seq(this.times(n), this.many()).map(function(results) {
       return results[0].concat(results[1]);
     });
   };
@@ -272,11 +279,11 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   };
 
   _.skip = function(next) {
-    return seq([this, next]).map(function(results) { return results[0]; });
+    return seq(this, next).map(function(results) { return results[0]; });
   };
 
   _.mark = function() {
-    return seq([index, this, index]).map(function(results) {
+    return seq(index, this, index).map(function(results) {
       return { start: results[0], value: results[1], end: results[2] };
     });
   };
@@ -357,12 +364,15 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   };
 
   // [Parser a] -> Parser [a]
-  var seq = Parsimmon.seq = function(parsers) {
+  var seq = Parsimmon.seq = function() {
+    var parsers = [].slice.call(arguments);
+    var numParsers = parsers.length;
+
     return Parser(function(stream, i) {
       var result;
-      var accum = new Array(parsers.length);
+      var accum = new Array(numParsers);
 
-      for (var j = 0; j < parsers.length; j += 1) {
+      for (var j = 0; j < numParsers; j += 1) {
         result = furthestBacktrackFor(parsers[j]._(stream, i), result);
         if (!result.status) return result;
         accum[j] = result.value
@@ -373,7 +383,11 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
     });
   };
 
-  var alt = Parsimmon.alt = function(parsers) {
+  var alt = Parsimmon.alt = function() {
+    var parsers = [].slice.call(arguments);
+    var numParsers = parsers.length;
+    if (numParsers === 0) return fail('zero alternates')
+
     return Parser(function(stream, i) {
       var result;
       for (var j = 0; j < parsers.length; j += 1) {
@@ -398,13 +412,21 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   _.of = Parser.of = Parsimmon.of = succeed
 
   _.ap = function(other) {
-    return seq([this, other]).map(function(results) {
+    return seq(this, other).map(function(results) {
       return results[0](results[1]);
     });
   };
 
   //- Monad
-  _.chain = _.then;
+  _.chain = function(f) {
+    var self = this;
+    return Parser(function(stream, i) {
+      var result = self._(stream, i);
+      if (!result.status) return result;
+      var nextParser = f(result.value);
+      return furthestBacktrackFor(nextParser._(stream, result.index), result);
+    });
+  };
 });
   return Parsimmon;
 })()
@@ -1145,7 +1167,7 @@ Gibbon.TypeAST = TypeAST = (function(_super) {
 })(Variant);
 
 parse = Gibbon.parse = (function() {
-  var accessor, accessorExpr, arrow, arrowType, assertString, blankLines, blockExpr, blockType, comma, commaSepFlows, comment, component, concrete, decimal, decimalExpr, defaulted, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, identifier, innerFrame, integer, integerExpr, isString, label, labelVal, lazy, lbrace, lbrack, lexeme, lexical, lexicalExpr, lines, listExpr, listType, lparen, lsplat, metadata, multiline, name, nonDefaultedFlow, nonPairedFlow, numericExpr, opt, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, queryArg, queryExpr, rbrace, rbrack, regex, rparen, rsplat, seq, signature, simpleType, singletonFlow, spanLoc, squishListExpr, str, string, stringExpr, substExpr, succeed, tag, tassign, type, typeVar, variable, whitespace, wildType, wildcard, withLoc,
+  var accessor, accessorExpr, arrow, arrowType, assertString, blankLines, blockExpr, blockType, comma, commaSepFlows, comment, component, concrete, decimal, decimalExpr, defaulted, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, handleResult, identifier, innerFrame, integer, integerExpr, isString, label, labelVal, lazy, lbrace, lbrack, lexeme, lexical, lexicalExpr, lines, listExpr, listType, lparen, lsplat, metadata, multiline, name, nonDefaultedFlow, nonPairedFlow, numericExpr, opt, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, queryArg, queryExpr, rbrace, rbrack, regex, rparen, rsplat, seq, signature, simpleType, singletonFlow, spanLoc, squishListExpr, str, string, stringExpr, substExpr, succeed, tag, tassign, type, typeVar, variable, whitespace, wildType, wildcard, withLoc,
     _this = this;
   tag = function(name, parser) {
     return Parsimmon.Parser(function(stream, i) {
@@ -1245,9 +1267,9 @@ parse = Gibbon.parse = (function() {
   lexicalExpr = withLoc(lexical, function(loc, name) {
     return AST.lexical(loc, name, []);
   });
-  queryExpr = query.then(function(q) {
+  queryExpr = query.chain(function(q) {
     var args;
-    args = seq([lbrack, queryArg.many(), rbrack]).map(function(_arg) {
+    args = seq(lbrack, queryArg.many(), rbrack).map(function(_arg) {
       var a, args, loc, r, _;
       _ = _arg[0], args = _arg[1], r = _arg[2];
       loc = spanLoc(q, r);
@@ -1268,28 +1290,28 @@ parse = Gibbon.parse = (function() {
     return lparen.then(flow).skip(rparen);
   });
   substExpr = lazy(function() {
-    return seq([lparen, flow, rparen]).map(function(_arg) {
+    return seq(lparen, flow, rparen).map(function(_arg) {
       var fl, l, r;
       l = _arg[0], fl = _arg[1], r = _arg[2];
       return AST.subst(spanLoc(l, r), fl);
     });
   });
   listExpr = lazy(function() {
-    return seq([lbrack, commaSepFlows, rbrack]).map(function(_arg) {
+    return seq(lbrack, commaSepFlows, rbrack).map(function(_arg) {
       var els, l, r;
       l = _arg[0], els = _arg[1], r = _arg[2];
       return AST.list(spanLoc(l, r), els, false);
     });
   });
   squishListExpr = lazy(function() {
-    return seq([lsplat, commaSepFlows, rsplat]).map(function(_arg) {
+    return seq(lsplat, commaSepFlows, rsplat).map(function(_arg) {
       var els, l, r;
       l = _arg[0], els = _arg[1], r = _arg[2];
       return AST.list(spanLoc(l, r), els, true);
     });
   });
   blockExpr = lazy(function() {
-    return seq([lbrace, flow, rbrace]).map(function(_arg) {
+    return seq(lbrace, flow, rbrace).map(function(_arg) {
       var flow, l, r;
       l = _arg[0], flow = _arg[1], r = _arg[2];
       return AST.block(spanLoc(l, r), flow);
@@ -1299,7 +1321,7 @@ parse = Gibbon.parse = (function() {
   singletonFlow = expr.map(function(e) {
     return AST.flow(e.loc, e, null);
   });
-  func = seq([name, parenFlow.or(singletonFlow).many()]).map(function(_arg) {
+  func = seq(name, parenFlow.or(singletonFlow).many()).map(function(_arg) {
     var args, loc, name;
     name = _arg[0], args = _arg[1];
     loc = {
@@ -1312,7 +1334,7 @@ parse = Gibbon.parse = (function() {
     return AST.func(loc, name.value, args);
   });
   component = expr.or(func).skip(lines);
-  nonPairedFlow = seq([component, arrow.then(component).many()]).map(function(_arg) {
+  nonPairedFlow = seq(component, arrow.then(component).many()).map(function(_arg) {
     var comp, cursor, first, rest, _i, _len;
     first = _arg[0], rest = _arg[1];
     cursor = AST.flow(first.loc, first, null);
@@ -1336,7 +1358,7 @@ parse = Gibbon.parse = (function() {
       return AST.flow(loc, AST.defaulted(loc, body, alternative), null);
     });
   }));
-  commaSepFlows = seq([flow.skip(seq([opt(comma, lines)])).many(), opt(flow)]).map(function(_arg) {
+  commaSepFlows = seq(flow.skip(seq(opt(comma, lines))).many(), opt(flow)).map(function(_arg) {
     var els, final;
     els = _arg[0], final = _arg[1];
     if (final) {
@@ -1344,24 +1366,24 @@ parse = Gibbon.parse = (function() {
     }
     return els;
   });
-  metadata = seq([label, labelVal]).map(function(key, text) {
+  metadata = seq(label, labelVal).map(function(key, text) {
     return AST.metadata(spanLoc(key, text), key.value, text.value);
   });
   definition = lazy(function() {
-    return seq([metadata.many(), name, define.then(innerFrame)]).map(function(_arg) {
+    return seq(metadata.many(), name, define.then(innerFrame)).map(function(_arg) {
       var fl, loc, md, n, _ref5;
       md = _arg[0], n = _arg[1], fl = _arg[2];
       loc = spanLoc(((_ref5 = md[0]) != null ? _ref5.loc : void 0) || n, fl);
       return AST.definition(loc, md, n.value, fl);
     });
   });
-  frame = seq([definition.many(), flow]).map(function(_arg) {
+  frame = seq(definition.many(), flow).map(function(_arg) {
     var defs, flow, loc;
     defs = _arg[0], flow = _arg[1];
     loc = spanLoc((defs[0] || flow).loc, flow.loc);
     return AST.frame(loc, defs, flow);
   });
-  parenFrame = seq([lparen, frame, rparen, lines]).map(function(_arg) {
+  parenFrame = seq(lparen, frame, rparen, lines).map(function(_arg) {
     var fr, l, r, _;
     l = _arg[0], fr = _arg[1], r = _arg[2], _ = _arg[3];
     fr.loc = spanLoc(l, r);
@@ -1381,7 +1403,7 @@ parse = Gibbon.parse = (function() {
   });
   wildType = wildcard.result(TypeAST.wildcard());
   listType = lazy(function() {
-    return seq([lbrack, type, rbrack]).map(function(_arg) {
+    return seq(lbrack, type, rbrack).map(function(_arg) {
       var t, _, __;
       _ = _arg[0], t = _arg[1], __ = _arg[2];
       return TypeAST.list(t);
@@ -1401,12 +1423,12 @@ parse = Gibbon.parse = (function() {
       return TypeAST.pair(first, second);
     });
   });
-  arrowType = seq([type, arrow, type]).map(function(_arg) {
+  arrowType = seq(type, arrow, type).map(function(_arg) {
     var first, second, _;
     first = _arg[0], _ = _arg[1], second = _arg[2];
     return TypeAST.arrow(first, second);
   });
-  signature = seq([name, type.many(), tassign.then(arrowType)]).map(function(_arg) {
+  signature = seq(name, type.many(), tassign.then(arrowType)).map(function(_arg) {
     var argTypes, ftype, name;
     name = _arg[0], argTypes = _arg[1], ftype = _arg[2];
     return TypeAST.func(ftype.from, argTypes, ftype.to);
@@ -1420,13 +1442,20 @@ parse = Gibbon.parse = (function() {
       throw 'can only parse strings';
     }
   };
+  handleResult = function(result) {
+    if (result.status) {
+      return result.value;
+    } else {
+      throw new Error(Parsimmon.formatError(result));
+    }
+  };
   parse = function(str) {
     assertString(str);
-    return program.parse(str);
+    return handleResult(program.parse(str));
   };
   parse.type = function(str) {
     assertString(str);
-    return fullSignature.parse(str);
+    return handleResult(fullSignature.parse(str));
   };
   return parse;
 })();
@@ -3522,36 +3551,157 @@ Gibbon.optimize = (function() {
     });
   };
   insertBindings = (function() {
-    var findLastCommon, genSubstitutions, makeCrumbs, simplify;
+    var SubstTree, findLastCommon, genSubstitutions, insertSubstitutions, makeCrumbs, _ref10;
+    SubstTree = (function(_super) {
+      __extends(SubstTree, _super);
+
+      function SubstTree() {
+        _ref10 = SubstTree.__super__.constructor.apply(this, arguments);
+        return _ref10;
+      }
+
+      SubstTree.variants({
+        subst: ['bindings', 'expr']
+      });
+
+      SubstTree.prototype.toCore = function() {
+        return this.__toCore || (this.__toCore = this.expr.map(function(x) {
+          return x.toCore();
+        }));
+      };
+
+      SubstTree.prototype.inspect = function() {
+        var e;
+        if (!this.bindings.length) {
+          return this.expr.inspect();
+        }
+        return "(subst [" + (((function() {
+          var _i, _len, _ref11, _results;
+          _ref11 = this.bindings;
+          _results = [];
+          for (_i = 0, _len = _ref11.length; _i < _len; _i++) {
+            e = _ref11[_i];
+            _results.push(e.inspect());
+          }
+          return _results;
+        }).call(this)).join(' ')) + "] " + (this.expr.inspect()) + ")";
+      };
+
+      SubstTree.prototype.map = function(f) {
+        var e;
+        return SubstTree.subst((function() {
+          var _i, _len, _ref11, _results;
+          _ref11 = this.bindings;
+          _results = [];
+          for (_i = 0, _len = _ref11.length; _i < _len; _i++) {
+            e = _ref11[_i];
+            _results.push(e.map(f));
+          }
+          return _results;
+        }).call(this), this.expr.map(f));
+      };
+
+      SubstTree.prototype.substituteWith = function(names, bindableExprs) {
+        var bindable, core, hash, i, _i, _len;
+        core = this.toCore();
+        hash = core.hash();
+        for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
+          bindable = bindableExprs[i];
+          if (hash === bindable.toCore().hash()) {
+            return SubstTree.unit(Core.variable(names[i]));
+          }
+        }
+        return this.map(function(x) {
+          return x.substituteWith(names, bindableExprs);
+        });
+      };
+
+      SubstTree.prototype.simplify = function() {
+        var bindableExprs, expr;
+        bindableExprs = this.bindings;
+        expr = this.expr;
+        return expr.cases({
+          rescue: function() {
+            return SubstTree.unit(this.map(function(x) {
+              return insertSubstitutions(x.toCore());
+            }));
+          },
+          squishList: function(list) {
+            list = list.toCore();
+            if (list._tag !== 'list') {
+              throw 'invalid squish';
+            }
+            return SubstTree.unit(Core.squishList(SubstTree.unit(list.map(insertSubstitutions))));
+          },
+          other: function() {
+            var bindable, i, names, out, substituted, _, _i, _len;
+            substituted = expr.map(function(t) {
+              return t.simplify();
+            });
+            names = (function() {
+              var _i, _len, _results;
+              _results = [];
+              for (_i = 0, _len = bindableExprs.length; _i < _len; _i++) {
+                _ = bindableExprs[_i];
+                _results.push(nameGen('b'));
+              }
+              return _results;
+            })();
+            if (!bindableExprs.length) {
+              return SubstTree.unit(substituted);
+            }
+            out = SubstTree.unit(substituted).substituteWith(names, bindableExprs);
+            for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
+              bindable = bindableExprs[i];
+              out = SubstTree.unit(Core.bind(names[i], bindable, out));
+            }
+            DEBUG.log("=> " + (out.inspect()));
+            return out;
+          }
+        });
+      };
+
+      SubstTree.unit = function(expr) {
+        return SubstTree.subst([], expr);
+      };
+
+      return SubstTree;
+
+    })(Variant);
     makeCrumbs = function(trace) {
       return trace.mapArray(function(e) {
         return e.hash();
       }).reverse();
     };
     genSubstitutions = function(expr) {
-      var newTrace, occurrences, queue, sub, substitutions, trace, _i, _len, _ref10, _ref11, _ref12;
+      var occurrences, queue, recurse, substitutions;
       occurrences = new ObjHash;
       substitutions = new Hash;
       queue = [[expr, List.empty()]];
       while (queue.length) {
-        _ref10 = queue.shift(), expr = _ref10[0], trace = _ref10[1];
-        if (expr.isSimple() || expr.alwaysFails()) {
-          continue;
-        }
-        if (occurrences.has(expr)) {
-          occurrences.get(expr).push(makeCrumbs(trace));
-        } else {
-          occurrences.set(expr, [makeCrumbs(trace)]);
-          newTrace = trace.cons(expr);
-          if ((_ref11 = expr._tag) === 'rescue' || _ref11 === 'squishList') {
-            continue;
+        (function(_arg) {
+          var expr, newTrace, sub, trace, _i, _len, _ref11, _ref12, _results;
+          expr = _arg[0], trace = _arg[1];
+          if (expr.isSimple() || expr.alwaysFails()) {
+            return;
           }
-          _ref12 = expr.subtrees();
-          for (_i = 0, _len = _ref12.length; _i < _len; _i++) {
-            sub = _ref12[_i];
-            queue.push([sub, newTrace]);
+          if (occurrences.has(expr)) {
+            return occurrences.get(expr).push(makeCrumbs(trace));
+          } else {
+            occurrences.set(expr, [makeCrumbs(trace)]);
+            newTrace = trace.cons(expr);
+            if ((_ref11 = expr._tag) === 'rescue' || _ref11 === 'squishList') {
+              return;
+            }
+            _ref12 = expr.subtrees();
+            _results = [];
+            for (_i = 0, _len = _ref12.length; _i < _len; _i++) {
+              sub = _ref12[_i];
+              _results.push(queue.push([sub, newTrace]));
+            }
+            return _results;
           }
-        }
+        })(queue.shift());
       }
       occurrences.each(function(expr, crumbs) {
         var insertionPoint;
@@ -3564,7 +3714,22 @@ Gibbon.optimize = (function() {
         });
         return substitutions.get(insertionPoint).push(expr);
       });
-      return substitutions;
+      return (recurse = function(expr) {
+        var bindableExprs, e;
+        bindableExprs = substitutions.get(expr.hash());
+        if (!bindableExprs) {
+          return SubstTree.unit(expr.map(recurse));
+        }
+        return SubstTree.subst((function() {
+          var _i, _len, _results;
+          _results = [];
+          for (_i = 0, _len = bindableExprs.length; _i < _len; _i++) {
+            e = bindableExprs[_i];
+            _results.push(recurse(e));
+          }
+          return _results;
+        })(), expr.map(recurse));
+      })(expr);
     };
     findLastCommon = function(_arg) {
       var i, last, refCrumb, reference, rest, testCrumbs, _i, _j, _len, _len1;
@@ -3582,66 +3747,11 @@ Gibbon.optimize = (function() {
       }
       return refCrumb;
     };
-    simplify = function(expr, substitutions) {
-      var recurse;
-      return (recurse = function(expr) {
-        var bindable, bindableExprs, i, names, out, recurseInner, _, _i, _len;
-        bindableExprs = substitutions.get(expr.hash());
-        if (!bindableExprs) {
-          return expr.map(recurse);
-        }
-        names = (function() {
-          var _i, _len, _results;
-          _results = [];
-          for (_i = 0, _len = bindableExprs.length; _i < _len; _i++) {
-            _ = bindableExprs[_i];
-            _results.push(nameGen('b'));
-          }
-          return _results;
-        })();
-        DEBUG(function() {
-          var bindable, i, _i, _len, _results;
-          _results = [];
-          for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
-            bindable = bindableExprs[i];
-            _results.push(DEBUG.log("binding " + (bindable.inspect()) + " as " + names[i]));
-          }
-          return _results;
-        });
-        out = (recurseInner = function(boundExpr) {
-          var bindable, hash, i, _i, _len;
-          hash = boundExpr.hash();
-          for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
-            bindable = bindableExprs[i];
-            if (hash === bindable.hash()) {
-              return Core.variable(names[i]);
-            }
-          }
-          return boundExpr.cases({
-            rescue: function(expr, default_) {
-              return Core.rescue(insertBindings(expr), insertBindings(default_));
-            },
-            squishList: function(list) {
-              if (list._tag !== 'list') {
-                throw 'invalid squish';
-              }
-              return Core.squishList(list.map(insertBindings));
-            },
-            other: function() {
-              return this.map(recurseInner);
-            }
-          });
-        })(expr);
-        for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
-          bindable = bindableExprs[i];
-          out = Core.bind(names[i], bindable, out);
-        }
-        DEBUG.log("=> " + (out.inspect()));
-        return out.map(recurse);
-      })(expr);
+    insertSubstitutions = function(expr) {
+      return genSubstitutions(expr).simplify();
     };
     return function(expr) {
-      return simplify(expr, genSubstitutions(expr));
+      return insertSubstitutions(expr).toCore();
     };
   })();
   return function(expr) {
@@ -5066,7 +5176,7 @@ Gibbon.reduce = (function() {
 })();
 
 Gibbon.JS = JS = (function(_super) {
-  var inspectString, oldBlock, validIdent;
+  var inspectString, validIdent;
 
   __extends(JS, _super);
 
@@ -5095,15 +5205,6 @@ Gibbon.JS = JS = (function(_super) {
     varDecl: ['name']
   });
 
-  oldBlock = JS.block;
-
-  JS.block = function(s) {
-    if (!isArray(s)) {
-      throw 'lol';
-    }
-    return oldBlock(s);
-  };
-
   JS.prototype.toFunction = function() {
     return this.cases({
       func: function(name, args, block) {

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

@@ -116,46 +116,53 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
     }
   }
 
-  function parseError(stream, result) {
-    var expected = result.expected;
-    var i = result.furthest;
+  function assertParser(p) {
+    if (!(p instanceof Parser)) throw new Error('not a parser: '+p);
+  }
+
+  var formatError = Parsimmon.formatError = function(stream, error) {
+    var expected = error.expected;
+    var i = error.index;
 
     if (i === stream.length) {
-      var message = 'expected ' + expected + ', got the end of the string';
-    }
-    else {
-      var prefix = (i > 0 ? "'..." : "'");
-      var suffix = (stream.length - i > 12 ? "...'" : "'");
-      var message = 'expected ' + expected + ' at character ' + i + ', got '
-        + prefix + stream.slice(i, i+12) + suffix;
+      return 'expected ' + expected + ', got the end of the string';
     }
-    throw 'Parse Error: ' + message + "\n    parsing: '" + stream + "'";
-  }
+
+    var prefix = (i > 0 ? "'..." : "'");
+    var suffix = (stream.length - i > 12 ? "...'" : "'");
+    return (
+      'expected ' + expected + ' at character ' + i + ', got ' +
+      prefix + stream.slice(i, i+12) + suffix
+    );
+  };
 
   _.init = function(body) { this._ = body; };
 
   _.parse = function(stream) {
     var result = this.skip(eof)._(stream, 0);
 
-    return result.status ? result.value : parseError(stream, result);
+    return result.status ? {
+      status: true,
+      value: result.value
+    } : {
+      status: false,
+      index: result.furthest,
+      expected: result.expected
+    };
   };
 
   // -*- primitive combinators -*- //
   _.or = function(alternative) {
-    return alt([this, alternative]);
+    return alt(this, alternative);
   };
 
   _.then = function(next) {
-    var self = this;
-
-    return Parser(function(stream, i) {
-      var result = self._(stream, i);
-
-      if (!result.status) return result;
+    if (typeof next === 'function') {
+      throw new Error('chaining features of .then are no longer supported');
+    }
 
-      var nextParser = (next instanceof Parser ? next : next(result.value));
-      return furthestBacktrackFor(nextParser._(stream, result.index), result);
-    });
+    assertParser(next);
+    return seq(this, next).map(function(results) { return results[1]; });
   };
 
   // -*- optimized iterative combinators -*- //
@@ -257,7 +264,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   _.atMost = function(n) { return this.times(0, n); };
   _.atLeast = function(n) {
     var self = this;
-    return seq([this.times(n), this.many()]).map(function(results) {
+    return seq(this.times(n), this.many()).map(function(results) {
       return results[0].concat(results[1]);
     });
   };
@@ -272,11 +279,11 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   };
 
   _.skip = function(next) {
-    return seq([this, next]).map(function(results) { return results[0]; });
+    return seq(this, next).map(function(results) { return results[0]; });
   };
 
   _.mark = function() {
-    return seq([index, this, index]).map(function(results) {
+    return seq(index, this, index).map(function(results) {
       return { start: results[0], value: results[1], end: results[2] };
     });
   };
@@ -357,12 +364,15 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   };
 
   // [Parser a] -> Parser [a]
-  var seq = Parsimmon.seq = function(parsers) {
+  var seq = Parsimmon.seq = function() {
+    var parsers = [].slice.call(arguments);
+    var numParsers = parsers.length;
+
     return Parser(function(stream, i) {
       var result;
-      var accum = new Array(parsers.length);
+      var accum = new Array(numParsers);
 
-      for (var j = 0; j < parsers.length; j += 1) {
+      for (var j = 0; j < numParsers; j += 1) {
         result = furthestBacktrackFor(parsers[j]._(stream, i), result);
         if (!result.status) return result;
         accum[j] = result.value
@@ -373,7 +383,11 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
     });
   };
 
-  var alt = Parsimmon.alt = function(parsers) {
+  var alt = Parsimmon.alt = function() {
+    var parsers = [].slice.call(arguments);
+    var numParsers = parsers.length;
+    if (numParsers === 0) return fail('zero alternates')
+
     return Parser(function(stream, i) {
       var result;
       for (var j = 0; j < parsers.length; j += 1) {
@@ -398,13 +412,21 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
   _.of = Parser.of = Parsimmon.of = succeed
 
   _.ap = function(other) {
-    return seq([this, other]).map(function(results) {
+    return seq(this, other).map(function(results) {
       return results[0](results[1]);
     });
   };
 
   //- Monad
-  _.chain = _.then;
+  _.chain = function(f) {
+    var self = this;
+    return Parser(function(stream, i) {
+      var result = self._(stream, i);
+      if (!result.status) return result;
+      var nextParser = f(result.value);
+      return furthestBacktrackFor(nextParser._(stream, result.index), result);
+    });
+  };
 });
   return Parsimmon;
 })()
@@ -1135,7 +1157,7 @@ Gibbon.TypeAST = TypeAST = (function(_super) {
 })(Variant);
 
 parse = Gibbon.parse = (function() {
-  var accessor, accessorExpr, arrow, arrowType, assertString, blankLines, blockExpr, blockType, comma, commaSepFlows, comment, component, concrete, decimal, decimalExpr, defaulted, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, identifier, innerFrame, integer, integerExpr, isString, label, labelVal, lazy, lbrace, lbrack, lexeme, lexical, lexicalExpr, lines, listExpr, listType, lparen, lsplat, metadata, multiline, name, nonDefaultedFlow, nonPairedFlow, numericExpr, opt, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, queryArg, queryExpr, rbrace, rbrack, regex, rparen, rsplat, seq, signature, simpleType, singletonFlow, spanLoc, squishListExpr, str, string, stringExpr, substExpr, succeed, tag, tassign, type, typeVar, variable, whitespace, wildType, wildcard, withLoc,
+  var accessor, accessorExpr, arrow, arrowType, assertString, blankLines, blockExpr, blockType, comma, commaSepFlows, comment, component, concrete, decimal, decimalExpr, defaulted, define, definition, expr, fail, flow, fraction, fractionExpr, frame, freeFrame, fullSignature, func, funcPlaceholder, handleResult, identifier, innerFrame, integer, integerExpr, isString, label, labelVal, lazy, lbrace, lbrack, lexeme, lexical, lexicalExpr, lines, listExpr, listType, lparen, lsplat, metadata, multiline, name, nonDefaultedFlow, nonPairedFlow, numericExpr, opt, pair, parenFlow, parenFrame, parenType, percent, percentExpr, program, query, queryArg, queryExpr, rbrace, rbrack, regex, rparen, rsplat, seq, signature, simpleType, singletonFlow, spanLoc, squishListExpr, str, string, stringExpr, substExpr, succeed, tag, tassign, type, typeVar, variable, whitespace, wildType, wildcard, withLoc,
     _this = this;
   tag = function(name, parser) {
     return Parsimmon.Parser(function(stream, i) {
@@ -1235,9 +1257,9 @@ parse = Gibbon.parse = (function() {
   lexicalExpr = withLoc(lexical, function(loc, name) {
     return AST.lexical(loc, name, []);
   });
-  queryExpr = query.then(function(q) {
+  queryExpr = query.chain(function(q) {
     var args;
-    args = seq([lbrack, queryArg.many(), rbrack]).map(function(_arg) {
+    args = seq(lbrack, queryArg.many(), rbrack).map(function(_arg) {
       var a, args, loc, r, _;
       _ = _arg[0], args = _arg[1], r = _arg[2];
       loc = spanLoc(q, r);
@@ -1258,28 +1280,28 @@ parse = Gibbon.parse = (function() {
     return lparen.then(flow).skip(rparen);
   });
   substExpr = lazy(function() {
-    return seq([lparen, flow, rparen]).map(function(_arg) {
+    return seq(lparen, flow, rparen).map(function(_arg) {
       var fl, l, r;
       l = _arg[0], fl = _arg[1], r = _arg[2];
       return AST.subst(spanLoc(l, r), fl);
     });
   });
   listExpr = lazy(function() {
-    return seq([lbrack, commaSepFlows, rbrack]).map(function(_arg) {
+    return seq(lbrack, commaSepFlows, rbrack).map(function(_arg) {
       var els, l, r;
       l = _arg[0], els = _arg[1], r = _arg[2];
       return AST.list(spanLoc(l, r), els, false);
     });
   });
   squishListExpr = lazy(function() {
-    return seq([lsplat, commaSepFlows, rsplat]).map(function(_arg) {
+    return seq(lsplat, commaSepFlows, rsplat).map(function(_arg) {
       var els, l, r;
       l = _arg[0], els = _arg[1], r = _arg[2];
       return AST.list(spanLoc(l, r), els, true);
     });
   });
   blockExpr = lazy(function() {
-    return seq([lbrace, flow, rbrace]).map(function(_arg) {
+    return seq(lbrace, flow, rbrace).map(function(_arg) {
       var flow, l, r;
       l = _arg[0], flow = _arg[1], r = _arg[2];
       return AST.block(spanLoc(l, r), flow);
@@ -1289,7 +1311,7 @@ parse = Gibbon.parse = (function() {
   singletonFlow = expr.map(function(e) {
     return AST.flow(e.loc, e, null);
   });
-  func = seq([name, parenFlow.or(singletonFlow).many()]).map(function(_arg) {
+  func = seq(name, parenFlow.or(singletonFlow).many()).map(function(_arg) {
     var args, loc, name;
     name = _arg[0], args = _arg[1];
     loc = {
@@ -1302,7 +1324,7 @@ parse = Gibbon.parse = (function() {
     return AST.func(loc, name.value, args);
   });
   component = expr.or(func).skip(lines);
-  nonPairedFlow = seq([component, arrow.then(component).many()]).map(function(_arg) {
+  nonPairedFlow = seq(component, arrow.then(component).many()).map(function(_arg) {
     var comp, cursor, first, rest, _i, _len;
     first = _arg[0], rest = _arg[1];
     cursor = AST.flow(first.loc, first, null);
@@ -1326,7 +1348,7 @@ parse = Gibbon.parse = (function() {
       return AST.flow(loc, AST.defaulted(loc, body, alternative), null);
     });
   }));
-  commaSepFlows = seq([flow.skip(seq([opt(comma, lines)])).many(), opt(flow)]).map(function(_arg) {
+  commaSepFlows = seq(flow.skip(seq(opt(comma, lines))).many(), opt(flow)).map(function(_arg) {
     var els, final;
     els = _arg[0], final = _arg[1];
     if (final) {
@@ -1334,24 +1356,24 @@ parse = Gibbon.parse = (function() {
     }
     return els;
   });
-  metadata = seq([label, labelVal]).map(function(key, text) {
+  metadata = seq(label, labelVal).map(function(key, text) {
     return AST.metadata(spanLoc(key, text), key.value, text.value);
   });
   definition = lazy(function() {
-    return seq([metadata.many(), name, define.then(innerFrame)]).map(function(_arg) {
+    return seq(metadata.many(), name, define.then(innerFrame)).map(function(_arg) {
       var fl, loc, md, n, _ref5;
       md = _arg[0], n = _arg[1], fl = _arg[2];
       loc = spanLoc(((_ref5 = md[0]) != null ? _ref5.loc : void 0) || n, fl);
       return AST.definition(loc, md, n.value, fl);
     });
   });
-  frame = seq([definition.many(), flow]).map(function(_arg) {
+  frame = seq(definition.many(), flow).map(function(_arg) {
     var defs, flow, loc;
     defs = _arg[0], flow = _arg[1];
     loc = spanLoc((defs[0] || flow).loc, flow.loc);
     return AST.frame(loc, defs, flow);
   });
-  parenFrame = seq([lparen, frame, rparen, lines]).map(function(_arg) {
+  parenFrame = seq(lparen, frame, rparen, lines).map(function(_arg) {
     var fr, l, r, _;
     l = _arg[0], fr = _arg[1], r = _arg[2], _ = _arg[3];
     fr.loc = spanLoc(l, r);
@@ -1371,7 +1393,7 @@ parse = Gibbon.parse = (function() {
   });
   wildType = wildcard.result(TypeAST.wildcard());
   listType = lazy(function() {
-    return seq([lbrack, type, rbrack]).map(function(_arg) {
+    return seq(lbrack, type, rbrack).map(function(_arg) {
       var t, _, __;
       _ = _arg[0], t = _arg[1], __ = _arg[2];
       return TypeAST.list(t);
@@ -1391,12 +1413,12 @@ parse = Gibbon.parse = (function() {
       return TypeAST.pair(first, second);
     });
   });
-  arrowType = seq([type, arrow, type]).map(function(_arg) {
+  arrowType = seq(type, arrow, type).map(function(_arg) {
     var first, second, _;
     first = _arg[0], _ = _arg[1], second = _arg[2];
     return TypeAST.arrow(first, second);
   });
-  signature = seq([name, type.many(), tassign.then(arrowType)]).map(function(_arg) {
+  signature = seq(name, type.many(), tassign.then(arrowType)).map(function(_arg) {
     var argTypes, ftype, name;
     name = _arg[0], argTypes = _arg[1], ftype = _arg[2];
     return TypeAST.func(ftype.from, argTypes, ftype.to);
@@ -1410,13 +1432,20 @@ parse = Gibbon.parse = (function() {
       throw 'can only parse strings';
     }
   };
+  handleResult = function(result) {
+    if (result.status) {
+      return result.value;
+    } else {
+      throw new Error(Parsimmon.formatError(result));
+    }
+  };
   parse = function(str) {
     assertString(str);
-    return program.parse(str);
+    return handleResult(program.parse(str));
   };
   parse.type = function(str) {
     assertString(str);
-    return fullSignature.parse(str);
+    return handleResult(fullSignature.parse(str));
   };
   return parse;
 })();
@@ -3490,36 +3519,157 @@ Gibbon.optimize = (function() {
     });
   };
   insertBindings = (function() {
-    var findLastCommon, genSubstitutions, makeCrumbs, simplify;
+    var SubstTree, findLastCommon, genSubstitutions, insertSubstitutions, makeCrumbs, _ref10;
+    SubstTree = (function(_super) {
+      __extends(SubstTree, _super);
+
+      function SubstTree() {
+        _ref10 = SubstTree.__super__.constructor.apply(this, arguments);
+        return _ref10;
+      }
+
+      SubstTree.variants({
+        subst: ['bindings', 'expr']
+      });
+
+      SubstTree.prototype.toCore = function() {
+        return this.__toCore || (this.__toCore = this.expr.map(function(x) {
+          return x.toCore();
+        }));
+      };
+
+      SubstTree.prototype.inspect = function() {
+        var e;
+        if (!this.bindings.length) {
+          return this.expr.inspect();
+        }
+        return "(subst [" + (((function() {
+          var _i, _len, _ref11, _results;
+          _ref11 = this.bindings;
+          _results = [];
+          for (_i = 0, _len = _ref11.length; _i < _len; _i++) {
+            e = _ref11[_i];
+            _results.push(e.inspect());
+          }
+          return _results;
+        }).call(this)).join(' ')) + "] " + (this.expr.inspect()) + ")";
+      };
+
+      SubstTree.prototype.map = function(f) {
+        var e;
+        return SubstTree.subst((function() {
+          var _i, _len, _ref11, _results;
+          _ref11 = this.bindings;
+          _results = [];
+          for (_i = 0, _len = _ref11.length; _i < _len; _i++) {
+            e = _ref11[_i];
+            _results.push(e.map(f));
+          }
+          return _results;
+        }).call(this), this.expr.map(f));
+      };
+
+      SubstTree.prototype.substituteWith = function(names, bindableExprs) {
+        var bindable, core, hash, i, _i, _len;
+        core = this.toCore();
+        hash = core.hash();
+        for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
+          bindable = bindableExprs[i];
+          if (hash === bindable.toCore().hash()) {
+            return SubstTree.unit(Core.variable(names[i]));
+          }
+        }
+        return this.map(function(x) {
+          return x.substituteWith(names, bindableExprs);
+        });
+      };
+
+      SubstTree.prototype.simplify = function() {
+        var bindableExprs, expr;
+        bindableExprs = this.bindings;
+        expr = this.expr;
+        return expr.cases({
+          rescue: function() {
+            return SubstTree.unit(this.map(function(x) {
+              return insertSubstitutions(x.toCore());
+            }));
+          },
+          squishList: function(list) {
+            list = list.toCore();
+            if (list._tag !== 'list') {
+              throw 'invalid squish';
+            }
+            return SubstTree.unit(Core.squishList(SubstTree.unit(list.map(insertSubstitutions))));
+          },
+          other: function() {
+            var bindable, i, names, out, substituted, _, _i, _len;
+            substituted = expr.map(function(t) {
+              return t.simplify();
+            });
+            names = (function() {
+              var _i, _len, _results;
+              _results = [];
+              for (_i = 0, _len = bindableExprs.length; _i < _len; _i++) {
+                _ = bindableExprs[_i];
+                _results.push(nameGen('b'));
+              }
+              return _results;
+            })();
+            if (!bindableExprs.length) {
+              return SubstTree.unit(substituted);
+            }
+            out = SubstTree.unit(substituted).substituteWith(names, bindableExprs);
+            for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
+              bindable = bindableExprs[i];
+              out = SubstTree.unit(Core.bind(names[i], bindable, out));
+            }
+            
+            return out;
+          }
+        });
+      };
+
+      SubstTree.unit = function(expr) {
+        return SubstTree.subst([], expr);
+      };
+
+      return SubstTree;
+
+    })(Variant);
     makeCrumbs = function(trace) {
       return trace.mapArray(function(e) {
         return e.hash();
       }).reverse();
     };
     genSubstitutions = function(expr) {
-      var newTrace, occurrences, queue, sub, substitutions, trace, _i, _len, _ref10, _ref11, _ref12;
+      var occurrences, queue, recurse, substitutions;
       occurrences = new ObjHash;
       substitutions = new Hash;
       queue = [[expr, List.empty()]];
       while (queue.length) {
-        _ref10 = queue.shift(), expr = _ref10[0], trace = _ref10[1];
-        if (expr.isSimple() || expr.alwaysFails()) {
-          continue;
-        }
-        if (occurrences.has(expr)) {
-          occurrences.get(expr).push(makeCrumbs(trace));
-        } else {
-          occurrences.set(expr, [makeCrumbs(trace)]);
-          newTrace = trace.cons(expr);
-          if ((_ref11 = expr._tag) === 'rescue' || _ref11 === 'squishList') {
-            continue;
+        (function(_arg) {
+          var expr, newTrace, sub, trace, _i, _len, _ref11, _ref12, _results;
+          expr = _arg[0], trace = _arg[1];
+          if (expr.isSimple() || expr.alwaysFails()) {
+            return;
           }
-          _ref12 = expr.subtrees();
-          for (_i = 0, _len = _ref12.length; _i < _len; _i++) {
-            sub = _ref12[_i];
-            queue.push([sub, newTrace]);
+          if (occurrences.has(expr)) {
+            return occurrences.get(expr).push(makeCrumbs(trace));
+          } else {
+            occurrences.set(expr, [makeCrumbs(trace)]);
+            newTrace = trace.cons(expr);
+            if ((_ref11 = expr._tag) === 'rescue' || _ref11 === 'squishList') {
+              return;
+            }
+            _ref12 = expr.subtrees();
+            _results = [];
+            for (_i = 0, _len = _ref12.length; _i < _len; _i++) {
+              sub = _ref12[_i];
+              _results.push(queue.push([sub, newTrace]));
+            }
+            return _results;
           }
-        }
+        })(queue.shift());
       }
       occurrences.each(function(expr, crumbs) {
         var insertionPoint;
@@ -3532,7 +3682,22 @@ Gibbon.optimize = (function() {
         });
         return substitutions.get(insertionPoint).push(expr);
       });
-      return substitutions;
+      return (recurse = function(expr) {
+        var bindableExprs, e;
+        bindableExprs = substitutions.get(expr.hash());
+        if (!bindableExprs) {
+          return SubstTree.unit(expr.map(recurse));
+        }
+        return SubstTree.subst((function() {
+          var _i, _len, _results;
+          _results = [];
+          for (_i = 0, _len = bindableExprs.length; _i < _len; _i++) {
+            e = bindableExprs[_i];
+            _results.push(recurse(e));
+          }
+          return _results;
+        })(), expr.map(recurse));
+      })(expr);
     };
     findLastCommon = function(_arg) {
       var i, last, refCrumb, reference, rest, testCrumbs, _i, _j, _len, _len1;
@@ -3550,58 +3715,11 @@ Gibbon.optimize = (function() {
       }
       return refCrumb;
     };
-    simplify = function(expr, substitutions) {
-      var recurse;
-      return (recurse = function(expr) {
-        var bindable, bindableExprs, i, names, out, recurseInner, _, _i, _len;
-        bindableExprs = substitutions.get(expr.hash());
-        if (!bindableExprs) {
-          return expr.map(recurse);
-        }
-        names = (function() {
-          var _i, _len, _results;
-          _results = [];
-          for (_i = 0, _len = bindableExprs.length; _i < _len; _i++) {
-            _ = bindableExprs[_i];
-            _results.push(nameGen('b'));
-          }
-          return _results;
-        })();
-        
-        out = (recurseInner = function(boundExpr) {
-          var bindable, hash, i, _i, _len;
-          hash = boundExpr.hash();
-          for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
-            bindable = bindableExprs[i];
-            if (hash === bindable.hash()) {
-              return Core.variable(names[i]);
-            }
-          }
-          return boundExpr.cases({
-            rescue: function(expr, default_) {
-              return Core.rescue(insertBindings(expr), insertBindings(default_));
-            },
-            squishList: function(list) {
-              if (list._tag !== 'list') {
-                throw 'invalid squish';
-              }
-              return Core.squishList(list.map(insertBindings));
-            },
-            other: function() {
-              return this.map(recurseInner);
-            }
-          });
-        })(expr);
-        for (i = _i = 0, _len = bindableExprs.length; _i < _len; i = ++_i) {
-          bindable = bindableExprs[i];
-          out = Core.bind(names[i], bindable, out);
-        }
-        
-        return out.map(recurse);
-      })(expr);
+    insertSubstitutions = function(expr) {
+      return genSubstitutions(expr).simplify();
     };
     return function(expr) {
-      return simplify(expr, genSubstitutions(expr));
+      return insertSubstitutions(expr).toCore();
     };
   })();
   return function(expr) {
@@ -5026,7 +5144,7 @@ Gibbon.reduce = (function() {
 })();
 
 Gibbon.JS = JS = (function(_super) {
-  var inspectString, oldBlock, validIdent;
+  var inspectString, validIdent;
 
   __extends(JS, _super);
 
@@ -5055,15 +5173,6 @@ Gibbon.JS = JS = (function(_super) {
     varDecl: ['name']
   });
 
-  oldBlock = JS.block;
-
-  JS.block = function(s) {
-    if (!isArray(s)) {
-      throw 'lol';
-    }
-    return oldBlock(s);
-  };
-
   JS.prototype.toFunction = function() {
     return this.cases({
       func: function(name, args, block) {

data/vendor/gibbon/package.json

@@ -16,7 +16,7 @@
     "node-inspector": "0.2.x"
   },
   "dependencies": {
-    "parsimmon": "0.2.x",
+    "parsimmon": "0.4.x",
     "falafel": "0.2.x"
   },
   "scripts": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies: []
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email:
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: goodguide-gibbon
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the gibbon data language