X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=basis%2Fmultiline%2Fmultiline.factor;h=c6d5576347a7122ed29eab33f6b27b209e756b57;hp=5182c33e599bba3853324109e8d53a63dfaaf8c5;hb=f2db336221c17d3dafc0faf85371a86a330242f7;hpb=7ce4b746e521fb7d97cfa1785106c529a997c0b5

diff --git a/basis/multiline/multiline.factor b/basis/multiline/multiline.factor
index 5182c33e59..c6d5576347 100644
--- a/basis/multiline/multiline.factor
+++ b/basis/multiline/multiline.factor
@@ -1,90 +1,85 @@
 ! Copyright (C) 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces make parser lexer kernel sequences words
-quotations math accessors locals ;
+USING: accessors kernel lexer make math namespaces parser
+quotations sequences strings.parser.private words ;
 IN: multiline
 
-ERROR: bad-heredoc identifier ;
-
 <PRIVATE
-: next-line-text ( -- str )
-    lexer get dup next-line line-text>> ;
 
-: (parse-here) ( -- )
-    next-line-text [
+: rest-of-line ( lexer -- seq )
+    [ line-text>> ] [ column>> ] bi tail ;
+
+: next-line-text ( lexer -- str ? )
+    [ next-line ] [ line-text>> ] [ still-parsing? ] tri ;
+
+: (parse-here) ( lexer -- )
+    dup next-line-text [
         dup ";" =
-        [ drop lexer get next-line ]
-        [ % "\n" % (parse-here) ] if
-    ] [ ";" unexpected-eof ] if* ;
+        [ drop next-line ]
+        [ % CHAR: \n , (parse-here) ] if
+    ] [ ";" throw-unexpected-eof ] if ;
+
 PRIVATE>
 
+ERROR: text-found-before-eol string ;
+
 : parse-here ( -- str )
-    [ (parse-here) ] "" make but-last
-    lexer get next-line ;
+    [
+        lexer get
+        dup rest-of-line [ text-found-before-eol ] unless-empty
+        (parse-here)
+    ] "" make but-last ;
 
 SYNTAX: STRING:
-    CREATE-WORD
+    scan-new-word
     parse-here 1quotation
-    (( -- string )) define-inline ;
+    ( -- string ) define-inline ;
 
 <PRIVATE
 
-:: (scan-multiline-string) ( i end -- j )
-    lexer get line-text>> :> text
-    text [
-        end text i start* [| j |
+:: (scan-multiline-string) ( i end lexer -- j )
+    lexer line-text>> :> text
+    lexer still-parsing? [
+        i text end subseq-index-from [| j |
             i j text subseq % j end length +
         ] [
-            text i short tail % CHAR: \n ,
-            lexer get next-line
-            0 end (scan-multiline-string)
+            text i index-or-length tail % CHAR: \n ,
+            lexer next-line
+            0 end lexer (scan-multiline-string)
         ] if*
-    ] [ end unexpected-eof ] if ;
-        
-:: (parse-multiline-string) ( end-text skip-n-chars -- str )
+    ] [ end throw-unexpected-eof ] if ;
+
+:: (parse-multiline-string) ( end-text lexer skip-n-chars -- str )
     [
-        lexer get
-        [ skip-n-chars + end-text (scan-multiline-string) ]
-        change-column drop
+        lexer
+        [ skip-n-chars + end-text lexer (scan-multiline-string) ]
+        change-column check-space
     ] "" make ;
 
-: rest-of-line ( -- seq )
-    lexer get [ line-text>> ] [ column>> ] bi tail ;
-
-:: advance-same-line ( text -- )
-    lexer get [ text length + ] change-column drop ;
-
-:: (parse-til-line-begins) ( begin-text -- )
-    lexer get still-parsing? [
-        lexer get line-text>> begin-text sequence= [
-            begin-text advance-same-line
-        ] [
-            lexer get line-text>> % "\n" %
-            lexer get next-line
-            begin-text (parse-til-line-begins)
-        ] if
-    ] [
-        begin-text bad-heredoc
-    ] if ;
-
-: parse-til-line-begins ( begin-text -- seq )
-    [ (parse-til-line-begins) ] "" make ;
+: advance-same-line ( lexer text -- )
+    length [ + ] curry change-column drop ;
 
 PRIVATE>
 
 : parse-multiline-string ( end-text -- str )
-    1 (parse-multiline-string) ;
+    lexer get 1 (parse-multiline-string) ;
 
 SYNTAX: /* "*/" parse-multiline-string drop ;
 
-SYNTAX: HEREDOC:
-    lexer get skip-blank
-    rest-of-line
-    lexer get next-line
-    parse-til-line-begins suffix! ;
-
-SYNTAX: DELIMITED:
-    lexer get skip-blank
-    rest-of-line
-    lexer get next-line
-    0 (parse-multiline-string) suffix! ;
+SYNTAX: (( "))" parse-multiline-string drop ;
+
+SYNTAX: [[ "]]" parse-multiline-string suffix! ;
+SYNTAX: [=[ "]=]" parse-multiline-string suffix! ;
+SYNTAX: [==[ "]==]" parse-multiline-string suffix! ;
+SYNTAX: [===[ "]===]" parse-multiline-string suffix! ;
+SYNTAX: [====[ "]====]" parse-multiline-string suffix! ;
+SYNTAX: [=====[ "]=====]" parse-multiline-string suffix! ;
+SYNTAX: [======[ "]======]" parse-multiline-string suffix! ;
+
+SYNTAX: ![[ "]]" parse-multiline-string drop ;
+SYNTAX: ![=[ "]=]" parse-multiline-string drop ;
+SYNTAX: ![==[ "]==]" parse-multiline-string drop ;
+SYNTAX: ![===[ "]===]" parse-multiline-string drop ;
+SYNTAX: ![====[ "]====]" parse-multiline-string drop ;
+SYNTAX: ![=====[ "]=====]" parse-multiline-string drop ;
+SYNTAX: ![======[ "]======]" parse-multiline-string drop ;