goodguide-gibbon 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28406c6cb9eeb1238f8b2c4067a6d94c543703c0
-  data.tar.gz: 5ed6b1199bc4311c807e5081cde53345f78c760d
+  metadata.gz: a2a7dcf8d9db98045230513edc7c30ebfb44cb98
+  data.tar.gz: 39c2e0e633bfad5466dd430a415562074199a0ef
 SHA512:
-  metadata.gz: 9b8cf52d575d06c142adf1a457d88160754c8e10870289784df55cc7d8d032c19bebac6df9cbf95bccc0038e0acdeb33cb2924818062589792bc657d01c120b3
-  data.tar.gz: 46840e7791e9a052a6ee646bdb590fecf13d2aa0fcddadc5baf10a1b5f467351d3bd9d7ac4eaa6557d83d741ec574db31067cec9d876cfd4c84315c958bb57ed
+  metadata.gz: 2eb0b1a90425591ddb807cf6f7324914c7a39462972ebff03f2beb2b0dde2e305cc931510fb70b854aa05630351f1a8c2d89eec0460e04adf4546dff1dccb510
+  data.tar.gz: 4c0f224cb2f8c7b5a809b0e4f678b864ebb768aa439a422c93dd5cd9fa4b29564403d3bd8dced49fbdc9761162cf9d6b3fceea6f7643539feceff17f2f0105c6

data/lib/goodguide/gibbon/version.rb

@@ -1,7 +1,7 @@
 module GoodGuide
   module Gibbon
     def self.version
-      '0.8.1'
+      '0.8.2'
     end
   end
 end

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

@@ -3275,45 +3275,40 @@ Gibbon.optimize = (function() {
         });
       },
       branch: function(cond, ifTrue, ifFalse) {
-        ifTrue = partialEval(ifTrue);
-        ifFalse = partialEval(ifFalse);
-        if (ifTrue.equals(ifFalse)) {
-          DEBUG.log("eliminating condition in equivalent branches: " + (this.inspect()));
-          return ifTrue;
-        }
-        return partialEval(cond).cases({
+        var abort;
+        cond = partialEval(cond);
+        abort = function() {
+          ifTrue = partialEval(ifTrue);
+          ifFalse = partialEval(ifFalse);
+          if (ifTrue.equals(ifFalse)) {
+            DEBUG.log("eliminating condition in equivalent branches: " + (this.inspect()));
+            return ifTrue;
+          }
+          return cond.branch(ifTrue, ifFalse);
+        };
+        return cond.cases({
           constant: function(value) {
             if (value) {
               DEBUG.log("eliminating dead false branch " + (ifFalse.inspect()));
-              return ifTrue;
+              return partialEval(ifTrue);
             } else {
               DEBUG.log("eliminating dead true branch " + (ifTrue.inspect()));
-              return ifFalse;
+              return partialEval(ifFalse);
             }
           },
           branch: function(innerCond, innerTrue, innerFalse) {
-            if (innerTrue._tag === 'constant' && innerFalse._tag === 'constant') {
-              DEBUG.log("eliminating nested if " + (this.inspect()));
-              if (innerTrue.value) {
-                return partialEval(innerCond.branch(ifTrue, ifFalse));
-              } else {
-                return partialEval(innerCond.branch(ifFalse, ifTrue));
-              }
-            } else {
-              return this.branch(ifTrue, ifFalse);
-            }
+            DEBUG.log("flattening nested branch " + (this.inspect()));
+            return partialEval(innerCond.branch(innerTrue.branch(ifTrue, ifFalse), innerFalse.branch(ifTrue, ifFalse)));
           },
           op1: function(name, arg) {
             if (name === '!') {
               DEBUG.log("eliminating if negation in condition " + (this.inspect()));
               return partialEval(arg.branch(ifFalse, ifTrue));
             } else {
-              return this.branch(ifTrue, ifFalse);
+              return abort();
             }
           },
-          other: function() {
-            return this.branch(ifTrue, ifFalse);
-          }
+          other: abort
         });
       },
       app: function(block, arg) {
@@ -5491,11 +5486,12 @@ Gibbon.codegen = (function() {
 })();
 
 stdlib = Gibbon.stdlib = (function() {
-  var FALSE, TRUE, equals, isEmpty;
+  var FALSE, TRUE, ZERO, equals, isEmpty;
   TRUE = Core.constant(true);
   FALSE = Core.constant(false);
+  ZERO = Core.constant(0);
   isEmpty = function(list) {
-    return list.len().op2('===', Core.constant(0));
+    return list.len().op2('===', ZERO);
   };
   equals = function(x, y, type) {
     var direct;
@@ -5623,7 +5619,7 @@ stdlib = Gibbon.stdlib = (function() {
       compile: function(_, _arg) {
         var ratio, totalDenom, totalNum, weights, _ref16;
         weights = _arg[0];
-        ratio = weights.foldList(Core.pair(Core.constant(0), Core.constant(0)), function(el, next) {
+        ratio = weights.foldList(Core.pair(ZERO, ZERO), function(el, next) {
           var denominator, numerator, value, weight, weighted, _ref16, _ref17;
           _ref16 = el.depair(), value = _ref16[0], weight = _ref16[1];
           _ref17 = next.depair(), numerator = _ref17[0], denominator = _ref17[1];
@@ -5632,11 +5628,22 @@ stdlib = Gibbon.stdlib = (function() {
         });
         _ref16 = ratio.depair(), totalNum = _ref16[0], totalDenom = _ref16[1];
         totalDenom = totalDenom.failIf('weight: zero denominator', function(d) {
-          return d.op2('===', Core.constant(0));
+          return d.op2('===', ZERO);
         });
         return totalNum.op2('/', totalDenom);
       }
     },
+    mean: {
+      type: parse.type('mean = [numeric] -> numeric'),
+      compile: function(list) {
+        var sum;
+        list = list.failIf('mean: empty list', isEmpty);
+        sum = list.foldList(ZERO, function(el, next) {
+          return el.op2('+', next);
+        });
+        return sum.op2('/', list.len());
+      }
+    },
     filter: {
       type: parse.type('filter { %a -> bool } = [%a] -> [%a]'),
       compile: function(input, _arg) {
@@ -5685,7 +5692,7 @@ stdlib = Gibbon.stdlib = (function() {
     sum: {
       type: parse.type('sum = [numeric] -> numeric'),
       compile: function(list) {
-        return list.foldList(Core.constant(0), function(el, next) {
+        return list.foldList(ZERO, function(el, next) {
           return el.op2('+', next);
         });
       }
@@ -5713,7 +5720,7 @@ stdlib = Gibbon.stdlib = (function() {
       compile: function(_, _arg) {
         var list;
         list = _arg[0];
-        return list.foldList(Core.constant(0), function(el, next) {
+        return list.foldList(ZERO, function(el, next) {
           var cond, val;
           cond = el.depair('first');
           val = el.depair('second');
@@ -5724,7 +5731,33 @@ stdlib = Gibbon.stdlib = (function() {
     first: {
       type: parse.type('first = [%a] -> %a'),
       compile: function(list) {
-        return list.delist(Core.constant(0));
+        return list.delist(ZERO);
+      }
+    },
+    left: {
+      type: parse.type('left = (%a : %b) -> %a'),
+      compile: function(pair) {
+        return pair.depair('first');
+      }
+    },
+    right: {
+      type: parse.type('right = (%a : %b) -> %b'),
+      compile: function(pair) {
+        return pair.depair('second');
+      }
+    },
+    at: {
+      type: parse.type('at numeric = [%a] -> %a'),
+      compile: function(list, _arg) {
+        var index;
+        index = _arg[0];
+        index = index.failIf('index out of bounds', function(i) {
+          return list.len().op2('<=', i);
+        });
+        index = index.failIf('index out of bounds', function(i) {
+          return i.op2('<', ZERO);
+        });
+        return list.delist(index);
       }
     },
     "index-of": {
@@ -5768,7 +5801,7 @@ stdlib = Gibbon.stdlib = (function() {
         var num;
         num = _arg[0];
         num = num.failIf('division by zero', function(n) {
-          return n.op2('===', Core.constant(0));
+          return n.op2('===', ZERO);
         });
         return input.op2('/', num);
       }
@@ -6325,6 +6358,14 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         });
         return out.set(k, [value, deps]);
       });
+      failures.each(function(k, v) {
+        var deps;
+        deps = dependencies.get(k);
+        deps = uniq(deps, function(x, y) {
+          return x.equals(y);
+        });
+        return out.set(k, [v, deps]);
+      });
       return cb(null, out);
     });
     return trampoline(thunk);

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

@@ -3243,45 +3243,40 @@ Gibbon.optimize = (function() {
         });
       },
       branch: function(cond, ifTrue, ifFalse) {
-        ifTrue = partialEval(ifTrue);
-        ifFalse = partialEval(ifFalse);
-        if (ifTrue.equals(ifFalse)) {
-          
-          return ifTrue;
-        }
-        return partialEval(cond).cases({
+        var abort;
+        cond = partialEval(cond);
+        abort = function() {
+          ifTrue = partialEval(ifTrue);
+          ifFalse = partialEval(ifFalse);
+          if (ifTrue.equals(ifFalse)) {
+            
+            return ifTrue;
+          }
+          return cond.branch(ifTrue, ifFalse);
+        };
+        return cond.cases({
           constant: function(value) {
             if (value) {
               
-              return ifTrue;
+              return partialEval(ifTrue);
             } else {
               
-              return ifFalse;
+              return partialEval(ifFalse);
             }
           },
           branch: function(innerCond, innerTrue, innerFalse) {
-            if (innerTrue._tag === 'constant' && innerFalse._tag === 'constant') {
-              
-              if (innerTrue.value) {
-                return partialEval(innerCond.branch(ifTrue, ifFalse));
-              } else {
-                return partialEval(innerCond.branch(ifFalse, ifTrue));
-              }
-            } else {
-              return this.branch(ifTrue, ifFalse);
-            }
+            
+            return partialEval(innerCond.branch(innerTrue.branch(ifTrue, ifFalse), innerFalse.branch(ifTrue, ifFalse)));
           },
           op1: function(name, arg) {
             if (name === '!') {
               
               return partialEval(arg.branch(ifFalse, ifTrue));
             } else {
-              return this.branch(ifTrue, ifFalse);
+              return abort();
             }
           },
-          other: function() {
-            return this.branch(ifTrue, ifFalse);
-          }
+          other: abort
         });
       },
       app: function(block, arg) {
@@ -5451,11 +5446,12 @@ Gibbon.codegen = (function() {
 })();
 
 stdlib = Gibbon.stdlib = (function() {
-  var FALSE, TRUE, equals, isEmpty;
+  var FALSE, TRUE, ZERO, equals, isEmpty;
   TRUE = Core.constant(true);
   FALSE = Core.constant(false);
+  ZERO = Core.constant(0);
   isEmpty = function(list) {
-    return list.len().op2('===', Core.constant(0));
+    return list.len().op2('===', ZERO);
   };
   equals = function(x, y, type) {
     var direct;
@@ -5583,7 +5579,7 @@ stdlib = Gibbon.stdlib = (function() {
       compile: function(_, _arg) {
         var ratio, totalDenom, totalNum, weights, _ref16;
         weights = _arg[0];
-        ratio = weights.foldList(Core.pair(Core.constant(0), Core.constant(0)), function(el, next) {
+        ratio = weights.foldList(Core.pair(ZERO, ZERO), function(el, next) {
           var denominator, numerator, value, weight, weighted, _ref16, _ref17;
           _ref16 = el.depair(), value = _ref16[0], weight = _ref16[1];
           _ref17 = next.depair(), numerator = _ref17[0], denominator = _ref17[1];
@@ -5592,11 +5588,22 @@ stdlib = Gibbon.stdlib = (function() {
         });
         _ref16 = ratio.depair(), totalNum = _ref16[0], totalDenom = _ref16[1];
         totalDenom = totalDenom.failIf('weight: zero denominator', function(d) {
-          return d.op2('===', Core.constant(0));
+          return d.op2('===', ZERO);
         });
         return totalNum.op2('/', totalDenom);
       }
     },
+    mean: {
+      type: parse.type('mean = [numeric] -> numeric'),
+      compile: function(list) {
+        var sum;
+        list = list.failIf('mean: empty list', isEmpty);
+        sum = list.foldList(ZERO, function(el, next) {
+          return el.op2('+', next);
+        });
+        return sum.op2('/', list.len());
+      }
+    },
     filter: {
       type: parse.type('filter { %a -> bool } = [%a] -> [%a]'),
       compile: function(input, _arg) {
@@ -5645,7 +5652,7 @@ stdlib = Gibbon.stdlib = (function() {
     sum: {
       type: parse.type('sum = [numeric] -> numeric'),
       compile: function(list) {
-        return list.foldList(Core.constant(0), function(el, next) {
+        return list.foldList(ZERO, function(el, next) {
           return el.op2('+', next);
         });
       }
@@ -5673,7 +5680,7 @@ stdlib = Gibbon.stdlib = (function() {
       compile: function(_, _arg) {
         var list;
         list = _arg[0];
-        return list.foldList(Core.constant(0), function(el, next) {
+        return list.foldList(ZERO, function(el, next) {
           var cond, val;
           cond = el.depair('first');
           val = el.depair('second');
@@ -5684,7 +5691,33 @@ stdlib = Gibbon.stdlib = (function() {
     first: {
       type: parse.type('first = [%a] -> %a'),
       compile: function(list) {
-        return list.delist(Core.constant(0));
+        return list.delist(ZERO);
+      }
+    },
+    left: {
+      type: parse.type('left = (%a : %b) -> %a'),
+      compile: function(pair) {
+        return pair.depair('first');
+      }
+    },
+    right: {
+      type: parse.type('right = (%a : %b) -> %b'),
+      compile: function(pair) {
+        return pair.depair('second');
+      }
+    },
+    at: {
+      type: parse.type('at numeric = [%a] -> %a'),
+      compile: function(list, _arg) {
+        var index;
+        index = _arg[0];
+        index = index.failIf('index out of bounds', function(i) {
+          return list.len().op2('<=', i);
+        });
+        index = index.failIf('index out of bounds', function(i) {
+          return i.op2('<', ZERO);
+        });
+        return list.delist(index);
       }
     },
     "index-of": {
@@ -5728,7 +5761,7 @@ stdlib = Gibbon.stdlib = (function() {
         var num;
         num = _arg[0];
         num = num.failIf('division by zero', function(n) {
-          return n.op2('===', Core.constant(0));
+          return n.op2('===', ZERO);
         });
         return input.op2('/', num);
       }
@@ -6285,6 +6318,14 @@ Gibbon.CompiledCode = CompiledCode = (function() {
         });
         return out.set(k, [value, deps]);
       });
+      failures.each(function(k, v) {
+        var deps;
+        deps = dependencies.get(k);
+        deps = uniq(deps, function(x, y) {
+          return x.equals(y);
+        });
+        return out.set(k, [v, deps]);
+      });
       return cb(null, out);
     });
     return trampoline(thunk);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goodguide-gibbon
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies: []
 description: Run and analyze gibbon code from ruby or a browser (via a ruby app).
 email: