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

xo-expression2: register DGlobalSymtab type + rename

Browse source
This commit is contained in:
Roland Conybeare 2026-02-16 09:32:53 -05:00
commit 323a7cf9d3
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xo-expression2/src/expression2/expression2_register_facets.cpp
View file

@ -5,6 +5,7 @@
#include "expression2_register_facets.hpp" #include "expression2_register_facets.hpp"
#include <xo/expression2/UniqueString.hpp>
#include <xo/expression2/detail/IGCObject_DUniqueString.hpp> #include <xo/expression2/detail/IGCObject_DUniqueString.hpp>
#include <xo/expression2/detail/IPrintable_DUniqueString.hpp> #include <xo/expression2/detail/IPrintable_DUniqueString.hpp>
@ -47,8 +48,6 @@ namespace xo {
{ {
scope log(XO_DEBUG(true)); scope log(XO_DEBUG(true));
FacetRegistry::register_impl<AGCObject, DUniqueString>(); FacetRegistry::register_impl<AGCObject, DUniqueString>();
FacetRegistry::register_impl<APrintable, DUniqueString>(); FacetRegistry::register_impl<APrintable, DUniqueString>();
@ -105,6 +104,8 @@ namespace xo {
// until we register facets // until we register facets
TypeRegistry::register_type<DGlobalSymtab>(); TypeRegistry::register_type<DGlobalSymtab>();
TypeRegistry::register_type<DGlobalSymtab::repr_type>();
log && log(xtag("DUniqueString.tseq", typeseq::id<DUniqueString>())); log && log(xtag("DUniqueString.tseq", typeseq::id<DUniqueString>()));
log && log(xtag("DDefineExpr.tseq", typeseq::id<DDefineExpr>())); log && log(xtag("DDefineExpr.tseq", typeseq::id<DDefineExpr>()));
log && log(xtag("DVariable.tseq", typeseq::id<DVariable>())); log && log(xtag("DVariable.tseq", typeseq::id<DVariable>()));

2
xo-reader2/include/xo/reader2/SchematikaReader.hpp
View file

@ -49,7 +49,7 @@ namespace xo {
**/ **/
SchematikaReader(const ReaderConfig & config, SchematikaReader(const ReaderConfig & config,
obj<AAllocator> expr_alloc, obj<AAllocator> expr_alloc,
obj<AAllocator> fixed_alloc); obj<AAllocator> aux_alloc);
/** non-trivial dtor because of @p parser **/ /** non-trivial dtor because of @p parser **/
~SchematikaReader() = default; ~SchematikaReader() = default;

4
xo-reader2/src/reader2/SchematikaParser.cpp
View file

@ -22,12 +22,12 @@ namespace xo {
SchematikaParser::SchematikaParser(const ParserConfig & cfg, SchematikaParser::SchematikaParser(const ParserConfig & cfg,
obj<AAllocator> expr_alloc, obj<AAllocator> expr_alloc,
obj<AAllocator> fixed_alloc) obj<AAllocator> aux_alloc)
: psm_{cfg.parser_arena_config_, : psm_{cfg.parser_arena_config_,
cfg.symtab_config_, cfg.symtab_config_,
cfg.max_stringtable_capacity_, cfg.max_stringtable_capacity_,
expr_alloc, expr_alloc,
fixed_alloc}, aux_alloc},
debug_flag_{cfg.debug_flag_} debug_flag_{cfg.debug_flag_}
{ {
} }

4
xo-reader2/src/reader2/SchematikaReader.cpp
View file

@ -11,7 +11,7 @@ namespace xo {
namespace scm { namespace scm {
SchematikaReader::SchematikaReader(const ReaderConfig & config, SchematikaReader::SchematikaReader(const ReaderConfig & config,
obj<AAllocator> expr_alloc, obj<AAllocator> expr_alloc,
obj<AAllocator> fixed_alloc) obj<AAllocator> aux_alloc)
: tokenizer_{config.tk_buffer_config_, : tokenizer_{config.tk_buffer_config_,
config.tk_debug_flag_}, config.tk_debug_flag_},
parser_{ParserConfig(config.parser_arena_config_, parser_{ParserConfig(config.parser_arena_config_,
@ -19,7 +19,7 @@ namespace xo {
config.max_stringtable_cap_, config.max_stringtable_cap_,
config.parser_debug_flag_), config.parser_debug_flag_),
expr_alloc, expr_alloc,
fixed_alloc}, aux_alloc},
debug_flag_{config.reader_debug_flag_} debug_flag_{config.reader_debug_flag_}
{ {
} }