From cb1d36c6d8bc84f3422c71ab3eb29606e80f7837 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Tue, 26 Aug 2025 14:58:51 -0400
Subject: Formatting for reductions

---
 src/compile/comparisons.c | 14 +++++++++++++-
 src/compile/reductions.c  |  7 ++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'src/compile')

diff --git a/src/compile/comparisons.c b/src/compile/comparisons.c
index d73664de..d7531261 100644
--- a/src/compile/comparisons.c
+++ b/src/compile/comparisons.c
@@ -7,6 +7,18 @@
 #include "../typecheck.h"
 #include "compilation.h"
 
+static CONSTFUNC const char *comparison_operator(ast_e tag) {
+    switch (tag) {
+    case Equals: return "==";
+    case NotEquals: return "!=";
+    case LessThan: return "<";
+    case LessThanOrEquals: return "<=";
+    case GreaterThan: return ">";
+    case GreaterThanOrEquals: return ">=";
+    default: return NULL;
+    }
+}
+
 Text_t compile_comparison(env_t *env, ast_t *ast) {
 
     switch (ast->tag) {
@@ -75,7 +87,7 @@ Text_t compile_comparison(env_t *env, ast_t *ast) {
         if (ast->tag == Compare)
             return Texts("generic_compare(stack(", lhs, "), stack(", rhs, "), ", compile_type_info(operand_t), ")");
 
-        const char *op = binop_operator(ast->tag);
+        const char *op = comparison_operator(ast->tag);
         switch (operand_t->tag) {
         case BigIntType: return Texts("(Int$compare_value(", lhs, ", ", rhs, ") ", op, " 0)");
         case BoolType:
diff --git a/src/compile/reductions.c b/src/compile/reductions.c
index e0477a9c..1652384c 100644
--- a/src/compile/reductions.c
+++ b/src/compile/reductions.c
@@ -12,6 +12,7 @@ public
 Text_t compile_reduction(env_t *env, ast_t *ast) {
     DeclareMatch(reduction, ast, Reduction);
     ast_e op = reduction->op;
+    const char *op_str = binop_operator(op);
 
     type_t *iter_t = get_type(env, reduction->iter);
     type_t *item_t = get_iterated_type(iter_t);
@@ -29,7 +30,7 @@ Text_t compile_reduction(env_t *env, ast_t *ast) {
         type_t *item_value_type = item_t;
         ast_t *item_value = item;
         if (reduction->key) {
-            set_binding(body_scope, "$", item_t, compile(body_scope, item));
+            set_binding(body_scope, op_str, item_t, compile(body_scope, item));
             item_value = reduction->key;
             item_value_type = get_type(body_scope, reduction->key);
         }
@@ -67,7 +68,7 @@ Text_t compile_reduction(env_t *env, ast_t *ast) {
         ast_e cmp_op = op == Min ? LessThan : GreaterThan;
         if (reduction->key) {
             env_t *key_scope = fresh_scope(env);
-            set_binding(key_scope, "$", item_t, item_code);
+            set_binding(key_scope, op_str, item_t, item_code);
             type_t *key_type = get_type(key_scope, reduction->key);
             Text_t superlative_key = op == Min ? Text("min_key") : Text("max_key");
             code = Texts(code, compile_declaration(key_type, superlative_key), ";\n");
@@ -111,7 +112,7 @@ Text_t compile_reduction(env_t *env, ast_t *ast) {
         type_t *reduction_type = Match(get_type(env, ast), OptionalType)->type;
         ast_t *item_value = item;
         if (reduction->key) {
-            set_binding(body_scope, "$", item_t, compile(body_scope, item));
+            set_binding(body_scope, op_str, item_t, compile(body_scope, item));
             item_value = reduction->key;
         }
 
-- 
cgit v1.2.3