xp-framework
diff --git a/‎src/main/php/lang/ast/emit/InType.class.php
Lines changed: 1 addition & 0 deletions b/‎src/main/php/lang/ast/emit/InType.class.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/main/php/lang/ast/emit/PHP.class.php
Lines changed: 3 additions & 9 deletions b/‎src/main/php/lang/ast/emit/PHP.class.php
Lines changed: 3 additions & 9 deletions
@@ -6,6 +6,7 @@ class InType {
   public $init= [];
   public $statics= [];
   public $virtual= [];
+  public $defaultImplementations= [];
 
   public function __construct($type) {
     $this->type= $type;
 
@@ -553,10 +553,10 @@ protected function emitInterface($result, $interface) {
     $this->emitMeta($result, $interface->name, $interface->annotations, $interface->comment);
 
     // Emit default implementations
-    if (isset($result->locals[3])) {
+    if ($defaults= $result->codegen->scope[0]->defaultImplementations) {
       $p= strrpos($interface->name, '\\');
       $name= substr($interface->name, 0, $p).'\\__'.substr($interface->name, $p + 1).'_Defaults';
-      $this->emitOne($result, new TraitDeclaration([], new IsValue($name), $result->locals[3]));
+      $this->emitOne($result, new TraitDeclaration([], new IsValue($name), $defaults));
     }
 
     $result->codegen->leave();
@@ -670,10 +670,9 @@ protected function emitMethod($result, $method) {
 
     if (null === $method->body) {
       $result->out->write(';');
-      $default= null;
     } else if ('interface' === $result->codegen->scope[0]->type->kind) {
       $result->out->write(';');
-      $default= $method;
+      $result->codegen->scope[0]->defaultImplementations[]= $method;
     } else {
       $result->out->write(' {');
 
@@ -697,18 +696,13 @@ protected function emitMethod($result, $method) {
 
       $this->emitAll($result, $method->body);
       $result->out->write('}');
-      $default= null;
     }
 
     foreach ($promoted as $param) {
       $this->emitProperty($result, new Property(explode(' ', $param->promote), $param->name, $param->type));
     }
 
     $result->locals= array_pop($result->stack);
-
-    // Copy default implementations to class scope
-    $default && $result->locals[3][]= $default;
-
     $result->codegen->scope[0]->meta[self::METHOD][$method->name]= $meta;
   }