forked from BigfootDev/flatbuffers
Fix typos (#7483)
This commit is contained in:
@@ -17,7 +17,7 @@ class Builder {
|
||||
final Map<double, _StackValue> _indirectDoubleCache = {};
|
||||
|
||||
/// Instantiate the builder if you intent to gradually build up the buffer by calling
|
||||
/// add... methods and calling [finish] to receive the the resulting byte array.
|
||||
/// add... methods and calling [finish] to receive the resulting byte array.
|
||||
///
|
||||
/// The default size of internal buffer is set to 2048. Provide a different value in order to avoid buffer copies.
|
||||
Builder({int size = 2048}) : _buffer = ByteData(size);
|
||||
|
||||
@@ -199,7 +199,7 @@ class Reference {
|
||||
return _MapValueIterator(this);
|
||||
}
|
||||
|
||||
/// Returns the length of the the underlying FlexBuffer value.
|
||||
/// Returns the length of the underlying FlexBuffer value.
|
||||
/// If the underlying value is [null] the length is 0.
|
||||
/// If the underlying value is a number, or a bool, the length is 1.
|
||||
/// If the underlying value is a vector, or map, the length reflects number of elements / element pairs.
|
||||
|
||||
@@ -273,14 +273,14 @@ namespace flatbuffers {
|
||||
#endif // !FLATBUFFERS_LOCALE_INDEPENDENT
|
||||
|
||||
// Suppress Undefined Behavior Sanitizer (recoverable only). Usage:
|
||||
// - __supress_ubsan__("undefined")
|
||||
// - __supress_ubsan__("signed-integer-overflow")
|
||||
// - __suppress_ubsan__("undefined")
|
||||
// - __suppress_ubsan__("signed-integer-overflow")
|
||||
#if defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >=7))
|
||||
#define __supress_ubsan__(type) __attribute__((no_sanitize(type)))
|
||||
#define __suppress_ubsan__(type) __attribute__((no_sanitize(type)))
|
||||
#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 409)
|
||||
#define __supress_ubsan__(type) __attribute__((no_sanitize_undefined))
|
||||
#define __suppress_ubsan__(type) __attribute__((no_sanitize_undefined))
|
||||
#else
|
||||
#define __supress_ubsan__(type)
|
||||
#define __suppress_ubsan__(type)
|
||||
#endif
|
||||
|
||||
// This is constexpr function used for checking compile-time constants.
|
||||
@@ -413,7 +413,7 @@ template<typename T> T EndianScalar(T t) {
|
||||
|
||||
template<typename T>
|
||||
// UBSAN: C++ aliasing type rules, see std::bit_cast<> for details.
|
||||
__supress_ubsan__("alignment")
|
||||
__suppress_ubsan__("alignment")
|
||||
T ReadScalar(const void *p) {
|
||||
return EndianScalar(*reinterpret_cast<const T *>(p));
|
||||
}
|
||||
@@ -427,13 +427,13 @@ T ReadScalar(const void *p) {
|
||||
|
||||
template<typename T>
|
||||
// UBSAN: C++ aliasing type rules, see std::bit_cast<> for details.
|
||||
__supress_ubsan__("alignment")
|
||||
__suppress_ubsan__("alignment")
|
||||
void WriteScalar(void *p, T t) {
|
||||
*reinterpret_cast<T *>(p) = EndianScalar(t);
|
||||
}
|
||||
|
||||
template<typename T> struct Offset;
|
||||
template<typename T> __supress_ubsan__("alignment") void WriteScalar(void *p, Offset<T> t) {
|
||||
template<typename T> __suppress_ubsan__("alignment") void WriteScalar(void *p, Offset<T> t) {
|
||||
*reinterpret_cast<uoffset_t *>(p) = EndianScalar(t.o);
|
||||
}
|
||||
|
||||
@@ -444,7 +444,7 @@ template<typename T> __supress_ubsan__("alignment") void WriteScalar(void *p, Of
|
||||
// Computes how many bytes you'd have to pad to be able to write an
|
||||
// "scalar_size" scalar if the buffer had grown to "buf_size" (downwards in
|
||||
// memory).
|
||||
__supress_ubsan__("unsigned-integer-overflow")
|
||||
__suppress_ubsan__("unsigned-integer-overflow")
|
||||
inline size_t PaddingBytes(size_t buf_size, size_t scalar_size) {
|
||||
return ((~buf_size) + 1) & (scalar_size - 1);
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ template<typename T> struct IndirectHelper<const T *> {
|
||||
}
|
||||
};
|
||||
|
||||
/// @brief Get a pointer to the the file_identifier section of the buffer.
|
||||
/// @brief Get a pointer to the file_identifier section of the buffer.
|
||||
/// @return Returns a const char pointer to the start of the file_identifier
|
||||
/// characters in the buffer. The returned char * has length
|
||||
/// 'flatbuffers::FlatBufferBuilder::kFileIdentifierLength'.
|
||||
|
||||
@@ -358,7 +358,7 @@ class FlatBufferBuilder {
|
||||
// If you get this assert, a corresponding StartTable wasn't called.
|
||||
FLATBUFFERS_ASSERT(nested);
|
||||
// Write the vtable offset, which is the start of any Table.
|
||||
// We fill it's value later.
|
||||
// We fill its value later.
|
||||
auto vtableoffsetloc = PushElement<soffset_t>(0);
|
||||
// Write a vtable, which consists entirely of voffset_t elements.
|
||||
// It starts with the number of offsets, followed by a type id, followed
|
||||
@@ -747,7 +747,7 @@ class FlatBufferBuilder {
|
||||
|
||||
/// @brief Serialize a collection of Strings into a FlatBuffer `vector`.
|
||||
/// This is a convenience function for a common case.
|
||||
/// @param begin The begining iterator of the collection
|
||||
/// @param begin The beginning iterator of the collection
|
||||
/// @param end The ending iterator of the collection
|
||||
/// @return Returns a typed `Offset` into the serialized data indicating
|
||||
/// where the vector is stored.
|
||||
@@ -757,7 +757,7 @@ class FlatBufferBuilder {
|
||||
auto scratch_buffer_usage = size * sizeof(Offset<String>);
|
||||
// If there is not enough space to store the offsets, there definitely won't
|
||||
// be enough space to store all the strings. So ensuring space for the
|
||||
// scratch region is OK, for it it fails, it would have failed later.
|
||||
// scratch region is OK, for if it fails, it would have failed later.
|
||||
buf_.ensure_space(scratch_buffer_usage);
|
||||
for (auto it = begin; it != end; ++it) {
|
||||
buf_.scratch_push_small(CreateString(*it));
|
||||
|
||||
@@ -1871,7 +1871,7 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
|
||||
std::vector<uint8_t> *reuse_tracker_;
|
||||
};
|
||||
|
||||
// Utility function that contructs the Verifier for you, see above for
|
||||
// Utility function that constructs the Verifier for you, see above for
|
||||
// parameters.
|
||||
inline bool VerifyBuffer(const uint8_t *buf, size_t buf_len,
|
||||
std::vector<uint8_t> *reuse_tracker = nullptr) {
|
||||
|
||||
@@ -293,7 +293,7 @@ namespace internal {
|
||||
// > to a pointer to an array of To.
|
||||
// This helper is used for checking of 'From -> const From'.
|
||||
template<class To, std::size_t Extent, class From, std::size_t N>
|
||||
struct is_span_convertable {
|
||||
struct is_span_convertible {
|
||||
using type =
|
||||
typename std::conditional<std::is_convertible<From (*)[], To (*)[]>::value
|
||||
&& (Extent == dynamic_extent || N == Extent),
|
||||
@@ -415,7 +415,7 @@ class span FLATBUFFERS_FINAL_CLASS {
|
||||
// extent == 0 || extent == flatbuffers::dynamic_extent.
|
||||
// A dummy template argument N is need dependency for SFINAE.
|
||||
template<std::size_t N = 0,
|
||||
typename internal::is_span_convertable<element_type, Extent, element_type, (N - N)>::type = 0>
|
||||
typename internal::is_span_convertible<element_type, Extent, element_type, (N - N)>::type = 0>
|
||||
FLATBUFFERS_CONSTEXPR_CPP11 span() FLATBUFFERS_NOEXCEPT : data_(nullptr),
|
||||
count_(0) {
|
||||
static_assert(extent == 0 || extent == dynamic_extent, "invalid span");
|
||||
@@ -428,12 +428,12 @@ class span FLATBUFFERS_FINAL_CLASS {
|
||||
// std::remove_pointer_t<decltype(std::data(arr))>(*)[]
|
||||
// is convertible to element_type (*)[].
|
||||
template<std::size_t N,
|
||||
typename internal::is_span_convertable<element_type, Extent, element_type, N>::type = 0>
|
||||
typename internal::is_span_convertible<element_type, Extent, element_type, N>::type = 0>
|
||||
FLATBUFFERS_CONSTEXPR_CPP11 span(element_type (&arr)[N]) FLATBUFFERS_NOEXCEPT
|
||||
: data_(arr), count_(N) {}
|
||||
|
||||
template<class U, std::size_t N,
|
||||
typename internal::is_span_convertable<element_type, Extent, U, N>::type = 0>
|
||||
typename internal::is_span_convertible<element_type, Extent, U, N>::type = 0>
|
||||
FLATBUFFERS_CONSTEXPR_CPP11 span(std::array<U, N> &arr) FLATBUFFERS_NOEXCEPT
|
||||
: data_(arr.data()), count_(N) {}
|
||||
|
||||
@@ -443,7 +443,7 @@ class span FLATBUFFERS_FINAL_CLASS {
|
||||
// : data_(arr.data()), count_(N) {}
|
||||
|
||||
template<class U, std::size_t N,
|
||||
typename internal::is_span_convertable<element_type, Extent, U, N>::type = 0>
|
||||
typename internal::is_span_convertible<element_type, Extent, U, N>::type = 0>
|
||||
FLATBUFFERS_CONSTEXPR_CPP11 span(const std::array<U, N> &arr) FLATBUFFERS_NOEXCEPT
|
||||
: data_(arr.data()), count_(N) {}
|
||||
|
||||
@@ -453,7 +453,7 @@ class span FLATBUFFERS_FINAL_CLASS {
|
||||
// if extent == std::dynamic_extent || N == extent is true and U (*)[]
|
||||
// is convertible to element_type (*)[].
|
||||
template<class U, std::size_t N,
|
||||
typename internal::is_span_convertable<element_type, Extent, U, N>::type = 0>
|
||||
typename internal::is_span_convertible<element_type, Extent, U, N>::type = 0>
|
||||
FLATBUFFERS_CONSTEXPR_CPP11 span(const flatbuffers::span<U, N> &s) FLATBUFFERS_NOEXCEPT
|
||||
: span(s.data(), s.size()) {
|
||||
}
|
||||
|
||||
@@ -255,7 +255,7 @@ inline void strtoval_impl(double *val, const char *str, char **endptr) {
|
||||
}
|
||||
|
||||
// UBSAN: double to float is safe if numeric_limits<float>::is_iec559 is true.
|
||||
__supress_ubsan__("float-cast-overflow")
|
||||
__suppress_ubsan__("float-cast-overflow")
|
||||
inline void strtoval_impl(float *val, const char *str, char **endptr) {
|
||||
*val = __strtof_impl(str, endptr);
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
namespace flatbuffers {
|
||||
|
||||
// This is a minimal replication of std::vector<uint8_t> functionality,
|
||||
// except growing from higher to lower addresses. i.e push_back() inserts data
|
||||
// except growing from higher to lower addresses. i.e. push_back() inserts data
|
||||
// in the lowest address in the vector.
|
||||
// Since this vector leaves the lower part unused, we support a "scratch-pad"
|
||||
// that can be stored there for temporary data, to share the allocated space.
|
||||
|
||||
@@ -158,7 +158,7 @@ class Verifier FLATBUFFERS_FINAL_CLASS {
|
||||
return true;
|
||||
}
|
||||
|
||||
__supress_ubsan__("unsigned-integer-overflow") bool VerifyTableStart(
|
||||
__suppress_ubsan__("unsigned-integer-overflow") bool VerifyTableStart(
|
||||
const uint8_t *const table) {
|
||||
// Check the vtable offset.
|
||||
const auto tableo = static_cast<size_t>(table - buf_);
|
||||
|
||||
@@ -451,7 +451,7 @@ public class FlexBuffersBuilder {
|
||||
/**
|
||||
* Finishes a vector, but writing the information in the buffer
|
||||
* @param key key used to store element in map
|
||||
* @param start reference for begining of the vector. Returned by {@link startVector()}
|
||||
* @param start reference for beginning of the vector. Returned by {@link startVector()}
|
||||
* @param typed boolean indicating whether vector is typed
|
||||
* @param fixed boolean indicating whether vector is fixed
|
||||
* @return Reference to the vector
|
||||
@@ -602,7 +602,7 @@ public class FlexBuffersBuilder {
|
||||
/**
|
||||
* Finishes a map, but writing the information in the buffer
|
||||
* @param key key used to store element in map
|
||||
* @param start reference for begining of the map. Returned by {@link startMap()}
|
||||
* @param start reference for beginning of the map. Returned by {@link startMap()}
|
||||
* @return Reference to the map
|
||||
*/
|
||||
public int endMap(String key, int start) {
|
||||
|
||||
@@ -1815,7 +1815,7 @@ void FuzzTest2() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
TEST_NOTNULL(nullptr); //-V501 (this comment supresses CWE-570 warning)
|
||||
TEST_NOTNULL(nullptr); //-V501 (this comment suppresses CWE-570 warning)
|
||||
}
|
||||
|
||||
// clang-format off
|
||||
@@ -3663,14 +3663,14 @@ void CreateSharedStringTest() {
|
||||
#if !defined(FLATBUFFERS_USE_STD_SPAN) && !defined(FLATBUFFERS_SPAN_MINIMAL)
|
||||
void FlatbuffersSpanTest() {
|
||||
// Compile-time checking of non-const [] to const [] conversions.
|
||||
using flatbuffers::internal::is_span_convertable;
|
||||
(void)is_span_convertable<int, 1, int, 1>::type(123);
|
||||
(void)is_span_convertable<const int, 1, int, 1>::type(123);
|
||||
(void)is_span_convertable<const int64_t, 1, int64_t, 1>::type(123);
|
||||
(void)is_span_convertable<const uint64_t, 1, uint64_t, 1>::type(123);
|
||||
(void)is_span_convertable<const int, 1, const int, 1>::type(123);
|
||||
(void)is_span_convertable<const int64_t, 1, const int64_t, 1>::type(123);
|
||||
(void)is_span_convertable<const uint64_t, 1, const uint64_t, 1>::type(123);
|
||||
using flatbuffers::internal::is_span_convertible;
|
||||
(void)is_span_convertible<int, 1, int, 1>::type(123);
|
||||
(void)is_span_convertible<const int, 1, int, 1>::type(123);
|
||||
(void)is_span_convertible<const int64_t, 1, int64_t, 1>::type(123);
|
||||
(void)is_span_convertible<const uint64_t, 1, uint64_t, 1>::type(123);
|
||||
(void)is_span_convertible<const int, 1, const int, 1>::type(123);
|
||||
(void)is_span_convertible<const int64_t, 1, const int64_t, 1>::type(123);
|
||||
(void)is_span_convertible<const uint64_t, 1, const uint64_t, 1>::type(123);
|
||||
|
||||
using flatbuffers::span;
|
||||
span<char, 0> c1;
|
||||
|
||||
@@ -150,7 +150,7 @@ export class Builder {
|
||||
|
||||
/**
|
||||
* Add an `int8` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
* @param value The `int8` to add the the buffer.
|
||||
* @param value The `int8` to add the buffer.
|
||||
*/
|
||||
addInt8(value: number): void {
|
||||
this.prep(1, 0);
|
||||
@@ -159,7 +159,7 @@ export class Builder {
|
||||
|
||||
/**
|
||||
* Add an `int16` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
* @param value The `int16` to add the the buffer.
|
||||
* @param value The `int16` to add the buffer.
|
||||
*/
|
||||
addInt16(value: number): void {
|
||||
this.prep(2, 0);
|
||||
@@ -168,7 +168,7 @@ export class Builder {
|
||||
|
||||
/**
|
||||
* Add an `int32` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
* @param value The `int32` to add the the buffer.
|
||||
* @param value The `int32` to add the buffer.
|
||||
*/
|
||||
addInt32(value: number): void {
|
||||
this.prep(4, 0);
|
||||
@@ -177,7 +177,7 @@ export class Builder {
|
||||
|
||||
/**
|
||||
* Add an `int64` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
* @param value The `int64` to add the the buffer.
|
||||
* @param value The `int64` to add the buffer.
|
||||
*/
|
||||
addInt64(value: bigint): void {
|
||||
this.prep(8, 0);
|
||||
@@ -186,7 +186,7 @@ export class Builder {
|
||||
|
||||
/**
|
||||
* Add a `float32` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
* @param value The `float32` to add the the buffer.
|
||||
* @param value The `float32` to add the buffer.
|
||||
*/
|
||||
addFloat32(value: number): void {
|
||||
this.prep(4, 0);
|
||||
@@ -195,7 +195,7 @@ export class Builder {
|
||||
|
||||
/**
|
||||
* Add a `float64` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
* @param value The `float64` to add the the buffer.
|
||||
* @param value The `float64` to add the buffer.
|
||||
*/
|
||||
addFloat64(value: number): void {
|
||||
this.prep(8, 0);
|
||||
|
||||
Reference in New Issue
Block a user