Index type members by name - see #10

Author: thekid

ChangeLog.md

@@ -3,6 +3,8 @@ XP Compiler ChangeLog
 
 ## ?.?.? / ????-??-??
 
+* Indexed type members by name; implementing feature suggested in #10 
+  (@thekid)
 * **Heads up:** Implemented syntax for parameter annotations as stated 
   in issue #1 - alongside the parameter; no longer in its "targeted" form
   `$param: inject` as in https://github.com/xp-framework/rfc/issues/218

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

@@ -996,7 +996,7 @@ private function body() {
         }
 
         $member->value= [$name, $modifiers, $signature, $annotations, $statements];
-        $body[]= $member;
+        $body[$name.'()']= $member;
         $modifiers= [];
         $annotations= null;
       } else if ('const' === $this->token->symbol->id) {
@@ -1012,7 +1012,7 @@ private function body() {
           $this->token= $this->expect('=');
 
           $member->value= [$name, $modifiers, $this->expression(0)];
-          $body[]= $member;
+          $body[$name]= $member;
           if (',' === $this->token->symbol->id) {
             $this->token= $this->expect(',');
           }
@@ -1035,7 +1035,7 @@ private function body() {
             $member->value= [$name, $modifiers, null, $type, $annotations];
           }
 
-          $body[]= $member;
+          $body['$'.$name]= $member;
           if (',' === $this->token->symbol->id) {
             $this->token= $this->expect(',');
           }

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

@@ -15,7 +15,7 @@ public function short_method() {
     $block= [['==>' => ['true' => 'true']]];
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['function' => ['a', ['public'], [[], null], null, $block]]
+        'a()' => ['function' => ['a', ['public'], [[], null], null, $block]]
       ], []]]],
       $this->parse('class A { public function a() ==> true; }')
     );

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

@@ -7,7 +7,7 @@ class MembersTest extends ParseTest {
   #[@test]
   public function private_instance_property() {
     $this->assertNodes(
-      [['class' => ['\\A', [], null, [], [['(variable)' => ['a', ['private'], null, null, null]]], []]]],
+      [['class' => ['\\A', [], null, [], ['$a' => ['(variable)' => ['a', ['private'], null, null, null]]], []]]],
       $this->parse('class A { private $a; }')
     );
   }
@@ -16,8 +16,8 @@ public function private_instance_property() {
   public function private_instance_properties() {
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['(variable)' => ['a', ['private'], null, null, null]],
-        ['(variable)' => ['b', ['private'], null, null, null]],
+        '$a' => ['(variable)' => ['a', ['private'], null, null, null]],
+        '$b' => ['(variable)' => ['b', ['private'], null, null, null]],
       ], []]]],
       $this->parse('class A { private $a, $b; }')
     );
@@ -27,7 +27,7 @@ public function private_instance_properties() {
   public function private_instance_method() {
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['function' => ['a', ['private'], [[], null], null, []]]
+        'a()' => ['function' => ['a', ['private'], [[], null], null, []]]
       ], []]]],
       $this->parse('class A { private function a() { } }')
     );
@@ -37,7 +37,7 @@ public function private_instance_method() {
   public function private_static_method() {
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['function' => ['a', ['private', 'static'], [[], null], null, []]]
+        'a()' => ['function' => ['a', ['private', 'static'], [[], null], null, []]]
       ], []]]],
       $this->parse('class A { private static function a() { } }')
     );
@@ -46,7 +46,7 @@ public function private_static_method() {
   #[@test]
   public function class_constant() {
     $this->assertNodes(
-      [['class' => ['\\A', [], null, [], [['const' => ['T', [], ['(literal)' => '1']]]], []]]],
+      [['class' => ['\\A', [], null, [], ['T' => ['const' => ['T', [], ['(literal)' => '1']]]], []]]],
       $this->parse('class A { const T = 1; }')
     );
   }
@@ -55,8 +55,8 @@ public function class_constant() {
   public function class_constants() {
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['const' => ['T', [], ['(literal)' => '1']]],
-        ['const' => ['S', [], ['(literal)' => '2']]]
+        'T' => ['const' => ['T', [], ['(literal)' => '1']]],
+        'S' => ['const' => ['S', [], ['(literal)' => '2']]]
       ], []]]],
       $this->parse('class A { const T = 1, S = 2; }')
     );
@@ -65,7 +65,7 @@ public function class_constants() {
   #[@test]
   public function private_class_constant() {
     $this->assertNodes(
-      [['class' => ['\\A', [], null, [], [['const' => ['T', ['private'], ['(literal)' => '1']]]], []]]],
+      [['class' => ['\\A', [], null, [], ['T' => ['const' => ['T', ['private'], ['(literal)' => '1']]]], []]]],
       $this->parse('class A { private const T = 1; }')
     );
   }
@@ -74,7 +74,7 @@ public function private_class_constant() {
   public function method_with_return_type() {
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['function' => ['a', ['public'], [[], new Type('void')], null, []]]
+        'a()' => ['function' => ['a', ['public'], [[], new Type('void')], null, []]]
       ], []]]],
       $this->parse('class A { public function a(): void { } }')
     );
@@ -85,7 +85,7 @@ public function method_with_annotation() {
     $annotations= [['test']];
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['function' => ['a', ['public'], [[], null], $annotations, []]]
+        'a()' => ['function' => ['a', ['public'], [[], null], $annotations, []]]
       ], []]]],
       $this->parse('class A { <<test>> public function a() { } }')
     );
@@ -96,7 +96,7 @@ public function method_with_annotations() {
     $annotations= [['test'], ['ignore', ['(literal)' => '"Not implemented"']]];
     $this->assertNodes(
       [['class' => ['\\A', [], null, [], [
-        ['function' => ['a', ['public'], [[], null], $annotations, []]]
+        'a()' => ['function' => ['a', ['public'], [[], null], $annotations, []]]
       ], []]]],
       $this->parse('class A { <<test, ignore("Not implemented")>> public function a() { } }')
     );