Embedded & promoted fields

.php-cs-fixer.php

@@ -11,6 +11,11 @@
     'array_syntax' => ['syntax' => 'short'],
     'single_line_empty_body' => true,
     'statement_indentation' => false,
+    'global_namespace_import' => [
+        'import_classes' => true,
+        'import_constants' => true,
+        'import_functions' => true,
+    ],
 ];
 
 CONFIG->setRules(RULES);

README.md

@@ -49,12 +49,6 @@ Already implemented:
 
 * see [tests](tests/Functional/files/)
 
-To be implemented:
-
-* channels and select statements
-* type assertions
-* generics
-
 ## Development
 
 install dependencies:

composer.json

@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^8.2",
-        "tuqqu/go-parser": "^0.4.4"
+        "tuqqu/go-parser": "^0.5.1"
     },
     "require-dev": {
         "symfony/var-dumper": "^6",

src/Builtin/BuiltinFunc/Delete.php

@@ -30,7 +30,7 @@ public function __invoke(Argv $argv): VoidValue
 
         $m->delete($key);
 
-        return new VoidValue();
+        return VoidValue::get();
     }
 
     public function name(): string

src/Builtin/BuiltinFunc/Print_.php

@@ -30,7 +30,7 @@ public function __invoke(Argv $argv): VoidValue
 
         $this->stderr->write(implode('', $output));
 
-        return new VoidValue();
+        return VoidValue::get();
     }
 
     public function name(): string

src/Builtin/BuiltinFunc/Println.php

@@ -30,7 +30,7 @@ public function __invoke(Argv $argv): VoidValue
 
         $this->stderr->writeln(implode(' ', $output));
 
-        return new VoidValue();
+        return VoidValue::get();
     }
 
     public function name(): string

src/Error/ParserError.php

@@ -24,7 +24,7 @@ public static function fromInternalParserError(Error $error): self
             match (true) {
                 $error instanceof LexError => $error->pos,
                 $error instanceof SyntaxError => $error->pos,
-                default => throw new InternalError(sprintf('Unknown error type %s', $error::class)),
+                default => throw new InternalError(sprintf('unknown error type %s', $error::class)),
             },
             (string) $error,
         );

src/Error/RuntimeError.php

@@ -5,7 +5,6 @@
 namespace GoPhp\Error;
 
 use GoParser\Ast\Keyword;
-use GoParser\Ast\Stmt\IfStmt;
 use GoParser\Ast\Stmt\Stmt;
 use GoPhp\Arg;
 use GoPhp\Argv;
@@ -118,7 +117,7 @@ public static function mismatchedTypes(GoType $a, GoType $b): self
                 'invalid operation: mismatched types %s and %s',
                 $a->name(),
                 $b->name(),
-            )
+            ),
         );
     }
 
@@ -130,14 +129,16 @@ public static function untypedNilInVarDecl(): self
     public static function nonBooleanCondition(Stmt $context): self
     {
         /** @psalm-suppress NoInterfaceProperties */
-        $keyword = match (true) {
-            $context instanceof IfStmt => $context->if,
-            isset($context->keyword)
-            && $context->keyword instanceof Keyword => $context->keyword,
-            default => throw InternalError::unreachable($context),
-        };
+        if (!isset($context->keyword) || !$context->keyword instanceof Keyword) {
+            throw InternalError::unreachable($context);
+        }
 
-        return new self(sprintf('non-boolean condition in %s statement', $keyword->word));
+        return new self(
+            sprintf(
+                'non-boolean condition in %s statement',
+                $context->keyword->word,
+            ),
+        );
     }
 
     public static function multipleValueInSingleContext(TupleValue $value): self

src/ErrorHandler/Collector.php

@@ -7,7 +7,7 @@
 use GoPhp\Error\GoError;
 
 /**
- * Error handler that collects given errors into an array.
+ * Error handler that collects errors into an array.
  */
 final class Collector implements ErrorHandler
 {

src/ErrorHandler/OutputToStream.php

@@ -8,7 +8,7 @@
 use GoPhp\Stream\OutputStream;
 
 /**
- * Error handler that outputs error messages to a given stream.
+ * Error handler that outputs error messages to a stream.
  */
 final class OutputToStream implements ErrorHandler
 {

src/GoType/StructType.php

@@ -21,9 +21,11 @@ final class StructType implements GoType
 {
     /**
      * @param array<string, GoType> $fields
+     * @param list<string> $promotedNames
      */
     public function __construct(
         public readonly array $fields,
+        public readonly array $promotedNames,
     ) {}
 
     public function name(): string
@@ -78,4 +80,9 @@ public function convert(AddressableValue $value): AddressableValue
     {
         return DefaultConverter::convert($value, $this);
     }
+
+    public function hasField(string $name): bool
+    {
+        return isset($this->fields[$name]);
+    }
 }

src/GoValue/Complex/ComplexNumber.php

@@ -22,9 +22,9 @@
 use GoPhp\GoValue\SimpleNumber;
 use GoPhp\Operator;
 
-use function sprintf;
 use function GoPhp\assert_values_compatible;
 use function GoPhp\try_unwind;
+use function sprintf;
 
 /**
  * @psalm-type ComplexTuple = array{float, float}
@@ -250,7 +250,7 @@ private static function computeForMul(self $lhs, self $rhs): array
      */
     private static function computeForDiv(self $lhs, self $rhs): array
     {
-        $denominator = $rhs->real**2 + $rhs->imag**2;
+        $denominator = $rhs->real ** 2 + $rhs->imag ** 2;
         $real = ($lhs->real * $rhs->real + $lhs->imag * $rhs->imag) / $denominator;
         $imag = ($lhs->imag * $rhs->real - $lhs->real * $rhs->imag) / $denominator;
 

src/GoValue/Func/Func.php

@@ -128,7 +128,7 @@ public function __invoke(Argv $argv): GoValue
 
         if ($stmtJump instanceof None) {
             return $this->type->returnArity === ReturnJump::LEN_VOID
-                ? new VoidValue()
+                ? VoidValue::get()
                 : throw RuntimeError::wrongReturnValueNumber([], $this->type->returns);
         }
 
@@ -165,7 +165,7 @@ public function zeroReturnValue(): GoValue
         }
 
         return match (count($zeroValues)) {
-            ReturnJump::LEN_VOID => new VoidValue(),
+            ReturnJump::LEN_VOID => VoidValue::get(),
             ReturnJump::LEN_SINGLE => $zeroValues[0],
             default => new TupleValue($zeroValues),
         };

src/GoValue/Struct/StructValue.php

@@ -102,7 +102,25 @@ public function copy(): self
 
     public function accessField(string $name): GoValue
     {
-        return $this->fields->get($name)->unwrap();
+        $field = $this->fields->tryGet($name);
+
+        if ($field === null) {
+            foreach ($this->type->promotedNames as $promotedName) {
+                $field = $this->fields->get($promotedName);
+                /** @var StructValue $promotedField */
+                $promotedField = try_unwind($field->unwrap());
+
+                if ($promotedField->type->hasField($name)) {
+                    return $promotedField->accessField($name);
+                }
+            }
+        }
+
+        if ($field === null) {
+            throw RuntimeError::redeclaredName($name);
+        }
+
+        return $field->unwrap();
     }
 
     private function equals(self $rhs): BoolValue

src/GoValue/VoidValue.php

@@ -14,6 +14,13 @@
  */
 final class VoidValue implements GoValue
 {
+    private static ?self $instance = null;
+
+    public static function get(): self
+    {
+        return self::$instance ??= new self();
+    }
+
     public function unwrap(): never
     {
         throw RuntimeError::noValueUsedAsValue();

src/Interpreter.php

@@ -1098,7 +1098,7 @@ private function evalIncDecStmt(IncDecStmt $stmt): None
             ->evalExpr($stmt->lhs)
             ->mutate(
                 Operator::fromAst($stmt->op),
-                new UntypedIntValue(1)
+                new UntypedIntValue(1),
             );
 
         return self::$noneJump;

src/StmtJump/ReturnJump.php

@@ -29,7 +29,7 @@ private function __construct(
      */
     public static function fromVoid(): self
     {
-        return new self(new VoidValue(), self::LEN_VOID);
+        return new self(VoidValue::get(), self::LEN_VOID);
     }
 
     /**

src/TypeResolver.php

@@ -5,6 +5,7 @@
 namespace GoPhp;
 
 use Closure;
+use GoParser\Ast\EmbeddedFieldDecl;
 use GoParser\Ast\Expr\ArrayType as AstArrayType;
 use GoParser\Ast\Expr\Expr;
 use GoParser\Ast\Expr\FuncType as AstFuncType;
@@ -156,18 +157,26 @@ private function resolveStructType(AstStructType $structType, bool $composite):
     {
         /** @var array<string, GoType> $fields */
         $fields = [];
+        $promotedNames = [];
 
         foreach ($structType->fieldDecls as $fieldDecl) {
-            if ($fieldDecl->identList === null) {
-                // fixme add anonymous fields
-                throw InternalError::unimplemented();
-            }
+            $type = $this->resolve($fieldDecl->type, $composite);
 
-            if ($fieldDecl->type === null) {
-                throw InternalError::unimplemented();
-            }
+            if ($fieldDecl instanceof EmbeddedFieldDecl) {
+                $name = self::getNameForEmbeddedField($fieldDecl);
 
-            $type = $this->resolve($fieldDecl->type, $composite);
+                if (isset($fields[$name])) {
+                    throw RuntimeError::redeclaredName($name);
+                }
+
+                $fields[$name] = $type;
+
+                if (try_unwind($type) instanceof StructType) {
+                    $promotedNames[] = $name;
+                }
+
+                continue;
+            }
 
             foreach ($fieldDecl->identList->idents as $ident) {
                 if (isset($fields[$ident->name])) {
@@ -178,7 +187,7 @@ private function resolveStructType(AstStructType $structType, bool $composite):
             }
         }
 
-        return new StructType($fields);
+        return new StructType($fields, $promotedNames);
     }
 
     private function resolveInterfaceType(AstInterfaceType $interfaceType, bool $composite): InterfaceType
@@ -227,4 +236,20 @@ private function getTypeFromEnv(string $name, string $namespace): GoType
 
         return $value->unwrap();
     }
+
+    private static function getNameForEmbeddedField(EmbeddedFieldDecl $fieldDecl): string
+    {
+        $type = $fieldDecl->type;
+
+        if ($type instanceof AstPointerType) {
+            $type = $type->type;
+        }
+
+        if ($type instanceof QualifiedTypeName) {
+            $type = $type->typeName;
+        }
+
+        /** @var SingleTypeName $type */
+        return $type->name->name;
+    }
 }

tests/Functional/InterpreterTest.php

@@ -10,6 +10,11 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
+use function glob;
+use function file_get_contents;
+use function sprintf;
+use function basename;
+
 final class InterpreterTest extends TestCase
 {
     private const SRC_FILES_PATH = __DIR__ . '/files';
@@ -43,12 +48,12 @@ public function testSourceFiles(string $goProgram, string $expectedOutput): void
 
     public static function sourceFileProvider(): iterable
     {
-        $files = \glob(\sprintf('%s/*.go', self::SRC_FILES_PATH));
+        $files = glob(sprintf('%s/*.go', self::SRC_FILES_PATH));
 
         foreach ($files as $file) {
-            $goProgram = \file_get_contents($file);
-            $expectedOutput = \file_get_contents(
-                \sprintf('%s/%s.out', self::OUTPUT_FILES_PATH, \basename($file, '.go'))
+            $goProgram = file_get_contents($file);
+            $expectedOutput = file_get_contents(
+                sprintf('%s/%s.out', self::OUTPUT_FILES_PATH, basename($file, '.go'))
             );
 
             yield $file => [$goProgram, $expectedOutput];