xo-reader2: + DExpectFormalArgSsm [WIP]
This commit is contained in:
parent
254d7c179d
commit
66158551c7
12 changed files with 679 additions and 16 deletions
|
|
@ -37,6 +37,10 @@ set(SELF_SRCS
|
|||
ISyntaxStateMachine_DExpectFormalArglistSsm.cpp
|
||||
IPrintable_DExpectFormalArglistSsm.cpp
|
||||
|
||||
DExpectFormalArgSsm.cpp
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm.cpp
|
||||
# IPrintable_DExpectFormalArgSsm.cpp
|
||||
|
||||
DExpectSymbolSsm.cpp
|
||||
ISyntaxStateMachine_DExpectSymbolSsm.cpp
|
||||
IPrintable_DExpectSymbolSsm.cpp
|
||||
|
|
|
|||
235
src/reader2/DExpectFormalArgSsm.cpp
Normal file
235
src/reader2/DExpectFormalArgSsm.cpp
Normal file
|
|
@ -0,0 +1,235 @@
|
|||
/** @file DExpectFormalArgSsm.cpp
|
||||
*
|
||||
* @author Roland Conybeare, Jan 2026
|
||||
**/
|
||||
|
||||
#include "DExpectFormalArgSsm.hpp"
|
||||
|
||||
#ifdef NOT_YET
|
||||
#include "expect_symbol_xs.hpp"
|
||||
#include "expect_type_xs.hpp"
|
||||
#include "parserstatemachine.hpp"
|
||||
#include "exprstatestack.hpp"
|
||||
#include "xo/expression/Variable.hpp"
|
||||
#endif
|
||||
|
||||
namespace xo {
|
||||
using xo::scm::DVariable;
|
||||
using xo::reflect::TypeDescr;
|
||||
using xo::facet::typeseq;
|
||||
|
||||
namespace scm {
|
||||
const char *
|
||||
formalstatetype_descr(formalstatetype x) {
|
||||
switch (x) {
|
||||
case formalstatetype::invalid:
|
||||
case formalstatetype::n_formalstatetype:
|
||||
return "?formalstatetype";
|
||||
case formalstatetype::formal_0:
|
||||
return "formal_0";
|
||||
case formalstatetype::formal_1:
|
||||
return "formal_1";
|
||||
case formalstatetype::formal_2:
|
||||
return "formal_2";
|
||||
}
|
||||
|
||||
return "???formalstatetype";
|
||||
}
|
||||
|
||||
DExpectFormalArgSsm::DExpectFormalArgSsm() = default;
|
||||
|
||||
DExpectFormalArgSsm *
|
||||
DExpectFormalArgSsm::_make(DArena & mm)
|
||||
{
|
||||
void * mem = mm.alloc(typeseq::id<DExpectFormalArgSsm>(), sizeof(DExpectFormalArgSsm));
|
||||
|
||||
return new (mem) DExpectFormalArgSsm();
|
||||
}
|
||||
|
||||
syntaxstatetype
|
||||
DExpectFormalArgSsm::ssm_type() const noexcept {
|
||||
return syntaxstatetype::expect_formal_arg;
|
||||
}
|
||||
|
||||
std::string_view
|
||||
DExpectFormalArgSsm::get_expect_str() const noexcept
|
||||
{
|
||||
switch(fstate_) {
|
||||
case formalstatetype::invalid:
|
||||
case formalstatetype::n_formalstatetype:
|
||||
break;
|
||||
case formalstatetype::formal_0:
|
||||
return "formal-name";
|
||||
case formalstatetype::formal_1:
|
||||
return "colon|typename";
|
||||
case formalstatetype::formal_2:
|
||||
return "typename";
|
||||
}
|
||||
|
||||
return "?expect";
|
||||
}
|
||||
|
||||
/** update state on incoming token @p tk,
|
||||
* with overall parser state in @p p_psm
|
||||
**/
|
||||
void
|
||||
DExpectFormalArgSsm::on_token(const Token & tk,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
switch (tk.tk_type()) {
|
||||
// all the not-yet-handled cases
|
||||
case tokentype::tk_leftparen:
|
||||
case tokentype::tk_lambda:
|
||||
case tokentype::tk_def:
|
||||
case tokentype::tk_if:
|
||||
case tokentype::tk_symbol:
|
||||
case tokentype::tk_colon:
|
||||
case tokentype::tk_singleassign:
|
||||
case tokentype::tk_string:
|
||||
case tokentype::tk_f64:
|
||||
case tokentype::tk_i64:
|
||||
case tokentype::tk_bool:
|
||||
case tokentype::tk_semicolon:
|
||||
case tokentype::tk_invalid:
|
||||
case tokentype::tk_rightparen:
|
||||
case tokentype::tk_leftbracket:
|
||||
case tokentype::tk_rightbracket:
|
||||
case tokentype::tk_leftbrace:
|
||||
case tokentype::tk_rightbrace:
|
||||
case tokentype::tk_leftangle:
|
||||
case tokentype::tk_rightangle:
|
||||
case tokentype::tk_lessequal:
|
||||
case tokentype::tk_greatequal:
|
||||
case tokentype::tk_dot:
|
||||
case tokentype::tk_comma:
|
||||
case tokentype::tk_doublecolon:
|
||||
case tokentype::tk_assign:
|
||||
case tokentype::tk_yields:
|
||||
case tokentype::tk_plus:
|
||||
case tokentype::tk_minus:
|
||||
case tokentype::tk_star:
|
||||
case tokentype::tk_slash:
|
||||
case tokentype::tk_cmpeq:
|
||||
case tokentype::tk_cmpne:
|
||||
case tokentype::tk_type:
|
||||
case tokentype::tk_then:
|
||||
case tokentype::tk_else:
|
||||
case tokentype::tk_let:
|
||||
case tokentype::tk_in:
|
||||
case tokentype::tk_end:
|
||||
case tokentype::N:
|
||||
break;
|
||||
}
|
||||
|
||||
p_psm->illegal_input_on_token("DExpectFormalArgSsm::on_token",
|
||||
tk,
|
||||
this->get_expect_str());
|
||||
}
|
||||
|
||||
void
|
||||
DExpectFormalArgSsm::on_parsed_symbol(std::string_view sym,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
p_psm->illegal_input_on_symbol("DExpectFormalArgSsm::on_parsed_symbol",
|
||||
sym,
|
||||
this->get_expect_str());
|
||||
}
|
||||
|
||||
void
|
||||
DExpectFormalArgSsm::on_parsed_typedescr(TypeDescr td,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
p_psm->illegal_input_on_typedescr("DExpectFormalArgSsm::on_parsed_typedescr",
|
||||
td,
|
||||
this->get_expect_str());
|
||||
}
|
||||
|
||||
void
|
||||
DExpectFormalArgSsm::on_parsed_expression(obj<AExpression> expr,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
p_psm->illegal_parsed_expression("DExpectFormalArgSsm::on_parsed_expression",
|
||||
expr,
|
||||
this->get_expect_str());
|
||||
}
|
||||
|
||||
void
|
||||
DExpectFormalArgSsm::on_parsed_expression_with_semicolon(obj<AExpression> expr,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
p_psm->illegal_parsed_expression("DExpectFormalArgSsm::on_parsed_expression_with_semicolon",
|
||||
expr,
|
||||
this->get_expect_str());
|
||||
}
|
||||
#ifdef NOT_YET
|
||||
void
|
||||
DExpectFormalSsm::start(ParserStateMachine * p_psm) {
|
||||
p_psm->push_exprstate(expect_formal_xs::make());
|
||||
|
||||
expect_symbol_xs::start(p_psm);
|
||||
}
|
||||
|
||||
expect_formal_xs::expect_formal_xs()
|
||||
: exprstate(exprstatetype::expect_formal)
|
||||
{}
|
||||
|
||||
void
|
||||
expect_formal_xs::on_symbol(const std::string & symbol_name,
|
||||
parserstatemachine * p_psm)
|
||||
{
|
||||
if (this->formalxs_type_ == formalstatetype::formal_0) {
|
||||
this->formalxs_type_ = formalstatetype::formal_1;
|
||||
this->result_.assign_name(symbol_name);
|
||||
} else {
|
||||
exprstate::on_symbol(symbol_name, p_psm);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
expect_formal_xs::on_colon_token(const token_type & tk,
|
||||
parserstatemachine * p_psm)
|
||||
{
|
||||
if (this->formalxs_type_ == formalstatetype::formal_1) {
|
||||
this->formalxs_type_ = formalstatetype::formal_2;
|
||||
expect_type_xs::start(p_psm);
|
||||
/* control reenters via expect_formal_xs::on_typedescr() */
|
||||
} else {
|
||||
exprstate::on_colon_token(tk,
|
||||
p_psm);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
expect_formal_xs::on_typedescr(TypeDescr td,
|
||||
parserstatemachine * p_psm)
|
||||
{
|
||||
if (this->formalxs_type_ == formalstatetype::formal_2) {
|
||||
this->result_.assign_td(td);
|
||||
|
||||
std::unique_ptr<exprstate> self = p_psm->pop_exprstate();
|
||||
|
||||
rp<Variable> var = Variable::make(result_.name(),
|
||||
result_.td());
|
||||
|
||||
p_psm->top_exprstate().on_formal(var, p_psm);
|
||||
} else {
|
||||
exprstate::on_typedescr(td, p_psm);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
expect_formal_xs::print(std::ostream & os) const {
|
||||
os << "<expect_formal_xs"
|
||||
<< xtag("type", formalxs_type_);
|
||||
if (!result_.name().empty())
|
||||
os << xtag("result.name", result_.name());
|
||||
if (result_.td())
|
||||
os << xtag("result.td", result_.td());
|
||||
os << ">";
|
||||
}
|
||||
#endif
|
||||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
|
||||
/* end DExpectFormalArgSsm.cpp */
|
||||
|
|
@ -5,7 +5,10 @@
|
|||
|
||||
#include "DExpectFormalArglistSsm.hpp"
|
||||
#include "ssm/ISyntaxStateMachine_DExpectFormalArglistSsm.hpp"
|
||||
#include <xo/printable2/Printable.hpp>
|
||||
#include <xo/alloc2/arena/IAllocator_DArena.hpp>
|
||||
#include <xo/facet/FacetRegistry.hpp>
|
||||
#include <xo/indentlog/scope.hpp>
|
||||
|
||||
#ifdef NOT_YET
|
||||
#include "parserstatemachine.hpp"
|
||||
|
|
@ -17,8 +20,12 @@
|
|||
#endif
|
||||
|
||||
namespace xo {
|
||||
using xo::mm::AAllocator;
|
||||
using xo::print::APrintable;
|
||||
using xo::print::ppstate;
|
||||
using xo::print::ppindentinfo;
|
||||
using xo::mm::AGCObject;
|
||||
using xo::mm::AAllocator;
|
||||
using xo::facet::FacetRegistry;
|
||||
using xo::reflect::typeseq;
|
||||
|
||||
namespace scm {
|
||||
|
|
@ -106,6 +113,54 @@ namespace xo {
|
|||
DExpectFormalArglistSsm::on_token(const Token & tk,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
switch (tk.tk_type()) {
|
||||
case tokentype::tk_leftparen:
|
||||
this->on_leftparen_token(tk, p_psm);
|
||||
return;
|
||||
|
||||
// all the not-yet-handled cases
|
||||
case tokentype::tk_lambda:
|
||||
case tokentype::tk_def:
|
||||
case tokentype::tk_if:
|
||||
case tokentype::tk_symbol:
|
||||
case tokentype::tk_colon:
|
||||
case tokentype::tk_singleassign:
|
||||
case tokentype::tk_string:
|
||||
case tokentype::tk_f64:
|
||||
case tokentype::tk_i64:
|
||||
case tokentype::tk_bool:
|
||||
case tokentype::tk_semicolon:
|
||||
case tokentype::tk_invalid:
|
||||
case tokentype::tk_rightparen:
|
||||
case tokentype::tk_leftbracket:
|
||||
case tokentype::tk_rightbracket:
|
||||
case tokentype::tk_leftbrace:
|
||||
case tokentype::tk_rightbrace:
|
||||
case tokentype::tk_leftangle:
|
||||
case tokentype::tk_rightangle:
|
||||
case tokentype::tk_lessequal:
|
||||
case tokentype::tk_greatequal:
|
||||
case tokentype::tk_dot:
|
||||
case tokentype::tk_comma:
|
||||
case tokentype::tk_doublecolon:
|
||||
case tokentype::tk_assign:
|
||||
case tokentype::tk_yields:
|
||||
case tokentype::tk_plus:
|
||||
case tokentype::tk_minus:
|
||||
case tokentype::tk_star:
|
||||
case tokentype::tk_slash:
|
||||
case tokentype::tk_cmpeq:
|
||||
case tokentype::tk_cmpne:
|
||||
case tokentype::tk_type:
|
||||
case tokentype::tk_then:
|
||||
case tokentype::tk_else:
|
||||
case tokentype::tk_let:
|
||||
case tokentype::tk_in:
|
||||
case tokentype::tk_end:
|
||||
case tokentype::N:
|
||||
break;
|
||||
}
|
||||
|
||||
p_psm->illegal_input_on_token("DExpectFormalArglistSsm::on_token",
|
||||
tk,
|
||||
this->get_expect_str());
|
||||
|
|
@ -152,20 +207,29 @@ namespace xo {
|
|||
: exprstate(exprstatetype::expect_formal_arglist),
|
||||
farglxs_type_{formalarglstatetype::argl_0}
|
||||
{}
|
||||
#endif
|
||||
|
||||
void
|
||||
expect_formal_arglist_xs::on_leftparen_token(const token_type & tk,
|
||||
parserstatemachine * p_psm)
|
||||
DExpectFormalArglistSsm::on_leftparen_token(const Token & tk,
|
||||
ParserStateMachine * p_psm)
|
||||
{
|
||||
if (farglxs_type_ == formalarglstatetype::argl_0) {
|
||||
this->farglxs_type_ = formalarglstatetype::argl_1a;
|
||||
/* TODO: refactor to have setup method on each exprstate */
|
||||
expect_formal_xs::start(p_psm);
|
||||
} else {
|
||||
exprstate::on_leftparen_token(tk, p_psm);
|
||||
scope log(XO_DEBUG(true));
|
||||
|
||||
if (fastate_ == formalarglstatetype::argl_0) {
|
||||
this->fastate_ = formalarglstatetype::argl_1a;
|
||||
|
||||
log && log("STUB: DExpectFormalArglistSsm::on_leftparen_token -> DExpectFormalSsm::start()");
|
||||
|
||||
//DExpectFormalSsm::start(p_psm);
|
||||
return;
|
||||
}
|
||||
|
||||
p_psm->illegal_input_on_token("DExpectFormalArglistSsm::on_token",
|
||||
tk,
|
||||
this->get_expect_str());
|
||||
}
|
||||
|
||||
#ifdef NOT_YET
|
||||
void
|
||||
expect_formal_arglist_xs::on_formal(const rp<Variable> & formal,
|
||||
parserstatemachine * p_psm)
|
||||
|
|
@ -216,8 +280,58 @@ namespace xo {
|
|||
bool
|
||||
DExpectFormalArglistSsm::pretty(const ppindentinfo & ppii) const
|
||||
{
|
||||
return ppii.pps()->pretty_struct(ppii,
|
||||
"DExpectFormalArglistSsm");
|
||||
ppstate * pps = ppii.pps();
|
||||
|
||||
if (ppii.upto()) {
|
||||
if (!pps->print_upto("<DExpectFormalArglistSsm"))
|
||||
return false;
|
||||
|
||||
if (!pps->print_upto(xrefrtag("fastate", fastate_)))
|
||||
return false;
|
||||
|
||||
if (!pps->print_upto(xrefrtag("n_args", n_args_)))
|
||||
return false;
|
||||
|
||||
for (size_type i_arg = 0; i_arg < n_args_; ++i_arg) {
|
||||
char buf[80];
|
||||
snprintf(buf, sizeof(buf), "arg[%ud]", i_arg);
|
||||
|
||||
auto arg_gco = argl_->at(i_arg);
|
||||
obj<APrintable> arg_pr
|
||||
= FacetRegistry::instance().try_variant<APrintable,AGCObject>(arg_gco);
|
||||
|
||||
if (!pps->print_upto(xrefrtag(buf, arg_pr)))
|
||||
return false;
|
||||
}
|
||||
|
||||
pps->write(">");
|
||||
|
||||
return true;
|
||||
} else {
|
||||
pps->write("<DExpectFormalArglistSsm");
|
||||
|
||||
pps->newline_indent(ppii.ci1());
|
||||
pps->pretty(refrtag("fastate", fastate_));
|
||||
|
||||
pps->newline_indent(ppii.ci1());
|
||||
pps->pretty(refrtag("n_args", n_args_));
|
||||
|
||||
for (size_type i_arg = 0; i_arg < n_args_; ++i_arg) {
|
||||
char buf[80];
|
||||
snprintf(buf, sizeof(buf), "arg[%ud]", i_arg);
|
||||
|
||||
auto arg_gco = argl_->at(i_arg);
|
||||
obj<APrintable> arg_pr
|
||||
= FacetRegistry::instance().try_variant<APrintable,AGCObject>(arg_gco);
|
||||
|
||||
pps->newline_indent(ppii.ci1());
|
||||
pps->pretty(refrtag(buf, arg_pr));
|
||||
}
|
||||
|
||||
pps->write(">");
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
} /*namespace scm*/
|
||||
|
|
|
|||
59
src/reader2/ISyntaxStateMachine_DExpectFormalArgSsm.cpp
Normal file
59
src/reader2/ISyntaxStateMachine_DExpectFormalArgSsm.cpp
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
/** @file ISyntaxStateMachine_DExpectFormalArgSsm.cpp
|
||||
*
|
||||
* Generated automagically from ingredients:
|
||||
* 1. code generator:
|
||||
* [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet]
|
||||
* arguments:
|
||||
* --input [idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5]
|
||||
* 2. jinja2 template for abstract facet .hpp file:
|
||||
* [iface_facet_any.hpp.j2]
|
||||
* 3. idl for facet methods
|
||||
* [idl/ISyntaxStateMachine_DExpectFormalArgSsm.json5]
|
||||
**/
|
||||
|
||||
#include "ssm/ISyntaxStateMachine_DExpectFormalArgSsm.hpp"
|
||||
|
||||
namespace xo {
|
||||
namespace scm {
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::ssm_type(const DExpectFormalArgSsm & self) noexcept -> syntaxstatetype
|
||||
{
|
||||
return self.ssm_type();
|
||||
}
|
||||
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::get_expect_str(const DExpectFormalArgSsm & self) noexcept -> std::string_view
|
||||
{
|
||||
return self.get_expect_str();
|
||||
}
|
||||
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::on_token(DExpectFormalArgSsm & self, const Token & tk, ParserStateMachine * p_psm) -> void
|
||||
{
|
||||
self.on_token(tk, p_psm);
|
||||
}
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::on_parsed_symbol(DExpectFormalArgSsm & self, std::string_view sym, ParserStateMachine * p_psm) -> void
|
||||
{
|
||||
self.on_parsed_symbol(sym, p_psm);
|
||||
}
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::on_parsed_typedescr(DExpectFormalArgSsm & self, TypeDescr td, ParserStateMachine * p_psm) -> void
|
||||
{
|
||||
self.on_parsed_typedescr(td, p_psm);
|
||||
}
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::on_parsed_expression(DExpectFormalArgSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
|
||||
{
|
||||
self.on_parsed_expression(expr, p_psm);
|
||||
}
|
||||
auto
|
||||
ISyntaxStateMachine_DExpectFormalArgSsm::on_parsed_expression_with_semicolon(DExpectFormalArgSsm & self, obj<AExpression> expr, ParserStateMachine * p_psm) -> void
|
||||
{
|
||||
self.on_parsed_expression_with_semicolon(expr, p_psm);
|
||||
}
|
||||
|
||||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
/* end ISyntaxStateMachine_DExpectFormalArgSsm.cpp */
|
||||
|
|
@ -17,6 +17,8 @@ namespace xo {
|
|||
return "expect-toplevel-expression-sequence";
|
||||
case syntaxstatetype::expect_formal_arglist:
|
||||
return "expect-formal-arglist";
|
||||
case syntaxstatetype::expect_formal_arg:
|
||||
return "expect-formal-arg";
|
||||
case syntaxstatetype::expect_symbol:
|
||||
return "expect-symbol";
|
||||
case syntaxstatetype::expect_type:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue