work work

func.c

@@ -2,6 +2,7 @@
 
 #include "func.h"
 #include "node.h"
+#include "ply.h"
 #include "sym.h"
 #include "type.h"
 
@@ -18,8 +19,8 @@ int func_validate_expr(const struct func *func, struct node *n, int strict)
 		    || type_compatible(arg->sym->type, f->type) )
 			continue;
 
-		node_error(n, stderr, "type mismatch for argument %d, expected %T, got %T",
-			   nargs, f->type, arg->sym->type);
+		_e("%#N: %O argument is of type '%T', expected '%T'.\n",
+		   n, nargs, arg->sym->type, f->type);
 	}
 
 	return 0;
@@ -33,16 +34,14 @@ int func_static_validate(const struct func *func, struct node *n)
 	switch (n->ntype) {
 	case N_EXPR:
 		if (func->type->ttype != T_FUNC) {
-			node_error(n, stderr, "'%s' is not callable",
-				   n->expr.func);
+			_e("%#N: %N is not callable.\n", n, n);
 			return -EINVAL;
 		}
 		return func_validate_expr(func, n, 0);
 
 	case N_IDENT:
 		if (func->type->ttype == T_FUNC) {
-			node_error(n, stderr, "'%s' is a function",
-				   n->ident.name);
+			_e("%#N: %N is a function.\n", n, n);
 			return -EINVAL;
 		}
 		/* fall-through */

global.c

@@ -65,13 +65,13 @@ static int global_map_static_verify(struct node *n)
 {
 	int nargs = node_nargs(n);
 
-	if (nargs < 2) {
-		node_error(n, stderr, "map without key");
+	if (nargs < 2) {		
+		_e("%#N: map without key.\n", n);
 		return -EINVAL;
 	}
 
 	if (n->expr.args->ntype != N_IDENT) {
-		node_error(n, stderr, "map must be identifier");
+		_e("%#N: %N is not subscriptable.\n", n, n);
 		return -EINVAL;
 	}
 
@@ -120,14 +120,8 @@ static int global_assign_type_infer(struct prog *prog, struct node *n)
 	if (type_compatible(lval->sym->type, rval->sym->type))
 		return 0;
 
-	if (lval->ntype == N_IDENT) {
-		node_error(n, stderr, "conflicting types for '%s'",
-			   lval->ident.name);
-	} else {
-		node_error(n, stderr, "conflicting types for '%s'",
-			   lval->expr.args->ident.name);
-	}
-
+	_e("%#N: can't assign %N (type '%T'), to %N (type '%T').\n",
+	   n, rval, rval->sym->type, lval, lval->sym->type);
 	return -EINVAL;
 }
 
@@ -137,8 +131,7 @@ static int global_assign_static_verify(struct node *n)
 	int nargs = node_nargs(n);
 
 	if (nargs != 2) {
-		node_error(n, stderr, "assignment operator expects 2 arguments,"
-			   " %d given", nargs);
+		_e("%#N: expected 2 arguments, %d given.\n", n, nargs);
 		return -EINVAL;
 	}
 
@@ -147,7 +140,7 @@ static int global_assign_static_verify(struct node *n)
 	if (node_is_map(lval) || (lval->ntype == N_IDENT))
 		return 0;
 
-	node_error(n, stderr, "assignment destination must be a variable or map");
+	_e("%#N: %N is not assignable.\n", n, lval);
 	return -EINVAL;
 }
 

node.c

@@ -8,6 +8,7 @@
 #include <string.h>
 
 #include "node.h"
+#include "printxf.h"
 
 void node_print(struct node *n, FILE *fp)
 {
@@ -30,74 +31,15 @@ void node_print(struct node *n, FILE *fp)
 	}
 }
 
-struct node_dump_info {
-	FILE *fp;
-	int indent;
-};
-
-int __node_dump_pre(struct node *n, void *_info)
-{
-	struct node_dump_info *info = _info;
-	struct node *arg;
-
-	if (n->prev)
-		fputc(' ', info->fp);
-
-	if (node_is_block(n->up)) {
-		info->indent += 4;
-		fprintf(info->fp, "\n%*s", info->indent, "");
-	}
-
-	if (n->ntype == N_EXPR)
-		fputc('(', info->fp);
-
-	node_print(n, info->fp);
-
-	if ((n->ntype == N_EXPR) && n->expr.args)
-		fputc(' ', info->fp);
-
-	return 0;
-}
-
-int __node_dump_post(struct node *n, void *_info)
-{
-	struct node_dump_info *info = _info;
-	struct node *c;
-
-	if (node_is_block(n))
-		fprintf(info->fp, "\n%*s", info->indent, "");
-
-	if (n->ntype == N_EXPR)
-		fputc(')', info->fp);
-
-	if (node_is_block(n->up))
-		info->indent -= 4;
-	
-	return 0;
-}
-
-void node_dump(struct node *n, FILE *fp)
+int node_vfprintxf(struct printxf *pxf, FILE *fp, const char *spec, va_list ap)
 {
-	struct node_dump_info info = {
-		.fp = fp,
-	};
+	struct node *n;
 
-	node_walk(n, __node_dump_pre, __node_dump_post, &info);
-	fputc('\n', fp);		
-}
-
-void node_error(struct node *n, FILE *fp, const char *fmt, ...)
-{
-	va_list ap;
+	n = va_arg(ap, struct node *);
 
+	/* TODO: "%#N" should print source file location */
 	node_print(n, fp);
-	fputs(": ", fp);
-
-	va_start(ap, fmt);
-	vfprintf(fp, fmt, ap);
-	va_end(ap);
-
-	fputc('\n', fp);
+	return 0;
 }
 
 int node_walk(struct node *n,
@@ -238,3 +180,9 @@ struct node *node_expr(char *func, ...)
 	return n;
 	
 }
+
+__attribute__((constructor))
+static void node_init(void)
+{
+	printxf_default.vfprintxf['N'] = node_vfprintxf;
+}

node.h

@@ -40,9 +40,6 @@ struct node {
 
 /* debug */
 void node_print(struct node *n, FILE *fp);
-void node_dump (struct node *n, FILE *fp);
-
-void node_error(struct node *n, FILE *fp, const char *fmt, ...);
 
 typedef int (*nwalk_fn)(struct node *, void *);
 int node_walk(struct node *n, nwalk_fn pre, nwalk_fn post, void *ctx);

ply.c

@@ -155,9 +155,8 @@ int pass_sym_alloc(struct node *n, void *_prog)
 	}
 
 	if (err) {
-		if ((err == -ENOENT) && (n->ntype == N_EXPR))
-			node_error(n, stderr, "unknown function '%s'",
-				   n->expr.func);
+		if ((err == -ENOENT))
+			_e("%#N: unknown symbol %N.\n", n, n);
 	}
 
 	return err;
@@ -519,7 +518,7 @@ int main(void)
 
 	for (prog = ctx->progs; *prog; prog++) {
 		printf("\n\e[34m%s\e[0m\n", (*prog)->probe);
-		node_dump((*prog)->ast, stdout);
+		ast_fprint(stdout, (*prog)->ast);
 		printf("\n-- locals\n");
 		symtab_dump((*prog)->locals, stdout);
 		/* printf("-- ir\n"); */

ply.h

@@ -1,6 +1,8 @@
 #ifndef _PLY_H
 #define _PLY_H
 
+#include <stdio.h>
+
 struct node;
 struct symtab;
 
@@ -42,4 +44,14 @@ struct provider {
 
 void provider_register(struct provider *p);
 
+/* utils */
+void ast_fprint(FILE *fp, struct node *root);
+
+#include "printxf.h"
+
+#define _d(fmt, ...) fprintxf(NULL, stderr, fmt, ##__VA_ARGS__)
+#define _i(fmt, ...) fprintxf(NULL, stderr, fmt, ##__VA_ARGS__)
+#define _w(fmt, ...) fprintxf(NULL, stderr, fmt, ##__VA_ARGS__)
+#define _e(fmt, ...) fprintxf(NULL, stderr, fmt, ##__VA_ARGS__)
+
 #endif	/* _PLY_H */

printxf_test.c

@@ -1,7 +1,49 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "printxf.h"
 
 
+int printxf_test(const char *fmt, ...)
+{
+	va_list ap, xap;
+	FILE *fp, *xfp;
+	char *buf, *xbuf;
+	size_t loc, xloc;
+	int len, xlen;
+
+	 fp = open_memstream( &buf,  &loc);
+	xfp = open_memstream(&xbuf, &xloc);
+
+	va_start(ap, fmt);
+	va_copy(xap, ap);
+
+	len = vfprintf (        fp, fmt,  ap);
+	xlen = vfprintxf(NULL, xfp, fmt, xap);
+
+	va_end(xap);
+	va_end( ap);
+
+	fclose(xfp);
+	fclose( fp);
+
+	if ((xlen == len)
+	    && (xloc == loc)
+	    && !strcmp(xbuf, buf)) {
+		free(xbuf);
+		free( buf);
+		return 0;
+	}
+
+	printf("FAIL  len:%2d  loc:%2zd  buf:\"%s\"\n",  len,  loc,  buf);
+	printf("     xlen:%2d xloc:%2zd xbuf:\"%s\"\n", xlen, xloc, xbuf);
+	return -1;
+}
+
+
 int main(void)
 {
-	printxf(NULL, "testing %% %.*s %d\n", 3, "w000t", 13);
+	printxf_test("testing %% %.*s %d\n%", 3, "w000t", 13);
 }