steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multiline: lexer-eof? is just still-parsing?.

db4
John Benediktsson 2014-05-19 21:38:54 -07:00
parent 786793e145
commit 529ade12df
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
basis/multiline/multiline.factor
View File

@ -11,15 +11,15 @@ ERROR: bad-heredoc identifier ;
: rest-of-line ( lexer -- seq ) : rest-of-line ( lexer -- seq )
[ line-text>> ] [ column>> ] bi tail ; [ line-text>> ] [ column>> ] bi tail ;
: next-line-text ( lexer -- str ) : next-line-text ( lexer -- str ? )
[ next-line ] [ line-text>> ] bi ; [ next-line ] [ line-text>> ] [ still-parsing? ] tri ;
: (parse-here) ( lexer -- ) : (parse-here) ( lexer -- )
dup next-line-text [ dup next-line-text [
dup ";" = dup ";" =
[ drop next-line ] [ drop next-line ]
[ % CHAR: \n , (parse-here) ] if [ % CHAR: \n , (parse-here) ] if
] [ drop ";" throw-unexpected-eof ] if* ; ] [ ";" throw-unexpected-eof ] if ;
PRIVATE> PRIVATE>
@ -39,12 +39,9 @@ SYNTAX: STRING:
<PRIVATE <PRIVATE
: lexer-eof? ( lexer -- ? )
[ line>> ] [ text>> length ] bi <= ;
:: (scan-multiline-string) ( i end lexer -- j ) :: (scan-multiline-string) ( i end lexer -- j )
lexer line-text>> :> text lexer line-text>> :> text
lexer lexer-eof? [ lexer still-parsing? [
end text i start* [| j | end text i start* [| j |
i j text subseq % j end length + i j text subseq % j end length +
] [ ] [