From 1b8b366444537d7b904bb0c86c0b1b9de2fe02fa Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 7 Aug 2018 09:55:26 -0400 Subject: [PATCH] modern: fix rewriting backslashes and whitespace. --- extra/modern/modern.factor | 2 +- extra/modern/out/out.factor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/modern/modern.factor b/extra/modern/modern.factor index 43228c05b7..7a45e5a6c4 100644 --- a/extra/modern/modern.factor +++ b/extra/modern/modern.factor @@ -334,7 +334,7 @@ ERROR: no-backslash-payload n string slice ; ! \ foo, M\ foo dup [ char: \\ = ] count-tail '[ - _ [ skip-blank-from slice-til-whitespace drop ] replicate + _ [ slice-til-not-whitespace drop [ slice-til-whitespace drop ] dip swap 2array ] replicate ensure-no-false dup [ no-backslash-payload ] unless ] dip swap 2array diff --git a/extra/modern/out/out.factor b/extra/modern/out/out.factor index c1fc0124f1..ce70ca3f75 100644 --- a/extra/modern/out/out.factor +++ b/extra/modern/out/out.factor @@ -24,9 +24,9 @@ CONSTRUCTOR: renamed ( slice string -- obj ) ; trim-before-newline io:write ; GENERIC: write-literal* ( last obj -- last' ) -M: slice write-literal* [ write-whitespace ] [ write ] [ ] tri ; +M: slice write-literal* write ; ! [ write-whitespace ] [ write ] [ ] tri ; M: array write-literal* [ write-literal* ] each ; -M: renamed write-literal* [ slice>> write-whitespace ] [ string>> write ] [ slice>> ] tri ; ! for refactoring +! M: renamed write-literal* [ slice>> write-whitespace ] [ string>> write ] [ slice>> ] tri ; ! for refactoring M: string write-literal* write ; DEFER: map-literals