Fix for embedded struct field parsing

.gitattributes

@@ -1,6 +1,8 @@
 /.gitattributes     export-ignore
 /.gitignore         export-ignore
 /.github/           export-ignore
+
+/.php-cs-fixer.php  export-ignore
 /psalm.xml          export-ignore
 /phpunit.xml        export-ignore
-/tests/             export-ignore
+/tests/             export-ignore

src/Ast/FromLexeme.php

@@ -5,11 +5,14 @@
 namespace GoParser\Ast;
 
 use GoParser\Lexer\Lexeme;
+use GoParser\Lexer\Position;
 
 trait FromLexeme
 {
     public static function fromLexeme(Lexeme $lexeme): static
     {
         return new static($lexeme->pos, $lexeme->literal ?? $lexeme->token->value);
     }
+
+    abstract public function __construct(Position $pos, string $literal);
 }

src/Error.php

@@ -4,7 +4,6 @@
 
 namespace GoParser;
 
-interface Error
-{
-    public function __toString(): string;
-}
+use Stringable;
+
+interface Error extends Stringable {}

src/Exception/ParseModeError.php

@@ -14,7 +14,7 @@ final class ParseModeError extends BadMethodCallException
     public function __construct(ParseMode $expected, ParseMode $actual)
     {
         parent::__construct(sprintf(
-            'Expected Parser to be initialised with Parse Mode "%s" , but got "%s"',
+            'Expected Parser to be initialised with Parse Mode "%s", but got "%s"',
             $expected->name,
             $actual->name
         ));

src/Parser.php

@@ -1751,7 +1751,7 @@ private function parseStructType(): StructType
             $typeOrIdent = $this->parseType();
             $tag = $this->tryParseTag();
 
-            if ($this->match(Token::Semicolon)) {
+            if ($this->matchAny(Token::Semicolon, Token::RightBrace)) {
                 if (
                     !$typeOrIdent instanceof TypeName
                     && ($typeOrIdent instanceof PointerType && (!$typeOrIdent->type instanceof TypeName))

tests/ParserTest.php

@@ -13,12 +13,13 @@
 use GoParser\Ast\Stmt\VarDecl;
 use GoParser\Parser;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 
-use function json_encode;
-use function glob;
-use function sprintf;
 use function basename;
 use function file_get_contents;
+use function glob;
+use function json_encode;
+use function sprintf;
 
 use const JSON_PRETTY_PRINT;
 use const JSON_THROW_ON_ERROR;
@@ -82,15 +83,26 @@ private static function dataFiles(): iterable
 
     private static function fileContents(string $dir): iterable
     {
-        $path  = __DIR__ . '/data/';
-        $files = glob(sprintf($path . '/src/%s/*.go', $dir));
-
-        foreach ($files as $file) {
-            $goProgram = file_get_contents($file);
-            $jsonPath = sprintf($path . '/ast/%s/%s.json', $dir, basename($file, '.go'));
-            $parsedJson = file_get_contents($jsonPath);
-
-            yield $file => [$goProgram, $parsedJson];
+        $path  = __DIR__ . '/data';
+        $goFiles = glob(sprintf($path . '/%s/*.go', $dir));
+        $astFiles = glob(sprintf($path . '/%s/*.json', $dir));
+
+        foreach ($goFiles as $i => $goFile) {
+            $goFilename = basename($goFile, '.go');
+            $astFilename = basename($astFiles[$i], '.json');
+
+            if ($goFilename !== $astFilename) {
+                throw new RuntimeException(sprintf(
+                    'Filename mismatch: %s vs %s',
+                    $goFilename,
+                    $astFilename
+                ));
+            }
+
+            $goProgram = file_get_contents($goFile);
+            $ast = file_get_contents($astFiles[$i]);
+
+            yield $goFilename => [$goProgram, $ast];
         }
     }
 }

tests/data/README.md

@@ -1,5 +1,4 @@
 ## Directory structure
 
-* `./src/core` Go test files
-* `./src/sample` Go files from various open source projects
-* `./ast` Parsed AST in JSON
+* `./core` Go test files
+* `./sample` Go files from various open source projects

tests/data/src/core/struct.go → tests/data/core/struct.go

@@ -24,3 +24,28 @@ type a struct {
 	time.Time "tag"
 	*time.Duration
 }
+
+type b struct {
+	string
+	int
+}
+
+type name = string
+type age int
+
+type person struct {
+	name
+	age
+}
+
+func test() {
+	var a struct {
+		uint
+		string
+	} = struct {
+		uint
+		string
+	}{uint: 100}
+
+	var b struct{ string } = struct{ string }{}
+}