Browse Source

Fix easier acid compile errors

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 5 years ago
parent
commit
caa090f948

+ 7 - 7
sys/src/cmd/acid/acid.h

@@ -63,7 +63,7 @@ Extern int	initialising;
 Extern int	quiet;
 
 extern void	(*expop[])(Node*, Node*);
-#define expr(n, r) (r)->comt=0; (*expop[(n)->op])(n, r);
+#define expr(n, r) (r)->store.comt=0; (*expop[(n)->op])(n, r);
 extern int	fmtsize(Value *v) ;
 
 enum
@@ -130,17 +130,17 @@ struct Store
 
 struct List
 {
-	Gc;
+	Gc	gc;
 	List*	next;
 	char	type;
-	Store;
+	Store	store;
 };
 
 struct Value
 {
 	char	set;
 	char	type;
-	Store;
+	Store	store;
 	Value*	pop;
 	Lsym*	scope;
 	Rplace*	ret;
@@ -160,20 +160,20 @@ struct Lsym
 
 struct Node
 {
-	Gc;
+	Gc	gc;
 	uint8_t	op;
 	char	type;
 	Node*	left;
 	Node*	right;
 	Lsym*	sym;
 	int	builtin;
-	Store;
+	Store	store;
 };
 #define ZN	(Node*)0
 
 struct String
 {
-	Gc;
+	Gc	gc;
 	char	*string;
 	int	len;
 };

+ 2 - 2
sys/src/cmd/acid/acid.json

@@ -1,7 +1,7 @@
 [
 	{
 		"Name": "acid",
-		"CFlags": [
+		"#CFlags": [
 			"-fplan9-extensions"
 		],
 		"Include": [
@@ -26,4 +26,4 @@
 			"y.tab.c"
 		]
 	}
-]
+]

+ 173 - 172
sys/src/cmd/acid/builtin.c

@@ -36,6 +36,7 @@ void	startstop(Node*, Node*);
 void	match(Node*, Node*);
 void	status(Node*, Node*);
 void	kill(Node*,Node*);
+void	dosysr0(Node*, Node*);
 void	waitstop(Node*, Node*);
 void	stop(Node*, Node*);
 void	start(Node*, Node*);
@@ -59,41 +60,41 @@ struct Btab
 	void	(*fn)(Node*, Node*);
 } tab[] =
 {
-	"atof",		cvtatof,
-	"atoi",		cvtatoi,
-	"error",	doerror,
-	"file",		getfile,
-	"readfile",	readfile,
-	"access",	doaccess,
-	"filepc",	filepc,
-	"fnbound",	funcbound,
-	"fmt",		fmt,
-	"follow",	follow,
-	"itoa",		cvtitoa,
-	"kill",		kill,
-	"match",	match,
-	"newproc",	newproc,
-	"pcfile",	pcfile,
-	"pcline",	pcline,
-	"print",	bprint,
-	"printto",	printto,
-	"rc",		rc,
-	"reason",	reason,
-	"setproc",	setproc,
-	"start",	start,
-	"startstop",	startstop,
-	"status",	status,
-	"stop",		stop,
-	"strace",	strace,
-	"sysr0",	dosysr0,
-	"waitstop",	waitstop,
-	"map",		map,
-	"interpret",	interpret,
-	"include",	include,
-	"regexp",	regexp,
-	"fmtof",	fmtof,
-	"fmtsize",	dofmtsize,
-	0
+	{ "atof",	cvtatof, },
+	{ "atoi",	cvtatoi, },
+	{ "error",	doerror, },
+	{ "file",	getfile, },
+	{ "readfile",	readfile, },
+	{ "access",	doaccess, },
+	{ "filepc",	filepc, },
+	{ "fnbound",	funcbound, },
+	{ "fmt",	fmt, },
+	{ "follow",	follow, },
+	{ "itoa",	cvtitoa, },
+	{ "kill",	kill, },
+	{ "match",	match, },
+	{ "newproc",	newproc, },
+	{ "pcfile",	pcfile, },
+	{ "pcline",	pcline, },
+	{ "print",	bprint, },
+	{ "printto",	printto, },
+	{ "rc",		rc, },
+	{ "reason",	reason, },
+	{ "setproc",	setproc, },
+	{ "start",	start, },
+	{ "startstop",	startstop, },
+	{ "status",	status, },
+	{ "stop",	stop, },
+	{ "strace",	strace, },
+	{ "sysr0",	dosysr0, },
+	{ "waitstop",	waitstop, },
+	{ "map",	map, },
+	{ "interpret",	interpret, },
+	{ "include",	include, },
+	{ "regexp",	regexp, },
+	{ "fmtof",	fmtof, },
+	{ "fmtsize",	dofmtsize, },
+	{ 0 },
 };
 
 char vfmt[] = "aBbcCdDfFgGiIoOqQrRsSuUVWxXYZ38";
@@ -135,7 +136,7 @@ dosysr0(Node *r, Node*_)
 
 	r->op = OCONST;
 	r->type = TINT;
-	r->fmt = 'D';
+	r->store.fmt = 'D';
 	fprint(2, "Thank Giacomo -- no sysr1 -- we'll bring it back\n");
 	//r->ival = sysr1();
 }
@@ -160,28 +161,28 @@ match(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TINT;
-	r->fmt = 'D';
-	r->ival = -1;
+	r->store.fmt = 'D';
+	r->store.ival = -1;
 
 	i = 0;
-	for(f = resl.l; f; f = f->next) {
+	for(f = resl.store.l; f; f = f->next) {
 		if(resi.type == f->type) {
 			switch(resi.type) {
 			case TINT:
-				if(resi.ival == f->ival) {
-					r->ival = i;
+				if(resi.store.ival == f->store.ival) {
+					r->store.ival = i;
 					return;
 				}
 				break;
 			case TFLOAT:
-				if(resi.fval == f->fval) {
-					r->ival = i;
+				if(resi.store.fval == f->store.fval) {
+					r->store.ival = i;
 					return;
 				}
 				break;
 			case TSTRING:
-				if(scmp(resi.string, f->string)) {
-					r->ival = i;
+				if(scmp(resi.store.string, f->store.string)) {
+					r->store.ival = i;
 					return;
 				}
 				break;
@@ -208,12 +209,12 @@ newproc(Node *r, Node *args)
 		expr(args, &res);
 		if(res.type != TSTRING)
 			error("newproc(): arg not string");
-		if(res.string->len >= sizeof(buf))
+		if(res.store.string->len >= sizeof(buf))
 			error("newproc(): too many arguments");
-		memmove(buf, res.string->string, res.string->len);
-		buf[res.string->len] = '\0';
+		memmove(buf, res.store.string->string, res.store.string->len);
+		buf[res.store.string->len] = '\0';
 		p = buf;
-		e = buf+res.string->len;
+		e = buf+res.store.string->len;
 		for(;;) {
 			while(p < e && (*p == '\t' || *p == ' '))
 				*p++ = '\0';
@@ -229,8 +230,8 @@ newproc(Node *r, Node *args)
 	argv[i] = 0;
 	r->op = OCONST;
 	r->type = TINT;
-	r->fmt = 'D';
-	r->ival = nproc(argv);
+	r->store.fmt = 'D';
+	r->store.ival = nproc(argv);
 }
 
 void
@@ -245,9 +246,9 @@ startstop(Node *r, Node *args)
 	if(res.type != TINT)
 		error("startstop(pid): arg type");
 
-	msg(res.ival, "startstop");
-	notes(res.ival);
-	dostop(res.ival);
+	msg(res.store.ival, "startstop");
+	notes(res.store.ival);
+	dostop(res.store.ival);
 }
 
 void
@@ -263,9 +264,9 @@ waitstop(Node *r, Node *args)
 		error("waitstop(pid): arg type");
 
 	Bflush(bout);
-	msg(res.ival, "waitstop");
-	notes(res.ival);
-	dostop(res.ival);
+	msg(res.store.ival, "waitstop");
+	notes(res.store.ival);
+	dostop(res.store.ival);
 }
 
 void
@@ -280,7 +281,7 @@ start(Node *r, Node *args)
 	if(res.type != TINT)
 		error("start(pid): arg type");
 
-	msg(res.ival, "start");
+	msg(res.store.ival, "start");
 }
 
 void
@@ -296,9 +297,9 @@ stop(Node *r, Node *args)
 		error("stop(pid): arg type");
 
 	Bflush(bout);
-	msg(res.ival, "stop");
-	notes(res.ival);
-	dostop(res.ival);
+	msg(res.store.ival, "stop");
+	notes(res.store.ival);
+	dostop(res.store.ival);
 }
 
 void
@@ -313,8 +314,8 @@ kill(Node *r, Node *args)
 	if(res.type != TINT)
 		error("kill(pid): arg type");
 
-	msg(res.ival, "kill");
-	deinstall(res.ival);
+	msg(res.store.ival, "kill");
+	deinstall(res.store.ival);
 }
 
 void
@@ -330,10 +331,10 @@ status(Node *r, Node *args)
 	if(res.type != TINT)
 		error("status(pid): arg type");
 
-	p = getstatus(res.ival);
-	r->string = strnode(p);
+	p = getstatus(res.store.ival);
+	r->store.string = strnode(p);
 	r->op = OCONST;
-	r->fmt = 's';
+	r->store.fmt = 's';
 	r->type = TSTRING;
 }
 
@@ -350,8 +351,8 @@ reason(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TSTRING;
-	r->fmt = 's';
-	r->string = strnode((*machdata->excep)(cormap, rget));
+	r->store.fmt = 's';
+	r->store.string = strnode((*machdata->excep)(cormap, rget));
 }
 
 void
@@ -368,14 +369,14 @@ follow(Node *r, Node *args)
 	if(res.type != TINT)
 		error("follow(addr): arg type");
 
-	n = (*machdata->foll)(cormap, res.ival, rget, f);
+	n = (*machdata->foll)(cormap, res.store.ival, rget, f);
 	if (n < 0)
 		error("follow(addr): %r");
-	tail = &r->l;
+	tail = &r->store.l;
 	for(i = 0; i < n; i++) {
 		l = al(TINT);
-		l->ival = f[i];
-		l->fmt = 'X';
+		l->store.ival = f[i];
+		l->store.fmt = 'X';
 		*tail = l;
 		tail = &l->next;
 	}
@@ -395,16 +396,16 @@ funcbound(Node *r, Node *args)
 	if(res.type != TINT)
 		error("fnbound(addr): arg type");
 
-	n = fnbound(res.ival, bounds);
+	n = fnbound(res.store.ival, bounds);
 	if (n != 0) {
-		r->l = al(TINT);
-		l = r->l;
-		l->ival = bounds[0];
-		l->fmt = 'X';
+		r->store.l = al(TINT);
+		l = r->store.l;
+		l->store.ival = bounds[0];
+		l->store.fmt = 'X';
 		l->next = al(TINT);
 		l = l->next;
-		l->ival = bounds[1];
-		l->fmt = 'X';
+		l->store.ival = bounds[1];
+		l->store.fmt = 'X';
 	}
 }
 
@@ -420,7 +421,7 @@ setproc(Node *r, Node *args)
 	if(res.type != TINT)
 		error("setproc(pid): arg type");
 
-	sproc(res.ival);
+	sproc(res.store.ival);
 }
 
 void
@@ -435,20 +436,20 @@ filepc(Node *r, Node *args)
 	if(res.type != TSTRING)
 		error("filepc(filename:line): arg type");
 
-	p = strchr(res.string->string, ':');
+	p = strchr(res.store.string->string, ':');
 	if(p == 0)
 		error("filepc(filename:line): bad arg format");
 
 	c = *p;
 	*p++ = '\0';
-	r->ival = file2pc(res.string->string, strtol(p, 0, 0));
+	r->store.ival = file2pc(res.store.string->string, strtol(p, 0, 0));
 	p[-1] = c;
-	if(r->ival == ~0)
+	if(r->store.ival == ~0)
 		error("filepc(filename:line): can't find address");
 
 	r->op = OCONST;
 	r->type = TINT;
-	r->fmt = 'V';
+	r->store.fmt = 'V';
 }
 
 void
@@ -467,12 +468,12 @@ interpret(Node *r, Node *args)
 
 	isave = interactive;
 	interactive = 0;
-	r->ival = yyparse();
+	r->store.ival = yyparse();
 	interactive = isave;
 	popio();
 	r->op = OCONST;
 	r->type = TINT;
-	r->fmt = 'D';
+	r->store.fmt = 'D';
 }
 
 void
@@ -487,16 +488,16 @@ include(Node *r, Node *args)
 	if(res.type != TSTRING)
 		error("include(string): arg type");
 
-	pushfile(res.string->string);
+	pushfile(res.store.string->string);
 
 	isave = interactive;
 	interactive = 0;
-	r->ival = yyparse();
+	r->store.ival = yyparse();
 	interactive = isave;
 	popio();
 	r->op = OCONST;
 	r->type = TINT;
-	r->fmt = 'D';
+	r->store.fmt = 'D';
 }
 
 void
@@ -516,7 +517,7 @@ rc(Node *r, Node *args)
 
 	argv[0] = "/bin/rc";
 	argv[1] = "-c";
-	argv[2] = res.string->string;
+	argv[2] = res.store.string->string;
 	argv[3] = 0;
 
 	pid = fork();
@@ -537,9 +538,9 @@ rc(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TSTRING;
-	r->string = strnode(p);
+	r->store.string = strnode(p);
 	free(w);
-	r->fmt = 's';
+	r->store.fmt = 's';
 }
 
 void
@@ -554,7 +555,7 @@ doerror(Node *r, Node *args)
 	if(res.type != TSTRING)
 		error("error(string): arg type");
 
-	error(res.string->string);
+	error(res.store.string->string);
 }
 
 void
@@ -570,9 +571,9 @@ doaccess(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TINT;
-	r->ival = 0;
-	if(access(res.string->string, 4) == 0)
-		r->ival = 1;
+	r->store.ival = 0;
+	if(access(res.store.string->string, 4) == 0)
+		r->store.ival = 1;
 }
 
 void
@@ -589,7 +590,7 @@ readfile(Node *r, Node *args)
 	if(res.type != TSTRING)
 		error("readfile(filename): arg type");
 
-	fd = open(res.string->string, OREAD);
+	fd = open(res.store.string->string, OREAD);
 	if(fd < 0)
 		return;
 
@@ -606,8 +607,8 @@ readfile(Node *r, Node *args)
 	if(n > 0) {
 		r->op = OCONST;
 		r->type = TSTRING;
-		r->string = strnodlen(buf, n);
-		r->fmt = 's';
+		r->store.string = strnodlen(buf, n);
+		r->store.fmt = 's';
 	}
 	free(buf);
 	close(fd);
@@ -631,14 +632,14 @@ getfile(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TLIST;
-	r->l = 0;
+	r->store.l = 0;
 
-	p = res.string->string;
+	p = res.store.string->string;
 	bp = Bopen(p, OREAD);
 	if(bp == 0)
 		return;
 
-	l = &r->l;
+	l = &r->store.l;
 	for(;;) {
 		p = Brdline(bp, '\n');
 		n = Blinelen(bp);
@@ -652,8 +653,8 @@ getfile(Node *r, Node *args)
 			s = strnodlen(p, n-1);
 
 		new = al(TSTRING);
-		new->string = s;
-		new->fmt = 's';
+		new->store.string = s;
+		new->store.fmt = 's';
 		*l = new;
 		l = &new->next;
 	}
@@ -673,8 +674,8 @@ cvtatof(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TFLOAT;
-	r->fval = atof(res.string->string);
-	r->fmt = 'f';
+	r->store.fval = atof(res.store.string->string);
+	r->store.fmt = 'f';
 }
 
 void
@@ -690,8 +691,8 @@ cvtatoi(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TINT;
-	r->ival = strtoull(res.string->string, 0, 0);
-	r->fmt = 'V';
+	r->store.ival = strtoull(res.store.string->string, 0, 0);
+	r->store.fmt = 'V';
 }
 
 static char *fmtflags = "-0123456789. #,u";
@@ -758,21 +759,21 @@ err:
 	expr(av[0], &res);
 	if(res.type != TINT)
 		error("itoa(number [, fmt]): arg type");
-	ival = res.ival;
+	ival = res.store.ival;
 	strncpy(fmt, "%lld", sizeof(fmt));
 	if(na == 2){
 		expr(av[1], &res);
 		if(res.type != TSTRING)
 			error("itoa(number [, fmt]): fmt type");
-		if(acidfmt(res.string->string, fmt, sizeof(buf)))
+		if(acidfmt(res.store.string->string, fmt, sizeof(buf)))
 			error("itoa(number [, fmt]): malformed fmt");
 	}
 
 	snprint(buf, sizeof(buf), fmt, ival);
 	r->op = OCONST;
 	r->type = TSTRING;
-	r->string = strnode(buf);
-	r->fmt = 's';
+	r->store.string = strnode(buf);
+	r->store.fmt = 's';
 }
 
 List*
@@ -788,23 +789,23 @@ mapent(Map *m)
 			continue;
 		l = al(TSTRING);
 		n = al(TLIST);
-		n->l = l;
+		n->store.l = l;
 		*t = n;
 		t = &n->next;
-		l->string = strnode(m->seg[i].name);
-		l->fmt = 's';
+		l->store.string = strnode(m->seg[i].name);
+		l->store.fmt = 's';
 		l->next = al(TINT);
 		l = l->next;
-		l->ival = m->seg[i].b;
-		l->fmt = 'W';
+		l->store.ival = m->seg[i].b;
+		l->store.fmt = 'W';
 		l->next = al(TINT);
 		l = l->next;
-		l->ival = m->seg[i].e;
-		l->fmt = 'W';
+		l->store.ival = m->seg[i].e;
+		l->store.fmt = 'W';
 		l->next = al(TINT);
 		l = l->next;
-		l->ival = m->seg[i].f;
-		l->fmt = 'W';
+		l->store.ival = m->seg[i].f;
+		l->store.fmt = 'W';
 	}
 	return h;
 }
@@ -825,13 +826,13 @@ map(Node *r, Node *args)
 		expr(av[0], &res);
 		if(res.type != TLIST)
 			error("map(list): map needs a list");
-		if(listlen(res.l) != 4)
+		if(listlen(res.store.l) != 4)
 			error("map(list): list must have 4 entries");
 
-		l = res.l;
+		l = res.store.l;
 		if(l->type != TSTRING)
 			error("map name must be a string");
-		ent = l->string->string;
+		ent = l->store.string->string;
 		m = symmap;
 		i = findseg(m, ent);
 		if(i < 0) {
@@ -843,28 +844,28 @@ map(Node *r, Node *args)
 		l = l->next;
 		if(l->type != TINT)
 			error("map entry not int");
-		m->seg[i].b = l->ival;
+		m->seg[i].b = l->store.ival;
 		if (strcmp(ent, "text") == 0)
-			textseg(l->ival, &fhdr);
+			textseg(l->store.ival, &fhdr);
 		l = l->next;
 		if(l->type != TINT)
 			error("map entry not int");
-		m->seg[i].e = l->ival;
+		m->seg[i].e = l->store.ival;
 		l = l->next;
 		if(l->type != TINT)
 			error("map entry not int");
-		m->seg[i].f = l->ival;
+		m->seg[i].f = l->store.ival;
 	}
 
 	r->type = TLIST;
-	r->l = 0;
+	r->store.l = 0;
 	if(symmap)
-		r->l = mapent(symmap);
+		r->store.l = mapent(symmap);
 	if(cormap) {
-		if(r->l == 0)
-			r->l = mapent(cormap);
+		if(r->store.l == 0)
+			r->store.l = mapent(cormap);
 		else {
-			for(l = r->l; l->next; l = l->next)
+			for(l = r->store.l; l->next; l = l->next)
 				;
 			l->next = mapent(cormap);
 		}
@@ -905,13 +906,13 @@ strace(Node *r, Node *args)
 	expr(n, &res);
 	if(res.type != TINT)
 		error("strace(pc, sp, link): pc bad type");
-	pc = res.ival;
+	pc = res.store.ival;
 
 	n = av[1];
 	expr(n, &res);
 	if(res.type != TINT)
 		error("strace(pc, sp, link): sp bad type");
-	sp = res.ival;
+	sp = res.store.ival;
 
 	n = av[2];
 	expr(n, &res);
@@ -919,10 +920,10 @@ strace(Node *r, Node *args)
 		error("strace(pc, sp, link): link bad type");
 
 	tracelist = 0;
-	if ((*machdata->ctrace)(cormap, pc, sp, res.ival, trlist) <= 0)
+	if ((*machdata->ctrace)(cormap, pc, sp, res.store.ival, trlist) <= 0)
 		error("no stack frame: %r");
 	r->type = TLIST;
-	r->l = tracelist;
+	r->store.l = tracelist;
 }
 
 void
@@ -945,7 +946,7 @@ regexp(Node *r, Node *args)
 	expr(av[0], &res);
 	if(res.type != TSTRING)
 		error("regexp(pattern, string): pattern must be string");
-	rp = regcomp(res.string->string);
+	rp = regcomp(res.store.string->string);
 	if(rp == 0)
 		return;
 
@@ -953,9 +954,9 @@ regexp(Node *r, Node *args)
 	if(res.type != TSTRING)
 		error("regexp(pattern, string): bad string");
 
-	r->fmt = 'D';
+	r->store.fmt = 'D';
 	r->type = TINT;
-	r->ival = regexec(rp, res.string->string, 0, 0);
+	r->store.ival = regexec(rp, res.store.string->string, 0, 0);
 	free(rp);
 }
 
@@ -970,10 +971,10 @@ fmt(Node *r, Node *args)
 	if(na != 2)
 		error("fmt(obj, fmt): arg count");
 	expr(av[1], &res);
-	if(res.type != TINT || strchr(vfmt, res.ival) == 0)
-		error("fmt(obj, fmt): bad format '%c'", (char)res.ival);
+	if(res.type != TINT || strchr(vfmt, res.store.ival) == 0)
+		error("fmt(obj, fmt): bad format '%c'", (char)res.store.ival);
 	expr(av[0], r);
-	r->fmt = res.ival;
+	r->store.fmt = res.store.ival;
 }
 
 void
@@ -1100,18 +1101,18 @@ blprint(List *l)
 	while(l) {
 		switch(l->type) {
 		default:
-			patom(l->type, &l->Store);
+			patom(l->type, &l->store);
 			break;
 		case TSTRING:
 			Bputc(bout, '"');
-			patom(l->type, &l->Store);
+			patom(l->type, &l->store);
 			Bputc(bout, '"');
 			break;
 		case TLIST:
-			blprint(l->l);
+			blprint(l->store.l);
 			break;
 		case TCODE:
-			pcode(l->cc, 0);
+			pcode(l->store.cc, 0);
 			break;
 		}
 		l = l->next;
@@ -1127,13 +1128,13 @@ comx(Node res)
 	Lsym *sl;
 	Node *n, xx;
 
-	if(res.fmt != 'a' && res.fmt != 'A')
+	if(res.store.fmt != 'a' && res.store.fmt != 'A')
 		return 0;
 
-	if(res.comt == 0 || res.comt->base == 0)
+	if(res.store.comt == 0 || res.store.comt->base == 0)
 		return 0;
 
-	sl = res.comt->base;
+	sl = res.store.comt->base;
 	if(sl->proc) {
 		res.left = ZN;
 		res.right = ZN;
@@ -1164,13 +1165,13 @@ bprint(Node *r, Node *args)
 		default:
 			if(comx(res))
 				break;
-			patom(res.type, &res.Store);
+			patom(res.type, &res.store);
 			break;
 		case TCODE:
-			pcode(res.cc, 0);
+			pcode(res.store.cc, 0);
 			break;
 		case TLIST:
-			blprint(res.l);
+			blprint(res.store.l);
 			break;
 		}
 	}
@@ -1195,11 +1196,11 @@ printto(Node *r, Node *args)
 	if(res.type != TSTRING)
 		error("printto(string, ...): need string");
 
-	fd = create(res.string->string, OWRITE, 0666);
+	fd = create(res.store.string->string, OWRITE, 0666);
 	if(fd < 0)
-		fd = open(res.string->string, OWRITE);
+		fd = open(res.store.string->string, OWRITE);
 	if(fd < 0)
-		error("printto: open %s: %r", res.string->string);
+		error("printto: open %s: %r", res.store.string->string);
 
 	b = gmalloc(sizeof(Biobuf));
 	Binit(b, fd, OWRITE);
@@ -1214,10 +1215,10 @@ printto(Node *r, Node *args)
 		default:
 			if(comx(res))
 				break;
-			patom(res.type, &res.Store);
+			patom(res.type, &res.store);
 			break;
 		case TLIST:
-			blprint(res.l);
+			blprint(res.store.l);
 			break;
 		}
 	}
@@ -1243,16 +1244,16 @@ pcfile(Node *r, Node *args)
 		error("pcfile(addr): arg type");
 
 	r->type = TSTRING;
-	r->fmt = 's';
-	if(fileline(buf, sizeof(buf), res.ival) == 0) {
-		r->string = strnode("?file?");
+	r->store.fmt = 's';
+	if(fileline(buf, sizeof(buf), res.store.ival) == 0) {
+		r->store.string = strnode("?file?");
 		return;
 	}
 	p = strrchr(buf, ':');
 	if(p == 0)
 		error("pcfile(addr): funny file %s", buf);
 	*p = '\0';
-	r->string = strnode(buf);
+	r->store.string = strnode(buf);
 }
 
 void
@@ -1268,16 +1269,16 @@ pcline(Node *r, Node *args)
 		error("pcline(addr): arg type");
 
 	r->type = TINT;
-	r->fmt = 'D';
-	if(fileline(buf, sizeof(buf), res.ival) == 0) {
-		r->ival = 0;
+	r->store.fmt = 'D';
+	if(fileline(buf, sizeof(buf), res.store.ival) == 0) {
+		r->store.ival = 0;
 		return;
 	}
 
 	p = strrchr(buf, ':');
 	if(p == 0)
 		error("pcline(addr): funny file %s", buf);
-	r->ival = strtol(p+1, 0, 0);
+	r->store.ival = strtol(p+1, 0, 0);
 }
 
 void fmtof(Node *r, Node *args)
@@ -1295,8 +1296,8 @@ void fmtof(Node *r, Node *args)
 
 	r->op = OCONST;
 	r->type = TINT ;
-	r->ival = res.fmt ;
-	r->fmt = 'c';
+	r->store.ival = res.store.fmt ;
+	r->store.fmt = 'c';
 }
 
 void dofmtsize(Node *r, Node *args)
@@ -1315,11 +1316,11 @@ void dofmtsize(Node *r, Node *args)
 	expr(av[0], &res);
 
 	v.type = res.type ;
-	s = &v.Store ;
-	*s = res.Store ;
+	s = &v.store ;
+	*s = res.store ;
 
 	r->op = OCONST;
 	r->type = TINT ;
-	r->ival = fmtsize(&v) ;
-	r->fmt = 'D';
+	r->store.ival = fmtsize(&v) ;
+	r->store.fmt = 'D';
 }

+ 13 - 13
sys/src/cmd/acid/dbg.y

@@ -11,11 +11,11 @@
 
 %union
 {
-	Node	*node;
-	Lsym	*sym;
+	Node		*node;
+	Lsym		*sym;
 	uint64_t	ival;
-	float	fval;
-	String	*string;
+	float		fval;
+	String		*string;
 }
 
 %type <node> expr monexpr term stmnt name args zexpr slist
@@ -93,20 +93,20 @@ mname		: Tid
 
 member		: Tconst Tconst mname ';'
 		{
-			$3->ival = $2;
-			$3->fmt = $1;
+			$3->store.ival = $2;
+			$3->store.fmt = $1;
 			$$ = $3;
 		}
 		| Tconst mname Tconst mname ';'
 		{
-			$4->ival = $3;
-			$4->fmt = $1;
+			$4->store.ival = $3;
+			$4->store.fmt = $1;
 			$4->right = $2;
 			$$ = $4;
 		}
 		| mname Tconst mname ';'
 		{
-			$3->ival = $2;
+			$3->store.ival = $2;
 			$3->left = $1;
 			$$ = $3;
 		}
@@ -376,15 +376,15 @@ term		: '(' expr ')'
 		{
 			$$ = an(OCONST, ZN, ZN);
 			$$->type = TFLOAT;
-			$$->fmt = 'f';
-			$$->fval = $1;
+			$$->store.fmt = 'f';
+			$$->store.fval = $1;
 		}
 		| Tstring
 		{
 			$$ = an(OCONST, ZN, ZN);
 			$$->type = TSTRING;
-			$$->string = $1;
-			$$->fmt = 's';
+			$$->store.string = $1;
+			$$->store.fmt = 's';
 		}
 		| Twhat zname
 		{

+ 10 - 10
sys/src/cmd/acid/dot.c

@@ -44,26 +44,26 @@ odot(Node *n, Node *r)
 		fatal("dodot: no tag");
 
 	expr(n->left, &res);
-	if(res.comt == 0)
+	if(res.store.comt == 0)
 		error("no type specified for (expr).%s", s);
 
 	if(res.type != TINT)
 		error("pointer must be integer for (expr).%s", s);
 
-	t = srch(res.comt, s);
+	t = srch(res.store.comt, s);
 	if(t == 0)
 		error("no tag for (expr).%s", s);
 
 	/* Propagate types */
 	if(t->type)
-		r->comt = t->type->lt;
+		r->store.comt = t->type->lt;
 
-	addr = res.ival+t->offset;
+	addr = res.store.ival+t->offset;
 	if(t->fmt == 'a') {
 		r->op = OCONST;
-		r->fmt = 'a';
+		r->store.fmt = 'a';
 		r->type = TINT;
-		r->ival = addr;
+		r->store.ival = addr;
 	}
 	else
 		indir(cormap, addr, t->fmt, r);
@@ -96,7 +96,7 @@ buildtype(Node *m, int d)
 		t->depth = d;
 		t->tag = m->sym;
 		t->base = base;
-		t->offset = m->ival;
+		t->offset = m->store.ival;
 		if(m->left) {
 			t->type = m->left->sym;
 			t->fmt = 'a';
@@ -105,7 +105,7 @@ buildtype(Node *m, int d)
 			t->type = 0;
 			if(m->right)
 				t->type = m->right->sym;
-			t->fmt = m->fmt;
+			t->fmt = m->store.fmt;
 		}
 
 		*tail = t;
@@ -136,8 +136,8 @@ decl(Node *n)
 	l = n->left;
 	if(l->op == ONAME) {
 		v = l->sym->v;
-		v->comt = type->lt;
-		v->fmt = 'a';
+		v->store.comt = type->lt;
+		v->store.fmt = 'a';
 		return;
 	}
 

+ 40 - 40
sys/src/cmd/acid/exec.c

@@ -93,7 +93,7 @@ execute(Node *n)
 	switch(n->op) {
 	default:
 		expr(n, &res);
-		if(ret || (res.type == TLIST && res.l == 0 && n->op != OADD))
+		if(ret || (res.type == TLIST && res.store.l == 0 && n->op != OADD))
 			break;
 		prnt->right = &res;
 		expr(prnt, &xx);
@@ -154,11 +154,11 @@ execute(Node *n)
 		expr(l->left, &res);
 		if(res.type != TINT)
 			error("loop must have integer start");
-		s = res.ival;
+		s = res.store.ival;
 		expr(l->right, &res);
 		if(res.type != TINT)
 			error("loop must have integer end");
-		e = res.ival;
+		e = res.store.ival;
 		for(i = s; i <= e; i++)
 			execute(r);
 		break;
@@ -175,19 +175,19 @@ bool(Node *n)
 
 	switch(n->type) {
 	case TINT:
-		if(n->ival != 0)
+		if(n->store.ival != 0)
 			true = 1;
 		break;
 	case TFLOAT:
-		if(n->fval != 0.0)
+		if(n->store.fval != 0.0)
 			true = 1;
 		break;
 	case TSTRING:
-		if(n->string->len)
+		if(n->store.string->len)
 			true = 1;
 		break;
 	case TLIST:
-		if(n->l)
+		if(n->store.l)
 			true = 1;
 		break;
 	}
@@ -202,12 +202,12 @@ convflt(Node *r, char *flt)
 	c = flt[0];
 	if(('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')) {
 		r->type = TSTRING;
-		r->fmt = 's';
-		r->string = strnode(flt);
+		r->store.fmt = 's';
+		r->store.string = strnode(flt);
 	}
 	else {
 		r->type = TFLOAT;
-		r->fval = atof(flt);
+		r->store.fval = atof(flt);
 	}
 }
 
@@ -223,7 +223,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 	char buf[512], reg[12];
 
 	r->op = OCONST;
-	r->fmt = fmt;
+	r->store.fmt = fmt;
 	switch(fmt) {
 	default:
 		error("bad pointer format '%c' for *", fmt);
@@ -234,7 +234,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		ret = get1(m, addr, &cval, 1);
 		if (ret < 0)
 			error("indir: %r");
-		r->ival = cval;
+		r->store.ival = cval;
 		break;
 	case 'x':
 	case 'd':
@@ -246,7 +246,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		ret = get2(m, addr, &sval);
 		if (ret < 0)
 			error("indir: %r");
-		r->ival = sval;
+		r->store.ival = sval;
 		break;
 	case 'a':
 	case 'A':
@@ -255,7 +255,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		ret = geta(m, addr, &uvval);
 		if (ret < 0)
 			error("indir: %r");
-		r->ival = uvval;
+		r->store.ival = uvval;
 		break;
 	case 'B':
 	case 'X':
@@ -267,7 +267,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		ret = get4(m, addr, &lval);
 		if (ret < 0)
 			error("indir: %r");
-		r->ival = lval;
+		r->store.ival = lval;
 		break;
 	case 'V':
 	case 'Y':
@@ -276,7 +276,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		ret = get8(m, addr, &uvval);
 		if (ret < 0)
 			error("indir: %r");
-		r->ival = uvval;
+		r->store.ival = uvval;
 		break;
 	case 's':
 		r->type = TSTRING;
@@ -291,7 +291,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		buf[i] = 0;
 		if(i == 0)
 			strcpy(buf, "(null)");
-		r->string = strnode(buf);
+		r->store.string = strnode(buf);
 		break;
 	case 'R':
 		r->type = TSTRING;
@@ -305,15 +305,15 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 		}
 		buf[i++] = 0;
 		buf[i] = 0;
-		r->string = runenode((Rune*)buf);
+		r->store.string = runenode((Rune*)buf);
 		break;
 	case 'i':
 	case 'I':
 		if ((*machdata->das)(m, addr, fmt, buf, sizeof(buf)) < 0)
 			error("indir: %r");
 		r->type = TSTRING;
-		r->fmt = 's';
-		r->string = strnode(buf);
+		r->store.fmt = 's';
+		r->store.string = strnode(buf);
 		break;
 	case 'f':
 		ret = get1(m, addr, (uint8_t*)buf, mach->szfloat);
@@ -328,7 +328,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 			error("indir: %r");
 		machdata->sftos(buf, sizeof(buf), (void*) buf);
 		r->type = TSTRING;
-		r->string = strnode(buf);
+		r->store.string = strnode(buf);
 		break;
 	case 'F':
 		ret = get1(m, addr, (uint8_t*)buf, mach->szdouble);
@@ -359,7 +359,7 @@ indir(Map *m, uint64_t addr, char fmt, Node *r)
 			error("indir: %r");
 		machdata->dftos(buf, sizeof(buf), (void*) buf);
 		r->type = TSTRING;
-		r->string = strnode(buf);
+		r->store.string = strnode(buf);
 		break;
 	}
 }
@@ -386,49 +386,49 @@ windir(Map *m, Node *addr, Node *rval, Node *r)
 		error("not in write mode");
 
 	r->type = res.type;
-	r->fmt = res.fmt;
-	r->Store = res.Store;
+	r->store.fmt = res.store.fmt;
+	r->store = res.store;
 
-	switch(res.fmt) {
+	switch(res.store.fmt) {
 	default:
-		error("bad pointer format '%c' for */@=", res.fmt);
+		error("bad pointer format '%c' for */@=", res.store.fmt);
 	case 'c':
 	case 'C':
 	case 'b':
-		cval = res.ival;
-		ret = put1(m, aes.ival, &cval, 1);
+		cval = res.store.ival;
+		ret = put1(m, aes.store.ival, &cval, 1);
 		break;
 	case 'r':
 	case 'x':
 	case 'd':
 	case 'u':
 	case 'o':
-		sval = res.ival;
-		ret = put2(m, aes.ival, sval);
-		r->ival = sval;
+		sval = res.store.ival;
+		ret = put2(m, aes.store.ival, sval);
+		r->store.ival = sval;
 		break;
 	case 'a':
 	case 'A':
 	case 'W':
-		ret = puta(m, aes.ival, res.ival);
+		ret = puta(m, aes.store.ival, res.store.ival);
 		break;
 	case 'B':
 	case 'X':
 	case 'D':
 	case 'U':
 	case 'O':
-		lval = res.ival;
-		ret = put4(m, aes.ival, lval);
+		lval = res.store.ival;
+		ret = put4(m, aes.store.ival, lval);
 		break;
 	case 'V':
 	case 'Y':
 	case 'Z':
-		ret = put8(m, aes.ival, res.ival);
+		ret = put8(m, aes.store.ival, res.store.ival);
 		break;
 	case 's':
 	case 'R':
-		ret = put1(m, aes.ival, (uint8_t*)res.string->string,
-		           res.string->len);
+		ret = put1(m, aes.store.ival, (uint8_t*)res.store.string->string,
+		           res.store.string->len);
 		break;
 	}
 	if (ret < 0)
@@ -471,9 +471,9 @@ call(char *fn, Node *parameters, Node *local, Node *body, Node *retexp)
 			s = n->sym;
 			break;
 		case OINDM:
-			res.cc = avp[i];
+			res.store.cc = avp[i];
 			res.type = TCODE;
-			res.comt = 0;
+			res.store.comt = 0;
 			if(n->left->op != ONAME)
 				error("%s: %d formal not a name", fn, i);
 			s = n->left->sym;
@@ -490,7 +490,7 @@ call(char *fn, Node *parameters, Node *local, Node *body, Node *retexp)
 		*(rlab.tail) = s;
 		rlab.tail = &v->scope;
 
-		v->Store = res.Store;
+		v->store = res.store;
 		v->type = res.type;
 		v->set = 1;
 	}

+ 135 - 135
sys/src/cmd/acid/expr.c

@@ -54,16 +54,16 @@ fmtsize(Value *v)
 {
 	int ret;
 
-	switch(v->fmt) {
+	switch(v->store.fmt) {
 	default:
-		return  fsize[v->fmt];
+		return  fsize[v->store.fmt];
 	case 'i':
 	case 'I':
 		if(v->type != TINT || machdata == 0)
 			error("no size for i fmt pointer ++/--");
-		ret = (*machdata->instsize)(cormap, v->ival);
+		ret = (*machdata->instsize)(cormap, v->store.ival);
 		if(ret < 0) {
-			ret = (*machdata->instsize)(symmap, v->ival);
+			ret = (*machdata->instsize)(symmap, v->store.ival);
 			if(ret < 0)
 				error("%r");
 		}
@@ -91,7 +91,7 @@ oeval(Node *n, Node *res)
 	expr(n->left, res);
 	if(res->type != TCODE)
 		error("bad type for eval");
-	expr(res->cc, res);
+	expr(res->store.cc, res);
 }
 
 void
@@ -101,8 +101,8 @@ ocast(Node *n, Node *res)
 		error("%s is not a complex type", n->sym->name);
 
 	expr(n->left, res);
-	res->comt = n->sym->lt;
-	res->fmt = 'a';
+	res->store.comt = n->sym->lt;
+	res->store.fmt = 'a';
 }
 
 void
@@ -119,8 +119,8 @@ oindm(Node *n, Node *res)
 		error("bad type for *");
 	if(m == 0)
 		error("no map for *");
-	indir(m, l.ival, l.fmt, res);
-	res->comt = l.comt;
+	indir(m, l.store.ival, l.store.fmt, res);
+	res->store.comt = l.store.comt;
 }
 
 void
@@ -137,8 +137,8 @@ oindc(Node *n, Node *res)
 		error("bad type for @");
 	if(m == 0)
 		error("no map for @");
-	indir(m, l.ival, l.fmt, res);
-	res->comt = l.comt;
+	indir(m, l.store.ival, l.store.fmt, res);
+	res->store.comt = l.store.comt;
 }
 
 void
@@ -156,16 +156,16 @@ oframe(Node *n, Node *res)
 	if(localaddr(cormap, p, lp->sym->name, &ival, rget) < 0)
 		error("colon: %r");
 
-	res->ival = ival;
+	res->store.ival = ival;
 	res->op = OCONST;
-	res->fmt = 'X';
+	res->store.fmt = 'X';
 	res->type = TINT;
 
 	/* Try and set comt */
 	for(f = n->sym->local; f; f = f->next) {
 		if(f->var == lp->sym) {
-			res->comt = f->type;
-			res->fmt = 'a';
+			res->store.comt = f->type;
+			res->store.fmt = 'a';
 			break;
 		}
 	}
@@ -186,23 +186,23 @@ oindex(Node *n, Node *res)
 	default:
 		error("lhs[] has bad type");
 	case TINT:
-		indir(cormap, l.ival+(r.ival*fsize[l.fmt]), l.fmt, res);
-		res->comt = l.comt;
-		res->fmt = l.fmt;
+		indir(cormap, l.store.ival+(r.store.ival*fsize[l.store.fmt]), l.store.fmt, res);
+		res->store.comt = l.store.comt;
+		res->store.fmt = l.store.fmt;
 		break;
 	case TLIST:
-		nthelem(l.l, r.ival, res);
+		nthelem(l.store.l, r.store.ival, res);
 		break;
 	case TSTRING:
-		res->ival = 0;
-		if(r.ival >= 0 && r.ival < l.string->len) {
+		res->store.ival = 0;
+		if(r.store.ival >= 0 && r.store.ival < l.store.string->len) {
 			int xx8;	/* to get around bug in vc */
-			xx8 = r.ival;
-			res->ival = l.string->string[xx8];
+			xx8 = r.store.ival;
+			res->store.ival = l.store.string->string[xx8];
 		}
 		res->op = OCONST;
 		res->type = TINT;
-		res->fmt = 'c';
+		res->store.fmt = 'c';
 		break;
 	}
 }
@@ -218,13 +218,13 @@ oappend(Node *n, Node *res)
 	expr(n->right, &r);
 	if(l.type != TLIST)
 		error("must append to list");
-	empty = (l.l == nil && (n->left->op == ONAME));
+	empty = (l.store.l == nil && (n->left->op == ONAME));
 	append(res, &l, &r);
 	if(empty) {
 		v = n->left->sym->v;
 		v->type = res->type;
-		v->Store = res->Store;
-		v->comt = res->comt;
+		v->store = res->store;
+		v->store.comt = res->store.comt;
 	}
 }
 
@@ -240,7 +240,7 @@ odelete(Node *n, Node *res)
 	if(r.type != TINT)
 		error("delete index must be integer");
 
-	delete(l.l, r.ival, res);
+	delete(l.store.l, r.store.ival, res);
 }
 
 void
@@ -252,13 +252,13 @@ ohead(Node *n, Node *res)
 	if(l.type != TLIST)
 		error("head needs list");
 	res->op = OCONST;
-	if(l.l) {
-		res->type = l.l->type;
-		res->Store = l.l->Store;
+	if(l.store.l) {
+		res->type = l.store.l->type;
+		res->store = l.store.l->store;
 	}
 	else {
 		res->type = TLIST;
-		res->l = 0;
+		res->store.l = 0;
 	}
 }
 
@@ -272,10 +272,10 @@ otail(Node *n, Node *res)
 		error("tail needs list");
 	res->op = OCONST;
 	res->type = TLIST;
-	if(l.l)
-		res->l = l.l->next;
+	if(l.store.l)
+		res->store.l = l.store.l->next;
 	else
-		res->l = 0;
+		res->store.l = 0;
 }
 
 void
@@ -283,8 +283,8 @@ oconst(Node *n, Node *res)
 {
 	res->op = OCONST;
 	res->type = n->type;
-	res->Store = n->Store;
-	res->comt = n->comt;
+	res->store = n->store;
+	res->store.comt = n->store.comt;
 }
 
 void
@@ -297,8 +297,8 @@ oname(Node *n, Node *res)
 		error("%s used but not set", n->sym->name);
 	res->op = OCONST;
 	res->type = v->type;
-	res->Store = v->Store;
-	res->comt = v->comt;
+	res->store = v->store;
+	res->store.comt = v->store.comt;
 }
 
 void
@@ -306,7 +306,7 @@ octruct(Node *n, Node *res)
 {
 	res->op = OCONST;
 	res->type = TLIST;
-	res->l = construct(n->left);
+	res->store.l = construct(n->left);
 }
 
 void
@@ -329,11 +329,11 @@ oasgn(Node *n, Node *res)
 		expr(n->right, &r);
 		v->set = 1;
 		v->type = r.type;
-		v->Store = r.Store;
+		v->store = r.store;
 		res->op = OCONST;
 		res->type = v->type;
-		res->Store = v->Store;
-		res->comt = v->comt;
+		res->store = v->store;
+		res->store.comt = v->store.comt;
 	}
 }
 
@@ -348,7 +348,7 @@ oadd(Node *n, Node *res)
 	}
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TFLOAT;
 	switch(l.type) {
@@ -358,10 +358,10 @@ oadd(Node *n, Node *res)
 		switch(r.type) {
 		case TINT:
 			res->type = TINT;
-			res->ival = l.ival+r.ival;
+			res->store.ival = l.store.ival+r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.ival+r.fval;
+			res->store.fval = l.store.ival+r.store.fval;
 			break;
 		default:
 			error("bad rhs type +");
@@ -370,10 +370,10 @@ oadd(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->fval = l.fval+r.ival;
+			res->store.fval = l.store.fval+r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.fval+r.fval;
+			res->store.fval = l.store.fval+r.store.fval;
 			break;
 		default:
 			error("bad rhs type +");
@@ -382,14 +382,14 @@ oadd(Node *n, Node *res)
 	case TSTRING:
 		if(r.type == TSTRING) {
 			res->type = TSTRING;
-			res->fmt = 's';
-			res->string = stradd(l.string, r.string);
+			res->store.fmt = 's';
+			res->store.string = stradd(l.store.string, r.store.string);
 			break;
 		}
 		if(r.type == TINT) {
 			res->type = TSTRING;
-			res->fmt = 's';
-			res->string = straddrune(l.string, r.ival);
+			res->store.fmt = 's';
+			res->store.string = straddrune(l.store.string, r.store.ival);
 			break;
 		}
 		error("bad rhs for +");
@@ -397,12 +397,12 @@ oadd(Node *n, Node *res)
 		res->type = TLIST;
 		switch(r.type) {
 		case TLIST:
-			res->l = addlist(l.l, r.l);
+			res->store.l = addlist(l.store.l, r.store.l);
 			break;
 		default:
 			r.left = 0;
 			r.right = 0;
-			res->l = addlist(l.l, construct(&r));
+			res->store.l = addlist(l.store.l, construct(&r));
 			break;
 		}
 	}
@@ -415,7 +415,7 @@ osub(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TFLOAT;
 	switch(l.type) {
@@ -425,10 +425,10 @@ osub(Node *n, Node *res)
 		switch(r.type) {
 		case TINT:
 			res->type = TINT;
-			res->ival = l.ival-r.ival;
+			res->store.ival = l.store.ival-r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.ival-r.fval;
+			res->store.fval = l.store.ival-r.store.fval;
 			break;
 		default:
 			error("bad rhs type -");
@@ -437,10 +437,10 @@ osub(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->fval = l.fval-r.ival;
+			res->store.fval = l.store.fval-r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.fval-r.fval;
+			res->store.fval = l.store.fval-r.store.fval;
 			break;
 		default:
 			error("bad rhs type -");
@@ -456,7 +456,7 @@ omul(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TFLOAT;
 	switch(l.type) {
@@ -466,10 +466,10 @@ omul(Node *n, Node *res)
 		switch(r.type) {
 		case TINT:
 			res->type = TINT;
-			res->ival = l.ival*r.ival;
+			res->store.ival = l.store.ival*r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.ival*r.fval;
+			res->store.fval = l.store.ival*r.store.fval;
 			break;
 		default:
 			error("bad rhs type *");
@@ -478,10 +478,10 @@ omul(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->fval = l.fval*r.ival;
+			res->store.fval = l.store.fval*r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.fval*r.fval;
+			res->store.fval = l.store.fval*r.store.fval;
 			break;
 		default:
 			error("bad rhs type *");
@@ -497,7 +497,7 @@ odiv(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TFLOAT;
 	switch(l.type) {
@@ -507,14 +507,14 @@ odiv(Node *n, Node *res)
 		switch(r.type) {
 		case TINT:
 			res->type = TINT;
-			if(r.ival == 0)
+			if(r.store.ival == 0)
 				error("zero divide");
-			res->ival = l.ival/r.ival;
+			res->store.ival = l.store.ival/r.store.ival;
 			break;
 		case TFLOAT:
-			if(r.fval == 0)
+			if(r.store.fval == 0)
 				error("zero divide");
-			res->fval = l.ival/r.fval;
+			res->store.fval = l.store.ival/r.store.fval;
 			break;
 		default:
 			error("bad rhs type /");
@@ -523,10 +523,10 @@ odiv(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->fval = l.fval/r.ival;
+			res->store.fval = l.store.fval/r.store.ival;
 			break;
 		case TFLOAT:
-			res->fval = l.fval/r.fval;
+			res->store.fval = l.store.fval/r.store.fval;
 			break;
 		default:
 			error("bad rhs type /");
@@ -542,12 +542,12 @@ omod(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
 		error("bad expr type %");
-	res->ival = l.ival%r.ival;
+	res->store.ival = l.store.ival%r.store.ival;
 }
 
 void
@@ -557,12 +557,12 @@ olsh(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
 		error("bad expr type <<");
-	res->ival = l.ival<<r.ival;
+	res->store.ival = l.store.ival<<r.store.ival;
 }
 
 void
@@ -572,12 +572,12 @@ orsh(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
 		error("bad expr type >>");
-	res->ival = (uint64_t)l.ival>>r.ival;
+	res->store.ival = (uint64_t)l.store.ival>>r.store.ival;
 }
 
 void
@@ -588,7 +588,7 @@ olt(Node *n, Node *res)
 	expr(n->left, &l);
 	expr(n->right, &r);
 
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	switch(l.type) {
@@ -597,10 +597,10 @@ olt(Node *n, Node *res)
 	case TINT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.ival < r.ival;
+			res->store.ival = l.store.ival < r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.ival < r.fval;
+			res->store.ival = l.store.ival < r.store.fval;
 			break;
 		default:
 			error("bad rhs type <");
@@ -609,10 +609,10 @@ olt(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.fval < r.ival;
+			res->store.ival = l.store.fval < r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.fval < r.fval;
+			res->store.ival = l.store.fval < r.store.fval;
 			break;
 		default:
 			error("bad rhs type <");
@@ -628,7 +628,7 @@ ogt(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = 'D';
+	res->store.fmt = 'D';
 	res->op = OCONST;
 	res->type = TINT;
 	switch(l.type) {
@@ -637,10 +637,10 @@ ogt(Node *n, Node *res)
 	case TINT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.ival > r.ival;
+			res->store.ival = l.store.ival > r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.ival > r.fval;
+			res->store.ival = l.store.ival > r.store.fval;
 			break;
 		default:
 			error("bad rhs type >");
@@ -649,10 +649,10 @@ ogt(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.fval > r.ival;
+			res->store.ival = l.store.fval > r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.fval > r.fval;
+			res->store.ival = l.store.fval > r.store.fval;
 			break;
 		default:
 			error("bad rhs type >");
@@ -668,7 +668,7 @@ oleq(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = 'D';
+	res->store.fmt = 'D';
 	res->op = OCONST;
 	res->type = TINT;
 	switch(l.type) {
@@ -677,10 +677,10 @@ oleq(Node *n, Node *res)
 	case TINT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.ival <= r.ival;
+			res->store.ival = l.store.ival <= r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.ival <= r.fval;
+			res->store.ival = l.store.ival <= r.store.fval;
 			break;
 		default:
 			error("bad expr type <=");
@@ -689,10 +689,10 @@ oleq(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.fval <= r.ival;
+			res->store.ival = l.store.fval <= r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.fval <= r.fval;
+			res->store.ival = l.store.fval <= r.store.fval;
 			break;
 		default:
 			error("bad expr type <=");
@@ -708,7 +708,7 @@ ogeq(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = 'D';
+	res->store.fmt = 'D';
 	res->op = OCONST;
 	res->type = TINT;
 	switch(l.type) {
@@ -717,10 +717,10 @@ ogeq(Node *n, Node *res)
 	case TINT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.ival >= r.ival;
+			res->store.ival = l.store.ival >= r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.ival >= r.fval;
+			res->store.ival = l.store.ival >= r.store.fval;
 			break;
 		default:
 			error("bad rhs type >=");
@@ -729,10 +729,10 @@ ogeq(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.fval >= r.ival;
+			res->store.ival = l.store.fval >= r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.fval >= r.fval;
+			res->store.ival = l.store.fval >= r.store.fval;
 			break;
 		default:
 			error("bad rhs type >=");
@@ -748,20 +748,20 @@ oeq(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = 'D';
+	res->store.fmt = 'D';
 	res->op = OCONST;
 	res->type = TINT;
-	res->ival = 0;
+	res->store.ival = 0;
 	switch(l.type) {
 	default:
 		break;
 	case TINT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.ival == r.ival;
+			res->store.ival = l.store.ival == r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.ival == r.fval;
+			res->store.ival = l.store.ival == r.store.fval;
 			break;
 		default:
 			break;
@@ -770,10 +770,10 @@ oeq(Node *n, Node *res)
 	case TFLOAT:
 		switch(r.type) {
 		case TINT:
-			res->ival = l.fval == r.ival;
+			res->store.ival = l.store.fval == r.store.ival;
 			break;
 		case TFLOAT:
-			res->ival = l.fval == r.fval;
+			res->store.ival = l.store.fval == r.store.fval;
 			break;
 		default:
 			break;
@@ -781,19 +781,19 @@ oeq(Node *n, Node *res)
 		break;
 	case TSTRING:
 		if(r.type == TSTRING) {
-			res->ival = scmp(r.string, l.string);
+			res->store.ival = scmp(r.store.string, l.store.string);
 			break;
 		}
 		break;
 	case TLIST:
 		if(r.type == TLIST) {
-			res->ival = listcmp(l.l, r.l);
+			res->store.ival = listcmp(l.store.l, r.store.l);
 			break;
 		}
 		break;
 	}
 	if(n->op == ONEQ)
-		res->ival = !res->ival;
+		res->store.ival = !res->store.ival;
 }
 
 
@@ -804,12 +804,12 @@ oland(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
 		error("bad expr type &");
-	res->ival = l.ival&r.ival;
+	res->store.ival = l.store.ival&r.store.ival;
 }
 
 void
@@ -819,12 +819,12 @@ oxor(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
 		error("bad expr type ^");
-	res->ival = l.ival^r.ival;
+	res->store.ival = l.store.ival^r.store.ival;
 }
 
 void
@@ -834,12 +834,12 @@ olor(Node *n, Node *res)
 
 	expr(n->left, &l);
 	expr(n->right, &r);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	res->op = OCONST;
 	res->type = TINT;
 	if(l.type != TINT || r.type != TINT)
 		error("bad expr type |");
-	res->ival = l.ival|r.ival;
+	res->store.ival = l.store.ival|r.store.ival;
 }
 
 void
@@ -849,15 +849,15 @@ ocand(Node *n, Node *res)
 
 	res->op = OCONST;
 	res->type = TINT;
-	res->ival = 0;
-	res->fmt = 'D';
+	res->store.ival = 0;
+	res->store.fmt = 'D';
 	expr(n->left, &l);
 	if(bool(&l) == 0)
 		return;
 	expr(n->right, &r);
 	if(bool(&r) == 0)
 		return;
-	res->ival = 1;
+	res->store.ival = 1;
 }
 
 void
@@ -867,11 +867,11 @@ onot(Node *n, Node *res)
 
 	res->op = OCONST;
 	res->type = TINT;
-	res->ival = 0;
+	res->store.ival = 0;
 	expr(n->left, &l);
-	res->fmt = l.fmt;
+	res->store.fmt = l.store.fmt;
 	if(bool(&l) == 0)
-		res->ival = 1;
+		res->store.ival = 1;
 }
 
 void
@@ -881,16 +881,16 @@ ocor(Node *n, Node *res)
 
 	res->op = OCONST;
 	res->type = TINT;
-	res->ival = 0;
-	res->fmt = 'D';
+	res->store.ival = 0;
+	res->store.fmt = 'D';
 	expr(n->left, &l);
 	if(bool(&l)) {
-		res->ival = 1;
+		res->store.ival = 1;
 		return;
 	}
 	expr(n->right, &r);
 	if(bool(&r)) {
-		res->ival = 1;
+		res->store.ival = 1;
 		return;
 	}
 }
@@ -907,20 +907,20 @@ oeinc(Node *n, Node *res)
 	switch(v->type) {
 	case TINT:
 		if(n->op == OEDEC)
-			v->ival -= fmtsize(v);
+			v->store.ival -= fmtsize(v);
 		else
-			v->ival += fmtsize(v);
+			v->store.ival += fmtsize(v);
 		break;
 	case TFLOAT:
 		if(n->op == OEDEC)
-			v->fval--;
+			v->store.fval--;
 		else
-			v->fval++;
+			v->store.fval++;
 		break;
 	default:
 		error("bad type for pre --/++");
 	}
-	res->Store = v->Store;
+	res->store = v->store;
 }
 
 void
@@ -932,19 +932,19 @@ opinc(Node *n, Node *res)
 	v = n->left->sym->v;
 	res->op = OCONST;
 	res->type = v->type;
-	res->Store = v->Store;
+	res->store = v->store;
 	switch(v->type) {
 	case TINT:
 		if(n->op == OPDEC)
-			v->ival -= fmtsize(v);
+			v->store.ival -= fmtsize(v);
 		else
-			v->ival += fmtsize(v);
+			v->store.ival += fmtsize(v);
 		break;
 	case TFLOAT:
 		if(n->op == OPDEC)
-			v->fval--;
+			v->store.fval--;
 		else
-			v->fval++;
+			v->store.fval++;
 		break;
 	default:
 		error("bad type for post --/++");
@@ -959,7 +959,7 @@ ocall(Node *n, Node *res)
 
 	res->op = OCONST;		/* Default return value */
 	res->type = TLIST;
-	res->l = 0;
+	res->store.l = 0;
 
 	chklval(n->left);
 	s = n->left->sym;
@@ -984,7 +984,7 @@ void
 ofmt(Node *n, Node *res)
 {
 	expr(n->left, res);
-	res->fmt = n->right->ival;
+	res->store.fmt = n->right->store.ival;
 }
 
 void
@@ -992,7 +992,7 @@ owhat(Node *n, Node *res)
 {
 	res->op = OCONST;		/* Default return value */
 	res->type = TLIST;
-	res->l = 0;
+	res->store.l = 0;
 	whatis(n->sym);
 }
 

+ 23 - 23
sys/src/cmd/acid/lex.c

@@ -23,27 +23,27 @@ struct keywd
 }
 keywds[] =
 {
-	"do",		Tdo,
-	"if",		Tif,
-	"then",		Tthen,
-	"else",		Telse,
-	"while",	Twhile,
-	"loop",		Tloop,
-	"head",		Thead,
-	"tail",		Ttail,
-	"append",	Tappend,
-	"defn",		Tfn,
-	"return",	Tret,
-	"local",	Tlocal,
-	"aggr",		Tcomplex,
-	"union",	Tcomplex,
-	"adt",		Tcomplex,
-	"complex",	Tcomplex,
-	"delete",	Tdelete,
-	"whatis",	Twhat,
-	"eval",		Teval,
-	"builtin",	Tbuiltin,
-	0,		0
+	{ "do",		Tdo, },
+	{ "if",		Tif, },
+	{ "then",	Tthen, },
+	{ "else",	Telse, },
+	{ "while",	Twhile, },
+	{ "loop",	Tloop, },
+	{ "head",	Thead, },
+	{ "tail",	Ttail, },
+	{ "append",	Tappend, },
+	{ "defn",	Tfn, },
+	{ "return",	Tret, },
+	{ "local",	Tlocal, },
+	{ "aggr",	Tcomplex, },
+	{ "union",	Tcomplex, },
+	{ "adt",	Tcomplex, },
+	{ "complex",	Tcomplex, },
+	{ "delete",	Tdelete, },
+	{ "whatis",	Twhat, },
+	{ "eval",	Teval, },
+	{ "builtin",	Tbuiltin, },
+	{ 0,		0 },
 };
 
 char cmap[256] =
@@ -126,7 +126,7 @@ pushstr(Node *s)
 		fatal("no memory");
 	io->line = line;
 	line = 1;
-	io->text = strdup(s->string->string);
+	io->text = strdup(s->store.string->string);
 	if(io->text == 0)
 		fatal("no memory");
 	io->ip = io->text;
@@ -581,7 +581,7 @@ enter(char *name, int t)
 	v = gmalloc(sizeof(Value));
 	s->v = v;
 
-	v->fmt = 'X';
+	v->store.fmt = 'X';
 	v->type = TINT;
 	memset(v, 0, sizeof(Value));
 

+ 27 - 27
sys/src/cmd/acid/list.c

@@ -61,7 +61,7 @@ build(Node *n)
 	default:
 		expr(n, &res);
 		l = al(res.type);
-		l->Store = res.Store;
+		l->store = res.store;
 		*tail = l;
 		tail = &l->next;
 	}
@@ -88,21 +88,21 @@ append(Node *r, Node *list, Node *val)
 	List *l, *f;
 
 	l = al(val->type);
-	l->Store = val->Store;
+	l->store = val->store;
 	l->next = 0;
 
 	r->op = OCONST;
 	r->type = TLIST;
 
-	if(list->l == 0) {
-		list->l = l;
-		r->l = l;
+	if(list->store.l == 0) {
+		list->store.l = l;
+		r->store.l = l;
 		return;
 	}
-	for(f = list->l; f->next; f = f->next)
+	for(f = list->store.l; f->next; f = f->next)
 		;
 	f->next = l;
-	r->l = list->l;
+	r->store.l = list->store.l;
 }
 
 int
@@ -118,19 +118,19 @@ listcmp(List *l, List *r)
 			return 0;
 		switch(l->type) {
 		case TINT:
-			if(l->ival != r->ival)
+			if(l->store.ival != r->store.ival)
 				return 0;
 			break;
 		case TFLOAT:
-			if(l->fval != r->fval)
+			if(l->store.fval != r->store.fval)
 				return 0;
 			break;
 		case TSTRING:
-			if(scmp(l->string, r->string) == 0)
+			if(scmp(l->store.string, r->store.string) == 0)
 				return 0;
 			break;
 		case TLIST:
-			if(listcmp(l->l, r->l) == 0)
+			if(listcmp(l->store.l, r->store.l) == 0)
 				return 0;
 			break;
 		}
@@ -154,11 +154,11 @@ nthelem(List *l, int n, Node *res)
 	res->op = OCONST;
 	if(l == 0) {
 		res->type = TLIST;
-		res->l = 0;
+		res->store.l = 0;
 		return;
 	}
 	res->type = l->type;
-	res->Store = l->Store;
+	res->store = l->store;
 }
 
 void
@@ -171,9 +171,9 @@ delete(List *l, int n, Node *res)
 
 	res->op = OCONST;
 	res->type = TLIST;
-	res->l = l;
+	res->store.l = l;
 
-	for(tl = &res->l; l && n--; l = l->next)
+	for(tl = &res->store.l; l && n--; l = l->next)
 		tl = &l->next;
 
 	if(l == 0)
@@ -189,13 +189,13 @@ listvar(char *s, int64_t v)
 	tl = al(TLIST);
 
 	l = al(TSTRING);
-	tl->l = l;
-	l->fmt = 's';
-	l->string = strnode(s);
+	tl->store.l = l;
+	l->store.fmt = 's';
+	l->store.string = strnode(s);
 	l->next = al(TINT);
 	l = l->next;
-	l->fmt = 'X';
-	l->ival = v;
+	l->store.fmt = 'X';
+	l->store.ival = v;
 
 	return tl;
 }
@@ -267,20 +267,20 @@ trlist(Map *map, uint64_t pc, uint64_t sp, Symbol *sym)
 	tail = &q->next;
 
 	l = al(TINT);			/* Function address */
-	q->l = l;
-	l->ival = sym->value;
-	l->fmt = 'X';
+	q->store.l = l;
+	l->store.ival = sym->value;
+	l->store.fmt = 'X';
 
 	l->next = al(TINT);		/* called from address */
 	l = l->next;
-	l->ival = pc;
-	l->fmt = 'Y';
+	l->store.ival = pc;
+	l->store.fmt = 'Y';
 
 	l->next = al(TLIST);		/* make list of params */
 	l = l->next;
-	l->l = listparams(map, sym, sp);
+	l->store.l = listparams(map, sym, sp);
 
 	l->next = al(TLIST);		/* make list of locals */
 	l = l->next;
-	l->l = listlocals(map, sym, sp);
+	l->store.l = listlocals(map, sym, sp);
 }

+ 23 - 23
sys/src/cmd/acid/main.c

@@ -199,8 +199,8 @@ die(void)
 
 	s = look("proclist");
 	if(s && s->v->type == TLIST) {
-		for(f = s->v->l; f; f = f->next)
-			Bprint(bout, "echo kill > /proc/%d/ctl\n", (int)f->ival);
+		for(f = s->v->store.l; f; f = f->next)
+			Bprint(bout, "echo kill > /proc/%d/ctl\n", (int)f->store.ival);
 	}
 	exits(0);
 }
@@ -302,24 +302,24 @@ readtext(char *s)
 	if(mach->sbreg && lookup(0, mach->sbreg, &sym)) {
 		mach->sb = sym.value;
 		l = enter("SB", Tid);
-		l->v->fmt = 'X';
-		l->v->ival = mach->sb;
+		l->v->store.fmt = 'X';
+		l->v->store.ival = mach->sb;
 		l->v->type = TINT;
 		l->v->set = 1;
 	}
 
 	l = mkvar("objtype");
 	v = l->v;
-	v->fmt = 's';
+	v->store.fmt = 's';
 	v->set = 1;
-	v->string = strnode(mach->name);
+	v->store.string = strnode(mach->name);
 	v->type = TSTRING;
 
 	l = mkvar("textfile");
 	v = l->v;
-	v->fmt = 's';
+	v->store.fmt = 's';
 	v->set = 1;
-	v->string = strnode(s);
+	v->store.string = strnode(s);
 	v->type = TSTRING;
 
 	machbytype(fhdr.type);
@@ -333,7 +333,7 @@ an(int op, Node *l, Node *r)
 
 	n = gmalloc(sizeof(Node));
 	memset(n, 0, sizeof(Node));
-	n->gclink = gcl;
+	n->gc.gclink = gcl;
 	gcl = n;
 	n->op = op;
 	n->left = l;
@@ -349,7 +349,7 @@ al(int t)
 	l = gmalloc(sizeof(List));
 	memset(l, 0, sizeof(List));
 	l->type = t;
-	l->gclink = gcl;
+	l->gc.gclink = gcl;
 	gcl = l;
 	return l;
 }
@@ -360,8 +360,8 @@ con(int64_t v)
 	Node *n;
 
 	n = an(OCONST, ZN, ZN);
-	n->ival = v;
-	n->fmt = 'W';
+	n->store.ival = v;
+	n->store.fmt = 'W';
 	n->type = TINT;
 	return n;
 }
@@ -405,19 +405,19 @@ marktree(Node *n)
 	marktree(n->left);
 	marktree(n->right);
 
-	n->gcmark = 1;
+	n->gc.gcmark = 1;
 	if(n->op != OCONST)
 		return;
 
 	switch(n->type) {
 	case TSTRING:
-		n->string->gcmark = 1;
+		n->store.string->gc.gcmark = 1;
 		break;
 	case TLIST:
-		marklist(n->l);
+		marklist(n->store.l);
 		break;
 	case TCODE:
-		marktree(n->cc);
+		marktree(n->store.cc);
 		break;
 	}
 }
@@ -426,16 +426,16 @@ void
 marklist(List *l)
 {
 	while(l) {
-		l->gcmark = 1;
+		l->gc.gcmark = 1;
 		switch(l->type) {
 		case TSTRING:
-			l->string->gcmark = 1;
+			l->store.string->gc.gcmark = 1;
 			break;
 		case TLIST:
-			marklist(l->l);
+			marklist(l->store.l);
 			break;
 		case TCODE:
-			marktree(l->cc);
+			marktree(l->store.cc);
 			break;
 		}
 		l = l->next;
@@ -467,13 +467,13 @@ gc(void)
 			for(v = f->v; v; v = v->pop) {
 				switch(v->type) {
 				case TSTRING:
-					v->string->gcmark = 1;
+					v->store.string->gc.gcmark = 1;
 					break;
 				case TLIST:
-					marklist(v->l);
+					marklist(v->store.l);
 					break;
 				case TCODE:
-					marktree(v->cc);
+					marktree(v->store.cc);
 					break;
 				}
 			}

+ 7 - 7
sys/src/cmd/acid/print.c

@@ -117,9 +117,9 @@ whatis(Lsym *l)
 		t = l->v->type;
 		Bprint(bout, "%s variable", typenames[t]);
 		if(t == TINT || t == TFLOAT)
-			Bprint(bout, " format %c", l->v->fmt);
-		if(l->v->comt)
-			Bprint(bout, " complex %s", l->v->comt->base->name);
+			Bprint(bout, " format %c", l->v->store.fmt);
+		if(l->v->store.comt)
+			Bprint(bout, " complex %s", l->v->store.comt->base->name);
 		Bputc(bout, '\n');
 		def = 1;
 	}
@@ -261,13 +261,13 @@ pexpr(Node *n)
 	case OCONST:
 		switch(n->type) {
 		case TINT:
-			Bprint(bout, "%lld", n->ival);
+			Bprint(bout, "%lld", n->store.ival);
 			break;
 		case TFLOAT:
-			Bprint(bout, "%g", n->fval);
+			Bprint(bout, "%g", n->store.fval);
 			break;
 		case TSTRING:
-			pstr(n->string);
+			pstr(n->store.string);
 			break;
 		case TLIST:
 			break;
@@ -391,7 +391,7 @@ pexpr(Node *n)
 		break;
 	case OFMT:
 		pexpr(l);
-		Bprint(bout, "\\%c", (int)r->ival);
+		Bprint(bout, "\\%c", (int)r->store.ival);
 		break;
 	case OEVAL:
 		Bprint(bout, "eval ");

+ 15 - 15
sys/src/cmd/acid/proc.c

@@ -51,7 +51,7 @@ sproc(int pid)
 	checkqid(symmap->seg[0].fd, pid);
 
 	s = look("pid");
-	s->v->ival = pid;
+	s->v->store.ival = pid;
 
 	nocore();
 	cormap = attachproc(pid, kernel, fcor, &fhdr);
@@ -130,16 +130,16 @@ notes(int pid)
 
 	v->set = 1;
 	v->type = TLIST;
-	v->l = 0;
-	tail = &v->l;
+	v->store.l = 0;
+	tail = &v->store.l;
 	for(;;) {
 		i = read(fd, buf, sizeof(buf));
 		if(i <= 0)
 			break;
 		buf[i] = '\0';
 		l = al(TSTRING);
-		l->string = strnode(buf);
-		l->fmt = 's';
+		l->store.string = strnode(buf);
+		l->store.fmt = 's';
 		*tail = l;
 		tail = &l->next;
 	}
@@ -156,10 +156,10 @@ dostop(int pid)
 	if(s && s->proc) {
 		np = an(ONAME, ZN, ZN);
 		np->sym = s;
-		np->fmt = 'D';
+		np->store.fmt = 'D';
 		np->type = TINT;
 		p = con(pid);
-		p->fmt = 'D';
+		p->store.fmt = 'D';
 		np = an(OCALL, np, p);
 		execute(np);
 	}
@@ -193,10 +193,10 @@ install(int pid)
 
 	s = look("proclist");
 	l = al(TINT);
-	l->fmt = 'D';
-	l->ival = pid;
-	l->next = s->v->l;
-	s->v->l = l;
+	l->store.fmt = 'D';
+	l->store.ival = pid;
+	l->next = s->v->store.l;
+	s->v->store.l = l;
 	s->v->set = 1;
 }
 
@@ -212,16 +212,16 @@ deinstall(int pid)
 			close(ptab[i].ctl);
 			ptab[i].pid = 0;
 			s = look("proclist");
-			d = &s->v->l;
+			d = &s->v->store.l;
 			for(f = *d; f; f = f->next) {
-				if(f->ival == pid) {
+				if(f->store.ival == pid) {
 					*d = f->next;
 					break;
 				}
 			}
 			s = look("pid");
-			if(s->v->ival == pid)
-				s->v->ival = 0;
+			if(s->v->store.ival == pid)
+				s->v->store.ival = 0;
 			return;
 		}
 	}

+ 32 - 32
sys/src/cmd/acid/util.c

@@ -89,30 +89,30 @@ varsym(void)
 
 			l->v->set = 1;
 			l->v->type = TINT;
-			l->v->ival = v;
-			if(l->v->comt == 0)
-				l->v->fmt = 'X';
+			l->v->store.ival = v;
+			if(l->v->store.comt == 0)
+				l->v->store.fmt = 'X';
 
 			/* Enter as list of { name, type, value } */
 			list = al(TSTRING);
-			tl->l = list;
-			list->string = strnode(buf);
-			list->fmt = 's';
+			tl->store.l = list;
+			list->store.string = strnode(buf);
+			list->store.fmt = 's';
 			list->next = al(TINT);
 			list = list->next;
-			list->fmt = 'c';
-			list->ival = s->type;
+			list->store.fmt = 'c';
+			list->store.ival = s->type;
 			list->next = al(TINT);
 			list = list->next;
-			list->fmt = 'X';
-			list->ival = v;
+			list->store.fmt = 'X';
+			list->store.ival = v;
 
 		}
 	}
 	l = mkvar("symbols");
 	l->v->set = 1;
 	l->v->type = TLIST;
-	l->v->l = l2;
+	l->v->store.l = l2;
 	if(l2 == 0)
 		print("no symbol information\n");
 }
@@ -129,20 +129,20 @@ varreg(void)
 	v = l->v;
 	v->set = 1;
 	v->type = TLIST;
-	v->l = 0;
-	tail = &v->l;
+	v->store.l = 0;
+	tail = &v->store.l;
 
 	for(r = mach->reglist; r->rname; r++) {
 		l = mkvar(r->rname);
 		v = l->v;
 		v->set = 1;
-		v->ival = r->roffs;
-		v->fmt = r->rformat;
+		v->store.ival = r->roffs;
+		v->store.fmt = r->rformat;
 		v->type = TINT;
 
 		li = al(TSTRING);
-		li->string = strnode(r->rname);
-		li->fmt = 's';
+		li->store.string = strnode(r->rname);
+		li->store.fmt = 's';
 		*tail = li;
 		tail = &li->next;
 	}
@@ -153,12 +153,12 @@ varreg(void)
 	l = mkvar("bpinst");	/* Breakpoint text */
 	v = l->v;
 	v->type = TSTRING;
-	v->fmt = 's';
+	v->store.fmt = 's';
 	v->set = 1;
-	v->string = gmalloc(sizeof(String));
-	v->string->len = machdata->bpsize;
-	v->string->string = gmalloc(machdata->bpsize);
-	memmove(v->string->string, machdata->bpinst, machdata->bpsize);
+	v->store.string = gmalloc(sizeof(String));
+	v->store.string->len = machdata->bpsize;
+	v->store.string->string = gmalloc(machdata->bpsize);
+	memmove(v->store.string->string, machdata->bpinst, machdata->bpsize);
 }
 
 void
@@ -170,16 +170,16 @@ loadvars(void)
 	l =  mkvar("proc");
 	v = l->v;
 	v->type = TINT;
-	v->fmt = 'X';
+	v->store.fmt = 'X';
 	v->set = 1;
-	v->ival = 0;
+	v->store.ival = 0;
 
 	l = mkvar("pid");		/* Current process */
 	v = l->v;
 	v->type = TINT;
-	v->fmt = 'D';
+	v->store.fmt = 'D';
 	v->set = 1;
-	v->ival = 0;
+	v->store.ival = 0;
 
 	mkvar("notes");			/* Pending notes */
 
@@ -199,16 +199,16 @@ rget(Map *map, char *reg)
 	if(s == 0)
 		fatal("rget: %s\n", reg);
 
-	switch(s->v->fmt){
+	switch(s->v->store.fmt){
 	default:
-		ret = get4(map, s->v->ival, &x);
+		ret = get4(map, s->v->store.ival, &x);
 		v = x;
 		break;
 	case 'V':
 	case 'W':
 	case 'Y':
 	case 'Z':
-		ret = get8(map, s->v->ival, &v);
+		ret = get8(map, s->v->store.ival, &v);
 		break;
 	}
 	if(ret < 0)
@@ -228,7 +228,7 @@ strnodlen(char *name, int len)
 		memmove(s->string, name, len);
 	s->string[len] = '\0';
 
-	s->gclink = gcl;
+	s->gc.gclink = gcl;
 	gcl = s;
 
 	return s;
@@ -258,7 +258,7 @@ runenode(Rune *name)
 	s->len = len;
 	memmove(s->string, name, len);
 
-	s->gclink = gcl;
+	s->gc.gclink = gcl;
 	gcl = s;
 
 	return s;
@@ -272,7 +272,7 @@ stradd(String *l, String *r)
 
 	len = l->len+r->len;
 	s = gmalloc(sizeof(String)+len+1);
-	s->gclink = gcl;
+	s->gc.gclink = gcl;
 	gcl = s;
 	s->len = len;
 	s->string = (char*)s+sizeof(String);

+ 2345 - 0
sys/src/cmd/acid/y.tab.c

@@ -0,0 +1,2345 @@
+/* A Bison parser, made by GNU Bison 3.0.5.  */
+
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "3.0.5"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Push parsers.  */
+#define YYPUSH 0
+
+/* Pull parsers.  */
+#define YYPULL 1
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 1 "dbg.y" /* yacc.c:339  */
+
+#include <u.h>
+#include <libc.h>
+#include <bio.h>
+#include <mach.h>
+#define Extern extern
+#include "acid.h"
+
+#define YYSIZE_T size_t
+
+#line 77 "y.tab.c" /* yacc.c:339  */
+
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* In a future release of Bison, this section will be replaced
+   by #include "y.tab.h".  */
+#ifndef YY_YY_Y_TAB_H_INCLUDED
+# define YY_YY_Y_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    Tfmt = 258,
+    Toror = 259,
+    Tandand = 260,
+    Teq = 261,
+    Tneq = 262,
+    Tleq = 263,
+    Tgeq = 264,
+    Tlsh = 265,
+    Trsh = 266,
+    Tdec = 267,
+    Tinc = 268,
+    Tindir = 269,
+    Tid = 270,
+    Tconst = 271,
+    Tfconst = 272,
+    Tstring = 273,
+    Tif = 274,
+    Tdo = 275,
+    Tthen = 276,
+    Telse = 277,
+    Twhile = 278,
+    Tloop = 279,
+    Thead = 280,
+    Ttail = 281,
+    Tappend = 282,
+    Tfn = 283,
+    Tret = 284,
+    Tlocal = 285,
+    Tcomplex = 286,
+    Twhat = 287,
+    Tdelete = 288,
+    Teval = 289,
+    Tbuiltin = 290
+  };
+#endif
+/* Tokens.  */
+#define Tfmt 258
+#define Toror 259
+#define Tandand 260
+#define Teq 261
+#define Tneq 262
+#define Tleq 263
+#define Tgeq 264
+#define Tlsh 265
+#define Trsh 266
+#define Tdec 267
+#define Tinc 268
+#define Tindir 269
+#define Tid 270
+#define Tconst 271
+#define Tfconst 272
+#define Tstring 273
+#define Tif 274
+#define Tdo 275
+#define Tthen 276
+#define Telse 277
+#define Twhile 278
+#define Tloop 279
+#define Thead 280
+#define Ttail 281
+#define Tappend 282
+#define Tfn 283
+#define Tret 284
+#define Tlocal 285
+#define Tcomplex 286
+#define Twhat 287
+#define Tdelete 288
+#define Teval 289
+#define Tbuiltin 290
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 13 "dbg.y" /* yacc.c:355  */
+
+	Node		*node;
+	Lsym		*sym;
+	uint64_t	ival;
+	float		fval;
+	String		*string;
+
+#line 195 "y.tab.c" /* yacc.c:355  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_Y_TAB_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 212 "y.tab.c" /* yacc.c:358  */
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#else
+typedef signed char yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(E) ((void) (E))
+#else
+# define YYUSE(E) /* empty */
+#endif
+
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
+#else
+# define YY_INITIAL_VALUE(Value) Value
+#endif
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined EXIT_SUCCESS
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined EXIT_SUCCESS
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+      + YYSTACK_GAP_MAXIMUM)
+
+# define YYCOPY_NEEDED 1
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
+
+#endif
+
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  2
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   669
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  60
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  18
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  88
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  191
+
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   290
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    56,     2,     2,     2,    23,    10,     2,
+      29,    51,    21,    19,    54,    20,    27,    22,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    59,     3,
+      13,     4,    14,     2,    55,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    28,     2,    58,     9,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    52,     8,    53,    57,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     5,     6,
+       7,    11,    12,    15,    16,    17,    18,    24,    25,    26,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
+      50
+};
+
+#if YYDEBUG
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,    49,    49,    50,    53,    63,    67,    71,    77,    78,
+      80,    81,    87,    94,   100,   107,   113,   120,   121,   124,
+     125,   131,   132,   136,   140,   144,   148,   152,   156,   160,
+     167,   172,   180,   181,   184,   185,   189,   193,   197,   201,
+     205,   209,   213,   217,   221,   225,   229,   233,   237,   241,
+     245,   249,   253,   257,   261,   267,   268,   275,   276,   280,
+     284,   288,   293,   297,   301,   305,   309,   313,   317,   321,
+     325,   331,   335,   339,   343,   347,   352,   357,   361,   365,
+     370,   371,   375,   382,   389,   396,   401,   408,   409
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || 0
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "';'", "'='", "Tfmt", "Toror", "Tandand",
+  "'|'", "'^'", "'&'", "Teq", "Tneq", "'<'", "'>'", "Tleq", "Tgeq", "Tlsh",
+  "Trsh", "'+'", "'-'", "'*'", "'/'", "'%'", "Tdec", "Tinc", "Tindir",
+  "'.'", "'['", "'('", "Tid", "Tconst", "Tfconst", "Tstring", "Tif", "Tdo",
+  "Tthen", "Telse", "Twhile", "Tloop", "Thead", "Ttail", "Tappend", "Tfn",
+  "Tret", "Tlocal", "Tcomplex", "Twhat", "Tdelete", "Teval", "Tbuiltin",
+  "')'", "'{'", "'}'", "','", "'@'", "'!'", "'~'", "']'", "':'", "$accept",
+  "prog", "bigstmnt", "zsemi", "members", "mname", "member", "zname",
+  "slist", "stmnt", "idlist", "zexpr", "expr", "castexpr", "monexpr",
+  "term", "name", "args", YY_NULLPTR
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,    59,    61,   258,   259,   260,   124,    94,
+      38,   261,   262,    60,    62,   263,   264,   265,   266,    43,
+      45,    42,    47,    37,   267,   268,   269,    46,    91,    40,
+     270,   271,   272,   273,   274,   275,   276,   277,   278,   279,
+     280,   281,   282,   283,   284,   285,   286,   287,   288,   289,
+     290,    41,   123,   125,    44,    64,    33,   126,    93,    58
+};
+# endif
+
+#define YYPACT_NINF -54
+
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-54)))
+
+#define YYTABLE_NINF -1
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
+{
+     -54,    99,   -54,    21,    21,    21,    21,    21,   360,   -49,
+     -54,   -54,   -54,   399,   399,   399,    21,    21,    21,   -10,
+     399,     2,    42,    45,    21,    21,    91,   321,    21,    21,
+      21,   -54,   -54,    22,   571,   -54,   -54,   133,     0,   399,
+     399,   -54,   -54,   -54,   -54,   -54,   -38,   235,    91,   453,
+     486,   184,   -54,   -54,    71,    97,   551,   -54,    80,   -24,
+      83,   -54,   -54,    82,   -54,   121,   122,   243,   -54,    22,
+      -5,   -54,   -54,   -54,   -54,   399,   -54,   399,   399,   399,
+     399,   399,   399,   399,   399,   399,   399,   399,   399,   399,
+     399,   399,   399,   399,   399,   -54,   -54,   123,   154,   399,
+     399,   -54,    21,   -54,   -54,   321,   321,   399,    21,   399,
+     -54,   155,   183,     8,    21,   399,    91,   -54,   -54,   -54,
+     399,   571,   588,   604,   619,   633,   646,   464,   464,   192,
+     192,   192,   192,   208,   208,    34,    34,   -54,   -54,   -54,
+     -54,   -54,   160,    13,   -54,   179,   -54,   518,   -54,    59,
+     -54,   -54,   -54,    78,     8,   -22,   186,   -54,   -54,    63,
+     -54,   -54,   -54,   321,   321,   216,   190,   191,     6,   220,
+     -54,   190,   -54,   -54,   -54,   216,   172,   222,   190,   229,
+     -54,   231,   -54,   321,   -54,   232,   -54,   -54,   282,   -54,
+     -54
+};
+
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       2,    32,     1,     0,     0,     0,     0,     0,     0,    85,
+      81,    82,    83,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    17,     0,     0,     0,    32,     0,     0,
+       0,     3,     4,     0,    33,    34,    55,    57,    80,     0,
+      32,    60,    61,    58,    62,    63,    85,     0,     0,     0,
+       0,     0,    64,    65,     0,     6,     0,    30,    28,    85,
+       0,    18,    84,     0,    70,     0,     0,    32,    19,    87,
+       0,    59,    68,    69,    21,     0,    54,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    74,    77,     0,     0,     0,
+      32,    87,     0,    71,    86,    32,    32,     0,     0,    32,
+      27,     0,     0,     0,     0,    32,     0,    22,    20,    72,
+      32,    53,    52,    51,    50,    49,    48,    46,    47,    42,
+      43,    44,    45,    41,    40,    38,    39,    35,    36,    37,
+      76,    75,     0,     0,    56,    23,    26,     0,    66,     0,
+      31,    29,    12,     0,     0,     0,     0,    10,    67,     0,
+      88,    73,    78,    32,    32,     8,     0,     0,     0,     0,
+      11,     0,    79,    24,    25,     8,     0,     0,     0,     0,
+       7,     0,     9,    32,    13,     0,    16,    15,    32,    14,
+       5
+};
+
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -54,   -54,   -54,    61,   105,    55,   -53,   -54,    54,    -1,
+     -54,     7,     4,   -54,    -2,   -54,   -15,   -35
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
+{
+      -1,     1,    31,   176,   155,   156,   157,    62,    67,    68,
+      58,    33,    34,    35,    36,    37,    38,    70
+};
+
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_uint8 yytable[] =
+{
+      32,    41,    42,    43,    44,    45,     9,    60,   152,   153,
+      48,    65,    47,   102,    52,    53,    54,    49,    50,    51,
+      55,    48,    63,    64,    56,    74,    71,    72,    73,   100,
+     154,   169,    57,   104,    69,    48,   152,   153,   152,   153,
+       3,     4,     5,    47,   112,     6,     7,   101,   119,   120,
+      39,     9,    10,    11,    12,    92,    93,    94,   154,   179,
+     154,    16,    17,    18,   162,   143,   118,   120,    23,    24,
+      25,    26,    59,    40,   149,    61,    28,    29,    30,   121,
+     159,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   139,     2,
+     144,   112,   170,   142,   145,   146,   148,   101,   152,   166,
+     165,   147,   158,   120,   172,   170,   101,   120,     3,     4,
+       5,     9,   101,     6,     7,   108,   109,   160,     8,     9,
+      10,    11,    12,    13,   111,   113,   114,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
+     115,    27,   116,   140,    28,    29,    30,    95,    96,    97,
+      98,    99,   173,   174,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,   141,   150,   151,   118,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,   167,    88,
+      89,    90,    91,    92,    93,    94,   163,   171,   161,   175,
+     152,   177,   178,   180,   183,   184,   181,    90,    91,    92,
+      93,    94,   186,   185,   187,   189,   182,   188,   107,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,   168,
+       0,     0,     3,     4,     5,     0,     0,     6,     7,     0,
+       0,     0,     8,     9,    10,    11,    12,    13,     0,     0,
+       0,    14,    15,    16,    17,    18,   103,    20,    21,    66,
+      23,    24,    25,    26,     0,    27,   117,     0,    28,    29,
+      30,     3,     4,     5,     0,     0,     6,     7,     0,     0,
+       0,     8,     9,    10,    11,    12,    13,     0,     0,     0,
+      14,    15,    16,    17,    18,     0,    20,    21,    66,    23,
+      24,    25,    26,     0,    27,   190,     0,    28,    29,    30,
+       3,     4,     5,     0,     0,     6,     7,     0,     0,     0,
+       8,     9,    10,    11,    12,    13,     0,     0,     0,    14,
+      15,    16,    17,    18,     0,    20,    21,    66,    23,    24,
+      25,    26,     0,    27,     0,     0,    28,    29,    30,     3,
+       4,     5,     0,     0,     6,     7,     0,     0,     0,     8,
+      46,    10,    11,    12,     0,     0,     0,     0,     0,     0,
+      16,    17,    18,     0,     0,     0,     0,    23,    24,    25,
+      26,     0,    40,     0,     0,    28,    29,    30,     3,     4,
+       5,     0,     0,     6,     7,     0,     0,     0,     8,     9,
+      10,    11,    12,     0,     0,     0,     0,     0,     0,    16,
+      17,    18,     0,     0,     0,     0,    23,    24,    25,    26,
+       0,    40,     0,     0,    28,    29,    30,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,     0,   105,
+      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   106,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   164,   110,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    82,    83,    84,
+      85,    86,    87,    88,    89,    90,    91,    92,    93,    94
+};
+
+static const yytype_int16 yycheck[] =
+{
+       1,     3,     4,     5,     6,     7,    30,    22,    30,    31,
+      59,    26,     8,    51,    16,    17,    18,    13,    14,    15,
+      30,    59,    24,    25,    20,     3,    28,    29,    30,    29,
+      52,    53,    30,    48,    27,    59,    30,    31,    30,    31,
+      19,    20,    21,    39,    59,    24,    25,    40,    53,    54,
+      29,    30,    31,    32,    33,    21,    22,    23,    52,    53,
+      52,    40,    41,    42,    51,   100,    67,    54,    47,    48,
+      49,    50,    30,    52,   109,    30,    55,    56,    57,    75,
+     115,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    94,     0,
+     102,   116,   155,    99,   105,   106,   108,   100,    30,    31,
+      51,   107,   114,    54,    51,   168,   109,    54,    19,    20,
+      21,    30,   115,    24,    25,    54,    29,   120,    29,    30,
+      31,    32,    33,    34,    54,    52,    54,    38,    39,    40,
+      41,    42,    43,    44,    45,    46,    47,    48,    49,    50,
+      29,    52,    30,    30,    55,    56,    57,    24,    25,    26,
+      27,    28,   163,   164,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    30,    30,     3,   188,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,   153,    17,
+      18,    19,    20,    21,    22,    23,    37,    31,    58,     3,
+      30,   166,    31,     3,    52,     3,   171,    19,    20,    21,
+      22,    23,     3,   178,     3,     3,   175,   183,    54,     4,
+       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,   154,
+      -1,    -1,    19,    20,    21,    -1,    -1,    24,    25,    -1,
+      -1,    -1,    29,    30,    31,    32,    33,    34,    -1,    -1,
+      -1,    38,    39,    40,    41,    42,    51,    44,    45,    46,
+      47,    48,    49,    50,    -1,    52,    53,    -1,    55,    56,
+      57,    19,    20,    21,    -1,    -1,    24,    25,    -1,    -1,
+      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
+      38,    39,    40,    41,    42,    -1,    44,    45,    46,    47,
+      48,    49,    50,    -1,    52,    53,    -1,    55,    56,    57,
+      19,    20,    21,    -1,    -1,    24,    25,    -1,    -1,    -1,
+      29,    30,    31,    32,    33,    34,    -1,    -1,    -1,    38,
+      39,    40,    41,    42,    -1,    44,    45,    46,    47,    48,
+      49,    50,    -1,    52,    -1,    -1,    55,    56,    57,    19,
+      20,    21,    -1,    -1,    24,    25,    -1,    -1,    -1,    29,
+      30,    31,    32,    33,    -1,    -1,    -1,    -1,    -1,    -1,
+      40,    41,    42,    -1,    -1,    -1,    -1,    47,    48,    49,
+      50,    -1,    52,    -1,    -1,    55,    56,    57,    19,    20,
+      21,    -1,    -1,    24,    25,    -1,    -1,    -1,    29,    30,
+      31,    32,    33,    -1,    -1,    -1,    -1,    -1,    -1,    40,
+      41,    42,    -1,    -1,    -1,    -1,    47,    48,    49,    50,
+      -1,    52,    -1,    -1,    55,    56,    57,     4,     5,     6,
+       7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    -1,    36,
+       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    35,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    35,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    22,    23,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    20,    21,    22,    23,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    22,    23
+};
+
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,    61,     0,    19,    20,    21,    24,    25,    29,    30,
+      31,    32,    33,    34,    38,    39,    40,    41,    42,    43,
+      44,    45,    46,    47,    48,    49,    50,    52,    55,    56,
+      57,    62,    69,    71,    72,    73,    74,    75,    76,    29,
+      52,    74,    74,    74,    74,    74,    30,    72,    59,    72,
+      72,    72,    74,    74,    74,    30,    72,    30,    70,    30,
+      76,    30,    67,    74,    74,    76,    46,    68,    69,    71,
+      77,    74,    74,    74,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    71,    51,    51,    76,    36,    35,    54,    54,    29,
+       3,    54,    76,    52,    54,    29,    30,    53,    69,    53,
+      54,    72,    72,    72,    72,    72,    72,    72,    72,    72,
+      72,    72,    72,    72,    72,    72,    72,    72,    72,    72,
+      30,    30,    72,    77,    74,    69,    69,    72,    74,    77,
+      30,     3,    30,    31,    52,    64,    65,    66,    74,    77,
+      71,    58,    51,    37,    35,    51,    31,    65,    64,    53,
+      66,    31,    51,    69,    69,     3,    63,    65,    31,    53,
+       3,    65,    63,    52,     3,    65,     3,     3,    68,     3,
+      53
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    60,    61,    61,    62,    62,    62,    62,    63,    63,
+      64,    64,    65,    66,    66,    66,    66,    67,    67,    68,
+      68,    69,    69,    69,    69,    69,    69,    69,    69,    69,
+      70,    70,    71,    71,    72,    72,    72,    72,    72,    72,
+      72,    72,    72,    72,    72,    72,    72,    72,    72,    72,
+      72,    72,    72,    72,    72,    73,    73,    74,    74,    74,
+      74,    74,    74,    74,    74,    74,    74,    74,    74,    74,
+      74,    75,    75,    75,    75,    75,    75,    75,    75,    75,
+      75,    75,    75,    75,    75,    76,    76,    77,    77
+};
+
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     0,     2,     1,     9,     2,     6,     0,     2,
+       1,     2,     1,     4,     5,     4,     4,     0,     1,     1,
+       2,     2,     3,     4,     6,     6,     4,     3,     2,     4,
+       1,     3,     0,     1,     1,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     2,     1,     4,     1,     2,     2,
+       2,     2,     2,     2,     2,     2,     4,     4,     2,     2,
+       2,     3,     3,     4,     2,     3,     3,     2,     4,     5,
+       1,     1,     1,     1,     2,     1,     3,     1,     3
+};
+
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
+
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
+
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
+
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
+
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
+  YYUSE (yytype);
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+{
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+static void
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+static void
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+{
+  unsigned long int yylno = yyrline[yyrule];
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
+      YYFPRINTF (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+static YYSIZE_T
+yystrlen (const char *yystr)
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+    default: /* Avoid compiler warnings. */
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
+    {
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
+    }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+{
+  YYUSE (yyvaluep);
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+}
+
+
+
+
+/* The lookahead symbol.  */
+int yychar;
+
+/* The semantic value of the lookahead symbol.  */
+YYSTYPE yylval;
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+int
+yyparse (void)
+{
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
+  int yyn;
+  int yyresult;
+  /* Lookahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY; /* Cause a token to be read.  */
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     lookahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to lookahead token.  */
+  yyn = yypact[yystate];
+  if (yypact_value_is_default (yyn))
+    goto yydefault;
+
+  /* Not known => get a lookahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = yylex ();
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the lookahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
+
+  yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     '$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 4:
+#line 54 "dbg.y" /* yacc.c:1648  */
+    {
+			/* make stmnt a root so it isn't collected! */
+			mkvar("_thiscmd")->proc = (yyvsp[0].node);
+			execute((yyvsp[0].node));
+			mkvar("_thiscmd")->proc = nil;
+			gc();
+			if(interactive)
+				Bprint(bout, "acid: ");
+		}
+#line 1518 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 5:
+#line 64 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyvsp[-7].sym)->proc = an(OLIST, (yyvsp[-5].node), (yyvsp[-1].node));
+		}
+#line 1526 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 6:
+#line 68 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyvsp[0].sym)->proc = nil;
+		}
+#line 1534 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 7:
+#line 72 "dbg.y" /* yacc.c:1648  */
+    {
+			defcomplex((yyvsp[-4].node), (yyvsp[-2].node));
+		}
+#line 1542 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 11:
+#line 82 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLIST, (yyvsp[-1].node), (yyvsp[0].node));
+		}
+#line 1550 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 12:
+#line 88 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ONAME, ZN, ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 1559 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 13:
+#line 95 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyvsp[-1].node)->store.ival = (yyvsp[-2].ival);
+			(yyvsp[-1].node)->store.fmt = (yyvsp[-3].ival);
+			(yyval.node) = (yyvsp[-1].node);
+		}
+#line 1569 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 14:
+#line 101 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyvsp[-1].node)->store.ival = (yyvsp[-2].ival);
+			(yyvsp[-1].node)->store.fmt = (yyvsp[-4].ival);
+			(yyvsp[-1].node)->right = (yyvsp[-3].node);
+			(yyval.node) = (yyvsp[-1].node);
+		}
+#line 1580 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 15:
+#line 108 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyvsp[-1].node)->store.ival = (yyvsp[-2].ival);
+			(yyvsp[-1].node)->left = (yyvsp[-3].node);
+			(yyval.node) = (yyvsp[-1].node);
+		}
+#line 1590 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 16:
+#line 114 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCTRUCT, (yyvsp[-2].node), ZN);
+		}
+#line 1598 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 17:
+#line 120 "dbg.y" /* yacc.c:1648  */
+    { (yyval.sym) = 0; }
+#line 1604 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 20:
+#line 126 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLIST, (yyvsp[-1].node), (yyvsp[0].node));
+		}
+#line 1612 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 22:
+#line 133 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = (yyvsp[-1].node);
+		}
+#line 1620 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 23:
+#line 137 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OIF, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1628 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 24:
+#line 141 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OIF, (yyvsp[-4].node), an(OELSE, (yyvsp[-2].node), (yyvsp[0].node)));
+		}
+#line 1636 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 25:
+#line 145 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ODO, an(OLIST, (yyvsp[-4].node), (yyvsp[-2].node)), (yyvsp[0].node));
+		}
+#line 1644 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 26:
+#line 149 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OWHILE, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1652 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 27:
+#line 153 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ORET, (yyvsp[-1].node), ZN);
+		}
+#line 1660 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 28:
+#line 157 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLOCAL, (yyvsp[0].node), ZN);
+		}
+#line 1668 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 29:
+#line 161 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCOMPLEX, (yyvsp[-1].node), ZN);
+			(yyval.node)->sym = (yyvsp[-2].sym);
+		}
+#line 1677 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 30:
+#line 168 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ONAME, ZN, ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 1686 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 31:
+#line 173 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ONAME, (yyvsp[-2].node), ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 1695 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 32:
+#line 180 "dbg.y" /* yacc.c:1648  */
+    { (yyval.node) = 0; }
+#line 1701 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 35:
+#line 186 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OMUL, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1709 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 36:
+#line 190 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ODIV, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1717 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 37:
+#line 194 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OMOD, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1725 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 38:
+#line 198 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OADD, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1733 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 39:
+#line 202 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OSUB, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1741 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 40:
+#line 206 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ORSH, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1749 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 41:
+#line 210 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLSH, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1757 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 42:
+#line 214 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLT, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1765 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 43:
+#line 218 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OGT, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1773 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 44:
+#line 222 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLEQ, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1781 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 45:
+#line 226 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OGEQ, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1789 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 46:
+#line 230 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OEQ, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1797 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 47:
+#line 234 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ONEQ, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1805 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 48:
+#line 238 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLAND, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1813 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 49:
+#line 242 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OXOR, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1821 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 50:
+#line 246 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLOR, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1829 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 51:
+#line 250 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCAND, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1837 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 52:
+#line 254 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCOR, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1845 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 53:
+#line 258 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OASGN, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1853 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 54:
+#line 262 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OFMT, (yyvsp[-1].node), con((yyvsp[0].ival)));
+		}
+#line 1861 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 56:
+#line 269 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCAST, (yyvsp[0].node), ZN);
+			(yyval.node)->sym = (yyvsp[-2].sym);
+		}
+#line 1870 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 58:
+#line 277 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OINDM, (yyvsp[0].node), ZN);
+		}
+#line 1878 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 59:
+#line 281 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OINDC, (yyvsp[0].node), ZN);
+		}
+#line 1886 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 60:
+#line 285 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OADD, (yyvsp[0].node), ZN);
+		}
+#line 1894 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 61:
+#line 289 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = con(0);
+			(yyval.node) = an(OSUB, (yyval.node), (yyvsp[0].node));
+		}
+#line 1903 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 62:
+#line 294 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OEDEC, (yyvsp[0].node), ZN);
+		}
+#line 1911 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 63:
+#line 298 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OEINC, (yyvsp[0].node), ZN);
+		}
+#line 1919 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 64:
+#line 302 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OHEAD, (yyvsp[0].node), ZN);
+		}
+#line 1927 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 65:
+#line 306 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OTAIL, (yyvsp[0].node), ZN);
+		}
+#line 1935 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 66:
+#line 310 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OAPPEND, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1943 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 67:
+#line 314 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ODELETE, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 1951 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 68:
+#line 318 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ONOT, (yyvsp[0].node), ZN);
+		}
+#line 1959 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 69:
+#line 322 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OXOR, (yyvsp[0].node), con(-1));
+		}
+#line 1967 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 70:
+#line 326 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OEVAL, (yyvsp[0].node), ZN);
+		}
+#line 1975 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 71:
+#line 332 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = (yyvsp[-1].node);
+		}
+#line 1983 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 72:
+#line 336 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCTRUCT, (yyvsp[-1].node), ZN);
+		}
+#line 1991 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 73:
+#line 340 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OINDEX, (yyvsp[-3].node), (yyvsp[-1].node));
+		}
+#line 1999 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 74:
+#line 344 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OPDEC, (yyvsp[-1].node), ZN);
+		}
+#line 2007 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 75:
+#line 348 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ODOT, (yyvsp[-2].node), ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 2016 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 76:
+#line 353 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ODOT, an(OINDM, (yyvsp[-2].node), ZN), ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 2025 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 77:
+#line 358 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OPINC, (yyvsp[-1].node), ZN);
+		}
+#line 2033 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 78:
+#line 362 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCALL, (yyvsp[-3].node), (yyvsp[-1].node));
+		}
+#line 2041 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 79:
+#line 366 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCALL, (yyvsp[-3].node), (yyvsp[-1].node));
+			(yyval.node)->builtin = 1;
+		}
+#line 2050 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 81:
+#line 372 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = con((yyvsp[0].ival));
+		}
+#line 2058 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 82:
+#line 376 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCONST, ZN, ZN);
+			(yyval.node)->type = TFLOAT;
+			(yyval.node)->store.fmt = 'f';
+			(yyval.node)->store.fval = (yyvsp[0].fval);
+		}
+#line 2069 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 83:
+#line 383 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OCONST, ZN, ZN);
+			(yyval.node)->type = TSTRING;
+			(yyval.node)->store.string = (yyvsp[0].string);
+			(yyval.node)->store.fmt = 's';
+		}
+#line 2080 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 84:
+#line 390 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OWHAT, ZN, ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 2089 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 85:
+#line 397 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(ONAME, ZN, ZN);
+			(yyval.node)->sym = (yyvsp[0].sym);
+		}
+#line 2098 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 86:
+#line 402 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OFRAME, (yyvsp[0].node), ZN);
+			(yyval.node)->sym = (yyvsp[-2].sym);
+		}
+#line 2107 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+  case 88:
+#line 410 "dbg.y" /* yacc.c:1648  */
+    {
+			(yyval.node) = an(OLIST, (yyvsp[-2].node), (yyvsp[0].node));
+		}
+#line 2115 "y.tab.c" /* yacc.c:1648  */
+    break;
+
+
+#line 2119 "y.tab.c" /* yacc.c:1648  */
+      default: break;
+    }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+
+  /* Now 'shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
+yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
+      {
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
+      }
+# undef YYSYNTAX_ERROR
+#endif
+    }
+
+
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse lookahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
+
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  return yyresult;
+}

+ 144 - 0
sys/src/cmd/acid/y.tab.h

@@ -0,0 +1,144 @@
+/* A Bison parser, made by GNU Bison 3.0.5.  */
+
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+#ifndef YY_YY_Y_TAB_H_INCLUDED
+# define YY_YY_Y_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    Tfmt = 258,
+    Toror = 259,
+    Tandand = 260,
+    Teq = 261,
+    Tneq = 262,
+    Tleq = 263,
+    Tgeq = 264,
+    Tlsh = 265,
+    Trsh = 266,
+    Tdec = 267,
+    Tinc = 268,
+    Tindir = 269,
+    Tid = 270,
+    Tconst = 271,
+    Tfconst = 272,
+    Tstring = 273,
+    Tif = 274,
+    Tdo = 275,
+    Tthen = 276,
+    Telse = 277,
+    Twhile = 278,
+    Tloop = 279,
+    Thead = 280,
+    Ttail = 281,
+    Tappend = 282,
+    Tfn = 283,
+    Tret = 284,
+    Tlocal = 285,
+    Tcomplex = 286,
+    Twhat = 287,
+    Tdelete = 288,
+    Teval = 289,
+    Tbuiltin = 290
+  };
+#endif
+/* Tokens.  */
+#define Tfmt 258
+#define Toror 259
+#define Tandand 260
+#define Teq 261
+#define Tneq 262
+#define Tleq 263
+#define Tgeq 264
+#define Tlsh 265
+#define Trsh 266
+#define Tdec 267
+#define Tinc 268
+#define Tindir 269
+#define Tid 270
+#define Tconst 271
+#define Tfconst 272
+#define Tstring 273
+#define Tif 274
+#define Tdo 275
+#define Tthen 276
+#define Telse 277
+#define Twhile 278
+#define Tloop 279
+#define Thead 280
+#define Ttail 281
+#define Tappend 282
+#define Tfn 283
+#define Tret 284
+#define Tlocal 285
+#define Tcomplex 286
+#define Twhat 287
+#define Tdelete 288
+#define Teval 289
+#define Tbuiltin 290
+
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+
+union YYSTYPE
+{
+#line 13 "dbg.y" /* yacc.c:1910  */
+
+	Node		*node;
+	Lsym		*sym;
+	uint64_t	ival;
+	float		fval;
+	String		*string;
+
+#line 132 "y.tab.h" /* yacc.c:1910  */
+};
+
+typedef union YYSTYPE YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
+#endif
+
+
+extern YYSTYPE yylval;
+
+int yyparse (void);
+
+#endif /* !YY_YY_Y_TAB_H_INCLUDED  */