X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=stdio.asm;h=47a6302698178d6aa3ad1d41126d1c99a0475a36;hb=0a436d5323363af19679ca0a1795b996dc886cfa;hp=467952ba2f8a4b7f9716a3a2b3f22b69372ea7e4;hpb=036306101f72c2f8033c4422abcb1436f0bde97e;p=rrq%2Frrqforth.git

diff --git a/stdio.asm b/stdio.asm
index 467952b..47a6302 100644
--- a/stdio.asm
+++ b/stdio.asm
@@ -147,6 +147,27 @@ p_stream_nchars_done:
 	popr rsi
 	next
 
+;;; ========================================
+;;; Copy line to PAD
+;;; READ-STREAM-LINE ( stream -- n )
+	
+	WORD p_read_stream_line,'READ-STREAM-LINE'
+	;; ( stream -- n )
+	;; Read stream until next newline
+	dq p_gtR, p_pad
+p_read_stream_line_loop:
+	dq p_Rget, p_read_stream_char
+	dq p_dup, p_0less
+	BRANCH 1,p_read_stream_line_done
+	dq p_dup, p_nl, p_equal
+	BRANCH 1,p_read_stream_line_done
+	dq p_over, p_Cput, p_literal,1, p_plus
+	BRANCH ,p_read_stream_line_loop
+p_read_stream_line_done:
+	dq p_drop, p_literal,0, p_over, p_Cput
+	dq p_pad, p_minus, p_return
+
+	
 ;;; ========================================
 ;;; Stream reading
 ;;; READ-STREAM-CHAR ( stream -- ch )
@@ -245,7 +266,7 @@ p_read_word_nomore:
 	next
 
 p_read_word_skipline:
-	DOFORTH p_dup, p_read_stream_char
+	DOFORTH p_Rget, p_read_stream_char
 	pop rbx
 	cmp bl,0
 	jl p_read_word_nomore
@@ -278,7 +299,7 @@ p_double_quote_endstream:
 	lea rdi,[p_pad_DFA]
 	add rdi,qword [rsp]
 	mov byte [rdi],0
-	;; copy PAD string into new temp object
+	;; copy PAD string + NUL into new temp object
 	inc qword [rsp]
 	DOFORTH p_str2temp
 	dec qword [rsp]
@@ -288,22 +309,22 @@ p_double_quote_endstream:
 	WORD p_fdtell,'FDTELL',
 	;; ( chars* n fd -- )
 	;; Write n bytes from chars* to fd
-	dq p_rot, p_rot, sys_write, p_drop, p_exit
+	dq p_rot, p_rot, sys_write, p_drop, p_return
 	
 	WORD p_tell,'TELL'
 	;; ( chars* n -- )
 	;; Write n bytes from chars* to stdout
-	dq p_literal,1,p_fdtell, p_exit
+	dq p_literal,1,p_fdtell, p_return
 
 	WORD p_fdemit,'FDEMIT'
 	;; ( c fd -- )
 	;; Write byte to fd
-	dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_exit
+	dq p_literal,1, p_dsp, p_literal,1, sys_write, p_2drop, p_return
 	
 	WORD p_emit,'EMIT'
 	;; ( c -- )
 	;; Write byte to stdout
-	dq p_literal,1, p_fdemit, p_exit
+	dq p_literal,1, p_fdemit, p_return
 
 	WORD p_nl,'NL',dovalue
 	;; ( -- c )
@@ -360,4 +381,4 @@ p_dot_remainder:
 	WORD p_dot,'.'
 	;; ( v -- )
 	;; Print value to stdout
-	dq p_dot_temp, p_literal,1, p_fdtell, p_exit
+	dq p_dot_temp, p_literal,1, p_fdtell, p_return