String splitting via division.

jaq-core/Cargo.toml

@@ -25,7 +25,7 @@ regex = { version = "1.9", optional = true }
 log = { version = "0.4.17", optional = true }
 libm = { version = "0.2.7", optional = true }
 aho-corasick = { version = "1.0", optional = true }
-base64 = { version = "0.21.2", optional = true }
+base64 = { version = "0.22", optional = true }
 urlencoding = { version = "2.1.3", optional = true }
 
 [dev-dependencies]

jaq-core/src/lib.rs

@@ -167,18 +167,6 @@ fn as_codepoint(v: &Val) -> Result<char, Error> {
     char::from_u32(u).ok_or_else(|| Error::str(format_args!("cannot use {u} as character")))
 }
 
-/// Split a string by a given separator string.
-fn split(s: &str, sep: &str) -> Vec<Val> {
-    if sep.is_empty() {
-        // Rust's `split` function with an empty separator ("")
-        // yields an empty string as first and last result
-        // to prevent this, we are using `chars` instead
-        s.chars().map(|s| Val::str(s.to_string())).collect()
-    } else {
-        s.split(sep).map(|s| Val::str(s.to_string())).collect()
-    }
-}
-
 /// This implements a ~10x faster version of:
 /// ~~~ text
 /// def range($from; $to; $by): $from |
@@ -340,10 +328,6 @@ const CORE_RUN: &[(&str, usize, RunPtr)] = &[
         let f = move |v| indices(&cv.1, &v?).map(|idxs| Val::arr(idxs.map(to_int).collect()));
         Box::new(vals.map(f))
     }),
-    ("split", 1, |args, cv| {
-        let seps = args.get(0).run(cv.clone());
-        Box::new(seps.map(move |sep| Ok(Val::arr(split(cv.1.as_str()?, sep?.as_str()?)))))
-    }),
     ("first", 1, |args, cv| Box::new(args.get(0).run(cv).take(1))),
     ("limit", 2, |args, cv| {
         let n = args.get(0).run(cv.clone()).map(|n| n?.as_int());

jaq-core/tests/tests.rs

@@ -307,16 +307,6 @@ fn round() {
     fail(json!({}), "round", err(json!({})));
 }
 
-#[test]
-fn split() {
-    give(json!("aöß"), r#"split("")"#, json!(["a", "ö", "ß"]));
-    give(
-        json!("abcabcdab"),
-        r#"split("ab")"#,
-        json!(["", "c", "cd", ""]),
-    );
-}
-
 #[test]
 fn startswith() {
     give(json!("foobar"), r#"startswith("")"#, json!(true));

jaq-interpret/src/val.rs

@@ -415,6 +415,20 @@ impl core::ops::Mul for Val {
     }
 }
 
+/// Split a string by a given separator string.
+fn split<'a>(s: &'a str, sep: &'a str) -> Box<dyn Iterator<Item = String> + 'a> {
+    if s.is_empty() {
+        Box::new(core::iter::empty())
+    } else if sep.is_empty() {
+        // Rust's `split` function with an empty separator ("")
+        // yields an empty string as first and last result
+        // to prevent this, we are using `chars` instead
+        Box::new(s.chars().map(|s| s.to_string()))
+    } else {
+        Box::new(s.split(sep).map(|s| s.to_string()))
+    }
+}
+
 impl core::ops::Div for Val {
     type Output = ValR;
     fn div(self, rhs: Self) -> Self::Output {
@@ -426,6 +440,7 @@ impl core::ops::Div for Val {
             (Float(x), Float(y)) => Ok(Float(x / y)),
             (Num(n), r) => Self::from_dec_str(&n) / r,
             (l, Num(n)) => l / Self::from_dec_str(&n),
+            (Str(x), Str(y)) => Ok(Val::arr(split(&x, &y).map(Val::str).collect())),
             (l, r) => Err(Error::MathOp(l, MathOp::Div, r)),
         }
     }

jaq-interpret/tests/tests.rs

@@ -63,6 +63,11 @@ fn mul() {
     );
 }
 
+yields!(div_str, r#""abcabcdab" / "ab""#, ["", "c", "cd", ""]);
+yields!(div_str_empty, r#""" / """#, json!([]));
+yields!(div_str_empty_str, r#""" / "ab""#, json!([]));
+yields!(div_str_empty_sep, r#""aöß" / """#, ["a", "ö", "ß"]);
+
 #[test]
 fn logic() {
     let tf = json!([true, false]);

jaq-std/src/std.jq

@@ -135,6 +135,9 @@ def    scan(re; flags): matches(re; flags)[] | .[0].string;
 def   match(re; flags): matches(re; flags)[] | .[0] + { captures: .[1:] };
 def capture(re; flags): matches(re; flags)[] | capture_of_match;
 
+def split($sep):
+  if isstring and ($sep | isstring) then . / $sep
+  else error("split input and separator must be strings") end;
 def split (re; flags): split_(re; flags + "g");
 def splits(re; flags): split(re; flags)[];
 

jaq/Cargo.toml

@@ -2,7 +2,7 @@
 name = "jaq"
 version = "1.3.0"
 authors = ["Michael Färber <michael.faerber@gedenkt.at>"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 readme = "../README.md"
 description = "Just another JSON query tool"