Merge branch 'devel' of github.com:nim-lang/Nim into devel

2 files changed, 21 insertions, 0 deletions

diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim
index 14877eb4d..8b5db49ed 100644
--- a/lib/pure/strutils.nim
+++ b/lib/pure/strutils.nim
@@ -808,6 +808,8 @@ proc split*(s: string, sep: string, maxsplit: int = -1): seq[string] {.noSideEff
   ##
   ## Substrings are separated by the string `sep`. This is a wrapper around the
   ## `split iterator <#split.i,string,string>`_.
+  doAssert(sep.len > 0)
+  
   accumulateResult(split(s, sep, maxsplit))
 
 proc rsplit*(s: string, seps: set[char] = Whitespace,
diff --git a/tests/stdlib/tsplit2.nim b/tests/stdlib/tsplit2.nim
new file mode 100644
index 000000000..7fd9dda74
--- /dev/null
+++ b/tests/stdlib/tsplit2.nim
@@ -0,0 +1,19 @@
+discard """
+  file: "tsplit2.nim"
+  output: "true"
+"""
+import strutils
+
+var s = ""
+for w in split("|abc|xy|z", {'|'}):
+  s.add("#")
+  s.add(w)
+
+try:
+  discard "hello".split("")
+  echo "false"
+except AssertionError:
+  echo "true"
+
+#OUT true
+