@@ -337,11 +337,11 @@ module.exports = {
337
337
// SCALAR | VARIABLE
338
338
var expr ;
339
339
if ( this . is ( 'VARIABLE' ) ) {
340
+ var result = this . node ( ) ;
340
341
expr = this . read_variable ( false , false , false ) ;
341
342
// VARIABLES SPECIFIC OPERATIONS
342
343
switch ( this . token ) {
343
344
case '=' :
344
- var result = this . node ( 'assign' ) ;
345
345
var right ;
346
346
if ( this . next ( ) . token == '&' ) {
347
347
if ( this . next ( ) . token === this . tok . T_NEW ) {
@@ -352,53 +352,51 @@ module.exports = {
352
352
} else {
353
353
right = this . read_expr ( ) ;
354
354
}
355
- return result ( expr , right , '=' ) ;
355
+ return result ( 'assign' , expr , right , '=' ) ;
356
356
357
357
// operations :
358
358
case this . tok . T_PLUS_EQUAL :
359
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '+=' ) ;
359
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '+=' ) ;
360
360
361
361
case this . tok . T_MINUS_EQUAL :
362
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '-=' ) ;
362
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '-=' ) ;
363
363
364
364
case this . tok . T_MUL_EQUAL :
365
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '*=' ) ;
365
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '*=' ) ;
366
366
367
367
case this . tok . T_POW_EQUAL :
368
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '**=' ) ;
368
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '**=' ) ;
369
369
370
370
case this . tok . T_DIV_EQUAL :
371
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '/=' ) ;
371
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '/=' ) ;
372
372
373
373
case this . tok . T_CONCAT_EQUAL :
374
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '.=' ) ;
374
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '.=' ) ;
375
375
376
376
case this . tok . T_MOD_EQUAL :
377
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '%=' ) ;
377
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '%=' ) ;
378
378
379
379
case this . tok . T_AND_EQUAL :
380
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '&=' ) ;
380
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '&=' ) ;
381
381
382
382
case this . tok . T_OR_EQUAL :
383
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '|=' ) ;
383
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '|=' ) ;
384
384
385
385
case this . tok . T_XOR_EQUAL :
386
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '^=' ) ;
386
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '^=' ) ;
387
387
388
388
case this . tok . T_SL_EQUAL :
389
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '<<=' ) ;
389
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '<<=' ) ;
390
390
391
391
case this . tok . T_SR_EQUAL :
392
- return this . node ( 'assign' ) ( expr , this . next ( ) . read_expr ( ) , '>>=' ) ;
392
+ return result ( 'assign' , expr , this . next ( ) . read_expr ( ) , '>>=' ) ;
393
393
394
394
case this . tok . T_INC :
395
- var result = this . node ( 'post' ) ;
396
395
this . next ( ) ;
397
- return result ( '+' , expr ) ;
396
+ return result ( 'post' , ' +', expr ) ;
398
397
case this . tok . T_DEC :
399
- var result = this . node ( 'post' ) ;
400
398
this . next ( ) ;
401
- return result ( '-' , expr ) ;
399
+ return result ( 'post' , ' -', expr ) ;
402
400
}
403
401
} else if ( this . is ( 'SCALAR' ) ) {
404
402
expr = this . read_scalar ( ) ;
@@ -416,7 +414,7 @@ module.exports = {
416
414
}
417
415
}
418
416
} else {
419
- expr = this . error ( 'EXPR' ) ;
417
+ this . error ( 'EXPR' ) ;
420
418
this . next ( ) ;
421
419
}
422
420
0 commit comments