Merge pull request #673 from altrisi/fix-split

Fix split
This commit is contained in:
gnembon authored and GitHub committed 2021-01-14 23:57:28 -04:00
commit 4694e40bdd
3 files changed
+11 -2

No files matched your search

@@ -57,7 +57,7 @@ public class DataStructures {
if (lv.size() == 1) if (lv.size() == 1)
{ {
hwat = lv.get(0); hwat = lv.get(0);
delimiter = StringValue.EMPTY; delimiter = null;
} }
else if (lv.size() == 2) else if (lv.size() == 2)
{ {
@@ -350,6 +350,11 @@ public class ListValue extends AbstractListValue implements ContainerValueInterf
@Override @Override
public Value split(Value delimiter) { public Value split(Value delimiter) {
ListValue result = new ListValue(); ListValue result = new ListValue();
if (delimiter == null)
{
this.forEach(item -> result.items.add(of(item)));
return result;
}
int startIndex = 0; int startIndex = 0;
int index = 0; int index = 0;
for (Value val : this.items) for (Value val : this.items)
+5 -1
View File
@@ -193,7 +193,11 @@ public abstract class Value implements Comparable<Value>, Cloneable
public Value split(Value delimiter) public Value split(Value delimiter)
{ {
try if (delimiter == null)
{
delimiter = StringValue.EMPTY;
}
try
{ {
return ListValue.wrap(Arrays.stream(getString().split(delimiter.getString())).map(StringValue::new).collect(Collectors.toList())); return ListValue.wrap(Arrays.stream(getString().split(delimiter.getString())).map(StringValue::new).collect(Collectors.toList()));
} }