Fix for embedded struct field parsing

tuqqu · Sep 9, 2023 · 6a0e03f · 6a0e03f
1 parent b0e2380
commit 6a0e03f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/Ast/FromLexeme.php b/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);
 }
diff --git a/src/Error.php b/src/Error.php
@@ -4,7 +4,6 @@
 
 namespace GoParser;
 
-interface Error
-{
-    public function __toString(): string;
-}
+use Stringable;
+
+interface Error extends Stringable {}
diff --git a/src/Exception/ParseModeError.php b/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
         ));

diff --git a/src/Parser.php b/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))