mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-30 01:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make diverging procedure types different from ones without a return type

Browse Source
This commit is contained in:
gingerBill
2018-09-09 13:48:33 +01:00
parent f5549f6bde
commit 12902821d6
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/parser.cpp
View File

@@ -866,7 +866,7 @@ Ast *ast_poly_type(AstFile *f, Token token, Ast *type, Ast *specialization) {
}
Ast *ast_proc_type(AstFile *f, Token token, Ast *params, Ast *results, u64 tags, ProcCallingConvention calling_convention, bool generic, bool no_return) {
Ast *ast_proc_type(AstFile *f, Token token, Ast *params, Ast *results, u64 tags, ProcCallingConvention calling_convention, bool generic, bool diverging) {
Ast *result = alloc_ast_node(f, Ast_ProcType);
result->ProcType.token = token;
result->ProcType.params = params;
@@ -874,7 +874,7 @@ Ast *ast_proc_type(AstFile *f, Token token, Ast *params, Ast *results, u64 tags,
result->ProcType.tags = tags;
result->ProcType.calling_convention = calling_convention;
result->ProcType.generic = generic;
result->ProcType.no_return = no_return;
result->ProcType.diverging = diverging;
return result;
}
@@ -2621,13 +2621,13 @@ Ast *parse_block_stmt(AstFile *f, b32 is_when) {
Ast *parse_results(AstFile *f, bool *no_return) {
Ast *parse_results(AstFile *f, bool *diverging) {
if (!allow_token(f, Token_ArrowRight)) {
return nullptr;
}
if (allow_token(f, Token_Not)) {
if (no_return) *no_return = true;
if (diverging) *diverging = true;
return nullptr;
}
@@ -2667,7 +2667,7 @@ ProcCallingConvention string_to_calling_convention(String s) {
Ast *parse_proc_type(AstFile *f, Token proc_token) {
Ast *params = nullptr;
Ast *results = nullptr;
bool no_return = false;
bool diverging = false;
ProcCallingConvention cc = ProcCC_Invalid;
if (f->curr_token.kind == Token_String) {
@@ -2691,7 +2691,7 @@ Ast *parse_proc_type(AstFile *f, Token proc_token) {
expect_token(f, Token_OpenParen);
params = parse_field_list(f, nullptr, FieldFlag_Signature, Token_CloseParen, true, true);
expect_token_after(f, Token_CloseParen, "parameter list");
results = parse_results(f, &no_return);
results = parse_results(f, &diverging);
u64 tags = 0;
parse_proc_tags(f, &tags);
@@ -2717,7 +2717,7 @@ Ast *parse_proc_type(AstFile *f, Token proc_token) {
}
}
end:
return ast_proc_type(f, proc_token, params, results, tags, cc, is_generic, no_return);
return ast_proc_type(f, proc_token, params, results, tags, cc, is_generic, diverging);
}
Ast *parse_var_type(AstFile *f, bool allow_ellipsis, bool allow_type_token) {