@@ -289,7 +289,7 @@ protected function emitParameter($result, $parameter) {
289
289
$ this ->emitOne ($ result , $ parameter ->default );
290
290
} else {
291
291
$ result ->out ->write ('=null ' );
292
- $ result ->locals [' $ ' ]['null === $ ' .$ parameter ->name .' && $ ' .$ parameter ->name ]= $ parameter ->default ;
292
+ $ result ->locals [1 ]['null === $ ' .$ parameter ->name .' && $ ' .$ parameter ->name ]= $ parameter ->default ;
293
293
}
294
294
}
295
295
$ result ->locals [$ parameter ->name ]= true ;
@@ -351,7 +351,7 @@ protected function emitLambda($result, $lambda) {
351
351
352
352
protected function emitClass ($ result , $ class ) {
353
353
array_unshift ($ result ->meta , []);
354
- $ result ->locals = [' $ ' => [], ' @ ' => []];
354
+ $ result ->locals = [[], []];
355
355
356
356
$ result ->out ->write (implode (' ' , $ class ->modifiers ).' class ' .$ this ->declaration ($ class ->name ));
357
357
$ class ->parent && $ result ->out ->write (' extends ' .$ class ->parent );
@@ -363,14 +363,14 @@ protected function emitClass($result, $class) {
363
363
364
364
// Create constructor for property initializations to non-static scalars
365
365
// which have not already been emitted inside constructor
366
- if ($ result ->locals [' $ ' ]) {
366
+ if ($ result ->locals [1 ]) {
367
367
$ result ->out ->write ('public function __construct() { ' );
368
- $ this ->emitInitializations ($ result , $ result ->locals [' $ ' ]);
368
+ $ this ->emitInitializations ($ result , $ result ->locals [1 ]);
369
369
$ result ->out ->write ('} ' );
370
370
}
371
371
372
372
$ result ->out ->write ('static function __init() { ' );
373
- $ this ->emitInitializations ($ result , $ result ->locals [' @ ' ]);
373
+ $ this ->emitInitializations ($ result , $ result ->locals [0 ]);
374
374
$ this ->emitMeta ($ result , $ class ->name , $ class ->annotations , $ class ->comment );
375
375
$ result ->out ->write ('}} ' .$ class ->name .'::__init(); ' );
376
376
}
@@ -520,9 +520,9 @@ protected function emitProperty($result, $property) {
520
520
$ result ->out ->write ('= ' );
521
521
$ this ->emitOne ($ result , $ property ->expression );
522
522
} else if (in_array ('static ' , $ property ->modifiers )) {
523
- $ result ->locals [' @ ' ]['self::$ ' .$ property ->name ]= $ property ->expression ;
523
+ $ result ->locals [0 ]['self::$ ' .$ property ->name ]= $ property ->expression ;
524
524
} else {
525
- $ result ->locals [' $ ' ]['$this-> ' .$ property ->name ]= $ property ->expression ;
525
+ $ result ->locals [1 ]['$this-> ' .$ property ->name ]= $ property ->expression ;
526
526
}
527
527
}
528
528
$ result ->out ->write ('; ' );
@@ -532,11 +532,11 @@ protected function emitMethod($result, $method) {
532
532
533
533
// Include non-static initializations for members in constructor, removing
534
534
// them to signal emitClass() no constructor needs to be generated.
535
- if ('__construct ' === $ method ->name && isset ($ result ->locals [' $ ' ])) {
536
- $ locals = ['this ' => true , ' $ ' => $ result ->locals [' $ ' ]];
537
- $ result ->locals [' $ ' ]= [];
535
+ if ('__construct ' === $ method ->name && isset ($ result ->locals [1 ])) {
536
+ $ locals = ['this ' => true , 1 => $ result ->locals [1 ]];
537
+ $ result ->locals [1 ]= [];
538
538
} else {
539
- $ locals = ['this ' => true , ' $ ' => []];
539
+ $ locals = ['this ' => true , 1 => []];
540
540
}
541
541
$ result ->stack []= $ result ->locals ;
542
542
$ result ->locals = $ locals ;
@@ -556,7 +556,7 @@ protected function emitMethod($result, $method) {
556
556
foreach ($ method ->signature ->parameters as $ param ) {
557
557
if (isset ($ param ->promote )) {
558
558
$ promoted .= $ param ->promote .' $ ' .$ param ->name .'; ' ;
559
- $ result ->locals [' $ ' ]['$this-> ' .$ param ->name ]= new Code (($ param ->reference ? '&$ ' : '$ ' ).$ param ->name );
559
+ $ result ->locals [1 ]['$this-> ' .$ param ->name ]= new Code (($ param ->reference ? '&$ ' : '$ ' ).$ param ->name );
560
560
$ result ->meta [0 ][self ::PROPERTY ][$ param ->name ]= [
561
561
DETAIL_RETURNS => $ param ->type ? $ param ->type ->name () : 'var ' ,
562
562
DETAIL_ANNOTATIONS => [],
@@ -573,7 +573,7 @@ protected function emitMethod($result, $method) {
573
573
$ result ->out ->write ('; ' );
574
574
} else {
575
575
$ result ->out ->write (' { ' );
576
- $ this ->emitInitializations ($ result , $ result ->locals [' $ ' ]);
576
+ $ this ->emitInitializations ($ result , $ result ->locals [1 ]);
577
577
$ this ->emitAll ($ result , $ method ->body );
578
578
$ result ->out ->write ('} ' );
579
579
}
0 commit comments