Fix constant-aware shape keys in exceptions

Author: SerafimArts

resources/grammar.php

@@ -558,7 +558,7 @@
 
             foreach ($children as $field) {
                 if ($field instanceof Node\Stmt\Shape\ExplicitFieldNode) {
-                    $key = $field->getHashString();
+                    $key = $field->getKey();
 
                     if (\in_array($key, $explicit, true)) {
                         throw SemanticException::fromShapeFieldDuplication($key, $field->offset);

resources/grammar/shape-fields.pp2

@@ -43,7 +43,7 @@ ShapeFieldsList -> {
 
     foreach ($children as $field) {
         if ($field instanceof Node\Stmt\Shape\ExplicitFieldNode) {
-            $key = $field->getHashString();
+            $key = $field->getKey();
 
             if (\in_array($key, $explicit, true)) {
                 throw SemanticException::fromShapeFieldDuplication($key, $field->offset);

src/Node/Stmt/Shape/ClassConstMaskFieldNode.php

@@ -6,6 +6,7 @@
 
 use TypeLang\Parser\Node\Stmt\Attribute\AttributeGroupsListNode;
 use TypeLang\Parser\Node\Stmt\ClassConstMaskNode;
+use TypeLang\Parser\Node\Stmt\ClassConstNode;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 final class ClassConstMaskFieldNode extends ExplicitFieldNode
@@ -19,12 +20,15 @@ public function __construct(
         parent::__construct($of, $optional, $attributes);
     }
 
-    public function getHashString(): string
+    public function getKey(): int|string
     {
-        $key = $this->key::class . ':'
-            . $this->key->class->toString()
+        $result = $this->key->class->toString()
             . '::' . $this->key->constant?->toString();
 
-        return \hash('xxh3', $key);
+        if ($this->key instanceof ClassConstNode) {
+            return $result;
+        }
+
+        return $result . '*';
     }
 }

src/Node/Stmt/Shape/ConstMaskFieldNode.php

@@ -19,11 +19,8 @@ public function __construct(
         parent::__construct($of, $optional, $attributes);
     }
 
-    public function getHashString(): string
+    public function getKey(): string
     {
-        $key = $this->key::class . ':'
-            . $this->key->name->toString();
-
-        return \hash('xxh3', $key);
+        return (string) $this->key;
     }
 }

src/Node/Stmt/Shape/ExplicitFieldNode.php

@@ -7,15 +7,7 @@
 abstract class ExplicitFieldNode extends FieldNode
 {
     /**
-     * @deprecated Please use {@see getHashString()} instead
+     * Returns pretty-printed key value
      */
-    public function getKey(): int|string
-    {
-        return $this->getHashString();
-    }
-
-    /**
-     * @return non-empty-string
-     */
-    abstract public function getHashString(): string;
+    abstract public function getKey(): int|string;
 }

src/Node/Stmt/Shape/NamedFieldNode.php

@@ -26,8 +26,8 @@ public function __construct(
         parent::__construct($of, $optional, $attributes);
     }
 
-    public function getHashString(): string
+    public function getKey(): string
     {
-        return \hash('xxh3', self::class . ':' . $this->key->toString());
+        return $this->key->toString();
     }
 }

src/Node/Stmt/Shape/NumericFieldNode.php

@@ -23,9 +23,4 @@ public function getKey(): int
     {
         return $this->key->getValue();
     }
-
-    public function getHashString(): string
-    {
-        return \hash('xxh3', self::class . ':' . $this->key->getRawValue());
-    }
 }

src/Node/Stmt/Shape/StringNamedFieldNode.php

@@ -19,8 +19,8 @@ public function __construct(
         parent::__construct($of, $optional, $attributes);
     }
 
-    public function getHashString(): string
+    public function getKey(): string
     {
-        return \hash('xxh3', self::class . ':' . $this->key->getValue());
+        return $this->key->getValue();
     }
 }