add new node

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)
@@ -53,6 +91,7 @@
         -   [Try](#try)
         -   [Catch](#catch)
         -   [Call](#call)
+        -   [New](#new)
         -   [UseGroup](#usegroup)
         -   [UseItem](#useitem)
         -   [Block](#block)
@@ -107,44 +146,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**
@@ -658,6 +659,17 @@ The main program node
 -   `name` **[Identifier](#identifier)** 
 -   `withBrackets` **[Boolean](#boolean)** 
 
+# New
+
+**Extends Statement**
+
+Creates a new instance of the specified class
+
+**Properties**
+
+-   `what` **([Identifier](#identifier) \| [Variable](#variable) \| [Class](#class))** 
+-   `arguments` **[Array](#array)<Arguments>** 
+
 # Node
 
 A generic AST node

src/ast.js

@@ -59,6 +59,7 @@ var Position = require('./ast/position');
  *     - [Try](#try)
  *     - [Catch](#catch)
  *     - [Call](#call)
+ *     - [New](#new)
  *     - [UseGroup](#usegroup)
  *     - [UseItem](#useitem)
  *     - [Block](#block)
@@ -205,6 +206,7 @@ AST.prototype.prepare = function(kind, parser) {
   require('./ast/magic'),
   require('./ast/method'),
   require('./ast/namespace'),
+  require('./ast/new'),
   require('./ast/number'),
   require('./ast/parameter'),
   require('./ast/post'),

src/ast/new.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 Statement = require('./statement');
+var KIND = 'new';
+
+/**
+ * Creates a new instance of the specified class
+ * @constructor New
+ * @extends {Statement}
+ * @property {Identifier|Variable|Class} what
+ * @property {Arguments[]} arguments
+ */
+var New = Statement.extends(function New(what, args, location) {
+  Statement.apply(this, [KIND, location]);
+  this.what = what;
+  this.arguments = args;
+});
+
+module.exports = New;

src/parser/expr.js

@@ -433,6 +433,7 @@ module.exports = {
   ,read_new_expr: function() {
     var result = this.node('new');
     if (this.token === this.tok.T_CLASS) {
+      var what = this.node('class');
       // Annonymous class declaration
       var propExtends = null, propImplements = null, body = null;
       if (this.next().token == this.tok.T_EXTENDS) {
@@ -445,10 +446,13 @@ module.exports = {
         body = this.next().read_class_body();
       }
       return result(
-        false           // class name => false : means it's an annonymous class
-        ,propExtends
-        ,propImplements
-        ,body
+        what(
+          null
+          ,propExtends
+          ,propImplements
+          ,body
+          ,[0, 0, 0]
+        ), []
       );
     } else {
       // Already existing class
@@ -471,8 +475,6 @@ module.exports = {
       var result = this.read_namespace_name();
       if (this.token === this.tok.T_DOUBLE_COLON) {
         result = this.read_static_getter(result);
-      } else {
-        result = ['ns', result];
       }
       return result;
     } else if (this.is('VARIABLE')) {

test/exprTests.js

@@ -185,11 +185,19 @@ describe('Test expressions', function() {
   it('test new', function() {
     var ast = parser.parseEval([
       '$a = new foo();',
-      '$a = new $foo();'
+      '$a = new $foo();',
+      '$a = new class extends foo implements bar { };',
     ].join('\n'), {
       ast: { debug: false }
     });
-    console.log(ast);
+    ast.children[0].right.kind.should.be.exactly('new');
+    ast.children[0].right.what.kind.should.be.exactly('identifier');
+
+    ast.children[1].right.kind.should.be.exactly('new');
+    ast.children[1].right.what.kind.should.be.exactly('variable');
+
+    ast.children[2].right.kind.should.be.exactly('new');
+    ast.children[2].right.what.kind.should.be.exactly('class');
   });
 
 });