Add more cases to handle properly when --broken-assertion-logic is set and bump to 0.5.8 (#541)

Manual cherry picking of #540

Author: stephenamar-db

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.5.8
+* Add more cases to handle properly when --broken-assertion-logic is set
+
 ## 0.5.7
 * Add flag (--broken-assertion-logic) to disable the new (correct) assertion logic introduced in 0.5.5.
 

sjsonnet/src/sjsonnet/Materializer.scala

@@ -85,7 +85,7 @@ abstract class Materializer {
     case ujson.Obj(xs) =>
       val builder = new java.util.LinkedHashMap[String, Val.Obj.Member]
       for (x <- xs) {
-        val v = new Val.Obj.Member(false, Visibility.Normal) {
+        val v = new Val.Obj.Member(false, Visibility.Normal, deprecatedSkipAsserts = true) {
           def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val =
             reverse(pos, x._2)
         }

sjsonnet/src/sjsonnet/Std.scala

@@ -454,7 +454,7 @@ class Std(
       var i = 0
       while (i < allKeys.length) {
         val k = allKeys(i)
-        val v = new Val.Obj.Member(false, Visibility.Normal) {
+        val v = new Val.Obj.Member(false, Visibility.Normal, deprecatedSkipAsserts = true) {
           def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val =
             func.apply2(Val.Str(pos, k), () => obj.value(k, pos.noOffset)(ev), pos.noOffset)(
               ev,
@@ -1136,9 +1136,10 @@ class Std(
     builtin(Range),
     builtin("mergePatch", "target", "patch") { (pos, ev, target: Val, patch: Val) =>
       val mergePosition = pos
-      def createLazyMember(v: => Val) = new Val.Obj.Member(false, Visibility.Normal) {
-        def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val = v
-      }
+      def createLazyMember(v: => Val) =
+        new Val.Obj.Member(false, Visibility.Normal, deprecatedSkipAsserts = true) {
+          def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val = v
+        }
       def recPair(l: Val, r: Val): Val = (l, r) match {
         case (l: Val.Obj, r: Val.Obj) =>
           val keys: Array[String] = distinctKeys(l.visibleKeyNames, r.visibleKeyNames)
@@ -2001,14 +2002,14 @@ class Std(
       } ++ Seq(
       (
         "thisFile",
-        new Val.Obj.Member(false, Visibility.Hidden, cached = false) {
+        new Val.Obj.Member(false, Visibility.Hidden, cached = false, deprecatedSkipAsserts = true) {
           def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val =
             Val.Str(self.pos, fs.currentFile.relativeToString(ev.wd))
         }
       ),
       (
         "pi",
-        new Val.Obj.Member(false, Visibility.Hidden, cached = false) {
+        new Val.Obj.Member(false, Visibility.Hidden, cached = false, deprecatedSkipAsserts = true) {
           def invoke(self: Val.Obj, sup: Val.Obj, fs: FileScope, ev: EvalScope): Val =
             Val.Num(self.pos, math.Pi)
         }

sjsonnet/src/sjsonnet/Val.scala

@@ -203,12 +203,13 @@ object Val {
     abstract class Member(
         val add: Boolean,
         val visibility: Visibility,
-        val cached: Boolean = true) {
+        val cached: Boolean = true,
+        val deprecatedSkipAsserts: Boolean = false) {
       def invoke(self: Obj, sup: Obj, fs: FileScope, ev: EvalScope): Val
     }
 
     class ConstMember(add2: Boolean, visibility2: Visibility, v: Val, cached2: Boolean = true)
-        extends Member(add2, visibility2, cached2) {
+        extends Member(add2, visibility2, cached2, deprecatedSkipAsserts = true) {
       def invoke(self: Obj, sup: Obj, fs: FileScope, ev: EvalScope): Val = v
     }
 
@@ -443,7 +444,7 @@ object Val {
           case null =>
             if (s == null) null else s.valueRaw(k, self, pos, addTo, addKey)
           case m =>
-            if (!evaluator.settings.brokenAssertionLogic || !m.isInstanceOf[Val.Obj.ConstMember]) {
+            if (!evaluator.settings.brokenAssertionLogic || !m.deprecatedSkipAsserts) {
               self.triggerAllAsserts(evaluator.settings.brokenAssertionLogic)
             }
             val vv = m.invoke(self, s, pos.fileScope, evaluator)

sjsonnet/version

@@ -1 +1 @@
-0.5.7
+0.5.8