error message includes function and constructor name

hemmecke · Apr 3, 2024 · 4b56421 · 4b56421
1 parent a85f1ca
commit 4b56421
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
@@ -481,10 +481,16 @@ try_constant_DF(mant, exp, m, e) ==
 
 compForm1(form is [op,:argl],m,e) ==
   op="error" =>
+      constr :=
+          NULL($functorForm) => nil
+          first($functorForm)
+      fun :=
+          $op = constr => nil
+          $op
       #argl = 1 =>
           arg := first(argl)
           u := comp(arg, $String, e) =>
-              [[op, u.expr], m, e]
+              [["error3", MKQ(constr), MKQ(fun), u.expr], m, e]
           SAY ['"compiling call to error ", argl]
           u := outputComp(arg, e) =>
               [[op, ['LIST, ['QUOTE, 'mathprint], u.expr]], m, e]

diff --git a/src/interp/g-error.boot b/src/interp/g-error.boot
@@ -171,6 +171,9 @@ userError x == errorSupervisor($UserError,x)
 
 error(x) == errorSupervisor($AlgebraError,x)
 
+error3(con, fun, mess) ==
+    errorSupervisor($AlgebraError, [STRCONC(fun, '" $ ", con, '": "), mess])
+
 nice_failure_msg(val, branch, umode) ==
     uname := devaluate(umode)
     of1 := coerceUn2E(val, uname);