From fa66053e13c39e6f6a25db8f46b1e1f97ecce2fc Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Thu, 7 Mar 2024 12:15:38 -0500 Subject: Use '$' for min/max variable --- compile.c | 2 +- parse.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compile.c b/compile.c index 0c7c050e..37d67af8 100644 --- a/compile.c +++ b/compile.c @@ -523,7 +523,7 @@ CORD compile(env_t *env, ast_t *ast) ast_t *key = ast->tag == Min ? Match(ast, Min)->key : Match(ast, Max)->key; ast_t *lhs = ast->tag == Min ? Match(ast, Min)->lhs : Match(ast, Max)->lhs; ast_t *rhs = ast->tag == Min ? Match(ast, Min)->rhs : Match(ast, Max)->rhs; - const char *key_name = ast->tag == Min ? "_min_" : "_max_"; + const char *key_name = "$"; if (key == NULL) key = FakeAST(Var, key_name); env_t *expr_env = fresh_scope(env); diff --git a/parse.c b/parse.c index 8ed6526f..de33439d 100644 --- a/parse.c +++ b/parse.c @@ -738,7 +738,7 @@ PARSER(parse_reduction) { ast_t *lhs = NewAST(ctx->file, pos, pos, Var, .name="$reduction"); ast_t *rhs = NewAST(ctx->file, pos, pos, Var, .name="$iter_value"); if (op == BINOP_MIN || op == BINOP_MAX) { - ast_t *key = NewAST(ctx->file, pos, pos, Var, .name=(op == BINOP_MIN ? "_min_" : "_max_")); + ast_t *key = NewAST(ctx->file, pos, pos, Var, .name="$"); for (bool progress = true; progress; ) { ast_t *new_term; progress = (false @@ -1302,7 +1302,7 @@ static ast_t *parse_infix_expr(parse_ctx_t *ctx, const char *pos, int min_tightn for (binop_e op; (op=match_binary_operator(&pos)) != BINOP_UNKNOWN && op_tightness[op] >= min_tightness; spaces(&pos)) { ast_t *key = NULL; if (op == BINOP_MIN || op == BINOP_MAX) { - key = NewAST(ctx->file, pos, pos, Var, .name=op == BINOP_MIN ? "_min_" : "_max_"); + key = NewAST(ctx->file, pos, pos, Var, .name="$"); for (bool progress = true; progress; ) { ast_t *new_term; progress = (false -- cgit v1.2.3