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

refactor: + xo-stringtable2 w/ DString impl

Browse source
This commit is contained in:
Roland Conybeare 2026-03-05 00:50:58 +11:00
commit b96cf33a21
5 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/xo/reader2/ParserResult.hpp
View file

@ -6,7 +6,7 @@
#pragma once
#include <xo/expression2/Expression.hpp>
#include <xo/object2/DString.hpp>
#include <xo/stringtable2/DString.hpp>
#include <xo/indentlog/print/pretty.hpp>
#include <string_view>

4
src/reader2/DExpectExprSsm.cpp
View file

@ -18,15 +18,13 @@
#include <xo/object2/Boolean.hpp>
#include <xo/object2/Integer.hpp>
#include <xo/object2/Float.hpp>
#include <xo/object2/String.hpp>
#include <xo/stringtable2/String.hpp>
#include <xo/alloc2/GCObject.hpp>
#include <xo/facet/facet_implementation.hpp>
#ifdef NOT_YET
#include "define_xs.hpp"
#include "paren_xs.hpp"
#include "sequence_xs.hpp"
#include "progress_xs.hpp"
#endif
namespace xo {

16
src/reader2/DToplevelSeqSsm.cpp
View file

@ -17,17 +17,17 @@
#include <xo/expression2/Constant.hpp>
//#include <xo/expression2/detail/IExpression_DConstant.hpp>
#include <xo/object2/DString.hpp>
#include <xo/object2/string/IGCObject_DString.hpp>
#include <xo/stringtable2/String.hpp>
//#include <xo/object2/string/IGCObject_DString.hpp>
#include <xo/object2/DFloat.hpp>
#include <xo/object2/number/IGCObject_DFloat.hpp>
#include <xo/object2/Float.hpp>
//#include <xo/object2/number/IGCObject_DFloat.hpp>
#include <xo/object2/DInteger.hpp>
#include <xo/object2/number/IGCObject_DInteger.hpp>
#include <xo/object2/Integer.hpp>
//#include <xo/object2/number/IGCObject_DInteger.hpp>
#include <xo/object2/DBoolean.hpp>
#include <xo/object2/boolean/IGCObject_DBoolean.hpp>
#include <xo/object2/Boolean.hpp>
//#include <xo/object2/boolean/IGCObject_DBoolean.hpp>
#include <xo/alloc2/GCObject.hpp>

2
src/reader2/init_reader2.cpp
View file

@ -9,7 +9,7 @@
#include <xo/expression2/init_expression2.hpp>
#include <xo/numeric/init_numeric.hpp>
#include <xo/gc/CollectorTypeRegistry.hpp>
#include <xo/alloc2/CollectorTypeRegistry.hpp>
namespace xo {
using xo::scm::reader2_register_facets;

10
utest/SchematikaParser.test.cpp
View file

@ -17,7 +17,7 @@
#include <xo/procedure2/Primitive_gco_2_gco_gco.hpp>
#include <xo/object2/Float.hpp>
#include <xo/object2/Integer.hpp>
#include <xo/object2/String.hpp>
#include <xo/stringtable2/String.hpp>
#include <xo/alloc2/arena/IAllocator_DArena.hpp>
#include <xo/facet/TypeRegistry.hpp>
#include <catch2/catch.hpp>
@ -25,10 +25,10 @@
namespace xo {
using xo::scm::ParserConfig;
using xo::scm::SchematikaParser;
using xo::scm::ASyntaxStateMachine;
using xo::scm::syntaxstatetype;
// using xo::scm::ASyntaxStateMachine;
// using xo::scm::syntaxstatetype;
// using xo::scm::DDefineSsm;
using xo::scm::DExpectExprSsm;
// using xo::scm::DExpectExprSsm;
using xo::scm::AExpression;
using xo::scm::DDefineExpr;
@ -51,7 +51,7 @@ namespace xo {
using xo::mm::AAllocator;
using xo::mm::DArena;
using xo::mm::MemorySizeInfo;
using xo::facet::with_facet;
// using xo::facet::with_facet;
static InitEvidence s_init = (InitSubsys<S_reader2_tag>::require());