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

Enable $defined((void)#hash)

Browse Source
This commit is contained in:
Christoffer Lerno
2025-08-29 23:24:32 +02:00
parent 1080303768
commit de8aed9d96
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
releasenotes.md
View File

@@ -33,7 +33,7 @@
- Added `$kindof` compile time function.
- Deprecated `@typekind` macro in favour of `$kindof`.
- Deprecated `@typeis` macro in favour of `$typeof(#foo) == int`.
- `$defined(#hash)` will not check the internal expression, just that `#hash` exists.
- `$defined(#hash)` will not check the internal expression, just that `#hash` exists. Use `$defined((void)#hash)` for the old behaviour.
- Added optional macro arguments using `macro foo(int x = ...)` which can be checked using `$defined(x)`.
### Fixes

24
src/compiler/sema_expr.c
View File

@@ -10414,6 +10414,7 @@ static inline bool sema_expr_analyse_ct_defined(SemaContext *context, Expr *expr
SemaContext *active_context = context;
bool in_no_eval = active_context->call_env.in_no_eval;
active_context->call_env.in_no_eval = true;
bool unroll_hash = false;
RETRY:
switch (main_expr->expr_kind)
{
@@ -10440,6 +10441,13 @@ static inline bool sema_expr_analyse_ct_defined(SemaContext *context, Expr *expr
}
case EXPR_HASH_IDENT:
{
if (unroll_hash)
{
Decl *decl = sema_resolve_symbol(active_context, main_expr->hash_ident_expr.identifier, NULL, main_expr->span);
if (!decl) goto FAIL;
main_expr = copy_expr_single(decl->var.init_expr);
goto RETRY;
}
Decl *decl = sema_find_symbol(active_context, main_expr->hash_ident_expr.identifier);
if (!decl_ok(decl)) goto FAIL;
success = decl != NULL;
@@ -10470,7 +10478,12 @@ static inline bool sema_expr_analyse_ct_defined(SemaContext *context, Expr *expr
{
Expr *eval = sema_ct_eval_expr(active_context, "$eval", main_expr->inner_expr, false);
if (!expr_ok(eval)) return false;
success = eval != NULL;
if (eval)
{
main_expr = eval;
goto RETRY;
}
success = false;
break;
}
case EXPR_SUBSCRIPT:
@@ -10486,12 +10499,21 @@ static inline bool sema_expr_analyse_ct_defined(SemaContext *context, Expr *expr
break;
}
case EXPR_CAST:
{
TypeInfo *typeinfo = type_infoptr(main_expr->cast_expr.type_info);
if (typeinfo->resolve_status == RESOLVE_DONE && typeinfo->type == type_void)
{
main_expr = exprptr(main_expr->cast_expr.expr);
unroll_hash = true;
goto RETRY;
}
if (!sema_expr_analyse_cast(active_context, main_expr, &failed))
{
if (!failed) goto FAIL;
success = false;
}
break;
}
case EXPR_CT_IDENT:
{
Decl *decl = sema_resolve_symbol(active_context, main_expr->ct_ident_expr.identifier, NULL, main_expr->span);