From 6a7353f68911d5072f49ff113f686716d3e619c8 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 25 Jul 2025 10:42:40 -0400 Subject: [PATCH] build: osx carveouts --- xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp | 1 + xo-indentlog/include/xo/indentlog/print/pretty.hpp | 4 +++- xo-tokenizer/include/xo/tokenizer/input_state.hpp | 2 ++ xo-tokenizer/include/xo/tokenizer/tokenizer.hpp | 2 ++ xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp b/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp index 89824028..d8036fe6 100644 --- a/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp +++ b/xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp @@ -23,6 +23,7 @@ namespace xo { : pps_{pps}, ci0_{ci0}, ci1_{ci0 + indent_width}, upto_{upto} {} ppstate * pps() const { return pps_; } + std::uint32_t ci0_unused() const { return ci0_; } std::uint32_t ci1() const { return ci1_; } bool upto() const { return upto_; } diff --git a/xo-indentlog/include/xo/indentlog/print/pretty.hpp b/xo-indentlog/include/xo/indentlog/print/pretty.hpp index c6ed3a40..9f17d64d 100644 --- a/xo-indentlog/include/xo/indentlog/print/pretty.hpp +++ b/xo-indentlog/include/xo/indentlog/print/pretty.hpp @@ -39,6 +39,8 @@ namespace xo { uint32_t indent_width() const { return config_->indent_width_; } ppindentinfo indent_info(bool upto) { return ppindentinfo(this, lpos(), indent_width(), upto); } + std::uint32_t current_indent_unused() const { return current_indent_; } + std::uint32_t pos() const { return scratch_sbuf_->pos(); } /** current position relative to start of line (last \n or \r), * excluding color escape sequences @@ -170,7 +172,7 @@ namespace xo { /** readonly pretty-printer config **/ const ppconfig * config_ = nullptr; - }; + }; /*ppstate*/ /** @class ppstate_standalone * @brief like ppstate, but also holds streambuf diff --git a/xo-tokenizer/include/xo/tokenizer/input_state.hpp b/xo-tokenizer/include/xo/tokenizer/input_state.hpp index 493a3823..f7f7293f 100644 --- a/xo-tokenizer/include/xo/tokenizer/input_state.hpp +++ b/xo-tokenizer/include/xo/tokenizer/input_state.hpp @@ -58,7 +58,9 @@ namespace xo { ///@{ #pragma GCC diagnostic push +#ifndef __APPLE__ #pragma GCC diagnostic ignored "-Wchanges-meaning" +#endif const span_type & current_line() const { return current_line_; } #pragma GCC diagnostic pop size_t current_pos() const { return current_pos_; } diff --git a/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp b/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp index 258d4900..ab4a9d6d 100644 --- a/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp +++ b/xo-tokenizer/include/xo/tokenizer/tokenizer.hpp @@ -74,7 +74,9 @@ namespace xo { ///@{ #pragma GCC diagnostic push +#ifndef __APPLE__ #pragma GCC diagnostic ignored "-Wchanges-meaning" +#endif const input_state & input_state() const { return input_state_; } #pragma GCC diagnostic pop diff --git a/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp b/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp index b2ea6c2e..ebcf2a0f 100644 --- a/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp +++ b/xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp @@ -55,7 +55,9 @@ namespace xo { const char * src_function() const { return src_function_; } const std::string & error_description() const { return error_description_; } #pragma GCC diagnostic push +#ifndef __APPLE__ #pragma GCC diagnostic ignored "-Wchanges-meaning" +#endif const input_state_type & input_state() const { return input_state_; } #pragma GCC diagnostic pop size_t tk_start() const { return input_state_.current_pos(); }