summaryrefslogtreecommitdiffstats
path: root/lib.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2017-04-21 06:56:23 -0700
committerKaz Kylheku <kaz@kylheku.com>2017-04-21 06:56:23 -0700
commit4e647f4d27827d2918e519cb3f52583d2bbb2a59 (patch)
tree4de914375260f4ccfdecef3ce64ec1de3adef575 /lib.c
parent0ba765092f20424828a520d6ccda1c313dab08f0 (diff)
downloadtxr-4e647f4d27827d2918e519cb3f52583d2bbb2a59.tar.gz
txr-4e647f4d27827d2918e519cb3f52583d2bbb2a59.tar.bz2
txr-4e647f4d27827d2918e519cb3f52583d2bbb2a59.zip
Continuing implementation of buffers.
* Makefile (OBJS): New objects itypes.o and buf.o. * buf.c, buf.h: New files. * itypes.c, itypes.h: New files. * lib.c (obj_print_impl): Handle BUF via buf_print and buf_pprint. (init): Call itypes_init and buf_init. * parser.h (end_of_buflit): Declared. * parser.l (BUFLIT): New exclusive state. (grammar): New rules for recognizing start of buffer literal and its interior. (end_of_buflit): New function. * parser.y (HASH_B_QUOTE): New token. (buflit, buflit_items, buflit_item): New nonterminals and corresponding grammar rules. (i_expr, n_expr): These symbols now generate a buflit; a buffer literal is a kind of expression. (yybadtoken): Handle HASH_B_QUOTE case.
Diffstat (limited to 'lib.c')
-rw-r--r--lib.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib.c b/lib.c
index 99e59351..9a594e10 100644
--- a/lib.c
+++ b/lib.c
@@ -67,6 +67,8 @@
#include "termios.h"
#include "cadr.h"
#include "struct.h"
+#include "itypes.h"
+#include "buf.h"
#include "txr.h"
#define max(a, b) ((a) > (b) ? (a) : (b))
@@ -10258,6 +10260,12 @@ dot:
format(out, if3(pretty, lit("#R(~a ~a)"), lit("#R(~s ~s)")),
from(obj), to(obj), nao);
break;
+ case BUF:
+ if (pretty)
+ buf_pprint(obj, out);
+ else
+ buf_print(obj, out);
+ break;
default:
format(out, lit("#<garbage: ~p>"), obj, nao);
break;
@@ -10912,6 +10920,8 @@ void init(mem_t *(*oom)(mem_t *, size_t), val *stack_bottom)
eval_init();
hash_init();
struct_init();
+ itypes_init();
+ buf_init();
sysif_init();
arith_init();
rand_init();