[MIN] fn:sequence-join → fn:insert-separator

Author: ChristianGruen

basex-core/src/main/java/org/basex/query/func/Function.java

@@ -394,6 +394,9 @@ ITEM_ZM, flag(HOF)),
   /** XQuery function. */
   INSERT_BEFORE(FnInsertBefore::new, "insert-before(input,position,insert)",
       params(ITEM_ZM, INTEGER_O, ITEM_ZM), ITEM_ZM),
+  /** XQuery function. */
+  INSERT_SEPARATOR(FnInsertSeparator::new, "insert-separator(input,separator)",
+      params(ITEM_ZM, ITEM_ZM), ITEM_ZM),
   /** XQuery function (obsolete). */
   INTERSPERSE(FnIntersperse::new, "intersperse(input,separator)",
       params(ITEM_ZM, ITEM_ZM), ITEM_ZM),
@@ -616,7 +619,7 @@ ARRAY_ZM, flag(HOF)),
   /** XQuery function. */
   SECONDS_FROM_TIME(FnSecondsFromTime::new, "seconds-from-time(value)",
       params(TIME_ZO), DECIMAL_ZO),
-  /** XQuery function. */
+  /** XQuery function (obsolete). */
   SEQUENCE_JOIN(FnSequenceJoin::new, "sequence-join(input,separator)",
       params(ITEM_ZM, ITEM_ZM), ITEM_ZM),
   /** XQuery function. */

basex-core/src/main/java/org/basex/query/func/fn/FnInsertSeparator.java

@@ -0,0 +1,45 @@
+package org.basex.query.func.fn;
+
+import org.basex.query.*;
+import org.basex.query.expr.*;
+import org.basex.query.func.*;
+import org.basex.query.iter.*;
+import org.basex.query.value.*;
+import org.basex.query.value.item.*;
+import org.basex.query.value.seq.*;
+import org.basex.query.value.type.*;
+
+/**
+ * Function implementation.
+ *
+ * @author BaseX Team, BSD License
+ * @author Christian Gruen
+ */
+public class FnInsertSeparator extends StandardFunc {
+  @Override
+  public final Value value(final QueryContext qc) throws QueryException {
+    final Iter input = arg(0).iter(qc);
+    final Value separator = arg(1).value(qc);
+
+    final ValueBuilder vb = new ValueBuilder(qc);
+    Item item = input.next();
+    if(item != null) {
+      vb.add(item);
+      while((item = qc.next(input)) != null) vb.add(separator).add(item);
+    }
+    return vb.value(this);
+  }
+
+  @Override
+  protected final Expr opt(final CompileContext cc) {
+    final Expr values = arg(0), separator = arg(1);
+    final SeqType st = values.seqType(), stSep = separator.seqType();
+    if(st.zeroOrOne() || separator == Empty.VALUE) return values;
+
+    final long size = values.size(), sizeSep = separator.size();
+    final long sz = size != -1 && sizeSep != -1 ? size + sizeSep * (size - 1) : -1;
+    exprType.assign(st.union(stSep), st.occ, sz).data(values, separator);
+
+    return this;
+  }
+}

basex-core/src/main/java/org/basex/query/func/fn/FnIntersperse.java

@@ -6,5 +6,5 @@
  * @author BaseX Team, BSD License
  * @author Christian Gruen
  */
-public final class FnIntersperse extends FnSequenceJoin {
+public final class FnIntersperse extends FnInsertSeparator {
 }

basex-core/src/main/java/org/basex/query/func/fn/FnSequenceJoin.java

@@ -1,45 +1,10 @@
 package org.basex.query.func.fn;
 
-import org.basex.query.*;
-import org.basex.query.expr.*;
-import org.basex.query.func.*;
-import org.basex.query.iter.*;
-import org.basex.query.value.*;
-import org.basex.query.value.item.*;
-import org.basex.query.value.seq.*;
-import org.basex.query.value.type.*;
-
 /**
  * Function implementation.
  *
  * @author BaseX Team, BSD License
  * @author Christian Gruen
  */
-public class FnSequenceJoin extends StandardFunc {
-  @Override
-  public final Value value(final QueryContext qc) throws QueryException {
-    final Iter input = arg(0).iter(qc);
-    final Value separator = arg(1).value(qc);
-
-    final ValueBuilder vb = new ValueBuilder(qc);
-    Item item = input.next();
-    if(item != null) {
-      vb.add(item);
-      while((item = qc.next(input)) != null) vb.add(separator).add(item);
-    }
-    return vb.value(this);
-  }
-
-  @Override
-  protected final Expr opt(final CompileContext cc) {
-    final Expr values = arg(0), separator = arg(1);
-    final SeqType st = values.seqType(), stSep = separator.seqType();
-    if(st.zeroOrOne() || separator == Empty.VALUE) return values;
-
-    final long size = values.size(), sizeSep = separator.size();
-    final long sz = size != -1 && sizeSep != -1 ? size + sizeSep * (size - 1) : -1;
-    exprType.assign(st.union(stSep), st.occ, sz).data(values, separator);
-
-    return this;
-  }
+public final class FnSequenceJoin extends FnInsertSeparator {
 }

basex-core/src/test/java/org/basex/query/func/FnModuleTest.java

@@ -1615,6 +1615,26 @@ public final class FnModuleTest extends SandboxTest {
         "56zyx\n56zyx\n5zyx6\nzyx56\nzyx56");
   }
 
+  /** Test method. */
+  @Test public void insertSeparator() {
+    final Function func = INSERT_SEPARATOR;
+
+    query(func.args(" ()", " ()"), "");
+    query(func.args(" ()", 1), "");
+    query(func.args(1, " ()"), 1);
+    query(func.args(" (1, 2)", " ()"), "1\n2");
+
+    query(func.args(1, "a"), 1);
+    query(func.args(1, " ('a', 'b')"), 1);
+    query(func.args(" (1, 2)", "a"), "1\na\n2");
+    query(func.args(" (1, 2)", " ('a', 'b')"), "1\na\nb\n2");
+
+    check(func.args(1, "a") + " => count()", 1, root(Itr.class));
+    check(func.args(" 1[. = <_>1</_>]", "a"), 1, root(If.class));
+    check(func.args(" (1, 2)[. = <_>3</_>]", " 'a'"), "", root(func));
+    check(func.args(" (1, 2)", " 'a'[. = <_/>]"), "1\n2", root(func));
+  }
+
   /** Test method. */
   @Test public void invisibleXml() {
     final Function func = INVISIBLE_XML;
@@ -2906,26 +2926,6 @@ public final class FnModuleTest extends SandboxTest {
     query(func.args(" #xs:numeric") + " ? members() ? name", "#double\n#float\n#decimal");
   }
 
-  /** Test method. */
-  @Test public void sequenceJoin() {
-    final Function func = SEQUENCE_JOIN;
-
-    query(func.args(" ()", " ()"), "");
-    query(func.args(" ()", 1), "");
-    query(func.args(1, " ()"), 1);
-    query(func.args(" (1, 2)", " ()"), "1\n2");
-
-    query(func.args(1, "a"), 1);
-    query(func.args(1, " ('a', 'b')"), 1);
-    query(func.args(" (1, 2)", "a"), "1\na\n2");
-    query(func.args(" (1, 2)", " ('a', 'b')"), "1\na\nb\n2");
-
-    check(func.args(1, "a") + " => count()", 1, root(Itr.class));
-    check(func.args(" 1[. = <_>1</_>]", "a"), 1, root(If.class));
-    check(func.args(" (1, 2)[. = <_>3</_>]", " 'a'"), "", root(func));
-    check(func.args(" (1, 2)", " 'a'[. = <_/>]"), "1\n2", root(func));
-  }
-
   /** Test method. */
   @Test public void serialize() {
     final Function func = SERIALIZE;