goodguide-gibbon 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bfe6e644dc8dbda3f8054e1c36b805956387529
-  data.tar.gz: 33de5acdaf0e4a3f489b8cdaab289ec96a63c1eb
+  metadata.gz: cabd835978ce48079cb610786bd50119555d75f3
+  data.tar.gz: f58c19cfbadc8ea11b5300aa8a135085d33c73a2
 SHA512:
-  metadata.gz: 267c82933e85a791ce21c1a940f68c6ec1983c5cb4144dae9cd523bc602794150f4e717e72e08ea7d20ab16e967a3b5fbbb27edb9dbef78d608a673bb78272bc
-  data.tar.gz: e1187c03ea3bbe127376c01fac81e0a9d45870947d7889d5659c93a518d175ba399f126b4a194b63f25097a325ad56ad4920b364b9e89ada50a96177877fc8d7
+  metadata.gz: a32bfa7fb568d4ef0a17b16acf51319125cd89f8c93770859b936cf2fc7175f8b7c939dc1199e3682aa543003d73ac5a143a7a5b05197d8563b19db2251d4e4b
+  data.tar.gz: 38c21a1b41fd85bf1700d3739911a132c7fe1b0a46f943787f434797e357f6f121e203133b6c9e17f2a80abf131c92f5334fa22fd79233d026f9bcf2b54b4763

data/lib/goodguide/gibbon/version.rb

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

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

@@ -1109,7 +1109,7 @@ Gibbon.AST = AST = (function(_super) {
         return "" + tail + (head.inspect());
       },
       metadata: function(_, key, text) {
-        return "" + key + ": " + text;
+        return "+" + key + ": " + text;
       },
       definition: function(_, metadata, name, frame) {
         var m, out, _i, _len;
@@ -1239,8 +1239,8 @@ parse = Gibbon.parse = (function() {
   decimal = tag('a decimal', lexeme(regex(/^\d+\.\d+/)));
   percent = tag('a percentage', lexeme(regex(/^\d+%/)));
   integer = tag('a number', lexeme(regex(/^\d+/)));
-  label = lexeme(identifier.skip(string(':')));
-  labelVal = lexeme(regex(/^[^\n]*/));
+  label = lexeme(string('~').then(identifier.skip(whitespace)).skip(string(':')));
+  labelVal = multiline(regex(/[^\n]*/));
   variable = lexeme(string('%').then(identifier));
   wildcard = lexeme(string('%'));
   funcPlaceholder = lexeme(string('&'));
@@ -1366,7 +1366,9 @@ parse = Gibbon.parse = (function() {
     }
     return els;
   });
-  metadata = seq(label, labelVal).map(function(key, text) {
+  metadata = seq(label, labelVal).map(function(_arg) {
+    var key, text;
+    key = _arg[0], text = _arg[1];
     return AST.metadata(spanLoc(key, text), key.value, text.value);
   });
   definition = lazy(function() {
@@ -1442,20 +1444,20 @@ parse = Gibbon.parse = (function() {
       throw 'can only parse strings';
     }
   };
-  handleResult = function(result) {
+  handleResult = function(str, result) {
     if (result.status) {
       return result.value;
     } else {
-      throw new Error(Parsimmon.formatError(result));
+      throw new Error(Parsimmon.formatError(str, result));
     }
   };
   parse = function(str) {
     assertString(str);
-    return handleResult(program.parse(str));
+    return handleResult(str, program.parse(str));
   };
   parse.type = function(str) {
     assertString(str);
-    return handleResult(fullSignature.parse(str));
+    return handleResult(str, fullSignature.parse(str));
   };
   return parse;
 })();
@@ -2003,14 +2005,14 @@ analyze = Gibbon.analyze = (function() {
       }
 
       Scope.prototype.extend = function(definition) {
-        var breadcrumbs, frame, metadata, name, val, _i, _len, _ref10, _ref9;
+        var breadcrumbs, frame, key, metadata, text, _i, _len, _ref10, _ref9;
         breadcrumbs = this.breadcrumbs.concat(definition.name);
         frame = definition.frame;
         metadata = new Hash;
         _ref9 = definition.metadata;
         for (_i = 0, _len = _ref9.length; _i < _len; _i++) {
-          _ref10 = _ref9[_i], name = _ref10[0], val = _ref10[1];
-          metadata.set(name, val);
+          _ref10 = _ref9[_i], key = _ref10.key, text = _ref10.text;
+          metadata.set(key, text);
         }
         return new Scope(this, breadcrumbs, frame, this.context, metadata);
       };
@@ -2845,7 +2847,7 @@ Gibbon.Core = Core = (function(_super) {
       bind: function(n, v, e) {
         return [v, e];
       },
-      delist: single,
+      delist: double,
       depair: single,
       squishList: single,
       list: function(e) {

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

@@ -1099,7 +1099,7 @@ Gibbon.AST = AST = (function(_super) {
         return "" + tail + (head.inspect());
       },
       metadata: function(_, key, text) {
-        return "" + key + ": " + text;
+        return "+" + key + ": " + text;
       },
       definition: function(_, metadata, name, frame) {
         var m, out, _i, _len;
@@ -1229,8 +1229,8 @@ parse = Gibbon.parse = (function() {
   decimal = tag('a decimal', lexeme(regex(/^\d+\.\d+/)));
   percent = tag('a percentage', lexeme(regex(/^\d+%/)));
   integer = tag('a number', lexeme(regex(/^\d+/)));
-  label = lexeme(identifier.skip(string(':')));
-  labelVal = lexeme(regex(/^[^\n]*/));
+  label = lexeme(string('~').then(identifier.skip(whitespace)).skip(string(':')));
+  labelVal = multiline(regex(/[^\n]*/));
   variable = lexeme(string('%').then(identifier));
   wildcard = lexeme(string('%'));
   funcPlaceholder = lexeme(string('&'));
@@ -1356,7 +1356,9 @@ parse = Gibbon.parse = (function() {
     }
     return els;
   });
-  metadata = seq(label, labelVal).map(function(key, text) {
+  metadata = seq(label, labelVal).map(function(_arg) {
+    var key, text;
+    key = _arg[0], text = _arg[1];
     return AST.metadata(spanLoc(key, text), key.value, text.value);
   });
   definition = lazy(function() {
@@ -1432,20 +1434,20 @@ parse = Gibbon.parse = (function() {
       throw 'can only parse strings';
     }
   };
-  handleResult = function(result) {
+  handleResult = function(str, result) {
     if (result.status) {
       return result.value;
     } else {
-      throw new Error(Parsimmon.formatError(result));
+      throw new Error(Parsimmon.formatError(str, result));
     }
   };
   parse = function(str) {
     assertString(str);
-    return handleResult(program.parse(str));
+    return handleResult(str, program.parse(str));
   };
   parse.type = function(str) {
     assertString(str);
-    return handleResult(fullSignature.parse(str));
+    return handleResult(str, fullSignature.parse(str));
   };
   return parse;
 })();
@@ -1989,14 +1991,14 @@ analyze = Gibbon.analyze = (function() {
       }
 
       Scope.prototype.extend = function(definition) {
-        var breadcrumbs, frame, metadata, name, val, _i, _len, _ref10, _ref9;
+        var breadcrumbs, frame, key, metadata, text, _i, _len, _ref10, _ref9;
         breadcrumbs = this.breadcrumbs.concat(definition.name);
         frame = definition.frame;
         metadata = new Hash;
         _ref9 = definition.metadata;
         for (_i = 0, _len = _ref9.length; _i < _len; _i++) {
-          _ref10 = _ref9[_i], name = _ref10[0], val = _ref10[1];
-          metadata.set(name, val);
+          _ref10 = _ref9[_i], key = _ref10.key, text = _ref10.text;
+          metadata.set(key, text);
         }
         return new Scope(this, breadcrumbs, frame, this.context, metadata);
       };
@@ -2813,7 +2815,7 @@ Gibbon.Core = Core = (function(_super) {
       bind: function(n, v, e) {
         return [v, e];
       },
-      delist: single,
+      delist: double,
       depair: single,
       squishList: single,
       list: function(e) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors:
 - Jay Adkisson
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: goodguide-gibbon
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the gibbon data language