multiline: require spaces after, similar to strings.parser

diff --git a/basis/multiline/multiline.factor b/basis/multiline/multiline.factor
index 870729fd60504875d991d6cf820877a91d6566ea..11f75636fbea48f3accf5d4e40e61dae801ad80f 100644 (file)
--- a/basis/multiline/multiline.factor
+++ b/basis/multiline/multiline.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2007 Daniel Ehrenberg
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators kernel lexer locals make math
-namespaces parser quotations sequences words ;
+namespaces parser quotations sequences strings.parser.private
+words ;
 IN: multiline
 
 <PRIVATE
@@ -53,7 +54,7 @@ SYNTAX: STRING:
     [
         lexer
         [ skip-n-chars + end-text lexer (scan-multiline-string) ]
-        change-column drop
+        change-column check-space
     ] "" make ;
 
 : advance-same-line ( lexer text -- )

diff --git a/core/strings/parser/parser.factor b/core/strings/parser/parser.factor
index 9e70223671ac6e04d6961106519214ec94c3da98..6590fb1e26be19a9fb263b0a706e19bca56d76b6 100644 (file)
--- a/core/strings/parser/parser.factor
+++ b/core/strings/parser/parser.factor
@@ -109,6 +109,13 @@ PRIVATE>
     [ column>> ] [ line-text>> ] bi
     [ "\"\\" member-eq? ] find-from ;
 
+: check-space ( lexer -- )
+    dup current-char forbid-tab {
+        { CHAR: \s [ advance-char ] }
+        { f [ drop ] }
+        [ "[space]" swap 1string "'" 1surround unexpected ]
+    } case ;
+
 DEFER: (parse-string)
 
 : parse-found-token ( accum lexer i elt -- )
@@ -119,14 +126,7 @@ DEFER: (parse-string)
         [ [ pick push ] bi@ ]
         [ drop 2dup next-line% ] if*
         (parse-string)
-    ] [
-        dup advance-char
-        dup current-char forbid-tab {
-            { CHAR: \s [ advance-char ] }
-            { f [ drop ] }
-            [ "[space]" swap 1string "'" 1surround unexpected ]
-        } case drop
-    ] if ;
+    ] [ dup advance-char check-space drop ] if ;
 
 : (parse-string) ( accum lexer -- )
     { sbuf lexer } declare