add goto, label, post nodes

Author: ichiriac

docs/AST.md

@@ -39,12 +39,15 @@ Returns **[Function](#function)**
     -   [TraitPrecedence](#traitprecedence)
     -   [Entry](#entry)
     -   [Case](#case)
+    -   [Label](#label)
     -   [Doc](#doc)
     -   [Error](#error)
     -   [Expression](#expression)
         -   [Array](#array)
         -   [Variable](#variable)
         -   [ConstRef](#constref)
+        -   [Operation](#operation)
+            -   [Post](#post)
         -   [Literal](#literal)
             -   [Boolean](#boolean)
             -   [String](#string)
@@ -65,6 +68,7 @@ Returns **[Function](#function)**
         -   [For](#for)
         -   [Foreach](#foreach)
         -   [Switch](#switch)
+        -   [Goto](#goto)
         -   [Block](#block)
             -   [Program](#program)
             -   [Namespace](#namespace)
@@ -381,6 +385,16 @@ Defines a classic function
 -   `byref` **[boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** 
 -   `body` **([Block](#block) | null)** 
 
+# Goto
+
+**Extends Statement**
+
+Defines goto statement
+
+**Properties**
+
+-   `label` **[String](#string)** 
+
 # Identifier
 
 **Extends Node**
@@ -440,6 +454,16 @@ An interface definition
 
 Defines an isset call
 
+# Label
+
+**Extends Node**
+
+A label statement (referenced by goto)
+
+**Properties**
+
+-   `name` **[String](#string)** 
+
 # List
 
 **Extends Sys**
@@ -532,6 +556,12 @@ Returns **[Function](#function)**
 
 Defines a numeric value
 
+# Operation
+
+**Extends Expression**
+
+Defines binary operations
+
 # Parameter
 
 **Extends Declaration**
@@ -561,6 +591,17 @@ Each Position object consists of a line number (1-indexed) and a column number (
 -   `column` **[Number](#number)** 
 -   `offset` **[Number](#number)** 
 
+# Post
+
+**Extends Operation**
+
+Defines a post operation `$i++` or `$i--`
+
+**Properties**
+
+-   `type` **[String](#string)** 
+-   `what` **[Variable](#variable)** 
+
 # Print
 
 **Extends Sys**

src/ast.js

@@ -19,12 +19,15 @@ var Position = require('./ast/position');
  *   - [TraitPrecedence](#traitprecedence)
  *   - [Entry](#entry)
  *   - [Case](#case)
+ *   - [Label](#label)
  *   - [Doc](#doc)
  *   - [Error](#error)
  *   - [Expression](#expression)
  *     - [Array](#array)
  *     - [Variable](#variable)
  *     - [ConstRef](#constref)
+ *     - [Operation](#operation)
+ *       - [Post](#post)
  *     - [Literal](#literal)
  *       - [Boolean](#boolean)
  *       - [String](#string)
@@ -45,6 +48,7 @@ var Position = require('./ast/position');
  *     - [For](#for)
  *     - [Foreach](#foreach)
  *     - [Switch](#switch)
+ *     - [Goto](#goto)
  *     - [Block](#block)
  *       - [Program](#program)
  *       - [Namespace](#namespace)
@@ -161,19 +165,22 @@ AST.prototype.prepare = function(kind, parser) {
   require('./ast/for'),
   require('./ast/foreach'),
   require('./ast/function'),
+  require('./ast/goto'),
   require('./ast/identifier'),
   require('./ast/if'),
   require('./ast/include'),
   require('./ast/inline'),
   require('./ast/interface'),
   require('./ast/isset'),
+  require('./ast/label'),
   require('./ast/list'),
   require('./ast/literal'),
   require('./ast/magic'),
   require('./ast/method'),
   require('./ast/namespace'),
   require('./ast/number'),
   require('./ast/parameter'),
+  require('./ast/post'),
   require('./ast/print'),
   require('./ast/program'),
   require('./ast/property'),

src/ast/goto.js

@@ -0,0 +1,23 @@
+/*!
+ * Copyright (C) 2017 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+var Statement = require('./statement');
+var KIND = 'goto';
+
+/**
+ * Defines goto statement
+ * @constructor Goto
+ * @extends {Statement}
+ * @property {String} label
+ * @see {Label}
+ */
+var Goto = Statement.extends(function Goto(label, location) {
+  Statement.apply(this, [KIND, location]);
+  this.label = label;
+});
+
+module.exports = Goto;

src/ast/label.js

@@ -0,0 +1,21 @@
+/*!
+ * Copyright (C) 2017 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+var Node = require('./node');
+var KIND = 'label';
+
+/**
+ * A label statement (referenced by goto)
+ * @constructor Label
+ * @extends {Node}
+ * @property {String} name
+ */
+var Label = Node.extends(function Label(name, location) {
+  Node.apply(this, [KIND, location]);
+  this.name = name;
+});
+
+module.exports = Label;

src/ast/operation.js

@@ -0,0 +1,20 @@
+/*!
+ * Copyright (C) 2017 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+var Expr = require('./expression');
+var KIND = 'operation';
+
+/**
+ * Defines binary operations
+ * @constructor Operation
+ * @extends {Expression}
+ */
+var Operation = Expr.extends(function Operation(kind, location) {
+  Expr.apply(this, [kind || KIND, location]);
+});
+
+module.exports = Operation;

src/ast/post.js

@@ -0,0 +1,24 @@
+/*!
+ * Copyright (C) 2017 Glayzzle (BSD3 License)
+ * @authors https://github.com/glayzzle/php-parser/graphs/contributors
+ * @url http://glayzzle.com
+ */
+"use strict";
+
+var Operation = require('./operation');
+var KIND = 'post';
+
+/**
+ * Defines a post operation `$i++` or `$i--`
+ * @constructor Post
+ * @extends {Operation}
+ * @property {String} type
+ * @property {Variable} what
+ */
+var Post = Operation.extends(function Post(type, what, location) {
+  Operation.apply(this, [KIND, location]);
+  this.type = type;
+  this.what = what;
+});
+
+module.exports = Post;

src/parser/expr.js

@@ -354,11 +354,13 @@ module.exports = {
         case this.tok.T_SR_EQUAL:
           return ['set', expr, ['bin', '>>', expr, this.next().read_expr()]];
         case this.tok.T_INC:
+          var result = this.node('post');
           this.next();
-          return ['post', '+', expr];
+          return result('+', expr);
         case this.tok.T_DEC:
+          var result = this.node('post');
           this.next();
-          return ['post', '-', expr];
+          return result('+', expr);
       }
     } else if (this.is('SCALAR')) {
       expr = this.read_scalar();

test/astTests.js

@@ -79,9 +79,6 @@ describe('Test AST structure', function() {
   it('should be variable', function() {
     // @todo
   });
-  it('should be assign', function() {
-    // @todo
-  });
   it('test literals', function() {
     // @todo string / numbers / booleans
   });

test/exprTests.js

@@ -0,0 +1,8 @@
+var should = require("should");
+var parser = require('../src/index');
+
+describe('Test expressions', function() {
+  it('test assignments', function() {
+    // @todo
+  });
+});

test/loopTests.js

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

test/statementTests.js

@@ -0,0 +1,19 @@
+var should = require("should");
+var parser = require('../src/index');
+
+describe('Test statements', function() {
+  it('test goto label', function() {
+    var ast = parser.parseEval([
+      'start:',
+      '  $i++;',
+      'goto start;'
+    ].join('\n'), {
+      parser: { debug: false }
+    });
+    ast.children[0].kind.should.be.exactly('label');
+    ast.children[0].name.should.be.exactly('start');
+    ast.children[1].kind.should.be.exactly('post');
+    ast.children[2].kind.should.be.exactly('goto');
+    ast.children[2].label.should.be.exactly('start');
+  });
+});