From 529ade12dfc771a217fb36f6a3ab33418101c4f3 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Mon, 19 May 2014 21:38:54 -0700 Subject: [PATCH] multiline: lexer-eof? is just still-parsing?. --- basis/multiline/multiline.factor | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/basis/multiline/multiline.factor b/basis/multiline/multiline.factor index 38d0be7ded..069c594b0d 100644 --- a/basis/multiline/multiline.factor +++ b/basis/multiline/multiline.factor @@ -11,15 +11,15 @@ ERROR: bad-heredoc identifier ; : rest-of-line ( lexer -- seq ) [ line-text>> ] [ column>> ] bi tail ; -: next-line-text ( lexer -- str ) - [ next-line ] [ line-text>> ] bi ; +: next-line-text ( lexer -- str ? ) + [ next-line ] [ line-text>> ] [ still-parsing? ] tri ; : (parse-here) ( lexer -- ) dup next-line-text [ dup ";" = [ drop next-line ] [ % CHAR: \n , (parse-here) ] if - ] [ drop ";" throw-unexpected-eof ] if* ; + ] [ ";" throw-unexpected-eof ] if ; PRIVATE> @@ -39,12 +39,9 @@ SYNTAX: STRING: > ] [ text>> length ] bi <= ; - :: (scan-multiline-string) ( i end lexer -- j ) lexer line-text>> :> text - lexer lexer-eof? [ + lexer still-parsing? [ end text i start* [| j | i j text subseq % j end length + ] [ -- 2.34.1