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

xo-reader2: bugfix: move toplevel ExprSeqState to parser stack

Browse source
This commit is contained in:
Roland Conybeare 2026-02-16 11:08:21 -05:00
commit 5224799479
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/reader2/DExprSeqState.cpp
View file

@ -35,6 +35,7 @@ namespace xo {
using xo::scm::DFloat;
using xo::mm::AGCObject;
using xo::mm::AAllocator;
using xo::mm::DArena;
using xo::facet::with_facet;
using xo::reflect::typeseq;
@ -59,7 +60,7 @@ namespace xo {
namespace {
obj<ASyntaxStateMachine>
make_exprseq_ssm(obj<AAllocator> mm,
make_exprseq_ssm(DArena & mm,
exprseqtype seqtype)
{
void * mem = mm.alloc(typeseq::id<DExprSeqState>(),
@ -67,12 +68,12 @@ namespace xo {
DExprSeqState * ssm = new (mem) DExprSeqState(seqtype);
return with_facet<ASyntaxStateMachine>::mkobj(ssm);
return obj<ASyntaxStateMachine,DExprSeqState>(ssm);
}
}
void
DExprSeqState::establish_interactive(obj<AAllocator> mm,
DExprSeqState::establish_interactive(DArena & mm,
ParserStateMachine * p_psm)
{
p_psm->establish_toplevel_ssm(make_exprseq_ssm
@ -81,7 +82,7 @@ namespace xo {
}
void
DExprSeqState::establish_batch(obj<AAllocator> mm,
DExprSeqState::establish_batch(DArena & mm,
ParserStateMachine * p_psm)
{
p_psm->establish_toplevel_ssm(make_exprseq_ssm

4
src/reader2/SchematikaParser.cpp
View file

@ -65,14 +65,14 @@ namespace xo {
void
SchematikaParser::begin_interactive_session()
{
DExprSeqState::establish_interactive(psm_.expr_alloc(), &psm_);
DExprSeqState::establish_interactive(psm_.parser_alloc(), &psm_);
}
void
SchematikaParser::begin_batch_session()
{
DExprSeqState::establish_batch(psm_.expr_alloc(), &psm_);
DExprSeqState::establish_batch(psm_.parser_alloc(), &psm_);
}
const ParserResult &