From c7bffc8fa27b4ae2c92e018dc5f8f79e0dfff9b9 Mon Sep 17 00:00:00 2001 From: Aras Pranckevicius Date: Fri, 6 May 2022 14:53:56 +0300 Subject: obj: move parsing utilities out of io_common, since they are fairly obj specific As pointed out in https://developer.blender.org/rB213cd39b6db387bd88f12589fd50ff0e6563cf56#341113, the utilities are quite OBJ specific due to treating backslash as a line continuation character. It's unlikely that other formats need that. No functionality changes, just pure code move (and renamed tests so that their names reflect obj). Reviewed By: Campbell Barton Differential Revision: https://developer.blender.org/D14871 --- source/blender/io/common/CMakeLists.txt | 5 - source/blender/io/common/IO_string_utils.hh | 69 ------------ source/blender/io/common/intern/string_utils.cc | 99 ----------------- .../blender/io/common/intern/string_utils_test.cc | 118 --------------------- 4 files changed, 291 deletions(-) delete mode 100644 source/blender/io/common/IO_string_utils.hh delete mode 100644 source/blender/io/common/intern/string_utils.cc delete mode 100644 source/blender/io/common/intern/string_utils_test.cc (limited to 'source/blender/io/common') diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt index b1add38bf01..02bd5b2b81f 100644 --- a/source/blender/io/common/CMakeLists.txt +++ b/source/blender/io/common/CMakeLists.txt @@ -7,8 +7,6 @@ set(INC ../../blenlib ../../depsgraph ../../makesdna - ../../../../intern/guardedalloc - ../../../../extern/fast_float ) set(INC_SYS @@ -19,11 +17,9 @@ set(SRC intern/dupli_parent_finder.cc intern/dupli_persistent_id.cc intern/object_identifier.cc - intern/string_utils.cc IO_abstract_hierarchy_iterator.h IO_dupli_persistent_id.hh - IO_string_utils.hh IO_types.h intern/dupli_parent_finder.hh ) @@ -42,7 +38,6 @@ if(WITH_GTESTS) intern/abstract_hierarchy_iterator_test.cc intern/hierarchy_context_order_test.cc intern/object_identifier_test.cc - intern/string_utils_test.cc ) set(TEST_INC ../../blenloader diff --git a/source/blender/io/common/IO_string_utils.hh b/source/blender/io/common/IO_string_utils.hh deleted file mode 100644 index 25f1f01c6ed..00000000000 --- a/source/blender/io/common/IO_string_utils.hh +++ /dev/null @@ -1,69 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#pragma once - -#include "BLI_string_ref.hh" - -/* - * Various text parsing utilities commonly used by text-based input formats. - */ - -namespace blender::io { - -/** - * Fetches next line from an input string buffer. - * - * The returned line will not have '\n' characters at the end; - * the `buffer` is modified to contain remaining text without - * the input line. - * - * Note that backslash (\) character is treated as a line - * continuation, similar to OBJ file format or a C preprocessor. - */ -StringRef read_next_line(StringRef &buffer); - -/** - * Drop leading white-space from a StringRef. - * Note that backslash character is considered white-space. - */ -StringRef drop_whitespace(StringRef str); - -/** - * Drop leading non-white-space from a StringRef. - * Note that backslash character is considered white-space. - */ -StringRef drop_non_whitespace(StringRef str); - -/** - * Parse an integer from an input string. - * The parsed result is stored in `dst`. The function skips - * leading white-space unless `skip_space=false`. If the - * number can't be parsed (invalid syntax, out of range), - * `fallback` value is stored instead. - * - * Returns the remainder of the input string after parsing. - */ -StringRef parse_int(StringRef str, int fallback, int &dst, bool skip_space = true); - -/** - * Parse a float from an input string. - * The parsed result is stored in `dst`. The function skips - * leading white-space unless `skip_space=false`. If the - * number can't be parsed (invalid syntax, out of range), - * `fallback` value is stored instead. - * - * Returns the remainder of the input string after parsing. - */ -StringRef parse_float(StringRef str, float fallback, float &dst, bool skip_space = true); - -/** - * Parse a number of white-space separated floats from an input string. - * The parsed `count` numbers are stored in `dst`. If a - * number can't be parsed (invalid syntax, out of range), - * `fallback` value is stored instead. - * - * Returns the remainder of the input string after parsing. - */ -StringRef parse_floats(StringRef str, float fallback, float *dst, int count); - -} // namespace blender::io diff --git a/source/blender/io/common/intern/string_utils.cc b/source/blender/io/common/intern/string_utils.cc deleted file mode 100644 index 3a12250e14b..00000000000 --- a/source/blender/io/common/intern/string_utils.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include "IO_string_utils.hh" - -/* Note: we could use C++17 from_chars to parse - * floats, but even if some compilers claim full support, - * their standard libraries are not quite there yet. - * LLVM/libc++ only has a float parser since LLVM 14, - * and gcc/libstdc++ since 11.1. So until at least these are - * the minimum spec, use an external library. */ -#include "fast_float.h" -#include - -namespace blender::io { - -StringRef read_next_line(StringRef &buffer) -{ - const char *start = buffer.begin(); - const char *end = buffer.end(); - size_t len = 0; - char prev = 0; - const char *ptr = start; - while (ptr < end) { - char c = *ptr++; - if (c == '\n' && prev != '\\') { - break; - } - prev = c; - ++len; - } - - buffer = StringRef(ptr, end); - return StringRef(start, len); -} - -static bool is_whitespace(char c) -{ - return c <= ' ' || c == '\\'; -} - -StringRef drop_whitespace(StringRef str) -{ - while (!str.is_empty() && is_whitespace(str[0])) { - str = str.drop_prefix(1); - } - return str; -} - -StringRef drop_non_whitespace(StringRef str) -{ - while (!str.is_empty() && !is_whitespace(str[0])) { - str = str.drop_prefix(1); - } - return str; -} - -static StringRef drop_plus(StringRef str) -{ - if (!str.is_empty() && str[0] == '+') { - str = str.drop_prefix(1); - } - return str; -} - -StringRef parse_float(StringRef str, float fallback, float &dst, bool skip_space) -{ - if (skip_space) { - str = drop_whitespace(str); - } - str = drop_plus(str); - fast_float::from_chars_result res = fast_float::from_chars(str.begin(), str.end(), dst); - if (res.ec == std::errc::invalid_argument || res.ec == std::errc::result_out_of_range) { - dst = fallback; - } - return StringRef(res.ptr, str.end()); -} - -StringRef parse_floats(StringRef str, float fallback, float *dst, int count) -{ - for (int i = 0; i < count; ++i) { - str = parse_float(str, fallback, dst[i]); - } - return str; -} - -StringRef parse_int(StringRef str, int fallback, int &dst, bool skip_space) -{ - if (skip_space) { - str = drop_whitespace(str); - } - str = drop_plus(str); - std::from_chars_result res = std::from_chars(str.begin(), str.end(), dst); - if (res.ec == std::errc::invalid_argument || res.ec == std::errc::result_out_of_range) { - dst = fallback; - } - return StringRef(res.ptr, str.end()); -} - -} // namespace blender::io diff --git a/source/blender/io/common/intern/string_utils_test.cc b/source/blender/io/common/intern/string_utils_test.cc deleted file mode 100644 index a78bd7ab8a3..00000000000 --- a/source/blender/io/common/intern/string_utils_test.cc +++ /dev/null @@ -1,118 +0,0 @@ -/* SPDX-License-Identifier: Apache-2.0 */ - -#include "IO_string_utils.hh" - -#include "testing/testing.h" - -namespace blender::io { - -#define EXPECT_STRREF_EQ(str1, str2) EXPECT_STREQ(str1, std::string(str2).c_str()) - -TEST(string_utils, read_next_line) -{ - std::string str = "abc\n \n\nline with \\\ncontinuation\nCRLF ending:\r\na"; - StringRef s = str; - EXPECT_STRREF_EQ("abc", read_next_line(s)); - EXPECT_STRREF_EQ(" ", read_next_line(s)); - EXPECT_STRREF_EQ("", read_next_line(s)); - EXPECT_STRREF_EQ("line with \\\ncontinuation", read_next_line(s)); - EXPECT_STRREF_EQ("CRLF ending:\r", read_next_line(s)); - EXPECT_STRREF_EQ("a", read_next_line(s)); - EXPECT_TRUE(s.is_empty()); -} - -TEST(string_utils, drop_whitespace) -{ - /* Empty */ - EXPECT_STRREF_EQ("", drop_whitespace("")); - /* Only whitespace */ - EXPECT_STRREF_EQ("", drop_whitespace(" ")); - EXPECT_STRREF_EQ("", drop_whitespace(" ")); - EXPECT_STRREF_EQ("", drop_whitespace(" \t\n\r ")); - /* Drops leading whitespace */ - EXPECT_STRREF_EQ("a", drop_whitespace(" a")); - EXPECT_STRREF_EQ("a b", drop_whitespace(" a b")); - EXPECT_STRREF_EQ("a b ", drop_whitespace(" a b ")); - /* No leading whitespace */ - EXPECT_STRREF_EQ("c", drop_whitespace("c")); - /* Case with backslash, should be treated as whitespace */ - EXPECT_STRREF_EQ("d", drop_whitespace(" \\ d")); -} - -TEST(string_utils, parse_int_valid) -{ - std::string str = "1 -10 \t 1234 1234567890 +7 123a"; - StringRef s = str; - int val; - s = parse_int(s, 0, val); - EXPECT_EQ(1, val); - s = parse_int(s, 0, val); - EXPECT_EQ(-10, val); - s = parse_int(s, 0, val); - EXPECT_EQ(1234, val); - s = parse_int(s, 0, val); - EXPECT_EQ(1234567890, val); - s = parse_int(s, 0, val); - EXPECT_EQ(7, val); - s = parse_int(s, 0, val); - EXPECT_EQ(123, val); - EXPECT_STRREF_EQ("a", s); -} - -TEST(string_utils, parse_int_invalid) -{ - int val; - /* Invalid syntax */ - EXPECT_STRREF_EQ("--123", parse_int("--123", -1, val)); - EXPECT_EQ(val, -1); - EXPECT_STRREF_EQ("foobar", parse_int("foobar", -2, val)); - EXPECT_EQ(val, -2); - /* Out of integer range */ - EXPECT_STRREF_EQ(" a", parse_int("1234567890123 a", -3, val)); - EXPECT_EQ(val, -3); - /* Has leading white-space when we don't expect it */ - EXPECT_STRREF_EQ(" 1", parse_int(" 1", -4, val, false)); - EXPECT_EQ(val, -4); -} - -TEST(string_utils, parse_float_valid) -{ - std::string str = "1 -10 123.5 -17.125 0.1 1e6 50.0e-1"; - StringRef s = str; - float val; - s = parse_float(s, 0, val); - EXPECT_EQ(1.0f, val); - s = parse_float(s, 0, val); - EXPECT_EQ(-10.0f, val); - s = parse_float(s, 0, val); - EXPECT_EQ(123.5f, val); - s = parse_float(s, 0, val); - EXPECT_EQ(-17.125f, val); - s = parse_float(s, 0, val); - EXPECT_EQ(0.1f, val); - s = parse_float(s, 0, val); - EXPECT_EQ(1.0e6f, val); - s = parse_float(s, 0, val); - EXPECT_EQ(5.0f, val); - EXPECT_TRUE(s.is_empty()); -} - -TEST(string_utils, parse_float_invalid) -{ - float val; - /* Invalid syntax */ - EXPECT_STRREF_EQ("_0", parse_float("_0", -1.0f, val)); - EXPECT_EQ(val, -1.0f); - EXPECT_STRREF_EQ("..5", parse_float("..5", -2.0f, val)); - EXPECT_EQ(val, -2.0f); - /* Out of float range. Current float parser (fast_float) - * clamps out of range numbers to +/- infinity, so this - * one gets a +inf instead of fallback -3.0. */ - EXPECT_STRREF_EQ(" a", parse_float("9.0e500 a", -3.0f, val)); - EXPECT_EQ(val, std::numeric_limits::infinity()); - /* Has leading white-space when we don't expect it */ - EXPECT_STRREF_EQ(" 1", parse_float(" 1", -4.0f, val, false)); - EXPECT_EQ(val, -4.0f); -} - -} // namespace blender::io -- cgit v1.2.3