From 0ad52a7e22c4c7f94f91c246c66acf014eaaefff Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Sat, 21 Aug 2021 10:23:22 -0400 Subject: [PATCH] Renaming scalar to is_scalar. (#1698) --- include/simdjson/generic/ondemand/document-inl.h | 12 ++++++------ include/simdjson/generic/ondemand/document.h | 12 ++++++------ include/simdjson/generic/ondemand/value-inl.h | 6 +++--- include/simdjson/generic/ondemand/value.h | 4 ++-- tests/ondemand/ondemand_json_pointer_tests.cpp | 14 +++++++------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/simdjson/generic/ondemand/document-inl.h b/include/simdjson/generic/ondemand/document-inl.h index 1cb17066d..b7e6f1d9c 100644 --- a/include/simdjson/generic/ondemand/document-inl.h +++ b/include/simdjson/generic/ondemand/document-inl.h @@ -199,7 +199,7 @@ simdjson_really_inline simdjson_result document::type() noexcept { return get_root_value_iterator().type(); } -simdjson_really_inline simdjson_result document::scalar() noexcept { +simdjson_really_inline simdjson_result document::is_scalar() noexcept { json_type this_type; auto error = type().get(this_type); if(error) { return error; } @@ -374,9 +374,9 @@ simdjson_really_inline simdjson_result simdjson_result::scalar() noexcept { +simdjson_really_inline simdjson_result simdjson_result::is_scalar() noexcept { if (error()) { return error(); } - return first.scalar(); + return first.is_scalar(); } #if SIMDJSON_EXCEPTIONS @@ -472,7 +472,7 @@ simdjson_really_inline simdjson_result document_reference::operator[](con simdjson_really_inline simdjson_result document_reference::find_field_unordered(std::string_view key) & noexcept { return doc->find_field_unordered(key); } simdjson_really_inline simdjson_result document_reference::find_field_unordered(const char *key) & noexcept { return doc->find_field_unordered(key); } simdjson_really_inline simdjson_result document_reference::type() noexcept { return doc->type(); } -simdjson_really_inline simdjson_result document_reference::scalar() noexcept { return doc->scalar(); } +simdjson_really_inline simdjson_result document_reference::is_scalar() noexcept { return doc->is_scalar(); } simdjson_really_inline simdjson_result document_reference::raw_json_token() noexcept { return doc->raw_json_token(); } simdjson_really_inline simdjson_result document_reference::at_pointer(std::string_view json_pointer) noexcept { return doc->at_pointer(json_pointer); } simdjson_really_inline simdjson_result document_reference::raw_json() noexcept { return doc->raw_json();} @@ -577,9 +577,9 @@ simdjson_really_inline simdjson_result simdjson_result::scalar() noexcept { +simdjson_really_inline simdjson_result simdjson_result::is_scalar() noexcept { if (error()) { return error(); } - return first.scalar(); + return first.is_scalar(); } #if SIMDJSON_EXCEPTIONS simdjson_really_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::array() & noexcept(false) { diff --git a/include/simdjson/generic/ondemand/document.h b/include/simdjson/generic/ondemand/document.h index 355c8831d..84a369323 100644 --- a/include/simdjson/generic/ondemand/document.h +++ b/include/simdjson/generic/ondemand/document.h @@ -119,7 +119,7 @@ public: * Cast this JSON value to a value when the document is an object or an array. * * @returns A value if a JSON array or object cannot be found. - * @returns SCALAR_DOCUMENT_AS_VALUE error is the document is a scalar (see scalar() function). + * @returns SCALAR_DOCUMENT_AS_VALUE error is the document is a scalar (see is_scalar() function). */ simdjson_really_inline simdjson_result get_value() noexcept; @@ -340,7 +340,7 @@ public: * @returns true if the type is string, number, null, Boolean * @error TAPE_ERROR when the JSON value is a bad token like "}" "," or "alse". */ - simdjson_really_inline simdjson_result scalar() noexcept; + simdjson_really_inline simdjson_result is_scalar() noexcept; /** * Get the raw JSON for this token. @@ -411,7 +411,7 @@ public: * - INDEX_OUT_OF_BOUNDS if an array index is larger than an array length * - INCORRECT_TYPE if a non-integer is used to access an array * - INVALID_JSON_POINTER if the JSON pointer is invalid and cannot be parsed - * - SCALAR_DOCUMENT_AS_VALUE if the json_pointer is empty and the document is not a scalar (see scalar() function). + * - SCALAR_DOCUMENT_AS_VALUE if the json_pointer is empty and the document is not a scalar (see is_scalar() function). */ simdjson_really_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; /** @@ -497,7 +497,7 @@ public: simdjson_really_inline simdjson_result find_field_unordered(const char *key) & noexcept; simdjson_really_inline simdjson_result type() noexcept; - simdjson_really_inline simdjson_result scalar() noexcept; + simdjson_really_inline simdjson_result is_scalar() noexcept; simdjson_really_inline simdjson_result raw_json_token() noexcept; simdjson_really_inline simdjson_result at_pointer(std::string_view json_pointer) noexcept; @@ -558,7 +558,7 @@ public: simdjson_really_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; simdjson_really_inline simdjson_result find_field_unordered(const char *key) & noexcept; simdjson_really_inline simdjson_result type() noexcept; - simdjson_really_inline simdjson_result scalar() noexcept; + simdjson_really_inline simdjson_result is_scalar() noexcept; /** @copydoc simdjson_really_inline std::string_view document::raw_json_token() const noexcept */ simdjson_really_inline simdjson_result raw_json_token() noexcept; @@ -612,7 +612,7 @@ public: simdjson_really_inline simdjson_result find_field_unordered(std::string_view key) & noexcept; simdjson_really_inline simdjson_result find_field_unordered(const char *key) & noexcept; simdjson_really_inline simdjson_result type() noexcept; - simdjson_really_inline simdjson_result scalar() noexcept; + simdjson_really_inline simdjson_result is_scalar() noexcept; /** @copydoc simdjson_really_inline std::string_view document_reference::raw_json_token() const noexcept */ simdjson_really_inline simdjson_result raw_json_token() noexcept; diff --git a/include/simdjson/generic/ondemand/value-inl.h b/include/simdjson/generic/ondemand/value-inl.h index 6381a95ee..a42a0b153 100644 --- a/include/simdjson/generic/ondemand/value-inl.h +++ b/include/simdjson/generic/ondemand/value-inl.h @@ -144,7 +144,7 @@ simdjson_really_inline simdjson_result value::type() noexcept { return iter.type(); } -simdjson_really_inline simdjson_result value::scalar() noexcept { +simdjson_really_inline simdjson_result value::is_scalar() noexcept { json_type this_type; auto error = type().get(this_type); if(error) { return error; } @@ -305,9 +305,9 @@ simdjson_really_inline simdjson_result simdjson_result::scalar() noexcept { +simdjson_really_inline simdjson_result simdjson_result::is_scalar() noexcept { if (error()) { return error(); } - return first.scalar(); + return first.is_scalar(); } #if SIMDJSON_EXCEPTIONS simdjson_really_inline simdjson_result::operator SIMDJSON_IMPLEMENTATION::ondemand::array() noexcept(false) { diff --git a/include/simdjson/generic/ondemand/value.h b/include/simdjson/generic/ondemand/value.h index 2f8552c57..8005b6b24 100644 --- a/include/simdjson/generic/ondemand/value.h +++ b/include/simdjson/generic/ondemand/value.h @@ -328,7 +328,7 @@ public: * @returns true if the type is string, number, null, Boolean * @error TAPE_ERROR when the JSON value is a bad token like "}" "," or "alse". */ - simdjson_really_inline simdjson_result scalar() noexcept; + simdjson_really_inline simdjson_result is_scalar() noexcept; /** * Get the raw JSON for this token. * @@ -544,7 +544,7 @@ public: * let it throw an exception). */ simdjson_really_inline simdjson_result type() noexcept; - simdjson_really_inline simdjson_result scalar() noexcept; + simdjson_really_inline simdjson_result is_scalar() noexcept; /** @copydoc simdjson_really_inline std::string_view value::raw_json_token() const noexcept */ simdjson_really_inline simdjson_result raw_json_token() noexcept; diff --git a/tests/ondemand/ondemand_json_pointer_tests.cpp b/tests/ondemand/ondemand_json_pointer_tests.cpp index 2fca4dbac..f6d808cff 100644 --- a/tests/ondemand/ondemand_json_pointer_tests.cpp +++ b/tests/ondemand/ondemand_json_pointer_tests.cpp @@ -144,37 +144,37 @@ namespace json_pointer_tests { bool is_scalar; std::cout << " checking number"<< std::endl; ASSERT_SUCCESS(parser.iterate(number_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_TRUE(is_scalar); ASSERT_ERROR(doc.at_pointer("").get(val), simdjson::SCALAR_DOCUMENT_AS_VALUE); std::cout << " checking null"<< std::endl; ASSERT_SUCCESS(parser.iterate(null_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_TRUE(is_scalar); ASSERT_ERROR(doc.at_pointer("").get(val), simdjson::SCALAR_DOCUMENT_AS_VALUE); std::cout << " checking string"<< std::endl; ASSERT_SUCCESS(parser.iterate(string_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_TRUE(is_scalar); ASSERT_ERROR(doc.at_pointer("").get(val), simdjson::SCALAR_DOCUMENT_AS_VALUE); std::cout << " checking false"<< std::endl; ASSERT_SUCCESS(parser.iterate(false_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_TRUE(is_scalar); ASSERT_ERROR(doc.at_pointer("").get(val), simdjson::SCALAR_DOCUMENT_AS_VALUE); std::cout << " checking true"<< std::endl; ASSERT_SUCCESS(parser.iterate(true_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_TRUE(is_scalar); ASSERT_ERROR(doc.at_pointer("").get(val), simdjson::SCALAR_DOCUMENT_AS_VALUE); std::cout << " checking object"<< std::endl; ASSERT_SUCCESS(parser.iterate(object_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_FALSE(is_scalar); ASSERT_SUCCESS(doc.at_pointer("").get(val)); std::cout << " checking array"<< std::endl; ASSERT_SUCCESS(parser.iterate(array_json).get(doc)); - ASSERT_SUCCESS(doc.scalar().get(is_scalar)); + ASSERT_SUCCESS(doc.is_scalar().get(is_scalar)); ASSERT_FALSE(is_scalar); ASSERT_SUCCESS(doc.at_pointer("").get(val)); TEST_SUCCEED();