mprove std.get and error messages

databricks · Dec 6, 2024 · dff0188 · dff0188
1 parent b5c269d
commit dff0188
Show file tree

Hide file tree

Showing 5 changed files with 252 additions and 159 deletions.
diff --git a/bench/src/main/scala/sjsonnet/ProfilingEvaluator.scala b/bench/src/main/scala/sjsonnet/ProfilingEvaluator.scala
@@ -157,7 +157,7 @@ class ProfilingEvaluator(resolver: CachedResolver,
     new Std().functions.foreachEntry((n, f) => names.put(f, n))
     val m = new mutable.HashMap[String, BuiltinBox]
     def add(b: ExprBox, func: Val.Builtin): Unit = {
-      val n = names.getOrDefault(func, func.getClass.getName)
+      val n = names.getOrDefault(func, func.functionName)
       val bb = m.getOrElseUpdate(n, new BuiltinBox(n))
       bb.time += b.time
       bb.count += b.count

diff --git a/sjsonnet/src/sjsonnet/Expr.scala b/sjsonnet/src/sjsonnet/Expr.scala
@@ -130,9 +130,15 @@ object Expr{
   case class Apply1(pos: Position, value: Expr, a1: Expr) extends Expr
   case class Apply2(pos: Position, value: Expr, a1: Expr, a2: Expr) extends Expr
   case class Apply3(pos: Position, value: Expr, a1: Expr, a2: Expr, a3: Expr) extends Expr
-  case class ApplyBuiltin(pos: Position, func: Val.Builtin, argExprs: Array[Expr]) extends Expr
-  case class ApplyBuiltin1(pos: Position, func: Val.Builtin1, a1: Expr) extends Expr
-  case class ApplyBuiltin2(pos: Position, func: Val.Builtin2, a1: Expr, a2: Expr) extends Expr
+  case class ApplyBuiltin(pos: Position, func: Val.Builtin, argExprs: Array[Expr]) extends Expr {
+    override def exprErrorString: String = s"std.${func.functionName}"
+  }
+  case class ApplyBuiltin1(pos: Position, func: Val.Builtin1, a1: Expr) extends Expr {
+    override def exprErrorString: String = s"std.${func.functionName}"
+  }
+  case class ApplyBuiltin2(pos: Position, func: Val.Builtin2, a1: Expr, a2: Expr) extends Expr {
+    override def exprErrorString: String = s"std.${func.functionName}"
+  }
   case class Select(pos: Position, value: Expr, name: String) extends Expr {
     override def exprErrorString: String = s"${super.exprErrorString} $name"
   }

diff --git a/sjsonnet/src/sjsonnet/Format.scala b/sjsonnet/src/sjsonnet/Format.scala
@@ -273,7 +273,7 @@ object Format{
     if (formatted.precision.contains(0) && !formatted.alternate) None else Some(fracLengths)
   }
 
-  class PartialApplyFmt(fmt: String) extends Val.Builtin1("values") {
+  class PartialApplyFmt(fmt: String) extends Val.Builtin1("format", "values") {
     val (leading, chunks) = fastparse.parse(fmt, format(_)).get.value
     def evalRhs(values0: Val, ev: EvalScope, pos: Position): Val =
       Val.Str(pos, format(leading, chunks, values0, pos)(ev))