diff --git a/xo-expression2/src/expression2/expression2_register_facets.cpp b/xo-expression2/src/expression2/expression2_register_facets.cpp index f14ceae6..a3a4b520 100644 --- a/xo-expression2/src/expression2/expression2_register_facets.cpp +++ b/xo-expression2/src/expression2/expression2_register_facets.cpp @@ -5,6 +5,7 @@ #include "expression2_register_facets.hpp" +#include #include #include @@ -47,8 +48,6 @@ namespace xo { { scope log(XO_DEBUG(true)); - - FacetRegistry::register_impl(); FacetRegistry::register_impl(); @@ -105,6 +104,8 @@ namespace xo { // until we register facets TypeRegistry::register_type(); + TypeRegistry::register_type(); + log && log(xtag("DUniqueString.tseq", typeseq::id())); log && log(xtag("DDefineExpr.tseq", typeseq::id())); log && log(xtag("DVariable.tseq", typeseq::id())); diff --git a/xo-reader2/include/xo/reader2/SchematikaReader.hpp b/xo-reader2/include/xo/reader2/SchematikaReader.hpp index 73b8166b..5a4243a1 100644 --- a/xo-reader2/include/xo/reader2/SchematikaReader.hpp +++ b/xo-reader2/include/xo/reader2/SchematikaReader.hpp @@ -49,7 +49,7 @@ namespace xo { **/ SchematikaReader(const ReaderConfig & config, obj expr_alloc, - obj fixed_alloc); + obj aux_alloc); /** non-trivial dtor because of @p parser **/ ~SchematikaReader() = default; diff --git a/xo-reader2/src/reader2/SchematikaParser.cpp b/xo-reader2/src/reader2/SchematikaParser.cpp index 48e109da..37ebdd05 100644 --- a/xo-reader2/src/reader2/SchematikaParser.cpp +++ b/xo-reader2/src/reader2/SchematikaParser.cpp @@ -22,12 +22,12 @@ namespace xo { SchematikaParser::SchematikaParser(const ParserConfig & cfg, obj expr_alloc, - obj fixed_alloc) + obj aux_alloc) : psm_{cfg.parser_arena_config_, cfg.symtab_config_, cfg.max_stringtable_capacity_, expr_alloc, - fixed_alloc}, + aux_alloc}, debug_flag_{cfg.debug_flag_} { } diff --git a/xo-reader2/src/reader2/SchematikaReader.cpp b/xo-reader2/src/reader2/SchematikaReader.cpp index e02eefa2..98d44112 100644 --- a/xo-reader2/src/reader2/SchematikaReader.cpp +++ b/xo-reader2/src/reader2/SchematikaReader.cpp @@ -11,7 +11,7 @@ namespace xo { namespace scm { SchematikaReader::SchematikaReader(const ReaderConfig & config, obj expr_alloc, - obj fixed_alloc) + obj aux_alloc) : tokenizer_{config.tk_buffer_config_, config.tk_debug_flag_}, parser_{ParserConfig(config.parser_arena_config_, @@ -19,7 +19,7 @@ namespace xo { config.max_stringtable_cap_, config.parser_debug_flag_), expr_alloc, - fixed_alloc}, + aux_alloc}, debug_flag_{config.reader_debug_flag_} { }