goodguide-gibbon 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c61efe121d23db7a49c70a68f0a043a48dd8cc22
-  data.tar.gz: 0ba5e9f089eef69f035a5890086b3584c5199212
+  metadata.gz: 831fea2094e21661113b50208c2e16291c8652d8
+  data.tar.gz: 328f433998f64337ffafaa1a544ad6d5e0328048
 SHA512:
-  metadata.gz: 9808a033ec1fcdc705e4ddfd96b476d4537de9bcca07f0198df3d947da1fa741cc7e862c3d1a16ff7f1289acd486a2e3eb5c44c14ad13a3c8543790a60a17772
-  data.tar.gz: 2bb8a4a01ff84e2b29fbcb97bece26eed9ad56fb767aa0d59606b2d69ebe1be83ab3eaf4c4d1cb757f18dc1556b47ebd16af621712780c2894bb6f3beaa0681a
+  metadata.gz: 96890a4afd8ecc4eaffae303202959bfd78332b7a655bf9bd90a39afb54a8f494d42877698f6d24bf2c9fcfa96eca002d29564b9582f1af37ba862d805817660
+  data.tar.gz: 311a066787d1b17e512cc54b7048e61afcf9017dff422aa4f0f94e09a7014ed143faaf954a649e499f1a0fe60fa948a1aadc578d8cebbfd7cf30bebec926060b

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.8.3'
+      '0.9.0'
     end
   end
 end

data/lib/goodguide/gibbon.rb

@@ -330,7 +330,7 @@ module GoodGuide
         @last_annotations = annotations
         @last_id = id
 
-        query = get_query(query_type) or raise "invalid query type in compiled code: #{query_type.inspect}"
+        query = get_query(query_type) or raise "invalid query type in compiled code: #{query_type.inspect} with annotations #{annotations.inspect}"
         instance_exec(id, annotations, &query)
       end
 

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

@@ -1,14 +1,6 @@
 var Gibbon = (function(undefined) {
 var Parsimmon = (function(undefined) {
 var P = (function(prototype, ownProperty, undefined) {
-  // helper functions that also help minification
-  function isObject(o) { return typeof o === 'object'; }
-  function isFunction(f) { return typeof f === 'function'; }
-
-  // used to extend the prototypes of superclasses (which might not
-  // have `.Bare`s)
-  function SuperclassBare() {}
-
   return function P(_superclass /* = Object */, definition) {
     // handle the case where no superclass is given
     if (definition === undefined) {
@@ -18,69 +10,60 @@ var P = (function(prototype, ownProperty, undefined) {
 
     // C is the class to be returned.
     //
-    // It delegates to instantiating an instance of `Bare`, so that it
-    // will always return a new instance regardless of the calling
-    // context.
+    // When called, creates and initializes an instance of C, unless
+    // `this` is already an instance of C, then just initializes `this`;
+    // either way, returns the instance of C that was initialized.
     //
     //  TODO: the Chrome inspector shows all created objects as `C`
     //        rather than `Object`.  Setting the .name property seems to
     //        have no effect.  Is there a way to override this behavior?
     function C() {
-      var self = new Bare;
-      if (isFunction(self.init)) self.init.apply(self, arguments);
+      var self = this instanceof C ? this : new Bare;
+      self.init.apply(self, arguments);
       return self;
     }
 
-    // C.Bare is a class with a noop constructor.  Its prototype is the
-    // same as C, so that instances of C.Bare are also instances of C.
-    // New objects can be allocated without initialization by calling
-    // `new MyClass.Bare`.
+    // C.Bare is a class with a noop constructor.  Its prototype will be
+    // the same as C, so that instances of C.Bare are instances of C.
+    // `new MyClass.Bare` then creates new instances of C without
+    // calling .init().
     function Bare() {}
     C.Bare = Bare;
 
-    // Set up the prototype of the new class.
-    var _super = SuperclassBare[prototype] = _superclass[prototype];
-    var proto = Bare[prototype] = C[prototype] = C.p = new SuperclassBare;
-
-    // other variables, as a minifier optimization
-    var extensions;
+    // Extend the prototype chain: first use Bare to create an
+    // uninitialized instance of the superclass, then set up Bare
+    // to create instances of this class.
+    var _super = Bare[prototype] = _superclass[prototype];
+    var proto = Bare[prototype] = C[prototype] = C.p = new Bare;
 
+    // pre-declaring the iteration variable for the loop below to save
+    // a `var` keyword after minification
+    var key;
 
     // set the constructor property on the prototype, for convenience
     proto.constructor = C;
 
-    C.mixin = function(def) {
-      Bare[prototype] = C[prototype] = P(C, def)[prototype];
-      return C;
-    }
+    C.extend = function(def) { return P(C, def); }
 
     return (C.open = function(def) {
-      extensions = {};
-
-      if (isFunction(def)) {
+      if (typeof def === 'function') {
         // call the defining function with all the arguments you need
         // extensions captures the return value.
-        extensions = def.call(C, proto, _super, C, _superclass);
-      }
-      else if (isObject(def)) {
-        // if you passed an object instead, we'll take it
-        extensions = def;
+        def = def.call(C, proto, _super, C, _superclass);
       }
 
       // ...and extend it
-      if (isObject(extensions)) {
-        for (var ext in extensions) {
-          if (ownProperty.call(extensions, ext)) {
-            proto[ext] = extensions[ext];
+      if (typeof def === 'object') {
+        for (key in def) {
+          if (ownProperty.call(def, key)) {
+            proto[key] = def[key];
           }
         }
       }
 
-      // if there's no init, we assume we're inheriting a non-pjs class, so
-      // we default to applying the superclass's constructor.
-      if (!isFunction(proto.init)) {
-        proto.init = _superclass;
-      }
+      // if no init, assume we're inheriting from a non-Pjs class, so
+      // default to using the superclass constructor.
+      if (!('init' in proto)) proto.init = _superclass;
 
       return C;
     })(definition);
@@ -159,13 +142,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
 
   // -*- primitive combinators -*- //
   _.or = function(alternative) {
-    var self = this;
-
-    return Parser(function(stream, i) {
-      var result = self._(stream, i);
-
-      return result.status ? result : furthestBacktrackFor(alternative._(stream, i), result);
-    });
+    return alt([this, alternative]);
   };
 
   _.then = function(next) {
@@ -259,7 +236,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
         }
       }
 
-      for (; times < max && result; times += 1) {
+      for (; times < max; times += 1) {
         result = self._(stream, i);
         prevResult = furthestBacktrackFor(result, prevResult);
         if (result.status) {
@@ -394,7 +371,18 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
 
       return furthestBacktrackFor(makeSuccess(i, accum), result);
     });
-  }
+  };
+
+  var alt = Parsimmon.alt = function(parsers) {
+    return Parser(function(stream, i) {
+      var result;
+      for (var j = 0; j < parsers.length; j += 1) {
+        result = furthestBacktrackFor(parsers[j]._(stream, i), result);
+        if (result.status) return result;
+      }
+      return result;
+    });
+  };
 
   var index = Parsimmon.index = Parser(function(stream, i) {
     return makeSuccess(i, i);
@@ -402,8 +390,9 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
 
   //- fantasyland compat
 
-  //- Semigroup
-  _.concat = _.then;
+  //- Monoid (Alternative, really)
+  _.concat = _.or;
+  _.empty = fail('empty')
 
   //- Applicative
   _.of = Parser.of = Parsimmon.of = succeed
@@ -993,6 +982,7 @@ Gibbon.AST = AST = (function(_super) {
     list: ['loc', 'elements', 'squish'],
     defaulted: ['loc', 'body', 'alternative'],
     query: ['loc', 'type', 'args'],
+    lexical: ['loc', 'name', 'args'],
     func: ['loc', 'name', 'args'],
     pair: ['loc', 'first', 'second'],
     flow: ['loc', 'head', 'tail'],
@@ -1034,10 +1024,15 @@ Gibbon.AST = AST = (function(_super) {
       query: function(_, query, args) {
         if (query === 'access') {
           return "@" + args[0];
+        } else if (args.length) {
+          return "@:" + query + "[" + (args.join(' ')) + "]";
         } else {
-          return "." + query + " " + (args.join(' '));
+          return "@:" + query;
         }
       },
+      lexical: function(_, name, args) {
+        return "." + name;
+      },
       subst: function(_, flow) {
         return "(" + (flow.inspect()) + ")";
       },
@@ -1148,7 +1143,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, 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, 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) {
@@ -1210,9 +1205,10 @@ parse = Gibbon.parse = (function() {
   defaulted = multiline(string('|'));
   lsplat = multiline(string('[*'));
   rsplat = lexeme(string('*]'));
-  query = lexeme(string('.').then(identifier));
+  query = lexeme(string('@:').then(identifier));
   queryArg = lexeme(regex(/^\w[\w-]*/));
   accessor = lexeme(string('@').then(identifier));
+  lexical = lexeme(string('.').then(identifier));
   name = lexeme(identifier);
   str = lexeme(string("'").then(regex(/^[^']*/)).skip(string("'")));
   fraction = tag('a fraction', lexeme(regex(/^\d+\/\d+/)));
@@ -1244,10 +1240,13 @@ parse = Gibbon.parse = (function() {
   accessorExpr = withLoc(accessor, function(loc, name) {
     return AST.query(loc, 'access', [name]);
   });
-  queryExpr = seq([query, queryArg.many()]).map(function(_arg) {
-    var a, args, loc, q;
-    q = _arg[0], args = _arg[1];
-    loc = spanLoc(q, args[args.length - 1] || q);
+  lexicalExpr = withLoc(lexical, function(loc, name) {
+    return AST.lexical(loc, name, []);
+  });
+  queryExpr = seq([query, lbrack, queryArg.many(), rbrack]).map(function(_arg) {
+    var a, args, loc, q, _;
+    q = _arg[0], _ = _arg[1], args = _arg[2];
+    loc = spanLoc(q, rbrack);
     return AST.query(loc, q.value, (function() {
       var _i, _len, _results;
       _results = [];
@@ -1290,7 +1289,7 @@ parse = Gibbon.parse = (function() {
       return AST.block(spanLoc(l, r), flow);
     });
   });
-  expr = tag('an expr', queryExpr.or(accessorExpr.or(substExpr.or(squishListExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr))))))));
+  expr = tag('an expr', queryExpr.or(accessorExpr.or(lexicalExpr.or(substExpr.or(squishListExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr)))))))));
   singletonFlow = expr.map(function(e) {
     return AST.flow(e.loc, e, null);
   });
@@ -1657,6 +1656,7 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
     expr: ['expr'],
     variable: ['name', 'uniq'],
     query: ['input', 'scope', 'query'],
+    lexical: ['syntax', 'scope'],
     destructure: ['constraint', 'name', 'argnum'],
     "native": ['id'],
     param: ['name', 'constraints'],
@@ -1710,6 +1710,9 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
       query: function(input, _, query) {
         return "" + (input.inspect()) + "[" + (query.inspect()) + "]";
       },
+      lexical: function(syntax, scope) {
+        return "." + syntax.name + ":" + (scope.key());
+      },
       destructure: function(constraint, name, argnum) {
         return "" + (constraint.inspect()) + "/" + name + "[" + argnum + "]";
       },
@@ -1769,6 +1772,9 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
         query: function(input, scope, query) {
           return "" + (query.inspect()) + ":" + scope.uniq + "[" + (recurse(input)) + "]";
         },
+        lexical: function(syntax, scope) {
+          return "." + (syntax.hash()) + ":" + (scope.key());
+        },
         "native": function(id) {
           return "!" + id;
         },
@@ -1975,35 +1981,17 @@ analyze = Gibbon.analyze = (function() {
       };
 
       Scope.prototype.lookup = function(nativeId, query, cb) {
-        var lexical;
-        if (query.type === 'access' && nativeId === this.context.globalID) {
-          lexical = this.lexicalLookup(query.args[0]);
-          if (lexical) {
-            return cb(lexical);
-          } else {
-            return this.context.query(nativeId, query, cb);
-          }
-        } else {
-          return this.context.query(nativeId, query, cb);
-        }
+        return this.context.query(nativeId, query, cb);
       };
 
       Scope.prototype.lexicalLookup = function(name) {
-        var local;
-        local = this.lookupLocal(name);
-        if (local) {
-          return local;
-        }
-        if (this.parent) {
-          return this.parent.lexicalLookup(name);
-        }
-      };
-
-      Scope.prototype.lookupLocal = function(name) {
-        if (!this.bindings.has(name)) {
-          return null;
+        if (this.bindings.has(name)) {
+          return this.keyFor(name);
+        } else {
+          if (this.parent) {
+            return this.parent.lexicalLookup(name);
+          }
         }
-        return TypeLookup.local(this.keyFor(name));
       };
 
       makeKey = function(crumbs) {
@@ -2046,6 +2034,9 @@ analyze = Gibbon.analyze = (function() {
             input = flow.tail ? TypeExpr.expr(flow.tail) : global;
             return push(TypeExpr.expr(flow), TypeExpr.query(input, _this, flow.head));
           },
+          lexical: function(_, name) {
+            return push(TypeExpr.expr(flow), TypeExpr.lexical(flow.head, _this));
+          },
           pair: function(_, first, second) {
             _this.analyzeFlow(first, global, push);
             _this.analyzeFlow(second, global, push);
@@ -2152,6 +2143,7 @@ analyze = Gibbon.analyze = (function() {
         match: ['lhs', 'rhs'],
         destructure: ['type'],
         lookup: ['query', 'id', 'error'],
+        lexical: ['name', 'scope'],
         circular: ['crumbs'],
         func: ['node']
       });
@@ -2167,6 +2159,9 @@ analyze = Gibbon.analyze = (function() {
           lookup: function(query, id, error) {
             return "error looking up " + (query.inspect()) + " on " + id + ": " + error;
           },
+          lexical: function(name, scope) {
+            return "." + name + " is not defined in " + (scope.key());
+          },
           circular: function(crumbs) {
             return "circular reference: " + (crumbs.join(' -> '));
           },
@@ -2276,6 +2271,26 @@ analyze = Gibbon.analyze = (function() {
                 }));
               });
             },
+            lexical: function(syntax, scope) {
+              var lookupKey;
+              lookupKey = scope.lexicalLookup(syntax.name);
+              if (!lookupKey) {
+                return cb(error('lexical', name, scope));
+              }
+              semanticAccessors.set(syntax, Semantic.localAccessor(lookupKey));
+              dependencies.push(TypeLookup.local(lookupKey));
+              nextCrumbs = crumbs.concat([lookupKey]);
+              if (locks.get(lookupKey)) {
+                return cb(error('circular', nextCrumbs));
+              }
+              return new Thunk(function() {
+                return solveEntry(nextCrumbs, function() {
+                  return new Thunk(function() {
+                    return cb(frameTypes.get(lookupKey));
+                  });
+                });
+              });
+            },
             query: function(input, scope, query) {
               return simplify(input, function(x) {
                 return x.cases({
@@ -2292,22 +2307,6 @@ analyze = Gibbon.analyze = (function() {
                             type: analysis.type.toSexpr()
                           }));
                           return cb(TypeExpr.fromType(analysis.type));
-                        },
-                        local: function(key) {
-                          var localFrame;
-                          nextCrumbs = crumbs.concat([key]);
-                          semanticAccessors.set(query, Semantic.localAccessor(key));
-                          if (locks.get(key)) {
-                            return cb(error('circular', nextCrumbs));
-                          }
-                          localFrame = constraintMap.get(key).scope.frame;
-                          return new Thunk(function() {
-                            return solveEntry(nextCrumbs, function() {
-                              return new Thunk(function() {
-                                return cb(frameTypes.get(key));
-                              });
-                            });
-                          });
                         }
                       });
                     });
@@ -2348,6 +2347,9 @@ analyze = Gibbon.analyze = (function() {
                 }
                 return semanticAccessors.get(this);
               },
+              lexical: function(_, name) {
+                return semanticAccessors.get(this);
+              },
               func: function(_, name, args) {
                 var a, semArgs, solvedScope, typeScope;
                 typeScope = this.__scope__;
@@ -2413,7 +2415,9 @@ analyze = Gibbon.analyze = (function() {
             });
           });
           DEBUG.log('setting key: ' + key);
-          semantics.set(key, toSemanticTree(frame));
+          if (!errors.length) {
+            semantics.set(key, toSemanticTree(frame));
+          }
           frameTypes.set(key, solutions.get(TypeExpr.expr(frame.flow)));
           DEBUG.log('unlocking', key);
           locks.set(key, false);
@@ -5754,7 +5758,7 @@ stdlib = Gibbon.stdlib = (function() {
         index = index.failIf('index out of bounds', function(i) {
           return list.len().op2('<=', i);
         });
-        index = index.failIf('index out of bounds', function(i) {
+        index = index.failIf('index must be non-negative', function(i) {
           return i.op2('<', ZERO);
         });
         return list.delist(index);

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

@@ -1,14 +1,6 @@
 var Gibbon = (function(undefined) {
 var Parsimmon = (function(undefined) {
 var P = (function(prototype, ownProperty, undefined) {
-  // helper functions that also help minification
-  function isObject(o) { return typeof o === 'object'; }
-  function isFunction(f) { return typeof f === 'function'; }
-
-  // used to extend the prototypes of superclasses (which might not
-  // have `.Bare`s)
-  function SuperclassBare() {}
-
   return function P(_superclass /* = Object */, definition) {
     // handle the case where no superclass is given
     if (definition === undefined) {
@@ -18,69 +10,60 @@ var P = (function(prototype, ownProperty, undefined) {
 
     // C is the class to be returned.
     //
-    // It delegates to instantiating an instance of `Bare`, so that it
-    // will always return a new instance regardless of the calling
-    // context.
+    // When called, creates and initializes an instance of C, unless
+    // `this` is already an instance of C, then just initializes `this`;
+    // either way, returns the instance of C that was initialized.
     //
     //  TODO: the Chrome inspector shows all created objects as `C`
     //        rather than `Object`.  Setting the .name property seems to
     //        have no effect.  Is there a way to override this behavior?
     function C() {
-      var self = new Bare;
-      if (isFunction(self.init)) self.init.apply(self, arguments);
+      var self = this instanceof C ? this : new Bare;
+      self.init.apply(self, arguments);
       return self;
     }
 
-    // C.Bare is a class with a noop constructor.  Its prototype is the
-    // same as C, so that instances of C.Bare are also instances of C.
-    // New objects can be allocated without initialization by calling
-    // `new MyClass.Bare`.
+    // C.Bare is a class with a noop constructor.  Its prototype will be
+    // the same as C, so that instances of C.Bare are instances of C.
+    // `new MyClass.Bare` then creates new instances of C without
+    // calling .init().
     function Bare() {}
     C.Bare = Bare;
 
-    // Set up the prototype of the new class.
-    var _super = SuperclassBare[prototype] = _superclass[prototype];
-    var proto = Bare[prototype] = C[prototype] = C.p = new SuperclassBare;
-
-    // other variables, as a minifier optimization
-    var extensions;
+    // Extend the prototype chain: first use Bare to create an
+    // uninitialized instance of the superclass, then set up Bare
+    // to create instances of this class.
+    var _super = Bare[prototype] = _superclass[prototype];
+    var proto = Bare[prototype] = C[prototype] = C.p = new Bare;
 
+    // pre-declaring the iteration variable for the loop below to save
+    // a `var` keyword after minification
+    var key;
 
     // set the constructor property on the prototype, for convenience
     proto.constructor = C;
 
-    C.mixin = function(def) {
-      Bare[prototype] = C[prototype] = P(C, def)[prototype];
-      return C;
-    }
+    C.extend = function(def) { return P(C, def); }
 
     return (C.open = function(def) {
-      extensions = {};
-
-      if (isFunction(def)) {
+      if (typeof def === 'function') {
         // call the defining function with all the arguments you need
         // extensions captures the return value.
-        extensions = def.call(C, proto, _super, C, _superclass);
-      }
-      else if (isObject(def)) {
-        // if you passed an object instead, we'll take it
-        extensions = def;
+        def = def.call(C, proto, _super, C, _superclass);
       }
 
       // ...and extend it
-      if (isObject(extensions)) {
-        for (var ext in extensions) {
-          if (ownProperty.call(extensions, ext)) {
-            proto[ext] = extensions[ext];
+      if (typeof def === 'object') {
+        for (key in def) {
+          if (ownProperty.call(def, key)) {
+            proto[key] = def[key];
           }
         }
       }
 
-      // if there's no init, we assume we're inheriting a non-pjs class, so
-      // we default to applying the superclass's constructor.
-      if (!isFunction(proto.init)) {
-        proto.init = _superclass;
-      }
+      // if no init, assume we're inheriting from a non-Pjs class, so
+      // default to using the superclass constructor.
+      if (!('init' in proto)) proto.init = _superclass;
 
       return C;
     })(definition);
@@ -159,13 +142,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
 
   // -*- primitive combinators -*- //
   _.or = function(alternative) {
-    var self = this;
-
-    return Parser(function(stream, i) {
-      var result = self._(stream, i);
-
-      return result.status ? result : furthestBacktrackFor(alternative._(stream, i), result);
-    });
+    return alt([this, alternative]);
   };
 
   _.then = function(next) {
@@ -259,7 +236,7 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
         }
       }
 
-      for (; times < max && result; times += 1) {
+      for (; times < max; times += 1) {
         result = self._(stream, i);
         prevResult = furthestBacktrackFor(result, prevResult);
         if (result.status) {
@@ -394,7 +371,18 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
 
       return furthestBacktrackFor(makeSuccess(i, accum), result);
     });
-  }
+  };
+
+  var alt = Parsimmon.alt = function(parsers) {
+    return Parser(function(stream, i) {
+      var result;
+      for (var j = 0; j < parsers.length; j += 1) {
+        result = furthestBacktrackFor(parsers[j]._(stream, i), result);
+        if (result.status) return result;
+      }
+      return result;
+    });
+  };
 
   var index = Parsimmon.index = Parser(function(stream, i) {
     return makeSuccess(i, i);
@@ -402,8 +390,9 @@ Parsimmon.Parser = P(function(_, _super, Parser) {
 
   //- fantasyland compat
 
-  //- Semigroup
-  _.concat = _.then;
+  //- Monoid (Alternative, really)
+  _.concat = _.or;
+  _.empty = fail('empty')
 
   //- Applicative
   _.of = Parser.of = Parsimmon.of = succeed
@@ -983,6 +972,7 @@ Gibbon.AST = AST = (function(_super) {
     list: ['loc', 'elements', 'squish'],
     defaulted: ['loc', 'body', 'alternative'],
     query: ['loc', 'type', 'args'],
+    lexical: ['loc', 'name', 'args'],
     func: ['loc', 'name', 'args'],
     pair: ['loc', 'first', 'second'],
     flow: ['loc', 'head', 'tail'],
@@ -1024,10 +1014,15 @@ Gibbon.AST = AST = (function(_super) {
       query: function(_, query, args) {
         if (query === 'access') {
           return "@" + args[0];
+        } else if (args.length) {
+          return "@:" + query + "[" + (args.join(' ')) + "]";
         } else {
-          return "." + query + " " + (args.join(' '));
+          return "@:" + query;
         }
       },
+      lexical: function(_, name, args) {
+        return "." + name;
+      },
       subst: function(_, flow) {
         return "(" + (flow.inspect()) + ")";
       },
@@ -1138,7 +1133,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, 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, 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) {
@@ -1200,9 +1195,10 @@ parse = Gibbon.parse = (function() {
   defaulted = multiline(string('|'));
   lsplat = multiline(string('[*'));
   rsplat = lexeme(string('*]'));
-  query = lexeme(string('.').then(identifier));
+  query = lexeme(string('@:').then(identifier));
   queryArg = lexeme(regex(/^\w[\w-]*/));
   accessor = lexeme(string('@').then(identifier));
+  lexical = lexeme(string('.').then(identifier));
   name = lexeme(identifier);
   str = lexeme(string("'").then(regex(/^[^']*/)).skip(string("'")));
   fraction = tag('a fraction', lexeme(regex(/^\d+\/\d+/)));
@@ -1234,10 +1230,13 @@ parse = Gibbon.parse = (function() {
   accessorExpr = withLoc(accessor, function(loc, name) {
     return AST.query(loc, 'access', [name]);
   });
-  queryExpr = seq([query, queryArg.many()]).map(function(_arg) {
-    var a, args, loc, q;
-    q = _arg[0], args = _arg[1];
-    loc = spanLoc(q, args[args.length - 1] || q);
+  lexicalExpr = withLoc(lexical, function(loc, name) {
+    return AST.lexical(loc, name, []);
+  });
+  queryExpr = seq([query, lbrack, queryArg.many(), rbrack]).map(function(_arg) {
+    var a, args, loc, q, _;
+    q = _arg[0], _ = _arg[1], args = _arg[2];
+    loc = spanLoc(q, rbrack);
     return AST.query(loc, q.value, (function() {
       var _i, _len, _results;
       _results = [];
@@ -1280,7 +1279,7 @@ parse = Gibbon.parse = (function() {
       return AST.block(spanLoc(l, r), flow);
     });
   });
-  expr = tag('an expr', queryExpr.or(accessorExpr.or(substExpr.or(squishListExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr))))))));
+  expr = tag('an expr', queryExpr.or(accessorExpr.or(lexicalExpr.or(substExpr.or(squishListExpr.or(listExpr.or(stringExpr.or(blockExpr.or(numericExpr)))))))));
   singletonFlow = expr.map(function(e) {
     return AST.flow(e.loc, e, null);
   });
@@ -1647,6 +1646,7 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
     expr: ['expr'],
     variable: ['name', 'uniq'],
     query: ['input', 'scope', 'query'],
+    lexical: ['syntax', 'scope'],
     destructure: ['constraint', 'name', 'argnum'],
     "native": ['id'],
     param: ['name', 'constraints'],
@@ -1700,6 +1700,9 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
       query: function(input, _, query) {
         return "" + (input.inspect()) + "[" + (query.inspect()) + "]";
       },
+      lexical: function(syntax, scope) {
+        return "." + syntax.name + ":" + (scope.key());
+      },
       destructure: function(constraint, name, argnum) {
         return "" + (constraint.inspect()) + "/" + name + "[" + argnum + "]";
       },
@@ -1759,6 +1762,9 @@ Gibbon.TypeExpr = TypeExpr = (function(_super) {
         query: function(input, scope, query) {
           return "" + (query.inspect()) + ":" + scope.uniq + "[" + (recurse(input)) + "]";
         },
+        lexical: function(syntax, scope) {
+          return "." + (syntax.hash()) + ":" + (scope.key());
+        },
         "native": function(id) {
           return "!" + id;
         },
@@ -1961,35 +1967,17 @@ analyze = Gibbon.analyze = (function() {
       };
 
       Scope.prototype.lookup = function(nativeId, query, cb) {
-        var lexical;
-        if (query.type === 'access' && nativeId === this.context.globalID) {
-          lexical = this.lexicalLookup(query.args[0]);
-          if (lexical) {
-            return cb(lexical);
-          } else {
-            return this.context.query(nativeId, query, cb);
-          }
-        } else {
-          return this.context.query(nativeId, query, cb);
-        }
+        return this.context.query(nativeId, query, cb);
       };
 
       Scope.prototype.lexicalLookup = function(name) {
-        var local;
-        local = this.lookupLocal(name);
-        if (local) {
-          return local;
-        }
-        if (this.parent) {
-          return this.parent.lexicalLookup(name);
-        }
-      };
-
-      Scope.prototype.lookupLocal = function(name) {
-        if (!this.bindings.has(name)) {
-          return null;
+        if (this.bindings.has(name)) {
+          return this.keyFor(name);
+        } else {
+          if (this.parent) {
+            return this.parent.lexicalLookup(name);
+          }
         }
-        return TypeLookup.local(this.keyFor(name));
       };
 
       makeKey = function(crumbs) {
@@ -2032,6 +2020,9 @@ analyze = Gibbon.analyze = (function() {
             input = flow.tail ? TypeExpr.expr(flow.tail) : global;
             return push(TypeExpr.expr(flow), TypeExpr.query(input, _this, flow.head));
           },
+          lexical: function(_, name) {
+            return push(TypeExpr.expr(flow), TypeExpr.lexical(flow.head, _this));
+          },
           pair: function(_, first, second) {
             _this.analyzeFlow(first, global, push);
             _this.analyzeFlow(second, global, push);
@@ -2138,6 +2129,7 @@ analyze = Gibbon.analyze = (function() {
         match: ['lhs', 'rhs'],
         destructure: ['type'],
         lookup: ['query', 'id', 'error'],
+        lexical: ['name', 'scope'],
         circular: ['crumbs'],
         func: ['node']
       });
@@ -2153,6 +2145,9 @@ analyze = Gibbon.analyze = (function() {
           lookup: function(query, id, error) {
             return "error looking up " + (query.inspect()) + " on " + id + ": " + error;
           },
+          lexical: function(name, scope) {
+            return "." + name + " is not defined in " + (scope.key());
+          },
           circular: function(crumbs) {
             return "circular reference: " + (crumbs.join(' -> '));
           },
@@ -2248,6 +2243,26 @@ analyze = Gibbon.analyze = (function() {
                 }));
               });
             },
+            lexical: function(syntax, scope) {
+              var lookupKey;
+              lookupKey = scope.lexicalLookup(syntax.name);
+              if (!lookupKey) {
+                return cb(error('lexical', name, scope));
+              }
+              semanticAccessors.set(syntax, Semantic.localAccessor(lookupKey));
+              dependencies.push(TypeLookup.local(lookupKey));
+              nextCrumbs = crumbs.concat([lookupKey]);
+              if (locks.get(lookupKey)) {
+                return cb(error('circular', nextCrumbs));
+              }
+              return new Thunk(function() {
+                return solveEntry(nextCrumbs, function() {
+                  return new Thunk(function() {
+                    return cb(frameTypes.get(lookupKey));
+                  });
+                });
+              });
+            },
             query: function(input, scope, query) {
               return simplify(input, function(x) {
                 return x.cases({
@@ -2264,22 +2279,6 @@ analyze = Gibbon.analyze = (function() {
                             type: analysis.type.toSexpr()
                           }));
                           return cb(TypeExpr.fromType(analysis.type));
-                        },
-                        local: function(key) {
-                          var localFrame;
-                          nextCrumbs = crumbs.concat([key]);
-                          semanticAccessors.set(query, Semantic.localAccessor(key));
-                          if (locks.get(key)) {
-                            return cb(error('circular', nextCrumbs));
-                          }
-                          localFrame = constraintMap.get(key).scope.frame;
-                          return new Thunk(function() {
-                            return solveEntry(nextCrumbs, function() {
-                              return new Thunk(function() {
-                                return cb(frameTypes.get(key));
-                              });
-                            });
-                          });
                         }
                       });
                     });
@@ -2320,6 +2319,9 @@ analyze = Gibbon.analyze = (function() {
                 }
                 return semanticAccessors.get(this);
               },
+              lexical: function(_, name) {
+                return semanticAccessors.get(this);
+              },
               func: function(_, name, args) {
                 var a, semArgs, solvedScope, typeScope;
                 typeScope = this.__scope__;
@@ -2381,7 +2383,9 @@ analyze = Gibbon.analyze = (function() {
           };
           
           
-          semantics.set(key, toSemanticTree(frame));
+          if (!errors.length) {
+            semantics.set(key, toSemanticTree(frame));
+          }
           frameTypes.set(key, solutions.get(TypeExpr.expr(frame.flow)));
           
           locks.set(key, false);
@@ -5714,7 +5718,7 @@ stdlib = Gibbon.stdlib = (function() {
         index = index.failIf('index out of bounds', function(i) {
           return list.len().op2('<=', i);
         });
-        index = index.failIf('index out of bounds', function(i) {
+        index = index.failIf('index must be non-negative', function(i) {
           return i.op2('<', ZERO);
         });
         return list.delist(index);

data/vendor/gibbon/package.json

@@ -16,7 +16,7 @@
     "node-inspector": "0.2.x"
   },
   "dependencies": {
-    "parsimmon": "0.2.0",
+    "parsimmon": "0.2.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.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies: []
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email:
@@ -50,4 +50,3 @@ signing_key:
 specification_version: 4
 summary: Ruby bindings for the gibbon data language
 test_files: []
-has_rdoc: