Minor streaming improvements

peterwang · Jan 28, 2021 · 0d2db94 · 0d2db94
1 parent e635e71
commit 0d2db94
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/vlaaad/reveal/stream.clj b/src/vlaaad/reveal/stream.clj
@@ -5,7 +5,7 @@
   (:import [clojure.lang Keyword Symbol IPersistentMap IPersistentVector IPersistentSet Fn
                          ISeq MultiFn IRef Var Volatile Namespace IRecord Delay
                          IBlockingDeref TaggedLiteral Reduced ReaderConditional
-                         IPersistentCollection BigInt]
+                         IPersistentCollection BigInt PersistentQueue]
            [java.util.regex Pattern]
            [java.io File FileNotFoundException]
            [java.net URL URI]
@@ -114,7 +114,10 @@
               (case ch
                 \newline ((=> (flush-builder builder style) newline) rf acc)
                 \tab (do (.append builder "    ") acc)
-                \return ((flush+util builder style "\\r") rf acc)
+                \return (cond
+                          (== i (dec len)) ((flush+util builder style "\\r") rf acc)
+                          (= \newline (.charAt str (inc i))) acc
+                          :else ((flush+util builder style "\\r") rf acc))
                 \formfeed ((flush+util builder style "\\f") rf acc)
                 \backspace ((flush+util builder style "\\b") rf acc)
                 (do (.append builder ch) acc)))))))))
@@ -149,8 +152,10 @@
                   (case ch
                     \newline ((=> (flush-builder builder style) newline) rf acc)
                     \tab (do (.append builder "    ") acc)
-                    ;; todo except if followed by newline...
-                    \return ((flush+util builder style "\\r") rf acc)
+                    \return (cond
+                              (== i (dec len)) ((flush+util builder style "\\r") rf acc)
+                              (= \newline (.charAt str (inc i))) acc
+                              :else ((flush+util builder style "\\r") rf acc))
                     \formfeed ((flush+util builder style "\\f") rf acc)
                     \backspace ((flush+util builder style "\\b") rf acc)
                     (do (.append builder ch) acc)))))))))))
@@ -833,6 +838,12 @@
     separator
     (stream (str instant))))
 
+(defstream PersistentQueue [q]
+  (horizontal
+    (raw-string "#reveal/queue(" {:fill :object})
+    (items q)
+    (raw-string ")" {:fill :object})))
+
 (defmacro ^:private when-class [class-name & body]
   `(try
      (Class/forName ^String ~class-name)