Merge pull request glayzzle#82 from glayzzle/2.1.0

2.1.0

Author: ichiriac

README.md

@@ -90,6 +90,7 @@ Documentation
 Related projects
 ----------------
 
+- [babel-preset-php](https://gitlab.com/kornelski/babel-preset-php) : Babel preset for converting PHP syntax to JavaScript. It can run subset of PHP in the browser or in Node.js. .
 - [php-unparser](https://github.com/chris-l/php-unparser) : Produce code that uses the style format recommended by PSR-1 and PSR-2.
 - [php-writer](https://github.com/glayzzle/php-writer) : Update PHP scripts from their AST
 - [ts-php-inspections](https://github.com/DaGhostman/ts-php-inspections) : Provide PHP code inspections written in typescript

src/parser/expr.js

@@ -353,9 +353,20 @@ module.exports = {
     if (this.is('VARIABLE')) {
       var result = this.node();
       expr = this.read_variable(false, false, false);
+
+      // https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L877
+      // should accept only a variable
+      var isConst = (
+        expr.kind === 'constref' || (
+          expr.kind === 'staticlookup' &&
+          expr.offset.kind === 'constref'
+        )
+      );
+
       // VARIABLES SPECIFIC OPERATIONS
       switch(this.token) {
         case '=':
+          if (isConst) this.error('VARIABLE');
           var right;
           if (this.next().token == '&') {
             if (this.next().token === this.tok.T_NEW) {
@@ -370,45 +381,59 @@ module.exports = {
 
         // operations :
         case this.tok.T_PLUS_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '+=');
 
         case this.tok.T_MINUS_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '-=');
 
         case this.tok.T_MUL_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '*=');
 
         case this.tok.T_POW_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '**=');
 
         case this.tok.T_DIV_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '/=');
 
         case this.tok.T_CONCAT_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '.=');
 
         case this.tok.T_MOD_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '%=');
 
         case this.tok.T_AND_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '&=');
 
         case this.tok.T_OR_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '|=');
 
         case this.tok.T_XOR_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '^=');
 
         case this.tok.T_SL_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign', expr, this.next().read_expr(), '<<=');
 
         case this.tok.T_SR_EQUAL:
+          if (isConst) this.error('VARIABLE');
           return result('assign',expr, this.next().read_expr(), '>>=');
 
         case this.tok.T_INC:
+          if (isConst) this.error('VARIABLE');
           this.next();
           return result('post', '+', expr);
         case this.tok.T_DEC:
+          if (isConst) this.error('VARIABLE');
           this.next();
           return result('post', '-', expr);
       }

src/parser/statement.js

@@ -322,18 +322,19 @@ module.exports = {
       case this.tok.T_STRING:
         var current = [this.token, this.lexer.getState()];
         var label = this.text();
+        // AST : https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y#L457
         if (this.next().token === ':') {
           var result = this.node('label');
           this.next();
           return result(label);
-        } else {
-          // default fallback expr
-          this.lexer.tokens.push(current);
-          var expr = this.next().read_expr();
-          this.expect([';', this.tok.T_CLOSE_TAG]) && this.nextWithComments();
-          return expr;
         }
 
+        // default fallback expr / T_STRING '::' (etc...)
+        this.lexer.tokens.push(current);
+        var expr = this.next().read_expr();
+        this.expectEndOfStatement();
+        return expr;
+
       case this.tok.T_GOTO:
         var result = this.node('goto'), label = null;
         if (this.next().expect(this.tok.T_STRING)) {

test/exprTests.js

@@ -87,7 +87,7 @@ describe('Test expressions', function() {
       '$a > 5 ? true : false;',
       '$a ?: false;'
     ].join('\n'));
-    console.log(ast.children[1]);
+    //console.log(ast.children[1]);
     ast.children[1].kind.should.be.exactly('retif');
 
   });
@@ -209,6 +209,32 @@ describe('Test expressions', function() {
     ast.children[3].type.should.be.exactly('-');
   });
 
+  it('should fail to assign constants', function() {
+    var ast = parser.parseEval('a = 1;', {
+      parser: { debug: false, suppressErrors: true }
+    });
+    var msg = 'Parse Error : syntax error, unexpected \'=\' on line 1';
+    ast.errors.length.should.be.exactly(1);
+    ast.errors[0].message.should.be.exactly(msg);
+  });
+
+  it('should fail to assign class constants', function() {
+    var ast = parser.parseEval('foo::b = 1;', {
+      parser: { debug: false, suppressErrors: true }
+    });
+    var msg = 'Parse Error : syntax error, unexpected \'=\' on line 1';
+    ast.errors.length.should.be.exactly(1);
+    ast.errors[0].message.should.be.exactly(msg);
+  });
+
+  it('should assign class static', function() {
+    var ast = parser.parseEval('a::$b = 1;', {
+      parser: { debug: false, suppressErrors: true }
+    });
+    ast.errors.length.should.be.exactly(0);
+    ast.children[0].kind.should.be.exactly('assign');
+  });
+
   it('test new', function() {
     var ast = parser.parseEval([
       '$a = new \\foo();',