xo-reader2: simplify DExpectTypeSsm w/ DSyntaxStateMachine

This commit is contained in:
Roland Conybeare 2026-01-30 14:53:49 -05:00
commit ed9733937e
2 changed files with 13 additions and 274 deletions

View file

@ -5,7 +5,7 @@
#pragma once
#include "SyntaxStateMachine.hpp"
#include "DSyntaxStateMachine.hpp"
#include <xo/indentlog/print/ppindentinfo.hpp>
namespace xo {
@ -21,8 +21,9 @@ namespace xo {
*
* @endpre
**/
class DExpectTypeSsm {
class DExpectTypeSsm : public DSyntaxStateMachine<DExpectTypeSsm> {
public:
using Super = DSyntaxStateMachine<DExpectTypeSsm>;
using TypeDescr = xo::reflect::TypeDescr;
using DArena = xo::mm::DArena;
using ppindentinfo = xo::print::ppindentinfo;
@ -34,6 +35,8 @@ namespace xo {
static void start(ParserStateMachine * p_psm);
const char * ssm_classname() const noexcept { return "DExpectTypeSsm"; }
/** @defgroup scm-expecttype-ssm-facet syntaxstatemachine facet methods **/
///@{
@ -57,105 +60,6 @@ namespace xo {
void on_symbol_token(const Token & tk,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on incoming define-token @p tk
* with overall parser state in @p p_psm
**/
void on_def_token(const Token & tk,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on incoming if-token @p tk
* with overall parser state in @p p_psm
**/
void on_if_token(const Token & tk,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on incoming colon-token @p tk
* with overall parser state in @p p_psm
**/
void on_colon_token(const Token & tk,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on incoming singleassign-token @p tk
* with overall parser state in @p p_psm
**/
void on_singleassign_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming string token @p tk,
* overall parser state in @p p_psm
**/
void on_string_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming f64 token @p tk,
* overall parser state in @p p_psm
**/
void on_f64_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming i64 token @p tk,
* overall parser state in @p p_psm
**/
void on_i64_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming bool token @p tk,
* overall parser state in @p p_psm
**/
void on_bool_token(const Token & tk,
ParserStateMachine * p_psm);
/** update state for this syntax on incoming semicolon token @p tk,
* overall parser state in @p p_psm
**/
void on_semicolon_token(const Token & tk,
ParserStateMachine * p_psm);
/** (Never called).
* Operate state machine for this syntax after symbol
* emitted from nested ssm.
* Impossible path for DExpectTypeSsm until such time as it relies
* on nested ssms. Currently using on_symbol_token
* entry point instead.
**/
void on_parsed_symbol(std::string_view sym,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on receiving type-description
* from nested parser.
* Currently (jan 2026) impossible path for DExpectTypeSsm.
* Active path is via on_symbol_token()
**/
void on_parsed_typedescr(TypeDescr td,
ParserStateMachine * p_psm);
/** operate state machine to consume formal param (name,value)
* emitted by nested ssm
**/
void on_parsed_formal(const DUniqueString * param_name,
TypeDescr param_type,
ParserStateMachine * p_psm);
/** consume formal params @p arglist from completed nested ssm,
* with overall parser state in @p p_psm.
**/
void on_parsed_formal_arglist(DArray * arglist,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on receiving expression
* from nested parser.
* (provided to satisfy ASyntaxStateMachine api. not reachable)
**/
void on_parsed_expression(obj<AExpression> expr,
ParserStateMachine * p_psm);
/** operate state machine for this syntax on receiving expression
* followed by semicolon from nested parser.
* (provided to satisfy ASyntaxStateMachine api. not reachable)
**/
void on_parsed_expression_with_semicolon(obj<AExpression> expr,
ParserStateMachine * p_psm);
///@}
/** @defgroup scm-expecttype-printable-facet printable facet methods **/
///@{