shishantbiswas/c3c
1
1
Fork 0
mirror of https://github.com/c3lang/c3c.git synced 2026-02-27 12:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow "if (try foo())"."

Browse Source
This commit is contained in:
Christoffer Lerno
2023-08-13 18:15:20 +02:00
parent c060569599
commit e22afe5424
4 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/llvm_codegen_expr.c
View File

@@ -6168,7 +6168,16 @@ static inline void llvm_emit_try_unwrap(GenContext *c, BEValue *value, Expr *exp
BEValue addr;
if (expr->try_unwrap_expr.assign_existing)
{
llvm_emit_expr(c, &addr, expr->try_unwrap_expr.lhs);
Expr *lhs = expr->try_unwrap_expr.lhs;
if (lhs)
{
llvm_emit_expr(c, &addr, lhs);
}
else
{
llvm_emit_try_assign_try_catch(c, true, value, NULL, NULL, expr->try_unwrap_expr.optional);
return;
}
}
else
{

8
src/compiler/sema_stmts.c
View File

@@ -534,10 +534,14 @@ static inline bool sema_analyse_try_unwrap(SemaContext *context, Expr *expr)
if (!optional)
{
if (!sema_analyse_expr(context, ident)) return false;
// The `try foo()` case.
if (ident->expr_kind != EXPR_IDENTIFIER)
{
SEMA_ERROR(ident, "Only single identifiers may be unwrapped using 'try var', maybe you wanted 'try (expr)' instead?");
return false;
expr->try_unwrap_expr.optional = ident;
expr->try_unwrap_expr.lhs = NULL;
expr->try_unwrap_expr.assign_existing = true;
expr->type = type_bool;
return true;
}
Decl *decl = ident->identifier_expr.decl;
if (decl->decl_kind != DECL_VAR)

2
src/version.h
View File

@@ -1 +1 @@
#define COMPILER_VERSION "0.4.605"
#define COMPILER_VERSION "0.4.606"

49
test/test_suite/errors/try_expr.c3t Normal file
View File

@@ -0,0 +1,49 @@
// #target: macos-x64
module foo;
import std::io;
fn void main()
{
int a;
if (try foo())
{
a--;
}
else
{
a++;
}
}
fn void! foo() {}
/* #expect: foo.ll
define void @foo.main() #0 {
entry:
%a = alloca i32, align 4
store i32 0, ptr %a, align 4
%0 = call i64 @foo.foo()
%not_err = icmp eq i64 %0, 0
%1 = call i1 @llvm.expect.i1(i1 %not_err, i1 true)
br i1 %1, label %after_check, label %catch_landing
after_check: ; preds = %entry
br label %phi_try_catch
catch_landing: ; preds = %entry
br label %phi_try_catch
phi_try_catch: ; preds = %catch_landing, %after_check
%val = phi i1 [ true, %after_check ], [ false, %catch_landing ]
br i1 %val, label %if.then, label %if.else
if.then: ; preds = %phi_try_catch
%2 = load i32, ptr %a, align 4
%sub = sub i32 %2, 1
store i32 %sub, ptr %a, align 4
br label %if.exit
if.else: ; preds = %phi_try_catch
%3 = load i32, ptr %a, align 4
%add = add i32 %3, 1
store i32 %add, ptr %a, align 4
br label %if.exit
if.exit: ; preds = %if.else, %if.then
ret void
}