glayzzle#71 implement static closures

Author: ichiriac

src/parser/expr.js

@@ -332,9 +332,20 @@ module.exports = {
         return result(expr);
 
       case this.tok.T_FUNCTION:
-        // @fixme later - removed static lambda function declarations (colides with static keyword usage)
         return this.read_function(true);
 
+      case this.tok.T_STATIC:
+        var backup = [this.token, this.lexer.getState()];
+        if (this.next().token === this.tok.T_FUNCTION) {
+          // handles static function
+          return this.read_function(true, [0, 1, 0]);
+        } else {
+          // rollback
+          this.lexer.tokens.push(backup);
+          this.next();
+        }
+
+
     }
 
     // SCALAR | VARIABLE

src/parser/function.js

@@ -33,7 +33,8 @@ module.exports = {
    */
   ,read_function: function(closure, flag) {
     var result = this.read_function_declaration(
-      closure ? 1 : (flag ? 2 : 0)
+      closure ? 1 : (flag ? 2 : 0),
+      flag && flag[1] === 1
     );
     if (flag && flag[2] == 1) {
       // abstract function :
@@ -48,7 +49,7 @@ module.exports = {
           result.loc.end = result.body.loc.end;
         }
       }
-      if (flag) {
+      if (!closure && flag) {
         result.parseFlags(flag);
       }
     }
@@ -60,14 +61,15 @@ module.exports = {
    * function_declaration ::= T_FUNCTION '&'?  T_STRING '(' parameter_list ')'
    * ```
    */
-  ,read_function_declaration: function(type) {
+  ,read_function_declaration: function(type, isStatic) {
     var nodeName = 'function';
     if (type === 1) {
       nodeName = 'closure';
     } else if (type === 2) {
       nodeName = 'method';
     }
     var result = this.node(nodeName);
+
     if (this.expect(this.tok.T_FUNCTION)) {
       this.next();
     }
@@ -96,7 +98,7 @@ module.exports = {
     }
     if (type === 1) {
       // closure
-      return result(params, isRef, use, returnType, nullable);
+      return result(params, isRef, use, returnType, nullable, isStatic);
     }
     return result(name, params, isRef, returnType, nullable);
   }

src/parser/statement.js

@@ -244,6 +244,9 @@ module.exports = {
           this.expect(';') && this.nextWithComments();
           return expr;
         }
+        if (this.token === this.tok.T_FUNCTION) {
+          return this.read_function(true, [0, 1, 0]);
+        }
         var items = this.read_variable_declarations();
         this.expectEndOfStatement();
         return result(items);