handle optional level argument on break & continue statements

Author: ichiriac

docs/AST.md

@@ -2,6 +2,44 @@
 
 # AST
 
+The AST builder class
+
+**Parameters**
+
+-   `withPositions`  
+-   `withSource`  
+
+**Properties**
+
+-   `withPositions` **[Boolean](#boolean)** Should locate any node (by default false)
+-   `withSource` **[Boolean](#boolean)** Should extract the node original code (by default false)
+
+## position
+
+Create a position node from specified parser
+including it's lexer current state
+
+**Parameters**
+
+-   `Parser`  
+-   `parser`  
+
+Returns **[Position](#position)** 
+
+## prepare
+
+Prepares an AST node
+
+**Parameters**
+
+-   `kind` **([String](#string) | null)** Defines the node type
+    (if null, the kind must be passed at the function call)
+-   `parser` **Parser** The parser instance (use for extracting locations)
+
+Returns **[Function](#function)** 
+
+# AST
+
 ## Class hierarchy
 
 -   [Location](#location)
@@ -117,44 +155,6 @@ Prepares an AST node
 
 Returns **[Function](#function)** 
 
-# AST
-
-The AST builder class
-
-**Parameters**
-
--   `withPositions`  
--   `withSource`  
-
-**Properties**
-
--   `withPositions` **[Boolean](#boolean)** Should locate any node (by default false)
--   `withSource` **[Boolean](#boolean)** Should extract the node original code (by default false)
-
-## position
-
-Create a position node from specified parser
-including it's lexer current state
-
-**Parameters**
-
--   `Parser`  
--   `parser`  
-
-Returns **[Position](#position)** 
-
-## prepare
-
-Prepares an AST node
-
-**Parameters**
-
--   `kind` **([String](#string) | null)** Defines the node type
-    (if null, the kind must be passed at the function call)
--   `parser` **Parser** The parser instance (use for extracting locations)
-
-Returns **[Function](#function)** 
-
 # Array
 
 **Extends Expression**
@@ -224,6 +224,10 @@ Defines a boolean value (true/false)
 
 A break statement
 
+**Properties**
+
+-   `level` **([Number](#number) \| [Null](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/null))** 
+
 # Call
 
 **Extends Statement**
@@ -368,6 +372,10 @@ A constant reference
 
 A continue statement
 
+**Properties**
+
+-   `level` **([Number](#number) \| [Null](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/null))** 
+
 # Declaration
 
 **Extends Statement**

src/ast/break.js

@@ -11,9 +11,11 @@ var KIND = 'break';
  * A break statement
  * @constructor Break
  * @extends {Node}
+ * @property {Number|Null} level
  */
-var Break = Node.extends(function Break(location) {
+var Break = Node.extends(function Break(level, location) {
   Node.apply(this, [KIND, location]);
+  this.level = level;
 });
 
 module.exports = Break;

src/ast/continue.js

@@ -11,9 +11,11 @@ var KIND = 'continue';
  * A continue statement
  * @constructor Continue
  * @extends {Node}
+ * @property {Number|Null} level
  */
-var Continue = Node.extends(function Continue(location) {
+var Continue = Node.extends(function Continue(level, location) {
   Node.apply(this, [KIND, location]);
+  this.level = level;
 });
 
 module.exports = Continue;

src/parser/scalar.js

@@ -90,8 +90,8 @@ module.exports = {
             this.next().expect([this.tok.T_LNUMBER, this.tok.T_DNUMBER]);
             value += this.text();
           }
-          result = result(value);
           this.next();
+          result = result(value);
           return result;
 
         // CONSTANTS

src/parser/statement.js

@@ -203,14 +203,18 @@ module.exports = {
         return result(expr);
 
       case this.tok.T_BREAK:
-        var result = this.node('break');
-        this.next().expectEndOfStatement();
-        return result();
-
       case this.tok.T_CONTINUE:
-        var result = this.node('continue');
-        this.next().expectEndOfStatement();
-        return result();
+        var result = this.node(
+          this.token === this.tok.T_CONTINUE ? 'continue' : 'break'
+        ), level = null;
+        if(this.next().token === this.tok.T_LNUMBER) {
+          level = this.node('number');
+          var value = this.text();
+          this.next();
+          level = level(value);
+        }
+        this.expectEndOfStatement();
+        return result(level);
 
       case this.tok.T_GLOBAL:
         var result = this.node('global');

test/loopTests.js

@@ -54,7 +54,7 @@ describe('Test loops statements (for, while)', function() {
       'echo $i;',
       'for(;;):',
       'echo $ok;',
-      'continue;;',
+      'continue 5;;',
       'endfor;'
     ].join('\n'), {
       parser: { debug: false }

test/switchTests.js

@@ -7,7 +7,7 @@ describe('Test SWITCH statements', function() {
     '  case 1:',
     '  case $var:',
     '    $foo = false;',
-    '    break;',
+    '    break 10;',
     '  case FOO:',
     '    $foo = true;',
     '    break;',