From 2a5632c70dcb686a7764c23a5f330fcb9a33c8a1 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@protonmail.com>
Date: Fri, 29 Apr 2022 10:02:17 -0600
Subject: incorporate PosIdx changes, symbol changes.

---
 src/libcmd/command.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libcmd/command.cc')

diff --git a/src/libcmd/command.cc b/src/libcmd/command.cc
index 82b35d16f..3e789adba 100644
--- a/src/libcmd/command.cc
+++ b/src/libcmd/command.cc
@@ -126,7 +126,7 @@ ref<EvalState> EvalCommand::getEvalState()
                               new DebugTraceStacker(
                                   *evalState,
                                   DebugTrace 
-                                        {.pos = (error->info().errPos ? *error->info().errPos : *expr.getPos()),
+                                        {.pos = (error->info().errPos ? *error->info().errPos : evalState->positions[expr.getPos()]),
                                          .expr = expr,
                                          .env = env,
                                          .hint = error->info().msg,
@@ -139,7 +139,7 @@ ref<EvalState> EvalCommand::getEvalState()
 
                 if (expr.staticenv)
                 {
-                    std::unique_ptr<valmap> vm(mapStaticEnvBindings(*expr.staticenv.get(), env));
+                    std::unique_ptr<valmap> vm(mapStaticEnvBindings(evalState->symbols, *expr.staticenv.get(), env));
                     runRepl(evalState, expr, *vm);
                 }
             };
-- 
cgit v1.2.3