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

xo-reader2: ParserStateMachine w/ separate allocator

Browse source
This commit is contained in:
Roland Conybeare 2026-01-18 20:37:15 -05:00
commit e38b61ce76
4 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/reader2/ParserStateMachine.cpp
View file

@ -16,9 +16,10 @@ namespace xo {
using xo::facet::with_facet;
namespace scm {
ParserStateMachine::ParserStateMachine(const ArenaConfig & config)
ParserStateMachine::ParserStateMachine(const ArenaConfig & config,
obj<AAllocator> * expr_alloc)
: parser_alloc_{DArena::map(config)},
expr_alloc_{with_facet<AAllocator>::mkobj(&parser_alloc_)},
expr_alloc_{expr_alloc},
debug_flag_{config.debug_flag_}
{
}
@ -176,7 +177,9 @@ namespace xo {
xtag("ssm", ssm_name),
xtag("via", "ParserStateMachine::illegal_input_on_token"));
auto errmsg = DString::from_view(expr_alloc_,
assert(expr_alloc_);
auto errmsg = DString::from_view(*expr_alloc_,
std::string_view(errmsg_string));
this->capture_error(ssm_name, errmsg);

11
src/reader2/SchematikaParser.cpp
View file

@ -11,14 +11,17 @@
#include <stdexcept>
namespace xo {
using xo::mm::AAllocator;
using xo::tostr;
using xo::xtag;
namespace scm {
// ----- SchematikaParser -----
SchematikaParser::SchematikaParser(const ArenaConfig & config, bool debug_flag)
: psm_{config},
SchematikaParser::SchematikaParser(const ArenaConfig & config,
obj<AAllocator> * expr_alloc,
bool debug_flag)
: psm_{config, expr_alloc},
debug_flag_{debug_flag}
{
}
@ -35,13 +38,13 @@ namespace xo {
void
SchematikaParser::begin_interactive_session() {
DExprSeqState::establish_interactive(psm_.expr_alloc(), &psm_);
DExprSeqState::establish_interactive(*(psm_.expr_alloc()), &psm_);
}
void
SchematikaParser::begin_translation_unit() {
DExprSeqState::establish_batch(psm_.expr_alloc(), &psm_);
DExprSeqState::establish_batch(*(psm_.expr_alloc()), &psm_);
}
const ParserResult &