diff --git a/lib/std/math/math.c3 b/lib/std/math/math.c3 index db69b0ffb..fb9582cd7 100644 --- a/lib/std/math/math.c3 +++ b/lib/std/math/math.c3 @@ -159,7 +159,7 @@ macro atan2(x, y) /** * @require values::@is_int(x) || values::@is_float(x) "Expected an integer or floating point value" - * @require $and(@typekind(y) == ARRAY || @typekind(y) == VECTOR, y.len == 2) + * @require (@typekind(y) == ARRAY || @typekind(y) == VECTOR) &&& y.len == 2 * @require $assignable(x, $typeof(y[0])) **/ macro sincos(x, y) diff --git a/lib/std/sort/sort.c3 b/lib/std/sort/sort.c3 index b65ae78db..24208ff73 100644 --- a/lib/std/sort/sort.c3 +++ b/lib/std/sort/sort.c3 @@ -16,7 +16,7 @@ macro bool @is_sortable(#list) return false; $case !$defined(#list.len): return false; - $case $and($defined(&#list[0]) && !types::is_same($typeof(&#list[0]), $typeof(#list[0])*)): + $case $defined(&#list[0]) &&& !types::is_same($typeof(&#list[0]), $typeof(#list[0])*): return false; $default: return true; diff --git a/src/compiler/parse_expr.c b/src/compiler/parse_expr.c index 651ad4ffa..350f70a86 100644 --- a/src/compiler/parse_expr.c +++ b/src/compiler/parse_expr.c @@ -1136,6 +1136,7 @@ static Expr *parse_ct_concat_append(ParseContext *c, Expr *left) { assert(!left && "Unexpected left hand side"); Expr *expr = EXPR_NEW_TOKEN(tok_is(c, TOKEN_CT_CONCATFN) ? EXPR_CT_CONCAT : EXPR_CT_APPEND); + if (!active_target.silence_deprecation) SEMA_NOTE(expr, "'%s' is deprecated in favour of '+++'.", symstr(c)); advance(c); CONSUME_OR_RET(TOKEN_LPAREN, poisoned_expr); @@ -1171,6 +1172,7 @@ static Expr *parse_ct_and_or(ParseContext *c, Expr *left) assert(!left && "Unexpected left hand side"); Expr *expr = EXPR_NEW_TOKEN(EXPR_CT_AND_OR); expr->ct_and_or_expr.is_and = tok_is(c, TOKEN_CT_ANDFN); + if (!active_target.silence_deprecation) SEMA_NOTE(expr, "The use of '%s' is deprecated in favour of '&&&'.", symstr(c)); advance(c); CONSUME_OR_RET(TOKEN_LPAREN, poisoned_expr); if (!parse_expr_list(c, &expr->ct_and_or_expr.args, TOKEN_RPAREN)) return poisoned_expr;