Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions build.mill
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ trait SjsonnetCrossModule extends CrossScalaModule with ScalafmtModule {
mvn"org.scala-lang.modules::scala-collection-compat::2.14.0"
)

def manifest = super.manifest().add(
"Enable-Native-Access" -> "net.jpountz.util.Native"
)
def manifest = super
.manifest()
.add(
"Enable-Native-Access" -> "net.jpountz.util.Native"
)

def generatedSources = Task {
os.write(
Expand Down
10 changes: 7 additions & 3 deletions sjsonnet/src/sjsonnet/stdlib/ArrayModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@ object ArrayModule extends AbstractFunctionModule {
private object FlattenArrays extends Val.Builtin1("flattenArrays", "arrs") {
def evalRhs(arrs: Lazy, ev: EvalScope, pos: Position): Val = {
val out = new mutable.ArrayBuilder.ofRef[Lazy]
for (x <- arrs.force.asArr) {
val arr = arrs.force.asArr
out.sizeHint(arr.length * 4) // Rough size hint
for (x <- arr) {
x.force match {
case Val.Null(_) => // do nothing
case v: Val.Arr => out ++= v.asLazyArray
Expand All @@ -226,9 +228,11 @@ object ArrayModule extends AbstractFunctionModule {

private object FlattenDeepArrays extends Val.Builtin1("flattenDeepArray", "value") {
def evalRhs(value: Lazy, ev: EvalScope, pos: Position): Val = {
val lazyArray = value.force.asArr.asLazyArray
val out = new mutable.ArrayBuilder.ofRef[Lazy]
val q = new java.util.ArrayDeque[Lazy]()
value.force.asArr.asLazyArray.foreach(q.add)
out.sizeHint(lazyArray.length)
val q = new java.util.ArrayDeque[Lazy](lazyArray.length)
lazyArray.foreach(q.add)
while (!q.isEmpty) {
q.removeFirst().force match {
case v: Val.Arr => v.asLazyArray.reverseIterator.foreach(q.push)
Expand Down
13 changes: 11 additions & 2 deletions sjsonnet/src/sjsonnet/stdlib/StringModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ object StringModule extends AbstractFunctionModule {
}

val b = new mutable.ArrayBuilder.ofRef[Lazy]
b.sizeHint(maxSplits)
var sz = 0
var i = 0
var start = 0
Expand Down Expand Up @@ -313,8 +314,16 @@ object StringModule extends AbstractFunctionModule {
}

private object EncodeUTF8 extends Val.Builtin1("encodeUTF8", "str") {
def evalRhs(s: Lazy, ev: EvalScope, pos: Position): Val =
Val.Arr(pos, s.force.asString.getBytes(UTF_8).map(i => Val.Num(pos, i & 0xff)))
def evalRhs(s: Lazy, ev: EvalScope, pos: Position): Val = {
val bytes = s.force.asString.getBytes(UTF_8)
val arr = new Array[Lazy](bytes.length)
var i = 0
while (i < bytes.length) {
arr(i) = Val.Num(pos, bytes(i) & 0xff)
i += 1
}
Val.Arr(pos, arr)
}
}

private object DecodeUTF8 extends Val.Builtin1("decodeUTF8", "arr") {
Expand Down