Fix additional discrepancies found when importing go-jsonnet tests. (#436)

- Re-add pow6 test case. The difference for large numbers is
insignificant (it's due to difference on how the jdk handles decimal
exponents)
- Fix tailstrict evaluation when default args are present.
- Fix std.char
- Fix |/^ bit operators

Author: stephenamar-db

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

@@ -33,7 +33,8 @@ object MainBenchmark {
       Map.empty[String, String],
       Map.empty[String, String],
       OsPath(wd),
-      importer = SjsonnetMain.resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)), None),
+      importer = SjsonnetMain
+        .resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)), None),
       parseCache = parseCache
     )
     val renderer = new Renderer(new StringWriter, indent = 3)

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

@@ -33,7 +33,10 @@ class MaterializerBenchmark {
       Map.empty[String, String],
       OsPath(wd),
       importer = SjsonnetMain
-        .resolveImport(config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq, None),
+        .resolveImport(
+          config.getOrderedJpaths.map(os.Path(_, wd)).map(OsPath(_)).toIndexedSeq,
+          None
+        ),
       parseCache = new DefaultParseCache
     )
     value = interp.evaluate(os.read(path), OsPath(path)).getOrElse(???)

sjsonnet/src/sjsonnet/Evaluator.scala

@@ -595,14 +595,14 @@ class Evaluator(
       case Expr.BinaryOp.OP_^ =>
         (l, r) match {
           case (l: Val.Num, r: Val.Num) =>
-            Val.Num(pos, (l.asSafeLong ^ r.asSafeLong).toDouble)
+            Val.Num(pos, (l.asLong ^ r.asLong).toDouble)
           case _ => fail()
         }
 
       case Expr.BinaryOp.OP_| =>
         (l, r) match {
           case (l: Val.Num, r: Val.Num) =>
-            Val.Num(pos, (l.asSafeLong | r.asSafeLong).toDouble)
+            Val.Num(pos, (l.asLong | r.asLong).toDouble)
           case _ => fail()
         }
 

sjsonnet/src/sjsonnet/Std.scala

@@ -596,7 +596,7 @@ class Std(
       if (!Character.isValidCodePoint(c)) {
         Error.fail(s"Invalid unicode code point, got " + c)
       }
-      Val.Str(pos, c.toChar.toString)
+      Val.Str(pos, Character.toString(c))
     }
   }
 

sjsonnet/src/sjsonnet/Val.scala

@@ -526,7 +526,7 @@ object Val {
         case p    => p.fileScope
       }
       // println(s"apply: argsL: ${argsL.length}, namedNames: $namedNames, paramNames: ${params.names.mkString(",")}")
-      if (simple || tailstrictMode == TailstrictModeEnabled) {
+      if (simple) {
         if (tailstrictMode == TailstrictModeEnabled) {
           argsL.foreach(_.force)
         }
@@ -585,6 +585,9 @@ object Val {
             )
           }
         }
+        if (tailstrictMode == TailstrictModeEnabled) {
+          argVals.foreach(_.force)
+        }
         evalRhs(newScope, ev, funDefFileScope, outerPos)
       }
     }

sjsonnet/test/resources/go_test_suite/pow6.jsonnet

@@ -1,2 +1,2 @@
 // roughly the largest possible double
-std.pow(1.1, 7447.081)
+std.pow(1.1, 7447)

sjsonnet/test/resources/go_test_suite/pow6.jsonnet.golden

@@ -1 +1 @@
-179754255558423237941456473541041914055900576989066323324790225489927405882855355678287600996768561249516179005117487900995816670389973592784065259754879901383672166545582558984633189841112133404180226485873094649946308637416044832879263264479292996247265876810814717146304544813220293475007274508971205984256
+178371873262215010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

sjsonnet/test/resources/go_test_suite/tailstrict3.jsonnet.golden

@@ -1,15 +1,3 @@
-RUNTIME ERROR: xxx
--------------------------------------------------
-	testdata/tailstrict3:1:16-27	function <foo>
-
-local foo(x, y=error "xxx")=x;
-
--------------------------------------------------
-	testdata/tailstrict3:2:1-8	$
-
-foo(42) tailstrict
-
--------------------------------------------------
-	During evaluation	
-
-
+sjsonnet.Error: xxx
+    at [Error].(sjsonnet/test/resources/go_test_suite/tailstrict3.jsonnet:1:16)
+    at [Apply1].(sjsonnet/test/resources/go_test_suite/tailstrict3.jsonnet:2:4)

sjsonnet/test/src-js/sjsonnet/FileTests.scala

@@ -20,11 +20,7 @@ object FileTests extends BaseFileTests {
   )
 
   val goTestDataSkippedTests: Set[String] = Set(
-    "bitwise_or9.jsonnet",
-    "builtinChar6.jsonnet",
-    "pow6.jsonnet",
     "object_invariant_plus.jsonnet",
-    "tailstrict3.jsonnet",
     "stdlib_smoke_test.jsonnet",
     "builtinSha1.jsonnet",
     "builtinSha256.jsonnet",

sjsonnet/test/src-jvm-native/sjsonnet/FileTests.scala

@@ -19,11 +19,7 @@ object FileTests extends BaseFileTests {
           Set.empty[String]
         })
   val goTestDataSkippedTests: Set[String] = Set(
-    "bitwise_or9.jsonnet",
-    "builtinChar6.jsonnet",
-    "pow6.jsonnet",
-    "object_invariant_plus.jsonnet",
-    "tailstrict3.jsonnet"
+    "object_invariant_plus.jsonnet"
   ) ++ (if (isScalaNative)
           Set(
             "stdlib_smoke_test.jsonnet",