From 199e710597921467a3056382deb90793ccfa109c Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Sun, 27 Aug 2017 15:09:35 -0500
Subject: [PATCH] modern.out: maybe simplify
---
extra/modern/out/out.factor | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/extra/modern/out/out.factor b/extra/modern/out/out.factor
index 1a2c97b5fa..1c4f3a3f62 100644
--- a/extra/modern/out/out.factor
+++ b/extra/modern/out/out.factor
@@ -11,17 +11,18 @@ IN: modern.out
{ char: \r char: \n } member?
[ tail-slice ] [ drop ] if ;
-: write-whitespace ( obj last -- )
+: write-whitespace ( last obj -- )
+ swap
[ swap slice-between ] [ slice-before ] if*
trim-before-newline io:write ;
-GENERIC#: write-literal* 1 ( obj last -- last' )
-M: slice write-literal* [ write-whitespace ] [ drop write ] [ drop ] 2tri ;
-M: array write-literal* swap [ swap write-literal* ] each ;
+GENERIC: write-literal* ( last obj -- last' )
+M: slice write-literal* [ write-whitespace ] [ write ] [ ] tri ;
+M: array write-literal* [ write-literal* ] each ;
! M: string write-literal* drop [ write ] keep ; ! for refactoring
! Start with no slice as ``last``
-: write-literal ( obj -- ) f write-literal* drop ;
+: write-literal ( obj -- ) f swap write-literal* drop ;
: write-modern-string ( seq -- string )
[ write-literal ] with-string-writer ; inline