From 270314640c66bbf34a97dfc5e0b5130666b0bab1 Mon Sep 17 00:00:00 2001
From: Paul Gardner-Stephen <paul@servalproject.org>
Date: Mon, 29 Apr 2019 22:27:58 +0930
Subject: [PATCH] refactor end of statement check.

---
 c64/basic/basic_execute_line.s | 15 ++++++++++-----
 c64/basic/cmd_run.s            |  4 ++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/c64/basic/basic_execute_line.s b/c64/basic/basic_execute_line.s
index a424a8ff..e88a57c4 100644
--- a/c64/basic/basic_execute_line.s
+++ b/c64/basic/basic_execute_line.s
@@ -2,7 +2,7 @@
 	;; after first checking that we have a colon
 	;; or $00 char
 
-basic_run_next_statement:
+basic_end_of_statement_check:	
 	ldx #<basic_current_statement_ptr
 	ldy #0
 	jsr peek_under_roms
@@ -12,11 +12,16 @@ basic_run_next_statement:
 	cmp #$3a
 	beq +
 
-	;; Nope, so SYNTAX ERROR it is!
-	ldx #10
-	jmp do_basic_error
-
+	;; not end of statement
+	clc
+	rts
 *
+	sec
+	rts
+
+basic_run_next_statement:
+	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
diff --git a/c64/basic/cmd_run.s b/c64/basic/cmd_run.s
index 82749dde..210fad35 100644
--- a/c64/basic/cmd_run.s
+++ b/c64/basic/cmd_run.s
@@ -1,6 +1,10 @@
 cmd_run:
 	;; XXX - Parse starting line number
 
+	jsr basic_end_of_statement_check
+	bcc +
+
+*
 	;; Reset line pointer to first line of program.
 	lda basic_start_of_text_ptr+0
 	sta basic_current_line_ptr+0