🔨 some cleanup

parent 186a9fd4
...@@ -8626,6 +8626,9 @@ class basic_json ...@@ -8626,6 +8626,9 @@ class basic_json
} }
}; };
// a type to simplify interfaces
using input_adapter_t = std::shared_ptr<input_adapter>;
/// input adapter for cached stream input /// input adapter for cached stream input
class cached_input_stream_adapter : public input_adapter class cached_input_stream_adapter : public input_adapter
{ {
...@@ -8783,8 +8786,8 @@ class basic_json ...@@ -8783,8 +8786,8 @@ class basic_json
class binary_reader class binary_reader
{ {
public: public:
explicit binary_reader(std::shared_ptr<input_adapter> a) explicit binary_reader(input_adapter_t adapter)
: ia(a), is_little_endian(little_endianess()) : ia(adapter), is_little_endian(little_endianess())
{} {}
/*! /*!
...@@ -9807,7 +9810,7 @@ class basic_json ...@@ -9807,7 +9810,7 @@ class basic_json
private: private:
/// input adapter /// input adapter
std::shared_ptr<input_adapter> ia = nullptr; input_adapter_t ia = nullptr;
/// the current character /// the current character
int current = std::char_traits<char>::eof(); int current = std::char_traits<char>::eof();
...@@ -10761,8 +10764,8 @@ class basic_json ...@@ -10761,8 +10764,8 @@ class basic_json
} }
} }
explicit lexer(std::shared_ptr<input_adapter> a) explicit lexer(input_adapter_t adapter)
: ia(a), decimal_point_char(get_decimal_point()) : ia(adapter), decimal_point_char(get_decimal_point())
{} {}
private: private:
...@@ -12118,7 +12121,7 @@ scan_number_done: ...@@ -12118,7 +12121,7 @@ scan_number_done:
private: private:
/// input adapter /// input adapter
std::shared_ptr<input_adapter> ia = nullptr; input_adapter_t ia = nullptr;
/// the current character /// the current character
int current = std::char_traits<char>::eof(); int current = std::char_traits<char>::eof();
...@@ -12157,9 +12160,9 @@ scan_number_done: ...@@ -12157,9 +12160,9 @@ scan_number_done:
{ {
public: public:
/// a parser reading from an input adapter /// a parser reading from an input adapter
explicit parser(std::shared_ptr<input_adapter> ia, explicit parser(input_adapter_t adapter,
const parser_callback_t cb = nullptr) const parser_callback_t cb = nullptr)
: callback(cb), m_lexer(ia) : callback(cb), m_lexer(adapter)
{} {}
/*! /*!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment