From ad6c4755e03023ac17ebea6c2f8132d5952a02ae Mon Sep 17 00:00:00 2001 From: ochafik Date: Thu, 21 Mar 2024 10:03:51 +0000 Subject: [PATCH] json: iostream -> fprintf --- common/json-schema-to-grammar.cpp | 3 +-- tests/test-json-schema-to-grammar.cpp | 21 ++++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/common/json-schema-to-grammar.cpp b/common/json-schema-to-grammar.cpp index e5481459f..dd1ffee80 100644 --- a/common/json-schema-to-grammar.cpp +++ b/common/json-schema-to-grammar.cpp @@ -1,7 +1,6 @@ #include "json-schema-to-grammar.h" #include #include -#include #include #include #include @@ -703,7 +702,7 @@ public: throw std::runtime_error("JSON schema conversion failed:\n" + join(_errors.begin(), _errors.end(), "\n")); } if (!_warnings.empty()) { - std::cerr << "WARNING: JSON schema conversion was incomplete: " + join(_warnings.begin(), _warnings.end(), "; ") << std::endl; + fprintf(stderr, "WARNING: JSON schema conversion was incomplete: %s\n", join(_warnings.begin(), _warnings.end(), "; ").c_str()); } } diff --git a/tests/test-json-schema-to-grammar.cpp b/tests/test-json-schema-to-grammar.cpp index 01dc3c59d..2790a628b 100755 --- a/tests/test-json-schema-to-grammar.cpp +++ b/tests/test-json-schema-to-grammar.cpp @@ -2,7 +2,6 @@ #undef NDEBUG #endif -#include #include #include #include @@ -29,16 +28,12 @@ struct TestCase { std::string expected_grammar; void _print_failure_header() const { - std::cerr << "#" << std::endl; - std::cerr << "# Test '" << name.c_str() << "' failed." << std::endl; - std::cerr << "#" << std::endl; - std::cerr << schema.c_str() << std::endl; + fprintf(stderr, "#\n# Test '%s' failed.\n#\n%s\n", name.c_str(), schema.c_str()); } void verify(const std::string& actual_grammar) const { if (trim(actual_grammar) != trim(expected_grammar)) { _print_failure_header(); - std::cerr << "# EXPECTED:\n" << expected_grammar.c_str() << std::endl; - std::cerr << "# ACTUAL:\n" << actual_grammar.c_str() << std::endl; + fprintf(stderr, "# EXPECTED:\n%s\n# ACTUAL:\n%s\n", expected_grammar.c_str(), actual_grammar.c_str()); assert(false); } } @@ -50,15 +45,15 @@ struct TestCase { } } catch (const std::runtime_error& ex) { _print_failure_header(); - std::cerr << "# GRAMMAR ERROR: " << ex.what() << std::endl; + fprintf(stderr, "# GRAMMAR ERROR: %s\n", ex.what()); assert(false); } } void verify_status(TestCaseStatus status) const { if (status != expected_status) { _print_failure_header(); - std::cerr << "# EXPECTED STATUS: " << (expected_status == SUCCESS ? "SUCCESS" : "FAILURE") << std::endl; - std::cerr << "# ACTUAL STATUS: " << (status == SUCCESS ? "SUCCESS" : "FAILURE") << std::endl; + fprintf(stderr, "# EXPECTED STATUS: %s\n", expected_status == SUCCESS ? "SUCCESS" : "FAILURE"); + fprintf(stderr, "# ACTUAL STATUS: %s\n", status == SUCCESS ? "SUCCESS" : "FAILURE"); assert(false); } } @@ -78,9 +73,9 @@ static std::string read(const std::string& file) { } static void test_all(const std::string& lang, std::function runner) { - std::cerr << "#\n# Testing JSON schema conversion (" << lang.c_str() << ")\n#" << std::endl; + fprintf(stderr, "#\n# Testing JSON schema conversion (%s)\n#\n", lang.c_str()); auto test = [&](const TestCase& tc) { - std::cerr << "- " << tc.name.c_str() << (tc.expected_status == FAILURE ? " (failure expected)" : "") << std::endl; + fprintf(stderr, "- %s%s\n", tc.name.c_str(), tc.expected_status == FAILURE ? " (failure expected)" : ""); runner(tc); }; @@ -804,7 +799,7 @@ int main() { tc.verify(json_schema_to_grammar(nlohmann::json::parse(tc.schema))); tc.verify_status(SUCCESS); } catch (const std::runtime_error& ex) { - std::cerr << "Error: " << ex.what() << std::endl; + fprintf(stderr, "Error: %s\n", ex.what()); tc.verify_status(FAILURE); } });