Emit imports, fixing interop with xp-forge/partial. See #15

Author: thekid

ChangeLog.md

@@ -3,6 +3,10 @@ XP Compiler ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 1.1.2 / 2017-10-31
+
+* Fixed issue #15: Interop with xp-forge/partial broken - @thekid
+
 ## 1.1.1 / 2017-10-31
 
 * Fixed map initialization with keys consisting of complex expressions

src/main/php/lang/ast/Emitter.class.php

@@ -193,7 +193,7 @@ protected function emitPackage($node) {
   }
 
   protected function emitImport($node) {
-    // NOOP
+    $this->out->write('use '.implode(',', $node->value).';');
   }
 
   protected function emitAnnotation($node) {

src/main/php/lang/ast/Parse.class.php

@@ -402,19 +402,23 @@ private function setup() {
       $this->token= $this->advance();
 
       if ('{' === $this->token->symbol->id) {
+        $types= [];
         while ('}' !== $this->token->symbol->id) {
           $this->token= $this->advance();
-          $class= $this->token->value;
-          $this->scope->import($import.$class);
+          $class= $import.$this->token->value;
+          $types[]= $class;
+          $this->scope->import($class);
           $this->token= $this->advance();
         }
         $this->token= $this->advance();
       } else {
+        $types= [$import];
         $this->scope->import($import);
       }
 
       $this->token= $this->expect(';');
       $node->arity= 'import';
+      $node->value= $types;
       return $node;
     });
 

src/test/php/lang/ast/unittest/ScopeTest.class.php

@@ -32,6 +32,14 @@ public function resolve_in_package() {
     $this->assertEquals('\\test\\Parse', $s->resolve('Parse'));
   }
 
+  #[@test]
+  public function resolve_relative_in_package() {
+    $s= new Scope();
+    $s->package('test');
+
+    $this->assertEquals('\\test\\ast\\Parse', $s->resolve('ast\\Parse'));
+  }
+
   #[@test]
   public function resolve_imported_in_package() {
     $s= new Scope();

src/test/php/lang/ast/unittest/parse/NamespacesTest.class.php

@@ -14,11 +14,14 @@ public function compound_namespace() {
 
   #[@test]
   public function use_statement() {
-    $this->assertNodes([['use' => 'use']], $this->parse('use lang\ast\Parse;'));
+    $this->assertNodes([['use' => ['lang\ast\Parse']]], $this->parse('use lang\ast\Parse;'));
   }
 
   #[@test]
   public function grouped_use_statement() {
-    $this->assertNodes([['use' => 'use']], $this->parse('use lang\ast\{Parse, Emitter};'));
+    $this->assertNodes(
+      [['use' => ['lang\ast\Parse', 'lang\ast\Emitter']]],
+      $this->parse('use lang\ast\{Parse, Emitter};')
+    );
   }
 }