Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize std.findSubstr and std.flattenArrays #216

Merged
merged 6 commits into from
Dec 5, 2024
Merged

Optimize std.findSubstr and std.flattenArrays #216

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9dac5c3
Optimize findSubstr
JoshRosen Nov 22, 2024
eb10497
Optimize flattenArrays
JoshRosen Nov 22, 2024
2477c40
retrigger tests
JoshRosen Dec 5, 2024
fa304b0
Revert "Optimize flattenArrays"
JoshRosen Dec 5, 2024
35bc8e1
Revert "Revert "Optimize flattenArrays""
JoshRosen Dec 5, 2024
fa73acf
2.12 fix
JoshRosen Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions sjsonnet/src/sjsonnet/Std.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,15 +463,15 @@ class Std {

private object FlattenArrays extends Val.Builtin1("arrs") {
def evalRhs(arrs: Val, ev: EvalScope, pos: Position): Val = {
val out = new mutable.ArrayBuffer[Lazy]
val out = new mutable.ArrayBuilder.ofRef[Lazy]
for(x <- arrs.asArr) {
x match{
case Val.Null(_) => // do nothing
case v: Val.Arr => out.appendAll(v.asLazyArray)
case v: Val.Arr => out ++= v.asLazyArray
case x => Error.fail("Cannot call flattenArrays on " + x)
}
}
new Val.Arr(pos, out.toArray)
new Val.Arr(pos, out.result())
}
}
private object Reverse extends Val.Builtin1("arrs") {
Expand Down Expand Up @@ -922,13 +922,16 @@ class Std {
builtin("findSubstr", "pat", "str") { (pos, ev, pat: String, str: String) =>
if (pat.length == 0) new Val.Arr(pos, emptyLazyArray)
else {
val indices = mutable.ArrayBuffer[Int]()
var matchIndex = str.indexOf(pat)
while (0 <= matchIndex && matchIndex < str.length) {
indices.append(matchIndex)
matchIndex = str.indexOf(pat, matchIndex + 1)
if (matchIndex == -1) new Val.Arr(pos, emptyLazyArray)
else {
val indices = new mutable.ArrayBuilder.ofRef[Val.Num]
while (0 <= matchIndex && matchIndex < str.length) {
indices.+=(Val.Num(pos, matchIndex))
matchIndex = str.indexOf(pat, matchIndex + 1)
}
new Val.Arr(pos, indices.result())
}
new Val.Arr(pos, indices.map(x => Val.Num(pos, x)).toArray)
}
},
"substr" -> Substr,
Expand Down
Loading