remove aa_readfp and simplify reading

Sigrid Haflínudóttir committed 6 years ago

Commit a5cbab71 parent 2362b063 files · +22 −39Browse files

Unified · Split

3 files

aa.c +20 −36
aa.h +1 −2
repl.c +1 −1

aa.c+20−36

 }
 static aaObject *
-read_(aaContext *ctx, aaReadFn fn, void *udata)
+read_(aaContext *ctx, Biobuf *fp)
 {
 	const char *delimiter = " \n\t\r();";
 	aaObject *v, *res, **tail;
 	char buf[64], *p;
 	/* get next character */
-	chr = ctx->nextchr ? ctx->nextchr : fn(ctx, udata);
+	chr = ctx->nextchr ? ctx->nextchr : Bgetc(fp);
 	ctx->nextchr = '\0';
 	/* skip whitespace */
-	while(chr && strchr(" \n\t\r", chr))
+	while(chr > 0 && strchr(" \n\t\r", chr))
-		chr = fn(ctx, udata);
+		chr = Bgetc(fp);
-	switch(chr){
+	if(chr <= 0)
-	case 0:
 		return nil;
+	switch(chr){
 	case ';':
-		while(chr && chr != '\n')
+		while(chr > 0 && chr != '\n')
-			chr = fn(ctx, udata);
+			chr = Bgetc(fp);
-		return read_(ctx, fn, udata);
+		return read_(ctx, fp);
 	case ')':
 		return &rparen;
 		tail = &res;
 		gc = aa_savegc(ctx);
 		aa_pushgc(ctx, res); /* to cause error on too-deep nesting */
-		while((v = read_(ctx, fn, udata)) != &rparen){
+		while((v = read_(ctx, fp)) != &rparen){
 			if(v == nil)
 				aa_error(ctx, "unclosed list");
 			if(TYPE(v) == AA_TSYMBOL && streq(CAR(CDR(v)), ".")){
 				/* dotted pair */
-				*tail = aa_read(ctx, fn, udata);
+				*tail = aa_read(ctx, fp);
 			}else{
 				/* proper pair */
 				*tail = aa_cons(ctx, v, &Null);
 		return res;
 	case '\'':
-		v = aa_read(ctx, fn, udata);
+		v = aa_read(ctx, fp);
 		if(!v)
 			aa_error(ctx, "stray '''");
 		return aa_cons(ctx, aa_symbol(ctx, "quote"), aa_cons(ctx, v, &Null));
 	case '"':
 		res = buildstring(ctx, nil, '\0');
 		v = res;
-		for(chr = fn(ctx, udata); chr != '"'; chr = fn(ctx, udata)){
+		for(chr = Bgetc(fp); chr != '"'; chr = Bgetc(fp)){
-			if(chr == 0)
+			if(chr <= 0)
 				aa_error(ctx, "unclosed string");
 			if(chr == '\\'){
-				chr = fn(ctx, udata);
+				chr = Bgetc(fp);
 				if(strchr("nrt", chr))
 					chr = strchr("n\nr\rt\t", chr)[1];
 			}
 			if(p == buf + sizeof(buf) - 1)
 				aa_error(ctx, "symbol too long");
 			*p++ = chr;
-			chr = fn(ctx, udata);
+			chr = Bgetc(fp);
-		}while(chr && !strchr(delimiter, chr));
+		}while(chr > 0 && !strchr(delimiter, chr));
 		*p = '\0';
 		ctx->nextchr = chr;
 		n.r = strtod(buf, &p); /* try to read as number */
 }
 aaObject *
-aa_read(aaContext *ctx, aaReadFn fn, void *udata)
+aa_read(aaContext *ctx, Biobuf *fp)
 {
-	aaObject *obj = read_(ctx, fn, udata);
+	aaObject *obj = read_(ctx, fp);
 	if(obj == &rparen)
 		aa_error(ctx, "stray ')'");
 	return obj;
 }
-static char
-readbio(aaContext *ctx, void *udata)
-{
-	int chr;
-	USED(ctx);
-	return (chr = Bgetc(udata)) < 0 ? 0 : chr;
-}
-aaObject *
-aa_readfp(aaContext *ctx, Biobuf *fp)
-{
-	return aa_read(ctx, readbio, fp);
-}
 static aaObject *
 evallist(aaContext *ctx, aaObject *lst, aaObject *env)
 {
 	Binits(&b, -1, OREAD, (uchar*)prelude, i);
 	b.icount = -i;
 	Biofn(&b, eof);
-	while((v = aa_readfp(ctx, &b)) != nil){
+	while((v = aa_read(ctx, &b)) != nil){
 		aa_eval(ctx, v);
 		aa_restoregc(ctx, save);
 	}

aa.h+1−2

@@ -99,6 +99,5 @@ aaObject aa_cdr(aaContext ctx, aaObject *obj); · 98 unmodified lines
99	aaNumber aa_tonumber(aaContext ctx, aaObject obj);	99	aaNumber aa_tonumber(aaContext ctx, aaObject obj);
100	void aa_toptr(aaContext ctx, aaObject *obj);	100	void aa_toptr(aaContext ctx, aaObject *obj);
101	void aa_set(aaContext ctx, aaObject sym, aaObject *v);	101	void aa_set(aaContext ctx, aaObject sym, aaObject *v);
102	aaObject aa_read(aaContext ctx, aaReadFn fn, void *udata);	102	aaObject aa_read(aaContext ctx, Biobuf *fp);
103	aaObject aa_readfp(aaContext ctx, Biobuf *fp);
104	aaObject aa_eval(aaContext ctx, aaObject *obj);	103	aaObject aa_eval(aaContext ctx, aaObject *obj);

repl.c+1−1

@@ -63,7 +63,7 @@ main(int argc, char **argv) · 62 unmodified lines
63	Bflush(ctx->fd[2]);	63	Bflush(ctx->fd[2]);
64	Bflush(ctx->fd[1]);	64	Bflush(ctx->fd[1]);
65	}	65	}
66	if((obj = aa_readfp(ctx, fp)) == nil)	66	if((obj = aa_read(ctx, fp)) == nil)
67	break;	67	break;
68	obj = aa_eval(ctx, obj);	68	obj = aa_eval(ctx, obj);
69	if(fp->fid == 0)	69	if(fp->fid == 0)

@@ -99,6 +99,5 @@ aaObject aa_cdr(aaContext ctx, aaObject *obj); · 98 unmodified lines
99	aaNumber aa_tonumber(aaContext ctx, aaObject obj);	99	aaNumber aa_tonumber(aaContext ctx, aaObject obj);
100	void aa_toptr(aaContext ctx, aaObject *obj);	100	void aa_toptr(aaContext ctx, aaObject *obj);
101	void aa_set(aaContext ctx, aaObject sym, aaObject *v);	101	void aa_set(aaContext ctx, aaObject sym, aaObject *v);
102	aaObject aa_read(aaContext ctx, aaReadFn fn, void *udata);	102	aaObject aa_read(aaContext ctx, Biobuf *fp);
103	aaObject aa_readfp(aaContext ctx, Biobuf *fp);
104	aaObject aa_eval(aaContext ctx, aaObject *obj);	103	aaObject aa_eval(aaContext ctx, aaObject *obj);

remove aa_readfp and simplify reading

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code