tidy up debug

Author: braindigitalis

include/basic.h

@@ -26,6 +26,8 @@
  */
 #pragma once
 
+#define basic_debug if (debug) dprintf
+
 #include "basic/defines.h"
 #include "basic/structs.h"
 #include "basic/context.h"

src/basic/flow_control.c

@@ -8,9 +8,7 @@
 extern bool debug;
 
 bool conditional(struct basic_ctx* ctx) {
-	if (debug) {
-		dprintf("line %ld conditional\n", ctx->current_linenum);
-	}
+	basic_debug("line %ld conditional\n", ctx->current_linenum);
 
 	return up_conditional(ctx);
 }
@@ -80,22 +78,22 @@ void error_statement(struct basic_ctx* ctx)
 
 void if_statement(struct basic_ctx* ctx)
 {
-	if (debug) dprintf("line %ld if_statement\n", ctx->current_linenum);
+	basic_debug("line %ld if_statement\n", ctx->current_linenum);
 
 	accept_or_return(IF, ctx);
 	bool r = conditional(ctx);
 	accept_or_return(THEN, ctx);
 
 	if (r) {
-		if (debug) dprintf("conditional is true\n");
+		basic_debug("conditional is true\n");
 		if (tokenizer_token(ctx) == NEWLINE) {
 			/* Multi-statement block IF */
 			accept_or_return(NEWLINE, ctx);
 			return;
 		}
 		statement(ctx);
 	} else {
-		if (debug) dprintf("conditional is false\n");
+		basic_debug("conditional is false\n");
 
 		if (tokenizer_token(ctx) == NEWLINE) {
 			/* --- multiline false-branch with nesting --- */

src/basic/function.c

@@ -573,7 +573,7 @@ void proc_statement(struct basic_ctx* ctx)
 
 		if (ctx->call_stack_ptr < MAX_CALL_STACK_DEPTH) {
 			ctx->call_stack[ctx->call_stack_ptr] = tokenizer_num(ctx, NUMBER);
-			if (debug) dprintf("PROC from %lu returning line %lu, PROC %s on line %lu\n", ctx->current_linenum, ctx->call_stack[ctx->call_stack_ptr], procname, def->line);
+			basic_debug("PROC from %lu returning line %lu, PROC %s on line %lu\n", ctx->current_linenum, ctx->call_stack[ctx->call_stack_ptr], procname, def->line);
 			ctx->call_stack_ptr++;
 			jump_linenum(def->line, ctx);
 		} else {
@@ -598,18 +598,18 @@ void def_statement(struct basic_ctx* ctx)
 
 void eq_statement(struct basic_ctx* ctx)
 {
-	if (debug) dprintf("eq_statement\n");
+	basic_debug("eq_statement\n");
 	accept_or_return(EQUALS, ctx);
 
 	if (ctx->fn_type == RT_STRING) {
-		if (debug) dprintf("eq_statement return string\n");
+		basic_debug("eq_statement return string\n");
 		ctx->fn_return = (void*)str_expr(ctx);
 	} else if (ctx->fn_type == RT_FLOAT) {
-		if (debug) dprintf("eq_statement return double\n");
+		basic_debug("eq_statement return double\n");
 		double_expr(ctx, (void*)&ctx->fn_return);
 	} else if (ctx->fn_type == RT_INT) {
 		ctx->fn_return = (void*)expr(ctx);
-		if (debug) dprintf("eq_statement return int %ld\n", (int64_t)ctx->fn_return);
+		basic_debug("eq_statement return int %ld\n", (int64_t)ctx->fn_return);
 	} else if (ctx->fn_type == RT_NONE) {
 		tokenizer_error_print(ctx, "Can't return a value from a PROC");
 		return;
@@ -642,7 +642,7 @@ void endproc_statement(struct basic_ctx* ctx)
 
 		ctx->if_nest_level = 0; // If we exit a proc, we clear the nest level
 
-		if (debug) dprintf("ENDPROC back to line %lu stack pos %lu\n", ctx->call_stack[ctx->call_stack_ptr], ctx->call_stack_ptr);
+		basic_debug("ENDPROC back to line %lu stack pos %lu\n", ctx->call_stack[ctx->call_stack_ptr], ctx->call_stack_ptr);
 		jump_linenum(ctx->call_stack[ctx->call_stack_ptr], ctx);
 	} else {
 		tokenizer_error_print(ctx, "ENDPROC when not inside PROC");

src/basic/main.c

@@ -638,9 +638,7 @@ void basic_run(struct basic_ctx *ctx) {
 		(void) kgetc();
 		tokenizer_error_print(ctx, "Escape");
 	}
-	if (debug) {
-		dprintf("BASIC RUN\n");
-	}
+	basic_debug("BASIC RUN\n");
  	line_statement(ctx);
 	if (ctx->errored) {
 		ctx->errored = false;

src/basic/statement.c

@@ -6,9 +6,7 @@ void statement(struct basic_ctx* ctx)
 {
 	int token = tokenizer_token(ctx);
 
-	if (debug) {
-		dprintf("line %ld statement(%d)\n", ctx->current_linenum, token);
-	}
+	basic_debug("line %ld statement(%d)\n", ctx->current_linenum, token);
 
 	switch (token) {
 		case REM:
@@ -171,18 +169,14 @@ void statement(struct basic_ctx* ctx)
 
 void line_statement(struct basic_ctx* ctx)
 {
-	if (debug) {
-		dprintf("line_statement\n");
-	}
+	basic_debug("line_statement\n");
 	if (tokenizer_token(ctx) == NEWLINE) {
 		/* Empty line! */
 		accept(NEWLINE, ctx);
 		return;
 	}
 	int64_t line = tokenizer_num(ctx, NUMBER);
-	if (debug) {
-		dprintf("line_statement parsed line %ld\n", line);
-	}
+	basic_debug("line_statement parsed line %ld\n", line);
 	if (line == 0) {
 		return tokenizer_error_printf(ctx, "Missing line number after line %lu", ctx->current_linenum);
 	}