Remove need for trailing semicolons

2026-05-27 14:05:17 +02:00
parent e814ebae83
commit b09ddfcbbe
3 changed files with 1022 additions and 1029 deletions
@@ -3991,10 +3991,16 @@ begin
 	result^.parameters := parameter_head;

 	(* Skip semicolon or arrow. *)
-	token := elna_lexer_read(cursor);
+	token := elna_lexer_peek(cursor);

 	if token^.kind = ElnaLexerKind.arrow then
+		elna_lexer_read(cursor);
 		result^.return_type := elna_parser_type_expression(cursor);
+		token := elna_lexer_peek(cursor);
+		if token^.kind = ElnaLexerKind.semicolon then
+			elna_lexer_read(cursor)
+		end
+	elsif token^.kind = ElnaLexerKind.semicolon then
 		elna_lexer_read(cursor)
 	else
 		result^.return_type := nil
@@ -4270,8 +4276,10 @@ begin
 		current_declaration := parser_node;

 		(* Skip semicolon. *)
-		elna_lexer_read(cursor);
-
+		token := elna_lexer_peek(cursor);
+		if token^.kind = ElnaLexerKind.semicolon then
+			elna_lexer_read(cursor)
+		end;
 		goto elna_parser_procedures_loop
 	end;
 	return result
@@ -4393,8 +4401,10 @@ begin
 	elna_lexer_read(cursor);
 	result^.type_expression := elna_parser_type_expression(cursor);

-	elna_lexer_read(cursor);
-
+	token := elna_lexer_peek(cursor);
+	if token^.kind = ElnaLexerKind.semicolon then
+		elna_lexer_read(cursor);
+	end;
 	return result
 end;

@@ -4512,8 +4522,10 @@ begin
 		variable_node := elna_parser_variable_declaration(cursor);

 		(* Skip semicolon. *)
-		elna_lexer_read(cursor);
-
+		token := elna_lexer_peek(cursor);
+		if token^.kind = ElnaLexerKind.semicolon then
+			elna_lexer_read(cursor)
+		end;
 		if result = nil then
 			result := variable_node
 		else
@@ -6032,4 +6044,4 @@ begin
 	else
 		exit(4)
 	end
-end;
+end.