Refactor std.native functions out of Std (#442)

In this PR,
I move xz/gzip/regex outside of Std, and move testing infrastructure to
per-language directory.

Author: stephenamar-db

bench/src/main/scala/sjsonnet/MainBenchmark.scala

@@ -33,7 +33,7 @@ object MainBenchmark {
       Map.empty[String, String],
       Map.empty[String, String],
       OsPath(wd),
-      importer = SjsonnetMain
+      importer = SjsonnetMainBase
         .resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)), None),
       parseCache = parseCache
     )
@@ -65,7 +65,7 @@ class MainBenchmark {
   @Benchmark
   def main(bh: Blackhole): Unit = {
     bh.consume(
-      SjsonnetMain.main0(
+      SjsonnetMainBase.main0(
         MainBenchmark.mainArgs,
         new DefaultParseCache,
         System.in,
@@ -102,7 +102,7 @@ object MemoryBenchmark {
     } else {
       false
     }
-    SjsonnetMain.main0(
+    SjsonnetMainBase.main0(
       MainBenchmark.mainArgs,
       cache,
       System.in,

bench/src/main/scala/sjsonnet/MaterializerBenchmark.scala

@@ -32,7 +32,7 @@ class MaterializerBenchmark {
       Map.empty[String, String],
       Map.empty[String, String],
       OsPath(wd),
-      importer = SjsonnetMain
+      importer = SjsonnetMainBase
         .resolveImport(
           config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq,
           None

bench/src/main/scala/sjsonnet/MultiThreadedBenchmark.scala

@@ -39,7 +39,7 @@ class MultiThreadedBenchmark {
       pool.submit {
         (() =>
           if (
-            SjsonnetMain.main0(
+            SjsonnetMainBase.main0(
               MainBenchmark.mainArgs,
               cache, // new DefaultParseCache
               System.in,

bench/src/main/scala/sjsonnet/RunProfiler.scala

@@ -15,7 +15,7 @@ object RunProfiler extends App {
     Map.empty[String, String],
     Map.empty[String, String],
     OsPath(wd),
-    importer = SjsonnetMain
+    importer = SjsonnetMainBase
       .resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq, None),
     parseCache = parseCache
   ) {

build.mill

@@ -102,7 +102,8 @@ object sjsonnet extends VersionFileModule {
       def jsEnvConfig = JsEnvConfig.NodeJs(args = List("--stack-size=" + stackSizekBytes))
       def resources = T.sources(
         this.millSourcePath / "resources" / "test_suite",
-        this.millSourcePath / "resources" / "go_test_suite"
+        this.millSourcePath / "resources" / "go_test_suite",
+        this.millSourcePath / "resources" / "new_test_suite",
       )
       def generatedSources = T {
         resources().map(_.path).flatMap { testSuite =>

sjsonnet/server/src/sjsonnet/SjsonnetServerMain.scala

@@ -80,7 +80,7 @@ object SjsonnetServerMain extends SjsonnetServerMain[DefaultParseCache] {
         scala.Console.withIn(stdin) {
           scala.Console.withOut(stdout) {
             scala.Console.withErr(stderr) {
-              sjsonnet.SjsonnetMain.main0(args, stateCache2, stdin, stdout, stderr, wd) == 0
+              sjsonnet.SjsonnetMainBase.main0(args, stateCache2, stdin, stdout, stderr, wd) == 0
             }
           }
         }

sjsonnet/src-js/sjsonnet/Platform.scala

@@ -2,25 +2,11 @@ package sjsonnet
 
 import org.virtuslab.yaml.*
 
-import java.io.File
 import java.util
 import java.util.regex.Pattern
 import scala.collection.mutable
 
 object Platform {
-  def gzipBytes(s: Array[Byte]): String = {
-    throw new Exception("GZip not implemented in Scala.js")
-  }
-  def gzipString(s: String): String = {
-    throw new Exception("GZip not implemented in Scala.js")
-  }
-  def xzBytes(s: Array[Byte], compressionLevel: Option[Int]): String = {
-    throw new Exception("XZ not implemented in Scala.js")
-  }
-  def xzString(s: String, compressionLevel: Option[Int]): String = {
-    throw new Exception("XZ not implemented in Scala.js")
-  }
-
   private def nodeToJson(node: Node): ujson.Value = node match {
     case _: Node.ScalarNode =>
       YamlDecoder.forAny.construct(node).getOrElse("") match {
@@ -98,9 +84,6 @@ object Platform {
   def sha3(s: String): String = {
     throw new Exception("SHA3 not implemented in Scala.js")
   }
-  def hashFile(file: File): String = {
-    throw new Exception("hashFile not implemented in Scala.js")
-  }
 
   private val regexCache = new util.concurrent.ConcurrentHashMap[String, Pattern]
   private val namedGroupPattern = Pattern.compile("\\(\\?<(.+?)>.*?\\)")

sjsonnet/src-js/sjsonnet/SjsonnetMain.scala

@@ -1,5 +1,7 @@
 package sjsonnet
 
+import sjsonnet.stdlib.NativeRegex
+
 import scala.collection.mutable
 import scala.scalajs.js
 import scala.scalajs.js.annotation.{JSExport, JSExportTopLevel}
@@ -39,7 +41,8 @@ object SjsonnetMain {
           }
       },
       parseCache = new DefaultParseCache,
-      new Settings(preserveOrder = preserveOrder)
+      settings = new Settings(preserveOrder = preserveOrder),
+      std = new Std(nativeFunctions = Map.from(new NativeRegex().functions)).Std
     )
     interp.interpret0(text, JsVirtualPath("(memory)"), ujson.WebJson.Builder) match {
       case Left(msg) => throw new js.JavaScriptException(msg)

…c-jvm-native/sjsonnet/SjsonnetMain.scala …m-native/sjsonnet/SjsonnetMainBase.scalasjsonnet/src-jvm-native/sjsonnet/SjsonnetMain.scala renamed to sjsonnet/src-jvm-native/sjsonnet/SjsonnetMainBase.scala sjsonnet/src-jvm-native/sjsonnet/SjsonnetMain.scala renamed to sjsonnet/src-jvm-native/sjsonnet/SjsonnetMainBase.scala

@@ -13,7 +13,7 @@ import java.nio.file.NoSuchFileException
 import scala.annotation.unused
 import scala.util.Try
 
-object SjsonnetMain {
+object SjsonnetMainBase {
   def resolveImport(
       searchRoots0: Seq[Path], // Evaluated in order, first occurrence wins
       allowedInputs: Option[Set[os.Path]] = None,
@@ -60,19 +60,6 @@ object SjsonnetMain {
       }
     }
 
-  def main(args: Array[String]): Unit = {
-    val exitCode = main0(
-      args,
-      new DefaultParseCache,
-      System.in,
-      System.out,
-      System.err,
-      os.pwd,
-      None
-    )
-    System.exit(exitCode)
-  }
-
   def main0(
       args: Array[String],
       parseCache: ParseCache,

sjsonnet/src-jvm-native/sjsonnet/stdlib/NativeGzip.scala

@@ -0,0 +1,19 @@
+package sjsonnet.stdlib
+
+import sjsonnet.functions.AbstractFunctionModule
+import sjsonnet.{Error, EvalScope, Lazy, Platform, Position, Val}
+
+class NativeGzip extends AbstractFunctionModule {
+  def name = "gzip"
+
+  val functions: Seq[(String, Val.Builtin)] = Seq(
+    "gzip" -> new Val.Builtin1("gzip", "v") {
+      override def evalRhs(v: Lazy, ev: EvalScope, pos: Position): Val = v.force match {
+        case Val.Str(_, value) => Val.Str(pos, Platform.gzipString(value))
+        case arr: Val.Arr      =>
+          Val.Str(pos, Platform.gzipBytes(arr.iterator.map(_.cast[Val.Num].asInt.toByte).toArray))
+        case x => Error.fail("Cannot gzip encode " + x.prettyName)
+      }
+    }
+  )
+}