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

Fixes incorrect type resolution of && and || with optionals. Fixes #879

Browse Source
This commit is contained in:
Christoffer Lerno
2023-07-25 15:16:42 +02:00
parent 3e78a70552
commit d0c00b859b
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/sema_expr.c
View File

@@ -5343,6 +5343,7 @@ static bool sema_expr_analyse_and_or(SemaContext *context, Expr *expr, Expr *lef
if (!sema_binary_analyse_subexpr(context, expr, left, right)) return false; if (!sema_binary_analyse_subexpr(context, expr, left, right)) return false;
if (!cast_explicit(context, left, type_bool) || !cast_explicit(context, right, type_bool)) return false; if (!cast_explicit(context, left, type_bool) || !cast_explicit(context, right, type_bool)) return false;
if (expr_both_const(left, right) && sema_constant_fold_ops(left)) if (expr_both_const(left, right) && sema_constant_fold_ops(left))
{ {
if (expr->binary_expr.operator == BINARYOP_AND) if (expr->binary_expr.operator == BINARYOP_AND)
@@ -5356,7 +5357,7 @@ static bool sema_expr_analyse_and_or(SemaContext *context, Expr *expr, Expr *lef
expr->const_expr.b |= right->const_expr.b; expr->const_expr.b |= right->const_expr.b;
} }
} }
expr->type = type_bool; expr->type = type_add_optional(type_bool, IS_OPTIONAL(left) || IS_OPTIONAL(right));
return true; return true;
} }

2
src/version.h
View File

@@ -1 +1 @@
#define COMPILER_VERSION "0.4.579" #define COMPILER_VERSION "0.4.580"

13
test/test_suite/expressions/optional_and_error.c3 Normal file
View File

@@ -0,0 +1,13 @@
module testing;
import std::io;
fn void! main()
{
bool ok;
if (ok && !foo()) io::printfn("nok"); // #error: The expression may not be an optional
}
fn bool! foo()
{
return false;
}