From 8cf6ae86648336bd67a1555302b21576b790c368 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@protonmail.com>
Date: Thu, 2 Jun 2022 12:29:38 -0600
Subject: [PATCH] use Counter class to count tryEval levels

---
 src/libexpr/primops.cc | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index e4fd8f650..ecc1c136a 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -846,22 +846,30 @@ static RegisterPrimOp primop_floor({
     .fun = prim_floor,
 });
 
+class Counter
+{
+    private:
+        int &counter;
+    public:
+        Counter(int &counter) :counter(counter) { counter++; }
+        ~Counter() { counter--; }
+};
+
 /* Try evaluating the argument. Success => {success=true; value=something;},
  * else => {success=false; value=false;} */
 static void prim_tryEval(EvalState & state, const PosIdx pos, Value * * args, Value & v)
 {
     auto attrs = state.buildBindings(2);
 
+    /* increment state.trylevel, and decrement it when this function returns. */
+    Counter trylevel(state.trylevel);
+
     void (* savedDebugRepl)(ref<EvalState> es, const ValMap & extraEnv) = nullptr;
-    if (state.debugRepl)
+    if (state.debugRepl && state.ignoreTry)
     {
-        state.trylevel++;
-        if (state.ignoreTry)
-        {
-            // to prevent starting the repl from exceptions withing a tryEval, null it.
-            savedDebugRepl = state.debugRepl;
-            state.debugRepl = nullptr;
-        }
+        /* to prevent starting the repl from exceptions withing a tryEval, null it. */
+        savedDebugRepl = state.debugRepl;
+        state.debugRepl = nullptr;
     }
 
     try {
@@ -877,9 +885,6 @@ static void prim_tryEval(EvalState & state, const PosIdx pos, Value * * args, Va
     if (savedDebugRepl)
         state.debugRepl = savedDebugRepl;
 
-    if (state.debugRepl)
-        state.trylevel--;
-
     v.mkAttrs(attrs);
 }