Clean up codegen to not use macros

2 files changed, 4 insertions, 16 deletions

diff --git a/builtins/macros.h b/builtins/macros.h
index 6f9af8c9..09896b0d 100644
--- a/builtins/macros.h
+++ b/builtins/macros.h
@@ -14,15 +14,3 @@
 #define $stack(x) (__typeof(x)*)((__typeof(x)[1]){x})
 #define $tagged(obj_expr, type_name, tag_name) ({ __typeof(obj_expr) $obj = obj_expr; \
                                                 $obj.$tag == $tag$##type_name##$##tag_name ? &$obj.tag_name : NULL; })
-
-
-#define Bool(x) _Generic(x, bool: (bool)(x), int64_t: (x != 0), int32_t: (x != 0), int16_t: (x != 0), int8_t: (x != 0), CORD: ((x) == CORD_EMPTY), \
-                         array_t: ((x).length > 0), table_t: ((x).entries.length > 0), CORD: ((x) != CORD_EMPTY), \
-                         default: _Static_assert(0, "Not supported"))
-#define and(x, y) _Generic(x, bool: (bool)((x) && (y)), default: ((x) & (y)))
-#define or(x, y) _Generic(x, bool: (bool)((x) || (y)), default: ((x) | (y)))
-#define xor(x, y) _Generic(x, bool: (bool)((x) ^ (y)), default: ((x) ^ (y)))
-#define mod(x, n) ((x) % (n))
-#define mod1(x, n) (((x) % (n)) + (__typeof(x))1)
-#define $cmp(x, y, info) (_Generic(x, int8_t: (x>0)-(y>0), int16_t: (x>0)-(y>0), int32_t: (x>0)-(y>0), int64_t: (x>0)-(y>0), bool: (x>0)-(y>0), \
-                                 CORD: CORD_cmp((CORD)x, (CORD)y), char*: strcmp((char*)x, (char*)y), default: generic_compare($stack(x), $stack(y), info)))
diff --git a/compile.c b/compile.c
index 5f30d815..cc2bbf28 100644
--- a/compile.c
+++ b/compile.c
@@ -286,8 +286,8 @@ CORD compile_statement(env_t *env, ast_t *ast)
         switch (update->op) {
         case BINOP_MULT: return CORD_asprintf("%r *= %r;", lhs, rhs);
         case BINOP_DIVIDE: return CORD_asprintf("%r /= %r;", lhs, rhs);
-        case BINOP_MOD: return CORD_asprintf("%r = mod(%r, %r);", lhs, lhs, rhs);
-        case BINOP_MOD1: return CORD_asprintf("%r = mod1(%r, %r);", lhs, lhs, rhs);
+        case BINOP_MOD: return CORD_asprintf("%r = %r %% %r;", lhs, lhs, rhs);
+        case BINOP_MOD1: return CORD_asprintf("%r = (%r %% %r) + 1;", lhs, lhs, rhs);
         case BINOP_PLUS: return CORD_asprintf("%r += %r;", lhs, rhs);
         case BINOP_MINUS: return CORD_asprintf("%r -= %r;", lhs, rhs);
         case BINOP_POWER: {
@@ -842,12 +842,12 @@ CORD compile(env_t *env, ast_t *ast)
         case BINOP_MOD: {
             if (operand_t->tag != IntType && operand_t->tag != NumType)
                 code_err(ast, "Math operations are only supported for numeric types");
-            return CORD_asprintf("mod(%r, %r)", lhs, rhs);
+            return CORD_asprintf("(%r %% %r)", lhs, rhs);
         }
         case BINOP_MOD1: {
             if (operand_t->tag != IntType && operand_t->tag != NumType)
                 code_err(ast, "Math operations are only supported for numeric types");
-            return CORD_asprintf("mod1(%r, %r)", lhs, rhs);
+            return CORD_asprintf("((%r %% %r) + 1)", lhs, rhs);
         }
         case BINOP_PLUS: {
             if (operand_t->tag != IntType && operand_t->tag != NumType)