lisyarus/pslang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support return statement with no expression

Browse source
This commit is contained in:
Nikita Lisitsa 2025-12-17 14:22:20 +03:00
parent 1f3c495acf
commit bc7d24ad62
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libs/ast/include/pslang/ast/statement.hpp
View file

@ -28,6 +28,7 @@ namespace pslang::ast
struct return_statement struct return_statement
{ {
// can be null, which means "return unit"
expression_ptr value; expression_ptr value;
}; };

3
libs/ast/source/print.cpp
View file

@ -267,7 +267,8 @@ namespace pslang::ast
put_indent(out, options); put_indent(out, options);
out << "return"; out << "return";
newline(out); newline(out);
print(out, node.value, child(options)); if (node.value)
print(out, node.value, child(options));
} }
void print(std::ostream & out, statement_ptr const & node, print_options const & options) void print(std::ostream & out, statement_ptr const & node, print_options const & options)

2
libs/interpreter/source/interpreter.cpp
View file

@ -180,7 +180,7 @@ namespace pslang::interpreter
void execute_impl(context & context, ast::return_statement const & return_statement) void execute_impl(context & context, ast::return_statement const & return_statement)
{ {
auto value = eval(context, return_statement.value); auto value = return_statement.value ? eval(context, return_statement.value) : unit_value{};
for (auto it = context.scope_stack.rbegin(); it != context.scope_stack.rend(); ++it) for (auto it = context.scope_stack.rbegin(); it != context.scope_stack.rend(); ++it)
{ {
if (it->is_function_scope) if (it->is_function_scope)

1
libs/parser/rules/pslang.y
View file

@ -188,6 +188,7 @@ statement
| while expression colon { $$ = ast::while_block{std::make_unique<ast::expression>($2), {}}; } | while expression colon { $$ = ast::while_block{std::make_unique<ast::expression>($2), {}}; }
| func name lparen function_definition_argument_list rparen function_return_type colon { $$ = ast::function_definition{$2, $4, $6, {}}; } | func name lparen function_definition_argument_list rparen function_return_type colon { $$ = ast::function_definition{$2, $4, $6, {}}; }
| return expression { $$ = ast::return_statement{std::make_unique<ast::expression>($2)}; } | return expression { $$ = ast::return_statement{std::make_unique<ast::expression>($2)}; }
| return { $$ = ast::return_statement{nullptr}; }
; ;
function_definition_argument_list function_definition_argument_list