roland/xo-alloc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-expression: generalize envframestack + handle explicit lm retturn

Browse source
This commit is contained in:
Roland Conybeare 2025-07-28 13:16:09 -04:00
commit 5c7b756bd1
15 changed files with 112 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xo-reader/src/reader/parser.cpp
View file

@ -11,8 +11,8 @@
#include "xo/expression/DefineExpr.hpp"
#include "xo/expression/Constant.hpp"
#include "xo/expression/ConvertExpr.hpp"
//#include "xo/expression/GlobalEnv.hpp"
#include "xo/expression/LocalEnv.hpp"
#include "xo/expression/GlobalEnv.hpp"
//#include "xo/expression/LocalEnv.hpp"
//#include <regex>
#include <stdexcept>
@ -28,7 +28,7 @@ namespace xo {
: psm_{debug_flag}
{
/* top-level environment. initially empty */
rp<LocalEnv> toplevel_env = LocalEnv::make_empty();
rp<Environment> toplevel_env = GlobalEnv::make_empty();
this->psm_.env_stack_.push_envframe(toplevel_env);
}
@ -70,6 +70,12 @@ namespace xo {
return psm_.result_;
} /*include_token*/
void
parser::reset_result()
{
psm_.result_ = parser_result::none();
}
void
parser::reset_to_idle_toplevel()
{