tidy up a bit

billhails · Nov 7, 2024 · 1a0cbe5 · 1a0cbe5
1 parent 7540e8a
commit 1a0cbe5
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 444 deletions.
diff --git a/fn/wonderful-life.fn b/fn/wonderful-life.fn
@@ -58,4 +58,4 @@ let
             puts("}\n");
     }
 in
-    printTree(generateTree(0.64046))
+    printTree(generateTree(0.64316))
diff --git a/src/pratt_parser.c b/src/pratt_parser.c
@@ -797,15 +797,21 @@ static PrattParser *meldParsers(PrattParser *to, PrattParser *from) {
                 if (record->infixImpl) {
                     if (target->infixImpl) {
                         parserError(to, "import redefines infix operator %s", op->name);
+                    } else if (target->postfixImpl) {
+                        parserError(to, "import defines infix operator %s"
+                                        " over existing postfix operator", op->name);
                     } else {
                         target->infixImpl = record->infixImpl;
                         target->infixPrec = record->infixPrec;
                         target->infixOp = record->infixOp;
                     }
                 }
                 if (record->postfixImpl) {
-                    if (target->infixImpl) {
+                    if (target->postfixImpl) {
                         parserError(to, "import redefines postfix operator %s", op->name);
+                    } else if (target->postfixImpl) {
+                        parserError(to, "import defines postfix operator %s"
+                                        " over existing infix operator", op->name);
                     } else {
                         target->postfixImpl = record->postfixImpl;
                         target->postfixPrec = record->postfixPrec;

diff --git a/src/pratt_scanner.c b/src/pratt_scanner.c
@@ -31,11 +31,11 @@
 #  include "debugging_off.h"
 #endif
 
-#define TOKFN(name, string) \
-HashSymbol *TOK_ ## name(void) { \
-    static HashSymbol *s = NULL; \
+#define TOKFN(name, string)               \
+HashSymbol *TOK_ ## name(void) {          \
+    static HashSymbol *s = NULL;          \
     if (s == NULL) s = newSymbol(string); \
-    return s; \
+    return s;                             \
 }
 
 TOKFN(MACRO,"macro")