pogo - npm Package Compare versions

Comparing version 0.3.2 to 0.4.0

lib/asyncControl.js

@@ -215,1 +215,27 @@ exports.try = function(body, catchBody, finallyBody, cb) {
 };
+
+exports.future = function (action) {
+    var operationComplete = false;
+    var operationError, operationResult;
+    var futureCallbacks = [];
+
+    function callback (error, result) {
+        operationComplete = true;
+        operationError = error;
+        operationResult = result;
+
+        for (var n = 0; n < futureCallbacks.length; n++) {
+            futureCallbacks[n](operationError, operationResult);
+        }
+    }
+
+    action(callback);
+
+    return function (callback) {
+        if (operationComplete) {
+            callback(operationError, operationResult);
+        } else {
+            futureCallbacks.push(callback);
+        }
+    };
+};

lib/parser/basicExpression.js

@@ -35,2 +35,8 @@ var _ = require('underscore');
     
+    this.hasFutureArgument = function () {
+      return this._hasFutureArgument || (this._hasFutureArgument =
+        _.any(this.terminals, function (t) { return t.isFutureArgument; })
+      );
+    };
+    
     this.hasArguments = function () {
@@ -37,0 +43,0 @@ return this._hasArguments || (this._hasArguments =

lib/parser/codeGenerator.js

@@ -55,2 +55,3 @@ var cg = require('../codeGenerator');
   importTerm('asyncArgument');
+  importTerm('futureArgument');
   codegen.complexExpression = require('./complexExpression');
@@ -57,0 +58,0 @@ codegen.operatorExpression = require('../parser/operatorExpression')(codegen);

lib/parser/complexExpression.js

@@ -42,6 +42,14 @@ var _ = require('underscore');
 
-    this.hasAsyncArgument = function () {
+    this.isAsyncCall = function () {
       return this.head().hasAsyncArgument();
     };
+
+    this.isFutureCall = function () {
+      return this.head().hasFutureArgument();
+    };
     
+    this.isCall = function () {
+      return this.isAsyncCall() || this.isFutureCall();
+    };
+    
     this.tailBlock = function () {
@@ -93,3 +101,3 @@ if (this._hasTailBlock) {
         if (this.hasArguments()) {
-          return cg.functionCall(cg.variable(head.name(), {couldBeMacro: false, location: this.location()}), this.arguments(), {optionalArguments: this.optionalArguments(), async: this.hasAsyncArgument()});
+          return cg.functionCall(cg.variable(head.name(), {couldBeMacro: false, location: this.location()}), this.arguments(), {optionalArguments: this.optionalArguments(), async: this.isAsyncCall(), future: this.isFutureCall()});
         } else {
@@ -99,6 +107,6 @@ return cg.variable(head.name(), {location: this.location()});
       } else {
-        if (!this.hasTail() && this.arguments().length === 1 && !this.hasAsyncArgument()) {
+        if (!this.hasTail() && this.arguments().length === 1 && !this.isCall()) {
           return this.arguments()[0];
         } else {
-          return cg.functionCall(this.arguments()[0], this.arguments().slice(1), {async: this.hasAsyncArgument()});
+          return cg.functionCall(this.arguments()[0], this.arguments().slice(1), {async: this.isAsyncCall(), future: this.isFutureCall()});
         }
@@ -113,3 +121,3 @@ }
         if (this.hasArguments()) {
-          return cg.methodCall(object, head.name(), this.arguments(), {optionalArguments: this.optionalArguments(), async: this.hasAsyncArgument()});
+          return cg.methodCall(object, head.name(), this.arguments(), {optionalArguments: this.optionalArguments(), async: this.isAsyncCall(), future: this.isFutureCall()});
         } else {
@@ -119,6 +127,6 @@ return cg.fieldReference(object, head.name());
       } else {
-        if (!this.hasTail() && !head.isCall() && !this.hasAsyncArgument()) {
+        if (!this.hasTail() && !head.isCall() && !this.isAsyncCall()) {
           return cg.indexer(object, this.arguments()[0]);
         } else {
-          return cg.functionCall(cg.indexer(object, this.arguments()[0]), this.arguments().slice(1), {async: this.hasAsyncArgument()});
+          return cg.functionCall(cg.indexer(object, this.arguments()[0]), this.arguments().slice(1), {async: this.isAsyncCall(), future: this.isFutureCall()});
         }
@@ -156,4 +164,3 @@ }
             if (self.hasParameters()) {
-              var block = source.blockify(self.parameters(), {optionalParameters: self.optionalParameters(), async: self.hasAsyncArgument()});
-              block.redefinesSelf = true;
+              var block = source.blockify(self.parameters(), {optionalParameters: self.optionalParameters(), async: self.isAsyncCall(), redefinesSelf: true});
               return cg.definition(cg.fieldReference(object, self.head().name()), block, {assignment: true});
@@ -164,7 +171,6 @@ } else {
           } else {
-            if (!self.hasTail() && self.arguments().length === 1 && !self.hasAsyncArgument()) {
+            if (!self.hasTail() && self.arguments().length === 1 && !self.isAsyncCall()) {
               return cg.definition(cg.indexer(object, self.arguments()[0]), source.scopify(), {assignment: true});
             } else {
-              var block = source.blockify(self.parameters({skipFirstParameter: true}), {optionalParameters: self.optionalParameters(), async: self.hasAsyncArgument()});
-              block.redefinesSelf = true;
+              var block = source.blockify(self.parameters({skipFirstParameter: true}), {optionalParameters: self.optionalParameters(), async: self.isAsyncCall(), redefinesSelf: true});
               return cg.definition(cg.indexer(object, self.arguments()[0]), block, {assignment: true});
@@ -202,7 +208,6 @@ }
             expression: function () {
-              return cg.definition(cg.variable(self.head().name(), {location: self.location()}), source.blockify(self.parameters(), {optionalParameters: self.optionalParameters(), async: self.hasAsyncArgument()}), {assignment: assignment});
+              return cg.definition(cg.variable(self.head().name(), {location: self.location()}), source.blockify(self.parameters(), {optionalParameters: self.optionalParameters(), async: self.isAsyncCall()}), {assignment: assignment});
             },
             hashEntry: function (isOptionalArgument) {
-              var block = source.blockify(self.parameters(), {optionalParameters: self.optionalParameters(), async: self.hasAsyncArgument()});
-              block.redefinesSelf = !isOptionalArgument;
+              var block = source.blockify(self.parameters(), {optionalParameters: self.optionalParameters(), async: self.isAsyncCall(), redefinesSelf: !isOptionalArgument});
 
@@ -222,2 +227,9 @@ return cg.hashEntry(self.head().name(), block);
         }
+      } else if (self.isAsyncCall()) {
+        return {
+          hashEntry: function () {
+            var head = self.head();
+            return cg.hashEntry(head.hashKey(), source.blockify ([], {async: true}));
+          }
+        };
       } else {
@@ -224,0 +236,0 @@ return {

lib/parser/grammar.js

@@ -34,4 +34,4 @@ (function() {
             basic_expression_list: [ [ "terminal_list", "$$ = [$1];" ] ],
-            terminal_list: [ [ "terminal_list terminal", "$1.push($2); $$ = $1;" ], [ "terminal_list async_operator", "$1.push($2); $$ = $1;" ], [ "terminal", "$$ = [$1];" ] ],
-            async_operator: [ [ "!", "$$ = yy.loc(yy.terms.asyncArgument(), @$);" ] ],
+            terminal_list: [ [ "terminal_list terminal", "$1.push($2); $$ = $1;" ], [ "terminal_list call_operator", "$1.push($2); $$ = $1;" ], [ "terminal", "$$ = [$1];" ] ],
+            call_operator: [ [ "!", "$$ = yy.loc(yy.terms.asyncArgument(), @$);" ], [ "?", "$$ = yy.loc(yy.terms.futureArgument(), @$);" ] ],
             terminal: [ [ "( arguments )", "$$ = yy.loc(yy.terms.argumentList($arguments), @$);" ], [ "@ ( parameters )", "$$ = yy.loc(yy.terms.parameters($3), @$);" ], [ "block_start statements }", "$$ = yy.loc(yy.terms.block([], $2), @$);" ], [ "=> block_start statements }", "$$ = yy.loc(yy.terms.block([], $3, {redefinesSelf: true}), @$);" ], [ "[ arguments ]", "$$ = yy.loc(yy.terms.list($2), @$);" ], [ "{ hash_entries }", "$$ = yy.loc(yy.terms.hash($2), @$);" ], [ "float", "$$ = yy.loc(yy.terms.float(parseFloat(yytext)), @$);" ], [ "integer", "$$ = yy.loc(yy.terms.integer(parseInt(yytext, 10)), @$);" ], [ "identifier", "$$ = yy.loc(yy.terms.identifier(yytext), @$);" ], [ "string", "$$ = yy.loc(yy.terms.string(yy.unindentBy(yy.normaliseString(yytext), @$.first_column + 1)), @$);" ], [ "reg_exp", "$$ = yy.loc(yy.terms.regExp(yy.parseRegExp(yy.unindentBy(yytext, @$.first_column + 2))), @$);" ], [ "interpolated_string", "$$ = yy.loc($1, @$);" ], [ "...", "$$ = yy.loc(yy.terms.splat(), @$);" ] ],
@@ -38,0 +38,0 @@ block_start: [ [ "@ {", "$$ = '@{'" ], [ "@{", "$$ = '@{'" ] ],

lib/parser/jisonParser.js

@@ -5,5 +5,5 @@ /* Jison generated parser */
 yy: {},
-symbols_: {"error":2,"module_statements":3,"statements":4,"eof":5,"statements_list":6,"hash_entries":7,",":8,"expression":9,"statement":10,"arguments":11,"arguments_list":12,"argument":13,":":14,"parameters":15,"parameter_list":16,"=":17,":=":18,"operator_expression":19,"operator_with_newline":20,"operator":21,"unary_operator_expression":22,"object_operation":23,"unary_operator":24,"object_reference_with_newline":25,".":26,"complex_expression":27,"basic_expression_list":28,"terminal_list":29,"terminal":30,"async_operator":31,"!":32,"(":33,")":34,"@":35,"block_start":36,"}":37,"=>":38,"[":39,"]":40,"{":41,"float":42,"integer":43,"identifier":44,"string":45,"reg_exp":46,"interpolated_string":47,"...":48,"@{":49,"interpolated_terminal":50,"start_interpolated_string":51,"interpolated_string_components":52,"end_interpolated_string":53,"interpolated_string_component":54,"interpolated_string_body":55,"escaped_interpolated_string_terminal_start":56,"escape_sequence":57,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"eof",8:",",14:":",17:"=",18:":=",21:"operator",26:".",32:"!",33:"(",34:")",35:"@",37:"}",38:"=>",39:"[",40:"]",41:"{",42:"float",43:"integer",44:"identifier",45:"string",46:"reg_exp",48:"...",49:"@{",51:"start_interpolated_string",53:"end_interpolated_string",55:"interpolated_string_body",56:"escaped_interpolated_string_terminal_start",57:"escape_sequence"},
-productions_: [0,[3,2],[4,1],[7,3],[7,1],[7,0],[6,3],[6,1],[6,0],[11,1],[11,0],[12,3],[12,1],[13,3],[13,1],[15,1],[15,0],[16,3],[16,1],[10,1],[9,3],[9,3],[9,1],[20,2],[20,1],[19,3],[19,1],[22,1],[22,2],[25,2],[25,1],[23,3],[23,1],[27,1],[28,1],[29,2],[29,2],[29,1],[31,1],[30,3],[30,4],[30,3],[30,4],[30,3],[30,3],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[36,2],[36,1],[24,1],[24,1],[50,3],[47,3],[47,2],[52,2],[52,1],[54,1],[54,1],[54,1],[54,1]],
+symbols_: {"error":2,"module_statements":3,"statements":4,"eof":5,"statements_list":6,"hash_entries":7,",":8,"expression":9,"statement":10,"arguments":11,"arguments_list":12,"argument":13,":":14,"parameters":15,"parameter_list":16,"=":17,":=":18,"operator_expression":19,"operator_with_newline":20,"operator":21,"unary_operator_expression":22,"object_operation":23,"unary_operator":24,"object_reference_with_newline":25,".":26,"complex_expression":27,"basic_expression_list":28,"terminal_list":29,"terminal":30,"call_operator":31,"!":32,"?":33,"(":34,")":35,"@":36,"block_start":37,"}":38,"=>":39,"[":40,"]":41,"{":42,"float":43,"integer":44,"identifier":45,"string":46,"reg_exp":47,"interpolated_string":48,"...":49,"@{":50,"interpolated_terminal":51,"start_interpolated_string":52,"interpolated_string_components":53,"end_interpolated_string":54,"interpolated_string_component":55,"interpolated_string_body":56,"escaped_interpolated_string_terminal_start":57,"escape_sequence":58,"$accept":0,"$end":1},
+terminals_: {2:"error",5:"eof",8:",",14:":",17:"=",18:":=",21:"operator",26:".",32:"!",33:"?",34:"(",35:")",36:"@",38:"}",39:"=>",40:"[",41:"]",42:"{",43:"float",44:"integer",45:"identifier",46:"string",47:"reg_exp",49:"...",50:"@{",52:"start_interpolated_string",54:"end_interpolated_string",56:"interpolated_string_body",57:"escaped_interpolated_string_terminal_start",58:"escape_sequence"},
+productions_: [0,[3,2],[4,1],[7,3],[7,1],[7,0],[6,3],[6,1],[6,0],[11,1],[11,0],[12,3],[12,1],[13,3],[13,1],[15,1],[15,0],[16,3],[16,1],[10,1],[9,3],[9,3],[9,1],[20,2],[20,1],[19,3],[19,1],[22,1],[22,2],[25,2],[25,1],[23,3],[23,1],[27,1],[28,1],[29,2],[29,2],[29,1],[31,1],[31,1],[30,3],[30,4],[30,3],[30,4],[30,3],[30,3],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[30,1],[37,2],[37,1],[24,1],[24,1],[51,3],[48,3],[48,2],[53,2],[53,1],[55,1],[55,1],[55,1],[55,1]],
 performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
@@ -89,57 +89,59 @@
 break;
-case 39:this.$ = yy.loc(yy.terms.argumentList($$[$0-1]), this._$);
+case 39:this.$ = yy.loc(yy.terms.futureArgument(), this._$);
 break;
-case 40:this.$ = yy.loc(yy.terms.parameters($$[$0-1]), this._$);
+case 40:this.$ = yy.loc(yy.terms.argumentList($$[$0-1]), this._$);
 break;
-case 41:this.$ = yy.loc(yy.terms.block([], $$[$0-1]), this._$);
+case 41:this.$ = yy.loc(yy.terms.parameters($$[$0-1]), this._$);
 break;
-case 42:this.$ = yy.loc(yy.terms.block([], $$[$0-1], {redefinesSelf: true}), this._$);
+case 42:this.$ = yy.loc(yy.terms.block([], $$[$0-1]), this._$);
 break;
-case 43:this.$ = yy.loc(yy.terms.list($$[$0-1]), this._$);
+case 43:this.$ = yy.loc(yy.terms.block([], $$[$0-1], {redefinesSelf: true}), this._$);
 break;
-case 44:this.$ = yy.loc(yy.terms.hash($$[$0-1]), this._$);
+case 44:this.$ = yy.loc(yy.terms.list($$[$0-1]), this._$);
 break;
-case 45:this.$ = yy.loc(yy.terms.float(parseFloat(yytext)), this._$);
+case 45:this.$ = yy.loc(yy.terms.hash($$[$0-1]), this._$);
 break;
-case 46:this.$ = yy.loc(yy.terms.integer(parseInt(yytext, 10)), this._$);
+case 46:this.$ = yy.loc(yy.terms.float(parseFloat(yytext)), this._$);
 break;
-case 47:this.$ = yy.loc(yy.terms.identifier(yytext), this._$);
+case 47:this.$ = yy.loc(yy.terms.integer(parseInt(yytext, 10)), this._$);
 break;
-case 48:this.$ = yy.loc(yy.terms.string(yy.unindentBy(yy.normaliseString(yytext), this._$.first_column + 1)), this._$);
+case 48:this.$ = yy.loc(yy.terms.identifier(yytext), this._$);
 break;
-case 49:this.$ = yy.loc(yy.terms.regExp(yy.parseRegExp(yy.unindentBy(yytext, this._$.first_column + 2))), this._$);
+case 49:this.$ = yy.loc(yy.terms.string(yy.unindentBy(yy.normaliseString(yytext), this._$.first_column + 1)), this._$);
 break;
-case 50:this.$ = yy.loc($$[$0], this._$);
+case 50:this.$ = yy.loc(yy.terms.regExp(yy.parseRegExp(yy.unindentBy(yytext, this._$.first_column + 2))), this._$);
 break;
-case 51:this.$ = yy.loc(yy.terms.splat(), this._$);
+case 51:this.$ = yy.loc($$[$0], this._$);
 break;
-case 52:this.$ = '@{'
+case 52:this.$ = yy.loc(yy.terms.splat(), this._$);
 break;
 case 53:this.$ = '@{'
 break;
-case 54:this.$ = $$[$0];
+case 54:this.$ = '@{'
 break;
 case 55:this.$ = $$[$0];
 break;
-case 56:this.$ = $$[$0-1];
+case 56:this.$ = $$[$0];
 break;
-case 57:this.$ = yy.terms.interpolatedString(yy.normaliseStringComponentsUnindentingBy($$[$0-1], this._$.first_column + 1));
+case 57:this.$ = $$[$0-1];
 break;
-case 58:this.$ = yy.terms.interpolatedString([]);
+case 58:this.$ = yy.terms.interpolatedString(yy.normaliseStringComponentsUnindentingBy($$[$0-1], this._$.first_column + 1));
 break;
-case 59:$$[$0-1].push($$[$0]); this.$ = $$[$0-1];
+case 59:this.$ = yy.terms.interpolatedString([]);
 break;
-case 60:this.$ = [$$[$0]];
+case 60:$$[$0-1].push($$[$0]); this.$ = $$[$0-1];
 break;
-case 61:this.$ = $$[$0];
+case 61:this.$ = [$$[$0]];
 break;
-case 62:this.$ = yy.terms.string($$[$0]);
+case 62:this.$ = $$[$0];
 break;
-case 63:this.$ = yy.terms.string("#");
+case 63:this.$ = yy.terms.string($$[$0]);
 break;
-case 64:this.$ = yy.terms.string(yy.normaliseInterpolatedString($$[$0]));
+case 64:this.$ = yy.terms.string("#");
 break;
+case 65:this.$ = yy.terms.string(yy.normaliseInterpolatedString($$[$0]));
+break;
 }
 },
-table: [{3:1,4:2,5:[2,8],6:3,8:[2,8],9:5,10:4,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{1:[3]},{5:[1,31]},{5:[2,2],8:[1,32],37:[2,2]},{5:[2,7],8:[2,7],37:[2,7]},{5:[2,19],8:[2,19],17:[1,33],18:[1,34],34:[2,19],37:[2,19]},{5:[2,22],8:[2,22],14:[2,22],17:[2,22],18:[2,22],20:35,21:[1,36],34:[2,22],37:[2,22],40:[2,22]},{5:[2,26],8:[2,26],14:[2,26],17:[2,26],18:[2,26],21:[2,26],34:[2,26],37:[2,26],40:[2,26]},{5:[2,27],8:[2,27],14:[2,27],17:[2,27],18:[2,27],21:[2,27],25:37,26:[1,38],34:[2,27],37:[2,27],40:[2,27]},{21:[1,11],22:39,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{5:[2,32],8:[2,32],14:[2,32],17:[2,32],18:[2,32],21:[2,32],26:[2,32],34:[2,32],37:[2,32],40:[2,32]},{21:[2,54],32:[2,54],33:[2,54],35:[2,54],38:[2,54],39:[2,54],41:[2,54],42:[2,54],43:[2,54],44:[2,54],45:[2,54],46:[2,54],48:[2,54],49:[2,54],51:[2,54]},{21:[2,55],32:[2,55],33:[2,55],35:[2,55],38:[2,55],39:[2,55],41:[2,55],42:[2,55],43:[2,55],44:[2,55],45:[2,55],46:[2,55],48:[2,55],49:[2,55],51:[2,55]},{5:[2,33],8:[2,33],14:[2,33],17:[2,33],18:[2,33],21:[2,33],26:[2,33],34:[2,33],37:[2,33],40:[2,33]},{5:[2,34],8:[2,34],14:[2,34],17:[2,34],18:[2,34],21:[2,34],26:[2,34],30:40,31:41,32:[1,42],33:[1,16],34:[2,34],35:[1,17],36:18,37:[2,34],38:[1,19],39:[1,20],40:[2,34],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{5:[2,37],8:[2,37],14:[2,37],17:[2,37],18:[2,37],21:[2,37],26:[2,37],32:[2,37],33:[2,37],34:[2,37],35:[2,37],37:[2,37],38:[2,37],39:[2,37],40:[2,37],41:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],48:[2,37],49:[2,37],51:[2,37]},{9:46,10:47,11:43,12:44,13:45,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],34:[2,10],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{33:[1,48],41:[1,49]},{4:50,6:3,8:[2,8],9:5,10:4,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,37:[2,8],38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{35:[1,52],36:51,49:[1,29]},{9:46,10:47,11:53,12:44,13:45,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],40:[2,10],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{7:54,8:[2,5],9:55,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,37:[2,5],38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{5:[2,45],8:[2,45],14:[2,45],17:[2,45],18:[2,45],21:[2,45],26:[2,45],32:[2,45],33:[2,45],34:[2,45],35:[2,45],37:[2,45],38:[2,45],39:[2,45],40:[2,45],41:[2,45],42:[2,45],43:[2,45],44:[2,45],45:[2,45],46:[2,45],48:[2,45],49:[2,45],51:[2,45]},{5:[2,46],8:[2,46],14:[2,46],17:[2,46],18:[2,46],21:[2,46],26:[2,46],32:[2,46],33:[2,46],34:[2,46],35:[2,46],37:[2,46],38:[2,46],39:[2,46],40:[2,46],41:[2,46],42:[2,46],43:[2,46],44:[2,46],45:[2,46],46:[2,46],48:[2,46],49:[2,46],51:[2,46]},{5:[2,47],8:[2,47],14:[2,47],17:[2,47],18:[2,47],21:[2,47],26:[2,47],32:[2,47],33:[2,47],34:[2,47],35:[2,47],37:[2,47],38:[2,47],39:[2,47],40:[2,47],41:[2,47],42:[2,47],43:[2,47],44:[2,47],45:[2,47],46:[2,47],48:[2,47],49:[2,47],51:[2,47]},{5:[2,48],8:[2,48],14:[2,48],17:[2,48],18:[2,48],21:[2,48],26:[2,48],32:[2,48],33:[2,48],34:[2,48],35:[2,48],37:[2,48],38:[2,48],39:[2,48],40:[2,48],41:[2,48],42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],48:[2,48],49:[2,48],51:[2,48]},{5:[2,49],8:[2,49],14:[2,49],17:[2,49],18:[2,49],21:[2,49],26:[2,49],32:[2,49],33:[2,49],34:[2,49],35:[2,49],37:[2,49],38:[2,49],39:[2,49],40:[2,49],41:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],48:[2,49],49:[2,49],51:[2,49]},{5:[2,50],8:[2,50],14:[2,50],17:[2,50],18:[2,50],21:[2,50],26:[2,50],32:[2,50],33:[2,50],34:[2,50],35:[2,50],37:[2,50],38:[2,50],39:[2,50],40:[2,50],41:[2,50],42:[2,50],43:[2,50],44:[2,50],45:[2,50],46:[2,50],48:[2,50],49:[2,50],51:[2,50]},{5:[2,51],8:[2,51],14:[2,51],17:[2,51],18:[2,51],21:[2,51],26:[2,51],32:[2,51],33:[2,51],34:[2,51],35:[2,51],37:[2,51],38:[2,51],39:[2,51],40:[2,51],41:[2,51],42:[2,51],43:[2,51],44:[2,51],45:[2,51],46:[2,51],48:[2,51],49:[2,51],51:[2,51]},{8:[2,53],21:[2,53],32:[2,53],33:[2,53],35:[2,53],37:[2,53],38:[2,53],39:[2,53],41:[2,53],42:[2,53],43:[2,53],44:[2,53],45:[2,53],46:[2,53],48:[2,53],49:[2,53],51:[2,53]},{33:[1,63],50:59,52:56,53:[1,57],54:58,55:[1,60],56:[1,61],57:[1,62]},{1:[2,1]},{9:5,10:64,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{9:65,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{9:66,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{21:[1,11],22:67,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{8:[1,68],21:[2,24],32:[2,24],33:[2,24],35:[2,24],38:[2,24],39:[2,24],41:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],48:[2,24],49:[2,24],51:[2,24]},{27:69,28:13,29:14,30:15,33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{8:[1,70],33:[2,30],35:[2,30],38:[2,30],39:[2,30],41:[2,30],42:[2,30],43:[2,30],44:[2,30],45:[2,30],46:[2,30],48:[2,30],49:[2,30],51:[2,30]},{5:[2,28],8:[2,28],14:[2,28],17:[2,28],18:[2,28],21:[2,28],34:[2,28],37:[2,28],40:[2,28]},{5:[2,35],8:[2,35],14:[2,35],17:[2,35],18:[2,35],21:[2,35],26:[2,35],32:[2,35],33:[2,35],34:[2,35],35:[2,35],37:[2,35],38:[2,35],39:[2,35],40:[2,35],41:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],48:[2,35],49:[2,35],51:[2,35]},{5:[2,36],8:[2,36],14:[2,36],17:[2,36],18:[2,36],21:[2,36],26:[2,36],32:[2,36],33:[2,36],34:[2,36],35:[2,36],37:[2,36],38:[2,36],39:[2,36],40:[2,36],41:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],48:[2,36],49:[2,36],51:[2,36]},{5:[2,38],8:[2,38],14:[2,38],17:[2,38],18:[2,38],21:[2,38],26:[2,38],32:[2,38],33:[2,38],34:[2,38],35:[2,38],37:[2,38],38:[2,38],39:[2,38],40:[2,38],41:[2,38],42:[2,38],43:[2,38],44:[2,38],45:[2,38],46:[2,38],48:[2,38],49:[2,38],51:[2,38]},{34:[1,71]},{8:[1,72],34:[2,9],40:[2,9]},{8:[2,12],34:[2,12],40:[2,12]},{8:[2,19],14:[1,73],17:[1,33],18:[1,34],34:[2,19],40:[2,19]},{8:[2,14],34:[2,14],40:[2,14]},{9:5,10:76,15:74,16:75,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],34:[2,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{8:[2,52],21:[2,52],32:[2,52],33:[2,52],35:[2,52],37:[2,52],38:[2,52],39:[2,52],41:[2,52],42:[2,52],43:[2,52],44:[2,52],45:[2,52],46:[2,52],48:[2,52],49:[2,52],51:[2,52]},{37:[1,77]},{4:78,6:3,8:[2,8],9:5,10:4,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,37:[2,8],38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{41:[1,49]},{40:[1,79]},{8:[1,81],37:[1,80]},{8:[2,4],17:[1,33],18:[1,34],37:[2,4]},{33:[1,63],50:59,53:[1,82],54:83,55:[1,60],56:[1,61],57:[1,62]},{5:[2,58],8:[2,58],14:[2,58],17:[2,58],18:[2,58],21:[2,58],26:[2,58],32:[2,58],33:[2,58],34:[2,58],35:[2,58],37:[2,58],38:[2,58],39:[2,58],40:[2,58],41:[2,58],42:[2,58],43:[2,58],44:[2,58],45:[2,58],46:[2,58],48:[2,58],49:[2,58],51:[2,58]},{33:[2,60],53:[2,60],55:[2,60],56:[2,60],57:[2,60]},{33:[2,61],53:[2,61],55:[2,61],56:[2,61],57:[2,61]},{33:[2,62],53:[2,62],55:[2,62],56:[2,62],57:[2,62]},{33:[2,63],53:[2,63],55:[2,63],56:[2,63],57:[2,63]},{33:[2,64],53:[2,64],55:[2,64],56:[2,64],57:[2,64]},{9:5,10:84,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{5:[2,6],8:[2,6],37:[2,6]},{5:[2,20],8:[2,20],14:[2,20],17:[1,33],18:[1,34],34:[2,20],37:[2,20],40:[2,20]},{5:[2,21],8:[2,21],14:[2,21],17:[1,33],18:[1,34],34:[2,21],37:[2,21],40:[2,21]},{5:[2,25],8:[2,25],14:[2,25],17:[2,25],18:[2,25],21:[2,25],34:[2,25],37:[2,25],40:[2,25]},{21:[2,23],32:[2,23],33:[2,23],35:[2,23],38:[2,23],39:[2,23],41:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],48:[2,23],49:[2,23],51:[2,23]},{5:[2,31],8:[2,31],14:[2,31],17:[2,31],18:[2,31],21:[2,31],26:[2,31],34:[2,31],37:[2,31],40:[2,31]},{33:[2,29],35:[2,29],38:[2,29],39:[2,29],41:[2,29],42:[2,29],43:[2,29],44:[2,29],45:[2,29],46:[2,29],48:[2,29],49:[2,29],51:[2,29]},{5:[2,39],8:[2,39],14:[2,39],17:[2,39],18:[2,39],21:[2,39],26:[2,39],32:[2,39],33:[2,39],34:[2,39],35:[2,39],37:[2,39],38:[2,39],39:[2,39],40:[2,39],41:[2,39],42:[2,39],43:[2,39],44:[2,39],45:[2,39],46:[2,39],48:[2,39],49:[2,39],51:[2,39]},{9:46,10:47,13:85,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{9:86,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{34:[1,87]},{8:[1,88],34:[2,15]},{8:[2,18],34:[2,18]},{5:[2,41],8:[2,41],14:[2,41],17:[2,41],18:[2,41],21:[2,41],26:[2,41],32:[2,41],33:[2,41],34:[2,41],35:[2,41],37:[2,41],38:[2,41],39:[2,41],40:[2,41],41:[2,41],42:[2,41],43:[2,41],44:[2,41],45:[2,41],46:[2,41],48:[2,41],49:[2,41],51:[2,41]},{37:[1,89]},{5:[2,43],8:[2,43],14:[2,43],17:[2,43],18:[2,43],21:[2,43],26:[2,43],32:[2,43],33:[2,43],34:[2,43],35:[2,43],37:[2,43],38:[2,43],39:[2,43],40:[2,43],41:[2,43],42:[2,43],43:[2,43],44:[2,43],45:[2,43],46:[2,43],48:[2,43],49:[2,43],51:[2,43]},{5:[2,44],8:[2,44],14:[2,44],17:[2,44],18:[2,44],21:[2,44],26:[2,44],32:[2,44],33:[2,44],34:[2,44],35:[2,44],37:[2,44],38:[2,44],39:[2,44],40:[2,44],41:[2,44],42:[2,44],43:[2,44],44:[2,44],45:[2,44],46:[2,44],48:[2,44],49:[2,44],51:[2,44]},{9:90,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{5:[2,57],8:[2,57],14:[2,57],17:[2,57],18:[2,57],21:[2,57],26:[2,57],32:[2,57],33:[2,57],34:[2,57],35:[2,57],37:[2,57],38:[2,57],39:[2,57],40:[2,57],41:[2,57],42:[2,57],43:[2,57],44:[2,57],45:[2,57],46:[2,57],48:[2,57],49:[2,57],51:[2,57]},{33:[2,59],53:[2,59],55:[2,59],56:[2,59],57:[2,59]},{34:[1,91]},{8:[2,11],34:[2,11],40:[2,11]},{8:[2,13],17:[1,33],18:[1,34],34:[2,13],40:[2,13]},{5:[2,40],8:[2,40],14:[2,40],17:[2,40],18:[2,40],21:[2,40],26:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],37:[2,40],38:[2,40],39:[2,40],40:[2,40],41:[2,40],42:[2,40],43:[2,40],44:[2,40],45:[2,40],46:[2,40],48:[2,40],49:[2,40],51:[2,40]},{9:5,10:92,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],33:[1,16],35:[1,17],36:18,38:[1,19],39:[1,20],41:[1,21],42:[1,22],43:[1,23],44:[1,24],45:[1,25],46:[1,26],47:27,48:[1,28],49:[1,29],51:[1,30]},{5:[2,42],8:[2,42],14:[2,42],17:[2,42],18:[2,42],21:[2,42],26:[2,42],32:[2,42],33:[2,42],34:[2,42],35:[2,42],37:[2,42],38:[2,42],39:[2,42],40:[2,42],41:[2,42],42:[2,42],43:[2,42],44:[2,42],45:[2,42],46:[2,42],48:[2,42],49:[2,42],51:[2,42]},{8:[2,3],17:[1,33],18:[1,34],37:[2,3]},{33:[2,56],53:[2,56],55:[2,56],56:[2,56],57:[2,56]},{8:[2,17],34:[2,17]}],
+table: [{3:1,4:2,5:[2,8],6:3,8:[2,8],9:5,10:4,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{1:[3]},{5:[1,31]},{5:[2,2],8:[1,32],38:[2,2]},{5:[2,7],8:[2,7],38:[2,7]},{5:[2,19],8:[2,19],17:[1,33],18:[1,34],35:[2,19],38:[2,19]},{5:[2,22],8:[2,22],14:[2,22],17:[2,22],18:[2,22],20:35,21:[1,36],35:[2,22],38:[2,22],41:[2,22]},{5:[2,26],8:[2,26],14:[2,26],17:[2,26],18:[2,26],21:[2,26],35:[2,26],38:[2,26],41:[2,26]},{5:[2,27],8:[2,27],14:[2,27],17:[2,27],18:[2,27],21:[2,27],25:37,26:[1,38],35:[2,27],38:[2,27],41:[2,27]},{21:[1,11],22:39,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{5:[2,32],8:[2,32],14:[2,32],17:[2,32],18:[2,32],21:[2,32],26:[2,32],35:[2,32],38:[2,32],41:[2,32]},{21:[2,55],32:[2,55],34:[2,55],36:[2,55],39:[2,55],40:[2,55],42:[2,55],43:[2,55],44:[2,55],45:[2,55],46:[2,55],47:[2,55],49:[2,55],50:[2,55],52:[2,55]},{21:[2,56],32:[2,56],34:[2,56],36:[2,56],39:[2,56],40:[2,56],42:[2,56],43:[2,56],44:[2,56],45:[2,56],46:[2,56],47:[2,56],49:[2,56],50:[2,56],52:[2,56]},{5:[2,33],8:[2,33],14:[2,33],17:[2,33],18:[2,33],21:[2,33],26:[2,33],35:[2,33],38:[2,33],41:[2,33]},{5:[2,34],8:[2,34],14:[2,34],17:[2,34],18:[2,34],21:[2,34],26:[2,34],30:40,31:41,32:[1,42],33:[1,43],34:[1,16],35:[2,34],36:[1,17],37:18,38:[2,34],39:[1,19],40:[1,20],41:[2,34],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{5:[2,37],8:[2,37],14:[2,37],17:[2,37],18:[2,37],21:[2,37],26:[2,37],32:[2,37],33:[2,37],34:[2,37],35:[2,37],36:[2,37],38:[2,37],39:[2,37],40:[2,37],41:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],47:[2,37],49:[2,37],50:[2,37],52:[2,37]},{9:47,10:48,11:44,12:45,13:46,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],35:[2,10],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{34:[1,49],42:[1,50]},{4:51,6:3,8:[2,8],9:5,10:4,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,38:[2,8],39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{36:[1,53],37:52,50:[1,29]},{9:47,10:48,11:54,12:45,13:46,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],41:[2,10],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{7:55,8:[2,5],9:56,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,38:[2,5],39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{5:[2,46],8:[2,46],14:[2,46],17:[2,46],18:[2,46],21:[2,46],26:[2,46],32:[2,46],33:[2,46],34:[2,46],35:[2,46],36:[2,46],38:[2,46],39:[2,46],40:[2,46],41:[2,46],42:[2,46],43:[2,46],44:[2,46],45:[2,46],46:[2,46],47:[2,46],49:[2,46],50:[2,46],52:[2,46]},{5:[2,47],8:[2,47],14:[2,47],17:[2,47],18:[2,47],21:[2,47],26:[2,47],32:[2,47],33:[2,47],34:[2,47],35:[2,47],36:[2,47],38:[2,47],39:[2,47],40:[2,47],41:[2,47],42:[2,47],43:[2,47],44:[2,47],45:[2,47],46:[2,47],47:[2,47],49:[2,47],50:[2,47],52:[2,47]},{5:[2,48],8:[2,48],14:[2,48],17:[2,48],18:[2,48],21:[2,48],26:[2,48],32:[2,48],33:[2,48],34:[2,48],35:[2,48],36:[2,48],38:[2,48],39:[2,48],40:[2,48],41:[2,48],42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],47:[2,48],49:[2,48],50:[2,48],52:[2,48]},{5:[2,49],8:[2,49],14:[2,49],17:[2,49],18:[2,49],21:[2,49],26:[2,49],32:[2,49],33:[2,49],34:[2,49],35:[2,49],36:[2,49],38:[2,49],39:[2,49],40:[2,49],41:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],47:[2,49],49:[2,49],50:[2,49],52:[2,49]},{5:[2,50],8:[2,50],14:[2,50],17:[2,50],18:[2,50],21:[2,50],26:[2,50],32:[2,50],33:[2,50],34:[2,50],35:[2,50],36:[2,50],38:[2,50],39:[2,50],40:[2,50],41:[2,50],42:[2,50],43:[2,50],44:[2,50],45:[2,50],46:[2,50],47:[2,50],49:[2,50],50:[2,50],52:[2,50]},{5:[2,51],8:[2,51],14:[2,51],17:[2,51],18:[2,51],21:[2,51],26:[2,51],32:[2,51],33:[2,51],34:[2,51],35:[2,51],36:[2,51],38:[2,51],39:[2,51],40:[2,51],41:[2,51],42:[2,51],43:[2,51],44:[2,51],45:[2,51],46:[2,51],47:[2,51],49:[2,51],50:[2,51],52:[2,51]},{5:[2,52],8:[2,52],14:[2,52],17:[2,52],18:[2,52],21:[2,52],26:[2,52],32:[2,52],33:[2,52],34:[2,52],35:[2,52],36:[2,52],38:[2,52],39:[2,52],40:[2,52],41:[2,52],42:[2,52],43:[2,52],44:[2,52],45:[2,52],46:[2,52],47:[2,52],49:[2,52],50:[2,52],52:[2,52]},{8:[2,54],21:[2,54],32:[2,54],34:[2,54],36:[2,54],38:[2,54],39:[2,54],40:[2,54],42:[2,54],43:[2,54],44:[2,54],45:[2,54],46:[2,54],47:[2,54],49:[2,54],50:[2,54],52:[2,54]},{34:[1,64],51:60,53:57,54:[1,58],55:59,56:[1,61],57:[1,62],58:[1,63]},{1:[2,1]},{9:5,10:65,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{9:66,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{9:67,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{21:[1,11],22:68,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{8:[1,69],21:[2,24],32:[2,24],34:[2,24],36:[2,24],39:[2,24],40:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],47:[2,24],49:[2,24],50:[2,24],52:[2,24]},{27:70,28:13,29:14,30:15,34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{8:[1,71],34:[2,30],36:[2,30],39:[2,30],40:[2,30],42:[2,30],43:[2,30],44:[2,30],45:[2,30],46:[2,30],47:[2,30],49:[2,30],50:[2,30],52:[2,30]},{5:[2,28],8:[2,28],14:[2,28],17:[2,28],18:[2,28],21:[2,28],35:[2,28],38:[2,28],41:[2,28]},{5:[2,35],8:[2,35],14:[2,35],17:[2,35],18:[2,35],21:[2,35],26:[2,35],32:[2,35],33:[2,35],34:[2,35],35:[2,35],36:[2,35],38:[2,35],39:[2,35],40:[2,35],41:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],47:[2,35],49:[2,35],50:[2,35],52:[2,35]},{5:[2,36],8:[2,36],14:[2,36],17:[2,36],18:[2,36],21:[2,36],26:[2,36],32:[2,36],33:[2,36],34:[2,36],35:[2,36],36:[2,36],38:[2,36],39:[2,36],40:[2,36],41:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],47:[2,36],49:[2,36],50:[2,36],52:[2,36]},{5:[2,38],8:[2,38],14:[2,38],17:[2,38],18:[2,38],21:[2,38],26:[2,38],32:[2,38],33:[2,38],34:[2,38],35:[2,38],36:[2,38],38:[2,38],39:[2,38],40:[2,38],41:[2,38],42:[2,38],43:[2,38],44:[2,38],45:[2,38],46:[2,38],47:[2,38],49:[2,38],50:[2,38],52:[2,38]},{5:[2,39],8:[2,39],14:[2,39],17:[2,39],18:[2,39],21:[2,39],26:[2,39],32:[2,39],33:[2,39],34:[2,39],35:[2,39],36:[2,39],38:[2,39],39:[2,39],40:[2,39],41:[2,39],42:[2,39],43:[2,39],44:[2,39],45:[2,39],46:[2,39],47:[2,39],49:[2,39],50:[2,39],52:[2,39]},{35:[1,72]},{8:[1,73],35:[2,9],41:[2,9]},{8:[2,12],35:[2,12],41:[2,12]},{8:[2,19],14:[1,74],17:[1,33],18:[1,34],35:[2,19],41:[2,19]},{8:[2,14],35:[2,14],41:[2,14]},{9:5,10:77,15:75,16:76,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],35:[2,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{8:[2,53],21:[2,53],32:[2,53],34:[2,53],36:[2,53],38:[2,53],39:[2,53],40:[2,53],42:[2,53],43:[2,53],44:[2,53],45:[2,53],46:[2,53],47:[2,53],49:[2,53],50:[2,53],52:[2,53]},{38:[1,78]},{4:79,6:3,8:[2,8],9:5,10:4,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,38:[2,8],39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{42:[1,50]},{41:[1,80]},{8:[1,82],38:[1,81]},{8:[2,4],17:[1,33],18:[1,34],38:[2,4]},{34:[1,64],51:60,54:[1,83],55:84,56:[1,61],57:[1,62],58:[1,63]},{5:[2,59],8:[2,59],14:[2,59],17:[2,59],18:[2,59],21:[2,59],26:[2,59],32:[2,59],33:[2,59],34:[2,59],35:[2,59],36:[2,59],38:[2,59],39:[2,59],40:[2,59],41:[2,59],42:[2,59],43:[2,59],44:[2,59],45:[2,59],46:[2,59],47:[2,59],49:[2,59],50:[2,59],52:[2,59]},{34:[2,61],54:[2,61],56:[2,61],57:[2,61],58:[2,61]},{34:[2,62],54:[2,62],56:[2,62],57:[2,62],58:[2,62]},{34:[2,63],54:[2,63],56:[2,63],57:[2,63],58:[2,63]},{34:[2,64],54:[2,64],56:[2,64],57:[2,64],58:[2,64]},{34:[2,65],54:[2,65],56:[2,65],57:[2,65],58:[2,65]},{9:5,10:85,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{5:[2,6],8:[2,6],38:[2,6]},{5:[2,20],8:[2,20],14:[2,20],17:[1,33],18:[1,34],35:[2,20],38:[2,20],41:[2,20]},{5:[2,21],8:[2,21],14:[2,21],17:[1,33],18:[1,34],35:[2,21],38:[2,21],41:[2,21]},{5:[2,25],8:[2,25],14:[2,25],17:[2,25],18:[2,25],21:[2,25],35:[2,25],38:[2,25],41:[2,25]},{21:[2,23],32:[2,23],34:[2,23],36:[2,23],39:[2,23],40:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],47:[2,23],49:[2,23],50:[2,23],52:[2,23]},{5:[2,31],8:[2,31],14:[2,31],17:[2,31],18:[2,31],21:[2,31],26:[2,31],35:[2,31],38:[2,31],41:[2,31]},{34:[2,29],36:[2,29],39:[2,29],40:[2,29],42:[2,29],43:[2,29],44:[2,29],45:[2,29],46:[2,29],47:[2,29],49:[2,29],50:[2,29],52:[2,29]},{5:[2,40],8:[2,40],14:[2,40],17:[2,40],18:[2,40],21:[2,40],26:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],38:[2,40],39:[2,40],40:[2,40],41:[2,40],42:[2,40],43:[2,40],44:[2,40],45:[2,40],46:[2,40],47:[2,40],49:[2,40],50:[2,40],52:[2,40]},{9:47,10:48,13:86,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{9:87,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{35:[1,88]},{8:[1,89],35:[2,15]},{8:[2,18],35:[2,18]},{5:[2,42],8:[2,42],14:[2,42],17:[2,42],18:[2,42],21:[2,42],26:[2,42],32:[2,42],33:[2,42],34:[2,42],35:[2,42],36:[2,42],38:[2,42],39:[2,42],40:[2,42],41:[2,42],42:[2,42],43:[2,42],44:[2,42],45:[2,42],46:[2,42],47:[2,42],49:[2,42],50:[2,42],52:[2,42]},{38:[1,90]},{5:[2,44],8:[2,44],14:[2,44],17:[2,44],18:[2,44],21:[2,44],26:[2,44],32:[2,44],33:[2,44],34:[2,44],35:[2,44],36:[2,44],38:[2,44],39:[2,44],40:[2,44],41:[2,44],42:[2,44],43:[2,44],44:[2,44],45:[2,44],46:[2,44],47:[2,44],49:[2,44],50:[2,44],52:[2,44]},{5:[2,45],8:[2,45],14:[2,45],17:[2,45],18:[2,45],21:[2,45],26:[2,45],32:[2,45],33:[2,45],34:[2,45],35:[2,45],36:[2,45],38:[2,45],39:[2,45],40:[2,45],41:[2,45],42:[2,45],43:[2,45],44:[2,45],45:[2,45],46:[2,45],47:[2,45],49:[2,45],50:[2,45],52:[2,45]},{9:91,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{5:[2,58],8:[2,58],14:[2,58],17:[2,58],18:[2,58],21:[2,58],26:[2,58],32:[2,58],33:[2,58],34:[2,58],35:[2,58],36:[2,58],38:[2,58],39:[2,58],40:[2,58],41:[2,58],42:[2,58],43:[2,58],44:[2,58],45:[2,58],46:[2,58],47:[2,58],49:[2,58],50:[2,58],52:[2,58]},{34:[2,60],54:[2,60],56:[2,60],57:[2,60],58:[2,60]},{35:[1,92]},{8:[2,11],35:[2,11],41:[2,11]},{8:[2,13],17:[1,33],18:[1,34],35:[2,13],41:[2,13]},{5:[2,41],8:[2,41],14:[2,41],17:[2,41],18:[2,41],21:[2,41],26:[2,41],32:[2,41],33:[2,41],34:[2,41],35:[2,41],36:[2,41],38:[2,41],39:[2,41],40:[2,41],41:[2,41],42:[2,41],43:[2,41],44:[2,41],45:[2,41],46:[2,41],47:[2,41],49:[2,41],50:[2,41],52:[2,41]},{9:5,10:93,19:6,21:[1,11],22:7,23:8,24:9,27:10,28:13,29:14,30:15,32:[1,12],34:[1,16],36:[1,17],37:18,39:[1,19],40:[1,20],42:[1,21],43:[1,22],44:[1,23],45:[1,24],46:[1,25],47:[1,26],48:27,49:[1,28],50:[1,29],52:[1,30]},{5:[2,43],8:[2,43],14:[2,43],17:[2,43],18:[2,43],21:[2,43],26:[2,43],32:[2,43],33:[2,43],34:[2,43],35:[2,43],36:[2,43],38:[2,43],39:[2,43],40:[2,43],41:[2,43],42:[2,43],43:[2,43],44:[2,43],45:[2,43],46:[2,43],47:[2,43],49:[2,43],50:[2,43],52:[2,43]},{8:[2,3],17:[1,33],18:[1,34],38:[2,3]},{34:[2,57],54:[2,57],56:[2,57],57:[2,57],58:[2,57]},{8:[2,17],35:[2,17]}],
 defaultActions: {31:[2,1]},
@@ -440,7 +442,7 @@ parseError: function parseError(str, hash) {
 break;
-case 7:yy.setIndentation(yy_.yytext); return 41;
+case 7:yy.setIndentation(yy_.yytext); return 42;
 break;
 case 8:return yy.unsetIndentation('}');
 break;
-case 9:yy.setIndentation(yy_.yytext); return 39;
+case 9:yy.setIndentation(yy_.yytext); return 40;
 break;
@@ -451,5 +453,5 @@ case 10:return yy.unsetIndentation(']')
 break;
-case 12:return 42;
+case 12:return 43;
 break;
-case 13:return 43;
+case 13:return 44;
 break;
@@ -464,23 +466,23 @@ case 14:return "operator";
 break;
-case 18:return 46;
+case 18:return 47;
 break;
-case 19:return 44;
+case 19:return 45;
 break;
 case 20:return 5;
 break;
-case 21:return 45;
+case 21:return 46;
 break;
-case 22:this.begin('interpolated_string'); return 51;
+case 22:this.begin('interpolated_string'); return 52;
 break;
-case 23:return 56;
+case 23:return 57;
 break;
-case 24:yy.setIndentation('('); yy.interpolation.startInterpolation(); this.begin('INITIAL'); return 33;
+case 24:yy.setIndentation('('); yy.interpolation.startInterpolation(); this.begin('INITIAL'); return 34;
 break;
-case 25:return 55;
+case 25:return 56;
 break;
-case 26:this.popState(); return 53;
+case 26:this.popState(); return 54;
 break;
-case 27:return 57;
+case 27:return 58;
 break;
-case 28:return 55;
+case 28:return 56;
 break;
@@ -487,0 +489,0 @@ case 29:return 'non_token';

lib/terms/closure.js

@@ -122,8 +122,12 @@ (function() {
                 var self = this;
-                var optionalParameters, async;
+                var optionalParameters, async, redefinesSelf;
                 optionalParameters = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "optionalParameters") && gen2_options.optionalParameters !== void 0 ? gen2_options.optionalParameters : [];
                 async = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "async") && gen2_options.async !== void 0 ? gen2_options.async : false;
+                redefinesSelf = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "redefinesSelf") && gen2_options.redefinesSelf !== void 0 ? gen2_options.redefinesSelf : void 0;
                 self.parameters = parameters;
                 self.optionalParameters = optionalParameters;
                 self.isAsync = self.isAsync || async;
+                if (redefinesSelf !== void 0) {
+                    self.redefinesSelf = redefinesSelf;
+                }
                 return self;
@@ -130,0 +134,0 @@ },

lib/terms/functionCall.js

 (function() {
     var self = this;
-    var codegenUtils, argumentUtils, _;
+    var codegenUtils, argumentUtils, _, asyncControl;
     codegenUtils = require("./codegenUtils");
     argumentUtils = require("./argumentUtils");
     _ = require("underscore");
+    asyncControl = require("../asyncControl");
     module.exports = function(terms) {
@@ -73,3 +74,3 @@ var self = this;
         return functionCall = function(fun, args, gen2_options) {
-            var optionalArguments, async, passThisToApply, originallyAsync, asyncCallbackArgument, couldBeMacro;
+            var optionalArguments, async, passThisToApply, originallyAsync, asyncCallbackArgument, couldBeMacro, future;
             optionalArguments = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "optionalArguments") && gen2_options.optionalArguments !== void 0 ? gen2_options.optionalArguments : [];
@@ -81,3 +82,4 @@ async = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "async") && gen2_options.async !== void 0 ? gen2_options.async : false;
             couldBeMacro = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "couldBeMacro") && gen2_options.couldBeMacro !== void 0 ? gen2_options.couldBeMacro : true;
-            var asyncResult, name, macro, funCall;
+            future = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "future") && gen2_options.future !== void 0 ? gen2_options.future : false;
+            var asyncResult, futureFunction, name, macro, funCall;
             if (async) {
@@ -94,2 +96,11 @@ asyncResult = terms.asyncResult();
                 }), asyncResult ]);
+            } else if (future) {
+                futureFunction = terms.moduleConstants.defineAs([ "future" ], terms.javascript(asyncControl.future.toString()));
+                return terms.functionCall(futureFunction, [ terms.closure([ terms.callbackFunction ], terms.statements([ terms.functionCall(fun, args, {
+                    optionalArguments: optionalArguments,
+                    passThisToApply: passThisToApply,
+                    originallyAsync: true,
+                    asyncCallbackArgument: terms.callbackFunction,
+                    couldBeMacro: couldBeMacro
+                }) ])) ]);
             } else if (fun.variable && couldBeMacro) {
@@ -96,0 +107,0 @@ name = fun.variable;

lib/terms/methodCall.js

 (function() {
     var self = this;
-    var codegenUtils, argumentUtils;
+    var codegenUtils, argumentUtils, asyncControl;
     codegenUtils = require("./codegenUtils");
     argumentUtils = require("./argumentUtils");
+    asyncControl = require("../asyncControl");
     module.exports = function(terms) {
@@ -48,6 +49,9 @@ var self = this;
         return methodCall = function(object, name, args, gen2_options) {
-            var optionalArguments, async;
+            var optionalArguments, async, future, originallyAsync, asyncCallbackArgument;
             optionalArguments = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "optionalArguments") && gen2_options.optionalArguments !== void 0 ? gen2_options.optionalArguments : [];
             async = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "async") && gen2_options.async !== void 0 ? gen2_options.async : false;
-            var splattedArgs, objectVar, asyncResult;
+            future = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "future") && gen2_options.future !== void 0 ? gen2_options.future : false;
+            originallyAsync = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "originallyAsync") && gen2_options.originallyAsync !== void 0 ? gen2_options.originallyAsync : false;
+            asyncCallbackArgument = gen2_options !== void 0 && Object.prototype.hasOwnProperty.call(gen2_options, "asyncCallbackArgument") && gen2_options.asyncCallbackArgument !== void 0 ? gen2_options.asyncCallbackArgument : void 0;
+            var splattedArgs, objectVar, asyncResult, futureFunction;
             splattedArgs = terms.splatArguments(args, optionalArguments);
@@ -69,6 +73,15 @@ if (splattedArgs) {
                 }), asyncResult ]);
+            } else if (future) {
+                futureFunction = terms.moduleConstants.defineAs([ "future" ], terms.javascript(asyncControl.future.toString()));
+                return terms.functionCall(futureFunction, [ terms.closure([ terms.callbackFunction ], terms.statements([ methodCallTerm(object, name, args, {
+                    optionalArguments: optionalArguments,
+                    originallyAsync: true,
+                    asyncCallbackArgument: terms.callbackFunction
+                }) ])) ]);
             } else {
                 return methodCallTerm(object, name, args, {
                     optionalArguments: optionalArguments,
-                    async: async
+                    async: async,
+                    originallyAsync: originallyAsync,
+                    asyncCallbackArgument: asyncCallbackArgument
                 });
@@ -75,0 +88,0 @@ }

lib/terms/statements.js

@@ -111,7 +111,4 @@ (function() {
             },
-            blockify: function(parameters, gen7_options) {
+            blockify: function(parameters, options) {
                 var self = this;
-                var optionalParameters, async;
-                optionalParameters = gen7_options !== void 0 && Object.prototype.hasOwnProperty.call(gen7_options, "optionalParameters") && gen7_options.optionalParameters !== void 0 ? gen7_options.optionalParameters : void 0;
-                async = gen7_options !== void 0 && Object.prototype.hasOwnProperty.call(gen7_options, "async") && gen7_options.async !== void 0 ? gen7_options.async : false;
                 var statements;
@@ -125,6 +122,3 @@ statements = function() {
                 }();
-                return terms.block(parameters, statements, {
-                    optionalParameters: optionalParameters,
-                    async: async
-                });
+                return terms.block(parameters, statements, options);
             },
@@ -131,0 +125,0 @@ scopify: function() {

lib/terms/terms.js

@@ -332,11 +332,5 @@ (function() {
             },
-            blockify: function(parameters, gen12_options) {
+            blockify: function(parameters, options) {
                 var self = this;
-                var optionalParameters, async;
-                optionalParameters = gen12_options !== void 0 && Object.prototype.hasOwnProperty.call(gen12_options, "optionalParameters") && gen12_options.optionalParameters !== void 0 ? gen12_options.optionalParameters : void 0;
-                async = gen12_options !== void 0 && Object.prototype.hasOwnProperty.call(gen12_options, "async") && gen12_options.async !== void 0 ? gen12_options.async : false;
-                return self.cg.block(parameters, self.cg.asyncStatements([ self ]), {
-                    optionalParameters: optionalParameters,
-                    async: async
-                });
+                return self.cg.block(parameters, self.cg.asyncStatements([ self ]), options);
             },
@@ -362,5 +356,5 @@ scopify: function() {
                 return self.clone({
-                    rewrite: function(term, gen13_options) {
+                    rewrite: function(term, gen12_options) {
                         var clone;
-                        clone = gen13_options !== void 0 && Object.prototype.hasOwnProperty.call(gen13_options, "clone") && gen13_options.clone !== void 0 ? gen13_options.clone : void 0;
+                        clone = gen12_options !== void 0 && Object.prototype.hasOwnProperty.call(gen12_options, "clone") && gen12_options.clone !== void 0 ? gen12_options.clone : void 0;
                         return term.expandMacro(clone);
@@ -377,5 +371,5 @@ }
                 return self.clone({
-                    rewrite: function(term, gen14_options) {
+                    rewrite: function(term, gen13_options) {
                         var clone;
-                        clone = gen14_options !== void 0 && Object.prototype.hasOwnProperty.call(gen14_options, "clone") && gen14_options.clone !== void 0 ? gen14_options.clone : void 0;
+                        clone = gen13_options !== void 0 && Object.prototype.hasOwnProperty.call(gen13_options, "clone") && gen13_options.clone !== void 0 ? gen13_options.clone : void 0;
                         return term.rewriteStatements(clone);
@@ -445,8 +439,8 @@ }
                 var args = Array.prototype.slice.call(arguments, 0, arguments.length);
-                var gen15_c;
-                gen15_c = function() {
+                var gen14_c;
+                gen14_c = function() {
                     termConstructor.apply(this, args);
                 };
-                gen15_c.prototype = termConstructor.prototype;
-                return new gen15_c();
+                gen14_c.prototype = termConstructor.prototype;
+                return new gen14_c();
             };
@@ -453,0 +447,0 @@ };

package.json

 {
     "name": "pogo",
-    "version": "0.3.2",
+    "version": "0.4.0",
     "description": "A readable, DSL friendly programming language that compiles to JavaScript",
@@ -5,0 +5,0 @@ "maintainers": [

No alert changes

Improved metrics

Total package byte prevSize

450195

increased by9.41%

Number of package files

175

increased by1.74%

Lines of code

6369

increased by1.14%

No dependency changes