From cdcaff24263ae629b26037ba10910abfd6d212a1 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 10 Jan 2026 12:39:09 -0500 Subject: [PATCH] + xo-tokenizer2 xo-reader2 xo-expression2 xo-interpreter2 2nd gen schematika interpreter using fomo --- example/tokenrepl/tokenrepl.cpp | 5 ++++- include/xo/tokenizer/buffer.hpp | 12 ++++++++---- src/tokenizer/token.cpp | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/example/tokenrepl/tokenrepl.cpp b/example/tokenrepl/tokenrepl.cpp index 63cd6aaf..61f6ea74 100644 --- a/example/tokenrepl/tokenrepl.cpp +++ b/example/tokenrepl/tokenrepl.cpp @@ -4,7 +4,10 @@ #include #include // for isatty -bool repl_getline(bool interactive, std::istream& in, std::ostream& out, std::string& input) +bool repl_getline(bool interactive, + std::istream & in, + std::ostream & out, + std::string & input) { if (interactive) { out << "> "; diff --git a/include/xo/tokenizer/buffer.hpp b/include/xo/tokenizer/buffer.hpp index bc3621f2..7b19316b 100644 --- a/include/xo/tokenizer/buffer.hpp +++ b/include/xo/tokenizer/buffer.hpp @@ -101,7 +101,8 @@ namespace xo { @param buf_z Buffer size. allocate storage (owned by this buffer) if >0. @param align_z Align to this value, e.g. 8 to align storage on an 8-byte boundary **/ - buffer(size_type buf_z, size_type align_z = sizeof(char)) + buffer(size_type buf_z, + size_type align_z = sizeof(char)) : is_owner_{true}, buf_{buf_z ? (new (std::align_val_t(align_z)) CharT [buf_z]) : nullptr}, buf_z_{buf_z}, @@ -134,9 +135,11 @@ namespace xo { CharT const & operator[](size_type i) const { return buf_[i]; } /** @brief return span for current buffer contents **/ - span_type contents() const { return span_type(buf_ + lo_pos_, buf_ + hi_pos_); } + span_type contents() const { return span_type(buf_ + lo_pos_, + buf_ + hi_pos_); } /** @brief returns span for writable buffer contents (unused prefix following produce position **/ - span_type avail() const { return span_type(buf_ + hi_pos_, buf_ + buf_z_); } + span_type avail() const { return span_type(buf_ + hi_pos_, + buf_ + buf_z_); } /** @brief @c true iff buffer is empty **/ bool empty() const { return lo_pos_ == hi_pos_; } @@ -315,7 +318,8 @@ namespace xo { /** @brief Overload for @c swap, so that @c buffer swappable **/ template inline void - swap(buffer & lhs, buffer & rhs) { + swap(buffer & lhs, + buffer & rhs) { lhs.swap(rhs); } } /*namespace scm*/ diff --git a/src/tokenizer/token.cpp b/src/tokenizer/token.cpp index 6438dee1..2ed92ad5 100644 --- a/src/tokenizer/token.cpp +++ b/src/tokenizer/token.cpp @@ -4,6 +4,6 @@ **/ #include "token.hpp" -#include "xo/indentlog/print/tag.hpp" +#include /** end token.cpp **/