Make json_writer a structured_writer, improve output formatting #3227
Conversation
long long int is used in CmdStan
src/stan/callbacks/json_writer.hpp
Outdated
| template <typename T> | ||
| void write_int_like(const std::string& key, T value) { | ||
| if (output_ == nullptr) | ||
| return; | ||
| write_sep(); | ||
| write_key(key); | ||
| *output_ << value; | ||
| } |
There was a problem hiding this comment.
I would just call this write_ since it takes anything that is valid for operator<<
There was a problem hiding this comment.
Yes, but I want to make it clear that things like double (which are valid for operator<<) should not be passed to this.
There was a problem hiding this comment.
Oh for NA etc.
I'd still call it write_ and have the signature like
template <typename T, stan::require_integral_t<T>* = nullptr>
void write_int_like(const std::string& key, T value)
src/stan/callbacks/json_writer.hpp
Outdated
| if (output_ == nullptr) | ||
| return; |
There was a problem hiding this comment.
| if (output_ == nullptr) | |
| return; | |
| if (output_ == nullptr) { | |
| return; | |
| } |
There was a problem hiding this comment.
Done for all the functions
| *output_ << "[ "; | ||
| if (v.size() > 0) { | ||
| auto last = v.end(); | ||
| --last; | ||
| for (auto it = v.begin(); it != last; ++it) { | ||
| *output_ << *it << ", "; | ||
| } | ||
| } | ||
| *output_ << v.back() << " ]"; |
There was a problem hiding this comment.
Same code is replicated across multiple functions. Is there a reason you got rid of write_vector?
There was a problem hiding this comment.
The value type is printed differently in each case - this one uses <<, the vector uses process_string(), etc.
Write_vector was also just four functions which were the same as these but called from a template. To use this as a derived class we needed un-templated versions
| void write(const std::string& key, | ||
| const std::vector<std::complex<double>>& v) { |
There was a problem hiding this comment.
Need to make these virtual in structured_writer?
Submission Checklist
./runTests.py src/test/unitmake cpplintSummary
Follow up on #3191.
This PR:
structured_writerandjson_writersuch that the latter can be a subclass of the former.j.begin_record("foo"); j.end_record(); j.write("anything here");would generate invalid JSONIntended Effect
How to Verify
Side Effects
Documentation
Copyright and Licensing
Please list the copyright holder for the work you are submitting (this will be you or your assignee, such as a university or company):
By submitting this pull request, the copyright holder is agreeing to license the submitted work under the following licenses: