More error checking

msullivan · msullivan · commit 675e17bf9d64 · 2011-11-08T13:43:41.000-05:00
diff --git a/lazy.cpp b/lazy.cpp
@@ -599,10 +599,12 @@ Expr* parse_manual_close(Stream* f, int expected_terminator) {
 
 
 static Expr* car(Expr* list) {
+	check(1);
 	return partial_apply(list, &cK);
 }
 
 static Expr* cdr(Expr* list) {
+	check(1);
 	return partial_apply(list, &KI);
 }
 
diff --git a/lazy2.c b/lazy2.c
@@ -31,7 +31,7 @@
 //    stream.
 //
 
-#define DEBUG_COUNTERS 0
+#define DEBUG_COUNTERS 1
 
 #include <assert.h>
 #include <stdio.h>
@@ -213,7 +213,7 @@ static void oom(int n) {
 	gc();
 	if (is_exhausted(n)) {
 		fprintf(stderr, "out of memory!\n");
-		exit(4);
+		abort();
 	}
 }
 
@@ -339,21 +339,21 @@ static inline Expr *partial_eval_primitive_application(Expr *e, Expr **prev) {
 		e->type = Num;
 		e->numeric_arg1 = to_number(rhs_res) + 1;
 		if (e->numeric_arg1 == 0) {
-			fputs("Runtime error: invalid output format (attempted to apply inc to a non-number)\n", stderr);
-			exit(3);
+			fputs("Runtime error: invalid output format (attempted to apply inc to a non-number)\n",
+			      stderr);
+			abort();
 		}
 		e->arg2 = 0;
 		break;
 	}
 	case Num:
 		fputs("Runtime error: invalid output format (attempted to apply a number)\n", stderr);
-		exit(3);
+		abort();
 	default:
 		fprintf(stderr,
 		        "INTERNAL ERROR: invalid type in partial_eval_primitive_application (%d)\n",
 		        e->arg1->type);
 		abort();
-		exit(4);
 	}
 
 	return e;
@@ -433,7 +433,7 @@ Expr *parse_expr(FILE* f) {
 		return &cI;
 	default:
 		printf("Invalid character!\n");
-		exit(1);
+		abort();
 	}
 	return 0;
 }
@@ -442,16 +442,18 @@ Expr *parse_expr_top(FILE* f) {
 	Expr *e = parse_expr(f);
 	if (fgetc(f) != '\n') {
 		fprintf(stderr, "input program missing trailing newline\n");
-		exit(1);
+		abort();
 	}
 	return e;
 }
 
 static Expr *car(Expr *list) {
+	check(1);
 	return partial_apply(list, &cK);
 }
 
 static Expr *cdr(Expr *list) {
+	check(1);
 	return partial_apply(list, &KI);
 }
 
@@ -462,7 +464,7 @@ static int church2int(Expr *church) {
 	int result = to_number(partial_eval(e));
 	if (result == -1) {
 		fputs("Runtime error: invalid output format (result was not a number)\n", stderr);
-		exit(3);
+		abort();
 	}
 	*church2int_root = 0;
 	return result;
@@ -480,7 +482,7 @@ int main(int argc, char** argv) {
 		f = fopen(argv[1], "r");
 		if (!f) {
 			fprintf(stderr, "Unable to open the file \"%s\".\n", argv[1]);
-			exit(1);
+			return 1;
 		}
 	}
 	Expr *e = parse_expr_top(f);
diff --git a/lazy3.c b/lazy3.c
@@ -517,10 +517,12 @@ Expr *parse_expr_top(state *s) {
 }
 
 Expr *car(state *s, Expr *list) {
+	check(s, 1);
 	return partial_apply(s, list, s->cK);
 }
 
 Expr *cdr(state *s, Expr *list) {
+	check(s, 1);
 	return partial_apply(s, list, s->KI);
 }
 
@@ -566,7 +568,7 @@ int main(int argc, char** argv) {
 			return ch-256;
 		}
 		putchar(ch);
-		fflush(stdout);
+
 		s->roots[0] = cdr(s, s->roots[0]);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -599,10 +599,12 @@ Expr* parse_manual_close(Stream* f, int expected_terminator) {`
`599`	`599`
`600`	`600`
`601`	`601`	`static Expr* car(Expr* list) {`
	`602`	`+ check(1);`
`602`	`603`	`return partial_apply(list, &cK);`
`603`	`604`	`}`
`604`	`605`
`605`	`606`	`static Expr* cdr(Expr* list) {`
	`607`	`+ check(1);`
`606`	`608`	`return partial_apply(list, &KI);`
`607`	`609`	`}`
`608`	`610`
Original file line number	Diff line number	Diff line change
`@@ -517,10 +517,12 @@ Expr parse_expr_top(state s) {`
`517`	`517`	`}`
`518`	`518`
`519`	`519`	`Expr car(state s, Expr *list) {`
	`520`	`+ check(s, 1);`
`520`	`521`	`return partial_apply(s, list, s->cK);`
`521`	`522`	`}`
`522`	`523`
`523`	`524`	`Expr cdr(state s, Expr *list) {`
	`525`	`+ check(s, 1);`
`524`	`526`	`return partial_apply(s, list, s->KI);`
`525`	`527`	`}`
`526`	`528`
`@@ -566,7 +568,7 @@ int main(int argc, char** argv) {`
`566`	`568`	`return ch-256;`
`567`	`569`	`}`
`568`	`570`	`putchar(ch);`
`569`		`- fflush(stdout);`
	`571`	`+`
`570`	`572`	`s->roots[0] = cdr(s, s->roots[0]);`
`571`	`573`	`}`
`572`	`574`	`}`