1 files changed, 66 insertions, 32 deletions

diff --git a/src/ast.c b/src/ast.c
index 53d80a81..486e0262 100644
--- a/src/ast.c
+++ b/src/ast.c
@@ -5,9 +5,37 @@
 
 #include "ast.h"
 #include "stdlib/datatypes.h"
+#include "stdlib/optionals.h"
 #include "stdlib/tables.h"
 #include "stdlib/text.h"
 
+const int op_tightness[NUM_AST_TAGS] = {
+    [Power] = 9,
+    [Multiply] = 8,
+    [Divide] = 8,
+    [Mod] = 8,
+    [Mod1] = 8,
+    [Plus] = 7,
+    [Minus] = 7,
+    [Concat] = 6,
+    [LeftShift] = 5,
+    [RightShift] = 5,
+    [UnsignedLeftShift] = 5,
+    [UnsignedRightShift] = 5,
+    [Min] = 4,
+    [Max] = 4,
+    [Equals] = 3,
+    [NotEquals] = 3,
+    [LessThan] = 2,
+    [LessThanOrEquals] = 2,
+    [GreaterThan] = 2,
+    [GreaterThanOrEquals] = 2,
+    [Compare] = 2,
+    [And] = 1,
+    [Or] = 1,
+    [Xor] = 1,
+};
+
 static Text_t quoted_text(const char *text) { return Text$quoted(Text$from_str(text), false, Text("\"")); }
 
 CONSTFUNC const char *binop_method_name(ast_e tag) {
@@ -44,39 +72,47 @@ CONSTFUNC const char *binop_method_name(ast_e tag) {
     case XorUpdate: return "bit_xor";
     default: return NULL;
     }
-};
+}
 
 CONSTFUNC const char *binop_operator(ast_e tag) {
     switch (tag) {
-    case Multiply:
-    case MultiplyUpdate: return "*";
-    case Divide:
-    case DivideUpdate: return "/";
-    case Mod:
-    case ModUpdate: return "%";
-    case Plus:
-    case PlusUpdate: return "+";
-    case Minus:
-    case MinusUpdate: return "-";
-    case LeftShift:
-    case LeftShiftUpdate: return "<<";
-    case RightShift:
-    case RightShiftUpdate: return ">>";
-    case And:
-    case AndUpdate: return "&";
-    case Or:
-    case OrUpdate: return "|";
-    case Xor:
-    case XorUpdate: return "^";
+    case Power: return "^";
+    case PowerUpdate: return "^=";
+    case Concat: return "++";
+    case ConcatUpdate: return "++=";
+    case Multiply: return "*";
+    case MultiplyUpdate: return "*=";
+    case Divide: return "/";
+    case DivideUpdate: return "/=";
+    case Mod: return "mod";
+    case ModUpdate: return "mod=";
+    case Mod1: return "mod1";
+    case Mod1Update: return "mod1=";
+    case Plus: return "+";
+    case PlusUpdate: return "+=";
+    case Minus: return "-";
+    case MinusUpdate: return "-=";
+    case LeftShift: return "<<";
+    case LeftShiftUpdate: return "<<=";
+    case RightShift: return ">>";
+    case RightShiftUpdate: return ">>=";
+    case And: return "and";
+    case AndUpdate: return "and=";
+    case Or: return "or";
+    case OrUpdate: return "or=";
+    case Xor: return "xor";
+    case XorUpdate: return "xor=";
     case Equals: return "==";
     case NotEquals: return "!=";
     case LessThan: return "<";
     case LessThanOrEquals: return "<=";
     case GreaterThan: return ">";
     case GreaterThanOrEquals: return ">=";
+    case Min: return "_min_";
+    case Max: return "_max_";
     default: return NULL;
     }
-};
+}
 
 static Text_t ast_list_to_sexp(ast_list_t *asts);
 static Text_t arg_list_to_sexp(arg_ast_t *args);
@@ -175,8 +211,8 @@ Text_t ast_to_sexp(ast_t *ast) {
         T(None, "(None)");
         T(Bool, "(Bool ", data.b ? "yes" : "no", ")");
         T(Var, "(Var ", quoted_text(data.name), ")");
-        T(Int, "(Int ", quoted_text(ast_source(ast)), ")");
-        T(Num, "(Num ", quoted_text(ast_source(ast)), ")");
+        T(Int, "(Int ", Text$quoted(ast_source(ast), false, Text("\"")), ")");
+        T(Num, "(Num ", Text$quoted(ast_source(ast), false, Text("\"")), ")");
         T(TextLiteral, Text$quoted(data.text, false, Text("\"")));
         T(TextJoin, "(Text", data.lang ? Texts(" :lang ", quoted_text(data.lang)) : EMPTY_TEXT,
           ast_list_to_sexp(data.children), ")");
@@ -255,7 +291,7 @@ Text_t ast_to_sexp(ast_t *ast) {
           ")");
         T(When, "(When ", ast_to_sexp(data.subject), when_clauses_to_sexp(data.clauses),
           optional_sexp("else", data.else_body), ")");
-        T(Reduction, "(Reduction ", quoted_text(binop_method_name(data.op)), " ", ast_to_sexp(data.key), " ",
+        T(Reduction, "(Reduction ", quoted_text(binop_operator(data.op)), " ", ast_to_sexp(data.key), " ",
           ast_to_sexp(data.iter), ")");
         T(Skip, "(Skip ", quoted_text(data.target), ")");
         T(Stop, "(Stop ", quoted_text(data.target), ")");
@@ -285,13 +321,9 @@ Text_t ast_to_sexp(ast_t *ast) {
 
 const char *ast_to_sexp_str(ast_t *ast) { return Text$as_c_string(ast_to_sexp(ast)); }
 
-const char *ast_source(ast_t *ast) {
-    if (!ast) return NULL;
-    size_t len = (size_t)(ast->end - ast->start);
-    char *source = GC_MALLOC_ATOMIC(len + 1);
-    memcpy(source, ast->start, len);
-    source[len] = '\0';
-    return source;
+OptionalText_t ast_source(ast_t *ast) {
+    if (ast == NULL || ast->start == NULL || ast->end == NULL) return NONE_TEXT;
+    return Text$from_strn(ast->start, (int64_t)(ast->end - ast->start));
 }
 
 PUREFUNC bool is_idempotent(ast_t *ast) {
@@ -400,6 +432,8 @@ void visit_topologically(ast_list_t *asts, Closure_t fn) {
 
 CONSTFUNC bool is_binary_operation(ast_t *ast) {
     switch (ast->tag) {
+    case Min:
+    case Max:
     case BINOP_CASES: return true;
     default: return false;
     }