core: Support data mode sequence insertion for scalars

Author: ingydotnet

core/src/yamlscript/constructor.clj

@@ -259,13 +259,13 @@
                    (let [nodes (map #(construct-node %1 ctx) group)
                          node (if (:dmap (first group))
                                 (if (> (count group) 1)
-                                  (Lst (vec (cons (Sym 'concat) (vec nodes))))
+                                  (Lst (vec (cons (Sym '+concat) (vec nodes))))
                                   (first nodes))
                                 (Vec (vec nodes)))
                          new (if new (conj new node) [node])]
                      new))
                  nil nodes)]
-      (Lst (vec (cons (Sym 'concat) vect))))))
+      (Lst (vec (cons (Sym '+concat) vect))))))
 
 (defn construct-vec [node ctx]
   (or

core/src/ys/std.clj

@@ -205,6 +205,17 @@
   ([C] #(in? C %1))
   ([x C] (has? C x)))
 
+(defn +concat [& C]
+  (apply concat (map #(cond
+                        (sequential? %1) %1
+                        (or
+                          (string? %1)
+                          (number? %1)
+                          (boolean? %1)
+                          (map? %1)
+                          (set? %1)) [%1]
+                        :else nil) C)))
+
 (defn +merge [M]
   (if (:-<< M)
     (let [m (dissoc M :-<<)

core/src/ys/taptest.clj

@@ -4,6 +4,7 @@
    [clojure.string :as str]
    [ys.ys :as ys]
    [ys.yaml :as yaml]
+   [yamlscript.global :as global]
    [yamlscript.common])
   (:refer-clojure
    :exclude [test]))
@@ -72,7 +73,11 @@
         code (get test "code")
         what (get test "what")
         _ (check-string code "code" count)
-        code (str "!ys-0\n" code "\n")]
+        mode (get test "mode")
+        code (cond
+               (= "data" mode) (str "!ys-0:\n" code "\n")
+               (= "bare" mode) code
+               :else (str "!ys-0\n" code "\n"))]
     (try (if (= "out" what)
            (with-out-str (ys/eval code))
            (ys/eval code))
@@ -128,6 +133,7 @@
       tests2)))
 
 (defn- init-test [test]
+  (swap! global/opts assoc :unordered true)
   (let [keys (set (keys test))
         what (get test "what")
         form (get test "form")]
@@ -151,8 +157,11 @@
 
 (defn- normalize [got test]
   (let [what (get test "what")
-        form (get test "form")]
+        form (get test "form")
+        mode (get test "mode")]
     (cond
+      (= "data" mode) (pr-str got)
+      (= "bare" mode) (pr-str got)
       form (if (fn? form)
              (form got test)
              (die "taptest: 'form' must be a function"))

core/test/compiler-stack.yaml

@@ -1382,7 +1382,7 @@
     - :when true: ddd
     - eee
   clojure: |
-    (concat ["aaa"] (when true bbb) ["ccc"] (when true ddd) ["eee"])
+    (+concat ["aaa"] (when true bbb) ["ccc"] (when true ddd) ["eee"])
 
 
 - name: Multiple code insertions in data mode with mode swap variants
@@ -1407,9 +1407,9 @@
       {:map [{:expr ":when true"} {:seq ({:str "bbb"})}]}
       {:str "ccc"})}
   clojure: |
-    (concat
+    (+concat
       ["aaa"]
-      (concat bbb ["bbb"] (when true bbb) (when true ["bbb"]))
+      (+concat bbb ["bbb"] (when true bbb) (when true ["bbb"]))
       ["ccc"])
 
 
@@ -1425,7 +1425,7 @@
     - 9
     - 10
   clojure: |
-    (concat [0 1] [2 3 4] [5 5] [6 7 8] [9 10])
+    (+concat [0 1] [2 3 4] [5 5] [6 7 8] [9 10])
 
 
 - name: Two '::' in a row in a data mode sequence
@@ -1436,15 +1436,15 @@
     - :when y:: [6, 7, 8]
     - 9
   clojure: |
-    (concat [1] (concat (when x [2 3 4]) (when y [6 7 8])) [9])
+    (+concat [1] (+concat (when x [2 3 4]) (when y [6 7 8])) [9])
 
 
 - name: Single '::' in a data mode sequence
   yamlscript: |
     !ys-0:
     - :when x: +[2 3 4]
   clojure: |
-    (concat (when x [2 3 4]))
+    (+concat (when x [2 3 4]))
 
 
 - name: Two '::' in a row in a data mode mapping

core/test/compiler.yaml

@@ -1565,7 +1565,7 @@
       - bar
     - baz
   clojure: |
-    (concat ["foo"] (when (> (rand 2) 1) ["bar"]) ["baz"])
+    (+concat ["foo"] (when (> (rand 2) 1) ["bar"]) ["baz"])
 
 
 - name: Fix bug in seq insertion in data mode
@@ -1637,3 +1637,14 @@
     (.foo 123)
     (.bar foo baz)
     (.baz (.bar (.foo 123) baz))
+
+
+- name: Scalar insertion in data mode sequence
+  yamlscript: |
+    !ys-0:
+    - foo
+    - :: 3 .. 5
+    - :: 42
+    - bar
+  clojure: |
+    (+concat ["foo"] (+concat (rng 3 5) 42) ["bar"])

ys/test/data-mode.t

@@ -0,0 +1,20 @@
+#!/usr/bin/env ys-0
+
+use ys::taptest: :all
+
+hash =::
+  FOO: 1
+  FOO_BAR: 2
+
+test::
+- name: Data mode sequence insertions using '::'
+  code: |
+    - foo
+    - :: 3 .. 5
+    - :: 42
+    - :: +{'a' 1 'b' 2}
+    - bar
+  mode: data
+  want: ("foo" 3 4 5 42 {"a" 1, "b" 2} "bar")
+
+done:

ys/test/std.t

@@ -212,7 +212,7 @@ test::
   want:: inc
 
 - code: qw(one :two "three" 4 true false nil {} [])
-  want:: +['one' ':two' "three" '4' 'true' 'false' 'nil' '(%)' '[]']
+  want:: +['one' ':two' "three" '4' 'true' 'false' 'nil' '{}' '[]']
 
 
 #-------------------------------------------------------------------------------