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

build: osx carveouts

Browse source
This commit is contained in:
Roland Conybeare 2025-07-25 10:42:40 -04:00
commit 6a7353f689
5 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xo-indentlog/include/xo/indentlog/print/ppdetail_atomic.hpp
View file

@ -23,6 +23,7 @@ namespace xo {
: pps_{pps}, ci0_{ci0}, ci1_{ci0 + indent_width}, upto_{upto} {} : pps_{pps}, ci0_{ci0}, ci1_{ci0 + indent_width}, upto_{upto} {}
ppstate * pps() const { return pps_; } ppstate * pps() const { return pps_; }
std::uint32_t ci0_unused() const { return ci0_; }
std::uint32_t ci1() const { return ci1_; } std::uint32_t ci1() const { return ci1_; }
bool upto() const { return upto_; } bool upto() const { return upto_; }

4
xo-indentlog/include/xo/indentlog/print/pretty.hpp
View file

@ -39,6 +39,8 @@ namespace xo {
uint32_t indent_width() const { return config_->indent_width_; } uint32_t indent_width() const { return config_->indent_width_; }
ppindentinfo indent_info(bool upto) { return ppindentinfo(this, lpos(), indent_width(), upto); } 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(); } std::uint32_t pos() const { return scratch_sbuf_->pos(); }
/** current position relative to start of line (last \n or \r), /** current position relative to start of line (last \n or \r),
* excluding color escape sequences * excluding color escape sequences
@ -170,7 +172,7 @@ namespace xo {
/** readonly pretty-printer config **/ /** readonly pretty-printer config **/
const ppconfig * config_ = nullptr; const ppconfig * config_ = nullptr;
}; }; /*ppstate*/
/** @class ppstate_standalone /** @class ppstate_standalone
* @brief like ppstate, but also holds streambuf * @brief like ppstate, but also holds streambuf

2
xo-tokenizer/include/xo/tokenizer/input_state.hpp
View file

@ -58,7 +58,9 @@ namespace xo {
///@{ ///@{
#pragma GCC diagnostic push #pragma GCC diagnostic push
#ifndef __APPLE__
#pragma GCC diagnostic ignored "-Wchanges-meaning" #pragma GCC diagnostic ignored "-Wchanges-meaning"
#endif
const span_type & current_line() const { return current_line_; } const span_type & current_line() const { return current_line_; }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
size_t current_pos() const { return current_pos_; } size_t current_pos() const { return current_pos_; }

2
xo-tokenizer/include/xo/tokenizer/tokenizer.hpp
View file

@ -74,7 +74,9 @@ namespace xo {
///@{ ///@{
#pragma GCC diagnostic push #pragma GCC diagnostic push
#ifndef __APPLE__
#pragma GCC diagnostic ignored "-Wchanges-meaning" #pragma GCC diagnostic ignored "-Wchanges-meaning"
#endif
const input_state<CharT> & input_state() const { return input_state_; } const input_state<CharT> & input_state() const { return input_state_; }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

2
xo-tokenizer/include/xo/tokenizer/tokenizer_error.hpp
View file

@ -55,7 +55,9 @@ namespace xo {
const char * src_function() const { return src_function_; } const char * src_function() const { return src_function_; }
const std::string & error_description() const { return error_description_; } const std::string & error_description() const { return error_description_; }
#pragma GCC diagnostic push #pragma GCC diagnostic push
#ifndef __APPLE__
#pragma GCC diagnostic ignored "-Wchanges-meaning" #pragma GCC diagnostic ignored "-Wchanges-meaning"
#endif
const input_state_type & input_state() const { return input_state_; } const input_state_type & input_state() const { return input_state_; }
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
size_t tk_start() const { return input_state_.current_pos(); } size_t tk_start() const { return input_state_.current_pos(); }