Fix map initialization with keys consisting of complex expressions

Author: thekid

ChangeLog.md

@@ -3,6 +3,11 @@ XP Compiler ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 1.1.1 / 2017-10-31
+
+* Fixed map initialization with keys consisting of complex expressions
+  (@thekid)
+
 ## 1.1.0 / 2017-10-31
 
 * Implemented trait usage, including aliasing via `as`. See issue #14

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

@@ -254,9 +254,12 @@ protected function emitArray($node) {
     }
 
     $this->out->write('[');
-    foreach ($node->value as $key => $value) {
-      $this->out->write($key.'=>');
-      $this->emit($value);
+    foreach ($node->value as $pair) {
+      if ($pair[0]) {
+        $this->emit($pair[0]);
+        $this->out->write('=>');
+      }
+      $this->emit($pair[1]);
       $this->out->write(',');
     }
     $this->out->write(']');

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

@@ -219,16 +219,15 @@ private function setup() {
     });
 
     $this->prefix('[', function($node) {
-      $i= 0;
       $values= [];
       while (']' !== $this->token->symbol->id) {
         $expr= $this->expression(0);
 
         if ('=>' === $this->token->symbol->id) {
           $this->token= $this->advance();
-          $values[$expr->value]= $this->expression(0);
+          $values[]= [$expr, $this->expression(0)];
         } else {
-          $values[$i++]= $expr;
+          $values[]= [null, $expr];
         }
 
         if (']' === $this->token->symbol->id) break;

src/test/php/lang/ast/unittest/emit/ArraysTest.class.php

@@ -48,4 +48,28 @@ public function run() {
 
     $this->assertEquals([1, 2], $r);
   }
+
+  #[@test]
+  public function init_with_variable() {
+    $r= $this->run('class <T> {
+      public function run() {
+        $KEY= "key";
+        return [$KEY => "value"];
+      }
+    }');
+
+    $this->assertEquals(['key' => 'value'], $r);
+  }
+
+  #[@test]
+  public function init_with_member_variable() {
+    $r= $this->run('class <T> {
+      private static $KEY= "key";
+      public function run() {
+        return [self::$KEY => "value"];
+      }
+    }');
+
+    $this->assertEquals(['key' => 'value'], $r);
+  }
 }

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

@@ -54,21 +54,33 @@ public function empty_array() {
 
   #[@test]
   public function int_array() {
-    $this->assertNodes([['[' => [['(literal)' => '1'], ['(literal)' => '2']]]], $this->parse('[1, 2];'));
+    $this->assertNodes(
+      [['[' => [[null, ['(literal)' => '1']], [null, ['(literal)' => '2']]]]],
+      $this->parse('[1, 2];')
+    );
   }
 
   #[@test]
   public function key_value_map() {
-    $this->assertNodes([['[' => ['"key"' => ['(literal)' => '"value"']]]], $this->parse('["key" => "value"];'));
+    $this->assertNodes(
+      [['[' => [[['(literal)' => '"key"'], ['(literal)' => '"value"']]]]],
+      $this->parse('["key" => "value"];')
+    );
   }
 
   #[@test]
   public function dangling_comma_in_array() {
-    $this->assertNodes([['[' => [['(literal)' => '1']]]], $this->parse('[1, ];'));
+    $this->assertNodes(
+      [['[' => [[null, ['(literal)' => '1']]]]],
+      $this->parse('[1, ];')
+    );
   }
 
   #[@test]
   public function dangling_comma_in_key_value_map() {
-    $this->assertNodes([['[' => ['"key"' => ['(literal)' => '"value"']]]], $this->parse('["key" => "value", ];'));
+    $this->assertNodes(
+      [['[' => [[['(literal)' => '"key"'], ['(literal)' => '"value"']]]]],
+      $this->parse('["key" => "value", ];')
+    );
   }
 }

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

@@ -75,7 +75,7 @@ public function assignment_to_offset() {
   #[@test]
   public function destructuring_assignment() {
     $this->assertNodes(
-      [['=' => [['[' => [['(variable)' => 'a'], ['(variable)' => 'b']]], ['(' => [['result' => 'result'], []]]]]],
+      [['=' => [['[' => [[null, ['(variable)' => 'a']], [null, ['(variable)' => 'b']]]], ['(' => [['result' => 'result'], []]]]]],
       $this->parse('[$a, $b]= result();')
     );
   }