fix declare implementation + improve coverage

Author: ichiriac

src/parser/statement.js

@@ -91,6 +91,20 @@ module.exports = function(api, tokens, EOF) {
       this.expectEndOfStatement();
       return ['const', result];
     }
+    /**
+     * Reads a list of constants declaration
+     * <ebnf>
+     *   const_list ::= T_CONST T_STRING '=' expr (',' T_STRING '=' expr)*
+     * </ebnf>
+     */
+    ,read_declare_list: function() {
+      return this.read_list(function() {
+        this.expect(tokens.T_STRING);
+        var name = this.text();
+        this.next().expect('=').next();
+        return [name, this.read_expr()];
+      }, ',');
+    }
     /**
      * reads a simple inner statement
      * <ebnf>
@@ -202,11 +216,12 @@ module.exports = function(api, tokens, EOF) {
           return ['sys', 'unset', items];
 
         case tokens.T_DECLARE:
+          var result = this.node('declare');
           this.next().expect('(').next();
-          var options = this.read_list(this.read_const_list, ',');
+          var options = this.read_declare_list();
           this.expect(')').next();
           var body = this.read_statement();
-          return ['declare', options, body]
+          return result(options, body);
           break;
 
         case tokens.T_TRY:
@@ -225,8 +240,9 @@ module.exports = function(api, tokens, EOF) {
         case tokens.T_STRING:
           var label = this.text();
           if (this.next().token === ':') {
+            var result = this.node('label');
             this.next();
-            return ['label', label];
+            return result(label);
           } else {
             // default fallback expr
             this.lexer.unput(label.length + this.text().length);
@@ -236,9 +252,10 @@ module.exports = function(api, tokens, EOF) {
           }
 
         case tokens.T_GOTO:
+          var result = this.node('goto');
           var label = this.next().expect(tokens.T_STRING).text();
           this.next().expectEndOfStatement();
-          return ['goto', label];
+          return result(label);
 
         default: // default fallback expr
           var expr = this.read_expr();

test/parser/statement.parser

@@ -18,17 +18,38 @@ while(true) {
   $i++;
 }
 --PASS--
-/* @todo
 switch(true) {
   case 1: break;
   case 2: break;
   default: break;
-} */
+}
 --PASS--
-/* try {
+try {
   $i++;
+} catch(CustomException $e) {
+  $i--;
 } catch(Exception $e) {
   $i--;
 } finally {
   unset($i);
-}  */
+}
+--PASS--
+namespace a {
+  const A = 1, B = 2;
+  if (true) {
+    interface foo {
+    }
+    class bar {
+    }
+    trait boo {
+    }
+    function baz() {
+    }
+  }
+}
+--PASS--
+declare(ticks=1) {
+  haha:
+  throw new Exception('foo');
+  goto haha;
+}