Start adding support for read_term and write_term

1 files changed, 14 insertions, 13 deletions

diff --git a/prettyprint.c b/prettyprint.c
index bb0852a..07db144 100644
--- a/prettyprint.c
+++ b/prettyprint.c
@@ -1,24 +1,25 @@
 #include <u.h>
 #include <libc.h>
+#include <bio.h>
 
 #include "dat.h"
 #include "fns.h"
 
-Rune *prettyprintlist(Term *, Rune *, int);
-Rune *printlist(Term *);
+Rune *prettyprintlist(Term *, Rune *, int, int, int, int);
+Rune *printlist(Term *, int, int, int);
 int islist(Term *);
 
 Rune *
-prettyprint(Term *t)
+prettyprint(Term *t, int quoted, int ignoreops, int numbervars)
 {
 	Rune *result;
 	Rune *args;
 
 	switch(t->tag){
 	case CompoundTerm:
-		args = printlist(t);
+		args = printlist(t, quoted, ignoreops, numbervars);
 		if(args == nil){
-			args = prettyprintlist(t->children, L", ", 0);
+			args = prettyprintlist(t->children, L", ", 0, quoted, ignoreops, numbervars);
 			result = runesmprint("%S(%S)", t->text, args);
 			free(args);
 		}else
@@ -45,7 +46,7 @@ prettyprint(Term *t)
 }
 
 Rune *
-prettyprintlist(Term *t, Rune *sep, int end)
+prettyprintlist(Term *t, Rune *sep, int end, int quoted, int ignoreops, int numbervars)
 {
 	if(t == nil){
 		if(end)
@@ -54,8 +55,8 @@ prettyprintlist(Term *t, Rune *sep, int end)
 			return runesmprint("");
 	}
 
-	Rune *str = prettyprint(t);
-	Rune *rest = prettyprintlist(t->next, sep, end);
+	Rune *str = prettyprint(t, quoted, ignoreops, numbervars);
+	Rune *rest = prettyprintlist(t->next, sep, end, quoted, ignoreops, numbervars);
 	Rune *result;
 
 	if(t->next != nil)
@@ -70,7 +71,7 @@ prettyprintlist(Term *t, Rune *sep, int end)
 
 /* printlist prints a list's elements but not the surrounding [ and ] */
 Rune *
-printlist(Term *list)
+printlist(Term *list, int quoted, int ignoreops, int numbervars)
 {
 	if(list->tag != CompoundTerm || list->arity != 2 || runestrcmp(L".", list->text) != 0)
 		return nil;
@@ -78,20 +79,20 @@ printlist(Term *list)
 	Term *head = list->children;
 	Term *tail = head->next;
 
-	Rune *headstr = prettyprint(head);
+	Rune *headstr = prettyprint(head, quoted, ignoreops, numbervars);
 	Rune *tailstr = nil;
 	Rune *result;
 
 	if(tail->tag == CompoundTerm && tail->arity == 2 && runestrcmp(L".", tail->text) == 0){
-		tailstr = printlist(tail);
+		tailstr = printlist(tail, quoted, ignoreops, numbervars);
 		result = runesmprint("%S, %S", headstr, tailstr);
 	}else if(tail->tag == AtomTerm && runestrcmp(L"[]", tail->text) == 0){
 		result = runesmprint("%S", headstr);
 	}else{
-		tailstr = prettyprint(tail);
+		tailstr = prettyprint(tail, quoted, ignoreops, numbervars);
 		result = runesmprint("%S | %S", headstr, tailstr);
 	}
 	free(headstr);
 	free(tailstr);
 	return result;
-}
\ No newline at end of file
+}