1 files changed, 3 insertions, 5 deletions
diff --git a/src/vhdl/parse.adb b/src/vhdl/parse.adb
index 86465e037..d07d6b892 100644
--- a/src/vhdl/parse.adb
+++ b/src/vhdl/parse.adb
@@ -2269,7 +2269,7 @@ package body Parse is
 
          First := Null_Iir;
          Scan_Semi_Colon ("element declaration");
-         exit when Current_Token = Tok_End;
+         exit when Current_Token /= Tok_Identifier;
       end loop;
 
       Set_Elements_Declaration_List (Res, List_To_Flist (El_List));
@@ -2280,12 +2280,10 @@ package body Parse is
       end if;
 
       --  Skip 'end'
-      Scan_Expect (Tok_Record);
+      Expect_Scan (Tok_End);
+      Expect_Scan (Tok_Record);
       Set_End_Has_Reserved_Id (Res, True);
 
-      --  Skip 'record'
-      Scan;
-
       return Res;
    end Parse_Record_Type_Definition;