X-Git-Url: https://git.rrq.au/?a=blobdiff_plain;f=stdio.asm;h=865b7f0d6dcf462743d5284b197063e4d0953009;hb=d5a8f559318ac57934871a48e964bac18557b601;hp=a6cf5128683ce1f121855560ec4e181ed837f2c9;hpb=5e1475bc1afeecd3bd9388cac34d937ea67c2a68;p=rrq%2Frrqforth.git

diff --git a/stdio.asm b/stdio.asm
index a6cf512..865b7f0 100644
--- a/stdio.asm
+++ b/stdio.asm
@@ -77,7 +77,37 @@ p_stream_MEM:
 	mov rbx,qword [rax+16]	; copy fill
 	mov qword [rax+24],rbx	; into current
 	next
-	
+
+	WORD p_stream_nchars,'STREAM-NCHARS',fasm
+	;; ( stream -- n )
+	;; Scan over whitespace in the stream buffer (without actually
+	;; consuming) and tell how much then remains.
+	pushr rsi
+	mov rcx,qword [rsp]
+	mov rbx,qword [rcx+16] ; fill
+	sub rbx,qword [rcx+24] ; current
+	cmp qword [rcx+8],-1
+	je p_stream_nchars_memblock
+	mov rsi,rcx
+	add rsi,32
+	jmp p_stream_nchars_skipblanks
+p_stream_nchars_memblock:
+	mov rsi,qword [rcx]
+p_stream_nchars_skipblanks:
+	add rsi,qword [rcx+24] ; 
+	cmp rbx,0
+	je p_stream_nchars_done
+p_stream_nchars_loop:
+	lodsb
+	cmp al,32
+	jg p_stream_nchars_done
+	dec rbx
+	jg p_stream_nchars_loop
+p_stream_nchars_done:
+	mov qword [rsp],rbx
+	popr rsi
+	next
+
 ;;; ========================================
 ;;; Stream reading
 ;;; READ-STREAM-CHAR ( stream -- ch )
@@ -86,10 +116,10 @@ p_stream_MEM:
 	;; ( stream -- ch )
 	pushr rsi
 	mov rax,qword [rsp]
-	mov rbx,[rax+16]	; fill
+	mov rbx,qword [rax+16]	; fill
 
 p_read_stream_char.READ:
-	mov rcx,[rax+24]	; current
+	mov rcx,qword [rax+24]	; current
 	cmp rbx,rcx
 	jg p_read_stream_char.CHAR
 
@@ -173,6 +203,29 @@ p_read_word_nomore:
 	popr rsi
 	next
 
+	WORD p_double_quote,'"',fasm ;; " (fool emacs)
+	;; ( -- char* n )
+	;; Scan to double quote in stream buffer, putting the string on PAD
+	pushr rsi
+	push p_pad_DFA
+	push 0
+p_double_quote_loop:	
+	DOFORTH p_stdin, p_read_stream_char
+	pop rax
+	cmp rax,0
+	jl p_double_quote_endstream
+	cmp rax,'"'		; " (fool emacs)
+	je  p_double_quote_endquote
+	lea rdi,[p_pad_DFA]
+	add rdi,qword [rsp]
+	stosb
+	inc qword [rsp]
+	jmp p_double_quote_loop
+p_double_quote_endquote:
+p_double_quote_endstream:
+	popr rsi
+	next
+
 	WORD p_tell,'TELL',fasm
 	;; ( chars* n -- )
 	;; Write n bytes from chars* to stdout