Merge branch 'debug-exploratory-PR' into debuggerHook-eval-arg

2022-05-19 11:07:18 -06:00
parent 667074b586 357fb84dba
commit f9cdb6af8d
6 changed files with 69 additions and 57 deletions
@@ -137,9 +137,10 @@ ref<EvalState> EvalCommand::getEvalState()
                if (error)
                    printError("%s\n\n" ANSI_BOLD "Starting REPL to allow you to inspect the current state of the evaluator.\n" ANSI_NORMAL, error->what());

-                if (expr.staticEnv) {
-                    auto vm = mapStaticEnvBindings(evalState.symbols, *expr.staticEnv.get(), env);
-                    runRepl(*const_cast<EvalState*>(&evalState), *vm);
+                auto se = evalState->getStaticEnv(expr);
+                if (se) {
+                    auto vm = mapStaticEnvBindings(evalState->symbols, *se.get(), env);
+                    runRepl(evalState, *vm);
                }
            };
    }