change printing

[lambda.git] / print.c

diff --git a/print.c b/print.c
index 6a2cba5..02fcc16 100644 (file)
--- a/print.c
+++ b/print.c
@@ -1,26 +1,12 @@
 #include <stdio.h>
 #include "lambda.h"
 
-void print_apos(unsigned int revision)
-{
-       if(revision == 1)
-               printf("\'");
-       if(revision > 2){
-               printf("\"");
-               print_apos(revision - 2);
+#define PRINT_ABS(t) {\
+       if(t->data.abstraction.strict)\
+               putchar('!');\
+       printf("%s", t->data.abstraction.ident);\
        }
-}
 
-void print_ident(char *ident, unsigned int revision)
-{
-       printf("%s", ident);
-       while(revision > 2){
-               putchar('\"');
-               revision -= 2;
-       }
-       if(revision == 1)
-               putchar('\'');
-}
 
 void term_print(struct lambda *t, struct lambda *mark)
 {
@@ -28,14 +14,14 @@ void term_print(struct lambda *t, struct lambda *mark)
                putchar('|');
        switch(t->which){
        case lambda_ident:
-               print_ident(t->data.identifier.ident, t->data.identifier.revision);
+               printf("%s", t->data.identifier.ident);
                break;
        case lambda_abs:
                printf("λ");
-               print_ident(t->data.abstraction.ident, t->data.abstraction.revision);
+               PRINT_ABS(t);
                while((t = t->data.abstraction.expr)->which == lambda_abs){
                        putchar(' ');
-                       print_ident(t->data.abstraction.ident, t->data.abstraction.revision);
+                       PRINT_ABS(t);
                }
                putchar('.');
                term_print(t, mark);
@@ -49,10 +35,10 @@ void term_print(struct lambda *t, struct lambda *mark)
 
                putchar(' ');
 
-               if(t->data.application.expr2->which == lambda_app)
+               if(t->data.application.expr2->which == lambda_abs)
                        putchar('(');
                term_print(t->data.application.expr2, mark);
-               if(t->data.application.expr2->which == lambda_app)
+               if(t->data.application.expr2->which == lambda_abs)
                        putchar(')');
                break;
        }