goodguide-gibbon 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b9d67850eefaf6beb8331b64d608743564a410
-  data.tar.gz: c570344632c7b9733db5debd4a77b5a4b1bb1c1e
+  metadata.gz: 3c76476b765aa0f6ca14c4d781217e14e5dacf63
+  data.tar.gz: 804aab0497e0d6c8c87339b9efa26e754e9a9b20
 SHA512:
-  metadata.gz: ec7c7635932a1cf02446cd449812fff7093ead9f3e97a18681edb8d0246192b71bd4ff8265fb6f2e7cafe36be602b5d995fd513930420b77ccb7b948f151892f
-  data.tar.gz: dd413b4032913bf99b45a42862bf761c197c2a6d82727a83692b1dabaee81adf0bc0c187e35bb5d0aa768041e1ae32fe0526740c78a788cdd2da4f3e11384f69
+  metadata.gz: aa56fa349b68b4a1b78d03666c1bd8be4488991638fee10f8b915a5fba0ae48d0db0b15753c3acc9e2785468eaa83989744c4b4798a8b430a6f40bd1f2075ae4
+  data.tar.gz: 2d3cd36a052449b9fd89fe60432ec2a78edfb33380ac2f7f504c6ea43343b9219b399cba53df8c4852a2b7c1722db44b1395b769250162547110b824cb789e18

data/lib/goodguide/gibbon.rb

@@ -133,6 +133,10 @@ module GoodGuide
         @errors.map(&method(:semantic_error_message))
       end
 
+      def message
+        messages.join(', ')
+      end
+
     private
       def gibbon
         @context.gibbon

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

@@ -24,7 +24,7 @@ Parsimmon.Parser = (function() {
       index: index,
       value: value,
       furthest: -1,
-      expected: []
+      expected: ''
     };
   }
 
@@ -34,24 +34,20 @@ Parsimmon.Parser = (function() {
       index: -1,
       value: null,
       furthest: index,
-      expected: [expected]
+      expected: expected
     };
   }
 
-  function mergeReplies(result, last) {
+  function furthestBacktrackFor(result, last) {
     if (!last) return result;
-    if (result.furthest > last.furthest) return result;
-
-    var expected = (result.furthest === last.furthest)
-      ? result.expected.concat(last.expected)
-      : last.expected;
+    if (result.furthest >= last.furthest) return result;
 
     return {
       status: result.status,
       index: result.index,
       value: result.value,
       furthest: last.furthest,
-      expected: expected
+      expected: last.expected
     }
   }
 
@@ -59,27 +55,20 @@ Parsimmon.Parser = (function() {
     if (!(p instanceof Parser)) throw new Error('not a parser: '+p);
   }
 
-  function formatExpected(expected) {
-    if (expected.length === 1) return expected[0];
-
-    return 'one of ' + expected.join(', ')
-  }
-
-  function formatGot(stream, error) {
+  var formatError = Parsimmon.formatError = function(stream, error) {
+    var expected = error.expected;
     var i = error.index;
 
-    if (i === stream.length) return ', got the end of the stream'
-
+    if (i === stream.length) {
+      return 'expected ' + expected + ', got the end of the string';
+    }
 
     var prefix = (i > 0 ? "'..." : "'");
     var suffix = (stream.length - i > 12 ? "...'" : "'");
-
-    return ' at character ' + i + ', got ' + prefix + stream.slice(i, i+12) + suffix
-  }
-
-  var formatError = Parsimmon.formatError = function(stream, error) {
-    console.log('formatError', stream, error);
-    return 'expected ' + formatExpected(error.expected) + formatGot(stream, error)
+    return (
+      'expected ' + expected + ' at character ' + i + ', got ' +
+      prefix + stream.slice(i, i+12) + suffix
+    );
   };
 
   _.parse = function(stream) {
@@ -105,13 +94,13 @@ Parsimmon.Parser = (function() {
       var accum = new Array(numParsers);
 
       for (var j = 0; j < numParsers; j += 1) {
-        result = mergeReplies(parsers[j]._(stream, i), result);
+        result = furthestBacktrackFor(parsers[j]._(stream, i), result);
         if (!result.status) return result;
         accum[j] = result.value
         i = result.index;
       }
 
-      return mergeReplies(makeSuccess(i, accum), result);
+      return furthestBacktrackFor(makeSuccess(i, accum), result);
     });
   };
 
@@ -139,7 +128,7 @@ Parsimmon.Parser = (function() {
     return Parser(function(stream, i) {
       var result;
       for (var j = 0; j < parsers.length; j += 1) {
-        result = mergeReplies(parsers[j]._(stream, i), result);
+        result = furthestBacktrackFor(parsers[j]._(stream, i), result);
         if (result.status) return result;
       }
       return result;
@@ -183,14 +172,14 @@ Parsimmon.Parser = (function() {
       var prevResult;
 
       for (;;) {
-        result = mergeReplies(self._(stream, i), result);
+        result = furthestBacktrackFor(self._(stream, i), result);
 
         if (result.status) {
           i = result.index;
           accum.push(result.value);
         }
         else {
-          return mergeReplies(makeSuccess(i, accum), result);
+          return furthestBacktrackFor(makeSuccess(i, accum), result);
         }
       }
     });
@@ -228,7 +217,7 @@ Parsimmon.Parser = (function() {
 
       for (var times = 0; times < min; times += 1) {
         result = self._(stream, i);
-        prevResult = mergeReplies(result, prevResult);
+        prevResult = furthestBacktrackFor(result, prevResult);
         if (result.status) {
           i = result.index;
           accum.push(result.value);
@@ -238,7 +227,7 @@ Parsimmon.Parser = (function() {
 
       for (; times < max; times += 1) {
         result = self._(stream, i);
-        prevResult = mergeReplies(result, prevResult);
+        prevResult = furthestBacktrackFor(result, prevResult);
         if (result.status) {
           i = result.index;
           accum.push(result.value);
@@ -246,7 +235,7 @@ Parsimmon.Parser = (function() {
         else break;
       }
 
-      return mergeReplies(makeSuccess(i, accum), prevResult);
+      return furthestBacktrackFor(makeSuccess(i, accum), prevResult);
     });
   };
 
@@ -265,7 +254,7 @@ Parsimmon.Parser = (function() {
     return Parser(function(stream, i) {
       var result = self._(stream, i);
       if (!result.status) return result;
-      return mergeReplies(makeSuccess(result.index, fn(result.value)), result);
+      return furthestBacktrackFor(makeSuccess(result.index, fn(result.value)), result);
     });
   };
 
@@ -280,12 +269,7 @@ Parsimmon.Parser = (function() {
   };
 
   _.desc = function(expected) {
-    var self = this;
-    return Parser(function(stream, i) {
-      var reply = self._(stream, i);
-      if (!reply.status) reply.expected = [expected];
-      return reply;
-    });
+    return this.or(fail(expected))
   };
 
   // -*- primitive parsers -*- //
@@ -307,7 +291,6 @@ Parsimmon.Parser = (function() {
 
   var regex = Parsimmon.regex = function(re, group) {
     var anchored = RegExp('^(?:'+re.source+')', (''+re).slice((''+re).lastIndexOf('/')+1));
-    var expected = '' + re;
     if (group == null) group = 0;
 
     return Parser(function(stream, i) {
@@ -319,7 +302,7 @@ Parsimmon.Parser = (function() {
         if (groupMatch != null) return makeSuccess(i+fullMatch.length, groupMatch);
       }
 
-      return makeFailure(i, expected);
+      return makeFailure(i, re);
     });
   };
 
@@ -424,7 +407,7 @@ Parsimmon.Parser = (function() {
       var result = self._(stream, i);
       if (!result.status) return result;
       var nextParser = f(result.value);
-      return mergeReplies(nextParser._(stream, result.index), result);
+      return furthestBacktrackFor(nextParser._(stream, result.index), result);
     });
   };
 
@@ -459,7 +442,7 @@ Thunk = (function() {
 inspectNative = function(o) {
   switch (typeof o) {
     case 'string':
-      return "\"" + o + "\"";
+      return "'" + o + "'";
     case 'number':
       return "" + o;
     case 'boolean':
@@ -6289,7 +6272,7 @@ Value = Gibbon.Value = Value = (function(_super) {
     return this.cases({
       list: function(els) {
         var e;
-        return "(list " + (((function() {
+        return "[" + (((function() {
           var _i, _len, _results;
           _results = [];
           for (_i = 0, _len = els.length; _i < _len; _i++) {
@@ -6297,13 +6280,34 @@ Value = Gibbon.Value = Value = (function(_super) {
             _results.push(e.inspect());
           }
           return _results;
-        })()).join(' ')) + ")";
+        })()).join(', ')) + "]";
       },
       pair: function(first, second) {
-        return "(pair " + (first.inspect()) + " " + (second.inspect()) + ")";
+        var _1, _2;
+        _1 = first.cases({
+          pair: (function() {
+            return "(" + (first.inspect()) + ")";
+          }),
+          other: function() {
+            return first.inspect();
+          }
+        });
+        _2 = second.cases({
+          pair: (function() {
+            return "(" + (second.inspect()) + ")";
+          }),
+          other: function() {
+            return second.inspect();
+          }
+        });
+        return "" + _1 + " : " + _2;
       },
       entity: function(id) {
-        return "(entity " + id + ")";
+        return "<entity " + id + ">";
+      },
+      string: inspectNative,
+      block: function(f) {
+        return "{ <block> }";
       },
       other: function() {
         return '' + this.asPrimitive();

data/vendor/gibbon/gibbon.browser.js

@@ -24,7 +24,7 @@ Parsimmon.Parser = (function() {
       index: index,
       value: value,
       furthest: -1,
-      expected: []
+      expected: ''
     };
   }
 
@@ -34,24 +34,20 @@ Parsimmon.Parser = (function() {
       index: -1,
       value: null,
       furthest: index,
-      expected: [expected]
+      expected: expected
     };
   }
 
-  function mergeReplies(result, last) {
+  function furthestBacktrackFor(result, last) {
     if (!last) return result;
-    if (result.furthest > last.furthest) return result;
-
-    var expected = (result.furthest === last.furthest)
-      ? result.expected.concat(last.expected)
-      : last.expected;
+    if (result.furthest >= last.furthest) return result;
 
     return {
       status: result.status,
       index: result.index,
       value: result.value,
       furthest: last.furthest,
-      expected: expected
+      expected: last.expected
     }
   }
 
@@ -59,27 +55,20 @@ Parsimmon.Parser = (function() {
     if (!(p instanceof Parser)) throw new Error('not a parser: '+p);
   }
 
-  function formatExpected(expected) {
-    if (expected.length === 1) return expected[0];
-
-    return 'one of ' + expected.join(', ')
-  }
-
-  function formatGot(stream, error) {
+  var formatError = Parsimmon.formatError = function(stream, error) {
+    var expected = error.expected;
     var i = error.index;
 
-    if (i === stream.length) return ', got the end of the stream'
-
+    if (i === stream.length) {
+      return 'expected ' + expected + ', got the end of the string';
+    }
 
     var prefix = (i > 0 ? "'..." : "'");
     var suffix = (stream.length - i > 12 ? "...'" : "'");
-
-    return ' at character ' + i + ', got ' + prefix + stream.slice(i, i+12) + suffix
-  }
-
-  var formatError = Parsimmon.formatError = function(stream, error) {
-    console.log('formatError', stream, error);
-    return 'expected ' + formatExpected(error.expected) + formatGot(stream, error)
+    return (
+      'expected ' + expected + ' at character ' + i + ', got ' +
+      prefix + stream.slice(i, i+12) + suffix
+    );
   };
 
   _.parse = function(stream) {
@@ -105,13 +94,13 @@ Parsimmon.Parser = (function() {
       var accum = new Array(numParsers);
 
       for (var j = 0; j < numParsers; j += 1) {
-        result = mergeReplies(parsers[j]._(stream, i), result);
+        result = furthestBacktrackFor(parsers[j]._(stream, i), result);
         if (!result.status) return result;
         accum[j] = result.value
         i = result.index;
       }
 
-      return mergeReplies(makeSuccess(i, accum), result);
+      return furthestBacktrackFor(makeSuccess(i, accum), result);
     });
   };
 
@@ -139,7 +128,7 @@ Parsimmon.Parser = (function() {
     return Parser(function(stream, i) {
       var result;
       for (var j = 0; j < parsers.length; j += 1) {
-        result = mergeReplies(parsers[j]._(stream, i), result);
+        result = furthestBacktrackFor(parsers[j]._(stream, i), result);
         if (result.status) return result;
       }
       return result;
@@ -183,14 +172,14 @@ Parsimmon.Parser = (function() {
       var prevResult;
 
       for (;;) {
-        result = mergeReplies(self._(stream, i), result);
+        result = furthestBacktrackFor(self._(stream, i), result);
 
         if (result.status) {
           i = result.index;
           accum.push(result.value);
         }
         else {
-          return mergeReplies(makeSuccess(i, accum), result);
+          return furthestBacktrackFor(makeSuccess(i, accum), result);
         }
       }
     });
@@ -228,7 +217,7 @@ Parsimmon.Parser = (function() {
 
       for (var times = 0; times < min; times += 1) {
         result = self._(stream, i);
-        prevResult = mergeReplies(result, prevResult);
+        prevResult = furthestBacktrackFor(result, prevResult);
         if (result.status) {
           i = result.index;
           accum.push(result.value);
@@ -238,7 +227,7 @@ Parsimmon.Parser = (function() {
 
       for (; times < max; times += 1) {
         result = self._(stream, i);
-        prevResult = mergeReplies(result, prevResult);
+        prevResult = furthestBacktrackFor(result, prevResult);
         if (result.status) {
           i = result.index;
           accum.push(result.value);
@@ -246,7 +235,7 @@ Parsimmon.Parser = (function() {
         else break;
       }
 
-      return mergeReplies(makeSuccess(i, accum), prevResult);
+      return furthestBacktrackFor(makeSuccess(i, accum), prevResult);
     });
   };
 
@@ -265,7 +254,7 @@ Parsimmon.Parser = (function() {
     return Parser(function(stream, i) {
       var result = self._(stream, i);
       if (!result.status) return result;
-      return mergeReplies(makeSuccess(result.index, fn(result.value)), result);
+      return furthestBacktrackFor(makeSuccess(result.index, fn(result.value)), result);
     });
   };
 
@@ -280,12 +269,7 @@ Parsimmon.Parser = (function() {
   };
 
   _.desc = function(expected) {
-    var self = this;
-    return Parser(function(stream, i) {
-      var reply = self._(stream, i);
-      if (!reply.status) reply.expected = [expected];
-      return reply;
-    });
+    return this.or(fail(expected))
   };
 
   // -*- primitive parsers -*- //
@@ -307,7 +291,6 @@ Parsimmon.Parser = (function() {
 
   var regex = Parsimmon.regex = function(re, group) {
     var anchored = RegExp('^(?:'+re.source+')', (''+re).slice((''+re).lastIndexOf('/')+1));
-    var expected = '' + re;
     if (group == null) group = 0;
 
     return Parser(function(stream, i) {
@@ -319,7 +302,7 @@ Parsimmon.Parser = (function() {
         if (groupMatch != null) return makeSuccess(i+fullMatch.length, groupMatch);
       }
 
-      return makeFailure(i, expected);
+      return makeFailure(i, re);
     });
   };
 
@@ -424,7 +407,7 @@ Parsimmon.Parser = (function() {
       var result = self._(stream, i);
       if (!result.status) return result;
       var nextParser = f(result.value);
-      return mergeReplies(nextParser._(stream, result.index), result);
+      return furthestBacktrackFor(nextParser._(stream, result.index), result);
     });
   };
 
@@ -459,7 +442,7 @@ Thunk = (function() {
 inspectNative = function(o) {
   switch (typeof o) {
     case 'string':
-      return "\"" + o + "\"";
+      return "'" + o + "'";
     case 'number':
       return "" + o;
     case 'boolean':
@@ -6225,7 +6208,7 @@ Value = Gibbon.Value = Value = (function(_super) {
     return this.cases({
       list: function(els) {
         var e;
-        return "(list " + (((function() {
+        return "[" + (((function() {
           var _i, _len, _results;
           _results = [];
           for (_i = 0, _len = els.length; _i < _len; _i++) {
@@ -6233,13 +6216,34 @@ Value = Gibbon.Value = Value = (function(_super) {
             _results.push(e.inspect());
           }
           return _results;
-        })()).join(' ')) + ")";
+        })()).join(', ')) + "]";
       },
       pair: function(first, second) {
-        return "(pair " + (first.inspect()) + " " + (second.inspect()) + ")";
+        var _1, _2;
+        _1 = first.cases({
+          pair: (function() {
+            return "(" + (first.inspect()) + ")";
+          }),
+          other: function() {
+            return first.inspect();
+          }
+        });
+        _2 = second.cases({
+          pair: (function() {
+            return "(" + (second.inspect()) + ")";
+          }),
+          other: function() {
+            return second.inspect();
+          }
+        });
+        return "" + _1 + " : " + _2;
       },
       entity: function(id) {
-        return "(entity " + id + ")";
+        return "<entity " + id + ">";
+      },
+      string: inspectNative,
+      block: function(f) {
+        return "{ <block> }";
       },
       other: function() {
         return '' + this.asPrimitive();

data/vendor/gibbon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gibbon",
-  "version": "0.14.2",
+  "version": "0.14.4",
   "description": "A data language",
   "keywords": ["language"],
   "author": "Jeanine Adkisson <jeanine.adkisson@gmail.com>",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2016-06-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.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the gibbon data language