From dec1ce257d80fe14a9cfa799693ce72fbef1aacd Mon Sep 17 00:00:00 2001
From: Paul Gardner-Stephen <paul@servalproject.org>
Date: Mon, 29 Apr 2019 23:10:10 +0930
Subject: [PATCH] simplify BASIC execution logic

---
 c64/basic/basic_execute_line.s | 10 ++++------
 c64/basic/basic_main_loop.s    |  2 +-
 c64/basic/cmd_new.s            |  2 +-
 c64/basic/cmd_sys.s            |  2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/c64/basic/basic_execute_line.s b/c64/basic/basic_execute_line.s
index f5b5605a..86c26936 100644
--- a/c64/basic/basic_execute_line.s
+++ b/c64/basic/basic_execute_line.s
@@ -26,9 +26,9 @@ no_space_to_skip:
 	sec
 	rts
 
-basic_run_next_statement:
+basic_execute_statement:
+	;; Skip over any white space and :
 	jsr basic_end_of_statement_check
-	bcc basic_execute_line
 
 	;; Go through the line until its end is reached.
 	;; If we reach the end are in direct mode, then
@@ -37,8 +37,6 @@ basic_run_next_statement:
 	;; return to READY prompt because we have run out
 	;; of program.
 	
-basic_execute_line:	
-
 	;; Get next char of program text, even if it is hiding under a ROM or the
 	;; IO area.
 	ldx #<basic_current_statement_ptr
@@ -83,7 +81,7 @@ not_a_token:
 
 basic_skip_char:
 	jsr basic_consume_character
-	jmp basic_execute_line
+	jmp basic_execute_statement
 
 basic_consume_character:
 	;; Advance basic text pointer
@@ -143,7 +141,7 @@ basic_execute_from_current_line:
 	jsr peek_under_roms
 	sta basic_current_line_number+1
 
-	jmp basic_execute_line
+	jmp basic_execute_statement
 	
 basic_command_jump_table:
 	;; $80 - $8F
diff --git a/c64/basic/basic_main_loop.s b/c64/basic/basic_main_loop.s
index b3153ae4..49fd35dc 100644
--- a/c64/basic/basic_main_loop.s
+++ b/c64/basic/basic_main_loop.s
@@ -149,5 +149,5 @@ not_a_line:
 	lda #$ff
 	sta basic_current_line_number+1
 
-	jmp basic_execute_line
+	jmp basic_execute_statement
 
diff --git a/c64/basic/cmd_new.s b/c64/basic/cmd_new.s
index 3f3f2873..ce355946 100644
--- a/c64/basic/cmd_new.s
+++ b/c64/basic/cmd_new.s
@@ -10,7 +10,7 @@ cmd_clr:
 	jsr basic_do_clr
 	;; CLR command does not stop execution
 	;; (Cconfirmed on a c64)
-	jmp basic_run_next_statement
+	jmp basic_execute_statement
 	
 basic_do_new:	
 	;; Setup pointers to memory storage
diff --git a/c64/basic/cmd_sys.s b/c64/basic/cmd_sys.s
index d8d1e984..e628fa81 100644
--- a/c64/basic/cmd_sys.s
+++ b/c64/basic/cmd_sys.s
@@ -29,4 +29,4 @@ cmd_sys:
 	;; Call the routine.
 	jsr sys_jmp
 	
-	jmp basic_run_next_statement
+	jmp basic_execute_statement