mirror of
https://github.com/google/flatbuffers.git
synced 2026-06-01 19:58:15 +00:00
bulk code format fix (#8707)
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
// automatically generated by the FlatBuffers compiler, do not modify
|
||||
|
||||
|
||||
#ifndef FLATBUFFERS_GENERATED_ANIMAL_COM_FBS_APP_H_
|
||||
#define FLATBUFFERS_GENERATED_ANIMAL_COM_FBS_APP_H_
|
||||
|
||||
@@ -33,17 +32,12 @@ struct Animal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
|
||||
const ::flatbuffers::String* sound() const {
|
||||
return GetPointer<const ::flatbuffers::String*>(VT_SOUND);
|
||||
}
|
||||
uint16_t weight() const {
|
||||
return GetField<uint16_t>(VT_WEIGHT, 0);
|
||||
}
|
||||
uint16_t weight() const { return GetField<uint16_t>(VT_WEIGHT, 0); }
|
||||
bool Verify(::flatbuffers::Verifier& verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyOffset(verifier, VT_NAME) &&
|
||||
verifier.VerifyString(name()) &&
|
||||
VerifyOffset(verifier, VT_SOUND) &&
|
||||
return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NAME) &&
|
||||
verifier.VerifyString(name()) && VerifyOffset(verifier, VT_SOUND) &&
|
||||
verifier.VerifyString(sound()) &&
|
||||
VerifyField<uint16_t>(verifier, VT_WEIGHT, 2) &&
|
||||
verifier.EndTable();
|
||||
VerifyField<uint16_t>(verifier, VT_WEIGHT, 2) && verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -60,8 +54,7 @@ struct AnimalBuilder {
|
||||
void add_weight(uint16_t weight) {
|
||||
fbb_.AddElement<uint16_t>(Animal::VT_WEIGHT, weight, 0);
|
||||
}
|
||||
explicit AnimalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
|
||||
: fbb_(_fbb) {
|
||||
explicit AnimalBuilder(::flatbuffers::FlatBufferBuilder& _fbb) : fbb_(_fbb) {
|
||||
start_ = fbb_.StartTable();
|
||||
}
|
||||
::flatbuffers::Offset<Animal> Finish() {
|
||||
@@ -84,17 +77,11 @@ inline ::flatbuffers::Offset<Animal> CreateAnimal(
|
||||
}
|
||||
|
||||
inline ::flatbuffers::Offset<Animal> CreateAnimalDirect(
|
||||
::flatbuffers::FlatBufferBuilder &_fbb,
|
||||
const char *name = nullptr,
|
||||
const char *sound = nullptr,
|
||||
uint16_t weight = 0) {
|
||||
::flatbuffers::FlatBufferBuilder& _fbb, const char* name = nullptr,
|
||||
const char* sound = nullptr, uint16_t weight = 0) {
|
||||
auto name__ = name ? _fbb.CreateString(name) : 0;
|
||||
auto sound__ = sound ? _fbb.CreateString(sound) : 0;
|
||||
return com::fbs::app::CreateAnimal(
|
||||
_fbb,
|
||||
name__,
|
||||
sound__,
|
||||
weight);
|
||||
return com::fbs::app::CreateAnimal(_fbb, name__, sound__, weight);
|
||||
}
|
||||
|
||||
inline const com::fbs::app::Animal* GetAnimal(const void* buf) {
|
||||
@@ -105,13 +92,11 @@ inline const com::fbs::app::Animal *GetSizePrefixedAnimal(const void *buf) {
|
||||
return ::flatbuffers::GetSizePrefixedRoot<com::fbs::app::Animal>(buf);
|
||||
}
|
||||
|
||||
inline bool VerifyAnimalBuffer(
|
||||
::flatbuffers::Verifier &verifier) {
|
||||
inline bool VerifyAnimalBuffer(::flatbuffers::Verifier& verifier) {
|
||||
return verifier.VerifyBuffer<com::fbs::app::Animal>(nullptr);
|
||||
}
|
||||
|
||||
inline bool VerifySizePrefixedAnimalBuffer(
|
||||
::flatbuffers::Verifier &verifier) {
|
||||
inline bool VerifySizePrefixedAnimalBuffer(::flatbuffers::Verifier& verifier) {
|
||||
return verifier.VerifySizePrefixedBuffer<com::fbs::app::Animal>(nullptr);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.flatbuffers.app
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import android.widget.TextView
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.fbs.app.Animal
|
||||
import com.google.flatbuffers.FlatBufferBuilder
|
||||
import java.nio.ByteBuffer
|
||||
@@ -29,11 +29,12 @@ class MainActivity : AppCompatActivity() {
|
||||
// Create a "Cow" Animal flatbuffers from Kotlin
|
||||
private fun createAnimalFromKotlin(): Animal {
|
||||
val fb = FlatBufferBuilder(100)
|
||||
val cowOffset = Animal.createAnimal(
|
||||
val cowOffset =
|
||||
Animal.createAnimal(
|
||||
builder = fb,
|
||||
nameOffset = fb.createString("Cow"),
|
||||
soundOffset = fb.createString("Moo"),
|
||||
weight = 720u
|
||||
weight = 720u,
|
||||
)
|
||||
fb.finish(cowOffset)
|
||||
return Animal.getRootAsAnimal(fb.dataBuffer())
|
||||
|
||||
@@ -2,21 +2,11 @@
|
||||
|
||||
package com.fbs.app
|
||||
|
||||
import com.google.flatbuffers.BaseVector
|
||||
import com.google.flatbuffers.BooleanVector
|
||||
import com.google.flatbuffers.ByteVector
|
||||
import com.google.flatbuffers.Constants
|
||||
import com.google.flatbuffers.DoubleVector
|
||||
import com.google.flatbuffers.FlatBufferBuilder
|
||||
import com.google.flatbuffers.FloatVector
|
||||
import com.google.flatbuffers.LongVector
|
||||
import com.google.flatbuffers.StringVector
|
||||
import com.google.flatbuffers.Struct
|
||||
import com.google.flatbuffers.Table
|
||||
import com.google.flatbuffers.UnionVector
|
||||
import java.nio.ByteBuffer
|
||||
import java.nio.ByteOrder
|
||||
import kotlin.math.sign
|
||||
|
||||
@Suppress("unused")
|
||||
@kotlin.ExperimentalUnsignedTypes
|
||||
@@ -25,10 +15,12 @@ class Animal : Table() {
|
||||
fun __init(_i: Int, _bb: ByteBuffer) {
|
||||
__reset(_i, _bb)
|
||||
}
|
||||
|
||||
fun __assign(_i: Int, _bb: ByteBuffer): Animal {
|
||||
__init(_i, _bb)
|
||||
return this
|
||||
}
|
||||
|
||||
val name: String?
|
||||
get() {
|
||||
val o = __offset(4)
|
||||
@@ -38,8 +30,12 @@ class Animal : Table() {
|
||||
null
|
||||
}
|
||||
}
|
||||
val nameAsByteBuffer : ByteBuffer get() = __vector_as_bytebuffer(4, 1)
|
||||
|
||||
val nameAsByteBuffer: ByteBuffer
|
||||
get() = __vector_as_bytebuffer(4, 1)
|
||||
|
||||
fun nameInByteBuffer(_bb: ByteBuffer): ByteBuffer = __vector_in_bytebuffer(_bb, 4, 1)
|
||||
|
||||
val sound: String?
|
||||
get() {
|
||||
val o = __offset(6)
|
||||
@@ -49,36 +45,58 @@ class Animal : Table() {
|
||||
null
|
||||
}
|
||||
}
|
||||
val soundAsByteBuffer : ByteBuffer get() = __vector_as_bytebuffer(6, 1)
|
||||
|
||||
val soundAsByteBuffer: ByteBuffer
|
||||
get() = __vector_as_bytebuffer(6, 1)
|
||||
|
||||
fun soundInByteBuffer(_bb: ByteBuffer): ByteBuffer = __vector_in_bytebuffer(_bb, 6, 1)
|
||||
|
||||
val weight: UShort
|
||||
get() {
|
||||
val o = __offset(8)
|
||||
return if (o != 0) bb.getShort(o + bb_pos).toUShort() else 0u
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun validateVersion() = Constants.FLATBUFFERS_25_2_10()
|
||||
|
||||
fun getRootAsAnimal(_bb: ByteBuffer): Animal = getRootAsAnimal(_bb, Animal())
|
||||
|
||||
fun getRootAsAnimal(_bb: ByteBuffer, obj: Animal): Animal {
|
||||
_bb.order(ByteOrder.LITTLE_ENDIAN)
|
||||
return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb))
|
||||
}
|
||||
fun createAnimal(builder: FlatBufferBuilder, nameOffset: Int, soundOffset: Int, weight: UShort) : Int {
|
||||
|
||||
fun createAnimal(
|
||||
builder: FlatBufferBuilder,
|
||||
nameOffset: Int,
|
||||
soundOffset: Int,
|
||||
weight: UShort,
|
||||
): Int {
|
||||
builder.startTable(3)
|
||||
addSound(builder, soundOffset)
|
||||
addName(builder, nameOffset)
|
||||
addWeight(builder, weight)
|
||||
return endAnimal(builder)
|
||||
}
|
||||
|
||||
fun startAnimal(builder: FlatBufferBuilder) = builder.startTable(3)
|
||||
|
||||
fun addName(builder: FlatBufferBuilder, name: Int) = builder.addOffset(0, name, 0)
|
||||
|
||||
fun addSound(builder: FlatBufferBuilder, sound: Int) = builder.addOffset(1, sound, 0)
|
||||
fun addWeight(builder: FlatBufferBuilder, weight: UShort) = builder.addShort(2, weight.toShort(), 0)
|
||||
|
||||
fun addWeight(builder: FlatBufferBuilder, weight: UShort) =
|
||||
builder.addShort(2, weight.toShort(), 0)
|
||||
|
||||
fun endAnimal(builder: FlatBufferBuilder): Int {
|
||||
val o = builder.endTable()
|
||||
return o
|
||||
}
|
||||
|
||||
fun finishAnimalBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finish(offset)
|
||||
fun finishSizePrefixedAnimalBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finishSizePrefixed(offset)
|
||||
|
||||
fun finishSizePrefixedAnimalBuffer(builder: FlatBufferBuilder, offset: Int) =
|
||||
builder.finishSizePrefixed(offset)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
// automatically generated by the FlatBuffers compiler, do not modify
|
||||
|
||||
|
||||
#ifndef FLATBUFFERS_GENERATED_BENCH_BENCHMARKS_FLATBUFFERS_H_
|
||||
#define FLATBUFFERS_GENERATED_BENCH_BENCHMARKS_FLATBUFFERS_H_
|
||||
|
||||
@@ -34,21 +33,12 @@ enum Enum : int16_t {
|
||||
};
|
||||
|
||||
inline const Enum (&EnumValuesEnum())[3] {
|
||||
static const Enum values[] = {
|
||||
Enum_Apples,
|
||||
Enum_Pears,
|
||||
Enum_Bananas
|
||||
};
|
||||
static const Enum values[] = {Enum_Apples, Enum_Pears, Enum_Bananas};
|
||||
return values;
|
||||
}
|
||||
|
||||
inline const char* const* EnumNamesEnum() {
|
||||
static const char * const names[4] = {
|
||||
"Apples",
|
||||
"Pears",
|
||||
"Bananas",
|
||||
nullptr
|
||||
};
|
||||
static const char* const names[4] = {"Apples", "Pears", "Bananas", nullptr};
|
||||
return names;
|
||||
}
|
||||
|
||||
@@ -67,12 +57,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Foo FLATBUFFERS_FINAL_CLASS {
|
||||
uint32_t length_;
|
||||
|
||||
public:
|
||||
Foo()
|
||||
: id_(0),
|
||||
count_(0),
|
||||
prefix_(0),
|
||||
padding0__(0),
|
||||
length_(0) {
|
||||
Foo() : id_(0), count_(0), prefix_(0), padding0__(0), length_(0) {
|
||||
(void)padding0__;
|
||||
}
|
||||
Foo(uint64_t _id, int16_t _count, int8_t _prefix, uint32_t _length)
|
||||
@@ -83,18 +68,10 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Foo FLATBUFFERS_FINAL_CLASS {
|
||||
length_(flatbuffers::EndianScalar(_length)) {
|
||||
(void)padding0__;
|
||||
}
|
||||
uint64_t id() const {
|
||||
return flatbuffers::EndianScalar(id_);
|
||||
}
|
||||
int16_t count() const {
|
||||
return flatbuffers::EndianScalar(count_);
|
||||
}
|
||||
int8_t prefix() const {
|
||||
return flatbuffers::EndianScalar(prefix_);
|
||||
}
|
||||
uint32_t length() const {
|
||||
return flatbuffers::EndianScalar(length_);
|
||||
}
|
||||
uint64_t id() const { return flatbuffers::EndianScalar(id_); }
|
||||
int16_t count() const { return flatbuffers::EndianScalar(count_); }
|
||||
int8_t prefix() const { return flatbuffers::EndianScalar(prefix_); }
|
||||
uint32_t length() const { return flatbuffers::EndianScalar(length_); }
|
||||
};
|
||||
FLATBUFFERS_STRUCT_END(Foo, 16);
|
||||
|
||||
@@ -104,20 +81,17 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Bar FLATBUFFERS_FINAL_CLASS {
|
||||
int32_t time_;
|
||||
float ratio_;
|
||||
uint16_t size_;
|
||||
int16_t padding0__; int32_t padding1__;
|
||||
int16_t padding0__;
|
||||
int32_t padding1__;
|
||||
|
||||
public:
|
||||
Bar()
|
||||
: parent_(),
|
||||
time_(0),
|
||||
ratio_(0),
|
||||
size_(0),
|
||||
padding0__(0),
|
||||
padding1__(0) {
|
||||
: parent_(), time_(0), ratio_(0), size_(0), padding0__(0), padding1__(0) {
|
||||
(void)padding0__;
|
||||
(void)padding1__;
|
||||
}
|
||||
Bar(const benchmarks_flatbuffers::Foo &_parent, int32_t _time, float _ratio, uint16_t _size)
|
||||
Bar(const benchmarks_flatbuffers::Foo& _parent, int32_t _time, float _ratio,
|
||||
uint16_t _size)
|
||||
: parent_(_parent),
|
||||
time_(flatbuffers::EndianScalar(_time)),
|
||||
ratio_(flatbuffers::EndianScalar(_ratio)),
|
||||
@@ -127,18 +101,10 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Bar FLATBUFFERS_FINAL_CLASS {
|
||||
(void)padding0__;
|
||||
(void)padding1__;
|
||||
}
|
||||
const benchmarks_flatbuffers::Foo &parent() const {
|
||||
return parent_;
|
||||
}
|
||||
int32_t time() const {
|
||||
return flatbuffers::EndianScalar(time_);
|
||||
}
|
||||
float ratio() const {
|
||||
return flatbuffers::EndianScalar(ratio_);
|
||||
}
|
||||
uint16_t size() const {
|
||||
return flatbuffers::EndianScalar(size_);
|
||||
}
|
||||
const benchmarks_flatbuffers::Foo& parent() const { return parent_; }
|
||||
int32_t time() const { return flatbuffers::EndianScalar(time_); }
|
||||
float ratio() const { return flatbuffers::EndianScalar(ratio_); }
|
||||
uint16_t size() const { return flatbuffers::EndianScalar(size_); }
|
||||
};
|
||||
FLATBUFFERS_STRUCT_END(Bar, 32);
|
||||
|
||||
@@ -156,20 +122,14 @@ struct FooBar FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
||||
const flatbuffers::String* name() const {
|
||||
return GetPointer<const flatbuffers::String*>(VT_NAME);
|
||||
}
|
||||
double rating() const {
|
||||
return GetField<double>(VT_RATING, 0.0);
|
||||
}
|
||||
uint8_t postfix() const {
|
||||
return GetField<uint8_t>(VT_POSTFIX, 0);
|
||||
}
|
||||
double rating() const { return GetField<double>(VT_RATING, 0.0); }
|
||||
uint8_t postfix() const { return GetField<uint8_t>(VT_POSTFIX, 0); }
|
||||
bool Verify(flatbuffers::Verifier& verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyField<benchmarks_flatbuffers::Bar>(verifier, VT_SIBLING, 8) &&
|
||||
VerifyOffset(verifier, VT_NAME) &&
|
||||
verifier.VerifyString(name()) &&
|
||||
VerifyOffset(verifier, VT_NAME) && verifier.VerifyString(name()) &&
|
||||
VerifyField<double>(verifier, VT_RATING, 8) &&
|
||||
VerifyField<uint8_t>(verifier, VT_POSTFIX, 1) &&
|
||||
verifier.EndTable();
|
||||
VerifyField<uint8_t>(verifier, VT_POSTFIX, 1) && verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -189,8 +149,7 @@ struct FooBarBuilder {
|
||||
void add_postfix(uint8_t postfix) {
|
||||
fbb_.AddElement<uint8_t>(FooBar::VT_POSTFIX, postfix, 0);
|
||||
}
|
||||
explicit FooBarBuilder(flatbuffers::FlatBufferBuilder &_fbb)
|
||||
: fbb_(_fbb) {
|
||||
explicit FooBarBuilder(flatbuffers::FlatBufferBuilder& _fbb) : fbb_(_fbb) {
|
||||
start_ = fbb_.StartTable();
|
||||
}
|
||||
flatbuffers::Offset<FooBar> Finish() {
|
||||
@@ -203,8 +162,7 @@ struct FooBarBuilder {
|
||||
inline flatbuffers::Offset<FooBar> CreateFooBar(
|
||||
flatbuffers::FlatBufferBuilder& _fbb,
|
||||
const benchmarks_flatbuffers::Bar* sibling = nullptr,
|
||||
flatbuffers::Offset<flatbuffers::String> name = 0,
|
||||
double rating = 0.0,
|
||||
flatbuffers::Offset<flatbuffers::String> name = 0, double rating = 0.0,
|
||||
uint8_t postfix = 0) {
|
||||
FooBarBuilder builder_(_fbb);
|
||||
builder_.add_rating(rating);
|
||||
@@ -217,15 +175,9 @@ inline flatbuffers::Offset<FooBar> CreateFooBar(
|
||||
inline flatbuffers::Offset<FooBar> CreateFooBarDirect(
|
||||
flatbuffers::FlatBufferBuilder& _fbb,
|
||||
const benchmarks_flatbuffers::Bar* sibling = nullptr,
|
||||
const char *name = nullptr,
|
||||
double rating = 0.0,
|
||||
uint8_t postfix = 0) {
|
||||
const char* name = nullptr, double rating = 0.0, uint8_t postfix = 0) {
|
||||
auto name__ = name ? _fbb.CreateString(name) : 0;
|
||||
return benchmarks_flatbuffers::CreateFooBar(
|
||||
_fbb,
|
||||
sibling,
|
||||
name__,
|
||||
rating,
|
||||
return benchmarks_flatbuffers::CreateFooBar(_fbb, sibling, name__, rating,
|
||||
postfix);
|
||||
}
|
||||
|
||||
@@ -237,28 +189,28 @@ struct FooBarContainer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
|
||||
VT_FRUIT = 8,
|
||||
VT_LOCATION = 10
|
||||
};
|
||||
const flatbuffers::Vector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>> *list() const {
|
||||
return GetPointer<const flatbuffers::Vector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>> *>(VT_LIST);
|
||||
}
|
||||
bool initialized() const {
|
||||
return GetField<uint8_t>(VT_INITIALIZED, 0) != 0;
|
||||
const flatbuffers::Vector<
|
||||
flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>*
|
||||
list() const {
|
||||
return GetPointer<const flatbuffers::Vector<
|
||||
flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>*>(VT_LIST);
|
||||
}
|
||||
bool initialized() const { return GetField<uint8_t>(VT_INITIALIZED, 0) != 0; }
|
||||
benchmarks_flatbuffers::Enum fruit() const {
|
||||
return static_cast<benchmarks_flatbuffers::Enum>(GetField<int16_t>(VT_FRUIT, 0));
|
||||
return static_cast<benchmarks_flatbuffers::Enum>(
|
||||
GetField<int16_t>(VT_FRUIT, 0));
|
||||
}
|
||||
const flatbuffers::String* location() const {
|
||||
return GetPointer<const flatbuffers::String*>(VT_LOCATION);
|
||||
}
|
||||
bool Verify(flatbuffers::Verifier& verifier) const {
|
||||
return VerifyTableStart(verifier) &&
|
||||
VerifyOffset(verifier, VT_LIST) &&
|
||||
return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_LIST) &&
|
||||
verifier.VerifyVector(list()) &&
|
||||
verifier.VerifyVectorOfTables(list()) &&
|
||||
VerifyField<uint8_t>(verifier, VT_INITIALIZED, 1) &&
|
||||
VerifyField<int16_t>(verifier, VT_FRUIT, 2) &&
|
||||
VerifyOffset(verifier, VT_LOCATION) &&
|
||||
verifier.VerifyString(location()) &&
|
||||
verifier.EndTable();
|
||||
verifier.VerifyString(location()) && verifier.EndTable();
|
||||
}
|
||||
};
|
||||
|
||||
@@ -266,14 +218,18 @@ struct FooBarContainerBuilder {
|
||||
typedef FooBarContainer Table;
|
||||
flatbuffers::FlatBufferBuilder& fbb_;
|
||||
flatbuffers::uoffset_t start_;
|
||||
void add_list(flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>> list) {
|
||||
void add_list(flatbuffers::Offset<flatbuffers::Vector<
|
||||
flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>>
|
||||
list) {
|
||||
fbb_.AddOffset(FooBarContainer::VT_LIST, list);
|
||||
}
|
||||
void add_initialized(bool initialized) {
|
||||
fbb_.AddElement<uint8_t>(FooBarContainer::VT_INITIALIZED, static_cast<uint8_t>(initialized), 0);
|
||||
fbb_.AddElement<uint8_t>(FooBarContainer::VT_INITIALIZED,
|
||||
static_cast<uint8_t>(initialized), 0);
|
||||
}
|
||||
void add_fruit(benchmarks_flatbuffers::Enum fruit) {
|
||||
fbb_.AddElement<int16_t>(FooBarContainer::VT_FRUIT, static_cast<int16_t>(fruit), 0);
|
||||
fbb_.AddElement<int16_t>(FooBarContainer::VT_FRUIT,
|
||||
static_cast<int16_t>(fruit), 0);
|
||||
}
|
||||
void add_location(flatbuffers::Offset<flatbuffers::String> location) {
|
||||
fbb_.AddOffset(FooBarContainer::VT_LOCATION, location);
|
||||
@@ -291,7 +247,9 @@ struct FooBarContainerBuilder {
|
||||
|
||||
inline flatbuffers::Offset<FooBarContainer> CreateFooBarContainer(
|
||||
flatbuffers::FlatBufferBuilder& _fbb,
|
||||
flatbuffers::Offset<flatbuffers::Vector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>> list = 0,
|
||||
flatbuffers::Offset<flatbuffers::Vector<
|
||||
flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>>
|
||||
list = 0,
|
||||
bool initialized = false,
|
||||
benchmarks_flatbuffers::Enum fruit = benchmarks_flatbuffers::Enum_Apples,
|
||||
flatbuffers::Offset<flatbuffers::String> location = 0) {
|
||||
@@ -305,36 +263,41 @@ inline flatbuffers::Offset<FooBarContainer> CreateFooBarContainer(
|
||||
|
||||
inline flatbuffers::Offset<FooBarContainer> CreateFooBarContainerDirect(
|
||||
flatbuffers::FlatBufferBuilder& _fbb,
|
||||
const std::vector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>> *list = nullptr,
|
||||
const std::vector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>*
|
||||
list = nullptr,
|
||||
bool initialized = false,
|
||||
benchmarks_flatbuffers::Enum fruit = benchmarks_flatbuffers::Enum_Apples,
|
||||
const char* location = nullptr) {
|
||||
auto list__ = list ? _fbb.CreateVector<flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>(*list) : 0;
|
||||
auto list__ =
|
||||
list ? _fbb.CreateVector<
|
||||
flatbuffers::Offset<benchmarks_flatbuffers::FooBar>>(*list)
|
||||
: 0;
|
||||
auto location__ = location ? _fbb.CreateString(location) : 0;
|
||||
return benchmarks_flatbuffers::CreateFooBarContainer(
|
||||
_fbb,
|
||||
list__,
|
||||
initialized,
|
||||
fruit,
|
||||
location__);
|
||||
_fbb, list__, initialized, fruit, location__);
|
||||
}
|
||||
|
||||
inline const benchmarks_flatbuffers::FooBarContainer *GetFooBarContainer(const void *buf) {
|
||||
inline const benchmarks_flatbuffers::FooBarContainer* GetFooBarContainer(
|
||||
const void* buf) {
|
||||
return flatbuffers::GetRoot<benchmarks_flatbuffers::FooBarContainer>(buf);
|
||||
}
|
||||
|
||||
inline const benchmarks_flatbuffers::FooBarContainer *GetSizePrefixedFooBarContainer(const void *buf) {
|
||||
return flatbuffers::GetSizePrefixedRoot<benchmarks_flatbuffers::FooBarContainer>(buf);
|
||||
inline const benchmarks_flatbuffers::FooBarContainer*
|
||||
GetSizePrefixedFooBarContainer(const void* buf) {
|
||||
return flatbuffers::GetSizePrefixedRoot<
|
||||
benchmarks_flatbuffers::FooBarContainer>(buf);
|
||||
}
|
||||
|
||||
inline bool VerifyFooBarContainerBuffer(
|
||||
flatbuffers::Verifier &verifier) {
|
||||
return verifier.VerifyBuffer<benchmarks_flatbuffers::FooBarContainer>(nullptr);
|
||||
inline bool VerifyFooBarContainerBuffer(flatbuffers::Verifier& verifier) {
|
||||
return verifier.VerifyBuffer<benchmarks_flatbuffers::FooBarContainer>(
|
||||
nullptr);
|
||||
}
|
||||
|
||||
inline bool VerifySizePrefixedFooBarContainerBuffer(
|
||||
flatbuffers::Verifier& verifier) {
|
||||
return verifier.VerifySizePrefixedBuffer<benchmarks_flatbuffers::FooBarContainer>(nullptr);
|
||||
return verifier
|
||||
.VerifySizePrefixedBuffer<benchmarks_flatbuffers::FooBarContainer>(
|
||||
nullptr);
|
||||
}
|
||||
|
||||
inline void FinishFooBarContainerBuffer(
|
||||
|
||||
@@ -88,8 +88,8 @@ let benchmarks = {
|
||||
|
||||
Benchmark(
|
||||
"Allocating ByteBuffer 1GB",
|
||||
configuration: singleConfiguration)
|
||||
{ benchmark in
|
||||
configuration: singleConfiguration
|
||||
) { benchmark in
|
||||
let memory = UnsafeMutableRawPointer.allocate(
|
||||
byteCount: 1_024_000_000,
|
||||
alignment: 1)
|
||||
@@ -165,8 +165,8 @@ let benchmarks = {
|
||||
|
||||
Benchmark(
|
||||
"FlatBufferBuilder Add",
|
||||
configuration: kiloConfiguration)
|
||||
{ benchmark in
|
||||
configuration: kiloConfiguration
|
||||
) { benchmark in
|
||||
var fb = FlatBufferBuilder(initialSize: 1024 * 1024 * 32)
|
||||
benchmark.startMeasurement()
|
||||
for _ in benchmark.scaledIterations {
|
||||
@@ -182,8 +182,8 @@ let benchmarks = {
|
||||
|
||||
Benchmark(
|
||||
"FlatBufferBuilder Start table",
|
||||
configuration: kiloConfiguration)
|
||||
{ benchmark in
|
||||
configuration: kiloConfiguration
|
||||
) { benchmark in
|
||||
var fb = FlatBufferBuilder(initialSize: 1024 * 1024 * 32)
|
||||
benchmark.startMeasurement()
|
||||
for _ in benchmark.scaledIterations {
|
||||
|
||||
@@ -20,7 +20,7 @@ import PackageDescription
|
||||
let package = Package(
|
||||
name: "benchmarks",
|
||||
platforms: [
|
||||
.macOS(.v13),
|
||||
.macOS(.v13)
|
||||
],
|
||||
dependencies: [
|
||||
.package(path: "../.."),
|
||||
@@ -37,6 +37,6 @@ let package = Package(
|
||||
],
|
||||
path: "Benchmarks/FlatbuffersBenchmarks",
|
||||
plugins: [
|
||||
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
|
||||
]),
|
||||
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
|
||||
])
|
||||
])
|
||||
|
||||
@@ -6,10 +6,11 @@ import subprocess
|
||||
from cpt.packager import ConanMultiPackager
|
||||
|
||||
|
||||
|
||||
def get_branch():
|
||||
try:
|
||||
for line in subprocess.check_output("git branch", shell=True).decode().splitlines():
|
||||
for line in (
|
||||
subprocess.check_output("git branch", shell=True).decode().splitlines()
|
||||
):
|
||||
line = line.strip()
|
||||
if line.startswith("*") and " (HEAD detached" not in line:
|
||||
return line.replace("*", "", 1).strip()
|
||||
@@ -34,17 +35,25 @@ def get_reference(username):
|
||||
if __name__ == "__main__":
|
||||
login_username = os.getenv("CONAN_LOGIN_USERNAME", "aardappel")
|
||||
username = os.getenv("CONAN_USERNAME", "google")
|
||||
upload = os.getenv("CONAN_UPLOAD", "https://api.bintray.com/conan/aardappel/flatbuffers")
|
||||
stable_branch_pattern = os.getenv("CONAN_STABLE_BRANCH_PATTERN", r"v\d+\.\d+\.\d+.*")
|
||||
test_folder = os.getenv("CPT_TEST_FOLDER", os.path.join("conan", "test_package"))
|
||||
upload = os.getenv(
|
||||
"CONAN_UPLOAD", "https://api.bintray.com/conan/aardappel/flatbuffers"
|
||||
)
|
||||
stable_branch_pattern = os.getenv(
|
||||
"CONAN_STABLE_BRANCH_PATTERN", r"v\d+\.\d+\.\d+.*"
|
||||
)
|
||||
test_folder = os.getenv(
|
||||
"CPT_TEST_FOLDER", os.path.join("conan", "test_package")
|
||||
)
|
||||
upload_only_when_stable = os.getenv("CONAN_UPLOAD_ONLY_WHEN_STABLE", True)
|
||||
|
||||
builder = ConanMultiPackager(reference=get_reference(username),
|
||||
builder = ConanMultiPackager(
|
||||
reference=get_reference(username),
|
||||
username=username,
|
||||
login_username=login_username,
|
||||
upload=upload,
|
||||
stable_branch_pattern=stable_branch_pattern,
|
||||
upload_only_when_stable=upload_only_when_stable,
|
||||
test_folder=test_folder)
|
||||
test_folder=test_folder,
|
||||
)
|
||||
builder.add_common_builds(pure_c=False)
|
||||
builder.run()
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from conans import ConanFile, CMake
|
||||
import os
|
||||
from conans import CMake, ConanFile
|
||||
|
||||
|
||||
class TestPackageConan(ConanFile):
|
||||
|
||||
50
conanfile.py
50
conanfile.py
@@ -1,11 +1,10 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""Conan recipe package for Google FlatBuffers
|
||||
"""
|
||||
"""Conan recipe package for Google FlatBuffers"""
|
||||
import os
|
||||
import shutil
|
||||
from conans import ConanFile, CMake, tools
|
||||
from conans import CMake, ConanFile, tools
|
||||
|
||||
|
||||
class FlatbuffersConan(ConanFile):
|
||||
@@ -21,23 +20,27 @@ class FlatbuffersConan(ConanFile):
|
||||
default_options = {"shared": False, "fPIC": True}
|
||||
generators = "cmake"
|
||||
exports = "LICENSE"
|
||||
exports_sources = ["CMake/*", "include/*", "src/*", "grpc/*", "CMakeLists.txt", "conan/CMakeLists.txt"]
|
||||
exports_sources = [
|
||||
"CMake/*",
|
||||
"include/*",
|
||||
"src/*",
|
||||
"grpc/*",
|
||||
"CMakeLists.txt",
|
||||
"conan/CMakeLists.txt",
|
||||
]
|
||||
|
||||
def source(self):
|
||||
"""Wrap the original CMake file to call conan_basic_setup
|
||||
"""
|
||||
"""Wrap the original CMake file to call conan_basic_setup"""
|
||||
shutil.move("CMakeLists.txt", "CMakeListsOriginal.txt")
|
||||
shutil.move(os.path.join("conan", "CMakeLists.txt"), "CMakeLists.txt")
|
||||
|
||||
def config_options(self):
|
||||
"""Remove fPIC option on Windows platform
|
||||
"""
|
||||
"""Remove fPIC option on Windows platform"""
|
||||
if self.settings.os == "Windows":
|
||||
self.options.remove("fPIC")
|
||||
|
||||
def configure_cmake(self):
|
||||
"""Create CMake instance and execute configure step
|
||||
"""
|
||||
"""Create CMake instance and execute configure step"""
|
||||
cmake = CMake(self)
|
||||
cmake.definitions["FLATBUFFERS_BUILD_TESTS"] = False
|
||||
cmake.definitions["FLATBUFFERS_BUILD_SHAREDLIB"] = self.options.shared
|
||||
@@ -46,30 +49,35 @@ class FlatbuffersConan(ConanFile):
|
||||
return cmake
|
||||
|
||||
def build(self):
|
||||
"""Configure, build and install FlatBuffers using CMake.
|
||||
"""
|
||||
"""Configure, build and install FlatBuffers using CMake."""
|
||||
cmake = self.configure_cmake()
|
||||
cmake.build()
|
||||
|
||||
def package(self):
|
||||
"""Copy Flatbuffers' artifacts to package folder
|
||||
"""
|
||||
"""Copy Flatbuffers' artifacts to package folder"""
|
||||
cmake = self.configure_cmake()
|
||||
cmake.install()
|
||||
self.copy(pattern="LICENSE", dst="licenses")
|
||||
self.copy(pattern="FindFlatBuffers.cmake", dst=os.path.join("lib", "cmake", "flatbuffers"), src="CMake")
|
||||
self.copy(
|
||||
pattern="FindFlatBuffers.cmake",
|
||||
dst=os.path.join("lib", "cmake", "flatbuffers"),
|
||||
src="CMake",
|
||||
)
|
||||
self.copy(pattern="flathash*", dst="bin", src="bin")
|
||||
self.copy(pattern="flatc*", dst="bin", src="bin")
|
||||
if self.settings.os == "Windows" and self.options.shared:
|
||||
if self.settings.compiler == "Visual Studio":
|
||||
shutil.move(os.path.join(self.package_folder, "lib", "%s.dll" % self.name),
|
||||
os.path.join(self.package_folder, "bin", "%s.dll" % self.name))
|
||||
shutil.move(
|
||||
os.path.join(self.package_folder, "lib", "%s.dll" % self.name),
|
||||
os.path.join(self.package_folder, "bin", "%s.dll" % self.name),
|
||||
)
|
||||
elif self.settings.compiler == "gcc":
|
||||
shutil.move(os.path.join(self.package_folder, "lib", "lib%s.dll" % self.name),
|
||||
os.path.join(self.package_folder, "bin", "lib%s.dll" % self.name))
|
||||
shutil.move(
|
||||
os.path.join(self.package_folder, "lib", "lib%s.dll" % self.name),
|
||||
os.path.join(self.package_folder, "bin", "lib%s.dll" % self.name),
|
||||
)
|
||||
|
||||
def package_info(self):
|
||||
"""Collect built libraries names and solve flatc path.
|
||||
"""
|
||||
"""Collect built libraries names and solve flatc path."""
|
||||
self.cpp_info.libs = tools.collect_libs(self)
|
||||
self.user_info.flatc = os.path.join(self.package_folder, "bin", "flatc")
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import './monster_my_game.sample_generated.dart' as my_game;
|
||||
|
||||
// Example how to use FlatBuffers to create and read binary buffers.
|
||||
@@ -78,7 +79,8 @@ void builderTest() {
|
||||
builder.finish(monsteroff);
|
||||
if (verify(builder.buffer)) {
|
||||
print(
|
||||
"The FlatBuffer was successfully created with a builder and verified!");
|
||||
"The FlatBuffer was successfully created with a builder and verified!",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,7 +96,10 @@ void objectBuilderTest() {
|
||||
name: 'Orc',
|
||||
inventory: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
|
||||
color: my_game.Color.Red,
|
||||
weapons: [my_game.WeaponObjectBuilder(name: 'Sword', damage: 3), axe],
|
||||
weapons: [
|
||||
my_game.WeaponObjectBuilder(name: 'Sword', damage: 3),
|
||||
axe,
|
||||
],
|
||||
equippedType: my_game.EquipmentTypeId.Weapon,
|
||||
equipped: axe,
|
||||
);
|
||||
@@ -108,7 +113,8 @@ void objectBuilderTest() {
|
||||
// Instead, we're going to access it right away (as if we just received it).
|
||||
if (verify(buffer)) {
|
||||
print(
|
||||
"The FlatBuffer was successfully created with an object builder and verified!");
|
||||
"The FlatBuffer was successfully created with an object builder and verified!",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
library my_game.sample;
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
class Color {
|
||||
final int value;
|
||||
@@ -29,10 +29,7 @@ class Color {
|
||||
static const Color Red = Color._(0);
|
||||
static const Color Green = Color._(1);
|
||||
static const Color Blue = Color._(2);
|
||||
static const Map<int, Color> values = {
|
||||
0: Red,
|
||||
1: Green,
|
||||
2: Blue};
|
||||
static const Map<int, Color> values = {0: Red, 1: Green, 2: Blue};
|
||||
|
||||
static const fb.Reader<Color> reader = _ColorReader();
|
||||
|
||||
@@ -60,7 +57,9 @@ class EquipmentTypeId {
|
||||
factory EquipmentTypeId.fromValue(int value) {
|
||||
final result = values[value];
|
||||
if (result == null) {
|
||||
throw StateError('Invalid value $value for bit flag enum EquipmentTypeId');
|
||||
throw StateError(
|
||||
'Invalid value $value for bit flag enum EquipmentTypeId',
|
||||
);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@@ -74,9 +73,7 @@ class EquipmentTypeId {
|
||||
|
||||
static const EquipmentTypeId NONE = EquipmentTypeId._(0);
|
||||
static const EquipmentTypeId Weapon = EquipmentTypeId._(1);
|
||||
static const Map<int, EquipmentTypeId> values = {
|
||||
0: NONE,
|
||||
1: Weapon};
|
||||
static const Map<int, EquipmentTypeId> values = {0: NONE, 1: Weapon};
|
||||
|
||||
static const fb.Reader<EquipmentTypeId> reader = _EquipmentTypeIdReader();
|
||||
|
||||
@@ -122,8 +119,7 @@ class _Vec3Reader extends fb.StructReader<Vec3> {
|
||||
int get size => 12;
|
||||
|
||||
@override
|
||||
Vec3 createObject(fb.BufferContext bc, int offset) =>
|
||||
Vec3._(bc, offset);
|
||||
Vec3 createObject(fb.BufferContext bc, int offset) => Vec3._(bc, offset);
|
||||
}
|
||||
|
||||
class Vec3Builder {
|
||||
@@ -137,7 +133,6 @@ class Vec3Builder {
|
||||
fbBuilder.putFloat32(x);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class Vec3ObjectBuilder extends fb.ObjectBuilder {
|
||||
@@ -145,11 +140,7 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder {
|
||||
final double _y;
|
||||
final double _z;
|
||||
|
||||
Vec3ObjectBuilder({
|
||||
required double x,
|
||||
required double y,
|
||||
required double z,
|
||||
})
|
||||
Vec3ObjectBuilder({required double x, required double y, required double z})
|
||||
: _x = x,
|
||||
_y = y,
|
||||
_z = z;
|
||||
@@ -171,6 +162,7 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder {
|
||||
return fbBuilder.buffer;
|
||||
}
|
||||
}
|
||||
|
||||
class Monster {
|
||||
Monster._(this._bc, this._bcOffset);
|
||||
factory Monster(List<int> bytes) {
|
||||
@@ -186,18 +178,30 @@ class Monster {
|
||||
Vec3? get pos => Vec3.reader.vTableGetNullable(_bc, _bcOffset, 4);
|
||||
int get mana => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 6, 150);
|
||||
int get hp => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 8, 100);
|
||||
String? get name => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10);
|
||||
List<int>? get inventory => const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 14);
|
||||
Color get color => Color.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 16, 2));
|
||||
List<Weapon>? get weapons => const fb.ListReader<Weapon>(Weapon.reader).vTableGetNullable(_bc, _bcOffset, 18);
|
||||
EquipmentTypeId? get equippedType => EquipmentTypeId._createOrNull(const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 20));
|
||||
String? get name =>
|
||||
const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 10);
|
||||
List<int>? get inventory =>
|
||||
const fb.Uint8ListReader().vTableGetNullable(_bc, _bcOffset, 14);
|
||||
Color get color =>
|
||||
Color.fromValue(const fb.Int8Reader().vTableGet(_bc, _bcOffset, 16, 2));
|
||||
List<Weapon>? get weapons => const fb.ListReader<Weapon>(
|
||||
Weapon.reader,
|
||||
).vTableGetNullable(_bc, _bcOffset, 18);
|
||||
EquipmentTypeId? get equippedType => EquipmentTypeId._createOrNull(
|
||||
const fb.Uint8Reader().vTableGetNullable(_bc, _bcOffset, 20),
|
||||
);
|
||||
dynamic get equipped {
|
||||
switch (equippedType?.value) {
|
||||
case 1: return Weapon.reader.vTableGetNullable(_bc, _bcOffset, 22);
|
||||
default: return null;
|
||||
case 1:
|
||||
return Weapon.reader.vTableGetNullable(_bc, _bcOffset, 22);
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
List<Vec3>? get path => const fb.ListReader<Vec3>(Vec3.reader).vTableGetNullable(_bc, _bcOffset, 24);
|
||||
|
||||
List<Vec3>? get path => const fb.ListReader<Vec3>(
|
||||
Vec3.reader,
|
||||
).vTableGetNullable(_bc, _bcOffset, 24);
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
@@ -226,38 +230,47 @@ class MonsterBuilder {
|
||||
fbBuilder.addStruct(0, offset);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addMana(int? mana) {
|
||||
fbBuilder.addInt16(1, mana);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addHp(int? hp) {
|
||||
fbBuilder.addInt16(2, hp);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addNameOffset(int? offset) {
|
||||
fbBuilder.addOffset(3, offset);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addInventoryOffset(int? offset) {
|
||||
fbBuilder.addOffset(5, offset);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addColor(Color? color) {
|
||||
fbBuilder.addInt8(6, color?.value);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addWeaponsOffset(int? offset) {
|
||||
fbBuilder.addOffset(7, offset);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addEquippedType(EquipmentTypeId? equippedType) {
|
||||
fbBuilder.addUint8(8, equippedType?.value);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addEquippedOffset(int? offset) {
|
||||
fbBuilder.addOffset(9, offset);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addPathOffset(int? offset) {
|
||||
fbBuilder.addOffset(10, offset);
|
||||
return fbBuilder.offset;
|
||||
@@ -291,8 +304,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
|
||||
EquipmentTypeId? equippedType,
|
||||
dynamic equipped,
|
||||
List<Vec3ObjectBuilder>? path,
|
||||
})
|
||||
: _pos = pos,
|
||||
}) : _pos = pos,
|
||||
_mana = mana,
|
||||
_hp = hp,
|
||||
_name = name,
|
||||
@@ -306,14 +318,20 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
@override
|
||||
int finish(fb.Builder fbBuilder) {
|
||||
final int? nameOffset = _name == null ? null
|
||||
final int? nameOffset = _name == null
|
||||
? null
|
||||
: fbBuilder.writeString(_name!);
|
||||
final int? inventoryOffset = _inventory == null ? null
|
||||
final int? inventoryOffset = _inventory == null
|
||||
? null
|
||||
: fbBuilder.writeListUint8(_inventory!);
|
||||
final int? weaponsOffset = _weapons == null ? null
|
||||
: fbBuilder.writeList(_weapons!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
|
||||
final int? weaponsOffset = _weapons == null
|
||||
? null
|
||||
: fbBuilder.writeList(
|
||||
_weapons!.map((b) => b.getOrCreateOffset(fbBuilder)).toList(),
|
||||
);
|
||||
final int? equippedOffset = _equipped?.getOrCreateOffset(fbBuilder);
|
||||
final int? pathOffset = _path == null ? null
|
||||
final int? pathOffset = _path == null
|
||||
? null
|
||||
: fbBuilder.writeListOfStructs(_path!);
|
||||
fbBuilder.startTable(10);
|
||||
if (_pos != null) {
|
||||
@@ -339,6 +357,7 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
|
||||
return fbBuilder.buffer;
|
||||
}
|
||||
}
|
||||
|
||||
class Weapon {
|
||||
Weapon._(this._bc, this._bcOffset);
|
||||
factory Weapon(List<int> bytes) {
|
||||
@@ -351,7 +370,8 @@ class Weapon {
|
||||
final fb.BufferContext _bc;
|
||||
final int _bcOffset;
|
||||
|
||||
String? get name => const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 4);
|
||||
String? get name =>
|
||||
const fb.StringReader().vTableGetNullable(_bc, _bcOffset, 4);
|
||||
int get damage => const fb.Int16Reader().vTableGet(_bc, _bcOffset, 6, 0);
|
||||
|
||||
@override
|
||||
@@ -364,8 +384,7 @@ class _WeaponReader extends fb.TableReader<Weapon> {
|
||||
const _WeaponReader();
|
||||
|
||||
@override
|
||||
Weapon createObject(fb.BufferContext bc, int offset) =>
|
||||
Weapon._(bc, offset);
|
||||
Weapon createObject(fb.BufferContext bc, int offset) => Weapon._(bc, offset);
|
||||
}
|
||||
|
||||
class WeaponBuilder {
|
||||
@@ -381,6 +400,7 @@ class WeaponBuilder {
|
||||
fbBuilder.addOffset(0, offset);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
int addDamage(int? damage) {
|
||||
fbBuilder.addInt16(1, damage);
|
||||
return fbBuilder.offset;
|
||||
@@ -395,17 +415,15 @@ class WeaponObjectBuilder extends fb.ObjectBuilder {
|
||||
final String? _name;
|
||||
final int? _damage;
|
||||
|
||||
WeaponObjectBuilder({
|
||||
String? name,
|
||||
int? damage,
|
||||
})
|
||||
WeaponObjectBuilder({String? name, int? damage})
|
||||
: _name = name,
|
||||
_damage = damage;
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
@override
|
||||
int finish(fb.Builder fbBuilder) {
|
||||
final int? nameOffset = _name == null ? null
|
||||
final int? nameOffset = _name == null
|
||||
? null
|
||||
: fbBuilder.writeString(_name!);
|
||||
fbBuilder.startTable(2);
|
||||
fbBuilder.addOffset(0, nameOffset);
|
||||
|
||||
@@ -27,10 +27,11 @@ class BufferContext {
|
||||
ByteData get buffer => _buffer;
|
||||
|
||||
/// Create from a FlatBuffer represented by a list of bytes (uint8).
|
||||
factory BufferContext.fromBytes(List<int> byteList) =>
|
||||
BufferContext(byteList is Uint8List
|
||||
factory BufferContext.fromBytes(List<int> byteList) => BufferContext(
|
||||
byteList is Uint8List
|
||||
? byteList.buffer.asByteData(byteList.offsetInBytes)
|
||||
: ByteData.view(Uint8List.fromList(byteList).buffer));
|
||||
: ByteData.view(Uint8List.fromList(byteList).buffer),
|
||||
);
|
||||
|
||||
/// Create from a FlatBuffer represented by ByteData.
|
||||
BufferContext(this._buffer);
|
||||
@@ -350,8 +351,10 @@ class Builder {
|
||||
Uint8List get buffer {
|
||||
assert(_finished);
|
||||
final finishedSize = size();
|
||||
return _buf.buffer
|
||||
.asUint8List(_buf.lengthInBytes - finishedSize, finishedSize);
|
||||
return _buf.buffer.asUint8List(
|
||||
_buf.lengthInBytes - finishedSize,
|
||||
finishedSize,
|
||||
);
|
||||
}
|
||||
|
||||
/// Finish off the creation of the buffer. The given [offset] is used as the
|
||||
@@ -368,14 +371,18 @@ class Builder {
|
||||
if (fileIdentifier != null) {
|
||||
for (var i = 0; i < 4; i++) {
|
||||
_setUint8AtTail(
|
||||
finishedSize - _sizeofUint32 - i, fileIdentifier.codeUnitAt(i));
|
||||
finishedSize - _sizeofUint32 - i,
|
||||
fileIdentifier.codeUnitAt(i),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// zero out the added padding
|
||||
for (var i = sizeBeforePadding + 1;
|
||||
for (
|
||||
var i = sizeBeforePadding + 1;
|
||||
i <= finishedSize - requiredBytes;
|
||||
i++) {
|
||||
i++
|
||||
) {
|
||||
_setUint8AtTail(i, 0);
|
||||
}
|
||||
_finished = true;
|
||||
@@ -687,8 +694,10 @@ class Builder {
|
||||
int writeString(String value, {bool asciiOptimization = false}) {
|
||||
assert(!_inVTable);
|
||||
if (_strings != null) {
|
||||
return _strings!
|
||||
.putIfAbsent(value, () => _writeString(value, asciiOptimization));
|
||||
return _strings!.putIfAbsent(
|
||||
value,
|
||||
() => _writeString(value, asciiOptimization),
|
||||
);
|
||||
} else {
|
||||
return _writeString(value, asciiOptimization);
|
||||
}
|
||||
@@ -1005,8 +1014,11 @@ class ListReader<E> extends Reader<List<E>> {
|
||||
: List<E>.generate(
|
||||
bc.buffer.getUint32(listOffset, Endian.little),
|
||||
(int index) => _elementReader.read(
|
||||
bc, listOffset + size + _elementReader.size * index),
|
||||
growable: true);
|
||||
bc,
|
||||
listOffset + size + _elementReader.size * index,
|
||||
),
|
||||
growable: true,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1454,7 +1466,11 @@ abstract class Allocator {
|
||||
/// Params [inUseBack] and [inUseFront] indicate how much of [oldData] is
|
||||
/// actually in use at each end, and needs to be copied.
|
||||
ByteData resize(
|
||||
ByteData oldData, int newSize, int inUseBack, int inUseFront) {
|
||||
ByteData oldData,
|
||||
int newSize,
|
||||
int inUseBack,
|
||||
int inUseFront,
|
||||
) {
|
||||
final newData = allocate(newSize);
|
||||
_copyDownward(oldData, newData, inUseBack, inUseFront);
|
||||
deallocate(oldData);
|
||||
@@ -1465,17 +1481,25 @@ abstract class Allocator {
|
||||
/// memory of size [inUseFront] and [inUseBack] will be copied from the front
|
||||
/// and back of the old memory allocation.
|
||||
void _copyDownward(
|
||||
ByteData oldData, ByteData newData, int inUseBack, int inUseFront) {
|
||||
ByteData oldData,
|
||||
ByteData newData,
|
||||
int inUseBack,
|
||||
int inUseFront,
|
||||
) {
|
||||
if (inUseBack != 0) {
|
||||
newData.buffer.asUint8List().setAll(
|
||||
newData.lengthInBytes - inUseBack,
|
||||
oldData.buffer.asUint8List().getRange(
|
||||
oldData.lengthInBytes - inUseBack, oldData.lengthInBytes));
|
||||
oldData.lengthInBytes - inUseBack,
|
||||
oldData.lengthInBytes,
|
||||
),
|
||||
);
|
||||
}
|
||||
if (inUseFront != 0) {
|
||||
newData.buffer
|
||||
.asUint8List()
|
||||
.setAll(0, oldData.buffer.asUint8List().getRange(0, inUseFront));
|
||||
newData.buffer.asUint8List().setAll(
|
||||
0,
|
||||
oldData.buffer.asUint8List().getRange(0, inUseFront),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -107,8 +107,11 @@ class Builder {
|
||||
final newOffset = _newOffset(length + 1);
|
||||
_pushBuffer(utf8String);
|
||||
_offset = newOffset;
|
||||
final stackValue =
|
||||
_StackValue.withOffset(stringOffset, ValueType.String, bitWidth);
|
||||
final stackValue = _StackValue.withOffset(
|
||||
stringOffset,
|
||||
ValueType.String,
|
||||
bitWidth,
|
||||
);
|
||||
_stack.add(stackValue);
|
||||
_stringCache[value] = stackValue;
|
||||
}
|
||||
@@ -128,8 +131,11 @@ class Builder {
|
||||
final newOffset = _newOffset(length + 1);
|
||||
_pushBuffer(utf8String);
|
||||
_offset = newOffset;
|
||||
final stackValue =
|
||||
_StackValue.withOffset(keyOffset, ValueType.Key, BitWidth.width8);
|
||||
final stackValue = _StackValue.withOffset(
|
||||
keyOffset,
|
||||
ValueType.Key,
|
||||
BitWidth.width8,
|
||||
);
|
||||
_stack.add(stackValue);
|
||||
_keyCache[value] = stackValue;
|
||||
}
|
||||
@@ -147,8 +153,11 @@ class Builder {
|
||||
final newOffset = _newOffset(length);
|
||||
_pushBuffer(value.asUint8List());
|
||||
_offset = newOffset;
|
||||
final stackValue =
|
||||
_StackValue.withOffset(blobOffset, ValueType.Blob, bitWidth);
|
||||
final stackValue = _StackValue.withOffset(
|
||||
blobOffset,
|
||||
ValueType.Blob,
|
||||
bitWidth,
|
||||
);
|
||||
_stack.add(stackValue);
|
||||
}
|
||||
|
||||
@@ -170,7 +179,10 @@ class Builder {
|
||||
final valueOffset = _offset;
|
||||
_pushBuffer(stackValue.asU8List(stackValue.width));
|
||||
final stackOffset = _StackValue.withOffset(
|
||||
valueOffset, ValueType.IndirectInt, stackValue.width);
|
||||
valueOffset,
|
||||
ValueType.IndirectInt,
|
||||
stackValue.width,
|
||||
);
|
||||
_stack.add(stackOffset);
|
||||
_offset = newOffset;
|
||||
if (cache) {
|
||||
@@ -195,7 +207,10 @@ class Builder {
|
||||
final valueOffset = _offset;
|
||||
_pushBuffer(stackValue.asU8List(stackValue.width));
|
||||
final stackOffset = _StackValue.withOffset(
|
||||
valueOffset, ValueType.IndirectFloat, stackValue.width);
|
||||
valueOffset,
|
||||
ValueType.IndirectFloat,
|
||||
stackValue.width,
|
||||
);
|
||||
_stack.add(stackOffset);
|
||||
_offset = newOffset;
|
||||
if (cache) {
|
||||
@@ -252,9 +267,10 @@ class Builder {
|
||||
tmp._offset = _offset;
|
||||
tmp._stack = List.from(_stack);
|
||||
tmp._stackPointers = List.from(_stackPointers);
|
||||
tmp._buffer.buffer
|
||||
.asUint8List()
|
||||
.setAll(0, _buffer.buffer.asUint8List(0, _offset));
|
||||
tmp._buffer.buffer.asUint8List().setAll(
|
||||
0,
|
||||
_buffer.buffer.asUint8List(0, _offset),
|
||||
);
|
||||
for (var i = 0; i < tmp._stackPointers.length; i++) {
|
||||
tmp.end();
|
||||
}
|
||||
@@ -271,7 +287,8 @@ class Builder {
|
||||
if (_stackPointers.isNotEmpty && _stackPointers.last.isVector == false) {
|
||||
if (_stack.last.type != ValueType.Key) {
|
||||
throw StateError(
|
||||
'Adding value to a map before adding a key is prohibited');
|
||||
'Adding value to a map before adding a key is prohibited',
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -288,7 +305,8 @@ class Builder {
|
||||
void _finish() {
|
||||
if (_stack.length != 1) {
|
||||
throw StateError(
|
||||
'Stack has to be exactly 1, but is ${_stack.length}. You have to end all started vectors and maps, before calling [finish]');
|
||||
'Stack has to be exactly 1, but is ${_stack.length}. You have to end all started vectors and maps, before calling [finish]',
|
||||
);
|
||||
}
|
||||
final value = _stack[0];
|
||||
final byteWidth = _align(value.elementWidth(_offset, 0));
|
||||
@@ -298,8 +316,12 @@ class Builder {
|
||||
_finished = true;
|
||||
}
|
||||
|
||||
_StackValue _createVector(int start, int vecLength, int step,
|
||||
[_StackValue? keys]) {
|
||||
_StackValue _createVector(
|
||||
int start,
|
||||
int vecLength,
|
||||
int step, [
|
||||
_StackValue? keys,
|
||||
]) {
|
||||
var bitWidth = BitWidthUtil.uwidth(vecLength);
|
||||
var prefixElements = 1;
|
||||
if (keys != null) {
|
||||
@@ -326,7 +348,8 @@ class Builder {
|
||||
}
|
||||
}
|
||||
final byteWidth = _align(bitWidth);
|
||||
final fix = typed & ValueTypeUtils.isNumber(vectorType) &&
|
||||
final fix =
|
||||
typed & ValueTypeUtils.isNumber(vectorType) &&
|
||||
vecLength >= 2 &&
|
||||
vecLength <= 4;
|
||||
if (keys != null) {
|
||||
@@ -349,8 +372,10 @@ class Builder {
|
||||
return _StackValue.withOffset(vecOffset, ValueType.Map, bitWidth);
|
||||
}
|
||||
if (typed) {
|
||||
final vType =
|
||||
ValueTypeUtils.toTypedVector(vectorType, fix ? vecLength : 0);
|
||||
final vType = ValueTypeUtils.toTypedVector(
|
||||
vectorType,
|
||||
fix ? vecLength : 0,
|
||||
);
|
||||
return _StackValue.withOffset(vecOffset, vType, bitWidth);
|
||||
}
|
||||
return _StackValue.withOffset(vecOffset, ValueType.Vector, bitWidth);
|
||||
@@ -366,7 +391,8 @@ class Builder {
|
||||
void _sortKeysAndEndMap(_StackPointer pointer) {
|
||||
if (((_stack.length - pointer.stackPosition) & 1) == 1) {
|
||||
throw StateError(
|
||||
'The stack needs to hold key value pairs (even number of elements). Check if you combined [addKey] with add... method calls properly.');
|
||||
'The stack needs to hold key value pairs (even number of elements). Check if you combined [addKey] with add... method calls properly.',
|
||||
);
|
||||
}
|
||||
|
||||
var sorted = true;
|
||||
@@ -412,8 +438,12 @@ class Builder {
|
||||
keysStackValue = _createVector(pointer.stackPosition, vecLength, 2);
|
||||
_keyVectorCache[keysHash] = keysStackValue;
|
||||
}
|
||||
final vec =
|
||||
_createVector(pointer.stackPosition + 1, vecLength, 2, keysStackValue);
|
||||
final vec = _createVector(
|
||||
pointer.stackPosition + 1,
|
||||
vecLength,
|
||||
2,
|
||||
keysStackValue,
|
||||
);
|
||||
_stack.removeRange(pointer.stackPosition, _stack.length);
|
||||
_stack.add(vec);
|
||||
}
|
||||
@@ -421,7 +451,8 @@ class Builder {
|
||||
bool _shouldFlip(_StackValue v1, _StackValue v2) {
|
||||
if (v1.type != ValueType.Key || v2.type != ValueType.Key) {
|
||||
throw StateError(
|
||||
'Stack values are not keys $v1 | $v2. Check if you combined [addKey] with add... method calls properly.');
|
||||
'Stack values are not keys $v1 | $v2. Check if you combined [addKey] with add... method calls properly.',
|
||||
);
|
||||
}
|
||||
|
||||
late int c1, c2;
|
||||
@@ -450,7 +481,8 @@ class Builder {
|
||||
_writeUInt(relativeOffset, byteWidth);
|
||||
} else {
|
||||
throw StateError(
|
||||
'Unexpected size $byteWidth. This might be a bug. Please create an issue https://github.com/google/flatbuffers/issues/new');
|
||||
'Unexpected size $byteWidth. This might be a bug. Please create an issue https://github.com/google/flatbuffers/issues/new',
|
||||
);
|
||||
}
|
||||
} else {
|
||||
_pushBuffer(value.asU8List(BitWidthUtil.fromByteWidth(byteWidth)));
|
||||
@@ -523,9 +555,7 @@ class _StackValue {
|
||||
final ValueType _type;
|
||||
final BitWidth _width;
|
||||
|
||||
_StackValue.withNull()
|
||||
: _type = ValueType.Null,
|
||||
_width = BitWidth.width8;
|
||||
_StackValue.withNull() : _type = ValueType.Null, _width = BitWidth.width8;
|
||||
|
||||
_StackValue.withInt(int value)
|
||||
: _type = ValueType.Int,
|
||||
@@ -562,16 +592,16 @@ class _StackValue {
|
||||
final offset = _offset!;
|
||||
for (var i = 0; i < 4; i++) {
|
||||
final width = 1 << i;
|
||||
final bitWidth = BitWidthUtil.uwidth(size +
|
||||
BitWidthUtil.paddingSize(size, width) +
|
||||
index * width -
|
||||
offset);
|
||||
final bitWidth = BitWidthUtil.uwidth(
|
||||
size + BitWidthUtil.paddingSize(size, width) + index * width - offset,
|
||||
);
|
||||
if (1 << bitWidth.index == width) {
|
||||
return bitWidth;
|
||||
}
|
||||
}
|
||||
throw StateError(
|
||||
'Element is of unknown. Size: $size at index: $index. This might be a bug. Please create an issue https://github.com/google/flatbuffers/issues/new');
|
||||
'Element is of unknown. Size: $size at index: $index. This might be a bug. Please create an issue https://github.com/google/flatbuffers/issues/new',
|
||||
);
|
||||
}
|
||||
|
||||
List<int> asU8List(BitWidth width) {
|
||||
@@ -619,7 +649,8 @@ class _StackValue {
|
||||
}
|
||||
|
||||
throw StateError(
|
||||
'Unexpected type: $_type. This might be a bug. Please create an issue https://github.com/google/flatbuffers/issues/new');
|
||||
'Unexpected type: $_type. This might be a bug. Please create an issue https://github.com/google/flatbuffers/issues/new',
|
||||
);
|
||||
}
|
||||
|
||||
ValueType get type {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'dart:collection';
|
||||
import 'dart:convert';
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'types.dart';
|
||||
|
||||
/// Main class to read a value out of a FlexBuffer.
|
||||
@@ -16,9 +17,14 @@ class Reference {
|
||||
int? _length;
|
||||
|
||||
Reference._(
|
||||
this._buffer, this._offset, this._parentWidth, int packedType, this._path,
|
||||
[int? byteWidth, ValueType? valueType])
|
||||
: _byteWidth = byteWidth ?? 1 << (packedType & 3),
|
||||
this._buffer,
|
||||
this._offset,
|
||||
this._parentWidth,
|
||||
int packedType,
|
||||
this._path, [
|
||||
int? byteWidth,
|
||||
ValueType? valueType,
|
||||
]) : _byteWidth = byteWidth ?? 1 << (packedType & 3),
|
||||
_valueType = valueType ?? ValueTypeUtils.fromInt(packedType >> 2);
|
||||
|
||||
/// Use this method to access the root value of a FlexBuffer.
|
||||
@@ -31,8 +37,13 @@ class Reference {
|
||||
final byteWidth = byteData.getUint8(len - 1);
|
||||
final packedType = byteData.getUint8(len - 2);
|
||||
final offset = len - byteWidth - 2;
|
||||
return Reference._(ByteData.view(buffer), offset,
|
||||
BitWidthUtil.fromByteWidth(byteWidth), packedType, "/");
|
||||
return Reference._(
|
||||
ByteData.view(buffer),
|
||||
offset,
|
||||
BitWidthUtil.fromByteWidth(byteWidth),
|
||||
packedType,
|
||||
"/",
|
||||
);
|
||||
}
|
||||
|
||||
/// Returns true if the underlying value is null.
|
||||
@@ -138,7 +149,8 @@ class Reference {
|
||||
final index = key;
|
||||
if (index >= length || index < 0) {
|
||||
throw ArgumentError(
|
||||
'Key: [$key] is not applicable on: $_path of: $_valueType length: $length');
|
||||
'Key: [$key] is not applicable on: $_path of: $_valueType length: $length',
|
||||
);
|
||||
}
|
||||
final elementOffset = _indirect + index * _byteWidth;
|
||||
int packedType = 0;
|
||||
@@ -160,7 +172,8 @@ class Reference {
|
||||
packedType,
|
||||
"$_path[$index]",
|
||||
byteWidth,
|
||||
valueType);
|
||||
valueType,
|
||||
);
|
||||
}
|
||||
if (key is String && _valueType == ValueType.Map) {
|
||||
final index = _keyIndex(key);
|
||||
@@ -169,7 +182,8 @@ class Reference {
|
||||
}
|
||||
}
|
||||
throw ArgumentError(
|
||||
'Key: [$key] is not applicable on: $_path of: $_valueType');
|
||||
'Key: [$key] is not applicable on: $_path of: $_valueType',
|
||||
);
|
||||
}
|
||||
|
||||
/// Get an iterable if the underlying flexBuffer value is a vector.
|
||||
@@ -213,18 +227,24 @@ class Reference {
|
||||
ValueTypeUtils.isAVector(_valueType) ||
|
||||
_valueType == ValueType.Map) {
|
||||
_length = _readUInt(
|
||||
_indirect - _byteWidth, BitWidthUtil.fromByteWidth(_byteWidth));
|
||||
_indirect - _byteWidth,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth),
|
||||
);
|
||||
} else if (_valueType == ValueType.Null) {
|
||||
_length = 0;
|
||||
} else if (_valueType == ValueType.String) {
|
||||
final indirect = _indirect;
|
||||
var sizeByteWidth = _byteWidth;
|
||||
var size = _readUInt(indirect - sizeByteWidth,
|
||||
BitWidthUtil.fromByteWidth(sizeByteWidth));
|
||||
var size = _readUInt(
|
||||
indirect - sizeByteWidth,
|
||||
BitWidthUtil.fromByteWidth(sizeByteWidth),
|
||||
);
|
||||
while (_buffer.getInt8(indirect + size) != 0) {
|
||||
sizeByteWidth <<= 1;
|
||||
size = _readUInt(indirect - sizeByteWidth,
|
||||
BitWidthUtil.fromByteWidth(sizeByteWidth));
|
||||
size = _readUInt(
|
||||
indirect - sizeByteWidth,
|
||||
BitWidthUtil.fromByteWidth(sizeByteWidth),
|
||||
);
|
||||
}
|
||||
_length = size;
|
||||
} else if (_valueType == ValueType.Key) {
|
||||
@@ -289,7 +309,8 @@ class Reference {
|
||||
return result.toString();
|
||||
}
|
||||
throw UnsupportedError(
|
||||
'Type: $_valueType is not supported for JSON conversion');
|
||||
'Type: $_valueType is not supported for JSON conversion',
|
||||
);
|
||||
}
|
||||
|
||||
/// Computes the indirect offset of the value.
|
||||
@@ -354,10 +375,13 @@ class Reference {
|
||||
int? _keyIndex(String key) {
|
||||
final input = utf8.encode(key);
|
||||
final keysVectorOffset = _indirect - _byteWidth * 3;
|
||||
final indirectOffset = keysVectorOffset -
|
||||
final indirectOffset =
|
||||
keysVectorOffset -
|
||||
_readUInt(keysVectorOffset, BitWidthUtil.fromByteWidth(_byteWidth));
|
||||
final byteWidth = _readUInt(
|
||||
keysVectorOffset + _byteWidth, BitWidthUtil.fromByteWidth(_byteWidth));
|
||||
keysVectorOffset + _byteWidth,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth),
|
||||
);
|
||||
var low = 0;
|
||||
var high = length - 1;
|
||||
while (low <= high) {
|
||||
@@ -390,24 +414,37 @@ class Reference {
|
||||
final indirect = _indirect;
|
||||
final elementOffset = indirect + index * _byteWidth;
|
||||
final packedType = _buffer.getUint8(indirect + length * _byteWidth + index);
|
||||
return Reference._(_buffer, elementOffset,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth), packedType, "$_path/$key");
|
||||
return Reference._(
|
||||
_buffer,
|
||||
elementOffset,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth),
|
||||
packedType,
|
||||
"$_path/$key",
|
||||
);
|
||||
}
|
||||
|
||||
Reference _valueForIndex(int index) {
|
||||
final indirect = _indirect;
|
||||
final elementOffset = indirect + index * _byteWidth;
|
||||
final packedType = _buffer.getUint8(indirect + length * _byteWidth + index);
|
||||
return Reference._(_buffer, elementOffset,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth), packedType, "$_path/[$index]");
|
||||
return Reference._(
|
||||
_buffer,
|
||||
elementOffset,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth),
|
||||
packedType,
|
||||
"$_path/[$index]",
|
||||
);
|
||||
}
|
||||
|
||||
String _keyForIndex(int index) {
|
||||
final keysVectorOffset = _indirect - _byteWidth * 3;
|
||||
final indirectOffset = keysVectorOffset -
|
||||
final indirectOffset =
|
||||
keysVectorOffset -
|
||||
_readUInt(keysVectorOffset, BitWidthUtil.fromByteWidth(_byteWidth));
|
||||
final byteWidth = _readUInt(
|
||||
keysVectorOffset + _byteWidth, BitWidthUtil.fromByteWidth(_byteWidth));
|
||||
keysVectorOffset + _byteWidth,
|
||||
BitWidthUtil.fromByteWidth(_byteWidth),
|
||||
);
|
||||
final keyOffset = indirectOffset + index * byteWidth;
|
||||
final keyIndirectOffset =
|
||||
keyOffset - _readUInt(keyOffset, BitWidthUtil.fromByteWidth(byteWidth));
|
||||
|
||||
@@ -86,7 +86,8 @@ enum ValueType {
|
||||
VectorFloat,
|
||||
VectorKey,
|
||||
@Deprecated(
|
||||
'VectorString is deprecated due to a flaw in the binary format (https://github.com/google/flatbuffers/issues/5627)')
|
||||
'VectorString is deprecated due to a flaw in the binary format (https://github.com/google/flatbuffers/issues/5627)',
|
||||
)
|
||||
VectorString,
|
||||
VectorInt2,
|
||||
VectorUInt2,
|
||||
@@ -99,7 +100,7 @@ enum ValueType {
|
||||
VectorFloat4,
|
||||
Blob,
|
||||
Bool,
|
||||
VectorBool
|
||||
VectorBool,
|
||||
}
|
||||
|
||||
class ValueTypeUtils {
|
||||
@@ -153,31 +154,37 @@ class ValueTypeUtils {
|
||||
static ValueType toTypedVector(ValueType self, int length) {
|
||||
if (length == 0) {
|
||||
return ValueTypeUtils.fromInt(
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt));
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt),
|
||||
);
|
||||
}
|
||||
if (length == 2) {
|
||||
return ValueTypeUtils.fromInt(
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt2));
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt2),
|
||||
);
|
||||
}
|
||||
if (length == 3) {
|
||||
return ValueTypeUtils.fromInt(
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt3));
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt3),
|
||||
);
|
||||
}
|
||||
if (length == 4) {
|
||||
return ValueTypeUtils.fromInt(
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt4));
|
||||
toInt(self) - toInt(ValueType.Int) + toInt(ValueType.VectorInt4),
|
||||
);
|
||||
}
|
||||
throw Exception('unexpected length ' + length.toString());
|
||||
}
|
||||
|
||||
static ValueType typedVectorElementType(ValueType self) {
|
||||
return ValueTypeUtils.fromInt(
|
||||
toInt(self) - toInt(ValueType.VectorInt) + toInt(ValueType.Int));
|
||||
toInt(self) - toInt(ValueType.VectorInt) + toInt(ValueType.Int),
|
||||
);
|
||||
}
|
||||
|
||||
static ValueType fixedTypedVectorElementType(ValueType self) {
|
||||
return ValueTypeUtils.fromInt(
|
||||
(toInt(self) - toInt(ValueType.VectorInt2)) % 3 + toInt(ValueType.Int));
|
||||
(toInt(self) - toInt(ValueType.VectorInt2)) % 3 + toInt(ValueType.Int),
|
||||
);
|
||||
}
|
||||
|
||||
static int fixedTypedVectorElementSize(ValueType self) {
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
// ignore_for_file: unused_import, unused_field, unused_element, unused_local_variable, constant_identifier_names
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
class Foo {
|
||||
Foo._(this._bc, this._bcOffset);
|
||||
@@ -17,15 +17,15 @@ class Foo {
|
||||
final fb.BufferContext _bc;
|
||||
final int _bcOffset;
|
||||
|
||||
FooProperties? get myFoo => FooProperties.reader.vTableGetNullable(_bc, _bcOffset, 4);
|
||||
FooProperties? get myFoo =>
|
||||
FooProperties.reader.vTableGetNullable(_bc, _bcOffset, 4);
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'Foo{myFoo: ${myFoo}}';
|
||||
}
|
||||
|
||||
FooT unpack() => FooT(
|
||||
myFoo: myFoo?.unpack());
|
||||
FooT unpack() => FooT(myFoo: myFoo?.unpack());
|
||||
|
||||
static int pack(fb.Builder fbBuilder, FooT? object) {
|
||||
if (object == null) return 0;
|
||||
@@ -36,8 +36,7 @@ class Foo {
|
||||
class FooT implements fb.Packable {
|
||||
FooPropertiesT? myFoo;
|
||||
|
||||
FooT({
|
||||
this.myFoo});
|
||||
FooT({this.myFoo});
|
||||
|
||||
@override
|
||||
int pack(fb.Builder fbBuilder) {
|
||||
@@ -58,8 +57,7 @@ class _FooReader extends fb.TableReader<Foo> {
|
||||
const _FooReader();
|
||||
|
||||
@override
|
||||
Foo createObject(fb.BufferContext bc, int offset) =>
|
||||
Foo._(bc, offset);
|
||||
Foo createObject(fb.BufferContext bc, int offset) => Foo._(bc, offset);
|
||||
}
|
||||
|
||||
class FooBuilder {
|
||||
@@ -84,10 +82,7 @@ class FooBuilder {
|
||||
class FooObjectBuilder extends fb.ObjectBuilder {
|
||||
final FooPropertiesObjectBuilder? _myFoo;
|
||||
|
||||
FooObjectBuilder({
|
||||
FooPropertiesObjectBuilder? myFoo,
|
||||
})
|
||||
: _myFoo = myFoo;
|
||||
FooObjectBuilder({FooPropertiesObjectBuilder? myFoo}) : _myFoo = myFoo;
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
@override
|
||||
@@ -107,6 +102,7 @@ class FooObjectBuilder extends fb.ObjectBuilder {
|
||||
return fbBuilder.buffer;
|
||||
}
|
||||
}
|
||||
|
||||
class FooProperties {
|
||||
FooProperties._(this._bc, this._bcOffset);
|
||||
|
||||
@@ -123,9 +119,7 @@ class FooProperties {
|
||||
return 'FooProperties{a: ${a}, b: ${b}}';
|
||||
}
|
||||
|
||||
FooPropertiesT unpack() => FooPropertiesT(
|
||||
a: a,
|
||||
b: b);
|
||||
FooPropertiesT unpack() => FooPropertiesT(a: a, b: b);
|
||||
|
||||
static int pack(fb.Builder fbBuilder, FooPropertiesT? object) {
|
||||
if (object == null) return 0;
|
||||
@@ -137,9 +131,7 @@ class FooPropertiesT implements fb.Packable {
|
||||
bool a;
|
||||
bool b;
|
||||
|
||||
FooPropertiesT({
|
||||
required this.a,
|
||||
required this.b});
|
||||
FooPropertiesT({required this.a, required this.b});
|
||||
|
||||
@override
|
||||
int pack(fb.Builder fbBuilder) {
|
||||
@@ -175,17 +167,13 @@ class FooPropertiesBuilder {
|
||||
fbBuilder.putBool(a);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class FooPropertiesObjectBuilder extends fb.ObjectBuilder {
|
||||
final bool _a;
|
||||
final bool _b;
|
||||
|
||||
FooPropertiesObjectBuilder({
|
||||
required bool a,
|
||||
required bool b,
|
||||
})
|
||||
FooPropertiesObjectBuilder({required bool a, required bool b})
|
||||
: _a = a,
|
||||
_b = b;
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
// ignore_for_file: unused_import, unused_field, unused_element, unused_local_variable, constant_identifier_names
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
enum OptionsEnum {
|
||||
A(1),
|
||||
@@ -15,10 +15,14 @@ enum OptionsEnum {
|
||||
|
||||
factory OptionsEnum.fromValue(int value) {
|
||||
switch (value) {
|
||||
case 1: return OptionsEnum.A;
|
||||
case 2: return OptionsEnum.B;
|
||||
case 3: return OptionsEnum.C;
|
||||
default: throw StateError('Invalid value $value for bit flag enum');
|
||||
case 1:
|
||||
return OptionsEnum.A;
|
||||
case 2:
|
||||
return OptionsEnum.B;
|
||||
case 3:
|
||||
return OptionsEnum.C;
|
||||
default:
|
||||
throw StateError('Invalid value $value for bit flag enum');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,7 +57,9 @@ class MyTable {
|
||||
final fb.BufferContext _bc;
|
||||
final int _bcOffset;
|
||||
|
||||
List<OptionsEnum>? get options => const fb.ListReader<OptionsEnum>(OptionsEnum.reader).vTableGetNullable(_bc, _bcOffset, 4);
|
||||
List<OptionsEnum>? get options => const fb.ListReader<OptionsEnum>(
|
||||
OptionsEnum.reader,
|
||||
).vTableGetNullable(_bc, _bcOffset, 4);
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
@@ -61,7 +67,11 @@ class MyTable {
|
||||
}
|
||||
|
||||
MyTableT unpack() => MyTableT(
|
||||
options: const fb.ListReader<OptionsEnum>(OptionsEnum.reader, lazy: false).vTableGetNullable(_bc, _bcOffset, 4));
|
||||
options: const fb.ListReader<OptionsEnum>(
|
||||
OptionsEnum.reader,
|
||||
lazy: false,
|
||||
).vTableGetNullable(_bc, _bcOffset, 4),
|
||||
);
|
||||
|
||||
static int pack(fb.Builder fbBuilder, MyTableT? object) {
|
||||
if (object == null) return 0;
|
||||
@@ -72,12 +82,12 @@ class MyTable {
|
||||
class MyTableT implements fb.Packable {
|
||||
List<OptionsEnum>? options;
|
||||
|
||||
MyTableT({
|
||||
this.options});
|
||||
MyTableT({this.options});
|
||||
|
||||
@override
|
||||
int pack(fb.Builder fbBuilder) {
|
||||
final int? optionsOffset = options == null ? null
|
||||
final int? optionsOffset = options == null
|
||||
? null
|
||||
: fbBuilder.writeListUint32(options!.map((f) => f.value).toList());
|
||||
fbBuilder.startTable(1);
|
||||
fbBuilder.addOffset(0, optionsOffset);
|
||||
@@ -120,15 +130,13 @@ class MyTableBuilder {
|
||||
class MyTableObjectBuilder extends fb.ObjectBuilder {
|
||||
final List<OptionsEnum>? _options;
|
||||
|
||||
MyTableObjectBuilder({
|
||||
List<OptionsEnum>? options,
|
||||
})
|
||||
: _options = options;
|
||||
MyTableObjectBuilder({List<OptionsEnum>? options}) : _options = options;
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
@override
|
||||
int finish(fb.Builder fbBuilder) {
|
||||
final int? optionsOffset = _options == null ? null
|
||||
final int? optionsOffset = _options == null
|
||||
? null
|
||||
: fbBuilder.writeListUint32(_options!.map((f) => f.value).toList());
|
||||
fbBuilder.startTable(1);
|
||||
fbBuilder.addOffset(0, optionsOffset);
|
||||
|
||||
@@ -1,16 +1,15 @@
|
||||
import 'dart:typed_data';
|
||||
import 'dart:io' as io;
|
||||
|
||||
import 'package:path/path.dart' as path;
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
import 'package:test/test.dart';
|
||||
import 'package:test_reflective_loader/test_reflective_loader.dart';
|
||||
|
||||
import './monster_test_my_game.example_generated.dart' as example;
|
||||
import './monster_test_my_game.example2_generated.dart' as example2;
|
||||
import 'enums_generated.dart' as example3;
|
||||
import './bool_structs_generated.dart' as example4;
|
||||
import './monster_test_my_game.example2_generated.dart' as example2;
|
||||
import './monster_test_my_game.example_generated.dart' as example;
|
||||
import 'enums_generated.dart' as example3;
|
||||
|
||||
main() {
|
||||
defineReflectiveSuite(() {
|
||||
@@ -29,11 +28,9 @@ int indexToField(int index) {
|
||||
@reflectiveTest
|
||||
class CheckOtherLangaugesData {
|
||||
test_cppData() async {
|
||||
List<int> data = await io.File(path.join(
|
||||
path.context.current,
|
||||
'test',
|
||||
'monsterdata_test.mon',
|
||||
)).readAsBytes();
|
||||
List<int> data = await io.File(
|
||||
path.join(path.context.current, 'test', 'monsterdata_test.mon'),
|
||||
).readAsBytes();
|
||||
example.Monster mon = example.Monster(data);
|
||||
expect(mon.hp, 80);
|
||||
expect(mon.mana, 150);
|
||||
@@ -145,7 +142,8 @@ class CheckOtherLangaugesData {
|
||||
'longEnumNormalDefault: LongEnum.LongOne, nanDefault: NaN, '
|
||||
'infDefault: Infinity, positiveInfDefault: Infinity, infinityDefault: '
|
||||
'Infinity, positiveInfinityDefault: Infinity, negativeInfDefault: '
|
||||
'-Infinity, negativeInfinityDefault: -Infinity, doubleInfDefault: Infinity}');
|
||||
'-Infinity, negativeInfinityDefault: -Infinity, doubleInfDefault: Infinity}',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -298,20 +296,72 @@ class BuilderTest {
|
||||
expect(allocator.buffer(builder.size()), [2, 0, 0, 0, 0, 0, 0, 1]);
|
||||
|
||||
builder.putUint8(3);
|
||||
expect(
|
||||
allocator.buffer(builder.size()), [0, 0, 0, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
|
||||
expect(allocator.buffer(builder.size()), [
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
3,
|
||||
2,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
]);
|
||||
|
||||
builder.putUint8(4);
|
||||
expect(
|
||||
allocator.buffer(builder.size()), [0, 0, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
|
||||
expect(allocator.buffer(builder.size()), [
|
||||
0,
|
||||
0,
|
||||
4,
|
||||
3,
|
||||
2,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
]);
|
||||
|
||||
builder.putUint8(5);
|
||||
expect(
|
||||
allocator.buffer(builder.size()), [0, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
|
||||
expect(allocator.buffer(builder.size()), [
|
||||
0,
|
||||
5,
|
||||
4,
|
||||
3,
|
||||
2,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
]);
|
||||
|
||||
builder.putUint32(6);
|
||||
expect(allocator.buffer(builder.size()),
|
||||
[6, 0, 0, 0, 0, 5, 4, 3, 2, 0, 0, 0, 0, 0, 0, 1]);
|
||||
expect(allocator.buffer(builder.size()), [
|
||||
6,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
5,
|
||||
4,
|
||||
3,
|
||||
2,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
1,
|
||||
]);
|
||||
}
|
||||
|
||||
void test_table_default() {
|
||||
@@ -331,14 +381,14 @@ class BuilderTest {
|
||||
int objectOffset = buffer.derefObject(0);
|
||||
// was not written, so uses the new default value
|
||||
expect(
|
||||
const Int32Reader()
|
||||
.vTableGet(buffer, objectOffset, indexToField(0), 15),
|
||||
15);
|
||||
const Int32Reader().vTableGet(buffer, objectOffset, indexToField(0), 15),
|
||||
15,
|
||||
);
|
||||
// has the written value
|
||||
expect(
|
||||
const Int32Reader()
|
||||
.vTableGet(buffer, objectOffset, indexToField(1), 15),
|
||||
20);
|
||||
const Int32Reader().vTableGet(buffer, objectOffset, indexToField(1), 15),
|
||||
20,
|
||||
);
|
||||
}
|
||||
|
||||
void test_table_format([Builder? builder]) {
|
||||
@@ -370,7 +420,9 @@ class BuilderTest {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
int offset = byteData.getUint16(vTableLoc + 4 + 2 * i, Endian.little);
|
||||
expect(
|
||||
byteData.getInt32(tableDataLoc + offset, Endian.little), 10 + 10 * i);
|
||||
byteData.getInt32(tableDataLoc + offset, Endian.little),
|
||||
10 + 10 * i,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -380,10 +432,14 @@ class BuilderTest {
|
||||
List<int> byteList;
|
||||
{
|
||||
Builder builder = Builder(initialSize: 0);
|
||||
int? latinStringOffset =
|
||||
builder.writeString(latinString, asciiOptimization: true);
|
||||
int? unicodeStringOffset =
|
||||
builder.writeString(unicodeString, asciiOptimization: true);
|
||||
int? latinStringOffset = builder.writeString(
|
||||
latinString,
|
||||
asciiOptimization: true,
|
||||
);
|
||||
int? unicodeStringOffset = builder.writeString(
|
||||
unicodeString,
|
||||
asciiOptimization: true,
|
||||
);
|
||||
builder.startTable(2);
|
||||
builder.addOffset(0, latinStringOffset);
|
||||
builder.addOffset(1, unicodeStringOffset);
|
||||
@@ -395,13 +451,19 @@ class BuilderTest {
|
||||
BufferContext buf = BufferContext.fromBytes(byteList);
|
||||
int objectOffset = buf.derefObject(0);
|
||||
expect(
|
||||
const StringReader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(0)),
|
||||
latinString);
|
||||
const StringReader().vTableGetNullable(
|
||||
buf,
|
||||
objectOffset,
|
||||
indexToField(0),
|
||||
),
|
||||
latinString,
|
||||
);
|
||||
expect(
|
||||
const StringReader(asciiOptimization: true)
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(1)),
|
||||
unicodeString);
|
||||
const StringReader(
|
||||
asciiOptimization: true,
|
||||
).vTableGetNullable(buf, objectOffset, indexToField(1)),
|
||||
unicodeString,
|
||||
);
|
||||
}
|
||||
|
||||
void test_table_types([Builder? builder]) {
|
||||
@@ -425,33 +487,41 @@ class BuilderTest {
|
||||
BufferContext buf = BufferContext.fromBytes(byteList);
|
||||
int objectOffset = buf.derefObject(0);
|
||||
expect(
|
||||
const BoolReader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(0)),
|
||||
true);
|
||||
const BoolReader().vTableGetNullable(buf, objectOffset, indexToField(0)),
|
||||
true,
|
||||
);
|
||||
expect(
|
||||
const Int8Reader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(1)),
|
||||
10);
|
||||
const Int8Reader().vTableGetNullable(buf, objectOffset, indexToField(1)),
|
||||
10,
|
||||
);
|
||||
expect(
|
||||
const Int32Reader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(2)),
|
||||
20);
|
||||
const Int32Reader().vTableGetNullable(buf, objectOffset, indexToField(2)),
|
||||
20,
|
||||
);
|
||||
expect(
|
||||
const StringReader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(3)),
|
||||
'12345');
|
||||
const StringReader().vTableGetNullable(
|
||||
buf,
|
||||
objectOffset,
|
||||
indexToField(3),
|
||||
),
|
||||
'12345',
|
||||
);
|
||||
expect(
|
||||
const Int32Reader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(4)),
|
||||
40);
|
||||
const Int32Reader().vTableGetNullable(buf, objectOffset, indexToField(4)),
|
||||
40,
|
||||
);
|
||||
expect(
|
||||
const Uint32Reader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(5)),
|
||||
0x9ABCDEF0);
|
||||
const Uint32Reader().vTableGetNullable(
|
||||
buf,
|
||||
objectOffset,
|
||||
indexToField(5),
|
||||
),
|
||||
0x9ABCDEF0,
|
||||
);
|
||||
expect(
|
||||
const Uint8Reader()
|
||||
.vTableGetNullable(buf, objectOffset, indexToField(6)),
|
||||
0x9A);
|
||||
const Uint8Reader().vTableGetNullable(buf, objectOffset, indexToField(6)),
|
||||
0x9A,
|
||||
);
|
||||
}
|
||||
|
||||
void test_writeList_of_Uint32() {
|
||||
@@ -596,8 +666,9 @@ class BuilderTest {
|
||||
}
|
||||
// read and verify
|
||||
BufferContext buf = BufferContext.fromBytes(byteList);
|
||||
List<TestPointImpl> items =
|
||||
const ListReader<TestPointImpl>(TestPointReader()).read(buf, 0);
|
||||
List<TestPointImpl> items = const ListReader<TestPointImpl>(
|
||||
TestPointReader(),
|
||||
).read(buf, 0);
|
||||
expect(items, hasLength(2));
|
||||
expect(items[0].x, 10);
|
||||
expect(items[0].y, 20);
|
||||
@@ -627,8 +698,10 @@ class BuilderTest {
|
||||
List<int> byteList;
|
||||
{
|
||||
builder ??= Builder(initialSize: 0);
|
||||
int listOffset = builder.writeList(
|
||||
[builder.writeString('12345'), builder.writeString('ABC')]);
|
||||
int listOffset = builder.writeList([
|
||||
builder.writeString('12345'),
|
||||
builder.writeString('ABC'),
|
||||
]);
|
||||
builder.startTable(1);
|
||||
builder.addOffset(0, listOffset);
|
||||
int offset = builder.endTable();
|
||||
@@ -707,13 +780,14 @@ class BuilderTest {
|
||||
test_table_format,
|
||||
test_table_types,
|
||||
test_writeList_ofObjects,
|
||||
test_writeList_ofStrings_inObject
|
||||
test_writeList_ofStrings_inObject,
|
||||
];
|
||||
|
||||
// Execute all test cases in all permutations of their order.
|
||||
// To do that, we generate permutations of test case indexes.
|
||||
final testCasesPermutations =
|
||||
_permutationsOf(List.generate(testCases.length, (index) => index));
|
||||
final testCasesPermutations = _permutationsOf(
|
||||
List.generate(testCases.length, (index) => index),
|
||||
);
|
||||
expect(testCasesPermutations.length, _factorial(testCases.length));
|
||||
|
||||
for (var indexes in testCasesPermutations) {
|
||||
@@ -788,7 +862,8 @@ class ObjectAPITest {
|
||||
z: 3,
|
||||
test1: 4.0,
|
||||
test2: example.Color.Red,
|
||||
test3: example.TestT(a: 1, b: 2))
|
||||
test3: example.TestT(a: 1, b: 2),
|
||||
)
|
||||
..mana = 2
|
||||
..name = 'Monstrous'
|
||||
..inventory = [24, 42]
|
||||
@@ -804,7 +879,7 @@ class ObjectAPITest {
|
||||
..testf = 42.24
|
||||
..testarrayofsortedstruct = [
|
||||
example.AbilityT(id: 1, distance: 5),
|
||||
example.AbilityT(id: 3, distance: 7)
|
||||
example.AbilityT(id: 3, distance: 7),
|
||||
]
|
||||
..vectorOfLongs = [5, 6, 7]
|
||||
..vectorOfDoubles = [8.9, 9.0, 10.1, 11.2]
|
||||
@@ -867,8 +942,9 @@ class StringListWrapperImpl {
|
||||
|
||||
StringListWrapperImpl(this.bp, this.offset);
|
||||
|
||||
List<String>? get items => const ListReader<String>(StringReader())
|
||||
.vTableGetNullable(bp, offset, indexToField(0));
|
||||
List<String>? get items => const ListReader<String>(
|
||||
StringReader(),
|
||||
).vTableGetNullable(bp, offset, indexToField(0));
|
||||
}
|
||||
|
||||
class StringListWrapperReader extends TableReader<StringListWrapperImpl> {
|
||||
@@ -906,10 +982,14 @@ class GeneratorTest {
|
||||
expect(example.Color.values, same(example.Color.values));
|
||||
expect(example.Race.values, same(example.Race.values));
|
||||
expect(example.AnyTypeId.values, same(example.AnyTypeId.values));
|
||||
expect(example.AnyUniqueAliasesTypeId.values,
|
||||
same(example.AnyUniqueAliasesTypeId.values));
|
||||
expect(example.AnyAmbiguousAliasesTypeId.values,
|
||||
same(example.AnyAmbiguousAliasesTypeId.values));
|
||||
expect(
|
||||
example.AnyUniqueAliasesTypeId.values,
|
||||
same(example.AnyUniqueAliasesTypeId.values),
|
||||
);
|
||||
expect(
|
||||
example.AnyAmbiguousAliasesTypeId.values,
|
||||
same(example.AnyAmbiguousAliasesTypeId.values),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -917,11 +997,13 @@ class GeneratorTest {
|
||||
@reflectiveTest
|
||||
class ListOfEnumsTest {
|
||||
void test_listOfEnums() async {
|
||||
var mytable = example3.MyTableObjectBuilder(options: [
|
||||
var mytable = example3.MyTableObjectBuilder(
|
||||
options: [
|
||||
example3.OptionsEnum.A,
|
||||
example3.OptionsEnum.B,
|
||||
example3.OptionsEnum.C
|
||||
]);
|
||||
example3.OptionsEnum.C,
|
||||
],
|
||||
);
|
||||
var bytes = mytable.toBytes();
|
||||
var mytable_read = example3.MyTable(bytes);
|
||||
expect(mytable_read.options![0].value, example3.OptionsEnum.A.value);
|
||||
@@ -934,7 +1016,8 @@ class ListOfEnumsTest {
|
||||
class BoolInStructTest {
|
||||
void test_boolInStruct() async {
|
||||
var mystruct = example4.FooObjectBuilder(
|
||||
myFoo: example4.FooPropertiesObjectBuilder(a: true, b: false));
|
||||
myFoo: example4.FooPropertiesObjectBuilder(a: true, b: false),
|
||||
);
|
||||
var bytes = mystruct.toBytes();
|
||||
var mystruct_read = example4.Foo(bytes);
|
||||
expect(mystruct_read.myFoo!.a, true);
|
||||
|
||||
@@ -62,8 +62,23 @@ void main() {
|
||||
{
|
||||
var flx = Builder();
|
||||
flx.addString('hello 😱');
|
||||
expect(flx.finish(),
|
||||
[10, 104, 101, 108, 108, 111, 32, 240, 159, 152, 177, 0, 11, 20, 1]);
|
||||
expect(flx.finish(), [
|
||||
10,
|
||||
104,
|
||||
101,
|
||||
108,
|
||||
108,
|
||||
111,
|
||||
32,
|
||||
240,
|
||||
159,
|
||||
152,
|
||||
177,
|
||||
0,
|
||||
11,
|
||||
20,
|
||||
1,
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -117,7 +132,7 @@ void main() {
|
||||
192,
|
||||
16,
|
||||
75,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
}
|
||||
{
|
||||
@@ -177,7 +192,7 @@ void main() {
|
||||
7,
|
||||
3,
|
||||
60,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
}
|
||||
{
|
||||
@@ -215,7 +230,7 @@ void main() {
|
||||
10,
|
||||
6,
|
||||
60,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
}
|
||||
{
|
||||
@@ -300,7 +315,7 @@ void main() {
|
||||
104,
|
||||
45,
|
||||
43,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
}
|
||||
});
|
||||
@@ -322,8 +337,24 @@ void main() {
|
||||
..addKey('')
|
||||
..addInt(45)
|
||||
..end();
|
||||
expect(
|
||||
flx.finish(), [97, 0, 0, 2, 2, 5, 2, 1, 2, 45, 12, 4, 4, 4, 36, 1]);
|
||||
expect(flx.finish(), [
|
||||
97,
|
||||
0,
|
||||
0,
|
||||
2,
|
||||
2,
|
||||
5,
|
||||
2,
|
||||
1,
|
||||
2,
|
||||
45,
|
||||
12,
|
||||
4,
|
||||
4,
|
||||
4,
|
||||
36,
|
||||
1,
|
||||
]);
|
||||
}
|
||||
{
|
||||
var flx = Builder()
|
||||
@@ -367,7 +398,7 @@ void main() {
|
||||
36,
|
||||
4,
|
||||
40,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
}
|
||||
});
|
||||
@@ -381,21 +412,38 @@ void main() {
|
||||
|
||||
test('build from object', () {
|
||||
expect(
|
||||
Builder.buildFromObject(Uint8List.fromList([1, 2, 3]).buffer)
|
||||
.asUint8List(),
|
||||
[3, 1, 2, 3, 3, 100, 1]);
|
||||
Builder.buildFromObject(
|
||||
Uint8List.fromList([1, 2, 3]).buffer,
|
||||
).asUint8List(),
|
||||
[3, 1, 2, 3, 3, 100, 1],
|
||||
);
|
||||
expect(Builder.buildFromObject(null).asUint8List(), [0, 0, 1]);
|
||||
expect(Builder.buildFromObject(true).asUint8List(), [1, 104, 1]);
|
||||
expect(Builder.buildFromObject(false).asUint8List(), [0, 104, 1]);
|
||||
expect(Builder.buildFromObject(25).asUint8List(), [25, 4, 1]);
|
||||
expect(Builder.buildFromObject(-250).asUint8List(), [6, 255, 5, 2]);
|
||||
expect(Builder.buildFromObject(-2.50).asUint8List(), [
|
||||
0,
|
||||
0,
|
||||
32,
|
||||
192,
|
||||
14,
|
||||
4,
|
||||
]);
|
||||
expect(Builder.buildFromObject('Maxim').asUint8List(), [
|
||||
5,
|
||||
77,
|
||||
97,
|
||||
120,
|
||||
105,
|
||||
109,
|
||||
0,
|
||||
6,
|
||||
20,
|
||||
1,
|
||||
]);
|
||||
expect(
|
||||
Builder.buildFromObject(-2.50).asUint8List(), [0, 0, 32, 192, 14, 4]);
|
||||
expect(Builder.buildFromObject('Maxim').asUint8List(),
|
||||
[5, 77, 97, 120, 105, 109, 0, 6, 20, 1]);
|
||||
expect(
|
||||
Builder.buildFromObject([1, 3.3, 'max', true, null, false])
|
||||
.asUint8List(),
|
||||
Builder.buildFromObject([1, 3.3, 'max', true, null, false]).asUint8List(),
|
||||
[
|
||||
3,
|
||||
109,
|
||||
@@ -469,12 +517,13 @@ void main() {
|
||||
104,
|
||||
54,
|
||||
43,
|
||||
1
|
||||
]);
|
||||
1,
|
||||
],
|
||||
);
|
||||
expect(
|
||||
Builder.buildFromObject([
|
||||
{'something': 12},
|
||||
{'something': 45}
|
||||
{'something': 45},
|
||||
]).asUint8List(),
|
||||
[
|
||||
115,
|
||||
@@ -506,8 +555,9 @@ void main() {
|
||||
36,
|
||||
4,
|
||||
40,
|
||||
1
|
||||
]);
|
||||
1,
|
||||
],
|
||||
);
|
||||
});
|
||||
|
||||
test('add double indirectly', () {
|
||||
@@ -543,7 +593,7 @@ void main() {
|
||||
35,
|
||||
8,
|
||||
40,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -580,7 +630,7 @@ void main() {
|
||||
27,
|
||||
8,
|
||||
40,
|
||||
1
|
||||
1,
|
||||
]);
|
||||
});
|
||||
|
||||
|
||||
@@ -20,70 +20,76 @@ void main() {
|
||||
expect(Reference.fromBuffer(b([1, 4, 5, 2])).intValue, 1025);
|
||||
expect(Reference.fromBuffer(b([255, 251, 5, 2])).intValue, -1025);
|
||||
expect(Reference.fromBuffer(b([1, 4, 9, 2])).intValue, 1025);
|
||||
expect(Reference.fromBuffer(b([255, 255, 255, 127, 6, 4])).intValue,
|
||||
2147483647);
|
||||
expect(
|
||||
Reference.fromBuffer(b([255, 255, 255, 127, 6, 4])).intValue,
|
||||
2147483647,
|
||||
);
|
||||
expect(Reference.fromBuffer(b([0, 0, 0, 128, 6, 4])).intValue, -2147483648);
|
||||
expect(
|
||||
Reference.fromBuffer(b([255, 255, 255, 255, 0, 0, 0, 0, 7, 8]))
|
||||
.intValue,
|
||||
4294967295);
|
||||
Reference.fromBuffer(b([255, 255, 255, 255, 0, 0, 0, 0, 7, 8])).intValue,
|
||||
4294967295,
|
||||
);
|
||||
expect(
|
||||
Reference.fromBuffer(b([255, 255, 255, 255, 255, 255, 255, 127, 7, 8]))
|
||||
.intValue,
|
||||
9223372036854775807);
|
||||
expect(Reference.fromBuffer(b([0, 0, 0, 0, 0, 0, 0, 128, 7, 8])).intValue,
|
||||
-9223372036854775808);
|
||||
Reference.fromBuffer(
|
||||
b([255, 255, 255, 255, 255, 255, 255, 127, 7, 8]),
|
||||
).intValue,
|
||||
9223372036854775807,
|
||||
);
|
||||
expect(
|
||||
Reference.fromBuffer(b([0, 0, 0, 0, 0, 0, 0, 128, 7, 8])).intValue,
|
||||
-9223372036854775808,
|
||||
);
|
||||
// Dart does not really support UInt64
|
||||
// expect(FlxValue.fromBuffer(b([255, 255, 255, 255, 255, 255, 255, 255, 11, 8])).intValue, 18446744073709551615);
|
||||
});
|
||||
test('double value', () {
|
||||
expect(Reference.fromBuffer(b([0, 0, 128, 63, 14, 4])).doubleValue, 1.0);
|
||||
expect(Reference.fromBuffer(b([0, 0, 144, 64, 14, 4])).doubleValue, 4.5);
|
||||
expect(Reference.fromBuffer(b([205, 204, 204, 61, 14, 4])).doubleValue,
|
||||
closeTo(.1, .001));
|
||||
expect(
|
||||
Reference.fromBuffer(b([154, 153, 153, 153, 153, 153, 185, 63, 15, 8]))
|
||||
.doubleValue,
|
||||
.1);
|
||||
Reference.fromBuffer(b([205, 204, 204, 61, 14, 4])).doubleValue,
|
||||
closeTo(.1, .001),
|
||||
);
|
||||
expect(
|
||||
Reference.fromBuffer(
|
||||
b([154, 153, 153, 153, 153, 153, 185, 63, 15, 8]),
|
||||
).doubleValue,
|
||||
.1,
|
||||
);
|
||||
});
|
||||
test('num value', () {
|
||||
expect(Reference.fromBuffer(b([0, 0, 144, 64, 14, 4])).numValue, 4.5);
|
||||
expect(Reference.fromBuffer(b([205, 204, 204, 61, 14, 4])).numValue,
|
||||
closeTo(.1, .001));
|
||||
expect(
|
||||
Reference.fromBuffer(b([154, 153, 153, 153, 153, 153, 185, 63, 15, 8]))
|
||||
.numValue,
|
||||
.1);
|
||||
Reference.fromBuffer(b([205, 204, 204, 61, 14, 4])).numValue,
|
||||
closeTo(.1, .001),
|
||||
);
|
||||
expect(
|
||||
Reference.fromBuffer(
|
||||
b([154, 153, 153, 153, 153, 153, 185, 63, 15, 8]),
|
||||
).numValue,
|
||||
.1,
|
||||
);
|
||||
expect(Reference.fromBuffer(b([255, 251, 5, 2])).numValue, -1025);
|
||||
});
|
||||
test('string value', () {
|
||||
expect(
|
||||
Reference.fromBuffer(b([5, 77, 97, 120, 105, 109, 0, 6, 20, 1]))
|
||||
.stringValue,
|
||||
'Maxim');
|
||||
Reference.fromBuffer(
|
||||
b([5, 77, 97, 120, 105, 109, 0, 6, 20, 1]),
|
||||
).stringValue,
|
||||
'Maxim',
|
||||
);
|
||||
expect(
|
||||
Reference.fromBuffer(b([
|
||||
10,
|
||||
104,
|
||||
101,
|
||||
108,
|
||||
108,
|
||||
111,
|
||||
32,
|
||||
240,
|
||||
159,
|
||||
152,
|
||||
177,
|
||||
0,
|
||||
11,
|
||||
20,
|
||||
1
|
||||
])).stringValue,
|
||||
'hello 😱');
|
||||
Reference.fromBuffer(
|
||||
b([10, 104, 101, 108, 108, 111, 32, 240, 159, 152, 177, 0, 11, 20, 1]),
|
||||
).stringValue,
|
||||
'hello 😱',
|
||||
);
|
||||
});
|
||||
test('blob value', () {
|
||||
expect(
|
||||
Reference.fromBuffer(b([3, 1, 2, 3, 3, 100, 1])).blobValue, [1, 2, 3]);
|
||||
expect(Reference.fromBuffer(b([3, 1, 2, 3, 3, 100, 1])).blobValue, [
|
||||
1,
|
||||
2,
|
||||
3,
|
||||
]);
|
||||
});
|
||||
test('bool vector', () {
|
||||
var flx = Reference.fromBuffer(b([3, 1, 0, 1, 3, 144, 1]));
|
||||
@@ -95,9 +101,12 @@ void main() {
|
||||
testNumbers([3, 1, 2, 3, 3, 44, 1], [1, 2, 3]);
|
||||
testNumbers([3, 255, 2, 3, 3, 44, 1], [-1, 2, 3]);
|
||||
testNumbers([3, 0, 1, 0, 43, 2, 3, 0, 6, 45, 1], [1, 555, 3]);
|
||||
testNumbers([3, 0, 0, 0, 1, 0, 0, 0, 204, 216, 0, 0, 3, 0, 0, 0, 12, 46, 1],
|
||||
[1, 55500, 3]);
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[3, 0, 0, 0, 1, 0, 0, 0, 204, 216, 0, 0, 3, 0, 0, 0, 12, 46, 1],
|
||||
[1, 55500, 3],
|
||||
);
|
||||
testNumbers(
|
||||
[
|
||||
3,
|
||||
0,
|
||||
0,
|
||||
@@ -132,16 +141,16 @@ void main() {
|
||||
0,
|
||||
24,
|
||||
47,
|
||||
1
|
||||
], [
|
||||
1,
|
||||
55555555500,
|
||||
3
|
||||
]);
|
||||
],
|
||||
[1, 55555555500, 3],
|
||||
);
|
||||
testNumbers(
|
||||
[3, 0, 0, 0, 0, 0, 192, 63, 0, 0, 32, 64, 0, 0, 96, 64, 12, 54, 1],
|
||||
[1.5, 2.5, 3.5]);
|
||||
testNumbers([
|
||||
[1.5, 2.5, 3.5],
|
||||
);
|
||||
testNumbers(
|
||||
[
|
||||
3,
|
||||
0,
|
||||
0,
|
||||
@@ -176,18 +185,17 @@ void main() {
|
||||
64,
|
||||
24,
|
||||
55,
|
||||
1
|
||||
], [
|
||||
1.1,
|
||||
2.2,
|
||||
3.3
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[1.1, 2.2, 3.3],
|
||||
);
|
||||
});
|
||||
test('number vector, fixed type', () {
|
||||
testNumbers([1, 2, 2, 64, 1], [1, 2]);
|
||||
testNumbers([255, 255, 0, 1, 4, 65, 1], [-1, 256]);
|
||||
testNumbers([211, 255, 255, 255, 0, 232, 3, 0, 8, 66, 1], [-45, 256000]);
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[
|
||||
211,
|
||||
255,
|
||||
255,
|
||||
@@ -206,18 +214,18 @@ void main() {
|
||||
127,
|
||||
16,
|
||||
67,
|
||||
1
|
||||
], [
|
||||
-45,
|
||||
9223372036854775807
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[-45, 9223372036854775807],
|
||||
);
|
||||
|
||||
testNumbers([1, 2, 2, 68, 1], [1, 2]);
|
||||
testNumbers([1, 0, 0, 1, 4, 69, 1], [1, 256]);
|
||||
testNumbers([45, 0, 0, 0, 0, 232, 3, 0, 8, 70, 1], [45, 256000]);
|
||||
|
||||
testNumbers([205, 204, 140, 63, 0, 0, 0, 192, 8, 74, 1], [1.1, -2]);
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[
|
||||
154,
|
||||
153,
|
||||
153,
|
||||
@@ -236,16 +244,18 @@ void main() {
|
||||
192,
|
||||
16,
|
||||
75,
|
||||
1
|
||||
], [
|
||||
1.1,
|
||||
-256
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[1.1, -256],
|
||||
);
|
||||
|
||||
testNumbers([211, 255, 255, 255, 0, 232, 3, 0, 4, 0, 0, 0, 12, 78, 1],
|
||||
[-45, 256000, 4]);
|
||||
testNumbers(
|
||||
[211, 255, 255, 255, 0, 232, 3, 0, 4, 0, 0, 0, 12, 78, 1],
|
||||
[-45, 256000, 4],
|
||||
);
|
||||
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[
|
||||
211,
|
||||
255,
|
||||
255,
|
||||
@@ -280,15 +290,13 @@ void main() {
|
||||
0,
|
||||
32,
|
||||
91,
|
||||
1
|
||||
], [
|
||||
-45,
|
||||
9223372036854775807,
|
||||
4,
|
||||
9
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[-45, 9223372036854775807, 4, 9],
|
||||
);
|
||||
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[
|
||||
45,
|
||||
0,
|
||||
0,
|
||||
@@ -323,15 +331,13 @@ void main() {
|
||||
0,
|
||||
32,
|
||||
95,
|
||||
1
|
||||
], [
|
||||
45,
|
||||
9223372036854775807,
|
||||
4,
|
||||
9
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[45, 9223372036854775807, 4, 9],
|
||||
);
|
||||
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[
|
||||
154,
|
||||
153,
|
||||
153,
|
||||
@@ -358,14 +364,13 @@ void main() {
|
||||
64,
|
||||
24,
|
||||
87,
|
||||
1
|
||||
], [
|
||||
1.1,
|
||||
256,
|
||||
4
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[1.1, 256, 4],
|
||||
);
|
||||
|
||||
testNumbers([
|
||||
testNumbers(
|
||||
[
|
||||
154,
|
||||
153,
|
||||
153,
|
||||
@@ -400,16 +405,14 @@ void main() {
|
||||
64,
|
||||
32,
|
||||
99,
|
||||
1
|
||||
], [
|
||||
1.1,
|
||||
256,
|
||||
4,
|
||||
9
|
||||
]);
|
||||
1,
|
||||
],
|
||||
[1.1, 256, 4, 9],
|
||||
);
|
||||
});
|
||||
test('string vector', () {
|
||||
testStrings([
|
||||
testStrings(
|
||||
[
|
||||
3,
|
||||
102,
|
||||
111,
|
||||
@@ -431,13 +434,12 @@ void main() {
|
||||
7,
|
||||
3,
|
||||
60,
|
||||
1
|
||||
], [
|
||||
'foo',
|
||||
'bar',
|
||||
'baz'
|
||||
]);
|
||||
testStrings([
|
||||
1,
|
||||
],
|
||||
['foo', 'bar', 'baz'],
|
||||
);
|
||||
testStrings(
|
||||
[
|
||||
3,
|
||||
102,
|
||||
111,
|
||||
@@ -462,18 +464,14 @@ void main() {
|
||||
10,
|
||||
6,
|
||||
60,
|
||||
1
|
||||
], [
|
||||
'foo',
|
||||
'bar',
|
||||
'baz',
|
||||
'foo',
|
||||
'bar',
|
||||
'baz'
|
||||
]);
|
||||
1,
|
||||
],
|
||||
['foo', 'bar', 'baz', 'foo', 'bar', 'baz'],
|
||||
);
|
||||
});
|
||||
test('mixed vector', () {
|
||||
var flx = Reference.fromBuffer(b([
|
||||
var flx = Reference.fromBuffer(
|
||||
b([
|
||||
3,
|
||||
102,
|
||||
111,
|
||||
@@ -537,8 +535,9 @@ void main() {
|
||||
104,
|
||||
45,
|
||||
43,
|
||||
1
|
||||
]));
|
||||
1,
|
||||
]),
|
||||
);
|
||||
expect(flx.length, 5);
|
||||
expect(flx[0].stringValue, 'foo');
|
||||
expect(flx[1].numValue, 1);
|
||||
@@ -554,7 +553,8 @@ void main() {
|
||||
});
|
||||
test('two value map', () {
|
||||
var flx = Reference.fromBuffer(
|
||||
b([0, 97, 0, 2, 4, 4, 2, 1, 2, 45, 12, 4, 4, 4, 36, 1]));
|
||||
b([0, 97, 0, 2, 4, 4, 2, 1, 2, 45, 12, 4, 4, 4, 36, 1]),
|
||||
);
|
||||
expect(flx.length, 2);
|
||||
expect(flx['a'].numValue, 12);
|
||||
expect(flx[''].numValue, 45);
|
||||
@@ -579,54 +579,89 @@ void main() {
|
||||
|
||||
expect(
|
||||
() => flx['address']['country'].stringValue,
|
||||
throwsA(predicate((dynamic e) =>
|
||||
throwsA(
|
||||
predicate(
|
||||
(dynamic e) =>
|
||||
e is ArgumentError &&
|
||||
e.message ==
|
||||
'Key: [country] is not applicable on: //address of: ValueType.Map')));
|
||||
'Key: [country] is not applicable on: //address of: ValueType.Map',
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
() => flx['address']['countryCode'][0],
|
||||
throwsA(predicate((dynamic e) =>
|
||||
throwsA(
|
||||
predicate(
|
||||
(dynamic e) =>
|
||||
e is ArgumentError &&
|
||||
e.message ==
|
||||
'Key: [0] is not applicable on: //address/countryCode of: ValueType.String')));
|
||||
'Key: [0] is not applicable on: //address/countryCode of: ValueType.String',
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
() => flx[1],
|
||||
throwsA(predicate((dynamic e) =>
|
||||
throwsA(
|
||||
predicate(
|
||||
(dynamic e) =>
|
||||
e is ArgumentError &&
|
||||
e.message ==
|
||||
'Key: [1] is not applicable on: / of: ValueType.Map')));
|
||||
e.message == 'Key: [1] is not applicable on: / of: ValueType.Map',
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
() => flx['flags'][4],
|
||||
throwsA(predicate((dynamic e) =>
|
||||
throwsA(
|
||||
predicate(
|
||||
(dynamic e) =>
|
||||
e is ArgumentError &&
|
||||
e.message ==
|
||||
'Key: [4] is not applicable on: //flags of: ValueType.VectorBool length: 4')));
|
||||
'Key: [4] is not applicable on: //flags of: ValueType.VectorBool length: 4',
|
||||
),
|
||||
),
|
||||
);
|
||||
expect(
|
||||
() => flx['flags'][-1],
|
||||
throwsA(predicate((dynamic e) =>
|
||||
throwsA(
|
||||
predicate(
|
||||
(dynamic e) =>
|
||||
e is ArgumentError &&
|
||||
e.message ==
|
||||
'Key: [-1] is not applicable on: //flags of: ValueType.VectorBool length: 4')));
|
||||
'Key: [-1] is not applicable on: //flags of: ValueType.VectorBool length: 4',
|
||||
),
|
||||
),
|
||||
);
|
||||
});
|
||||
test('complex map to json', () {
|
||||
var flx = complexMap();
|
||||
expect(flx.json,
|
||||
'{"address":{"city":"Bla","countryCode":"XX","zip":"12345"},"age":35,"flags":[true,false,true,true],"name":"Maxim","weight":72.5}');
|
||||
expect(
|
||||
flx.json,
|
||||
'{"address":{"city":"Bla","countryCode":"XX","zip":"12345"},"age":35,"flags":[true,false,true,true],"name":"Maxim","weight":72.5}',
|
||||
);
|
||||
});
|
||||
|
||||
test('complex map iterators', () {
|
||||
var flx = complexMap();
|
||||
expect(flx.mapKeyIterable.map((e) => e).toList(),
|
||||
['address', 'age', 'flags', 'name', 'weight']);
|
||||
expect(flx.mapKeyIterable.map((e) => e).toList(), [
|
||||
'address',
|
||||
'age',
|
||||
'flags',
|
||||
'name',
|
||||
'weight',
|
||||
]);
|
||||
expect(flx.mapValueIterable.map((e) => e.json).toList(), [
|
||||
flx['address'].json,
|
||||
flx['age'].json,
|
||||
flx['flags'].json,
|
||||
flx['name'].json,
|
||||
flx['weight'].json
|
||||
flx['weight'].json,
|
||||
]);
|
||||
expect(flx['flags'].vectorIterable.map((e) => e.boolValue).toList(), [
|
||||
true,
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
]);
|
||||
expect(flx['flags'].vectorIterable.map((e) => e.boolValue).toList(),
|
||||
[true, false, true, true]);
|
||||
});
|
||||
|
||||
test('bug where offest were stored as int instead of uint', () {
|
||||
@@ -790,11 +825,13 @@ void main() {
|
||||
4,
|
||||
16,
|
||||
36,
|
||||
1
|
||||
1,
|
||||
];
|
||||
var flx = Reference.fromBuffer(b(data));
|
||||
expect(flx.json,
|
||||
'{"channels_in":64,"dilation_height_factor":1,"dilation_width_factor":1,"fused_activation_function":1,"pad_values":1,"padding":0,"stride_height":1,"stride_width":1}');
|
||||
expect(
|
||||
flx.json,
|
||||
'{"channels_in":64,"dilation_height_factor":1,"dilation_width_factor":1,"fused_activation_function":1,"pad_values":1,"padding":0,"stride_height":1,"stride_width":1}',
|
||||
);
|
||||
const object = {
|
||||
"channels_in": 64,
|
||||
"dilation_height_factor": 1,
|
||||
@@ -803,13 +840,15 @@ void main() {
|
||||
"pad_values": 1,
|
||||
"padding": 0,
|
||||
"stride_height": 1,
|
||||
"stride_width": 1
|
||||
"stride_width": 1,
|
||||
};
|
||||
var data1 = Builder.buildFromObject(object).asUint8List();
|
||||
expect(data1.length, data.length);
|
||||
var flx1 = Reference.fromBuffer(b(data1));
|
||||
expect(flx1.json,
|
||||
'{"channels_in":64,"dilation_height_factor":1,"dilation_width_factor":1,"fused_activation_function":1,"pad_values":1,"padding":0,"stride_height":1,"stride_width":1}');
|
||||
expect(
|
||||
flx1.json,
|
||||
'{"channels_in":64,"dilation_height_factor":1,"dilation_width_factor":1,"fused_activation_function":1,"pad_values":1,"padding":0,"stride_height":1,"stride_width":1}',
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -846,7 +885,8 @@ Reference complexMap() {
|
||||
// "countryCode": "XX",
|
||||
// }
|
||||
// }
|
||||
return Reference.fromBuffer(b([
|
||||
return Reference.fromBuffer(
|
||||
b([
|
||||
97,
|
||||
100,
|
||||
100,
|
||||
@@ -986,6 +1026,7 @@ Reference complexMap() {
|
||||
14,
|
||||
25,
|
||||
38,
|
||||
1
|
||||
]));
|
||||
1,
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -48,116 +48,210 @@ void main() {
|
||||
expect(ValueTypeUtils.isFixedTypedVector(ValueType.VectorInt), isFalse);
|
||||
});
|
||||
test('to typed vector', () {
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Int, 0),
|
||||
equals(ValueType.VectorInt));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.UInt, 0),
|
||||
equals(ValueType.VectorUInt));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Bool, 0),
|
||||
equals(ValueType.VectorBool));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Float, 0),
|
||||
equals(ValueType.VectorFloat));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Key, 0),
|
||||
equals(ValueType.VectorKey));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.String, 0),
|
||||
equals(ValueType.VectorString));
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Int, 0),
|
||||
equals(ValueType.VectorInt),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.UInt, 0),
|
||||
equals(ValueType.VectorUInt),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Bool, 0),
|
||||
equals(ValueType.VectorBool),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Float, 0),
|
||||
equals(ValueType.VectorFloat),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Key, 0),
|
||||
equals(ValueType.VectorKey),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.String, 0),
|
||||
equals(ValueType.VectorString),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Int, 2),
|
||||
equals(ValueType.VectorInt2));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.UInt, 2),
|
||||
equals(ValueType.VectorUInt2));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Float, 2),
|
||||
equals(ValueType.VectorFloat2));
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Int, 2),
|
||||
equals(ValueType.VectorInt2),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.UInt, 2),
|
||||
equals(ValueType.VectorUInt2),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Float, 2),
|
||||
equals(ValueType.VectorFloat2),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Int, 3),
|
||||
equals(ValueType.VectorInt3));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.UInt, 3),
|
||||
equals(ValueType.VectorUInt3));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Float, 3),
|
||||
equals(ValueType.VectorFloat3));
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Int, 3),
|
||||
equals(ValueType.VectorInt3),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.UInt, 3),
|
||||
equals(ValueType.VectorUInt3),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Float, 3),
|
||||
equals(ValueType.VectorFloat3),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Int, 4),
|
||||
equals(ValueType.VectorInt4));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.UInt, 4),
|
||||
equals(ValueType.VectorUInt4));
|
||||
expect(ValueTypeUtils.toTypedVector(ValueType.Float, 4),
|
||||
equals(ValueType.VectorFloat4));
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Int, 4),
|
||||
equals(ValueType.VectorInt4),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.UInt, 4),
|
||||
equals(ValueType.VectorUInt4),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.toTypedVector(ValueType.Float, 4),
|
||||
equals(ValueType.VectorFloat4),
|
||||
);
|
||||
});
|
||||
test('typed vector element type', () {
|
||||
expect(ValueTypeUtils.typedVectorElementType(ValueType.VectorInt),
|
||||
equals(ValueType.Int));
|
||||
expect(ValueTypeUtils.typedVectorElementType(ValueType.VectorUInt),
|
||||
equals(ValueType.UInt));
|
||||
expect(ValueTypeUtils.typedVectorElementType(ValueType.VectorFloat),
|
||||
equals(ValueType.Float));
|
||||
expect(ValueTypeUtils.typedVectorElementType(ValueType.VectorString),
|
||||
equals(ValueType.String));
|
||||
expect(ValueTypeUtils.typedVectorElementType(ValueType.VectorKey),
|
||||
equals(ValueType.Key));
|
||||
expect(ValueTypeUtils.typedVectorElementType(ValueType.VectorBool),
|
||||
equals(ValueType.Bool));
|
||||
expect(
|
||||
ValueTypeUtils.typedVectorElementType(ValueType.VectorInt),
|
||||
equals(ValueType.Int),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.typedVectorElementType(ValueType.VectorUInt),
|
||||
equals(ValueType.UInt),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.typedVectorElementType(ValueType.VectorFloat),
|
||||
equals(ValueType.Float),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.typedVectorElementType(ValueType.VectorString),
|
||||
equals(ValueType.String),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.typedVectorElementType(ValueType.VectorKey),
|
||||
equals(ValueType.Key),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.typedVectorElementType(ValueType.VectorBool),
|
||||
equals(ValueType.Bool),
|
||||
);
|
||||
});
|
||||
test('fixed typed vector element type', () {
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorInt2),
|
||||
equals(ValueType.Int));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorInt3),
|
||||
equals(ValueType.Int));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorInt4),
|
||||
equals(ValueType.Int));
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorInt2),
|
||||
equals(ValueType.Int),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorInt3),
|
||||
equals(ValueType.Int),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorInt4),
|
||||
equals(ValueType.Int),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorUInt2),
|
||||
equals(ValueType.UInt));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorUInt3),
|
||||
equals(ValueType.UInt));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorUInt4),
|
||||
equals(ValueType.UInt));
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorUInt2),
|
||||
equals(ValueType.UInt),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorUInt3),
|
||||
equals(ValueType.UInt),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorUInt4),
|
||||
equals(ValueType.UInt),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorFloat2),
|
||||
equals(ValueType.Float));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorFloat3),
|
||||
equals(ValueType.Float));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorFloat4),
|
||||
equals(ValueType.Float));
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorFloat2),
|
||||
equals(ValueType.Float),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorFloat3),
|
||||
equals(ValueType.Float),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementType(ValueType.VectorFloat4),
|
||||
equals(ValueType.Float),
|
||||
);
|
||||
});
|
||||
test('fixed typed vector element size', () {
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorInt2),
|
||||
equals(2));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorInt3),
|
||||
equals(3));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorInt4),
|
||||
equals(4));
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorInt2),
|
||||
equals(2),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorInt3),
|
||||
equals(3),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorInt4),
|
||||
equals(4),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorUInt2),
|
||||
equals(2));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorUInt3),
|
||||
equals(3));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorUInt4),
|
||||
equals(4));
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorUInt2),
|
||||
equals(2),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorUInt3),
|
||||
equals(3),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorUInt4),
|
||||
equals(4),
|
||||
);
|
||||
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorFloat2),
|
||||
equals(2));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorFloat3),
|
||||
equals(3));
|
||||
expect(ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorFloat4),
|
||||
equals(4));
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorFloat2),
|
||||
equals(2),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorFloat3),
|
||||
equals(3),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.fixedTypedVectorElementSize(ValueType.VectorFloat4),
|
||||
equals(4),
|
||||
);
|
||||
});
|
||||
test('packed type', () {
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width8), equals(0));
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width8),
|
||||
equals(0),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width16), equals(1));
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width16),
|
||||
equals(1),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width32), equals(2));
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width32),
|
||||
equals(2),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width64), equals(3));
|
||||
ValueTypeUtils.packedType(ValueType.Null, BitWidth.width64),
|
||||
equals(3),
|
||||
);
|
||||
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width8), equals(4));
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width8),
|
||||
equals(4),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width16), equals(5));
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width16),
|
||||
equals(5),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width32), equals(6));
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width32),
|
||||
equals(6),
|
||||
);
|
||||
expect(
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width64), equals(7));
|
||||
ValueTypeUtils.packedType(ValueType.Int, BitWidth.width64),
|
||||
equals(7),
|
||||
);
|
||||
});
|
||||
test('bit width', () {
|
||||
expect(BitWidthUtil.width(0), BitWidth.width8);
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
// ignore_for_file: unused_import, unused_field, unused_element, unused_local_variable, constant_identifier_names
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
|
||||
import './include_test2_my_game.other_name_space_generated.dart' as my_game_other_name_space;
|
||||
import './include_test2_my_game.other_name_space_generated.dart'
|
||||
as my_game_other_name_space;
|
||||
|
||||
class TableA {
|
||||
TableA._(this._bc, this._bcOffset);
|
||||
@@ -19,15 +20,17 @@ class TableA {
|
||||
final fb.BufferContext _bc;
|
||||
final int _bcOffset;
|
||||
|
||||
my_game_other_name_space.TableB? get b => my_game_other_name_space.TableB.reader.vTableGetNullable(_bc, _bcOffset, 4);
|
||||
my_game_other_name_space.TableB? get b => my_game_other_name_space
|
||||
.TableB
|
||||
.reader
|
||||
.vTableGetNullable(_bc, _bcOffset, 4);
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'TableA{b: ${b}}';
|
||||
}
|
||||
|
||||
TableAT unpack() => TableAT(
|
||||
b: b?.unpack());
|
||||
TableAT unpack() => TableAT(b: b?.unpack());
|
||||
|
||||
static int pack(fb.Builder fbBuilder, TableAT? object) {
|
||||
if (object == null) return 0;
|
||||
@@ -38,8 +41,7 @@ class TableA {
|
||||
class TableAT implements fb.Packable {
|
||||
my_game_other_name_space.TableBT? b;
|
||||
|
||||
TableAT({
|
||||
this.b});
|
||||
TableAT({this.b});
|
||||
|
||||
@override
|
||||
int pack(fb.Builder fbBuilder) {
|
||||
@@ -59,8 +61,7 @@ class _TableAReader extends fb.TableReader<TableA> {
|
||||
const _TableAReader();
|
||||
|
||||
@override
|
||||
TableA createObject(fb.BufferContext bc, int offset) =>
|
||||
TableA._(bc, offset);
|
||||
TableA createObject(fb.BufferContext bc, int offset) => TableA._(bc, offset);
|
||||
}
|
||||
|
||||
class TableABuilder {
|
||||
@@ -85,9 +86,7 @@ class TableABuilder {
|
||||
class TableAObjectBuilder extends fb.ObjectBuilder {
|
||||
final my_game_other_name_space.TableBObjectBuilder? _b;
|
||||
|
||||
TableAObjectBuilder({
|
||||
my_game_other_name_space.TableBObjectBuilder? b,
|
||||
})
|
||||
TableAObjectBuilder({my_game_other_name_space.TableBObjectBuilder? b})
|
||||
: _b = b;
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
library my_game.other_name_space;
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import './include_test1_generated.dart';
|
||||
|
||||
@@ -17,8 +17,10 @@ enum FromInclude {
|
||||
|
||||
factory FromInclude.fromValue(int value) {
|
||||
switch (value) {
|
||||
case 0: return FromInclude.IncludeVal;
|
||||
default: throw StateError('Invalid value $value for bit flag enum');
|
||||
case 0:
|
||||
return FromInclude.IncludeVal;
|
||||
default:
|
||||
throw StateError('Invalid value $value for bit flag enum');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,8 +58,7 @@ class Unused {
|
||||
return 'Unused{a: ${a}}';
|
||||
}
|
||||
|
||||
UnusedT unpack() => UnusedT(
|
||||
a: a);
|
||||
UnusedT unpack() => UnusedT(a: a);
|
||||
|
||||
static int pack(fb.Builder fbBuilder, UnusedT? object) {
|
||||
if (object == null) return 0;
|
||||
@@ -68,8 +69,7 @@ class Unused {
|
||||
class UnusedT implements fb.Packable {
|
||||
int a;
|
||||
|
||||
UnusedT({
|
||||
required this.a});
|
||||
UnusedT({required this.a});
|
||||
|
||||
@override
|
||||
int pack(fb.Builder fbBuilder) {
|
||||
@@ -90,8 +90,7 @@ class _UnusedReader extends fb.StructReader<Unused> {
|
||||
int get size => 4;
|
||||
|
||||
@override
|
||||
Unused createObject(fb.BufferContext bc, int offset) =>
|
||||
Unused._(bc, offset);
|
||||
Unused createObject(fb.BufferContext bc, int offset) => Unused._(bc, offset);
|
||||
}
|
||||
|
||||
class UnusedBuilder {
|
||||
@@ -103,16 +102,12 @@ class UnusedBuilder {
|
||||
fbBuilder.putInt32(a);
|
||||
return fbBuilder.offset;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class UnusedObjectBuilder extends fb.ObjectBuilder {
|
||||
final int _a;
|
||||
|
||||
UnusedObjectBuilder({
|
||||
required int a,
|
||||
})
|
||||
: _a = a;
|
||||
UnusedObjectBuilder({required int a}) : _a = a;
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
@override
|
||||
@@ -129,6 +124,7 @@ class UnusedObjectBuilder extends fb.ObjectBuilder {
|
||||
return fbBuilder.buffer;
|
||||
}
|
||||
}
|
||||
|
||||
class TableB {
|
||||
TableB._(this._bc, this._bcOffset);
|
||||
factory TableB(List<int> bytes) {
|
||||
@@ -148,8 +144,7 @@ class TableB {
|
||||
return 'TableB{a: ${a}}';
|
||||
}
|
||||
|
||||
TableBT unpack() => TableBT(
|
||||
a: a?.unpack());
|
||||
TableBT unpack() => TableBT(a: a?.unpack());
|
||||
|
||||
static int pack(fb.Builder fbBuilder, TableBT? object) {
|
||||
if (object == null) return 0;
|
||||
@@ -160,8 +155,7 @@ class TableB {
|
||||
class TableBT implements fb.Packable {
|
||||
TableAT? a;
|
||||
|
||||
TableBT({
|
||||
this.a});
|
||||
TableBT({this.a});
|
||||
|
||||
@override
|
||||
int pack(fb.Builder fbBuilder) {
|
||||
@@ -181,8 +175,7 @@ class _TableBReader extends fb.TableReader<TableB> {
|
||||
const _TableBReader();
|
||||
|
||||
@override
|
||||
TableB createObject(fb.BufferContext bc, int offset) =>
|
||||
TableB._(bc, offset);
|
||||
TableB createObject(fb.BufferContext bc, int offset) => TableB._(bc, offset);
|
||||
}
|
||||
|
||||
class TableBBuilder {
|
||||
@@ -207,10 +200,7 @@ class TableBBuilder {
|
||||
class TableBObjectBuilder extends fb.ObjectBuilder {
|
||||
final TableAObjectBuilder? _a;
|
||||
|
||||
TableBObjectBuilder({
|
||||
TableAObjectBuilder? a,
|
||||
})
|
||||
: _a = a;
|
||||
TableBObjectBuilder({TableAObjectBuilder? a}) : _a = a;
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
@override
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
library my_game.example2;
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import './monster_test_my_game_generated.dart' as my_game;
|
||||
import './monster_test_my_game.example_generated.dart' as my_game_example;
|
||||
|
||||
import './include_test1_generated.dart';
|
||||
import './monster_test_my_game.example_generated.dart' as my_game_example;
|
||||
import './monster_test_my_game_generated.dart' as my_game;
|
||||
|
||||
class Monster {
|
||||
Monster._(this._bc, this._bcOffset);
|
||||
@@ -23,7 +23,6 @@ class Monster {
|
||||
final fb.BufferContext _bc;
|
||||
final int _bcOffset;
|
||||
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'Monster{}';
|
||||
@@ -59,7 +58,6 @@ class _MonsterReader extends fb.TableReader<Monster> {
|
||||
}
|
||||
|
||||
class MonsterObjectBuilder extends fb.ObjectBuilder {
|
||||
|
||||
MonsterObjectBuilder();
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4,12 +4,12 @@
|
||||
library my_game;
|
||||
|
||||
import 'dart:typed_data' show Uint8List;
|
||||
|
||||
import 'package:flat_buffers/flat_buffers.dart' as fb;
|
||||
|
||||
import './monster_test_my_game.example_generated.dart' as my_game_example;
|
||||
import './monster_test_my_game.example2_generated.dart' as my_game_example2;
|
||||
|
||||
import './include_test1_generated.dart';
|
||||
import './monster_test_my_game.example2_generated.dart' as my_game_example2;
|
||||
import './monster_test_my_game.example_generated.dart' as my_game_example;
|
||||
|
||||
class InParentNamespace {
|
||||
InParentNamespace._(this._bc, this._bcOffset);
|
||||
@@ -23,7 +23,6 @@ class InParentNamespace {
|
||||
final fb.BufferContext _bc;
|
||||
final int _bcOffset;
|
||||
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'InParentNamespace{}';
|
||||
@@ -59,7 +58,6 @@ class _InParentNamespaceReader extends fb.TableReader<InParentNamespace> {
|
||||
}
|
||||
|
||||
class InParentNamespaceObjectBuilder extends fb.ObjectBuilder {
|
||||
|
||||
InParentNamespaceObjectBuilder();
|
||||
|
||||
/// Finish building, and store into the [fbBuilder].
|
||||
|
||||
@@ -104,13 +104,16 @@ func (b *Builder) StartObject(numfields int) {
|
||||
// logically-equal vtables will be deduplicated.
|
||||
//
|
||||
// A vtable has the following format:
|
||||
//
|
||||
// <VOffsetT: size of the vtable in bytes, including this value>
|
||||
// <VOffsetT: size of the object in bytes, including the vtable offset>
|
||||
// <VOffsetT: offset for a field> * N, where N is the number of fields in
|
||||
// the schema for this type. Includes deprecated fields.
|
||||
//
|
||||
// Thus, a vtable is made of 2 + N elements, each SizeVOffsetT bytes wide.
|
||||
//
|
||||
// An object has the following format:
|
||||
//
|
||||
// <SOffsetT: offset to this object's vtable (may be negative)>
|
||||
// <byte: data>+
|
||||
func (b *Builder) WriteVtable() (n UOffsetT) {
|
||||
@@ -296,6 +299,7 @@ func (b *Builder) PrependUOffsetT(off UOffsetT) {
|
||||
// StartVector initializes bookkeeping for writing a new vector.
|
||||
//
|
||||
// A vector has the following format:
|
||||
//
|
||||
// <UOffsetT: number of elements in this vector>
|
||||
// <T: data>+, where T is the type of elements of this vector.
|
||||
func (b *Builder) StartVector(elemSize, numElems, alignment int) UOffsetT {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import sys
|
||||
from pathlib import Path
|
||||
import sys
|
||||
|
||||
# Get the path where this script is located so we can invoke the script from
|
||||
# any directory and have the paths work correctly.
|
||||
|
||||
@@ -1,31 +1,36 @@
|
||||
import sys
|
||||
import argparse
|
||||
import sys
|
||||
import grpc
|
||||
|
||||
sys.path.insert(0, '../../../../../flatbuffers/python')
|
||||
sys.path.insert(0, "../../../../../flatbuffers/python")
|
||||
|
||||
import flatbuffers
|
||||
from models import HelloReply, HelloRequest, greeter_grpc_fb
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("port", help="server port to connect to", default=3000)
|
||||
parser.add_argument("name", help="name to be sent to server", default="flatbuffers")
|
||||
parser.add_argument(
|
||||
"name", help="name to be sent to server", default="flatbuffers"
|
||||
)
|
||||
|
||||
|
||||
def say_hello(stub, hello_request):
|
||||
reply = stub.SayHello(hello_request)
|
||||
r = HelloReply.HelloReply.GetRootAs(reply)
|
||||
print(r.Message())
|
||||
|
||||
|
||||
def say_many_hellos(stub, hello_request):
|
||||
greetings = stub.SayManyHellos(hello_request)
|
||||
for greeting in greetings:
|
||||
r = HelloReply.HelloReply.GetRootAs(greeting)
|
||||
print(r.Message())
|
||||
|
||||
|
||||
def main():
|
||||
args = parser.parse_args()
|
||||
|
||||
with grpc.insecure_channel('localhost:' + args.port) as channel:
|
||||
with grpc.insecure_channel("localhost:" + args.port) as channel:
|
||||
builder = flatbuffers.Builder()
|
||||
ind = builder.CreateString(args.name)
|
||||
HelloRequest.HelloRequestStart(builder)
|
||||
@@ -37,4 +42,5 @@ def main():
|
||||
say_hello(stub, output)
|
||||
say_many_hellos(stub, output)
|
||||
|
||||
|
||||
main()
|
||||
@@ -2,30 +2,29 @@
|
||||
|
||||
import flatbuffers
|
||||
import grpc
|
||||
|
||||
from models.HelloReply import HelloReply
|
||||
from models.HelloRequest import HelloRequest
|
||||
|
||||
|
||||
class GreeterStub(object):
|
||||
'''Interface exported by the server.'''
|
||||
"""Interface exported by the server."""
|
||||
|
||||
def __init__(self, channel):
|
||||
'''Constructor.
|
||||
"""Constructor.
|
||||
|
||||
Args:
|
||||
channel: A grpc.Channel.
|
||||
'''
|
||||
"""
|
||||
|
||||
self.SayHello = channel.unary_unary(
|
||||
method='/models.Greeter/SayHello')
|
||||
self.SayHello = channel.unary_unary(method='/models.Greeter/SayHello')
|
||||
|
||||
self.SayManyHellos = channel.unary_stream(
|
||||
method='/models.Greeter/SayManyHellos')
|
||||
method='/models.Greeter/SayManyHellos'
|
||||
)
|
||||
|
||||
|
||||
class GreeterServicer(object):
|
||||
'''Interface exported by the server.'''
|
||||
"""Interface exported by the server."""
|
||||
|
||||
def SayHello(self, request, context):
|
||||
context.set_code(grpc.StatusCode.UNIMPLEMENTED)
|
||||
@@ -40,15 +39,14 @@ class GreeterServicer(object):
|
||||
|
||||
def add_GreeterServicer_to_server(servicer, server):
|
||||
rpc_method_handlers = {
|
||||
'SayHello': grpc.unary_unary_rpc_method_handler(
|
||||
servicer.SayHello),
|
||||
'SayHello': grpc.unary_unary_rpc_method_handler(servicer.SayHello),
|
||||
'SayManyHellos': grpc.unary_stream_rpc_method_handler(
|
||||
servicer.SayManyHellos),
|
||||
servicer.SayManyHellos
|
||||
),
|
||||
}
|
||||
|
||||
generic_handler = grpc.method_handlers_generic_handler(
|
||||
'models.Greeter', rpc_method_handlers)
|
||||
'models.Greeter', rpc_method_handlers
|
||||
)
|
||||
|
||||
server.add_generic_rpc_handlers((generic_handler,))
|
||||
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import argparse
|
||||
from concurrent import futures
|
||||
import sys
|
||||
import argparse
|
||||
import grpc
|
||||
|
||||
sys.path.insert(0, '../../../../../flatbuffers/python')
|
||||
sys.path.insert(0, "../../../../../flatbuffers/python")
|
||||
|
||||
import flatbuffers
|
||||
from models import HelloReply, HelloRequest, greeter_grpc_fb
|
||||
@@ -11,6 +11,7 @@ from models import HelloReply, HelloRequest, greeter_grpc_fb
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("port", help="server on port", default=3000)
|
||||
|
||||
|
||||
def build_reply(message):
|
||||
builder = flatbuffers.Builder()
|
||||
ind = builder.CreateString(message)
|
||||
@@ -20,6 +21,7 @@ def build_reply(message):
|
||||
builder.Finish(root)
|
||||
return bytes(builder.Output())
|
||||
|
||||
|
||||
class GreeterServicer(greeter_grpc_fb.GreeterServicer):
|
||||
|
||||
def __init__(self):
|
||||
@@ -30,7 +32,7 @@ class GreeterServicer(greeter_grpc_fb.GreeterServicer):
|
||||
reply = "Unknown"
|
||||
if r.Name():
|
||||
reply = r.Name()
|
||||
return build_reply("welcome " + reply.decode('UTF-8'))
|
||||
return build_reply("welcome " + reply.decode("UTF-8"))
|
||||
|
||||
def SayManyHellos(self, request, context):
|
||||
r = HelloRequest.HelloRequest().GetRootAs(request, 0)
|
||||
@@ -40,18 +42,17 @@ class GreeterServicer(greeter_grpc_fb.GreeterServicer):
|
||||
|
||||
for greeting in self.greetings:
|
||||
print(type(reply))
|
||||
yield build_reply(greeting + " " + reply.decode('UTF-8'))
|
||||
yield build_reply(greeting + " " + reply.decode("UTF-8"))
|
||||
|
||||
|
||||
def serve():
|
||||
args = parser.parse_args()
|
||||
server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
|
||||
greeter_grpc_fb.add_GreeterServicer_to_server(
|
||||
GreeterServicer(), server
|
||||
)
|
||||
server.add_insecure_port('[::]:' + args.port)
|
||||
greeter_grpc_fb.add_GreeterServicer_to_server(GreeterServicer(), server)
|
||||
server.add_insecure_port("[::]:" + args.port)
|
||||
server.start()
|
||||
server.wait_for_termination()
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
if __name__ == "__main__":
|
||||
serve()
|
||||
@@ -37,7 +37,8 @@ func greet(name: String, client greeter: models_GreeterServiceClient) {
|
||||
builder.finish(offset: root)
|
||||
|
||||
// Make the RPC call to the server.
|
||||
let sayHello = greeter
|
||||
let sayHello =
|
||||
greeter
|
||||
.SayHello(Message<models_HelloRequest>(builder: &builder))
|
||||
|
||||
// wait() on the response to stop the program from exiting before the response is received.
|
||||
@@ -76,7 +77,7 @@ func main(args: [String]) {
|
||||
print("Usage: PORT [NAME]")
|
||||
exit(1)
|
||||
|
||||
case let (.some(port), name):
|
||||
case (.some(let port), let name):
|
||||
// Setup an `EventLoopGroup` for the connection to run on.
|
||||
//
|
||||
// See: https://github.com/apple/swift-nio#eventloops-and-eventloopgroups
|
||||
|
||||
@@ -32,7 +32,8 @@ class Greeter: models_GreeterProvider {
|
||||
|
||||
func SayHello(
|
||||
request: Message<models_HelloRequest>,
|
||||
context: StatusOnlyCallContext)
|
||||
context: StatusOnlyCallContext
|
||||
)
|
||||
-> EventLoopFuture<Message<models_HelloReply>>
|
||||
{
|
||||
let recipient = request.object.name ?? "Stranger"
|
||||
@@ -47,12 +48,14 @@ class Greeter: models_GreeterProvider {
|
||||
|
||||
func SayManyHellos(
|
||||
request: Message<models_HelloRequest>,
|
||||
context: StreamingResponseCallContext<Message<models_HelloReply>>)
|
||||
context: StreamingResponseCallContext<Message<models_HelloReply>>
|
||||
)
|
||||
-> EventLoopFuture<GRPCStatus>
|
||||
{
|
||||
for name in greetings {
|
||||
var builder = FlatBufferBuilder()
|
||||
let off = builder
|
||||
let off =
|
||||
builder
|
||||
.create(string: "\(name) \(request.object.name ?? "Unknown")")
|
||||
let root = models_HelloReply.createHelloReply(
|
||||
&builder,
|
||||
|
||||
@@ -1,16 +1,21 @@
|
||||
import * as grpc from '@grpc/grpc-js';
|
||||
import * as flatbuffers from 'flatbuffers';
|
||||
import {GreeterClient} from './greeter_grpc';
|
||||
import {HelloReply} from './models/hello-reply';
|
||||
import {HelloRequest} from './models/hello-request';
|
||||
import { GreeterClient } from './greeter_grpc';
|
||||
|
||||
async function main(PORT: Number, name: string) {
|
||||
const client = new GreeterClient(`localhost:${PORT}`, grpc.credentials.createInsecure());
|
||||
const client = new GreeterClient(
|
||||
`localhost:${PORT}`,
|
||||
grpc.credentials.createInsecure(),
|
||||
);
|
||||
const builder = new flatbuffers.Builder();
|
||||
const offset = builder.createString(name);
|
||||
const root = HelloRequest.createHelloRequest(builder, offset);
|
||||
builder.finish(root);
|
||||
const buffer = HelloRequest.getRootAsHelloRequest(new flatbuffers.ByteBuffer(builder.asUint8Array()));
|
||||
const buffer = HelloRequest.getRootAsHelloRequest(
|
||||
new flatbuffers.ByteBuffer(builder.asUint8Array()),
|
||||
);
|
||||
|
||||
client.SayHello(buffer, (err, response) => {
|
||||
console.log(response.message());
|
||||
@@ -23,12 +28,12 @@ async function main(PORT: Number, name: string) {
|
||||
});
|
||||
}
|
||||
|
||||
const args = process.argv.slice(2)
|
||||
const args = process.argv.slice(2);
|
||||
const PORT = Number(args[0]);
|
||||
const name: string = args[1] ?? "flatbuffers";
|
||||
const name: string = args[1] ?? 'flatbuffers';
|
||||
|
||||
if (PORT) {
|
||||
main(PORT, name);
|
||||
} else {
|
||||
throw new Error("Requires a valid port number.")
|
||||
throw new Error('Requires a valid port number.');
|
||||
}
|
||||
@@ -1,31 +1,45 @@
|
||||
import * as grpc from '@grpc/grpc-js';
|
||||
import * as flatbuffers from 'flatbuffers';
|
||||
import {GreeterService, IGreeterServer} from './greeter_grpc';
|
||||
import {HelloReply} from './models/hello-reply';
|
||||
import {HelloRequest} from './models/hello-request';
|
||||
import { IGreeterServer, GreeterService } from './greeter_grpc';
|
||||
|
||||
const greeter: IGreeterServer = {
|
||||
SayHello(call: grpc.ServerUnaryCall<HelloRequest, HelloReply>, callback: grpc.sendUnaryData<HelloReply>): void {
|
||||
SayHello(
|
||||
call: grpc.ServerUnaryCall<HelloRequest, HelloReply>,
|
||||
callback: grpc.sendUnaryData<HelloReply>,
|
||||
): void {
|
||||
console.log(`SayHello ${call.request.name()}`);
|
||||
const builder = new flatbuffers.Builder();
|
||||
const offset = builder.createString(`welcome ${call.request.name()}`);
|
||||
const root = HelloReply.createHelloReply(builder, offset);
|
||||
builder.finish(root);
|
||||
callback(null, HelloReply.getRootAsHelloReply(new flatbuffers.ByteBuffer(builder.asUint8Array())));
|
||||
callback(
|
||||
null,
|
||||
HelloReply.getRootAsHelloReply(
|
||||
new flatbuffers.ByteBuffer(builder.asUint8Array()),
|
||||
),
|
||||
);
|
||||
},
|
||||
async SayManyHellos(call: grpc.ServerWritableStream<HelloRequest, HelloReply>): Promise<void> {
|
||||
async SayManyHellos(
|
||||
call: grpc.ServerWritableStream<HelloRequest, HelloReply>,
|
||||
): Promise<void> {
|
||||
const name = call.request.name();
|
||||
console.log(`${call.request.name()} saying hi in different langagues`);
|
||||
['Hi', 'Hallo', 'Ciao'].forEach(element => {
|
||||
['Hi', 'Hallo', 'Ciao'].forEach((element) => {
|
||||
const builder = new flatbuffers.Builder();
|
||||
const offset = builder.createString(`${element} ${name}`);
|
||||
const root = HelloReply.createHelloReply(builder, offset);
|
||||
builder.finish(root);
|
||||
call.write(HelloReply.getRootAsHelloReply(new flatbuffers.ByteBuffer(builder.asUint8Array())))
|
||||
call.write(
|
||||
HelloReply.getRootAsHelloReply(
|
||||
new flatbuffers.ByteBuffer(builder.asUint8Array()),
|
||||
),
|
||||
);
|
||||
});
|
||||
call.end();
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
function serve(): void {
|
||||
const PORT = 3000;
|
||||
@@ -42,7 +56,7 @@ function serve(): void {
|
||||
console.log(`Server bound on port: ${port}`);
|
||||
server.start();
|
||||
}
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,16 +19,15 @@ import com.google.flatbuffers.Table;
|
||||
import io.grpc.Drainable;
|
||||
import io.grpc.KnownLength;
|
||||
import io.grpc.MethodDescriptor;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.nio.ByteBuffer;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class FlatbuffersUtils {
|
||||
abstract public static class FBExtactor <T extends Table> {
|
||||
public abstract static class FBExtactor<T extends Table> {
|
||||
T extract(InputStream stream) throws IOException {
|
||||
if (stream instanceof KnownLength) {
|
||||
int size = stream.available();
|
||||
@@ -36,11 +35,13 @@ public class FlatbuffersUtils {
|
||||
stream.read(buffer.array());
|
||||
return extract(buffer);
|
||||
} else
|
||||
throw new RuntimeException("The class " + stream.getClass().getCanonicalName() + " does not extend from KnownLength ");
|
||||
throw new RuntimeException(
|
||||
"The class "
|
||||
+ stream.getClass().getCanonicalName()
|
||||
+ " does not extend from KnownLength ");
|
||||
}
|
||||
|
||||
public abstract T extract(ByteBuffer buffer);
|
||||
|
||||
}
|
||||
|
||||
static class FBInputStream extends InputStream implements Drainable, KnownLength {
|
||||
@@ -81,18 +82,17 @@ public class FlatbuffersUtils {
|
||||
makeStreamIfNotAlready();
|
||||
return inputStream.read(b, off, len);
|
||||
}
|
||||
} else
|
||||
return inputStream.read(b, off, len);
|
||||
} else return inputStream.read(b, off, len);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int available() throws IOException {
|
||||
return inputStream == null ? size : inputStream.available();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static <T extends Table> MethodDescriptor.Marshaller<T> marshaller(final Class<T> clazz, final FBExtactor<T> extractor) {
|
||||
public static <T extends Table> MethodDescriptor.Marshaller<T> marshaller(
|
||||
final Class<T> clazz, final FBExtactor<T> extractor) {
|
||||
return new MethodDescriptor.ReflectableMarshaller<T>() {
|
||||
@Override
|
||||
public Class<T> getMessageClass() {
|
||||
|
||||
@@ -8,7 +8,8 @@
|
||||
namespace grpc_cpp_generator {
|
||||
namespace {
|
||||
|
||||
template<class T> static grpc::string as_string(T x) {
|
||||
template <class T>
|
||||
static grpc::string as_string(T x) {
|
||||
std::ostringstream out;
|
||||
out << x;
|
||||
return out.str();
|
||||
@@ -38,7 +39,8 @@ static grpc::string FilenameIdentifier(const grpc::string &filename) {
|
||||
return result;
|
||||
}
|
||||
|
||||
template<class T, size_t N> static T *array_end(T (&array)[N]) {
|
||||
template <class T, size_t N>
|
||||
static T* array_end(T (&array)[N]) {
|
||||
return array + N;
|
||||
}
|
||||
|
||||
@@ -53,7 +55,9 @@ static void PrintIncludes(grpc_generator::Printer *printer,
|
||||
auto& s = params.grpc_search_path;
|
||||
if (!s.empty()) {
|
||||
vars["l"] += s;
|
||||
if (s[s.size() - 1] != '/') { vars["l"] += '/'; }
|
||||
if (s[s.size() - 1] != '/') {
|
||||
vars["l"] += '/';
|
||||
}
|
||||
}
|
||||
|
||||
for (auto i = headers.begin(); i != headers.end(); i++) {
|
||||
@@ -65,8 +69,7 @@ static void PrintIncludes(grpc_generator::Printer *printer,
|
||||
static const char* cb_headers[] = {
|
||||
"grpcpp/impl/codegen/callback_common.h",
|
||||
"grpcpp/impl/codegen/server_callback_handlers.h",
|
||||
"grpcpp/support/client_callback.h"
|
||||
};
|
||||
"grpcpp/support/client_callback.h"};
|
||||
for (auto& h : cb_headers) {
|
||||
vars["h"] = h;
|
||||
printer->Print(vars, "#include $l$$h$$r$\n");
|
||||
@@ -125,8 +128,7 @@ grpc::string GetHeaderIncludes(grpc_generator::File *file,
|
||||
"grpcpp/impl/codegen/service_type.h",
|
||||
"grpcpp/impl/codegen/status.h",
|
||||
"grpcpp/impl/codegen/stub_options.h",
|
||||
"grpcpp/impl/codegen/sync_stream.h"
|
||||
};
|
||||
"grpcpp/impl/codegen/sync_stream.h"};
|
||||
std::vector<grpc::string> headers(headers_strs, array_end(headers_strs));
|
||||
PrintIncludes(printer.get(), headers, params);
|
||||
printer->Print(vars, "\n");
|
||||
@@ -436,7 +438,8 @@ static void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
||||
printer->Print(*vars, "// Client streaming callback reactor entry.\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"void async_$Method$(::grpc::ClientContext* context, $Response$* response, ::grpc::ClientWriteReactor< $Request$ >* reactor);\n");
|
||||
"void async_$Method$(::grpc::ClientContext* context, $Response$* "
|
||||
"response, ::grpc::ClientWriteReactor< $Request$ >* reactor);\n");
|
||||
}
|
||||
for (size_t i = 0; i < sizeof(async_prefixes) / sizeof(async_prefixes[0]);
|
||||
i++) {
|
||||
@@ -474,7 +477,9 @@ static void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
||||
if ((*vars)["generate_callback_api"] == "1") {
|
||||
printer->Print(*vars, "// Server streaming callback reactor entry.\n");
|
||||
printer->Print(*vars,
|
||||
"void async_$Method$(::grpc::ClientContext* context, const $Request$& request, ::grpc::ClientReadReactor< $Response$ >* reactor);\n");
|
||||
"void async_$Method$(::grpc::ClientContext* context, "
|
||||
"const $Request$& request, ::grpc::ClientReadReactor< "
|
||||
"$Response$ >* reactor);\n");
|
||||
}
|
||||
for (size_t i = 0; i < sizeof(async_prefixes) / sizeof(async_prefixes[0]);
|
||||
i++) {
|
||||
@@ -509,10 +514,12 @@ static void PrintHeaderClientMethod(grpc_generator::Printer *printer,
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
if ((*vars)["generate_callback_api"] == "1") {
|
||||
printer->Print(*vars, "// Bidirectional streaming callback reactor entry.\n");
|
||||
printer->Print(*vars,
|
||||
"// Bidirectional streaming callback reactor entry.\n");
|
||||
printer->Print(
|
||||
*vars,
|
||||
"void async_$Method$(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< $Request$, $Response$ >* reactor);\n");
|
||||
"void async_$Method$(::grpc::ClientContext* context, "
|
||||
"::grpc::ClientBidiReactor< $Request$, $Response$ >* reactor);\n");
|
||||
}
|
||||
for (size_t i = 0; i < sizeof(async_prefixes) / sizeof(async_prefixes[0]);
|
||||
i++) {
|
||||
@@ -1036,7 +1043,9 @@ static void PrintHeaderService(grpc_generator::Printer *printer,
|
||||
printer->Print(*vars, "WithAsyncMethod_$method_name$<");
|
||||
}
|
||||
printer->Print("Service");
|
||||
for (int i = 0; i < service->method_count(); ++i) { printer->Print(" >"); }
|
||||
for (int i = 0; i < service->method_count(); ++i) {
|
||||
printer->Print(" >");
|
||||
}
|
||||
printer->Print(" AsyncService;\n");
|
||||
|
||||
// Server side - Generic
|
||||
@@ -1061,7 +1070,9 @@ static void PrintHeaderService(grpc_generator::Printer *printer,
|
||||
}
|
||||
printer->Print("Service");
|
||||
for (int i = 0; i < service->method_count(); ++i) {
|
||||
if (service->method(i)->NoStreaming()) { printer->Print(" >"); }
|
||||
if (service->method(i)->NoStreaming()) {
|
||||
printer->Print(" >");
|
||||
}
|
||||
}
|
||||
printer->Print(" StreamedUnaryService;\n");
|
||||
|
||||
@@ -1083,7 +1094,9 @@ static void PrintHeaderService(grpc_generator::Printer *printer,
|
||||
printer->Print("Service");
|
||||
for (int i = 0; i < service->method_count(); ++i) {
|
||||
auto method = service->method(i);
|
||||
if (ServerOnlyStreaming(method.get())) { printer->Print(" >"); }
|
||||
if (ServerOnlyStreaming(method.get())) {
|
||||
printer->Print(" >");
|
||||
}
|
||||
}
|
||||
printer->Print(" SplitStreamedService;\n");
|
||||
|
||||
@@ -1168,7 +1181,9 @@ grpc::string GetHeaderServices(grpc_generator::File *file,
|
||||
// Package string is empty or ends with a dot. It is used to fully qualify
|
||||
// method names.
|
||||
vars["Package"] = file->package();
|
||||
if (!file->package().empty()) { vars["Package"].append("."); }
|
||||
if (!file->package().empty()) {
|
||||
vars["Package"].append(".");
|
||||
}
|
||||
|
||||
if (!params.services_namespace.empty()) {
|
||||
vars["services_namespace"] = params.services_namespace;
|
||||
@@ -1263,8 +1278,7 @@ grpc::string GetSourceIncludes(grpc_generator::File *file,
|
||||
"grpcpp/impl/codegen/method_handler.h",
|
||||
"grpcpp/impl/codegen/rpc_service_method.h",
|
||||
"grpcpp/impl/codegen/service_type.h",
|
||||
"grpcpp/impl/codegen/sync_stream.h"
|
||||
};
|
||||
"grpcpp/impl/codegen/sync_stream.h"};
|
||||
std::vector<grpc::string> headers(headers_strs, array_end(headers_strs));
|
||||
PrintIncludes(printer.get(), headers, params);
|
||||
|
||||
@@ -1325,7 +1339,8 @@ static void PrintSourceClientMethod(
|
||||
*vars,
|
||||
" "
|
||||
"::grpc::internal::ClientCallbackUnaryFactory::Create(channel_.get(),"
|
||||
" rpcmethod_$Method$_, context, &request, response, reactor);\n}\n\n");
|
||||
" rpcmethod_$Method$_, context, &request, response, "
|
||||
"reactor);\n}\n\n");
|
||||
}
|
||||
for (size_t i = 0; i < sizeof(async_prefixes) / sizeof(async_prefixes[0]);
|
||||
i++) {
|
||||
@@ -1409,7 +1424,8 @@ static void PrintSourceClientMethod(
|
||||
"void $ns$$Service$::Stub::async_$Method$(::grpc::ClientContext* "
|
||||
"context, const $Request$& request, ::grpc::ClientReadReactor< "
|
||||
"$Response$ >* reactor) {\n");
|
||||
printer->Print(*vars,
|
||||
printer->Print(
|
||||
*vars,
|
||||
" ::grpc::internal::ClientCallbackReaderFactory< "
|
||||
"$Response$ >::Create(channel_.get(), "
|
||||
"rpcmethod_$Method$_, context, &request, reactor);\n}\n\n");
|
||||
@@ -1666,28 +1682,34 @@ static void PrintSourceService(grpc_generator::Printer *printer,
|
||||
"AddMethod(new ::grpc::internal::RpcServiceMethod(\n"
|
||||
" $prefix$$Service$_method_names[$Idx$],\n"
|
||||
" ::grpc::internal::RpcMethod::NORMAL_RPC,\n"
|
||||
" new ::grpc::internal::CallbackUnaryHandler<$Request$, $Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx, const $Request$* req, $Response$* resp) {\n"
|
||||
" new ::grpc::internal::CallbackUnaryHandler<$Request$, "
|
||||
"$Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx, const $Request$* "
|
||||
"req, $Response$* resp) {\n"
|
||||
" return this->$Method$(ctx, req, resp);\n"
|
||||
" })));\n");
|
||||
} else if (ClientOnlyStreaming(method.get())) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
printer->Print(*vars,
|
||||
"AddMethod(new ::grpc::internal::RpcServiceMethod(\n"
|
||||
" $prefix$$Service$_method_names[$Idx$],\n"
|
||||
" ::grpc::internal::RpcMethod::CLIENT_STREAMING,\n"
|
||||
" new ::grpc::internal::CallbackClientStreamingHandler<$Request$, $Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx, $Response$* resp) {\n"
|
||||
" new "
|
||||
"::grpc::internal::CallbackClientStreamingHandler<$"
|
||||
"Request$, $Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx, "
|
||||
"$Response$* resp) {\n"
|
||||
" return this->$Method$(ctx, resp);\n"
|
||||
" })));\n");
|
||||
} else if (ServerOnlyStreaming(method.get())) {
|
||||
printer->Print(
|
||||
*vars,
|
||||
printer->Print(*vars,
|
||||
"AddMethod(new ::grpc::internal::RpcServiceMethod(\n"
|
||||
" $prefix$$Service$_method_names[$Idx$],\n"
|
||||
" ::grpc::internal::RpcMethod::SERVER_STREAMING,\n"
|
||||
" new ::grpc::internal::CallbackServerStreamingHandler<$Request$, $Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx, const $Request$* req) {\n"
|
||||
" new "
|
||||
"::grpc::internal::CallbackServerStreamingHandler<$"
|
||||
"Request$, $Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx, const "
|
||||
"$Request$* req) {\n"
|
||||
" return this->$Method$(ctx, req);\n"
|
||||
" })));\n");
|
||||
} else if (method->BidiStreaming()) {
|
||||
@@ -1696,7 +1718,8 @@ static void PrintSourceService(grpc_generator::Printer *printer,
|
||||
"AddMethod(new ::grpc::internal::RpcServiceMethod(\n"
|
||||
" $prefix$$Service$_method_names[$Idx$],\n"
|
||||
" ::grpc::internal::RpcMethod::BIDI_STREAMING,\n"
|
||||
" new ::grpc::internal::CallbackBidiHandler<$Request$, $Response$>(\n"
|
||||
" new ::grpc::internal::CallbackBidiHandler<$Request$, "
|
||||
"$Response$>(\n"
|
||||
" [this](::grpc::CallbackServerContext* ctx) {\n"
|
||||
" return this->$Method$(ctx);\n"
|
||||
" })));\n");
|
||||
@@ -1761,7 +1784,9 @@ grpc::string GetSourceServices(grpc_generator::File *file,
|
||||
// Package string is empty or ends with a dot. It is used to fully qualify
|
||||
// method names.
|
||||
vars["Package"] = file->package();
|
||||
if (!file->package().empty()) { vars["Package"].append("."); }
|
||||
if (!file->package().empty()) {
|
||||
vars["Package"].append(".");
|
||||
}
|
||||
if (!params.services_namespace.empty()) {
|
||||
vars["ns"] = params.services_namespace + "::";
|
||||
vars["prefix"] = params.services_namespace;
|
||||
@@ -1867,8 +1892,7 @@ static void PrintMockClientMethods(grpc_generator::Printer *printer,
|
||||
grpc::string prefix;
|
||||
grpc::string method_params; // extra arguments to method
|
||||
int extra_method_param_count;
|
||||
} async_prefixes[] = { { "Async", ", void* tag", 1 },
|
||||
{ "PrepareAsync", "", 0 } };
|
||||
} async_prefixes[] = {{"Async", ", void* tag", 1}, {"PrepareAsync", "", 0}};
|
||||
|
||||
if (method->NoStreaming()) {
|
||||
printer->Print(
|
||||
@@ -1976,7 +2000,9 @@ grpc::string GetMockServices(grpc_generator::File *file,
|
||||
// Package string is empty or ends with a dot. It is used to fully qualify
|
||||
// method names.
|
||||
vars["Package"] = file->package();
|
||||
if (!file->package().empty()) { vars["Package"].append("."); }
|
||||
if (!file->package().empty()) {
|
||||
vars["Package"].append(".");
|
||||
}
|
||||
|
||||
if (!params.services_namespace.empty()) {
|
||||
vars["services_namespace"] = params.services_namespace;
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
|
||||
template<class T> grpc::string as_string(T x) {
|
||||
template <class T>
|
||||
grpc::string as_string(T x) {
|
||||
std::ostringstream out;
|
||||
out << x;
|
||||
return out.str();
|
||||
@@ -67,8 +68,8 @@ static void GenerateImports(grpc_generator::File *file,
|
||||
}
|
||||
|
||||
// Generates Server method signature source
|
||||
static void GenerateServerMethodSignature(const grpc_generator::Method *method,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateServerMethodSignature(
|
||||
const grpc_generator::Method* method, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string> vars) {
|
||||
vars["Method"] = exportName(method->name());
|
||||
vars["Request"] = method->get_input_type_name();
|
||||
@@ -160,8 +161,12 @@ static void GenerateServerMethod(const grpc_generator::Method *method,
|
||||
|
||||
printer->Print(vars, "type $Service$_$Method$Server interface {\n");
|
||||
printer->Indent();
|
||||
if (genSend) { printer->Print(vars, "Send(*$Response$) error\n"); }
|
||||
if (genRecv) { printer->Print(vars, "Recv() (*$Request$, error)\n"); }
|
||||
if (genSend) {
|
||||
printer->Print(vars, "Send(*$Response$) error\n");
|
||||
}
|
||||
if (genRecv) {
|
||||
printer->Print(vars, "Recv() (*$Request$, error)\n");
|
||||
}
|
||||
if (genSendAndClose) {
|
||||
printer->Print(vars, "SendAndClose(*$Response$) error\n");
|
||||
}
|
||||
@@ -205,8 +210,8 @@ static void GenerateServerMethod(const grpc_generator::Method *method,
|
||||
}
|
||||
|
||||
// Generates Client method signature source
|
||||
static void GenerateClientMethodSignature(const grpc_generator::Method *method,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateClientMethodSignature(
|
||||
const grpc_generator::Method* method, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string> vars) {
|
||||
vars["Method"] = exportName(method->name());
|
||||
vars["Request"] =
|
||||
@@ -277,8 +282,12 @@ static void GenerateClientMethod(const grpc_generator::Method *method,
|
||||
// Stream interface
|
||||
printer->Print(vars, "type $Service$_$Method$Client interface {\n");
|
||||
printer->Indent();
|
||||
if (genSend) { printer->Print(vars, "Send(*$Request$) error\n"); }
|
||||
if (genRecv) { printer->Print(vars, "Recv() (*$Response$, error)\n"); }
|
||||
if (genSend) {
|
||||
printer->Print(vars, "Send(*$Request$) error\n");
|
||||
}
|
||||
if (genRecv) {
|
||||
printer->Print(vars, "Recv() (*$Response$, error)\n");
|
||||
}
|
||||
if (genCloseAndRecv) {
|
||||
printer->Print(vars, "CloseAndRecv() (*$Response$, error)\n");
|
||||
}
|
||||
|
||||
@@ -136,8 +136,7 @@ static void GrpcSplitStringToIteratorUsing(const string &full,
|
||||
++p;
|
||||
} else {
|
||||
const char* start = p;
|
||||
while (++p != end && *p != c)
|
||||
;
|
||||
while (++p != end && *p != c);
|
||||
*result++ = string(start, p - start);
|
||||
}
|
||||
}
|
||||
@@ -218,7 +217,9 @@ static string GrpcEscapeJavadoc(const string &input) {
|
||||
// Java interprets Unicode escape sequences anywhere!
|
||||
result.append("\");
|
||||
break;
|
||||
default: result.push_back(c); break;
|
||||
default:
|
||||
result.push_back(c);
|
||||
break;
|
||||
}
|
||||
|
||||
prev = c;
|
||||
@@ -238,7 +239,9 @@ static std::vector<string> GrpcGetDocLines(const string &comments) {
|
||||
string escapedComments = GrpcEscapeJavadoc(comments);
|
||||
|
||||
std::vector<string> lines = GrpcSplit(escapedComments, "\n");
|
||||
while (!lines.empty() && lines.back().empty()) { lines.pop_back(); }
|
||||
while (!lines.empty() && lines.back().empty()) {
|
||||
lines.pop_back();
|
||||
}
|
||||
return lines;
|
||||
}
|
||||
return std::vector<string>();
|
||||
@@ -254,7 +257,9 @@ static void GrpcWriteDocCommentBody(Printer *printer, VARS &vars,
|
||||
const std::vector<string>& lines,
|
||||
bool surroundWithPreTag) {
|
||||
if (!lines.empty()) {
|
||||
if (surroundWithPreTag) { printer->Print(" * <pre>\n"); }
|
||||
if (surroundWithPreTag) {
|
||||
printer->Print(" * <pre>\n");
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < lines.size(); i++) {
|
||||
// Most lines should start with a space. Watch out for lines that start
|
||||
@@ -268,7 +273,9 @@ static void GrpcWriteDocCommentBody(Printer *printer, VARS &vars,
|
||||
}
|
||||
}
|
||||
|
||||
if (surroundWithPreTag) { printer->Print(" * </pre>\n"); }
|
||||
if (surroundWithPreTag) {
|
||||
printer->Print(" * </pre>\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -493,7 +500,9 @@ static void PrintStub(Printer *p, VARS &vars, const ServiceDescriptor *service,
|
||||
vars["client_name"] = client_name;
|
||||
|
||||
// Class head
|
||||
if (!interface) { GrpcWriteServiceDocComment(p, vars, service); }
|
||||
if (!interface) {
|
||||
GrpcWriteServiceDocComment(p, vars, service);
|
||||
}
|
||||
if (impl_base) {
|
||||
p->Print(vars,
|
||||
"public static abstract class $abstract_name$ implements "
|
||||
@@ -555,7 +564,9 @@ static void PrintStub(Printer *p, VARS &vars, const ServiceDescriptor *service,
|
||||
p->Print("\n");
|
||||
// TODO(nmittler): Replace with WriteMethodDocComment once included by the
|
||||
// protobuf distro.
|
||||
if (!interface) { GrpcWriteMethodDocComment(p, vars, &*method); }
|
||||
if (!interface) {
|
||||
GrpcWriteMethodDocComment(p, vars, &*method);
|
||||
}
|
||||
p->Print("public ");
|
||||
switch (call_type) {
|
||||
case BLOCKING_CALL:
|
||||
@@ -620,7 +631,8 @@ static void PrintStub(Printer *p, VARS &vars, const ServiceDescriptor *service,
|
||||
"responseObserver);\n");
|
||||
}
|
||||
break;
|
||||
default: break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
} else if (!interface) {
|
||||
switch (call_type) {
|
||||
@@ -746,7 +758,9 @@ static void PrintMethodHandlerClass(Printer *p, VARS &vars,
|
||||
|
||||
for (int i = 0; i < service->method_count(); ++i) {
|
||||
auto method = service->method(i);
|
||||
if (method->ClientStreaming() || method->BidiStreaming()) { continue; }
|
||||
if (method->ClientStreaming() || method->BidiStreaming()) {
|
||||
continue;
|
||||
}
|
||||
vars["method_id_name"] = MethodIdFieldName(&*method);
|
||||
vars["lower_method_name"] = LowerMethodName(&*method);
|
||||
vars["input_type"] = JavaClassName(vars, method->get_input_type_name());
|
||||
@@ -778,7 +792,9 @@ static void PrintMethodHandlerClass(Printer *p, VARS &vars,
|
||||
|
||||
for (int i = 0; i < service->method_count(); ++i) {
|
||||
auto method = service->method(i);
|
||||
if (!(method->ClientStreaming() || method->BidiStreaming())) { continue; }
|
||||
if (!(method->ClientStreaming() || method->BidiStreaming())) {
|
||||
continue;
|
||||
}
|
||||
vars["method_id_name"] = MethodIdFieldName(&*method);
|
||||
vars["lower_method_name"] = LowerMethodName(&*method);
|
||||
vars["input_type"] = JavaClassName(vars, method->get_input_type_name());
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#define NET_GRPC_COMPILER_JAVA_GENERATOR_H_
|
||||
|
||||
#include <stdlib.h> // for abort()
|
||||
|
||||
#include <iostream>
|
||||
#include <map>
|
||||
#include <string>
|
||||
@@ -39,8 +40,8 @@ class LogHelper {
|
||||
LogHelper(std::ostream* os) : os_(os) {}
|
||||
#if defined(_MSC_VER)
|
||||
#pragma warning(push)
|
||||
#pragma warning( \
|
||||
disable : 4722) // the flow of control terminates in a destructor
|
||||
#pragma warning(disable \
|
||||
: 4722) // the flow of control terminates in a destructor
|
||||
// (needed to compile ~LogHelper where destructor emits abort intentionally -
|
||||
// inherited from grpc/java code generator).
|
||||
#endif
|
||||
|
||||
@@ -118,7 +118,8 @@ class BaseGenerator {
|
||||
return module;
|
||||
}
|
||||
|
||||
template<typename T> std::string ModuleFor(const T *def) const {
|
||||
template <typename T>
|
||||
std::string ModuleFor(const T* def) const {
|
||||
if (parser_.opts.one_file) return ModuleForFile(def->file);
|
||||
return namer_.NamespacedType(*def);
|
||||
}
|
||||
|
||||
@@ -20,12 +20,13 @@
|
||||
* please open an issue in the flatbuffers repository. This file should always
|
||||
* be maintained according to the Swift-grpc repository
|
||||
*/
|
||||
#include "src/compiler/swift_generator.h"
|
||||
|
||||
#include <map>
|
||||
#include <sstream>
|
||||
|
||||
#include "flatbuffers/util.h"
|
||||
#include "src/compiler/schema_interface.h"
|
||||
#include "src/compiler/swift_generator.h"
|
||||
|
||||
namespace grpc_swift_generator {
|
||||
namespace {
|
||||
@@ -45,8 +46,8 @@ static grpc::string GenerateMessage(const std::vector<std::string> &components,
|
||||
|
||||
// MARK: - Client
|
||||
|
||||
static void GenerateClientFuncName(const grpc_generator::Method *method,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateClientFuncName(
|
||||
const grpc_generator::Method* method, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string>* dictonary) {
|
||||
auto vars = *dictonary;
|
||||
if (method->NoStreaming()) {
|
||||
@@ -83,8 +84,8 @@ static void GenerateClientFuncName(const grpc_generator::Method *method,
|
||||
" ) -> BidirectionalStreamingCall<$Input$, $Output$>");
|
||||
}
|
||||
|
||||
static void GenerateClientFuncBody(const grpc_generator::Method *method,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateClientFuncBody(
|
||||
const grpc_generator::Method* method, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string>* dictonary) {
|
||||
auto vars = *dictonary;
|
||||
vars["Interceptor"] =
|
||||
@@ -380,7 +381,9 @@ grpc::string Generate(grpc_generator::File *file,
|
||||
grpc::string output;
|
||||
std::map<grpc::string, grpc::string> vars;
|
||||
vars["PATH"] = file->package();
|
||||
if (!file->package().empty()) { vars["PATH"].append("."); }
|
||||
if (!file->package().empty()) {
|
||||
vars["PATH"].append(".");
|
||||
}
|
||||
vars["ServiceQualifiedName"] =
|
||||
WrapInNameSpace(service->namespace_parts(), service->name());
|
||||
vars["ServiceName"] = service->name();
|
||||
|
||||
@@ -117,7 +117,8 @@ static void GetStreamType(grpc_generator::Printer *printer,
|
||||
printer->Print(vars, "responseStream: $ServerStreaming$,\n");
|
||||
}
|
||||
|
||||
static void GenerateSerializeMethod(grpc_generator::Printer *printer,
|
||||
static void GenerateSerializeMethod(
|
||||
grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string>* dictonary) {
|
||||
auto vars = *dictonary;
|
||||
printer->Print(vars, "function serialize_$Type$(buffer_args) {\n");
|
||||
@@ -223,7 +224,9 @@ grpc::string Generate(grpc_generator::File *file,
|
||||
|
||||
vars["PATH"] = file->package();
|
||||
|
||||
if (!file->package().empty()) { vars["PATH"].append("."); }
|
||||
if (!file->package().empty()) {
|
||||
vars["PATH"].append(".");
|
||||
}
|
||||
|
||||
vars["ServiceName"] = service->name();
|
||||
vars["FBSFile"] = service->name() + "_fbs";
|
||||
@@ -258,8 +261,8 @@ static void FillInterface(grpc_generator::Printer *printer,
|
||||
printer->Print("}\n");
|
||||
}
|
||||
|
||||
static void GenerateInterfaces(const grpc_generator::Service *service,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateInterfaces(
|
||||
const grpc_generator::Service* service, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string>* dictonary) {
|
||||
auto vars = *dictonary;
|
||||
for (auto it = 0; it < service->method_count(); it++) {
|
||||
@@ -324,8 +327,8 @@ static void GenerateExportedInterface(
|
||||
printer->Print("}\n");
|
||||
}
|
||||
|
||||
static void GenerateMainInterface(const grpc_generator::Service *service,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateMainInterface(
|
||||
const grpc_generator::Service* service, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string>* dictonary) {
|
||||
auto vars = *dictonary;
|
||||
printer->Print(
|
||||
@@ -351,7 +354,9 @@ static void GenerateMainInterface(const grpc_generator::Service *service,
|
||||
|
||||
static grpc::string GenerateMetaData() { return "metadata: grpc.Metadata"; }
|
||||
|
||||
static grpc::string GenerateOptions() { return "options: Partial<grpc.CallOptions>"; }
|
||||
static grpc::string GenerateOptions() {
|
||||
return "options: Partial<grpc.CallOptions>";
|
||||
}
|
||||
|
||||
static void GenerateUnaryClientInterface(
|
||||
grpc_generator::Printer* printer,
|
||||
@@ -413,8 +418,8 @@ static void GenerateDepluxStreamInterface(
|
||||
.c_str());
|
||||
}
|
||||
|
||||
static void GenerateClientInterface(const grpc_generator::Service *service,
|
||||
grpc_generator::Printer *printer,
|
||||
static void GenerateClientInterface(
|
||||
const grpc_generator::Service* service, grpc_generator::Printer* printer,
|
||||
std::map<grpc::string, grpc::string>* dictonary) {
|
||||
auto vars = *dictonary;
|
||||
printer->Print(vars, "export interface I$ServiceName$Client {\n");
|
||||
@@ -494,7 +499,6 @@ static void GenerateClientClassInterface(
|
||||
}
|
||||
} // namespace
|
||||
|
||||
|
||||
grpc::string GenerateInterface(grpc_generator::File* file,
|
||||
const grpc_generator::Service* service,
|
||||
const grpc::string& filename) {
|
||||
@@ -505,7 +509,9 @@ grpc::string GenerateInterface(grpc_generator::File *file,
|
||||
|
||||
vars["PATH"] = file->package();
|
||||
|
||||
if (!file->package().empty()) { vars["PATH"].append("."); }
|
||||
if (!file->package().empty()) {
|
||||
vars["PATH"].append(".");
|
||||
}
|
||||
|
||||
vars["ServiceName"] = service->name();
|
||||
vars["FBSFile"] = service->name() + "_fbs";
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
import java.nio.ByteBuffer;
|
||||
import MyGame.Example.Monster;
|
||||
import MyGame.Example.Stat;
|
||||
import com.google.flatbuffers.FlatBufferBuilder;
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
class GameFactory {
|
||||
public static Monster createMonster(String monsterName, short nestedMonsterHp, short nestedMonsterMana) {
|
||||
public static Monster createMonster(
|
||||
String monsterName, short nestedMonsterHp, short nestedMonsterMana) {
|
||||
FlatBufferBuilder builder = new FlatBufferBuilder();
|
||||
|
||||
int name_offset = builder.createString(monsterName);
|
||||
@@ -38,5 +39,4 @@ class GameFactory {
|
||||
Stat stat = Stat.getRootAsStat(builder.dataBuffer());
|
||||
return stat;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -17,27 +17,20 @@
|
||||
import MyGame.Example.Monster;
|
||||
import MyGame.Example.MonsterStorageGrpc;
|
||||
import MyGame.Example.Stat;
|
||||
import com.google.flatbuffers.FlatBufferBuilder;
|
||||
import io.grpc.ManagedChannel;
|
||||
import io.grpc.ManagedChannelBuilder;
|
||||
import io.grpc.Server;
|
||||
import io.grpc.ServerBuilder;
|
||||
import io.grpc.stub.StreamObserver;
|
||||
import java.io.IOException;
|
||||
import java.util.Iterator;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import org.junit.Assert;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.InterruptedException;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.Iterator;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.CountDownLatch;
|
||||
|
||||
|
||||
/**
|
||||
* Demonstrates basic client-server interaction using grpc-java over netty.
|
||||
*/
|
||||
/** Demonstrates basic client-server interaction using grpc-java over netty. */
|
||||
public class JavaGrpcTest {
|
||||
static final String BIG_MONSTER_NAME = "Cyberdemon";
|
||||
static final short nestedMonsterHp = 600;
|
||||
@@ -82,7 +75,8 @@ public class JavaGrpcTest {
|
||||
return computeMinMax(responseObserver, true);
|
||||
}
|
||||
|
||||
private StreamObserver<Monster> computeMinMax(final StreamObserver<Stat> responseObserver, final boolean includeMin) {
|
||||
private StreamObserver<Monster> computeMinMax(
|
||||
final StreamObserver<Stat> responseObserver, final boolean includeMin) {
|
||||
final AtomicInteger maxHp = new AtomicInteger(Integer.MIN_VALUE);
|
||||
final AtomicReference<String> maxHpMonsterName = new AtomicReference<String>();
|
||||
final AtomicInteger maxHpCount = new AtomicInteger();
|
||||
@@ -98,8 +92,7 @@ public class JavaGrpcTest {
|
||||
maxHp.set(monster.hp());
|
||||
maxHpMonsterName.set(monster.name());
|
||||
maxHpCount.set(1);
|
||||
}
|
||||
else if (monster.hp() == maxHp.get()) {
|
||||
} else if (monster.hp() == maxHp.get()) {
|
||||
// Count how many times we saw a monster of current max hit points.
|
||||
maxHpCount.getAndIncrement();
|
||||
}
|
||||
@@ -109,27 +102,31 @@ public class JavaGrpcTest {
|
||||
minHp.set(monster.hp());
|
||||
minHpMonsterName.set(monster.name());
|
||||
minHpCount.set(1);
|
||||
}
|
||||
else if (monster.hp() == minHp.get()) {
|
||||
} else if (monster.hp() == minHp.get()) {
|
||||
// Count how many times we saw a monster of current min hit points.
|
||||
minHpCount.getAndIncrement();
|
||||
}
|
||||
}
|
||||
|
||||
public void onCompleted() {
|
||||
Stat maxHpStat = GameFactory.createStat(maxHpMonsterName.get(), maxHp.get(), maxHpCount.get());
|
||||
Stat maxHpStat =
|
||||
GameFactory.createStat(maxHpMonsterName.get(), maxHp.get(), maxHpCount.get());
|
||||
// Send max hit points first.
|
||||
responseObserver.onNext(maxHpStat);
|
||||
if (includeMin) {
|
||||
// Send min hit points.
|
||||
Stat minHpStat = GameFactory.createStat(minHpMonsterName.get(), minHp.get(), minHpCount.get());
|
||||
Stat minHpStat =
|
||||
GameFactory.createStat(minHpMonsterName.get(), minHp.get(), minHpCount.get());
|
||||
responseObserver.onNext(minHpStat);
|
||||
}
|
||||
responseObserver.onCompleted();
|
||||
}
|
||||
|
||||
public void onError(Throwable t) {
|
||||
// Not expected
|
||||
Assert.fail();
|
||||
};
|
||||
}
|
||||
;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -138,7 +135,8 @@ public class JavaGrpcTest {
|
||||
public static void startServer() throws IOException {
|
||||
server = ServerBuilder.forPort(0).addService(new MyService()).build().start();
|
||||
int port = server.getPort();
|
||||
channel = ManagedChannelBuilder.forAddress("localhost", port)
|
||||
channel =
|
||||
ManagedChannelBuilder.forAddress("localhost", port)
|
||||
// Channels are secure by default (via SSL/TLS). For the example we disable TLS to avoid
|
||||
// needing certificates.
|
||||
.usePlaintext()
|
||||
@@ -150,7 +148,8 @@ public class JavaGrpcTest {
|
||||
|
||||
@org.junit.Test
|
||||
public void testUnary() throws IOException {
|
||||
Monster monsterRequest = GameFactory.createMonster(BIG_MONSTER_NAME, nestedMonsterHp, nestedMonsterMana);
|
||||
Monster monsterRequest =
|
||||
GameFactory.createMonster(BIG_MONSTER_NAME, nestedMonsterHp, nestedMonsterMana);
|
||||
Stat stat = blockingStub.store(monsterRequest);
|
||||
Assert.assertEquals(stat.id(), "Hello " + BIG_MONSTER_NAME);
|
||||
System.out.println("Received stat response from service: " + stat.id());
|
||||
@@ -158,7 +157,8 @@ public class JavaGrpcTest {
|
||||
|
||||
@org.junit.Test
|
||||
public void testServerStreaming() throws IOException {
|
||||
Monster monsterRequest = GameFactory.createMonster(BIG_MONSTER_NAME, nestedMonsterHp, nestedMonsterMana);
|
||||
Monster monsterRequest =
|
||||
GameFactory.createMonster(BIG_MONSTER_NAME, nestedMonsterHp, nestedMonsterMana);
|
||||
Stat stat = blockingStub.store(monsterRequest);
|
||||
Iterator<Monster> iterator = blockingStub.retrieve(stat);
|
||||
int counter = 0;
|
||||
@@ -176,11 +176,14 @@ public class JavaGrpcTest {
|
||||
final AtomicReference<Stat> maxHitStat = new AtomicReference<Stat>();
|
||||
final CountDownLatch streamAlive = new CountDownLatch(1);
|
||||
|
||||
StreamObserver<Stat> statObserver = new StreamObserver<Stat>() {
|
||||
StreamObserver<Stat> statObserver =
|
||||
new StreamObserver<Stat>() {
|
||||
public void onCompleted() {
|
||||
streamAlive.countDown();
|
||||
}
|
||||
|
||||
public void onError(Throwable ex) {}
|
||||
|
||||
public void onNext(Stat stat) {
|
||||
maxHitStat.set(stat);
|
||||
}
|
||||
@@ -188,7 +191,9 @@ public class JavaGrpcTest {
|
||||
StreamObserver<Monster> monsterStream = asyncStub.getMaxHitPoint(statObserver);
|
||||
short count = 10;
|
||||
for (short i = 0; i < count; ++i) {
|
||||
Monster monster = GameFactory.createMonster(BIG_MONSTER_NAME + i, (short) (nestedMonsterHp * i), nestedMonsterMana);
|
||||
Monster monster =
|
||||
GameFactory.createMonster(
|
||||
BIG_MONSTER_NAME + i, (short) (nestedMonsterHp * i), nestedMonsterMana);
|
||||
monsterStream.onNext(monster);
|
||||
}
|
||||
monsterStream.onCompleted();
|
||||
@@ -205,17 +210,19 @@ public class JavaGrpcTest {
|
||||
final AtomicReference<Stat> minHitStat = new AtomicReference<Stat>();
|
||||
final CountDownLatch streamAlive = new CountDownLatch(1);
|
||||
|
||||
StreamObserver<Stat> statObserver = new StreamObserver<Stat>() {
|
||||
StreamObserver<Stat> statObserver =
|
||||
new StreamObserver<Stat>() {
|
||||
public void onCompleted() {
|
||||
streamAlive.countDown();
|
||||
}
|
||||
|
||||
public void onError(Throwable ex) {}
|
||||
|
||||
public void onNext(Stat stat) {
|
||||
// We expect the server to send the max stat first and then the min stat.
|
||||
if (maxHitStat.get() == null) {
|
||||
maxHitStat.set(stat);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
minHitStat.set(stat);
|
||||
}
|
||||
}
|
||||
@@ -223,12 +230,15 @@ public class JavaGrpcTest {
|
||||
StreamObserver<Monster> monsterStream = asyncStub.getMinMaxHitPoints(statObserver);
|
||||
short count = 10;
|
||||
for (short i = 0; i < count; ++i) {
|
||||
Monster monster = GameFactory.createMonster(BIG_MONSTER_NAME + i, (short) (nestedMonsterHp * i), nestedMonsterMana);
|
||||
Monster monster =
|
||||
GameFactory.createMonster(
|
||||
BIG_MONSTER_NAME + i, (short) (nestedMonsterHp * i), nestedMonsterMana);
|
||||
monsterStream.onNext(monster);
|
||||
}
|
||||
monsterStream.onCompleted();
|
||||
|
||||
// Wait a little bit for the server to send the stats of the monster with the max and min hit-points.
|
||||
// Wait a little bit for the server to send the stats of the monster with the max and min
|
||||
// hit-points.
|
||||
streamAlive.await(timeoutMs, TimeUnit.MILLISECONDS);
|
||||
|
||||
Assert.assertEquals(maxHitStat.get().id(), BIG_MONSTER_NAME + (count - 1));
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
from __future__ import print_function
|
||||
|
||||
from concurrent import futures
|
||||
import os
|
||||
import sys
|
||||
import grpc
|
||||
|
||||
import flatbuffers
|
||||
import grpc
|
||||
|
||||
from concurrent import futures
|
||||
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'tests'))
|
||||
sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "tests"))
|
||||
import MyGame.Example.Monster as Monster
|
||||
import MyGame.Example.Stat as Stat
|
||||
import MyGame.Example.Vec3 as Vec3
|
||||
@@ -103,7 +103,7 @@ def serve():
|
||||
|
||||
server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
|
||||
monster_grpc_fb.add_MonsterStorageServicer_to_server(MonsterStorage(), server)
|
||||
server.add_insecure_port('[::]:50051')
|
||||
server.add_insecure_port("[::]:50051")
|
||||
|
||||
server.start()
|
||||
|
||||
@@ -112,7 +112,7 @@ def serve():
|
||||
|
||||
def run():
|
||||
|
||||
channel = grpc.insecure_channel('127.0.0.1:50051')
|
||||
channel = grpc.insecure_channel("127.0.0.1:50051")
|
||||
stub = monster_grpc_fb.MonsterStorageStub(channel)
|
||||
|
||||
b = flatbuffers.Builder(0)
|
||||
@@ -142,7 +142,9 @@ def run():
|
||||
Monster.MonsterAddHp(b, test_hp)
|
||||
Monster.MonsterAddName(b, name1)
|
||||
Monster.MonsterAddColor(b, test_color)
|
||||
pos = Vec3.CreateVec3(b, test_X, test_Y, test_Z, test_test1, test_color, test_a, test_b)
|
||||
pos = Vec3.CreateVec3(
|
||||
b, test_X, test_Y, test_Z, test_test1, test_color, test_a, test_b
|
||||
)
|
||||
Monster.MonsterAddPos(b, pos)
|
||||
Monster.MonsterAddInventory(b, inv)
|
||||
Monster.MonsterAddTestType(b, test_testtype)
|
||||
@@ -170,5 +172,5 @@ def run():
|
||||
count = count + 1
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == "__main__":
|
||||
serve()
|
||||
|
||||
@@ -104,10 +104,10 @@ class IdlNamer : public Namer {
|
||||
return "VT_" + ConvertCase(EscapeKeyword(field.name), Case::kAllUpper);
|
||||
}
|
||||
std::string LegacyRustUnionTypeOffsetName(const FieldDef& field) const {
|
||||
return "VT_" + ConvertCase(EscapeKeyword(field.name + "_type"), Case::kAllUpper);
|
||||
return "VT_" +
|
||||
ConvertCase(EscapeKeyword(field.name + "_type"), Case::kAllUpper);
|
||||
}
|
||||
|
||||
|
||||
std::string LegacySwiftVariant(const EnumVal& ev) const {
|
||||
auto name = ev.name;
|
||||
if (isupper(name.front())) {
|
||||
@@ -155,7 +155,9 @@ class IdlNamer : public Namer {
|
||||
std::string NamespacedString(const struct Namespace* ns,
|
||||
const std::string& str) const {
|
||||
std::string ret;
|
||||
if (ns != nullptr) { ret += Namespace(ns->components); }
|
||||
if (ns != nullptr) {
|
||||
ret += Namespace(ns->components);
|
||||
}
|
||||
if (!ret.empty()) ret += config_.namespace_seperator;
|
||||
return ret + str;
|
||||
}
|
||||
|
||||
@@ -110,12 +110,12 @@ class Namer {
|
||||
|
||||
virtual ~Namer() {}
|
||||
|
||||
template<typename T> std::string Method(const T &s) const {
|
||||
template <typename T>
|
||||
std::string Method(const T& s) const {
|
||||
return Method(s.name);
|
||||
}
|
||||
|
||||
virtual std::string Method(const std::string &pre,
|
||||
const std::string &mid,
|
||||
virtual std::string Method(const std::string& pre, const std::string& mid,
|
||||
const std::string& suf) const {
|
||||
return Format(pre + "_" + mid + "_" + suf, config_.methods);
|
||||
}
|
||||
|
||||
@@ -18,22 +18,22 @@
|
||||
#define FLATBUFFERS_FLATC_PCH_H_
|
||||
|
||||
// stl
|
||||
#include <cmath>
|
||||
#include <sstream>
|
||||
#include <cassert>
|
||||
#include <unordered_set>
|
||||
#include <unordered_map>
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
#include <functional>
|
||||
#include <set>
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
#include <set>
|
||||
#include <sstream>
|
||||
#include <tuple>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
// flatbuffers
|
||||
#include "flatbuffers/pch/pch.h"
|
||||
#include "flatbuffers/code_generators.h"
|
||||
#include "flatbuffers/flatbuffers.h"
|
||||
#include "flatbuffers/flexbuffers.h"
|
||||
#include "flatbuffers/idl.h"
|
||||
#include "flatbuffers/pch/pch.h"
|
||||
|
||||
#endif // FLATBUFFERS_FLATC_PCH_H_
|
||||
|
||||
@@ -18,19 +18,19 @@
|
||||
#define FLATBUFFERS_PCH_H_
|
||||
|
||||
// stl
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <algorithm>
|
||||
#include <list>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <iomanip>
|
||||
#include <limits>
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <limits>
|
||||
#include <stack>
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
// flatbuffers
|
||||
#include "flatbuffers/util.h"
|
||||
|
||||
@@ -3,12 +3,10 @@ package com.google.flatbuffers;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Implements {@code ReadBuf} using an array of bytes
|
||||
* as a backing storage. Using array of bytes are
|
||||
* Implements {@code ReadBuf} using an array of bytes as a backing storage. Using array of bytes are
|
||||
* usually faster than {@code ByteBuffer}.
|
||||
*
|
||||
* This class is not thread-safe, meaning that
|
||||
* it must operate on a single thread. Operating from
|
||||
* <p>This class is not thread-safe, meaning that it must operate on a single thread. Operating from
|
||||
* multiple thread leads into a undefined behavior
|
||||
*/
|
||||
public class ArrayReadWriteBuf implements ReadWriteBuf {
|
||||
@@ -56,22 +54,22 @@ public class ArrayReadWriteBuf implements ReadWriteBuf {
|
||||
|
||||
@Override
|
||||
public int getInt(int index) {
|
||||
return (((buffer[index + 3]) << 24) |
|
||||
((buffer[index + 2] & 0xff) << 16) |
|
||||
((buffer[index + 1] & 0xff) << 8) |
|
||||
((buffer[index] & 0xff)));
|
||||
return (((buffer[index + 3]) << 24)
|
||||
| ((buffer[index + 2] & 0xff) << 16)
|
||||
| ((buffer[index + 1] & 0xff) << 8)
|
||||
| ((buffer[index] & 0xff)));
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getLong(int index) {
|
||||
return ((((long) buffer[index++] & 0xff)) |
|
||||
(((long) buffer[index++] & 0xff) << 8) |
|
||||
(((long) buffer[index++] & 0xff) << 16) |
|
||||
(((long) buffer[index++] & 0xff) << 24) |
|
||||
(((long) buffer[index++] & 0xff) << 32) |
|
||||
(((long) buffer[index++] & 0xff) << 40) |
|
||||
(((long) buffer[index++] & 0xff) << 48) |
|
||||
(((long) buffer[index]) << 56));
|
||||
return ((((long) buffer[index++] & 0xff))
|
||||
| (((long) buffer[index++] & 0xff) << 8)
|
||||
| (((long) buffer[index++] & 0xff) << 16)
|
||||
| (((long) buffer[index++] & 0xff) << 24)
|
||||
| (((long) buffer[index++] & 0xff) << 32)
|
||||
| (((long) buffer[index++] & 0xff) << 40)
|
||||
| (((long) buffer[index++] & 0xff) << 48)
|
||||
| (((long) buffer[index]) << 56));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -94,7 +92,6 @@ public class ArrayReadWriteBuf implements ReadWriteBuf {
|
||||
return buffer;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void putBoolean(boolean value) {
|
||||
setBoolean(writePos, value);
|
||||
@@ -235,7 +232,8 @@ public class ArrayReadWriteBuf implements ReadWriteBuf {
|
||||
@Override
|
||||
public boolean requestCapacity(int capacity) {
|
||||
if (capacity < 0) {
|
||||
throw new IllegalArgumentException("Capacity may not be negative (likely a previous int overflow)");
|
||||
throw new IllegalArgumentException(
|
||||
"Capacity may not be negative (likely a previous int overflow)");
|
||||
}
|
||||
if (buffer.length >= capacity) {
|
||||
return true;
|
||||
|
||||
@@ -20,16 +20,17 @@ import java.nio.ByteBuffer;
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
|
||||
/**
|
||||
* All vector access objects derive from this class, and add their own accessors.
|
||||
*/
|
||||
/** All vector access objects derive from this class, and add their own accessors. */
|
||||
public class BaseVector {
|
||||
/** Used to hold the vector data position. */
|
||||
private int vector;
|
||||
|
||||
/** Used to hold the vector size. */
|
||||
private int length;
|
||||
|
||||
/** Used to hold the vector element size in table. */
|
||||
private int element_size;
|
||||
|
||||
/** The underlying ByteBuffer to hold the data of the vector. */
|
||||
protected ByteBuffer bb;
|
||||
|
||||
@@ -56,8 +57,8 @@ public class BaseVector {
|
||||
* Re-init the internal state with an external buffer {@code ByteBuffer}, an offset within and
|
||||
* element size.
|
||||
*
|
||||
* This method exists primarily to allow recycling vector instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references.
|
||||
* <p>This method exists primarily to allow recycling vector instances without risking memory
|
||||
* leaks due to {@code ByteBuffer} references.
|
||||
*/
|
||||
protected void __reset(int _vector, int _element_size, ByteBuffer _bb) {
|
||||
bb = _bb;
|
||||
@@ -75,8 +76,8 @@ public class BaseVector {
|
||||
/**
|
||||
* Resets the internal state with a null {@code ByteBuffer} and a zero position.
|
||||
*
|
||||
* This method exists primarily to allow recycling vector instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references. The instance will be unusable until it is assigned
|
||||
* <p>This method exists primarily to allow recycling vector instances without risking memory
|
||||
* leaks due to {@code ByteBuffer} references. The instance will be unusable until it is assigned
|
||||
* again to a {@code ByteBuffer}.
|
||||
*/
|
||||
public void reset() {
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of booleans.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of booleans. */
|
||||
public final class BooleanVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class BooleanVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public BooleanVector __assign(int _vector, ByteBuffer _bb) {
|
||||
__reset(_vector, Constants.SIZEOF_BYTE, _bb); return this;
|
||||
__reset(_vector, Constants.SIZEOF_BYTE, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -166,5 +166,4 @@ public class ByteBufferReadWriteBuf implements ReadWriteBuf {
|
||||
public boolean requestCapacity(int capacity) {
|
||||
return capacity <= buffer.limit();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -24,9 +24,7 @@ import java.nio.ByteBuffer;
|
||||
/// @addtogroup flatbuffers_java_api
|
||||
/// @{
|
||||
|
||||
/**
|
||||
* Class that collects utility functions around `ByteBuffer`.
|
||||
*/
|
||||
/** Class that collects utility functions around `ByteBuffer`. */
|
||||
public class ByteBufferUtil {
|
||||
|
||||
/**
|
||||
@@ -40,19 +38,17 @@ public class ByteBufferUtil {
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a duplicate of a size-prefixed `ByteBuffer` that has its position
|
||||
* advanced just past the size prefix.
|
||||
* Create a duplicate of a size-prefixed `ByteBuffer` that has its position advanced just past the
|
||||
* size prefix.
|
||||
*
|
||||
* @param bb a size-prefixed buffer
|
||||
* @return a new buffer on the same underlying data that has skipped the
|
||||
* size prefix
|
||||
* @return a new buffer on the same underlying data that has skipped the size prefix
|
||||
*/
|
||||
public static ByteBuffer removeSizePrefix(ByteBuffer bb) {
|
||||
ByteBuffer s = bb.duplicate();
|
||||
s.position(s.position() + SIZE_PREFIX_LENGTH);
|
||||
return s;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// @}
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of signed or unsigned 8-bit values.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of signed or unsigned 8-bit values. */
|
||||
public final class ByteVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class ByteVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public ByteVector __assign(int vector, ByteBuffer bb) {
|
||||
__reset(vector, Constants.SIZEOF_BYTE, bb); return this;
|
||||
__reset(vector, Constants.SIZEOF_BYTE, bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -48,8 +46,8 @@ public final class ByteVector extends BaseVector {
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the byte at the given index, zero-extends it to type int, and returns the result,
|
||||
* which is therefore in the range 0 through 255.
|
||||
* Reads the byte at the given index, zero-extends it to type int, and returns the result, which
|
||||
* is therefore in the range 0 through 255.
|
||||
*
|
||||
* @param j The index from which the byte will be read.
|
||||
* @return the unsigned 8-bit at the given index.
|
||||
|
||||
@@ -18,34 +18,39 @@ package com.google.flatbuffers;
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
|
||||
/**
|
||||
* Class that holds shared constants
|
||||
*/
|
||||
/** Class that holds shared constants */
|
||||
public class Constants {
|
||||
// Java doesn't seem to have these.
|
||||
/** The number of bytes in an `byte`. */
|
||||
static final int SIZEOF_BYTE = 1;
|
||||
|
||||
/** The number of bytes in a `short`. */
|
||||
static final int SIZEOF_SHORT = 2;
|
||||
|
||||
/** The number of bytes in an `int`. */
|
||||
static final int SIZEOF_INT = 4;
|
||||
|
||||
/** The number of bytes in an `float`. */
|
||||
static final int SIZEOF_FLOAT = 4;
|
||||
|
||||
/** The number of bytes in an `long`. */
|
||||
static final int SIZEOF_LONG = 8;
|
||||
|
||||
/** The number of bytes in an `double`. */
|
||||
static final int SIZEOF_DOUBLE = 8;
|
||||
|
||||
/** The number of bytes in a file identifier. */
|
||||
static final int FILE_IDENTIFIER_LENGTH = 4;
|
||||
|
||||
/** The number of bytes in a size prefix. */
|
||||
public static final int SIZE_PREFIX_LENGTH = 4;
|
||||
/** A version identifier to force a compile error if someone
|
||||
accidentally tries to build generated code with a runtime of
|
||||
two mismatched version. Versions need to always match, as
|
||||
the runtime and generated code are modified in sync.
|
||||
Changes to the Java implementation need to be sure to change
|
||||
the version here and in the code generator on every possible
|
||||
incompatible change */
|
||||
|
||||
/**
|
||||
* A version identifier to force a compile error if someone accidentally tries to build generated
|
||||
* code with a runtime of two mismatched version. Versions need to always match, as the runtime
|
||||
* and generated code are modified in sync. Changes to the Java implementation need to be sure to
|
||||
* change the version here and in the code generator on every possible incompatible change
|
||||
*/
|
||||
public static void FLATBUFFERS_25_2_10() {}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of double values.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of double values. */
|
||||
public final class DoubleVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class DoubleVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public DoubleVector __assign(int _vector, ByteBuffer _bb) {
|
||||
__reset(_vector, Constants.SIZEOF_DOUBLE, _bb); return this;
|
||||
__reset(_vector, Constants.SIZEOF_DOUBLE, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,15 +24,14 @@ import java.nio.*;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.lang.Integer;
|
||||
|
||||
/// @file
|
||||
/// @addtogroup flatbuffers_java_api
|
||||
/// @{
|
||||
|
||||
/**
|
||||
* Class that helps you build a FlatBuffer. See the section
|
||||
* "Use in Java/C#" in the main FlatBuffers documentation.
|
||||
* Class that helps you build a FlatBuffer. See the section "Use in Java/C#" in the main FlatBuffers
|
||||
* documentation.
|
||||
*/
|
||||
public class FlatBufferBuilder {
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
@@ -51,19 +50,16 @@ public class FlatBufferBuilder {
|
||||
ByteBufferFactory bb_factory; // Factory for allocating the internal buffer
|
||||
final Utf8 utf8; // UTF-8 encoder to use
|
||||
Map<String, Integer> string_pool; // map used to cache shared strings.
|
||||
|
||||
/// @endcond
|
||||
|
||||
|
||||
/**
|
||||
* Maximum size of buffer to allocate. If we're allocating arrays on the heap,
|
||||
* the header size of the array counts towards its maximum size.
|
||||
* Maximum size of buffer to allocate. If we're allocating arrays on the heap, the header size of
|
||||
* the array counts towards its maximum size.
|
||||
*/
|
||||
private static final int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8;
|
||||
|
||||
/**
|
||||
* Default buffer size that is allocated if an initial size is not given, or is
|
||||
* non positive.
|
||||
*/
|
||||
/** Default buffer size that is allocated if an initial size is not given, or is non positive. */
|
||||
private static final int DEFAULT_BUFFER_SIZE = 1024;
|
||||
|
||||
/**
|
||||
@@ -84,8 +80,8 @@ public class FlatBufferBuilder {
|
||||
* @param existing_bb The byte buffer to reuse.
|
||||
* @param utf8 The Utf8 codec
|
||||
*/
|
||||
public FlatBufferBuilder(int initial_size, ByteBufferFactory bb_factory,
|
||||
ByteBuffer existing_bb, Utf8 utf8) {
|
||||
public FlatBufferBuilder(
|
||||
int initial_size, ByteBufferFactory bb_factory, ByteBuffer existing_bb, Utf8 utf8) {
|
||||
if (initial_size <= 0) {
|
||||
initial_size = DEFAULT_BUFFER_SIZE;
|
||||
}
|
||||
@@ -110,30 +106,28 @@ public class FlatBufferBuilder {
|
||||
this(initial_size, HeapByteBufferFactory.INSTANCE, null, Utf8.getDefault());
|
||||
}
|
||||
|
||||
/**
|
||||
* Start with a buffer of 1KiB, then grow as required.
|
||||
*/
|
||||
/** Start with a buffer of 1KiB, then grow as required. */
|
||||
public FlatBufferBuilder() {
|
||||
this(DEFAULT_BUFFER_SIZE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Alternative constructor allowing reuse of {@link ByteBuffer}s. The builder
|
||||
* can still grow the buffer as necessary. User classes should make sure
|
||||
* to call {@link #dataBuffer()} to obtain the resulting encoded message.
|
||||
* Alternative constructor allowing reuse of {@link ByteBuffer}s. The builder can still grow the
|
||||
* buffer as necessary. User classes should make sure to call {@link #dataBuffer()} to obtain the
|
||||
* resulting encoded message.
|
||||
*
|
||||
* @param existing_bb The byte buffer to reuse.
|
||||
* @param bb_factory The factory to be used for allocating a new internal buffer if
|
||||
* the existing buffer needs to grow
|
||||
* @param bb_factory The factory to be used for allocating a new internal buffer if the existing
|
||||
* buffer needs to grow
|
||||
*/
|
||||
public FlatBufferBuilder(ByteBuffer existing_bb, ByteBufferFactory bb_factory) {
|
||||
this(existing_bb.capacity(), bb_factory, existing_bb, Utf8.getDefault());
|
||||
}
|
||||
|
||||
/**
|
||||
* Alternative constructor allowing reuse of {@link ByteBuffer}s. The builder
|
||||
* can still grow the buffer as necessary. User classes should make sure
|
||||
* to call {@link #dataBuffer()} to obtain the resulting encoded message.
|
||||
* Alternative constructor allowing reuse of {@link ByteBuffer}s. The builder can still grow the
|
||||
* buffer as necessary. User classes should make sure to call {@link #dataBuffer()} to obtain the
|
||||
* resulting encoded message.
|
||||
*
|
||||
* @param existing_bb The byte buffer to reuse.
|
||||
*/
|
||||
@@ -142,13 +136,13 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Alternative initializer that allows reusing this object on an existing
|
||||
* `ByteBuffer`. This method resets the builder's internal state, but keeps
|
||||
* objects that have been allocated for temporary storage.
|
||||
* Alternative initializer that allows reusing this object on an existing `ByteBuffer`. This
|
||||
* method resets the builder's internal state, but keeps objects that have been allocated for
|
||||
* temporary storage.
|
||||
*
|
||||
* @param existing_bb The byte buffer to reuse.
|
||||
* @param bb_factory The factory to be used for allocating a new internal buffer if
|
||||
* the existing buffer needs to grow
|
||||
* @param bb_factory The factory to be used for allocating a new internal buffer if the existing
|
||||
* buffer needs to grow
|
||||
* @return Returns `this`.
|
||||
*/
|
||||
public FlatBufferBuilder init(ByteBuffer existing_bb, ByteBufferFactory bb_factory) {
|
||||
@@ -171,19 +165,19 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* An interface that provides a user of the FlatBufferBuilder class the ability to specify
|
||||
* the method in which the internal buffer gets allocated. This allows for alternatives
|
||||
* to the default behavior, which is to allocate memory for a new byte-array
|
||||
* backed `ByteBuffer` array inside the JVM.
|
||||
* An interface that provides a user of the FlatBufferBuilder class the ability to specify the
|
||||
* method in which the internal buffer gets allocated. This allows for alternatives to the default
|
||||
* behavior, which is to allocate memory for a new byte-array backed `ByteBuffer` array inside the
|
||||
* JVM.
|
||||
*
|
||||
* The FlatBufferBuilder class contains the HeapByteBufferFactory class to
|
||||
* preserve the default behavior in the event that the user does not provide
|
||||
* their own implementation of this interface.
|
||||
* <p>The FlatBufferBuilder class contains the HeapByteBufferFactory class to preserve the default
|
||||
* behavior in the event that the user does not provide their own implementation of this
|
||||
* interface.
|
||||
*/
|
||||
public static abstract class ByteBufferFactory {
|
||||
public abstract static class ByteBufferFactory {
|
||||
/**
|
||||
* Create a `ByteBuffer` with a given capacity.
|
||||
* The returned ByteBuf must have a ByteOrder.LITTLE_ENDIAN ByteOrder.
|
||||
* Create a `ByteBuffer` with a given capacity. The returned ByteBuf must have a
|
||||
* ByteOrder.LITTLE_ENDIAN ByteOrder.
|
||||
*
|
||||
* @param capacity The size of the `ByteBuffer` to allocate.
|
||||
* @return Returns the new `ByteBuffer` that was allocated.
|
||||
@@ -191,23 +185,20 @@ public class FlatBufferBuilder {
|
||||
public abstract ByteBuffer newByteBuffer(int capacity);
|
||||
|
||||
/**
|
||||
* Release a ByteBuffer. Current {@link FlatBufferBuilder}
|
||||
* released any reference to it, so it is safe to dispose the buffer
|
||||
* or return it to a pool.
|
||||
* It is not guaranteed that the buffer has been created
|
||||
* with {@link #newByteBuffer(int) }.
|
||||
* Release a ByteBuffer. Current {@link FlatBufferBuilder} released any reference to it, so it
|
||||
* is safe to dispose the buffer or return it to a pool. It is not guaranteed that the buffer
|
||||
* has been created with {@link #newByteBuffer(int) }.
|
||||
*
|
||||
* @param bb the buffer to release
|
||||
*/
|
||||
public void releaseByteBuffer(ByteBuffer bb) {
|
||||
}
|
||||
public void releaseByteBuffer(ByteBuffer bb) {}
|
||||
}
|
||||
|
||||
/**
|
||||
* An implementation of the ByteBufferFactory interface that is used when
|
||||
* one is not provided by the user.
|
||||
* An implementation of the ByteBufferFactory interface that is used when one is not provided by
|
||||
* the user.
|
||||
*
|
||||
* Allocate memory for a new byte-array backed `ByteBuffer` array inside the JVM.
|
||||
* <p>Allocate memory for a new byte-array backed `ByteBuffer` array inside the JVM.
|
||||
*/
|
||||
public static final class HeapByteBufferFactory extends ByteBufferFactory {
|
||||
|
||||
@@ -230,9 +221,7 @@ public class FlatBufferBuilder {
|
||||
return table.__offset(offset) != 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the FlatBufferBuilder by purging all data that it holds.
|
||||
*/
|
||||
/** Reset the FlatBufferBuilder by purging all data that it holds. */
|
||||
public void clear() {
|
||||
space = bb.capacity();
|
||||
bb.clear();
|
||||
@@ -250,13 +239,13 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Doubles the size of the backing {@link ByteBuffer} and copies the old data towards the
|
||||
* end of the new buffer (since we build the buffer backwards).
|
||||
* Doubles the size of the backing {@link ByteBuffer} and copies the old data towards the end of
|
||||
* the new buffer (since we build the buffer backwards).
|
||||
*
|
||||
* @param bb The current buffer with the existing data.
|
||||
* @param bb_factory The factory to be used for allocating the new internal buffer
|
||||
* @return A new byte buffer with the old data copied copied to it. The data is
|
||||
* located at the end of the buffer.
|
||||
* @return A new byte buffer with the old data copied copied to it. The data is located at the end
|
||||
* of the buffer.
|
||||
*/
|
||||
static ByteBuffer growByteBuffer(ByteBuffer bb, ByteBufferFactory bb_factory) {
|
||||
int old_buf_size = bb.capacity();
|
||||
@@ -265,8 +254,7 @@ public class FlatBufferBuilder {
|
||||
|
||||
if (old_buf_size == 0) {
|
||||
new_buf_size = DEFAULT_BUFFER_SIZE;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (old_buf_size == MAX_BUFFER_SIZE) { // Ensure we don't grow beyond what fits in an int.
|
||||
throw new AssertionError("FlatBuffers: cannot grow buffer beyond 2 gigabytes.");
|
||||
}
|
||||
@@ -300,11 +288,10 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare to write an element of `size` after `additional_bytes`
|
||||
* have been written, e.g. if you write a string, you need to align such
|
||||
* the int length field is aligned to {@link com.google.flatbuffers.Constants#SIZEOF_INT}, and
|
||||
* the string data follows it directly. If all you need to do is alignment, `additional_bytes`
|
||||
* will be 0.
|
||||
* Prepare to write an element of `size` after `additional_bytes` have been written, e.g. if you
|
||||
* write a string, you need to align such the int length field is aligned to {@link
|
||||
* com.google.flatbuffers.Constants#SIZEOF_INT}, and the string data follows it directly. If all
|
||||
* you need to do is alignment, `additional_bytes` will be 0.
|
||||
*
|
||||
* @param size This is the of the new element to write.
|
||||
* @param additional_bytes The padding size.
|
||||
@@ -329,60 +316,75 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `boolean` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `boolean` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `boolean` to put into the buffer.
|
||||
*/
|
||||
public void putBoolean(boolean x) { bb.put (space -= Constants.SIZEOF_BYTE, (byte)(x ? 1 : 0)); }
|
||||
public void putBoolean(boolean x) {
|
||||
bb.put(space -= Constants.SIZEOF_BYTE, (byte) (x ? 1 : 0));
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `byte` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `byte` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `byte` to put into the buffer.
|
||||
*/
|
||||
public void putByte (byte x) { bb.put (space -= Constants.SIZEOF_BYTE, x); }
|
||||
public void putByte(byte x) {
|
||||
bb.put(space -= Constants.SIZEOF_BYTE, x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `short` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `short` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `short` to put into the buffer.
|
||||
*/
|
||||
public void putShort (short x) { bb.putShort (space -= Constants.SIZEOF_SHORT, x); }
|
||||
public void putShort(short x) {
|
||||
bb.putShort(space -= Constants.SIZEOF_SHORT, x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an `int` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add an `int` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x An `int` to put into the buffer.
|
||||
*/
|
||||
public void putInt (int x) { bb.putInt (space -= Constants.SIZEOF_INT, x); }
|
||||
public void putInt(int x) {
|
||||
bb.putInt(space -= Constants.SIZEOF_INT, x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `long` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `long` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `long` to put into the buffer.
|
||||
*/
|
||||
public void putLong (long x) { bb.putLong (space -= Constants.SIZEOF_LONG, x); }
|
||||
public void putLong(long x) {
|
||||
bb.putLong(space -= Constants.SIZEOF_LONG, x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `float` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `float` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `float` to put into the buffer.
|
||||
*/
|
||||
public void putFloat (float x) { bb.putFloat (space -= Constants.SIZEOF_FLOAT, x); }
|
||||
public void putFloat(float x) {
|
||||
bb.putFloat(space -= Constants.SIZEOF_FLOAT, x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `double` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `double` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `double` to put into the buffer.
|
||||
*/
|
||||
public void putDouble (double x) { bb.putDouble(space -= Constants.SIZEOF_DOUBLE, x); }
|
||||
public void putDouble(double x) {
|
||||
bb.putDouble(space -= Constants.SIZEOF_DOUBLE, x);
|
||||
}
|
||||
|
||||
/// @endcond
|
||||
|
||||
/**
|
||||
@@ -390,49 +392,70 @@ public class FlatBufferBuilder {
|
||||
*
|
||||
* @param x A `boolean` to put into the buffer.
|
||||
*/
|
||||
public void addBoolean(boolean x) { prep(Constants.SIZEOF_BYTE, 0); putBoolean(x); }
|
||||
public void addBoolean(boolean x) {
|
||||
prep(Constants.SIZEOF_BYTE, 0);
|
||||
putBoolean(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `byte` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
*
|
||||
* @param x A `byte` to put into the buffer.
|
||||
*/
|
||||
public void addByte (byte x) { prep(Constants.SIZEOF_BYTE, 0); putByte (x); }
|
||||
public void addByte(byte x) {
|
||||
prep(Constants.SIZEOF_BYTE, 0);
|
||||
putByte(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `short` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
*
|
||||
* @param x A `short` to put into the buffer.
|
||||
*/
|
||||
public void addShort (short x) { prep(Constants.SIZEOF_SHORT, 0); putShort (x); }
|
||||
public void addShort(short x) {
|
||||
prep(Constants.SIZEOF_SHORT, 0);
|
||||
putShort(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an `int` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
*
|
||||
* @param x An `int` to put into the buffer.
|
||||
*/
|
||||
public void addInt (int x) { prep(Constants.SIZEOF_INT, 0); putInt (x); }
|
||||
public void addInt(int x) {
|
||||
prep(Constants.SIZEOF_INT, 0);
|
||||
putInt(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `long` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
*
|
||||
* @param x A `long` to put into the buffer.
|
||||
*/
|
||||
public void addLong (long x) { prep(Constants.SIZEOF_LONG, 0); putLong (x); }
|
||||
public void addLong(long x) {
|
||||
prep(Constants.SIZEOF_LONG, 0);
|
||||
putLong(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `float` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
*
|
||||
* @param x A `float` to put into the buffer.
|
||||
*/
|
||||
public void addFloat (float x) { prep(Constants.SIZEOF_FLOAT, 0); putFloat (x); }
|
||||
public void addFloat(float x) {
|
||||
prep(Constants.SIZEOF_FLOAT, 0);
|
||||
putFloat(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `double` to the buffer, properly aligned, and grows the buffer (if necessary).
|
||||
*
|
||||
* @param x A `double` to put into the buffer.
|
||||
*/
|
||||
public void addDouble (double x) { prep(Constants.SIZEOF_DOUBLE, 0); putDouble (x); }
|
||||
public void addDouble(double x) {
|
||||
prep(Constants.SIZEOF_DOUBLE, 0);
|
||||
putDouble(x);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds on offset, relative to where it will be written.
|
||||
@@ -448,19 +471,20 @@ public class FlatBufferBuilder {
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
/**
|
||||
* Start a new array/vector of objects. Users usually will not call
|
||||
* this directly. The `FlatBuffers` compiler will create a start/end
|
||||
* method for vector types in generated code.
|
||||
* <p>
|
||||
* The expected sequence of calls is:
|
||||
* Start a new array/vector of objects. Users usually will not call this directly. The
|
||||
* `FlatBuffers` compiler will create a start/end method for vector types in generated code.
|
||||
*
|
||||
* <p>The expected sequence of calls is:
|
||||
*
|
||||
* <ol>
|
||||
* <li>Start the array using this method.</li>
|
||||
* <li>Call {@link #addOffset(int)} `num_elems` number of times to set
|
||||
* the offset of each element in the array.</li>
|
||||
* <li>Call {@link #endVector()} to retrieve the offset of the array.</li>
|
||||
* <li>Start the array using this method.
|
||||
* <li>Call {@link #addOffset(int)} `num_elems` number of times to set the offset of each
|
||||
* element in the array.
|
||||
* <li>Call {@link #endVector()} to retrieve the offset of the array.
|
||||
* </ol>
|
||||
* <p>
|
||||
* For example, to create an array of strings, do:
|
||||
*
|
||||
* <p>For example, to create an array of strings, do:
|
||||
*
|
||||
* <pre>{@code
|
||||
* // Need 10 strings
|
||||
* FlatBufferBuilder builder = new FlatBufferBuilder(existingBuffer);
|
||||
@@ -498,25 +522,24 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Finish off the creation of an array and all its elements. The array
|
||||
* must be created with {@link #startVector(int, int, int)}.
|
||||
* Finish off the creation of an array and all its elements. The array must be created with {@link
|
||||
* #startVector(int, int, int)}.
|
||||
*
|
||||
* @return The offset at which the newly created array starts.
|
||||
* @see #startVector(int, int, int)
|
||||
*/
|
||||
public int endVector() {
|
||||
if (!nested)
|
||||
throw new AssertionError("FlatBuffers: endVector called without startVector");
|
||||
if (!nested) throw new AssertionError("FlatBuffers: endVector called without startVector");
|
||||
nested = false;
|
||||
putInt(vector_num_elems);
|
||||
return offset();
|
||||
}
|
||||
|
||||
/// @endcond
|
||||
|
||||
/**
|
||||
* Create a new array/vector and return a ByteBuffer to be filled later.
|
||||
* Call {@link #endVector} after this method to get an offset to the beginning
|
||||
* of vector.
|
||||
* Create a new array/vector and return a ByteBuffer to be filled later. Call {@link #endVector}
|
||||
* after this method to get an offset to the beginning of vector.
|
||||
*
|
||||
* @param elem_size the size of each element in bytes.
|
||||
* @param num_elems number of elements in the vector.
|
||||
@@ -561,13 +584,12 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode the String `s` in the buffer using UTF-8. If a String with
|
||||
* this exact contents has already been serialized using this method,
|
||||
* instead simply returns the offset of the existing String.
|
||||
* Encode the String `s` in the buffer using UTF-8. If a String with this exact contents has
|
||||
* already been serialized using this method, instead simply returns the offset of the existing
|
||||
* String.
|
||||
*
|
||||
* Usage of the method will incur into additional allocations,
|
||||
* so it is advisable to use it only when it is known upfront that
|
||||
* your message will have several repeated strings.
|
||||
* <p>Usage of the method will incur into additional allocations, so it is advisable to use it
|
||||
* only when it is known upfront that your message will have several repeated strings.
|
||||
*
|
||||
* @param s The String to encode.
|
||||
* @return The offset in the buffer where the encoded String starts.
|
||||
@@ -579,7 +601,6 @@ public class FlatBufferBuilder {
|
||||
int offset = createString(s);
|
||||
string_pool.put(s, offset);
|
||||
return offset;
|
||||
|
||||
}
|
||||
|
||||
Integer offset = string_pool.get(s);
|
||||
@@ -592,8 +613,8 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode the string `s` in the buffer using UTF-8. If {@code s} is
|
||||
* already a {@link CharBuffer}, this method is allocation free.
|
||||
* Encode the string `s` in the buffer using UTF-8. If {@code s} is already a {@link CharBuffer},
|
||||
* this method is allocation free.
|
||||
*
|
||||
* @param s The string to encode.
|
||||
* @return The offset in the buffer where the encoded string starts.
|
||||
@@ -654,7 +675,7 @@ public class FlatBufferBuilder {
|
||||
/**
|
||||
* Create a byte array in the buffer.
|
||||
*
|
||||
* The source {@link ByteBuffer} position is advanced by {@link ByteBuffer#remaining()} places
|
||||
* <p>The source {@link ByteBuffer} position is advanced by {@link ByteBuffer#remaining()} places
|
||||
* after this call.
|
||||
*
|
||||
* @param byteBuffer A source {@link ByteBuffer} with data.
|
||||
@@ -669,44 +690,37 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
/**
|
||||
* Should not be accessing the final buffer before it is finished.
|
||||
*/
|
||||
/** Should not be accessing the final buffer before it is finished. */
|
||||
public void finished() {
|
||||
if (!finished)
|
||||
throw new AssertionError(
|
||||
"FlatBuffers: you can only access the serialized buffer after it has been" +
|
||||
" finished by FlatBufferBuilder.finish().");
|
||||
"FlatBuffers: you can only access the serialized buffer after it has been"
|
||||
+ " finished by FlatBufferBuilder.finish().");
|
||||
}
|
||||
|
||||
/**
|
||||
* Should not be creating any other object, string or vector
|
||||
* while an object is being constructed.
|
||||
* Should not be creating any other object, string or vector while an object is being constructed.
|
||||
*/
|
||||
public void notNested() {
|
||||
if (nested)
|
||||
throw new AssertionError("FlatBuffers: object serialization must not be nested.");
|
||||
if (nested) throw new AssertionError("FlatBuffers: object serialization must not be nested.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Structures are always stored inline, they need to be created right
|
||||
* where they're used. You'll get this assertion failure if you
|
||||
* created it elsewhere.
|
||||
* Structures are always stored inline, they need to be created right where they're used. You'll
|
||||
* get this assertion failure if you created it elsewhere.
|
||||
*
|
||||
* @param obj The offset of the created object.
|
||||
*/
|
||||
public void Nested(int obj) {
|
||||
if (obj != offset())
|
||||
throw new AssertionError("FlatBuffers: struct must be serialized inline.");
|
||||
if (obj != offset()) throw new AssertionError("FlatBuffers: struct must be serialized inline.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Start encoding a new object in the buffer. Users will not usually need to
|
||||
* call this directly. The `FlatBuffers` compiler will generate helper methods
|
||||
* that call this method internally.
|
||||
* <p>
|
||||
* For example, using the "Monster" code found on the "landing page". An
|
||||
* object of type `Monster` can be created using the following code:
|
||||
* Start encoding a new object in the buffer. Users will not usually need to call this directly.
|
||||
* The `FlatBuffers` compiler will generate helper methods that call this method internally.
|
||||
*
|
||||
* <p>For example, using the "Monster" code found on the "landing page". An object of type
|
||||
* `Monster` can be created using the following code:
|
||||
*
|
||||
* <pre>{@code
|
||||
* int testArrayOfString = Monster.createTestarrayofstringVector(fbb, new int[] {
|
||||
@@ -726,15 +740,16 @@ public class FlatBufferBuilder {
|
||||
* Monster.addTestarrayofstring(fbb, testArrayOfString);
|
||||
* int mon = Monster.endMonster(fbb);
|
||||
* }</pre>
|
||||
* <p>
|
||||
* Here:
|
||||
*
|
||||
* <p>Here:
|
||||
*
|
||||
* <ul>
|
||||
* <li>The call to `Monster#startMonster(FlatBufferBuilder)` will call this
|
||||
* method with the right number of fields set.</li>
|
||||
* <li>`Monster#endMonster(FlatBufferBuilder)` will ensure {@link #endObject()} is called.</li>
|
||||
* <li>The call to `Monster#startMonster(FlatBufferBuilder)` will call this method with the
|
||||
* right number of fields set.
|
||||
* <li>`Monster#endMonster(FlatBufferBuilder)` will ensure {@link #endObject()} is called.
|
||||
* </ul>
|
||||
* <p>
|
||||
* It's not recommended to call this method directly. If it's called manually, you must ensure
|
||||
*
|
||||
* <p>It's not recommended to call this method directly. If it's called manually, you must ensure
|
||||
* to audit all calls to it whenever fields are added or removed from your schema. This is
|
||||
* automatically done by the code generated by the `FlatBuffers` compiler.
|
||||
*
|
||||
@@ -758,7 +773,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d A `boolean` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addBoolean(int o, boolean x, boolean d) { if(force_defaults || x != d) { addBoolean(x); slot(o); } }
|
||||
public void addBoolean(int o, boolean x, boolean d) {
|
||||
if (force_defaults || x != d) {
|
||||
addBoolean(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `byte` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -769,7 +789,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d A `byte` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addByte (int o, byte x, int d) { if(force_defaults || x != d) { addByte (x); slot(o); } }
|
||||
public void addByte(int o, byte x, int d) {
|
||||
if (force_defaults || x != d) {
|
||||
addByte(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `short` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -780,7 +805,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d A `short` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addShort (int o, short x, int d) { if(force_defaults || x != d) { addShort (x); slot(o); } }
|
||||
public void addShort(int o, short x, int d) {
|
||||
if (force_defaults || x != d) {
|
||||
addShort(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an `int` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -791,7 +821,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d An `int` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addInt (int o, int x, int d) { if(force_defaults || x != d) { addInt (x); slot(o); } }
|
||||
public void addInt(int o, int x, int d) {
|
||||
if (force_defaults || x != d) {
|
||||
addInt(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `long` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -802,7 +837,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d A `long` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addLong (int o, long x, long d) { if(force_defaults || x != d) { addLong (x); slot(o); } }
|
||||
public void addLong(int o, long x, long d) {
|
||||
if (force_defaults || x != d) {
|
||||
addLong(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `float` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -813,7 +853,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d A `float` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addFloat (int o, float x, double d) { if(force_defaults || x != d) { addFloat (x); slot(o); } }
|
||||
public void addFloat(int o, float x, double d) {
|
||||
if (force_defaults || x != d) {
|
||||
addFloat(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `double` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -824,7 +869,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d A `double` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addDouble (int o, double x, double d) { if(force_defaults || x != d) { addDouble (x); slot(o); } }
|
||||
public void addDouble(int o, double x, double d) {
|
||||
if (force_defaults || x != d) {
|
||||
addDouble(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an `offset` to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
@@ -835,7 +885,12 @@ public class FlatBufferBuilder {
|
||||
* default value, it can be skipped.
|
||||
* @param d An `offset` default value to compare against when `force_defaults` is `false`.
|
||||
*/
|
||||
public void addOffset (int o, int x, int d) { if(force_defaults || x != d) { addOffset (x); slot(o); } }
|
||||
public void addOffset(int o, int x, int d) {
|
||||
if (force_defaults || x != d) {
|
||||
addOffset(x);
|
||||
slot(o);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a struct to the table. Structs are stored inline, so nothing additional is being added.
|
||||
@@ -854,8 +909,7 @@ public class FlatBufferBuilder {
|
||||
/**
|
||||
* Set the current vtable at `voffset` to the current location in the buffer.
|
||||
*
|
||||
* @param voffset The index into the vtable to store the offset relative to the end of the
|
||||
* buffer.
|
||||
* @param voffset The index into the vtable to store the offset relative to the end of the buffer.
|
||||
*/
|
||||
public void slot(int voffset) {
|
||||
vtable[voffset] = offset();
|
||||
@@ -925,8 +979,7 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks that a required field has been set in a given table that has
|
||||
* just been constructed.
|
||||
* Checks that a required field has been set in a given table that has just been constructed.
|
||||
*
|
||||
* @param table The offset to the start of the table from the `ByteBuffer` capacity.
|
||||
* @param field The offset to the field in the vtable.
|
||||
@@ -936,9 +989,9 @@ public class FlatBufferBuilder {
|
||||
int vtable_start = table_start - bb.getInt(table_start);
|
||||
boolean ok = bb.getShort(vtable_start + field) != 0;
|
||||
// If this fails, the caller will show what field needs to be set.
|
||||
if (!ok)
|
||||
throw new AssertionError("FlatBuffers: field " + field + " must be set");
|
||||
if (!ok) throw new AssertionError("FlatBuffers: field " + field + " must be set");
|
||||
}
|
||||
|
||||
/// @endcond
|
||||
|
||||
/**
|
||||
@@ -986,8 +1039,8 @@ public class FlatBufferBuilder {
|
||||
protected void finish(int root_table, String file_identifier, boolean size_prefix) {
|
||||
prep(minalign, SIZEOF_INT + FILE_IDENTIFIER_LENGTH + (size_prefix ? SIZEOF_INT : 0));
|
||||
if (file_identifier.length() != FILE_IDENTIFIER_LENGTH)
|
||||
throw new AssertionError("FlatBuffers: file identifier must be length " +
|
||||
FILE_IDENTIFIER_LENGTH);
|
||||
throw new AssertionError(
|
||||
"FlatBuffers: file identifier must be length " + FILE_IDENTIFIER_LENGTH);
|
||||
for (int i = FILE_IDENTIFIER_LENGTH - 1; i >= 0; i--) {
|
||||
addByte((byte) file_identifier.charAt(i));
|
||||
}
|
||||
@@ -1017,9 +1070,8 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* In order to save space, fields that are set to their default value
|
||||
* don't get serialized into the buffer. Forcing defaults provides a
|
||||
* way to manually disable this optimization.
|
||||
* In order to save space, fields that are set to their default value don't get serialized into
|
||||
* the buffer. Forcing defaults provides a way to manually disable this optimization.
|
||||
*
|
||||
* @param forceDefaults When set to `true`, always serializes default values.
|
||||
* @return Returns `this`.
|
||||
@@ -1030,9 +1082,8 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the ByteBuffer representing the FlatBuffer. Only call this after you've
|
||||
* called `finish()`. The actual data starts at the ByteBuffer's current position,
|
||||
* not necessarily at `0`.
|
||||
* Get the ByteBuffer representing the FlatBuffer. Only call this after you've called `finish()`.
|
||||
* The actual data starts at the ByteBuffer's current position, not necessarily at `0`.
|
||||
*
|
||||
* @return The {@link ByteBuffer} representing the FlatBuffer
|
||||
*/
|
||||
@@ -1042,12 +1093,12 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* The FlatBuffer data doesn't start at offset 0 in the {@link ByteBuffer}, but
|
||||
* now the {@code ByteBuffer}'s position is set to that location upon {@link #finish(int)}.
|
||||
* The FlatBuffer data doesn't start at offset 0 in the {@link ByteBuffer}, but now the {@code
|
||||
* ByteBuffer}'s position is set to that location upon {@link #finish(int)}.
|
||||
*
|
||||
* @return The {@link ByteBuffer#position() position} the data starts in {@link #dataBuffer()}
|
||||
* @deprecated This method should not be needed anymore, but is left
|
||||
* here for the moment to document this API change. It will be removed in the future.
|
||||
* @deprecated This method should not be needed anymore, but is left here for the moment to
|
||||
* document this API change. It will be removed in the future.
|
||||
*/
|
||||
@Deprecated
|
||||
private int dataStart() {
|
||||
@@ -1056,8 +1107,8 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* A utility function to copy and return the ByteBuffer data from `start` to
|
||||
* `start` + `length` as a `byte[]`.
|
||||
* A utility function to copy and return the ByteBuffer data from `start` to `start` + `length` as
|
||||
* a `byte[]`.
|
||||
*
|
||||
* @param start Start copying at this offset.
|
||||
* @param length How many bytes to copy.
|
||||
@@ -1084,8 +1135,8 @@ public class FlatBufferBuilder {
|
||||
/**
|
||||
* A utility function to return an InputStream to the ByteBuffer data
|
||||
*
|
||||
* @return An InputStream that starts at the beginning of the ByteBuffer data
|
||||
* and can read to the end of it.
|
||||
* @return An InputStream that starts at the beginning of the ByteBuffer data and can read to the
|
||||
* end of it.
|
||||
*/
|
||||
public InputStream sizedInputStream() {
|
||||
finished();
|
||||
@@ -1095,9 +1146,7 @@ public class FlatBufferBuilder {
|
||||
return new ByteBufferBackedInputStream(duplicate);
|
||||
}
|
||||
|
||||
/**
|
||||
* A class that allows a user to create an InputStream from a ByteBuffer.
|
||||
*/
|
||||
/** A class that allows a user to create an InputStream from a ByteBuffer. */
|
||||
static class ByteBufferBackedInputStream extends InputStream {
|
||||
|
||||
ByteBuffer buf;
|
||||
@@ -1114,7 +1163,6 @@ public class FlatBufferBuilder {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// @}
|
||||
|
||||
@@ -16,14 +16,11 @@
|
||||
|
||||
package com.google.flatbuffers;
|
||||
|
||||
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.byteToUnsignedInt;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.intToUnsignedLong;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.shortToUnsignedInt;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
/// @file
|
||||
/// @addtogroup flatbuffers_java_api
|
||||
@@ -31,10 +28,11 @@ import java.nio.charset.StandardCharsets;
|
||||
|
||||
/**
|
||||
* This class can be used to parse FlexBuffer messages.
|
||||
* <p>
|
||||
* For generating FlexBuffer messages, use {@link FlexBuffersBuilder}.
|
||||
* <p>
|
||||
* Example of usage:
|
||||
*
|
||||
* <p>For generating FlexBuffer messages, use {@link FlexBuffersBuilder}.
|
||||
*
|
||||
* <p>Example of usage:
|
||||
*
|
||||
* <pre>
|
||||
* ReadBuf bb = ... // load message from file or network
|
||||
* FlexBuffers.Reference r = FlexBuffers.getRoot(bb); // Reads the root element
|
||||
@@ -48,34 +46,49 @@ public class FlexBuffers {
|
||||
// type.
|
||||
/** Represent a null type */
|
||||
public static final int FBT_NULL = 0;
|
||||
|
||||
/** Represent a signed integer type */
|
||||
public static final int FBT_INT = 1;
|
||||
|
||||
/** Represent a unsigned type */
|
||||
public static final int FBT_UINT = 2;
|
||||
|
||||
/** Represent a float type */
|
||||
public static final int FBT_FLOAT = 3; // Types above stored inline, types below store an offset.
|
||||
|
||||
/** Represent a key to a map type */
|
||||
public static final int FBT_KEY = 4;
|
||||
|
||||
/** Represent a string type */
|
||||
public static final int FBT_STRING = 5;
|
||||
|
||||
/** Represent a indirect signed integer type */
|
||||
public static final int FBT_INDIRECT_INT = 6;
|
||||
|
||||
/** Represent a indirect unsigned integer type */
|
||||
public static final int FBT_INDIRECT_UINT = 7;
|
||||
|
||||
/** Represent a indirect float type */
|
||||
public static final int FBT_INDIRECT_FLOAT = 8;
|
||||
|
||||
/** Represent a map type */
|
||||
public static final int FBT_MAP = 9;
|
||||
|
||||
/** Represent a vector type */
|
||||
public static final int FBT_VECTOR = 10; // Untyped.
|
||||
|
||||
/** Represent a vector of signed integers type */
|
||||
public static final int FBT_VECTOR_INT = 11; // Typed any size = stores no type table).
|
||||
|
||||
/** Represent a vector of unsigned integers type */
|
||||
public static final int FBT_VECTOR_UINT = 12;
|
||||
|
||||
/** Represent a vector of floats type */
|
||||
public static final int FBT_VECTOR_FLOAT = 13;
|
||||
|
||||
/** Represent a vector of keys type */
|
||||
public static final int FBT_VECTOR_KEY = 14;
|
||||
|
||||
/** Represent a vector of strings type */
|
||||
// DEPRECATED, use FBT_VECTOR or FBT_VECTOR_KEY instead.
|
||||
// more info on thttps://github.com/google/flatbuffers/issues/5627.
|
||||
@@ -91,14 +104,18 @@ public class FlexBuffers {
|
||||
public static final int FBT_VECTOR_INT4 = 22; // Typed quad = no type table; no size field).
|
||||
public static final int FBT_VECTOR_UINT4 = 23;
|
||||
public static final int FBT_VECTOR_FLOAT4 = 24;
|
||||
|
||||
/// @endcond FLATBUFFERS_INTERNAL
|
||||
|
||||
/** Represent a blob type */
|
||||
public static final int FBT_BLOB = 25;
|
||||
|
||||
/** Represent a boolean type */
|
||||
public static final int FBT_BOOL = 26;
|
||||
|
||||
/** Represent a vector of booleans type */
|
||||
public static final int FBT_VECTOR_BOOL = 36; // To Allow the same type of conversion of type to vector type
|
||||
public static final int FBT_VECTOR_BOOL =
|
||||
36; // To Allow the same type of conversion of type to vector type
|
||||
|
||||
private static final ReadBuf EMPTY_BB = new ArrayReadWriteBuf(new byte[] {0}, 1);
|
||||
|
||||
@@ -109,7 +126,8 @@ public class FlexBuffers {
|
||||
* @return true if typed vector
|
||||
*/
|
||||
static boolean isTypedVector(int type) {
|
||||
return (type >= FBT_VECTOR_INT && type <= FBT_VECTOR_STRING_DEPRECATED) || type == FBT_VECTOR_BOOL;
|
||||
return (type >= FBT_VECTOR_INT && type <= FBT_VECTOR_STRING_DEPRECATED)
|
||||
|| type == FBT_VECTOR_BOOL;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -136,10 +154,14 @@ public class FlexBuffers {
|
||||
static int toTypedVector(int type, int fixedLength) {
|
||||
assert (isTypedVectorElementType(type));
|
||||
switch (fixedLength) {
|
||||
case 0: return type - FBT_INT + FBT_VECTOR_INT;
|
||||
case 2: return type - FBT_INT + FBT_VECTOR_INT2;
|
||||
case 3: return type - FBT_INT + FBT_VECTOR_INT3;
|
||||
case 4: return type - FBT_INT + FBT_VECTOR_INT4;
|
||||
case 0:
|
||||
return type - FBT_INT + FBT_VECTOR_INT;
|
||||
case 2:
|
||||
return type - FBT_INT + FBT_VECTOR_INT2;
|
||||
case 3:
|
||||
return type - FBT_INT + FBT_VECTOR_INT3;
|
||||
case 4:
|
||||
return type - FBT_INT + FBT_VECTOR_INT4;
|
||||
default:
|
||||
assert (false);
|
||||
return FBT_NULL;
|
||||
@@ -159,11 +181,17 @@ public class FlexBuffers {
|
||||
// read unsigned int with size byteWidth and return as a 64-bit integer
|
||||
private static long readUInt(ReadBuf buff, int end, int byteWidth) {
|
||||
switch (byteWidth) {
|
||||
case 1: return byteToUnsignedInt(buff.get(end));
|
||||
case 2: return shortToUnsignedInt(buff.getShort(end));
|
||||
case 4: return intToUnsignedLong(buff.getInt(end));
|
||||
case 8: return buff.getLong(end); // We are passing signed long here. Losing information (user should know)
|
||||
default: return -1; // we should never reach here
|
||||
case 1:
|
||||
return byteToUnsignedInt(buff.get(end));
|
||||
case 2:
|
||||
return shortToUnsignedInt(buff.getShort(end));
|
||||
case 4:
|
||||
return intToUnsignedLong(buff.getInt(end));
|
||||
case 8:
|
||||
return buff.getLong(
|
||||
end); // We are passing signed long here. Losing information (user should know)
|
||||
default:
|
||||
return -1; // we should never reach here
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,36 +203,47 @@ public class FlexBuffers {
|
||||
// read signed int of size byteWidth and return as 64-bit int
|
||||
private static long readLong(ReadBuf buff, int end, int byteWidth) {
|
||||
switch (byteWidth) {
|
||||
case 1: return buff.get(end);
|
||||
case 2: return buff.getShort(end);
|
||||
case 4: return buff.getInt(end);
|
||||
case 8: return buff.getLong(end);
|
||||
default: return -1; // we should never reach here
|
||||
case 1:
|
||||
return buff.get(end);
|
||||
case 2:
|
||||
return buff.getShort(end);
|
||||
case 4:
|
||||
return buff.getInt(end);
|
||||
case 8:
|
||||
return buff.getLong(end);
|
||||
default:
|
||||
return -1; // we should never reach here
|
||||
}
|
||||
}
|
||||
|
||||
private static double readDouble(ReadBuf buff, int end, int byteWidth) {
|
||||
switch (byteWidth) {
|
||||
case 4: return buff.getFloat(end);
|
||||
case 8: return buff.getDouble(end);
|
||||
default: return -1; // we should never reach here
|
||||
case 4:
|
||||
return buff.getFloat(end);
|
||||
case 8:
|
||||
return buff.getDouble(end);
|
||||
default:
|
||||
return -1; // we should never reach here
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads a FlexBuffer message in ReadBuf and returns {@link Reference} to
|
||||
* the root element.
|
||||
* Reads a FlexBuffer message in ReadBuf and returns {@link Reference} to the root element.
|
||||
*
|
||||
* @param buffer ReadBuf containing FlexBuffer message
|
||||
* @return {@link Reference} to the root object
|
||||
*/
|
||||
@Deprecated
|
||||
public static Reference getRoot(ByteBuffer buffer) {
|
||||
return getRoot( buffer.hasArray() ? new ArrayReadWriteBuf(buffer.array(), buffer.limit()) : new ByteBufferReadWriteBuf(buffer));
|
||||
return getRoot(
|
||||
buffer.hasArray()
|
||||
? new ArrayReadWriteBuf(buffer.array(), buffer.limit())
|
||||
: new ByteBufferReadWriteBuf(buffer));
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads a FlexBuffer message in ReadBuf and returns {@link Reference} to
|
||||
* the root element.
|
||||
* Reads a FlexBuffer message in ReadBuf and returns {@link Reference} to the root element.
|
||||
*
|
||||
* @param buffer ReadBuf containing FlexBuffer message
|
||||
* @return {@link Reference} to the root object
|
||||
*/
|
||||
@@ -218,9 +257,7 @@ public class FlexBuffers {
|
||||
return new Reference(buffer, end, byteWidth, packetType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Represents an generic element in the buffer.
|
||||
*/
|
||||
/** Represents an generic element in the buffer. */
|
||||
public static class Reference {
|
||||
|
||||
private static final Reference NULL_REFERENCE = new Reference(EMPTY_BB, 0, 1, 0);
|
||||
@@ -244,6 +281,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Return element type
|
||||
*
|
||||
* @return element type as integer
|
||||
*/
|
||||
public int getType() {
|
||||
@@ -252,6 +290,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element is null type
|
||||
*
|
||||
* @return true if null type
|
||||
*/
|
||||
public boolean isNull() {
|
||||
@@ -260,6 +299,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element is boolean type
|
||||
*
|
||||
* @return true if boolean type
|
||||
*/
|
||||
public boolean isBoolean() {
|
||||
@@ -268,6 +308,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is numeric (signed/unsigned integers and floats)
|
||||
*
|
||||
* @return true if numeric type
|
||||
*/
|
||||
public boolean isNumeric() {
|
||||
@@ -276,6 +317,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is signed or unsigned integers
|
||||
*
|
||||
* @return true if an integer type
|
||||
*/
|
||||
public boolean isIntOrUInt() {
|
||||
@@ -284,6 +326,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is float
|
||||
*
|
||||
* @return true if a float type
|
||||
*/
|
||||
public boolean isFloat() {
|
||||
@@ -292,6 +335,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is signed integer
|
||||
*
|
||||
* @return true if a signed integer type
|
||||
*/
|
||||
public boolean isInt() {
|
||||
@@ -300,6 +344,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is signed integer
|
||||
*
|
||||
* @return true if a signed integer type
|
||||
*/
|
||||
public boolean isUInt() {
|
||||
@@ -308,6 +353,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is string
|
||||
*
|
||||
* @return true if a string type
|
||||
*/
|
||||
public boolean isString() {
|
||||
@@ -316,6 +362,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is key
|
||||
*
|
||||
* @return true if a key type
|
||||
*/
|
||||
public boolean isKey() {
|
||||
@@ -324,6 +371,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is vector
|
||||
*
|
||||
* @return true if a vector type
|
||||
*/
|
||||
public boolean isVector() {
|
||||
@@ -332,6 +380,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is typed vector
|
||||
*
|
||||
* @return true if a typed vector type
|
||||
*/
|
||||
public boolean isTypedVector() {
|
||||
@@ -340,6 +389,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is a map
|
||||
*
|
||||
* @return true if a map type
|
||||
*/
|
||||
public boolean isMap() {
|
||||
@@ -348,6 +398,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks whether the element type is a blob
|
||||
*
|
||||
* @return true if a blob type
|
||||
*/
|
||||
public boolean isBlob() {
|
||||
@@ -356,10 +407,15 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as 32-bit integer.
|
||||
* <p> For vector element, it will return size of the vector</p>
|
||||
* <p> For String element, it will type to be parsed as integer</p>
|
||||
* <p> Unsigned elements will become negative</p>
|
||||
* <p> Float elements will be casted to integer </p>
|
||||
*
|
||||
* <p>For vector element, it will return size of the vector
|
||||
*
|
||||
* <p>For String element, it will type to be parsed as integer
|
||||
*
|
||||
* <p>Unsigned elements will become negative
|
||||
*
|
||||
* <p>Float elements will be casted to integer
|
||||
*
|
||||
* @return 32-bit integer or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public int asInt() {
|
||||
@@ -368,15 +424,24 @@ public class FlexBuffers {
|
||||
return readInt(bb, end, parentWidth);
|
||||
} else
|
||||
switch (type) {
|
||||
case FBT_INDIRECT_INT: return readInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_UINT: return (int) readUInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_UINT: return (int) readUInt(bb, indirect(bb, end, parentWidth), parentWidth);
|
||||
case FBT_FLOAT: return (int) readDouble(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT: return (int) readDouble(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_NULL: return 0;
|
||||
case FBT_STRING: return Integer.parseInt(asString());
|
||||
case FBT_VECTOR: return asVector().size();
|
||||
case FBT_BOOL: return readInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_INT:
|
||||
return readInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_UINT:
|
||||
return (int) readUInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_UINT:
|
||||
return (int) readUInt(bb, indirect(bb, end, parentWidth), parentWidth);
|
||||
case FBT_FLOAT:
|
||||
return (int) readDouble(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT:
|
||||
return (int) readDouble(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_NULL:
|
||||
return 0;
|
||||
case FBT_STRING:
|
||||
return Integer.parseInt(asString());
|
||||
case FBT_VECTOR:
|
||||
return asVector().size();
|
||||
case FBT_BOOL:
|
||||
return readInt(bb, end, parentWidth);
|
||||
default:
|
||||
// Convert other things to int.
|
||||
return 0;
|
||||
@@ -385,10 +450,15 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as unsigned 64-bit integer.
|
||||
* <p> For vector element, it will return size of the vector</p>
|
||||
* <p> For String element, it will type to be parsed as integer</p>
|
||||
* <p> Negative signed elements will become unsigned counterpart</p>
|
||||
* <p> Float elements will be casted to integer </p>
|
||||
*
|
||||
* <p>For vector element, it will return size of the vector
|
||||
*
|
||||
* <p>For String element, it will type to be parsed as integer
|
||||
*
|
||||
* <p>Negative signed elements will become unsigned counterpart
|
||||
*
|
||||
* <p>Float elements will be casted to integer
|
||||
*
|
||||
* @return 64-bit integer or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public long asUInt() {
|
||||
@@ -397,15 +467,24 @@ public class FlexBuffers {
|
||||
return readUInt(bb, end, parentWidth);
|
||||
} else
|
||||
switch (type) {
|
||||
case FBT_INDIRECT_UINT: return readUInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_INT: return readLong(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_INT: return readLong(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_FLOAT: return (long) readDouble(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT: return (long) readDouble(bb, indirect(bb, end, parentWidth), parentWidth);
|
||||
case FBT_NULL: return 0;
|
||||
case FBT_STRING: return Long.parseLong(asString());
|
||||
case FBT_VECTOR: return asVector().size();
|
||||
case FBT_BOOL: return readInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_UINT:
|
||||
return readUInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_INT:
|
||||
return readLong(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_INT:
|
||||
return readLong(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_FLOAT:
|
||||
return (long) readDouble(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT:
|
||||
return (long) readDouble(bb, indirect(bb, end, parentWidth), parentWidth);
|
||||
case FBT_NULL:
|
||||
return 0;
|
||||
case FBT_STRING:
|
||||
return Long.parseLong(asString());
|
||||
case FBT_VECTOR:
|
||||
return asVector().size();
|
||||
case FBT_BOOL:
|
||||
return readInt(bb, end, parentWidth);
|
||||
default:
|
||||
// Convert other things to uint.
|
||||
return 0;
|
||||
@@ -414,10 +493,15 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as 64-bit integer.
|
||||
* <p> For vector element, it will return size of the vector</p>
|
||||
* <p> For String element, it will type to be parsed as integer</p>
|
||||
* <p> Unsigned elements will become negative</p>
|
||||
* <p> Float elements will be casted to integer </p>
|
||||
*
|
||||
* <p>For vector element, it will return size of the vector
|
||||
*
|
||||
* <p>For String element, it will type to be parsed as integer
|
||||
*
|
||||
* <p>Unsigned elements will become negative
|
||||
*
|
||||
* <p>Float elements will be casted to integer
|
||||
*
|
||||
* @return 64-bit integer or 0 if fail to convert element to long.
|
||||
*/
|
||||
public long asLong() {
|
||||
@@ -426,21 +510,30 @@ public class FlexBuffers {
|
||||
return readLong(bb, end, parentWidth);
|
||||
} else
|
||||
switch (type) {
|
||||
case FBT_INDIRECT_INT: return readLong(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_UINT: return readUInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_UINT: return readUInt(bb, indirect(bb, end, parentWidth), parentWidth);
|
||||
case FBT_FLOAT: return (long) readDouble(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT: return (long) readDouble(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_NULL: return 0;
|
||||
case FBT_STRING: {
|
||||
case FBT_INDIRECT_INT:
|
||||
return readLong(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_UINT:
|
||||
return readUInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_UINT:
|
||||
return readUInt(bb, indirect(bb, end, parentWidth), parentWidth);
|
||||
case FBT_FLOAT:
|
||||
return (long) readDouble(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT:
|
||||
return (long) readDouble(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_NULL:
|
||||
return 0;
|
||||
case FBT_STRING:
|
||||
{
|
||||
try {
|
||||
return Long.parseLong(asString());
|
||||
} catch (NumberFormatException nfe) {
|
||||
return 0; // same as C++ implementation
|
||||
}
|
||||
}
|
||||
case FBT_VECTOR: return asVector().size();
|
||||
case FBT_BOOL: return readInt(bb, end, parentWidth);
|
||||
case FBT_VECTOR:
|
||||
return asVector().size();
|
||||
case FBT_BOOL:
|
||||
return readInt(bb, end, parentWidth);
|
||||
default:
|
||||
// Convert other things to int.
|
||||
return 0;
|
||||
@@ -449,8 +542,11 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as 64-bit integer.
|
||||
* <p> For vector element, it will return size of the vector</p>
|
||||
* <p> For String element, it will type to be parsed as integer</p>
|
||||
*
|
||||
* <p>For vector element, it will return size of the vector
|
||||
*
|
||||
* <p>For String element, it will type to be parsed as integer
|
||||
*
|
||||
* @return 64-bit integer or 0 if fail to convert element to long.
|
||||
*/
|
||||
public double asFloat() {
|
||||
@@ -459,16 +555,23 @@ public class FlexBuffers {
|
||||
return readDouble(bb, end, parentWidth);
|
||||
} else
|
||||
switch (type) {
|
||||
case FBT_INDIRECT_FLOAT: return readDouble(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_INT: return readInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_FLOAT:
|
||||
return readDouble(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_INT:
|
||||
return readInt(bb, end, parentWidth);
|
||||
case FBT_UINT:
|
||||
case FBT_BOOL:
|
||||
return readUInt(bb, end, parentWidth);
|
||||
case FBT_INDIRECT_INT: return readInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_INDIRECT_UINT: return readUInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_NULL: return 0.0;
|
||||
case FBT_STRING: return Double.parseDouble(asString());
|
||||
case FBT_VECTOR: return asVector().size();
|
||||
case FBT_INDIRECT_INT:
|
||||
return readInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_INDIRECT_UINT:
|
||||
return readUInt(bb, indirect(bb, end, parentWidth), byteWidth);
|
||||
case FBT_NULL:
|
||||
return 0.0;
|
||||
case FBT_STRING:
|
||||
return Double.parseDouble(asString());
|
||||
case FBT_VECTOR:
|
||||
return asVector().size();
|
||||
default:
|
||||
// Convert strings and other things to float.
|
||||
return 0;
|
||||
@@ -477,6 +580,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as a {@link Key}
|
||||
*
|
||||
* @return key or {@link Key#empty()} if element is not a key
|
||||
*/
|
||||
public Key asKey() {
|
||||
@@ -489,6 +593,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as a `String`
|
||||
*
|
||||
* @return element as `String` or empty `String` if fail
|
||||
*/
|
||||
public String asString() {
|
||||
@@ -496,8 +601,7 @@ public class FlexBuffers {
|
||||
int start = indirect(bb, end, parentWidth);
|
||||
int size = (int) readUInt(bb, start - byteWidth, byteWidth);
|
||||
return bb.getString(start, size);
|
||||
}
|
||||
else if (isKey()){
|
||||
} else if (isKey()) {
|
||||
int start = indirect(bb, end, byteWidth);
|
||||
for (int i = start; ; i++) {
|
||||
if (bb.get(i) == 0) {
|
||||
@@ -511,6 +615,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as a {@link Map}
|
||||
*
|
||||
* @return element as {@link Map} or empty {@link Map} if fail
|
||||
*/
|
||||
public Map asMap() {
|
||||
@@ -523,6 +628,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as a {@link Vector}
|
||||
*
|
||||
* @return element as {@link Vector} or empty {@link Vector} if fail
|
||||
*/
|
||||
public Vector asVector() {
|
||||
@@ -532,7 +638,11 @@ public class FlexBuffers {
|
||||
// deprecated. Should be treated as key vector
|
||||
return new TypedVector(bb, indirect(bb, end, parentWidth), byteWidth, FlexBuffers.FBT_KEY);
|
||||
} else if (FlexBuffers.isTypedVector(type)) {
|
||||
return new TypedVector(bb, indirect(bb, end, parentWidth), byteWidth, FlexBuffers.toTypedVectorElementType(type));
|
||||
return new TypedVector(
|
||||
bb,
|
||||
indirect(bb, end, parentWidth),
|
||||
byteWidth,
|
||||
FlexBuffers.toTypedVectorElementType(type));
|
||||
} else {
|
||||
return Vector.empty();
|
||||
}
|
||||
@@ -540,6 +650,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as a {@link Blob}
|
||||
*
|
||||
* @return element as {@link Blob} or empty {@link Blob} if fail
|
||||
*/
|
||||
public Blob asBlob() {
|
||||
@@ -552,7 +663,9 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns element as a boolean
|
||||
* <p>If element type is not boolean, it will be casted to integer and compared against 0</p>
|
||||
*
|
||||
* <p>If element type is not boolean, it will be casted to integer and compared against 0
|
||||
*
|
||||
* @return element as boolean
|
||||
*/
|
||||
public boolean asBoolean() {
|
||||
@@ -564,6 +677,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns text representation of the element (JSON)
|
||||
*
|
||||
* @return String containing text representation of the element
|
||||
*/
|
||||
@Override
|
||||
@@ -571,9 +685,7 @@ public class FlexBuffers {
|
||||
return toString(new StringBuilder(128)).toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends a text(JSON) representation to a `StringBuilder`
|
||||
*/
|
||||
/** Appends a text(JSON) representation to a `StringBuilder` */
|
||||
StringBuilder toString(StringBuilder sb) {
|
||||
// TODO: Original C++ implementation escape strings.
|
||||
// probably we should do it as well.
|
||||
@@ -617,7 +729,6 @@ public class FlexBuffers {
|
||||
case FBT_VECTOR_INT4:
|
||||
case FBT_VECTOR_UINT4:
|
||||
case FBT_VECTOR_FLOAT4:
|
||||
|
||||
throw new FlexBufferException("not_implemented:" + type);
|
||||
default:
|
||||
return sb;
|
||||
@@ -625,11 +736,8 @@ public class FlexBuffers {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Base class of all types below.
|
||||
* Points into the data buffer and allows access to one type.
|
||||
*/
|
||||
private static abstract class Object {
|
||||
/** Base class of all types below. Points into the data buffer and allows access to one type. */
|
||||
private abstract static class Object {
|
||||
ReadBuf bb;
|
||||
int end;
|
||||
int byteWidth;
|
||||
@@ -649,7 +757,7 @@ public class FlexBuffers {
|
||||
}
|
||||
|
||||
// Stores size in `byte_width_` bytes before end position.
|
||||
private static abstract class Sized extends Object {
|
||||
private abstract static class Sized extends Object {
|
||||
|
||||
protected final int size;
|
||||
|
||||
@@ -666,9 +774,8 @@ public class FlexBuffers {
|
||||
/**
|
||||
* Represents a array of bytes element in the buffer
|
||||
*
|
||||
* <p>It can be converted to `ReadBuf` using {@link data()},
|
||||
* copied into a byte[] using {@link getBytes()} or
|
||||
* have individual bytes accessed individually using {@link get(int)}</p>
|
||||
* <p>It can be converted to `ReadBuf` using {@link data()}, copied into a byte[] using {@link
|
||||
* getBytes()} or have individual bytes accessed individually using {@link get(int)}
|
||||
*/
|
||||
public static class Blob extends Sized {
|
||||
static final Blob EMPTY = new Blob(EMPTY_BB, 1, 1);
|
||||
@@ -684,6 +791,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Return {@link Blob} as `ReadBuf`
|
||||
*
|
||||
* @return blob as `ReadBuf`
|
||||
*/
|
||||
public ByteBuffer data() {
|
||||
@@ -695,6 +803,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Copy blob into a byte[]
|
||||
*
|
||||
* @return blob as a byte[]
|
||||
*/
|
||||
public byte[] getBytes() {
|
||||
@@ -708,6 +817,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Return individual byte at a given position
|
||||
*
|
||||
* @param pos position of the byte to be read
|
||||
*/
|
||||
public byte get(int pos) {
|
||||
@@ -715,17 +825,13 @@ public class FlexBuffers {
|
||||
return bb.get(end + pos);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a text(JSON) representation of the {@link Blob}
|
||||
*/
|
||||
/** Returns a text(JSON) representation of the {@link Blob} */
|
||||
@Override
|
||||
public String toString() {
|
||||
return bb.getString(end, size());
|
||||
}
|
||||
|
||||
/**
|
||||
* Append a text(JSON) representation of the {@link Blob} into a `StringBuilder`
|
||||
*/
|
||||
/** Append a text(JSON) representation of the {@link Blob} into a `StringBuilder` */
|
||||
@Override
|
||||
public StringBuilder toString(StringBuilder sb) {
|
||||
sb.append('"');
|
||||
@@ -734,10 +840,7 @@ public class FlexBuffers {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Represents a key element in the buffer. Keys are
|
||||
* used to reference objects in a {@link Map}
|
||||
*/
|
||||
/** Represents a key element in the buffer. Keys are used to reference objects in a {@link Map} */
|
||||
public static class Key extends Object {
|
||||
|
||||
private static final Key EMPTY = new Key(EMPTY_BB, 0, 0);
|
||||
@@ -748,15 +851,14 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Return an empty {@link Key}
|
||||
*
|
||||
* @return empty {@link Key}
|
||||
* */
|
||||
*/
|
||||
public static Key empty() {
|
||||
return Key.EMPTY;
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends a text(JSON) representation to a `StringBuilder`
|
||||
*/
|
||||
/** Appends a text(JSON) representation to a `StringBuilder` */
|
||||
@Override
|
||||
public StringBuilder toString(StringBuilder sb) {
|
||||
return sb.append(toString());
|
||||
@@ -781,8 +883,7 @@ public class FlexBuffers {
|
||||
do {
|
||||
c1 = bb.get(ia);
|
||||
c2 = other[io];
|
||||
if (c1 == '\0')
|
||||
return c1 - c2;
|
||||
if (c1 == '\0') return c1 - c2;
|
||||
ia++;
|
||||
io++;
|
||||
if (io == other.length) {
|
||||
@@ -795,20 +896,19 @@ public class FlexBuffers {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
while (c1 == c2);
|
||||
} while (c1 == c2);
|
||||
return c1 - c2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare keys
|
||||
*
|
||||
* @param obj other key to compare
|
||||
* @return true if keys are the same
|
||||
*/
|
||||
@Override
|
||||
public boolean equals(java.lang.Object obj) {
|
||||
if (!(obj instanceof Key))
|
||||
return false;
|
||||
if (!(obj instanceof Key)) return false;
|
||||
|
||||
return ((Key) obj).end == end && ((Key) obj).byteWidth == byteWidth;
|
||||
}
|
||||
@@ -818,9 +918,7 @@ public class FlexBuffers {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Map object representing a set of key-value pairs.
|
||||
*/
|
||||
/** Map object representing a set of key-value pairs. */
|
||||
public static class Map extends Vector {
|
||||
private static final Map EMPTY_MAP = new Map(EMPTY_BB, 1, 1);
|
||||
// cache for converting UTF-8 codepoints into
|
||||
@@ -833,6 +931,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns an empty {@link Map}
|
||||
*
|
||||
* @return an empty {@link Map}
|
||||
*/
|
||||
public static Map empty() {
|
||||
@@ -871,7 +970,9 @@ public class FlexBuffers {
|
||||
public KeyVector keys() {
|
||||
final int num_prefixed_fields = 3;
|
||||
int keysOffset = end - (byteWidth * num_prefixed_fields);
|
||||
return new KeyVector(new TypedVector(bb,
|
||||
return new KeyVector(
|
||||
new TypedVector(
|
||||
bb,
|
||||
indirect(bb, keysOffset, byteWidth),
|
||||
readInt(bb, keysOffset + byteWidth, byteWidth),
|
||||
FBT_KEY));
|
||||
@@ -896,12 +997,9 @@ public class FlexBuffers {
|
||||
int size = size();
|
||||
Vector vals = values();
|
||||
for (int i = 0; i < size; i++) {
|
||||
builder.append('"')
|
||||
.append(keys.get(i).toString())
|
||||
.append("\" : ");
|
||||
builder.append('"').append(keys.get(i).toString()).append("\" : ");
|
||||
builder.append(vals.get(i).toString());
|
||||
if (i != size - 1)
|
||||
builder.append(", ");
|
||||
if (i != size - 1) builder.append(", ");
|
||||
}
|
||||
builder.append(" }");
|
||||
return builder;
|
||||
@@ -919,12 +1017,9 @@ public class FlexBuffers {
|
||||
int mid = (low + high) >>> 1;
|
||||
int keyPos = indirect(bb, keysStart + mid * keyByteWidth, keyByteWidth);
|
||||
int cmp = compareCharSequence(keyPos, searchedKey);
|
||||
if (cmp < 0)
|
||||
low = mid + 1;
|
||||
else if (cmp > 0)
|
||||
high = mid - 1;
|
||||
else
|
||||
return mid; // key found
|
||||
if (cmp < 0) low = mid + 1;
|
||||
else if (cmp > 0) high = mid - 1;
|
||||
else return mid; // key found
|
||||
}
|
||||
return -(low + 1); // key not found
|
||||
}
|
||||
@@ -941,12 +1036,9 @@ public class FlexBuffers {
|
||||
int mid = (low + high) >>> 1;
|
||||
int keyPos = indirect(bb, keysStart + mid * keyByteWidth, keyByteWidth);
|
||||
int cmp = compareBytes(bb, keyPos, searchedKey);
|
||||
if (cmp < 0)
|
||||
low = mid + 1;
|
||||
else if (cmp > 0)
|
||||
high = mid - 1;
|
||||
else
|
||||
return mid; // key found
|
||||
if (cmp < 0) low = mid + 1;
|
||||
else if (cmp > 0) high = mid - 1;
|
||||
else return mid; // key found
|
||||
}
|
||||
return -(low + 1); // key not found
|
||||
}
|
||||
@@ -959,8 +1051,7 @@ public class FlexBuffers {
|
||||
do {
|
||||
c1 = bb.get(l1);
|
||||
c2 = other[l2];
|
||||
if (c1 == '\0')
|
||||
return c1 - c2;
|
||||
if (c1 == '\0') return c1 - c2;
|
||||
l1++;
|
||||
l2++;
|
||||
if (l2 == other.length) {
|
||||
@@ -973,8 +1064,7 @@ public class FlexBuffers {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
while (c1 == c2);
|
||||
} while (c1 == c2);
|
||||
return c1 - c2;
|
||||
}
|
||||
|
||||
@@ -1036,9 +1126,7 @@ public class FlexBuffers {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Object that represents a set of elements in the buffer
|
||||
*/
|
||||
/** Object that represents a set of elements in the buffer */
|
||||
public static class Vector extends Sized {
|
||||
|
||||
private static final Vector EMPTY_VECTOR = new Vector(EMPTY_BB, 1, 1);
|
||||
@@ -1049,6 +1137,7 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Returns an empty {@link Map}
|
||||
*
|
||||
* @return an empty {@link Map}
|
||||
*/
|
||||
public static Vector empty() {
|
||||
@@ -1057,15 +1146,14 @@ public class FlexBuffers {
|
||||
|
||||
/**
|
||||
* Checks if the vector is empty
|
||||
*
|
||||
* @return true if vector is empty
|
||||
*/
|
||||
public boolean isEmpty() {
|
||||
return this == EMPTY_VECTOR;
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends a text(JSON) representation to a `StringBuilder`
|
||||
*/
|
||||
/** Appends a text(JSON) representation to a `StringBuilder` */
|
||||
@Override
|
||||
public StringBuilder toString(StringBuilder sb) {
|
||||
sb.append("[ ");
|
||||
@@ -1097,9 +1185,7 @@ public class FlexBuffers {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Object that represents a set of elements with the same type
|
||||
*/
|
||||
/** Object that represents a set of elements with the same type */
|
||||
public static class TypedVector extends Vector {
|
||||
|
||||
private static final TypedVector EMPTY_VECTOR = new TypedVector(EMPTY_BB, 1, 1, FBT_INT);
|
||||
@@ -1148,9 +1234,7 @@ public class FlexBuffers {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Represent a vector of keys in a map
|
||||
*/
|
||||
/** Represent a vector of keys in a map */
|
||||
public static class KeyVector {
|
||||
|
||||
private final TypedVector vec;
|
||||
@@ -1181,9 +1265,7 @@ public class FlexBuffers {
|
||||
return vec.size();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a text(JSON) representation
|
||||
*/
|
||||
/** Returns a text(JSON) representation */
|
||||
public String toString() {
|
||||
StringBuilder b = new StringBuilder();
|
||||
b.append('[');
|
||||
|
||||
@@ -16,66 +16,66 @@
|
||||
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.FlexBuffers.*;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.byteToUnsignedInt;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.intToUnsignedLong;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.shortToUnsignedInt;
|
||||
|
||||
import java.math.BigInteger;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
|
||||
import static com.google.flatbuffers.FlexBuffers.*;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.byteToUnsignedInt;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.intToUnsignedLong;
|
||||
import static com.google.flatbuffers.FlexBuffers.Unsigned.shortToUnsignedInt;
|
||||
|
||||
/// @file
|
||||
/// @addtogroup flatbuffers_java_api
|
||||
/// @{
|
||||
|
||||
/**
|
||||
* Helper class that builds FlexBuffers
|
||||
* <p> This class presents all necessary APIs to create FlexBuffers. A `ByteBuffer` will be used to store the
|
||||
* data. It can be created internally, or passed down in the constructor.</p>
|
||||
*
|
||||
* <p>This class presents all necessary APIs to create FlexBuffers. A `ByteBuffer` will be used to
|
||||
* store the data. It can be created internally, or passed down in the constructor.
|
||||
*
|
||||
* <p>There are some limitations when compared to original implementation in C++. Most notably:
|
||||
*
|
||||
* <ul>
|
||||
* <li><p> No support for mutations (might change in the future).</p></li>
|
||||
* <li><p> Buffer size limited to {@link Integer#MAX_VALUE}</p></li>
|
||||
* <li><p> Since Java does not support unsigned type, all unsigned operations accepts an immediate higher representation
|
||||
* of similar type.</p></li>
|
||||
* <li>
|
||||
* <p>No support for mutations (might change in the future).
|
||||
* <li>
|
||||
* <p>Buffer size limited to {@link Integer#MAX_VALUE}
|
||||
* <li>
|
||||
* <p>Since Java does not support unsigned type, all unsigned operations accepts an immediate
|
||||
* higher representation of similar type.
|
||||
* </ul>
|
||||
* </p>
|
||||
*/
|
||||
public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* No keys or strings will be shared
|
||||
*/
|
||||
/** No keys or strings will be shared */
|
||||
public static final int BUILDER_FLAG_NONE = 0;
|
||||
|
||||
/**
|
||||
* Keys will be shared between elements. Identical keys will only be serialized once, thus possibly saving space.
|
||||
* But serialization performance might be slower and consumes more memory.
|
||||
* Keys will be shared between elements. Identical keys will only be serialized once, thus
|
||||
* possibly saving space. But serialization performance might be slower and consumes more memory.
|
||||
*/
|
||||
public static final int BUILDER_FLAG_SHARE_KEYS = 1;
|
||||
|
||||
/**
|
||||
* Strings will be shared between elements. Identical strings will only be serialized once, thus possibly saving space.
|
||||
* But serialization performance might be slower and consumes more memory. This is ideal if you expect many repeated
|
||||
* strings on the message.
|
||||
* Strings will be shared between elements. Identical strings will only be serialized once, thus
|
||||
* possibly saving space. But serialization performance might be slower and consumes more memory.
|
||||
* This is ideal if you expect many repeated strings on the message.
|
||||
*/
|
||||
public static final int BUILDER_FLAG_SHARE_STRINGS = 2;
|
||||
/**
|
||||
* Strings and keys will be shared between elements.
|
||||
*/
|
||||
|
||||
/** Strings and keys will be shared between elements. */
|
||||
public static final int BUILDER_FLAG_SHARE_KEYS_AND_STRINGS = 3;
|
||||
/**
|
||||
* Reserved for the future.
|
||||
*/
|
||||
|
||||
/** Reserved for the future. */
|
||||
public static final int BUILDER_FLAG_SHARE_KEY_VECTORS = 4;
|
||||
/**
|
||||
* Reserved for the future.
|
||||
*/
|
||||
|
||||
/** Reserved for the future. */
|
||||
public static final int BUILDER_FLAG_SHARE_ALL = 7;
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
@@ -91,7 +91,8 @@ public class FlexBuffersBuilder {
|
||||
private boolean finished = false;
|
||||
|
||||
// A lambda to sort map keys
|
||||
private Comparator<Value> keyComparator = new Comparator<Value>() {
|
||||
private Comparator<Value> keyComparator =
|
||||
new Comparator<Value>() {
|
||||
@Override
|
||||
public int compare(Value o1, Value o2) {
|
||||
int ia = o1.key;
|
||||
@@ -100,19 +101,20 @@ public class FlexBuffersBuilder {
|
||||
do {
|
||||
c1 = bb.get(ia);
|
||||
c2 = bb.get(io);
|
||||
if (c1 == 0)
|
||||
return c1 - c2;
|
||||
if (c1 == 0) return c1 - c2;
|
||||
ia++;
|
||||
io++;
|
||||
}
|
||||
while (c1 == c2);
|
||||
} while (c1 == c2);
|
||||
return c1 - c2;
|
||||
}
|
||||
};
|
||||
|
||||
/// @endcond
|
||||
|
||||
/**
|
||||
* Constructs a newly allocated {@code FlexBuffersBuilder} with {@link #BUILDER_FLAG_SHARE_KEYS} set.
|
||||
* Constructs a newly allocated {@code FlexBuffersBuilder} with {@link #BUILDER_FLAG_SHARE_KEYS}
|
||||
* set.
|
||||
*
|
||||
* @param bufSize size of buffer in bytes.
|
||||
*/
|
||||
public FlexBuffersBuilder(int bufSize) {
|
||||
@@ -120,7 +122,8 @@ public class FlexBuffersBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a newly allocated {@code FlexBuffersBuilder} with {@link #BUILDER_FLAG_SHARE_KEYS} set.
|
||||
* Constructs a newly allocated {@code FlexBuffersBuilder} with {@link #BUILDER_FLAG_SHARE_KEYS}
|
||||
* set.
|
||||
*/
|
||||
public FlexBuffersBuilder() {
|
||||
this(256);
|
||||
@@ -143,17 +146,16 @@ public class FlexBuffersBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a newly allocated {@code FlexBuffersBuilder}.
|
||||
* By default same keys will be serialized only once
|
||||
* Constructs a newly allocated {@code FlexBuffersBuilder}. By default same keys will be
|
||||
* serialized only once
|
||||
*
|
||||
* @param bb `ByteBuffer` that will hold the message
|
||||
*/
|
||||
public FlexBuffersBuilder(ByteBuffer bb) {
|
||||
this(bb, BUILDER_FLAG_SHARE_KEYS);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the FlexBuffersBuilder by purging all data that it holds.
|
||||
*/
|
||||
/** Reset the FlexBuffersBuilder by purging all data that it holds. */
|
||||
public void clear() {
|
||||
bb.clear();
|
||||
stack.clear();
|
||||
@@ -163,8 +165,8 @@ public class FlexBuffersBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Return `ByteBuffer` containing FlexBuffer message. {@code #finish()} must be called before calling this
|
||||
* function otherwise an assert will trigger.
|
||||
* Return `ByteBuffer` containing FlexBuffer message. {@code #finish()} must be called before
|
||||
* calling this function otherwise an assert will trigger.
|
||||
*
|
||||
* @return `ByteBuffer` with finished message
|
||||
*/
|
||||
@@ -173,15 +175,14 @@ public class FlexBuffersBuilder {
|
||||
return bb;
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a null value into the buffer
|
||||
*/
|
||||
/** Insert a null value into the buffer */
|
||||
public void putNull() {
|
||||
putNull(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a null value into the buffer
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
*/
|
||||
public void putNull(String key) {
|
||||
@@ -190,6 +191,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Insert a single boolean into the buffer
|
||||
*
|
||||
* @param val true or false
|
||||
*/
|
||||
public void putBoolean(boolean val) {
|
||||
@@ -198,6 +200,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Insert a single boolean into the buffer
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param val true or false
|
||||
*/
|
||||
@@ -231,6 +234,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a integer into the buff
|
||||
*
|
||||
* @param val integer
|
||||
*/
|
||||
public void putInt(int val) {
|
||||
@@ -239,6 +243,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a integer into the buff
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param val integer
|
||||
*/
|
||||
@@ -248,6 +253,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a integer into the buff
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param val 64-bit integer
|
||||
*/
|
||||
@@ -266,6 +272,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a 64-bit integer into the buff
|
||||
*
|
||||
* @param value integer
|
||||
*/
|
||||
public void putInt(long value) {
|
||||
@@ -274,6 +281,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a unsigned integer into the buff.
|
||||
*
|
||||
* @param value integer representing unsigned value
|
||||
*/
|
||||
public void putUInt(int value) {
|
||||
@@ -282,6 +290,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a unsigned integer (stored in a signed 64-bit integer) into the buff.
|
||||
*
|
||||
* @param value integer representing unsigned value
|
||||
*/
|
||||
public void putUInt(long value) {
|
||||
@@ -289,8 +298,9 @@ public class FlexBuffersBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a 64-bit unsigned integer (stored as {@link BigInteger}) into the buff.
|
||||
* Warning: This operation might be very slow.
|
||||
* Adds a 64-bit unsigned integer (stored as {@link BigInteger}) into the buff. Warning: This
|
||||
* operation might be very slow.
|
||||
*
|
||||
* @param value integer representing unsigned value
|
||||
*/
|
||||
public void putUInt64(BigInteger value) {
|
||||
@@ -321,6 +331,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a 32-bit float into the buff.
|
||||
*
|
||||
* @param value float representing value
|
||||
*/
|
||||
public void putFloat(float value) {
|
||||
@@ -329,6 +340,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a 32-bit float into the buff.
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param value float representing value
|
||||
*/
|
||||
@@ -338,6 +350,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a 64-bit float into the buff.
|
||||
*
|
||||
* @param value float representing value
|
||||
*/
|
||||
public void putFloat(double value) {
|
||||
@@ -346,6 +359,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a 64-bit float into the buff.
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param value float representing value
|
||||
*/
|
||||
@@ -355,6 +369,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a String into the buffer
|
||||
*
|
||||
* @param value string
|
||||
* @return start position of string in the buffer
|
||||
*/
|
||||
@@ -364,6 +379,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a String into the buffer
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param value string
|
||||
* @return start position of string in the buffer
|
||||
@@ -425,15 +441,24 @@ public class FlexBuffersBuilder {
|
||||
|
||||
private void writeInt(long value, int byteWidth) {
|
||||
switch (byteWidth) {
|
||||
case 1: bb.put((byte) value); break;
|
||||
case 2: bb.putShort((short) value); break;
|
||||
case 4: bb.putInt((int) value); break;
|
||||
case 8: bb.putLong(value); break;
|
||||
case 1:
|
||||
bb.put((byte) value);
|
||||
break;
|
||||
case 2:
|
||||
bb.putShort((short) value);
|
||||
break;
|
||||
case 4:
|
||||
bb.putInt((int) value);
|
||||
break;
|
||||
case 8:
|
||||
bb.putLong(value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a byte array into the message
|
||||
*
|
||||
* @param value byte array
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -443,6 +468,7 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Adds a byte array into the message
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @param value byte array
|
||||
* @return position in buffer as the start of byte array
|
||||
@@ -456,8 +482,9 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Start a new vector in the buffer.
|
||||
* @return a reference indicating position of the vector in buffer. This
|
||||
* reference must be passed along when the vector is finished using endVector()
|
||||
*
|
||||
* @return a reference indicating position of the vector in buffer. This reference must be passed
|
||||
* along when the vector is finished using endVector()
|
||||
*/
|
||||
public int startVector() {
|
||||
return stack.size();
|
||||
@@ -465,6 +492,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 beginning of the vector. Returned by {@link startVector()}
|
||||
* @param typed boolean indicating whether vector is typed
|
||||
@@ -483,9 +511,9 @@ public class FlexBuffersBuilder {
|
||||
}
|
||||
|
||||
/**
|
||||
* Finish writing the message into the buffer. After that no other element must
|
||||
* be inserted into the buffer. Also, you must call this function before start using the
|
||||
* FlexBuffer message
|
||||
* Finish writing the message into the buffer. After that no other element must be inserted into
|
||||
* the buffer. Also, you must call this function before start using the FlexBuffer message
|
||||
*
|
||||
* @return `ByteBuffer` containing the FlexBuffer message
|
||||
*/
|
||||
public ByteBuffer finish() {
|
||||
@@ -516,7 +544,8 @@ public class FlexBuffersBuilder {
|
||||
* @param keys Value representing key vector
|
||||
* @return Value representing the created vector
|
||||
*/
|
||||
private Value createVector(int key, int start, int length, boolean typed, boolean fixed, Value keys) {
|
||||
private Value createVector(
|
||||
int key, int start, int length, boolean typed, boolean fixed, Value keys) {
|
||||
if (fixed & !typed)
|
||||
throw new UnsupportedOperationException("Untyped fixed vector is not supported");
|
||||
|
||||
@@ -571,9 +600,13 @@ public class FlexBuffersBuilder {
|
||||
bb.put(stack.get(i).storedPackedType(bitWidth));
|
||||
}
|
||||
}
|
||||
return new Value(key, keys != null ? FBT_MAP
|
||||
: (typed ? FlexBuffers.toTypedVector(vectorType, fixed ? length : 0)
|
||||
: FBT_VECTOR), bitWidth, vloc);
|
||||
return new Value(
|
||||
key,
|
||||
keys != null
|
||||
? FBT_MAP
|
||||
: (typed ? FlexBuffers.toTypedVector(vectorType, fixed ? length : 0) : FBT_VECTOR),
|
||||
bitWidth,
|
||||
vloc);
|
||||
}
|
||||
|
||||
private void writeOffset(long val, int byteWidth) {
|
||||
@@ -609,8 +642,9 @@ public class FlexBuffersBuilder {
|
||||
|
||||
/**
|
||||
* Start a new map in the buffer.
|
||||
* @return a reference indicating position of the map in buffer. This
|
||||
* reference must be passed along when the map is finished using endMap()
|
||||
*
|
||||
* @return a reference indicating position of the map in buffer. This reference must be passed
|
||||
* along when the map is finished using endMap()
|
||||
*/
|
||||
public int startMap() {
|
||||
return stack.size();
|
||||
@@ -618,6 +652,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 beginning of the map. Returned by {@link startMap()}
|
||||
* @return Reference to the map
|
||||
@@ -643,7 +678,8 @@ public class FlexBuffersBuilder {
|
||||
int prefixElems = 1;
|
||||
// Check bit widths and types for all elements.
|
||||
for (int i = start; i < stack.size(); i++) {
|
||||
int elemWidth = Value.elemWidth(FBT_KEY, WIDTH_8, stack.get(i).key, bb.writePosition(), i + prefixElems);
|
||||
int elemWidth =
|
||||
Value.elemWidth(FBT_KEY, WIDTH_8, stack.get(i).key, bb.writePosition(), i + prefixElems);
|
||||
bitWidth = Math.max(bitWidth, elemWidth);
|
||||
}
|
||||
|
||||
@@ -766,7 +802,8 @@ public class FlexBuffersBuilder {
|
||||
return elemWidth(type, minBitWidth, iValue, bufSize, elemIndex);
|
||||
}
|
||||
|
||||
private static int elemWidth(int type, int minBitWidth, long iValue, int bufSize, int elemIndex) {
|
||||
private static int elemWidth(
|
||||
int type, int minBitWidth, long iValue, int bufSize, int elemIndex) {
|
||||
if (FlexBuffers.isTypeInline(type)) {
|
||||
return minBitWidth;
|
||||
} else {
|
||||
@@ -785,8 +822,7 @@ public class FlexBuffersBuilder {
|
||||
long offset = offsetLoc - iValue;
|
||||
// Does it fit?
|
||||
int bitWidth = widthUInBits(offset);
|
||||
if (((1L) << bitWidth) == byteWidth)
|
||||
return bitWidth;
|
||||
if (((1L) << bitWidth) == byteWidth) return bitWidth;
|
||||
}
|
||||
assert (false); // Must match one of the sizes above.
|
||||
return WIDTH_64;
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of float values.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of float values. */
|
||||
public final class FloatVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class FloatVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public FloatVector __assign(int _vector, ByteBuffer _bb) {
|
||||
__reset(_vector, Constants.SIZEOF_FLOAT, _bb); return this;
|
||||
__reset(_vector, Constants.SIZEOF_FLOAT, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of signed or unsigned 32-bit values.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of signed or unsigned 32-bit values. */
|
||||
public final class IntVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class IntVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public IntVector __assign(int _vector, ByteBuffer _bb) {
|
||||
__reset(_vector, Constants.SIZEOF_INT, _bb); return this;
|
||||
__reset(_vector, Constants.SIZEOF_INT, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of long values.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of long values. */
|
||||
public final class LongVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class LongVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public LongVector __assign(int _vector, ByteBuffer _bb) {
|
||||
__reset(_vector, Constants.SIZEOF_LONG, _bb); return this;
|
||||
__reset(_vector, Constants.SIZEOF_LONG, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
/**
|
||||
* Represent a chunk of data, where FlexBuffers will read from.
|
||||
*/
|
||||
/** Represent a chunk of data, where FlexBuffers will read from. */
|
||||
public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read boolean from data. Booleans as stored as single byte
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return boolean element
|
||||
*/
|
||||
@@ -14,6 +13,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a byte from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a byte
|
||||
*/
|
||||
@@ -21,6 +21,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a short from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a short
|
||||
*/
|
||||
@@ -28,6 +29,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 32-bit int from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return an int
|
||||
*/
|
||||
@@ -35,6 +37,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 64-bit long from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a long
|
||||
*/
|
||||
@@ -42,6 +45,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 32-bit float from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a float
|
||||
*/
|
||||
@@ -49,6 +53,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 64-bit float from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a double
|
||||
*/
|
||||
@@ -56,6 +61,7 @@ public interface ReadBuf {
|
||||
|
||||
/**
|
||||
* Read an UTF-8 string from data.
|
||||
*
|
||||
* @param start initial element of the string
|
||||
* @param size size of the string in bytes.
|
||||
* @return a {@code String}
|
||||
@@ -63,19 +69,19 @@ public interface ReadBuf {
|
||||
String getString(int start, int size);
|
||||
|
||||
/**
|
||||
* Expose ReadBuf as an array of bytes.
|
||||
* This method is meant to be as efficient as possible, so for a array-backed ReadBuf, it should
|
||||
* return its own internal data. In case access to internal data is not possible,
|
||||
* a copy of the data into an array of bytes might occur.
|
||||
* Expose ReadBuf as an array of bytes. This method is meant to be as efficient as possible, so
|
||||
* for a array-backed ReadBuf, it should return its own internal data. In case access to internal
|
||||
* data is not possible, a copy of the data into an array of bytes might occur.
|
||||
*
|
||||
* @return ReadBuf as an array of bytes
|
||||
*/
|
||||
byte[] data();
|
||||
|
||||
/**
|
||||
* Defines the size of the message in the buffer. It also determines last position that buffer
|
||||
* can be read. Last byte to be accessed is in position {@code limit() -1}.
|
||||
* Defines the size of the message in the buffer. It also determines last position that buffer can
|
||||
* be read. Last byte to be accessed is in position {@code limit() -1}.
|
||||
*
|
||||
* @return indicate last position
|
||||
*/
|
||||
int limit();
|
||||
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@ package com.google.flatbuffers;
|
||||
public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Clears (resets) the buffer so that it can be reused. Write position will be set to the
|
||||
* start.
|
||||
* Clears (resets) the buffer so that it can be reused. Write position will be set to the start.
|
||||
*/
|
||||
void clear();
|
||||
|
||||
/**
|
||||
* Put a boolean into the buffer at {@code writePosition()} . Booleans as stored as single
|
||||
* byte. Write position will be incremented.
|
||||
* Put a boolean into the buffer at {@code writePosition()} . Booleans as stored as single byte.
|
||||
* Write position will be incremented.
|
||||
*
|
||||
* @return boolean element
|
||||
*/
|
||||
void putBoolean(boolean value);
|
||||
@@ -22,6 +22,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
/**
|
||||
* Put an array of bytes into the buffer at {@code writePosition()}. Write position will be
|
||||
* incremented.
|
||||
*
|
||||
* @param value the data to be copied
|
||||
* @param start initial position on value to be copied
|
||||
* @param length amount of bytes to be copied
|
||||
@@ -29,8 +30,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
void put(byte[] value, int start, int length);
|
||||
|
||||
/**
|
||||
* Write a byte into the buffer at {@code writePosition()}. Write position will be
|
||||
* incremented.
|
||||
* Write a byte into the buffer at {@code writePosition()}. Write position will be incremented.
|
||||
*/
|
||||
void put(byte value);
|
||||
|
||||
@@ -66,12 +66,14 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Write boolean into a given position on the buffer. Booleans as stored as single byte.
|
||||
*
|
||||
* @param index position of the element in buffer
|
||||
*/
|
||||
void setBoolean(int index, boolean value);
|
||||
|
||||
/**
|
||||
* Read a byte from data.
|
||||
*
|
||||
* @param index position of the element in the buffer
|
||||
* @return a byte
|
||||
*/
|
||||
@@ -79,6 +81,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Write an array of bytes into the buffer.
|
||||
*
|
||||
* @param index initial position of the buffer to be written
|
||||
* @param value the data to be copied
|
||||
* @param start initial position on value to be copied
|
||||
@@ -88,6 +91,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a short from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a short
|
||||
*/
|
||||
@@ -95,6 +99,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 32-bit int from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return an int
|
||||
*/
|
||||
@@ -102,6 +107,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 64-bit long from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a long
|
||||
*/
|
||||
@@ -109,6 +115,7 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 32-bit float from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a float
|
||||
*/
|
||||
@@ -116,27 +123,27 @@ public interface ReadWriteBuf extends ReadBuf {
|
||||
|
||||
/**
|
||||
* Read a 64-bit float from data.
|
||||
*
|
||||
* @param index position of the element in ReadBuf
|
||||
* @return a double
|
||||
*/
|
||||
void setDouble(int index, double value);
|
||||
|
||||
|
||||
int writePosition();
|
||||
|
||||
/**
|
||||
* Defines the size of the message in the buffer. It also determines last position that buffer
|
||||
* can be read or write. Last byte to be accessed is in position {@code limit() -1}.
|
||||
* Defines the size of the message in the buffer. It also determines last position that buffer can
|
||||
* be read or write. Last byte to be accessed is in position {@code limit() -1}.
|
||||
*
|
||||
* @return indicate last position
|
||||
*/
|
||||
int limit();
|
||||
|
||||
/**
|
||||
* Request capacity of the buffer. In case buffer is already larger
|
||||
* than the requested, this method will just return true. Otherwise
|
||||
* It might try to resize the buffer.
|
||||
* Request capacity of the buffer. In case buffer is already larger than the requested, this
|
||||
* method will just return true. Otherwise It might try to resize the buffer.
|
||||
*
|
||||
* @return true if buffer is able to offer
|
||||
* the requested capacity
|
||||
* @return true if buffer is able to offer the requested capacity
|
||||
*/
|
||||
boolean requestCapacity(int capacity);
|
||||
}
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of signed or unsigned 16-bit values.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of signed or unsigned 16-bit values. */
|
||||
public final class ShortVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -34,7 +31,8 @@ public final class ShortVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public ShortVector __assign(int _vector, ByteBuffer _bb) {
|
||||
__reset(_vector, Constants.SIZEOF_SHORT, _bb); return this;
|
||||
__reset(_vector, Constants.SIZEOF_SHORT, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -48,8 +46,8 @@ public final class ShortVector extends BaseVector {
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads the short at the given index, zero-extends it to type int, and returns the result,
|
||||
* which is therefore in the range 0 through 65535.
|
||||
* Reads the short at the given index, zero-extends it to type int, and returns the result, which
|
||||
* is therefore in the range 0 through 65535.
|
||||
*
|
||||
* @param j The index from which the short value will be read.
|
||||
* @return the unsigned 16-bit at the given index.
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of String.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of String. */
|
||||
public final class StringVector extends BaseVector {
|
||||
private Utf8 utf8 = Utf8.getDefault();
|
||||
|
||||
@@ -37,7 +34,8 @@ public final class StringVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public StringVector __assign(int _vector, int _element_size, ByteBuffer _bb) {
|
||||
__reset(_vector, _element_size, _bb); return this;
|
||||
__reset(_vector, _element_size, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -20,19 +20,18 @@ import java.nio.ByteBuffer;
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
|
||||
/**
|
||||
* All structs in the generated code derive from this class, and add their own accessors.
|
||||
*/
|
||||
/** All structs in the generated code derive from this class, and add their own accessors. */
|
||||
public class Struct {
|
||||
/** Used to hold the position of the `bb` buffer. */
|
||||
protected int bb_pos;
|
||||
|
||||
/** The underlying ByteBuffer to hold the data of the Struct. */
|
||||
protected ByteBuffer bb;
|
||||
|
||||
/**
|
||||
* Re-init the internal state with an external buffer {@code ByteBuffer} and an offset within.
|
||||
*
|
||||
* This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* <p>This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references.
|
||||
*/
|
||||
protected void __reset(int _i, ByteBuffer _bb) {
|
||||
@@ -47,8 +46,8 @@ public class Struct {
|
||||
/**
|
||||
* Resets internal state with a null {@code ByteBuffer} and a zero position.
|
||||
*
|
||||
* This method exists primarily to allow recycling Struct instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references. The instance will be unusable until it is assigned
|
||||
* <p>This method exists primarily to allow recycling Struct instances without risking memory
|
||||
* leaks due to {@code ByteBuffer} references. The instance will be unusable until it is assigned
|
||||
* again to a {@code ByteBuffer}.
|
||||
*
|
||||
* @param struct the instance to reset to initial state
|
||||
|
||||
@@ -17,23 +17,26 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
|
||||
/// @cond FLATBUFFERS_INTERNAL
|
||||
|
||||
/**
|
||||
* All tables in the generated code derive from this class, and add their own accessors.
|
||||
*/
|
||||
/** All tables in the generated code derive from this class, and add their own accessors. */
|
||||
public class Table {
|
||||
/** Used to hold the position of the `bb` buffer. */
|
||||
protected int bb_pos;
|
||||
|
||||
/** The underlying ByteBuffer to hold the data of the Table. */
|
||||
protected ByteBuffer bb;
|
||||
|
||||
/** Used to hold the vtable position. */
|
||||
private int vtable_start;
|
||||
|
||||
/** Used to hold the vtable size. */
|
||||
private int vtable_size;
|
||||
|
||||
Utf8 utf8 = Utf8.getDefault();
|
||||
|
||||
/**
|
||||
@@ -41,7 +44,9 @@ public class Table {
|
||||
*
|
||||
* @return Returns the Table's ByteBuffer.
|
||||
*/
|
||||
public ByteBuffer getByteBuffer() { return bb; }
|
||||
public ByteBuffer getByteBuffer() {
|
||||
return bb;
|
||||
}
|
||||
|
||||
/**
|
||||
* Look up a field in the vtable.
|
||||
@@ -82,10 +87,10 @@ public class Table {
|
||||
/**
|
||||
* Create a Java `String` from UTF-8 data stored inside the FlatBuffer.
|
||||
*
|
||||
* This allocates a new string and converts to wide chars upon each access,
|
||||
* which is not very efficient. Instead, each FlatBuffer string also comes with an
|
||||
* accessor based on __vector_as_bytebuffer below, which is much more efficient,
|
||||
* assuming your Java program can handle UTF-8 data directly.
|
||||
* <p>This allocates a new string and converts to wide chars upon each access, which is not very
|
||||
* efficient. Instead, each FlatBuffer string also comes with an accessor based on
|
||||
* __vector_as_bytebuffer below, which is much more efficient, assuming your Java program can
|
||||
* handle UTF-8 data directly.
|
||||
*
|
||||
* @param offset An `int` index into the Table's ByteBuffer.
|
||||
* @return Returns a `String` from the data stored inside the FlatBuffer at `offset`.
|
||||
@@ -97,10 +102,10 @@ public class Table {
|
||||
/**
|
||||
* Create a Java `String` from UTF-8 data stored inside the FlatBuffer.
|
||||
*
|
||||
* This allocates a new string and converts to wide chars upon each access,
|
||||
* which is not very efficient. Instead, each FlatBuffer string also comes with an
|
||||
* accessor based on __vector_as_bytebuffer below, which is much more efficient,
|
||||
* assuming your Java program can handle UTF-8 data directly.
|
||||
* <p>This allocates a new string and converts to wide chars upon each access, which is not very
|
||||
* efficient. Instead, each FlatBuffer string also comes with an accessor based on
|
||||
* __vector_as_bytebuffer below, which is much more efficient, assuming your Java program can
|
||||
* handle UTF-8 data directly.
|
||||
*
|
||||
* @param offset An `int` index into the Table's ByteBuffer.
|
||||
* @param bb Table ByteBuffer used to read a string at given offset.
|
||||
@@ -139,9 +144,9 @@ public class Table {
|
||||
/**
|
||||
* Get a whole vector as a ByteBuffer.
|
||||
*
|
||||
* This is efficient, since it only allocates a new {@link ByteBuffer} object,
|
||||
* but does not actually copy the data, it still refers to the same bytes
|
||||
* as the original ByteBuffer. Also useful with nested FlatBuffers, etc.
|
||||
* <p>This is efficient, since it only allocates a new {@link ByteBuffer} object, but does not
|
||||
* actually copy the data, it still refers to the same bytes as the original ByteBuffer. Also
|
||||
* useful with nested FlatBuffers, etc.
|
||||
*
|
||||
* @param vector_offset The position of the vector in the byte buffer
|
||||
* @param elem_size The size of each element in the array
|
||||
@@ -160,8 +165,8 @@ public class Table {
|
||||
/**
|
||||
* Initialize vector as a ByteBuffer.
|
||||
*
|
||||
* This is more efficient than using duplicate, since it doesn't copy the data
|
||||
* nor allocattes a new {@link ByteBuffer}, creating no garbage to be collected.
|
||||
* <p>This is more efficient than using duplicate, since it doesn't copy the data nor allocattes a
|
||||
* new {@link ByteBuffer}, creating no garbage to be collected.
|
||||
*
|
||||
* @param bb The {@link ByteBuffer} for the array
|
||||
* @param vector_offset The position of the vector in the byte buffer
|
||||
@@ -205,15 +210,14 @@ public class Table {
|
||||
/**
|
||||
* Check if a {@link ByteBuffer} contains a file identifier.
|
||||
*
|
||||
* @param bb A {@code ByteBuffer} to check if it contains the identifier
|
||||
* `ident`.
|
||||
* @param bb A {@code ByteBuffer} to check if it contains the identifier `ident`.
|
||||
* @param ident A `String` identifier of the FlatBuffer file.
|
||||
* @return True if the buffer contains the file identifier
|
||||
*/
|
||||
protected static boolean __has_identifier(ByteBuffer bb, String ident) {
|
||||
if (ident.length() != FILE_IDENTIFIER_LENGTH)
|
||||
throw new AssertionError("FlatBuffers: file identifier must be length " +
|
||||
FILE_IDENTIFIER_LENGTH);
|
||||
throw new AssertionError(
|
||||
"FlatBuffers: file identifier must be length " + FILE_IDENTIFIER_LENGTH);
|
||||
for (int i = 0; i < FILE_IDENTIFIER_LENGTH; i++) {
|
||||
if (ident.charAt(i) != (char) bb.get(bb.position() + SIZEOF_INT + i)) return false;
|
||||
}
|
||||
@@ -229,7 +233,9 @@ public class Table {
|
||||
protected void sortTables(int[] offsets, final ByteBuffer bb) {
|
||||
Integer[] off = new Integer[offsets.length];
|
||||
for (int i = 0; i < offsets.length; i++) off[i] = offsets[i];
|
||||
java.util.Arrays.sort(off, new java.util.Comparator<Integer>() {
|
||||
java.util.Arrays.sort(
|
||||
off,
|
||||
new java.util.Comparator<Integer>() {
|
||||
public int compare(Integer o1, Integer o2) {
|
||||
return keysCompare(o1, o2, bb);
|
||||
}
|
||||
@@ -244,7 +250,9 @@ public class Table {
|
||||
* @param o2 An 'Integer' index of the second key into the bb.
|
||||
* @param bb A {@code ByteBuffer} to get the keys.
|
||||
*/
|
||||
protected int keysCompare(Integer o1, Integer o2, ByteBuffer bb) { return 0; }
|
||||
protected int keysCompare(Integer o1, Integer o2, ByteBuffer bb) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Compare two strings in the buffer.
|
||||
@@ -282,8 +290,7 @@ public class Table {
|
||||
int startPos_1 = offset_1 + Constants.SIZEOF_INT;
|
||||
int len = Math.min(len_1, len_2);
|
||||
for (int i = 0; i < len; i++) {
|
||||
if (bb.get(i + startPos_1) != key[i])
|
||||
return bb.get(i + startPos_1) - key[i];
|
||||
if (bb.get(i + startPos_1) != key[i]) return bb.get(i + startPos_1) - key[i];
|
||||
}
|
||||
return len_1 - len_2;
|
||||
}
|
||||
@@ -291,7 +298,7 @@ public class Table {
|
||||
/**
|
||||
* Re-init the internal state with an external buffer {@code ByteBuffer} and an offset within.
|
||||
*
|
||||
* This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* <p>This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references.
|
||||
*/
|
||||
protected void __reset(int _i, ByteBuffer _bb) {
|
||||
@@ -310,9 +317,9 @@ public class Table {
|
||||
/**
|
||||
* Resets the internal state with a null {@code ByteBuffer} and a zero position.
|
||||
*
|
||||
* This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references. The instance will be unusable until it is assigned
|
||||
* again to a {@code ByteBuffer}.
|
||||
* <p>This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* due to {@code ByteBuffer} references. The instance will be unusable until it is assigned again
|
||||
* to a {@code ByteBuffer}.
|
||||
*/
|
||||
public void __reset() {
|
||||
__reset(0, null);
|
||||
|
||||
@@ -17,13 +17,10 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
import java.nio.charset.Charset;
|
||||
|
||||
/**
|
||||
* Helper type for accessing vector of unions.
|
||||
*/
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/** Helper type for accessing vector of unions. */
|
||||
public final class UnionVector extends BaseVector {
|
||||
/**
|
||||
* Assigns vector access object to vector data.
|
||||
@@ -35,10 +32,10 @@ public final class UnionVector extends BaseVector {
|
||||
* `vector`.
|
||||
*/
|
||||
public UnionVector __assign(int _vector, int _element_size, ByteBuffer _bb) {
|
||||
__reset(_vector, _element_size, _bb); return this;
|
||||
__reset(_vector, _element_size, _bb);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Initialize any Table-derived type to point to the union at the given `index`.
|
||||
*
|
||||
|
||||
@@ -16,22 +16,22 @@
|
||||
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
import static java.lang.Character.MAX_SURROGATE;
|
||||
import static java.lang.Character.MIN_SURROGATE;
|
||||
import static java.lang.Character.MIN_HIGH_SURROGATE;
|
||||
import static java.lang.Character.MIN_LOW_SURROGATE;
|
||||
import static java.lang.Character.MIN_SUPPLEMENTARY_CODE_POINT;
|
||||
import static java.lang.Character.MIN_SURROGATE;
|
||||
import static java.lang.Character.isSurrogatePair;
|
||||
import static java.lang.Character.toCodePoint;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
public abstract class Utf8 {
|
||||
|
||||
/**
|
||||
* Returns the number of bytes in the UTF-8-encoded form of {@code sequence}. For a string,
|
||||
* this method is equivalent to {@code string.getBytes(UTF_8).length}, but is more efficient in
|
||||
* both time and space.
|
||||
* Returns the number of bytes in the UTF-8-encoded form of {@code sequence}. For a string, this
|
||||
* method is equivalent to {@code string.getBytes(UTF_8).length}, but is more efficient in both
|
||||
* time and space.
|
||||
*
|
||||
* @throws IllegalArgumentException if {@code sequence} contains ill-formed UTF-16 (unpaired
|
||||
* surrogates)
|
||||
@@ -60,6 +60,7 @@ public abstract class Utf8 {
|
||||
|
||||
/**
|
||||
* Get the default UTF-8 processor.
|
||||
*
|
||||
* @return the default processor
|
||||
*/
|
||||
public static Utf8 getDefault() {
|
||||
@@ -71,6 +72,7 @@ public abstract class Utf8 {
|
||||
|
||||
/**
|
||||
* Set the default instance of the UTF-8 processor.
|
||||
*
|
||||
* @param instance the new instance to use
|
||||
*/
|
||||
public static void setDefault(Utf8 instance) {
|
||||
@@ -79,6 +81,7 @@ public abstract class Utf8 {
|
||||
|
||||
/**
|
||||
* Encode a Java's CharSequence UTF8 codepoint into a byte array.
|
||||
*
|
||||
* @param in CharSequence to be encoded
|
||||
* @param start start position of the first char in the codepoint
|
||||
* @param out byte array of 4 bytes to be filled
|
||||
@@ -134,23 +137,17 @@ public abstract class Utf8 {
|
||||
*/
|
||||
static class DecodeUtil {
|
||||
|
||||
/**
|
||||
* Returns whether this is a single-byte codepoint (i.e., ASCII) with the form '0XXXXXXX'.
|
||||
*/
|
||||
/** Returns whether this is a single-byte codepoint (i.e., ASCII) with the form '0XXXXXXX'. */
|
||||
static boolean isOneByte(byte b) {
|
||||
return b >= 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether this is a two-byte codepoint with the form '10XXXXXX'.
|
||||
*/
|
||||
/** Returns whether this is a two-byte codepoint with the form '10XXXXXX'. */
|
||||
static boolean isTwoBytes(byte b) {
|
||||
return b < (byte) 0xE0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether this is a three-byte codepoint with the form '110XXXXX'.
|
||||
*/
|
||||
/** Returns whether this is a three-byte codepoint with the form '110XXXXX'. */
|
||||
static boolean isThreeBytes(byte b) {
|
||||
return b < (byte) 0xF0;
|
||||
}
|
||||
@@ -159,8 +156,7 @@ public abstract class Utf8 {
|
||||
resultArr[resultPos] = (char) byte1;
|
||||
}
|
||||
|
||||
static void handleTwoBytes(
|
||||
byte byte1, byte byte2, char[] resultArr, int resultPos)
|
||||
static void handleTwoBytes(byte byte1, byte byte2, char[] resultArr, int resultPos)
|
||||
throws IllegalArgumentException {
|
||||
// Simultaneously checks for illegal trailing-byte in leading position (<= '11000000') and
|
||||
// overlong 2-byte, '11000001'.
|
||||
@@ -184,7 +180,8 @@ public abstract class Utf8 {
|
||||
|| isNotTrailingByte(byte3)) {
|
||||
throw new IllegalArgumentException("Invalid UTF-8");
|
||||
}
|
||||
resultArr[resultPos] = (char)
|
||||
resultArr[resultPos] =
|
||||
(char)
|
||||
(((byte1 & 0x0F) << 12) | (trailingByteValue(byte2) << 6) | trailingByteValue(byte3));
|
||||
}
|
||||
|
||||
@@ -204,7 +201,8 @@ public abstract class Utf8 {
|
||||
|| isNotTrailingByte(byte4)) {
|
||||
throw new IllegalArgumentException("Invalid UTF-8");
|
||||
}
|
||||
int codepoint = ((byte1 & 0x07) << 18)
|
||||
int codepoint =
|
||||
((byte1 & 0x07) << 18)
|
||||
| (trailingByteValue(byte2) << 12)
|
||||
| (trailingByteValue(byte3) << 6)
|
||||
| trailingByteValue(byte4);
|
||||
@@ -212,23 +210,19 @@ public abstract class Utf8 {
|
||||
resultArr[resultPos + 1] = DecodeUtil.lowSurrogate(codepoint);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the byte is not a valid continuation of the form '10XXXXXX'.
|
||||
*/
|
||||
/** Returns whether the byte is not a valid continuation of the form '10XXXXXX'. */
|
||||
private static boolean isNotTrailingByte(byte b) {
|
||||
return b > (byte) 0xBF;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the actual value of the trailing byte (removes the prefix '10') for composition.
|
||||
*/
|
||||
/** Returns the actual value of the trailing byte (removes the prefix '10') for composition. */
|
||||
private static int trailingByteValue(byte b) {
|
||||
return b & 0x3F;
|
||||
}
|
||||
|
||||
private static char highSurrogate(int codePoint) {
|
||||
return (char) ((MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT >>> 10))
|
||||
+ (codePoint >>> 10));
|
||||
return (char)
|
||||
((MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT >>> 10)) + (codePoint >>> 10));
|
||||
}
|
||||
|
||||
private static char lowSurrogate(int codePoint) {
|
||||
@@ -236,7 +230,8 @@ public abstract class Utf8 {
|
||||
}
|
||||
}
|
||||
|
||||
// These UTF-8 handling methods are copied from Guava's Utf8Unsafe class with a modification to throw
|
||||
// These UTF-8 handling methods are copied from Guava's Utf8Unsafe class with a modification to
|
||||
// throw
|
||||
// a protocol buffer local exception. This exception is then caught in CodedOutputStream so it can
|
||||
// fallback to more lenient behavior.
|
||||
static class UnpairedSurrogateException extends IllegalArgumentException {
|
||||
|
||||
@@ -25,8 +25,8 @@ import java.nio.charset.CoderResult;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
/**
|
||||
* This class implements the Utf8 API using the Java Utf8 encoder. Use
|
||||
* Utf8.setDefault(new Utf8Old()); to use it.
|
||||
* This class implements the Utf8 API using the Java Utf8 encoder. Use Utf8.setDefault(new
|
||||
* Utf8Old()); to use it.
|
||||
*/
|
||||
public class Utf8Old extends Utf8 {
|
||||
|
||||
@@ -64,8 +64,7 @@ public class Utf8Old extends Utf8 {
|
||||
}
|
||||
cache.lastOutput.clear();
|
||||
cache.lastInput = in;
|
||||
CharBuffer wrap = (in instanceof CharBuffer) ?
|
||||
(CharBuffer) in : CharBuffer.wrap(in);
|
||||
CharBuffer wrap = (in instanceof CharBuffer) ? (CharBuffer) in : CharBuffer.wrap(in);
|
||||
CoderResult result = cache.encoder.encode(wrap, cache.lastOutput, true);
|
||||
if (result.isError()) {
|
||||
try {
|
||||
|
||||
@@ -1,41 +1,39 @@
|
||||
package com.google.flatbuffers;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import static java.lang.Character.MAX_SURROGATE;
|
||||
import static java.lang.Character.MIN_SUPPLEMENTARY_CODE_POINT;
|
||||
import static java.lang.Character.MIN_SURROGATE;
|
||||
import static java.lang.Character.isSurrogatePair;
|
||||
import static java.lang.Character.toCodePoint;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
/**
|
||||
* A set of low-level, high-performance static utility methods related
|
||||
* to the UTF-8 character encoding. This class has no dependencies
|
||||
* outside of the core JDK libraries.
|
||||
* A set of low-level, high-performance static utility methods related to the UTF-8 character
|
||||
* encoding. This class has no dependencies outside of the core JDK libraries.
|
||||
*
|
||||
* <p>There are several variants of UTF-8. The one implemented by
|
||||
* this class is the restricted definition of UTF-8 introduced in
|
||||
* Unicode 3.1, which mandates the rejection of "overlong" byte
|
||||
* sequences as well as rejection of 3-byte surrogate codepoint byte
|
||||
* sequences. Note that the UTF-8 decoder included in Oracle's JDK
|
||||
* has been modified to also reject "overlong" byte sequences, but (as
|
||||
* of 2011) still accepts 3-byte surrogate codepoint byte sequences.
|
||||
* <p>There are several variants of UTF-8. The one implemented by this class is the restricted
|
||||
* definition of UTF-8 introduced in Unicode 3.1, which mandates the rejection of "overlong" byte
|
||||
* sequences as well as rejection of 3-byte surrogate codepoint byte sequences. Note that the UTF-8
|
||||
* decoder included in Oracle's JDK has been modified to also reject "overlong" byte sequences, but
|
||||
* (as of 2011) still accepts 3-byte surrogate codepoint byte sequences.
|
||||
*
|
||||
* <p>The byte sequences considered valid by this class are exactly
|
||||
* those that can be roundtrip converted to Strings and back to bytes
|
||||
* using the UTF-8 charset, without loss: <pre> {@code
|
||||
* <p>The byte sequences considered valid by this class are exactly those that can be roundtrip
|
||||
* converted to Strings and back to bytes using the UTF-8 charset, without loss:
|
||||
*
|
||||
* <pre>{@code
|
||||
* Arrays.equals(bytes, new String(bytes, Internal.UTF_8).getBytes(Internal.UTF_8))
|
||||
* }</pre>
|
||||
*
|
||||
* <p>See the Unicode Standard,</br>
|
||||
* Table 3-6. <em>UTF-8 Bit Distribution</em>,</br>
|
||||
* Table 3-7. <em>Well Formed UTF-8 Byte Sequences</em>.
|
||||
* <p>See the Unicode Standard,</br> Table 3-6. <em>UTF-8 Bit Distribution</em>,</br> Table 3-7.
|
||||
* <em>Well Formed UTF-8 Byte Sequences</em>.
|
||||
*/
|
||||
final public class Utf8Safe extends Utf8 {
|
||||
public final class Utf8Safe extends Utf8 {
|
||||
|
||||
/**
|
||||
* Returns the number of bytes in the UTF-8-encoded form of {@code sequence}. For a string,
|
||||
* this method is equivalent to {@code string.getBytes(UTF_8).length}, but is more efficient in
|
||||
* both time and space.
|
||||
* Returns the number of bytes in the UTF-8-encoded form of {@code sequence}. For a string, this
|
||||
* method is equivalent to {@code string.getBytes(UTF_8).length}, but is more efficient in both
|
||||
* time and space.
|
||||
*
|
||||
* @throws IllegalArgumentException if {@code sequence} contains ill-formed UTF-16 (unpaired
|
||||
* surrogates)
|
||||
@@ -64,8 +62,8 @@ final public class Utf8Safe extends Utf8 {
|
||||
|
||||
if (utf8Length < utf16Length) {
|
||||
// Necessary and sufficient condition for overflow because of maximum 3x expansion
|
||||
throw new IllegalArgumentException("UTF-8 length does not fit in int: "
|
||||
+ (utf8Length + (1L << 32)));
|
||||
throw new IllegalArgumentException(
|
||||
"UTF-8 length does not fit in int: " + (utf8Length + (1L << 32)));
|
||||
}
|
||||
return utf8Length;
|
||||
}
|
||||
@@ -167,13 +165,11 @@ final public class Utf8Safe extends Utf8 {
|
||||
return new String(resultArr, 0, resultPos);
|
||||
}
|
||||
|
||||
public static String decodeUtf8Buffer(ByteBuffer buffer, int offset,
|
||||
int length) {
|
||||
public static String decodeUtf8Buffer(ByteBuffer buffer, int offset, int length) {
|
||||
// Bitwise OR combines the sign bits so any negative value fails the check.
|
||||
if ((offset | length | buffer.limit() - offset - length) < 0) {
|
||||
throw new ArrayIndexOutOfBoundsException(
|
||||
String.format("buffer limit=%d, index=%d, limit=%d", buffer.limit(),
|
||||
offset, length));
|
||||
String.format("buffer limit=%d, index=%d, limit=%d", buffer.limit(), offset, length));
|
||||
}
|
||||
|
||||
final int limit = offset + length;
|
||||
@@ -212,8 +208,7 @@ final public class Utf8Safe extends Utf8 {
|
||||
if (offset >= limit) {
|
||||
throw new IllegalArgumentException("Invalid UTF-8");
|
||||
}
|
||||
DecodeUtil.handleTwoBytes(
|
||||
byte1, /* byte2 */ buffer.get(offset++), resultArr, resultPos++);
|
||||
DecodeUtil.handleTwoBytes(byte1, /* byte2 */ buffer.get(offset++), resultArr, resultPos++);
|
||||
} else if (DecodeUtil.isThreeBytes(byte1)) {
|
||||
if (offset >= limit - 1) {
|
||||
throw new IllegalArgumentException("Invalid UTF-8");
|
||||
@@ -263,7 +258,6 @@ final public class Utf8Safe extends Utf8 {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static void encodeUtf8Buffer(CharSequence in, ByteBuffer out) {
|
||||
final int inLength = in.length();
|
||||
int outIx = out.position();
|
||||
@@ -335,8 +329,7 @@ final public class Utf8Safe extends Utf8 {
|
||||
}
|
||||
}
|
||||
|
||||
private static int encodeUtf8Array(CharSequence in, byte[] out,
|
||||
int offset, int length) {
|
||||
private static int encodeUtf8Array(CharSequence in, byte[] out, int offset, int length) {
|
||||
int utf16Length = in.length();
|
||||
int j = offset;
|
||||
int i = 0;
|
||||
@@ -366,8 +359,7 @@ final public class Utf8Safe extends Utf8 {
|
||||
// Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
|
||||
// four UTF-8 bytes
|
||||
final char low;
|
||||
if (i + 1 == in.length()
|
||||
|| !Character.isSurrogatePair(c, (low = in.charAt(++i)))) {
|
||||
if (i + 1 == in.length() || !Character.isSurrogatePair(c, (low = in.charAt(++i)))) {
|
||||
throw new UnpairedSurrogateException((i - 1), utf16Length);
|
||||
}
|
||||
int codePoint = Character.toCodePoint(c, low);
|
||||
@@ -379,8 +371,7 @@ final public class Utf8Safe extends Utf8 {
|
||||
// If we are surrogates and we're not a surrogate pair, always throw an
|
||||
// UnpairedSurrogateException instead of an ArrayOutOfBoundsException.
|
||||
if ((Character.MIN_SURROGATE <= c && c <= Character.MAX_SURROGATE)
|
||||
&& (i + 1 == in.length()
|
||||
|| !Character.isSurrogatePair(c, in.charAt(i + 1)))) {
|
||||
&& (i + 1 == in.length() || !Character.isSurrogatePair(c, in.charAt(i + 1)))) {
|
||||
throw new UnpairedSurrogateException(i, utf16Length);
|
||||
}
|
||||
throw new ArrayIndexOutOfBoundsException("Failed writing " + c + " at index " + j);
|
||||
@@ -402,8 +393,7 @@ final public class Utf8Safe extends Utf8 {
|
||||
public void encodeUtf8(CharSequence in, ByteBuffer out) {
|
||||
if (out.hasArray()) {
|
||||
int start = out.arrayOffset();
|
||||
int end = encodeUtf8Array(in, out.array(), start + out.position(),
|
||||
out.remaining());
|
||||
int end = encodeUtf8Array(in, out.array(), start + out.position(), out.remaining());
|
||||
out.position(end - start);
|
||||
} else {
|
||||
encodeUtf8Buffer(in, out);
|
||||
|
||||
@@ -1,28 +1,23 @@
|
||||
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static com.google.flatbuffers.Constants.*;
|
||||
|
||||
import DictionaryLookup.*;
|
||||
import MyGame.Example.*;
|
||||
import com.google.common.io.ByteStreams;
|
||||
import optional_scalars.ScalarStuff;
|
||||
import optional_scalars.OptionalByte;
|
||||
import NamespaceA.*;
|
||||
import NamespaceA.NamespaceB.*;
|
||||
import com.google.common.io.ByteStreams;
|
||||
import com.google.flatbuffers.ArrayReadWriteBuf;
|
||||
import com.google.flatbuffers.ByteBufferUtil;
|
||||
import com.google.flatbuffers.ByteVector;
|
||||
import com.google.flatbuffers.FlatBufferBuilder;
|
||||
import com.google.flatbuffers.FlexBuffers;
|
||||
import com.google.flatbuffers.FlexBuffers.FlexBufferException;
|
||||
import com.google.flatbuffers.FlexBuffers.KeyVector;
|
||||
import com.google.flatbuffers.FlexBuffers.Reference;
|
||||
import com.google.flatbuffers.FlexBuffers.Vector;
|
||||
import com.google.flatbuffers.FlexBuffersBuilder;
|
||||
import com.google.flatbuffers.StringVector;
|
||||
import com.google.flatbuffers.UnionVector;
|
||||
|
||||
import com.google.flatbuffers.FlexBuffers.FlexBufferException;
|
||||
import com.google.flatbuffers.FlexBuffers.Reference;
|
||||
import com.google.flatbuffers.FlexBuffers.Vector;
|
||||
import com.google.flatbuffers.ArrayReadWriteBuf;
|
||||
import com.google.flatbuffers.FlexBuffers.KeyVector;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
@@ -31,12 +26,13 @@ import java.nio.charset.StandardCharsets;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import optional_scalars.OptionalByte;
|
||||
import optional_scalars.ScalarStuff;
|
||||
import org.junit.Rule;
|
||||
import org.junit.rules.TemporaryFolder;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
|
||||
|
||||
/*
|
||||
* Copyright 2014 Google Inc. All rights reserved.
|
||||
*
|
||||
@@ -56,14 +52,14 @@ import org.junit.runners.JUnit4;
|
||||
@RunWith(JUnit4.class)
|
||||
public class JavaTest {
|
||||
|
||||
@Rule
|
||||
public TemporaryFolder tempFolder = new TemporaryFolder();
|
||||
@Rule public TemporaryFolder tempFolder = new TemporaryFolder();
|
||||
|
||||
@org.junit.Test
|
||||
public void mainTest() throws IOException {
|
||||
// First, let's test reading a FlatBuffer generated by C++ code:
|
||||
// This file was generated from monsterdata_test.json
|
||||
byte[] data = ByteStreams.toByteArray(
|
||||
byte[] data =
|
||||
ByteStreams.toByteArray(
|
||||
JavaTest.class.getClassLoader().getResourceAsStream("monsterdata_test.mon"));
|
||||
|
||||
// Now test it:
|
||||
@@ -121,23 +117,20 @@ public class JavaTest {
|
||||
|
||||
assertThat(monster.inventoryLength()).isEqualTo(5);
|
||||
int invsum = 0;
|
||||
for (int i = 0; i < monster.inventoryLength(); i++)
|
||||
invsum += monster.inventory(i);
|
||||
for (int i = 0; i < monster.inventoryLength(); i++) invsum += monster.inventory(i);
|
||||
assertThat(invsum).isEqualTo(10);
|
||||
|
||||
// Method using a vector access object:
|
||||
ByteVector inventoryVector = monster.inventoryVector();
|
||||
assertThat(inventoryVector.length()).isEqualTo(5);
|
||||
invsum = 0;
|
||||
for (int i = 0; i < inventoryVector.length(); i++)
|
||||
invsum += inventoryVector.getAsUnsigned(i);
|
||||
for (int i = 0; i < inventoryVector.length(); i++) invsum += inventoryVector.getAsUnsigned(i);
|
||||
assertThat(invsum).isEqualTo(10);
|
||||
|
||||
// Alternative way of accessing a vector:
|
||||
ByteBuffer ibb = monster.inventoryAsByteBuffer();
|
||||
invsum = 0;
|
||||
while (ibb.position() < ibb.limit())
|
||||
invsum += ibb.get();
|
||||
while (ibb.position() < ibb.limit()) invsum += ibb.get();
|
||||
assertThat(invsum).isEqualTo(10);
|
||||
|
||||
Test test_0 = monster.test4(0);
|
||||
@@ -174,8 +167,8 @@ public class JavaTest {
|
||||
assertThat(monster.testhashu32Fnv1()).isEqualTo((Integer.MAX_VALUE + 1L));
|
||||
}
|
||||
|
||||
|
||||
@org.junit.Test public void TestNamespaceNesting() {
|
||||
@org.junit.Test
|
||||
public void TestNamespaceNesting() {
|
||||
// reference / manipulate these to verify compilation
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(1);
|
||||
|
||||
@@ -188,7 +181,8 @@ public class JavaTest {
|
||||
int off = TableInFirstNS.endTableInFirstNS(fbb);
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestNestedFlatBuffer() {
|
||||
@org.junit.Test
|
||||
public void TestNestedFlatBuffer() {
|
||||
final String nestedMonsterName = "NestedMonsterName";
|
||||
final short nestedMonsterHp = 600;
|
||||
final short nestedMonsterMana = 1024;
|
||||
@@ -224,7 +218,8 @@ public class JavaTest {
|
||||
assertThat(nestedMonsterName).isEqualTo(nestedMonster.name());
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestCreateByteVector() {
|
||||
@org.junit.Test
|
||||
public void TestCreateByteVector() {
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(16);
|
||||
int str = fbb.createString("MyMonster");
|
||||
byte[] inventory = new byte[] {0, 1, 2, 3, 4};
|
||||
@@ -242,11 +237,11 @@ public class JavaTest {
|
||||
assertThat(inventoryVector.getAsUnsigned(1)).isEqualTo((int) inventory[1]);
|
||||
assertThat(inventoryVector.length()).isEqualTo(inventory.length);
|
||||
|
||||
assertThat(ByteBuffer.wrap(inventory)).isEqualTo(
|
||||
monsterObject.inventoryAsByteBuffer());
|
||||
assertThat(ByteBuffer.wrap(inventory)).isEqualTo(monsterObject.inventoryAsByteBuffer());
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestCreateUninitializedVector() {
|
||||
@org.junit.Test
|
||||
public void TestCreateUninitializedVector() {
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(16);
|
||||
int str = fbb.createString("MyMonster");
|
||||
byte[] inventory = new byte[] {0, 1, 2, 3, 4};
|
||||
@@ -267,11 +262,11 @@ public class JavaTest {
|
||||
ByteVector inventoryVector = monsterObject.inventoryVector();
|
||||
assertThat(inventoryVector.getAsUnsigned(1)).isEqualTo((int) inventory[1]);
|
||||
assertThat(inventoryVector.length()).isEqualTo(inventory.length);
|
||||
assertThat(ByteBuffer.wrap(inventory)).isEqualTo(
|
||||
monsterObject.inventoryAsByteBuffer());
|
||||
assertThat(ByteBuffer.wrap(inventory)).isEqualTo(monsterObject.inventoryAsByteBuffer());
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestByteBufferFactory() throws IOException {
|
||||
@org.junit.Test
|
||||
public void TestByteBufferFactory() throws IOException {
|
||||
File file = tempFolder.newFile("javatest.bin");
|
||||
final class MappedByteBufferFactory extends FlatBufferBuilder.ByteBufferFactory {
|
||||
@Override
|
||||
@@ -279,7 +274,10 @@ public class JavaTest {
|
||||
ByteBuffer bb;
|
||||
try {
|
||||
RandomAccessFile f = new RandomAccessFile(file, "rw");
|
||||
bb = f.getChannel().map(FileChannel.MapMode.READ_WRITE, 0, capacity).order(ByteOrder.LITTLE_ENDIAN);
|
||||
bb =
|
||||
f.getChannel()
|
||||
.map(FileChannel.MapMode.READ_WRITE, 0, capacity)
|
||||
.order(ByteOrder.LITTLE_ENDIAN);
|
||||
f.close();
|
||||
} catch (Throwable e) {
|
||||
System.out.println("FlatBuffers test: couldn't map ByteBuffer to a file");
|
||||
@@ -294,7 +292,8 @@ public class JavaTest {
|
||||
TestBuilderBasics(fbb, false);
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestSizedInputStream() {
|
||||
@org.junit.Test
|
||||
public void TestSizedInputStream() {
|
||||
// Test on default FlatBufferBuilder that uses HeapByteBuffer
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(1);
|
||||
|
||||
@@ -319,7 +318,9 @@ public class JavaTest {
|
||||
}
|
||||
|
||||
void TestBuilderBasics(FlatBufferBuilder fbb, boolean sizePrefix) {
|
||||
int[] names = {fbb.createString("Frodo"), fbb.createString("Barney"), fbb.createString("Wilma")};
|
||||
int[] names = {
|
||||
fbb.createString("Frodo"), fbb.createString("Barney"), fbb.createString("Wilma")
|
||||
};
|
||||
int[] off = new int[3];
|
||||
Monster.startMonster(fbb);
|
||||
Monster.addName(fbb, names[0]);
|
||||
@@ -348,14 +349,13 @@ public class JavaTest {
|
||||
Test.createTest(fbb, (short) 30, (byte) 40);
|
||||
int test4 = fbb.endVector();
|
||||
|
||||
int testArrayOfString = Monster.createTestarrayofstringVector(fbb, new int[] {
|
||||
fbb.createString("test1"),
|
||||
fbb.createString("test2")
|
||||
});
|
||||
int testArrayOfString =
|
||||
Monster.createTestarrayofstringVector(
|
||||
fbb, new int[] {fbb.createString("test1"), fbb.createString("test2")});
|
||||
|
||||
Monster.startMonster(fbb);
|
||||
Monster.addPos(fbb, Vec3.createVec3(fbb, 1.0f, 2.0f, 3.0f, 3.0,
|
||||
Color.Green, (short)5, (byte)6));
|
||||
Monster.addPos(
|
||||
fbb, Vec3.createVec3(fbb, 1.0f, 2.0f, 3.0f, 3.0, Color.Green, (short) 5, (byte) 6));
|
||||
Monster.addHp(fbb, (short) 80);
|
||||
Monster.addName(fbb, str);
|
||||
Monster.addInventory(fbb, inv);
|
||||
@@ -392,8 +392,8 @@ public class JavaTest {
|
||||
// Test it:
|
||||
ByteBuffer dataBuffer = fbb.dataBuffer();
|
||||
if (sizePrefix) {
|
||||
assertThat(ByteBufferUtil.getSizePrefix(dataBuffer) + SIZE_PREFIX_LENGTH).isEqualTo(
|
||||
dataBuffer.remaining());
|
||||
assertThat(ByteBufferUtil.getSizePrefix(dataBuffer) + SIZE_PREFIX_LENGTH)
|
||||
.isEqualTo(dataBuffer.remaining());
|
||||
dataBuffer = ByteBufferUtil.removeSizePrefix(dataBuffer);
|
||||
}
|
||||
TestExtendedBuffer(dataBuffer);
|
||||
@@ -463,16 +463,19 @@ public class JavaTest {
|
||||
assertThat(pos.x()).isEqualTo(1.0f);
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestVectorOfUnions() {
|
||||
@org.junit.Test
|
||||
public void TestVectorOfUnions() {
|
||||
final FlatBufferBuilder fbb = new FlatBufferBuilder();
|
||||
|
||||
final int swordAttackDamage = 1;
|
||||
|
||||
final int[] characterVector = new int[] {
|
||||
final int[] characterVector =
|
||||
new int[] {
|
||||
Attacker.createAttacker(fbb, swordAttackDamage),
|
||||
};
|
||||
|
||||
final byte[] characterTypeVector = new byte[]{
|
||||
final byte[] characterTypeVector =
|
||||
new byte[] {
|
||||
Character.MuLan,
|
||||
};
|
||||
|
||||
@@ -483,9 +486,7 @@ public class JavaTest {
|
||||
(byte) 0,
|
||||
(byte) 0,
|
||||
Movie.createCharactersTypeVector(fbb, characterTypeVector),
|
||||
Movie.createCharactersVector(fbb, characterVector)
|
||||
)
|
||||
);
|
||||
Movie.createCharactersVector(fbb, characterVector)));
|
||||
|
||||
final Movie movie = Movie.getRootAsMovie(fbb.dataBuffer());
|
||||
ByteVector charactersTypeByteVector = movie.charactersTypeVector();
|
||||
@@ -499,11 +500,12 @@ public class JavaTest {
|
||||
assertThat((Byte) movie.charactersType(0)).isEqualTo(characterTypeVector[0]);
|
||||
assertThat(charactersTypeByteVector.get(0)).isEqualTo(characterTypeVector[0]);
|
||||
|
||||
assertThat(((Attacker)movie.characters(new Attacker(), 0)).swordAttackDamage()).isEqualTo(
|
||||
swordAttackDamage);
|
||||
assertThat(((Attacker) movie.characters(new Attacker(), 0)).swordAttackDamage())
|
||||
.isEqualTo(swordAttackDamage);
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestFixedLengthArrays() {
|
||||
@org.junit.Test
|
||||
public void TestFixedLengthArrays() {
|
||||
FlatBufferBuilder builder = new FlatBufferBuilder(0);
|
||||
|
||||
float a;
|
||||
@@ -537,8 +539,7 @@ public class JavaTest {
|
||||
f[0] = -1;
|
||||
f[1] = 1;
|
||||
|
||||
int arrayOffset = ArrayStruct.createArrayStruct(builder,
|
||||
a, b, c, d_a, d_b, d_c, d_d, e, f);
|
||||
int arrayOffset = ArrayStruct.createArrayStruct(builder, a, b, c, d_a, d_b, d_c, d_d, e, f);
|
||||
|
||||
// Create a table with the ArrayStruct.
|
||||
ArrayTable.startArrayTable(builder);
|
||||
@@ -551,8 +552,7 @@ public class JavaTest {
|
||||
NestedStruct nested = new NestedStruct();
|
||||
|
||||
assertThat(table.a().a()).isEqualTo(0.5f);
|
||||
for (int i = 0; i < 15; i++)
|
||||
assertThat(table.a().b(i)).isEqualTo(i);
|
||||
for (int i = 0; i < 15; i++) assertThat(table.a().b(i)).isEqualTo(i);
|
||||
assertThat(table.a().c()).isEqualTo((byte) 1);
|
||||
assertThat(table.a().d(nested, 0).a(0)).isEqualTo(1);
|
||||
assertThat(table.a().d(nested, 0).a(1)).isEqualTo(2);
|
||||
@@ -573,9 +573,11 @@ public class JavaTest {
|
||||
assertThat(table.a().f(1)).isEqualTo((long) 1);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testFlexBuffersTest() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(512),
|
||||
FlexBuffersBuilder.BUILDER_FLAG_SHARE_KEYS_AND_STRINGS);
|
||||
@org.junit.Test
|
||||
public void testFlexBuffersTest() {
|
||||
FlexBuffersBuilder builder =
|
||||
new FlexBuffersBuilder(
|
||||
ByteBuffer.allocate(512), FlexBuffersBuilder.BUILDER_FLAG_SHARE_KEYS_AND_STRINGS);
|
||||
testFlexBuffersTest(builder);
|
||||
int bufferLimit1 = ((ArrayReadWriteBuf) builder.getBuffer()).limit();
|
||||
|
||||
@@ -699,13 +701,14 @@ public class JavaTest {
|
||||
assertThat(mymap.values().get(0).asString()).isEqualTo(vec.get(1).asString());
|
||||
assertThat(mymap.get("int").asInt()).isEqualTo(-120);
|
||||
assertThat((float) mymap.get("float").asFloat()).isEqualTo(-123.0f);
|
||||
assertThat(Arrays.equals(mymap.get("blob").asBlob().getBytes(), new byte[]{ 65, 67 })).isEqualTo(
|
||||
true);
|
||||
assertThat(Arrays.equals(mymap.get("blob").asBlob().getBytes(), new byte[] {65, 67}))
|
||||
.isEqualTo(true);
|
||||
assertThat(mymap.get("blob").asBlob().toString()).isEqualTo("AC");
|
||||
assertThat(mymap.get("blob").toString()).isEqualTo("\"AC\"");
|
||||
}
|
||||
|
||||
@org.junit.Test public void testFlexBufferVectorStrings() {
|
||||
@org.junit.Test
|
||||
public void testFlexBufferVectorStrings() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(10000000));
|
||||
|
||||
int size = 3000;
|
||||
@@ -744,12 +747,15 @@ public class JavaTest {
|
||||
}
|
||||
}
|
||||
|
||||
@org.junit.Test public void testDeprecatedTypedVectorString() {
|
||||
@org.junit.Test
|
||||
public void testDeprecatedTypedVectorString() {
|
||||
// tests whether we are able to support reading deprecated typed vector string
|
||||
// data is equivalent to [ "abc", "abc", "abc", "abc"]
|
||||
byte[] data = new byte[] {0x03, 0x61, 0x62, 0x63, 0x00, 0x03, 0x61, 0x62, 0x63, 0x00,
|
||||
0x03, 0x61, 0x62, 0x63, 0x00, 0x03, 0x61, 0x62, 0x63, 0x00, 0x04, 0x14, 0x10,
|
||||
0x0c, 0x08, 0x04, 0x3c, 0x01};
|
||||
byte[] data =
|
||||
new byte[] {
|
||||
0x03, 0x61, 0x62, 0x63, 0x00, 0x03, 0x61, 0x62, 0x63, 0x00, 0x03, 0x61, 0x62, 0x63, 0x00,
|
||||
0x03, 0x61, 0x62, 0x63, 0x00, 0x04, 0x14, 0x10, 0x0c, 0x08, 0x04, 0x3c, 0x01
|
||||
};
|
||||
Reference ref = FlexBuffers.getRoot(ByteBuffer.wrap(data));
|
||||
assertThat(ref.getType()).isEqualTo(FlexBuffers.FBT_VECTOR_STRING_DEPRECATED);
|
||||
assertThat(ref.isTypedVector()).isTrue();
|
||||
@@ -759,57 +765,65 @@ public class JavaTest {
|
||||
}
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementBoolean() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementBoolean() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(100));
|
||||
builder.putBoolean(true);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(FlexBuffers.getRoot(b).asBoolean()).isTrue();
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementByte() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementByte() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putInt(10);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(10).isEqualTo(FlexBuffers.getRoot(b).asInt());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementShort() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementShort() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putInt(Short.MAX_VALUE);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(Short.MAX_VALUE).isEqualTo((short) FlexBuffers.getRoot(b).asInt());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementInt() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementInt() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putInt(Integer.MIN_VALUE);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(Integer.MIN_VALUE).isEqualTo(FlexBuffers.getRoot(b).asInt());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementLong() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementLong() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putInt(Long.MAX_VALUE);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(Long.MAX_VALUE).isEqualTo(FlexBuffers.getRoot(b).asLong());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementFloat() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementFloat() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putFloat(Float.MAX_VALUE);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(Float.compare(Float.MAX_VALUE, (float) FlexBuffers.getRoot(b).asFloat())).isEqualTo(
|
||||
0);
|
||||
assertThat(Float.compare(Float.MAX_VALUE, (float) FlexBuffers.getRoot(b).asFloat()))
|
||||
.isEqualTo(0);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementDouble() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementDouble() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putFloat(Double.MAX_VALUE);
|
||||
ByteBuffer b = builder.finish();
|
||||
assertThat(Double.compare(Double.MAX_VALUE, FlexBuffers.getRoot(b).asFloat())).isEqualTo(0);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementBigString() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementBigString() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(10000));
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
@@ -826,7 +840,8 @@ public class JavaTest {
|
||||
assertThat(sb.toString()).isEqualTo(r.asString());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementSmallString() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementSmallString() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(10000));
|
||||
|
||||
builder.putString("aa");
|
||||
@@ -837,7 +852,8 @@ public class JavaTest {
|
||||
assertThat("aa").isEqualTo(r.asString());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementBlob() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementBlob() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putBlob(new byte[] {5, 124, 118, -1});
|
||||
ByteBuffer b = builder.finish();
|
||||
@@ -849,7 +865,8 @@ public class JavaTest {
|
||||
assertThat((byte) -1).isEqualTo(result[3]);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementLongBlob() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementLongBlob() {
|
||||
|
||||
// verifies blobs of up to 2^16 in length
|
||||
for (int i = 2; i <= 1 << 16; i = i << 1) {
|
||||
@@ -870,7 +887,8 @@ public class JavaTest {
|
||||
}
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementUByte() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementUByte() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putUInt(0xFF);
|
||||
ByteBuffer b = builder.finish();
|
||||
@@ -878,7 +896,8 @@ public class JavaTest {
|
||||
assertThat(255).isEqualTo((int) r.asUInt());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementUShort() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementUShort() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putUInt(0xFFFF);
|
||||
ByteBuffer b = builder.finish();
|
||||
@@ -886,7 +905,8 @@ public class JavaTest {
|
||||
assertThat(65535).isEqualTo((int) r.asUInt());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementUInt() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementUInt() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
builder.putUInt(0xFFFF_FFFFL);
|
||||
ByteBuffer b = builder.finish();
|
||||
@@ -894,16 +914,16 @@ public class JavaTest {
|
||||
assertThat(4294967295L).isEqualTo(r.asUInt());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleFixedTypeVector() {
|
||||
@org.junit.Test
|
||||
public void testSingleFixedTypeVector() {
|
||||
|
||||
int[] ints = new int[] {5, 124, 118, -1};
|
||||
float[] floats = new float[] {5.5f, 124.124f, 118.118f, -1.1f};
|
||||
String[] strings = new String[] {"This", "is", "a", "typed", "array"};
|
||||
boolean[] booleans = new boolean[] {false, true, true, false};
|
||||
|
||||
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(512),
|
||||
FlexBuffersBuilder.BUILDER_FLAG_NONE);
|
||||
FlexBuffersBuilder builder =
|
||||
new FlexBuffersBuilder(ByteBuffer.allocate(512), FlexBuffersBuilder.BUILDER_FLAG_NONE);
|
||||
|
||||
int mapPos = builder.startMap();
|
||||
|
||||
@@ -927,7 +947,6 @@ public class JavaTest {
|
||||
|
||||
builder.endMap(null, mapPos);
|
||||
|
||||
|
||||
ByteBuffer b = builder.finish();
|
||||
FlexBuffers.Reference r = FlexBuffers.getRoot(b);
|
||||
assert (r.asMap().get("ints").isTypedVector());
|
||||
@@ -935,7 +954,8 @@ public class JavaTest {
|
||||
assert (r.asMap().get("booleans").isTypedVector());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementVector() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementVector() {
|
||||
FlexBuffersBuilder b = new FlexBuffersBuilder();
|
||||
|
||||
int vecPos = b.startVector();
|
||||
@@ -958,11 +978,12 @@ public class JavaTest {
|
||||
assertThat("wow").isEqualTo(vec.get(1).asString());
|
||||
assertThat(true).isEqualTo(vec.get(2).isNull());
|
||||
assertThat("[ 99, \"wow\", null ]").isEqualTo(vec.get(3).toString());
|
||||
assertThat("[ 99, \"wow\", null, [ 99, \"wow\", null ] ]").isEqualTo(
|
||||
FlexBuffers.getRoot(b.getBuffer()).toString());
|
||||
assertThat("[ 99, \"wow\", null, [ 99, \"wow\", null ] ]")
|
||||
.isEqualTo(FlexBuffers.getRoot(b.getBuffer()).toString());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testSingleElementMap() {
|
||||
@org.junit.Test
|
||||
public void testSingleElementMap() {
|
||||
FlexBuffersBuilder b = new FlexBuffersBuilder();
|
||||
|
||||
int mapPost = b.startMap();
|
||||
@@ -991,11 +1012,14 @@ public class JavaTest {
|
||||
assertThat("wow").isEqualTo(map.get("myVec").asVector().get(1).asString());
|
||||
assertThat(Double.compare(0x1.ffffbbbffffffP+1023, map.get("double").asFloat())).isEqualTo(0);
|
||||
assertThat(
|
||||
"{ \"double\" : 1.7976894783391937E308, \"myInt\" : 9223371743723257855, \"myNull\" : null, \"myString\" : \"wow\", \"myString2\" : \"incredible\", \"myVec\" : [ 99, \"wow\" ] }").isEqualTo(
|
||||
FlexBuffers.getRoot(b.getBuffer()).toString());
|
||||
"{ \"double\" : 1.7976894783391937E308, \"myInt\" : 9223371743723257855, \"myNull\" :"
|
||||
+ " null, \"myString\" : \"wow\", \"myString2\" : \"incredible\", \"myVec\" : [ 99,"
|
||||
+ " \"wow\" ] }")
|
||||
.isEqualTo(FlexBuffers.getRoot(b.getBuffer()).toString());
|
||||
}
|
||||
|
||||
@org.junit.Test public void testFlexBuferEmpty() {
|
||||
@org.junit.Test
|
||||
public void testFlexBuferEmpty() {
|
||||
FlexBuffers.Blob blob = FlexBuffers.Blob.empty();
|
||||
FlexBuffers.Map ary = FlexBuffers.Map.empty();
|
||||
FlexBuffers.Vector map = FlexBuffers.Vector.empty();
|
||||
@@ -1006,7 +1030,8 @@ public class JavaTest {
|
||||
assertThat(typedAry.size()).isEqualTo(0);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testHashMapToMap() {
|
||||
@org.junit.Test
|
||||
public void testHashMapToMap() {
|
||||
int entriesCount = 12;
|
||||
|
||||
HashMap<String, String> source = new HashMap<>();
|
||||
@@ -1043,7 +1068,8 @@ public class JavaTest {
|
||||
assertThat(source).isEqualTo(result);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testBuilderGrowth() {
|
||||
@org.junit.Test
|
||||
public void testBuilderGrowth() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder();
|
||||
String someString = "This is a small string";
|
||||
builder.putString(someString);
|
||||
@@ -1056,8 +1082,9 @@ public class JavaTest {
|
||||
|
||||
@org.junit.Test
|
||||
public void testFlexBuffersUtf8Map() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(512),
|
||||
FlexBuffersBuilder.BUILDER_FLAG_SHARE_KEYS_AND_STRINGS);
|
||||
FlexBuffersBuilder builder =
|
||||
new FlexBuffersBuilder(
|
||||
ByteBuffer.allocate(512), FlexBuffersBuilder.BUILDER_FLAG_SHARE_KEYS_AND_STRINGS);
|
||||
|
||||
String key0 = "😨 face1";
|
||||
String key1 = "😩 face2";
|
||||
@@ -1090,9 +1117,11 @@ public class JavaTest {
|
||||
assertThat(m.get(key4).asString()).isEqualTo(utf8keys[4]);
|
||||
}
|
||||
|
||||
@org.junit.Test public void testFlexBuffersMapLookup() {
|
||||
FlexBuffersBuilder builder = new FlexBuffersBuilder(ByteBuffer.allocate(512),
|
||||
FlexBuffersBuilder.BUILDER_FLAG_SHARE_KEYS_AND_STRINGS);
|
||||
@org.junit.Test
|
||||
public void testFlexBuffersMapLookup() {
|
||||
FlexBuffersBuilder builder =
|
||||
new FlexBuffersBuilder(
|
||||
ByteBuffer.allocate(512), FlexBuffersBuilder.BUILDER_FLAG_SHARE_KEYS_AND_STRINGS);
|
||||
|
||||
String key0 = "123";
|
||||
String key1 = "1234";
|
||||
@@ -1114,7 +1143,8 @@ public class JavaTest {
|
||||
}
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestDictionaryLookup() {
|
||||
@org.junit.Test
|
||||
public void TestDictionaryLookup() {
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(16);
|
||||
int lfIndex = LongFloatEntry.createLongFloatEntry(fbb, 0, 99);
|
||||
int vectorEntriesIdx = LongFloatMap.createEntriesVector(fbb, new int[] {lfIndex});
|
||||
@@ -1133,7 +1163,8 @@ public class JavaTest {
|
||||
assertThat(e2.value()).isEqualTo(99.0f);
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestVectorOfBytes() {
|
||||
@org.junit.Test
|
||||
public void TestVectorOfBytes() {
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(16);
|
||||
int str = fbb.createString("ByteMonster");
|
||||
byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
|
||||
@@ -1251,7 +1282,8 @@ public class JavaTest {
|
||||
assertThat(monsterObject8.inventoryLength()).isEqualTo(2048);
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestSharedStringPool() {
|
||||
@org.junit.Test
|
||||
public void TestSharedStringPool() {
|
||||
FlatBufferBuilder fb = new FlatBufferBuilder(1);
|
||||
String testString = "My string";
|
||||
int offset = fb.createSharedString(testString);
|
||||
@@ -1260,7 +1292,8 @@ public class JavaTest {
|
||||
}
|
||||
}
|
||||
|
||||
@org.junit.Test public void TestScalarOptional() {
|
||||
@org.junit.Test
|
||||
public void TestScalarOptional() {
|
||||
FlatBufferBuilder fbb = new FlatBufferBuilder(1);
|
||||
ScalarStuff.startScalarStuff(fbb);
|
||||
int pos = ScalarStuff.endScalarStuff(fbb);
|
||||
@@ -1442,8 +1475,7 @@ public class JavaTest {
|
||||
int[] inv = monster.getInventory();
|
||||
assertThat(inv.length).isEqualTo(5);
|
||||
int[] expInv = {0, 1, 2, 3, 4};
|
||||
for (int i = 0; i < inv.length; i++)
|
||||
assertThat(expInv[i]).isEqualTo(inv[i]);
|
||||
for (int i = 0; i < inv.length; i++) assertThat(expInv[i]).isEqualTo(inv[i]);
|
||||
|
||||
TestT[] test4 = monster.getTest4();
|
||||
TestT test_0 = test4[0];
|
||||
|
||||
@@ -8,6 +8,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.google.flatbuffers.jmh"
|
||||
|
||||
version = "2.0.0-SNAPSHOT"
|
||||
|
||||
// Reads latest version from Java's runtime pom.xml,
|
||||
@@ -15,7 +16,8 @@ version = "2.0.0-SNAPSHOT"
|
||||
// runtime
|
||||
fun readJavaFlatBufferVersion(): String {
|
||||
val pom = XmlParser().parse(File("../java/pom.xml"))
|
||||
val versionTag = pom.children().find {
|
||||
val versionTag =
|
||||
pom.children().find {
|
||||
val node = it as groovy.util.Node
|
||||
node.name().toString().contains("version")
|
||||
} as groovy.util.Node
|
||||
@@ -42,9 +44,7 @@ benchmark {
|
||||
include(".*FlatbufferBenchmark.*")
|
||||
}
|
||||
}
|
||||
targets {
|
||||
register("jvm")
|
||||
}
|
||||
targets { register("jvm") }
|
||||
}
|
||||
|
||||
kotlin {
|
||||
@@ -52,7 +52,8 @@ kotlin {
|
||||
compilations {
|
||||
val main by getting {}
|
||||
// custom benchmark compilation
|
||||
val benchmarks by compilations.creating {
|
||||
val benchmarks by
|
||||
compilations.creating {
|
||||
defaultSourceSet {
|
||||
dependencies {
|
||||
// Compile against the main compilation's compile classpath and outputs:
|
||||
@@ -91,17 +92,13 @@ tasks.register<de.undercouch.gradle.tasks.download.Download>("downloadMultipleFi
|
||||
}
|
||||
|
||||
abstract class GenerateFBTestClasses : DefaultTask() {
|
||||
@get:InputFiles
|
||||
abstract val inputFiles: ConfigurableFileCollection
|
||||
@get:InputFiles abstract val inputFiles: ConfigurableFileCollection
|
||||
|
||||
@get:Input
|
||||
abstract val includeFolder: Property<String>
|
||||
@get:Input abstract val includeFolder: Property<String>
|
||||
|
||||
@get:Input
|
||||
abstract val outputFolder: Property<String>
|
||||
@get:Input abstract val outputFolder: Property<String>
|
||||
|
||||
@get:Input
|
||||
abstract val variants: ListProperty<String>
|
||||
@get:Input abstract val variants: ListProperty<String>
|
||||
|
||||
@Inject
|
||||
protected open fun getExecActionFactory(): org.gradle.process.internal.ExecActionFactory? {
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
package com.google.flatbuffers.kotlin.benchmark
|
||||
|
||||
|
||||
import com.google.flatbuffers.kotlin.FlatBufferBuilder
|
||||
import java.util.concurrent.TimeUnit
|
||||
import jmonster.JAllMonsters
|
||||
import jmonster.JColor
|
||||
import jmonster.JMonster
|
||||
@@ -17,7 +17,6 @@ import monster.MonsterOffsetArray
|
||||
import monster.Vec3
|
||||
import org.openjdk.jmh.annotations.*
|
||||
import org.openjdk.jmh.infra.Blackhole
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
@State(Scope.Benchmark)
|
||||
@BenchmarkMode(Mode.AverageTime)
|
||||
@@ -35,13 +34,15 @@ open class FlatbufferBenchmark {
|
||||
populateMosterKotlin(fbDeserializationKotlin)
|
||||
populateMosterJava(fbDeserializationJava)
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalUnsignedTypes::class)
|
||||
private fun populateMosterKotlin(fb: FlatBufferBuilder) {
|
||||
fb.clear()
|
||||
val monsterName = fb.createString("MonsterName");
|
||||
val monsterName = fb.createString("MonsterName")
|
||||
val items = ubyteArrayOf(0u, 1u, 2u, 3u, 4u)
|
||||
val inv = createInventoryVector(fb, items)
|
||||
val monsterOffsets: MonsterOffsetArray = MonsterOffsetArray(repetition) {
|
||||
val monsterOffsets: MonsterOffsetArray =
|
||||
MonsterOffsetArray(repetition) {
|
||||
Monster.startMonster(fb)
|
||||
Monster.addName(fb, monsterName)
|
||||
Monster.addPos(fb, Vec3.createVec3(fb, 1.0f, 2.0f, 3.0f))
|
||||
@@ -59,9 +60,12 @@ open class FlatbufferBenchmark {
|
||||
@OptIn(ExperimentalUnsignedTypes::class)
|
||||
private fun populateMosterJava(fb: com.google.flatbuffers.FlatBufferBuilder) {
|
||||
fb.clear()
|
||||
val monsterName = fb.createString("MonsterName");
|
||||
val monsterName = fb.createString("MonsterName")
|
||||
val inv = JMonster.createInventoryVector(fb, ubyteArrayOf(0u, 1u, 2u, 3u, 4u))
|
||||
val monsters = JAllMonsters.createMonstersVector(fb, IntArray(repetition) {
|
||||
val monsters =
|
||||
JAllMonsters.createMonstersVector(
|
||||
fb,
|
||||
IntArray(repetition) {
|
||||
JMonster.startJMonster(fb)
|
||||
JMonster.addName(fb, monsterName)
|
||||
JMonster.addPos(fb, JVec3.createJVec3(fb, 1.0f, 2.0f, 3.0f))
|
||||
@@ -70,10 +74,12 @@ open class FlatbufferBenchmark {
|
||||
JMonster.addInventory(fb, inv)
|
||||
JMonster.addColor(fb, JColor.Red)
|
||||
JMonster.endJMonster(fb)
|
||||
})
|
||||
},
|
||||
)
|
||||
val allMonsters = JAllMonsters.createJAllMonsters(fb, monsters)
|
||||
fb.finish(allMonsters)
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
fun monstersSerializationKotlin() {
|
||||
populateMosterKotlin(fbKotlin)
|
||||
@@ -100,6 +106,7 @@ open class FlatbufferBenchmark {
|
||||
hole.consume(monster.inventory(3))
|
||||
}
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
fun monstersSerializationJava() {
|
||||
populateMosterJava(fbJava)
|
||||
@@ -125,5 +132,4 @@ open class FlatbufferBenchmark {
|
||||
hole.consume(monster.inventory(3))
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -16,11 +16,13 @@
|
||||
@file:OptIn(ExperimentalUnsignedTypes::class)
|
||||
|
||||
package com.google.flatbuffers.kotlin.benchmark
|
||||
|
||||
import com.google.flatbuffers.ArrayReadWriteBuf
|
||||
import com.google.flatbuffers.FlexBuffers
|
||||
import com.google.flatbuffers.FlexBuffersBuilder.BUILDER_FLAG_SHARE_ALL
|
||||
import com.google.flatbuffers.kotlin.FlexBuffersBuilder
|
||||
import com.google.flatbuffers.kotlin.getRoot
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlinx.benchmark.Blackhole
|
||||
import org.openjdk.jmh.annotations.Benchmark
|
||||
import org.openjdk.jmh.annotations.BenchmarkMode
|
||||
@@ -30,7 +32,6 @@ import org.openjdk.jmh.annotations.OutputTimeUnit
|
||||
import org.openjdk.jmh.annotations.Scope
|
||||
import org.openjdk.jmh.annotations.Setup
|
||||
import org.openjdk.jmh.annotations.State
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
@State(Scope.Benchmark)
|
||||
@BenchmarkMode(Mode.AverageTime)
|
||||
@@ -57,9 +58,7 @@ open class FlexBuffersBenchmark {
|
||||
this["int"] = 10
|
||||
this["float"] = 12.3
|
||||
this["intarray"] = bigIntArray
|
||||
this.putMap("myMap") {
|
||||
this["cool"] = "beans"
|
||||
}
|
||||
this.putMap("myMap") { this["cool"] = "beans" }
|
||||
}
|
||||
val ref = getRoot(kBuilder.finish())
|
||||
val map = ref.toMap()
|
||||
@@ -74,7 +73,11 @@ open class FlexBuffersBenchmark {
|
||||
|
||||
@Benchmark
|
||||
open fun mapJava(blackhole: Blackhole) {
|
||||
val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
|
||||
val jBuilder =
|
||||
com.google.flatbuffers.FlexBuffersBuilder(
|
||||
ArrayReadWriteBuf(initialCapacity),
|
||||
BUILDER_FLAG_SHARE_ALL,
|
||||
)
|
||||
val startMap = jBuilder.startMap()
|
||||
jBuilder.putString("hello", "world")
|
||||
jBuilder.putInt("int", 10)
|
||||
@@ -112,18 +115,18 @@ open class FlexBuffersBenchmark {
|
||||
|
||||
@Benchmark
|
||||
open fun intArrayJava(blackhole: Blackhole) {
|
||||
val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
|
||||
val jBuilder =
|
||||
com.google.flatbuffers.FlexBuffersBuilder(
|
||||
ArrayReadWriteBuf(initialCapacity),
|
||||
BUILDER_FLAG_SHARE_ALL,
|
||||
)
|
||||
val v = jBuilder.startVector()
|
||||
bigIntArray.forEach { jBuilder.putInt(it) }
|
||||
jBuilder.endVector(null, v, true, false)
|
||||
jBuilder.finish()
|
||||
val root = FlexBuffers.getRoot(jBuilder.buffer)
|
||||
val vec = root.asVector()
|
||||
blackhole.consume(
|
||||
IntArray(vec.size()) {
|
||||
vec[it].asInt()
|
||||
}
|
||||
)
|
||||
blackhole.consume(IntArray(vec.size()) { vec[it].asInt() })
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
@@ -138,7 +141,11 @@ open class FlexBuffersBenchmark {
|
||||
|
||||
@Benchmark
|
||||
open fun stringArrayJava(blackhole: Blackhole) {
|
||||
val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
|
||||
val jBuilder =
|
||||
com.google.flatbuffers.FlexBuffersBuilder(
|
||||
ArrayReadWriteBuf(initialCapacity),
|
||||
BUILDER_FLAG_SHARE_ALL,
|
||||
)
|
||||
val v = jBuilder.startVector()
|
||||
stringValue.forEach { jBuilder.putString(it) }
|
||||
jBuilder.endVector(null, v, false, false)
|
||||
@@ -182,7 +189,11 @@ open class FlexBuffersBenchmark {
|
||||
|
||||
@Benchmark
|
||||
open fun stringMapJava(blackhole: Blackhole) {
|
||||
val jBuilder = com.google.flatbuffers.FlexBuffersBuilder(ArrayReadWriteBuf(initialCapacity), BUILDER_FLAG_SHARE_ALL)
|
||||
val jBuilder =
|
||||
com.google.flatbuffers.FlexBuffersBuilder(
|
||||
ArrayReadWriteBuf(initialCapacity),
|
||||
BUILDER_FLAG_SHARE_ALL,
|
||||
)
|
||||
val v = jBuilder.startMap()
|
||||
for (i in stringKey.indices) {
|
||||
jBuilder.putString(stringKey[i], stringValue[i])
|
||||
|
||||
@@ -24,6 +24,9 @@ import com.google.gson.JsonObject
|
||||
import com.google.gson.JsonParser
|
||||
import com.squareup.moshi.Moshi
|
||||
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
|
||||
import java.io.ByteArrayInputStream
|
||||
import java.io.InputStreamReader
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlinx.benchmark.Blackhole
|
||||
import okio.Buffer
|
||||
import org.openjdk.jmh.annotations.Benchmark
|
||||
@@ -33,9 +36,6 @@ import org.openjdk.jmh.annotations.Mode
|
||||
import org.openjdk.jmh.annotations.OutputTimeUnit
|
||||
import org.openjdk.jmh.annotations.Scope
|
||||
import org.openjdk.jmh.annotations.State
|
||||
import java.io.ByteArrayInputStream
|
||||
import java.io.InputStreamReader
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
@State(Scope.Benchmark)
|
||||
@BenchmarkMode(Mode.AverageTime)
|
||||
@@ -43,9 +43,7 @@ import java.util.concurrent.TimeUnit
|
||||
@Measurement(iterations = 100, time = 1, timeUnit = TimeUnit.MICROSECONDS)
|
||||
open class JsonBenchmark {
|
||||
|
||||
final val moshi = Moshi.Builder()
|
||||
.addLast(KotlinJsonAdapterFactory())
|
||||
.build()
|
||||
final val moshi = Moshi.Builder().addLast(KotlinJsonAdapterFactory()).build()
|
||||
final val moshiAdapter = moshi.adapter(Map::class.java)
|
||||
|
||||
final val gson = Gson()
|
||||
@@ -77,46 +75,60 @@ open class JsonBenchmark {
|
||||
|
||||
// TWITTER
|
||||
@Benchmark
|
||||
open fun readTwitterFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(twitterData))
|
||||
@Benchmark
|
||||
open fun readTwitterMoshi(hole: Blackhole?) = hole?.consume(readMoshi(twitterData))
|
||||
@Benchmark
|
||||
open fun readTwitterGson(hole: Blackhole?) = hole?.consume(readGson(twitterData))
|
||||
open fun readTwitterFlexBuffers(hole: Blackhole? = null) =
|
||||
hole?.consume(readFlexBuffers(twitterData))
|
||||
|
||||
@Benchmark open fun readTwitterMoshi(hole: Blackhole?) = hole?.consume(readMoshi(twitterData))
|
||||
|
||||
@Benchmark open fun readTwitterGson(hole: Blackhole?) = hole?.consume(readGson(twitterData))
|
||||
|
||||
@Benchmark
|
||||
open fun roundTripTwitterFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(twitterData).toJson())
|
||||
open fun roundTripTwitterFlexBuffers(hole: Blackhole? = null) =
|
||||
hole?.consume(readFlexBuffers(twitterData).toJson())
|
||||
|
||||
@Benchmark
|
||||
open fun roundTripTwitterMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(readMoshi(twitterData)))
|
||||
open fun roundTripTwitterMoshi(hole: Blackhole?) =
|
||||
hole?.consume(moshiAdapter.toJson(readMoshi(twitterData)))
|
||||
|
||||
@Benchmark
|
||||
open fun roundTripTwitterGson(hole: Blackhole?) = hole?.consume(gson.toJson(readGson(twitterData)))
|
||||
open fun roundTripTwitterGson(hole: Blackhole?) =
|
||||
hole?.consume(gson.toJson(readGson(twitterData)))
|
||||
|
||||
// CITM
|
||||
@Benchmark
|
||||
open fun readCITMFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(citmData))
|
||||
|
||||
@Benchmark
|
||||
open fun readCITMMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(readMoshi(citmData)))
|
||||
|
||||
@Benchmark
|
||||
open fun readCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(readGson(citmData)))
|
||||
|
||||
@Benchmark
|
||||
open fun roundTripCITMFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(citmData).toJson())
|
||||
open fun roundTripCITMFlexBuffers(hole: Blackhole? = null) =
|
||||
hole?.consume(readFlexBuffers(citmData).toJson())
|
||||
|
||||
@Benchmark
|
||||
open fun roundTripCITMMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(readMoshi(citmData)))
|
||||
open fun roundTripCITMMoshi(hole: Blackhole?) =
|
||||
hole?.consume(moshiAdapter.toJson(readMoshi(citmData)))
|
||||
|
||||
@Benchmark
|
||||
open fun roundTripCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(readGson(citmData)))
|
||||
|
||||
@Benchmark
|
||||
open fun writeCITMFlexBuffers(hole: Blackhole? = null) = hole?.consume(fbCitmRef.toJson())
|
||||
|
||||
@Benchmark
|
||||
open fun writeCITMMoshi(hole: Blackhole?) = hole?.consume(moshiAdapter.toJson(moshiCitmRef))
|
||||
@Benchmark
|
||||
open fun writeCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(gsonCitmRef))
|
||||
|
||||
@Benchmark open fun writeCITMGson(hole: Blackhole?) = hole?.consume(gson.toJson(gsonCitmRef))
|
||||
|
||||
// CANADA
|
||||
@Benchmark
|
||||
open fun readCanadaFlexBuffers(hole: Blackhole? = null) = hole?.consume(readFlexBuffers(canadaData))
|
||||
@Benchmark
|
||||
open fun readCanadaMoshi(hole: Blackhole?) = hole?.consume(readMoshi(canadaData))
|
||||
@Benchmark
|
||||
open fun readCanadaGson(hole: Blackhole?) = hole?.consume(readGson(canadaData))
|
||||
open fun readCanadaFlexBuffers(hole: Blackhole? = null) =
|
||||
hole?.consume(readFlexBuffers(canadaData))
|
||||
|
||||
@Benchmark open fun readCanadaMoshi(hole: Blackhole?) = hole?.consume(readMoshi(canadaData))
|
||||
|
||||
@Benchmark open fun readCanadaGson(hole: Blackhole?) = hole?.consume(readGson(canadaData))
|
||||
}
|
||||
|
||||
@@ -18,6 +18,9 @@ package com.google.flatbuffers.kotlin.benchmark
|
||||
import com.google.flatbuffers.kotlin.ArrayReadWriteBuffer
|
||||
import com.google.flatbuffers.kotlin.Key
|
||||
import com.google.flatbuffers.kotlin.Utf8
|
||||
import java.nio.ByteBuffer
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.random.Random
|
||||
import kotlinx.benchmark.Blackhole
|
||||
import org.openjdk.jmh.annotations.Benchmark
|
||||
import org.openjdk.jmh.annotations.BenchmarkMode
|
||||
@@ -27,9 +30,6 @@ import org.openjdk.jmh.annotations.OutputTimeUnit
|
||||
import org.openjdk.jmh.annotations.Scope
|
||||
import org.openjdk.jmh.annotations.Setup
|
||||
import org.openjdk.jmh.annotations.State
|
||||
import java.nio.ByteBuffer
|
||||
import java.util.concurrent.TimeUnit
|
||||
import kotlin.random.Random
|
||||
|
||||
@State(Scope.Benchmark)
|
||||
@BenchmarkMode(Mode.AverageTime)
|
||||
@@ -44,9 +44,7 @@ open class UTF8Benchmark {
|
||||
private var sampleSmallAscii = (0..sampleSize).map { populateAscii(stringSize) }.toList()
|
||||
private var sampleSmallAsciiDecoded = sampleSmallAscii.map { it.encodeToByteArray() }.toList()
|
||||
|
||||
@Setup
|
||||
fun setUp() {
|
||||
}
|
||||
@Setup fun setUp() {}
|
||||
|
||||
@Benchmark
|
||||
fun encodeUtf8KotlinStandard(blackhole: Blackhole) {
|
||||
@@ -54,6 +52,7 @@ open class UTF8Benchmark {
|
||||
blackhole.consume(i.encodeToByteArray())
|
||||
}
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
fun encodeUtf8KotlinFlatbuffers(blackhole: Blackhole) {
|
||||
for (i in sampleSmallUtf8) {
|
||||
@@ -61,6 +60,7 @@ open class UTF8Benchmark {
|
||||
blackhole.consume(Utf8.encodeUtf8Array(i, byteArray, 0, byteArray.size))
|
||||
}
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
fun encodeUtf8JavaFlatbuffers(blackhole: Blackhole) {
|
||||
val javaUtf8 = com.google.flatbuffers.Utf8.getDefault()
|
||||
@@ -101,6 +101,7 @@ open class UTF8Benchmark {
|
||||
blackhole.consume(i.encodeToByteArray())
|
||||
}
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
fun encodeAsciiKotlinFlatbuffers(blackhole: Blackhole) {
|
||||
for (i in sampleSmallAscii) {
|
||||
@@ -108,6 +109,7 @@ open class UTF8Benchmark {
|
||||
blackhole.consume(Utf8.encodeUtf8Array(i, byteArray, 0, byteArray.size))
|
||||
}
|
||||
}
|
||||
|
||||
@Benchmark
|
||||
fun encodeAsciiJavaFlatbuffers(blackhole: Blackhole) {
|
||||
val javaUtf8 = com.google.flatbuffers.Utf8.getDefault()
|
||||
@@ -179,7 +181,8 @@ open class UTF8Benchmark {
|
||||
while (i < size) {
|
||||
val w = Random.nextInt() and 0xFF
|
||||
when {
|
||||
w < 0x80 -> data[i++] = 0x20; // w;
|
||||
w < 0x80 -> data[i++] = 0x20
|
||||
// w;
|
||||
w < 0xE0 -> {
|
||||
data[i++] = (0xC2 + Random.nextInt() % (0xDF - 0xC2 + 1)).toByte()
|
||||
data[i++] = (0x80 + Random.nextInt() % (0xBF - 0x80 + 1)).toByte()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import org.gradle.internal.impldep.org.testng.ITestResult.STARTED
|
||||
import java.nio.charset.StandardCharsets
|
||||
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||
import java.nio.charset.StandardCharsets
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
@@ -26,7 +25,8 @@ allprojects {
|
||||
|
||||
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<KotlinCommonOptions>>().configureEach {
|
||||
kotlinOptions {
|
||||
freeCompilerArgs += "-progressive" // https://kotlinlang.org/docs/whatsnew13.html#progressive-mode
|
||||
freeCompilerArgs +=
|
||||
"-progressive" // https://kotlinlang.org/docs/whatsnew13.html#progressive-mode
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
plugins {
|
||||
`kotlin-dsl`
|
||||
}
|
||||
plugins { `kotlin-dsl` }
|
||||
|
||||
repositories {
|
||||
gradlePluginPortal()
|
||||
}
|
||||
repositories { gradlePluginPortal() }
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import java.util.*
|
||||
import org.gradle.api.publish.maven.MavenPublication
|
||||
import org.gradle.api.tasks.bundling.Jar
|
||||
import org.gradle.kotlin.dsl.`maven-publish`
|
||||
import org.gradle.kotlin.dsl.signing
|
||||
import java.util.*
|
||||
|
||||
plugins {
|
||||
`maven-publish`
|
||||
@@ -11,21 +11,24 @@ plugins {
|
||||
|
||||
// Stub secrets to let the project sync and build without the publication values set up
|
||||
ext["signing.keyId"] = null
|
||||
|
||||
ext["signing.password"] = null
|
||||
|
||||
ext["signing.secretKeyRingFile"] = null
|
||||
|
||||
ext["ossrhUsername"] = null
|
||||
|
||||
ext["ossrhPassword"] = null
|
||||
|
||||
// Grabbing secrets from local.properties file or from environment variables, which could be used on CI
|
||||
// Grabbing secrets from local.properties file or from environment variables, which could be used on
|
||||
// CI
|
||||
val secretPropsFile = project.rootProject.file("local.properties")
|
||||
|
||||
if (secretPropsFile.exists()) {
|
||||
secretPropsFile.reader().use {
|
||||
Properties().apply {
|
||||
load(it)
|
||||
}
|
||||
}.onEach { (name, value) ->
|
||||
ext[name.toString()] = value
|
||||
}
|
||||
secretPropsFile
|
||||
.reader()
|
||||
.use { Properties().apply { load(it) } }
|
||||
.onEach { (name, value) -> ext[name.toString()] = value }
|
||||
} else {
|
||||
ext["signing.keyId"] = System.getenv("OSSRH_USERNAME")
|
||||
ext["signing.password"] = System.getenv("OSSRH_PASSWORD")
|
||||
@@ -34,9 +37,7 @@ if (secretPropsFile.exists()) {
|
||||
ext["ossrhPassword"] = System.getenv("OSSRH_PASSWORD")
|
||||
}
|
||||
|
||||
val javadocJar by tasks.registering(Jar::class) {
|
||||
archiveClassifier.set("javadoc")
|
||||
}
|
||||
val javadocJar by tasks.registering(Jar::class) { archiveClassifier.set("javadoc") }
|
||||
|
||||
fun getExtraString(name: String) = ext[name]?.toString()
|
||||
|
||||
@@ -82,14 +83,10 @@ publishing {
|
||||
email.set("dbaileychess@gmail.com")
|
||||
}
|
||||
}
|
||||
scm {
|
||||
url.set("https://github.com/google/flatbuffers")
|
||||
}
|
||||
scm { url.set("https://github.com/google/flatbuffers") }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Signing artifacts. Signing.* extra properties values will be used
|
||||
signing {
|
||||
sign(publishing.publications)
|
||||
}
|
||||
signing { sign(publishing.publications) }
|
||||
|
||||
@@ -1,29 +1,19 @@
|
||||
import org.gradle.internal.impldep.org.fusesource.jansi.AnsiRenderer.test
|
||||
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
|
||||
import org.jetbrains.kotlin.cli.common.toBooleanLenient
|
||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
|
||||
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
|
||||
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFrameworkConfig
|
||||
|
||||
plugins {
|
||||
kotlin("multiplatform")
|
||||
id("convention.publication")
|
||||
}
|
||||
|
||||
|
||||
val libName = "Flatbuffers"
|
||||
|
||||
group = "com.google.flatbuffers.kotlin"
|
||||
|
||||
version = "2.0.0-SNAPSHOT"
|
||||
|
||||
kotlin {
|
||||
explicitApi()
|
||||
jvm()
|
||||
js(IR) {
|
||||
browser {
|
||||
testTask {
|
||||
enabled = false
|
||||
}
|
||||
}
|
||||
browser { testTask { enabled = false } }
|
||||
binaries.executable()
|
||||
}
|
||||
macosX64()
|
||||
@@ -32,17 +22,10 @@ kotlin {
|
||||
iosSimulatorArm64()
|
||||
|
||||
sourceSets {
|
||||
|
||||
val commonMain by getting {
|
||||
dependencies {
|
||||
implementation(kotlin("stdlib-common"))
|
||||
}
|
||||
}
|
||||
val commonMain by getting { dependencies { implementation(kotlin("stdlib-common")) } }
|
||||
|
||||
val commonTest by getting {
|
||||
dependencies {
|
||||
implementation(kotlin("test"))
|
||||
}
|
||||
dependencies { implementation(kotlin("test")) }
|
||||
|
||||
kotlin.srcDir("src/commonTest/generated/kotlin/")
|
||||
}
|
||||
@@ -52,8 +35,7 @@ kotlin {
|
||||
implementation("com.google.flatbuffers:flatbuffers-java:2.0.3")
|
||||
}
|
||||
}
|
||||
val jvmMain by getting {
|
||||
}
|
||||
val jvmMain by getting {}
|
||||
|
||||
val macosX64Main by getting
|
||||
val macosArm64Main by getting
|
||||
@@ -69,53 +51,47 @@ kotlin {
|
||||
iosSimulatorArm64Main.dependsOn(this)
|
||||
}
|
||||
|
||||
all {
|
||||
languageSettings.optIn("kotlin.ExperimentalUnsignedTypes")
|
||||
}
|
||||
all { languageSettings.optIn("kotlin.ExperimentalUnsignedTypes") }
|
||||
}
|
||||
}
|
||||
|
||||
// Fixes JS issue: https://youtrack.jetbrains.com/issue/KT-49109
|
||||
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
|
||||
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
|
||||
|
||||
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion =
|
||||
"16.0.0"
|
||||
}
|
||||
|
||||
// Use the default greeting
|
||||
tasks.register<GenerateFBTestClasses>("generateFBTestClassesKt") {
|
||||
inputFiles.setFrom("$rootDir/../tests/monster_test.fbs",
|
||||
inputFiles.setFrom(
|
||||
"$rootDir/../tests/monster_test.fbs",
|
||||
"$rootDir/../tests/dictionary_lookup.fbs",
|
||||
// @todo Seems like nesting code generation is broken for all generators.
|
||||
// disabling test for now.
|
||||
// "$rootDir/../tests/namespace_test/namespace_test1.fbs",
|
||||
// "$rootDir/../tests/namespace_test/namespace_test2.fbs",
|
||||
"$rootDir/../tests/union_vector/union_vector.fbs",
|
||||
"$rootDir/../tests/optional_scalars.fbs")
|
||||
"$rootDir/../tests/optional_scalars.fbs",
|
||||
)
|
||||
includeFolder.set("$rootDir/../tests/include_test")
|
||||
outputFolder.set("${projectDir}/src/commonTest/generated/kotlin/")
|
||||
variant.set("kotlin-kmp")
|
||||
}
|
||||
|
||||
|
||||
project.tasks.forEach {
|
||||
if (it.name.contains("compileKotlin"))
|
||||
it.dependsOn("generateFBTestClassesKt")
|
||||
if (it.name.contains("compileKotlin")) it.dependsOn("generateFBTestClassesKt")
|
||||
}
|
||||
|
||||
fun String.intProperty() = findProperty(this).toString().toInt()
|
||||
|
||||
abstract class GenerateFBTestClasses : DefaultTask() {
|
||||
@get:InputFiles
|
||||
abstract val inputFiles: ConfigurableFileCollection
|
||||
@get:InputFiles abstract val inputFiles: ConfigurableFileCollection
|
||||
|
||||
@get:Input
|
||||
abstract val includeFolder: Property<String>
|
||||
@get:Input abstract val includeFolder: Property<String>
|
||||
|
||||
@get:Input
|
||||
abstract val outputFolder: Property<String>
|
||||
@get:Input abstract val outputFolder: Property<String>
|
||||
|
||||
@get:Input
|
||||
abstract val variant: Property<String>
|
||||
@get:Input abstract val variant: Property<String>
|
||||
|
||||
@Inject
|
||||
protected open fun getExecActionFactory(): org.gradle.process.internal.ExecActionFactory? {
|
||||
|
||||
@@ -18,13 +18,12 @@ package com.google.flatbuffers.kotlin
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
|
||||
/**
|
||||
* Represent a chunk of data, where FlexBuffers will be read from.
|
||||
*/
|
||||
/** Represent a chunk of data, where FlexBuffers will be read from. */
|
||||
public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Scan through the buffer for first byte matching value.
|
||||
*
|
||||
* @param value to be match
|
||||
* @param start inclusive initial position to start searching
|
||||
* @param end exclusive final position of the search
|
||||
@@ -34,6 +33,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read boolean from the buffer. Booleans as stored as a single byte
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return [Boolean] element
|
||||
*/
|
||||
@@ -41,6 +41,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [Byte] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a byte
|
||||
*/
|
||||
@@ -48,6 +49,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [UByte] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a [UByte]
|
||||
*/
|
||||
@@ -55,6 +57,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [Short] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a [Short]
|
||||
*/
|
||||
@@ -62,6 +65,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [UShort] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a [UShort]
|
||||
*/
|
||||
@@ -69,6 +73,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [Int] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return an [Int]
|
||||
*/
|
||||
@@ -76,6 +81,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [UInt] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return an [UInt]
|
||||
*/
|
||||
@@ -83,6 +89,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [Long] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a [Long]
|
||||
*/
|
||||
@@ -90,6 +97,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a [ULong] from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a [ULong]
|
||||
*/
|
||||
@@ -97,6 +105,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a 32-bit float from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a float
|
||||
*/
|
||||
@@ -104,6 +113,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a 64-bit float from the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
* @return a double
|
||||
*/
|
||||
@@ -111,6 +121,7 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a UTF-8 string from the buffer.
|
||||
*
|
||||
* @param start initial element of the string
|
||||
* @param size size of the string in bytes.
|
||||
* @return a `String`
|
||||
@@ -119,22 +130,25 @@ public interface ReadBuffer {
|
||||
|
||||
/**
|
||||
* Read a ByteArray from the buffer.
|
||||
*
|
||||
* @param start position from the [ReadBuffer] to be read
|
||||
* @param length maximum number of bytes to be written in the buffer
|
||||
*/
|
||||
public fun getBytes(array: ByteArray, start: Int, length: Int = array.size)
|
||||
|
||||
/**
|
||||
* Expose [ReadBuffer] as an array of bytes.
|
||||
* This method is meant to be as efficient as possible, so for an array-backed [ReadBuffer], it should
|
||||
* return its own internal data. In case access to internal data is not possible,
|
||||
* a copy of the data into an array of bytes might occur.
|
||||
* Expose [ReadBuffer] as an array of bytes. This method is meant to be as efficient as possible,
|
||||
* so for an array-backed [ReadBuffer], it should return its own internal data. In case access to
|
||||
* internal data is not possible, a copy of the data into an array of bytes might occur.
|
||||
*
|
||||
* @return [ReadBuffer] as an array of bytes
|
||||
*/
|
||||
public fun data(): ByteArray
|
||||
|
||||
/**
|
||||
* Creates a new [ReadBuffer] point to a region of the current buffer, starting at [start] with size [size].
|
||||
* Creates a new [ReadBuffer] point to a region of the current buffer, starting at [start] with
|
||||
* size [size].
|
||||
*
|
||||
* @param start starting position of the [ReadBuffer]
|
||||
* @param size in bytes of the [ReadBuffer]
|
||||
* @return [ReadBuffer] slice.
|
||||
@@ -142,15 +156,17 @@ public interface ReadBuffer {
|
||||
public fun slice(start: Int, size: Int): ReadBuffer
|
||||
|
||||
/**
|
||||
* Defines the size of the message in the buffer. It also determines last position that buffer
|
||||
* can be read. Last byte to be accessed is in position `limit() -1`.
|
||||
* Defines the size of the message in the buffer. It also determines last position that buffer can
|
||||
* be read. Last byte to be accessed is in position `limit() -1`.
|
||||
*
|
||||
* @return indicate last position
|
||||
*/
|
||||
public val limit: Int
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface to represent a read-write buffers. This interface will be used to access and write FlexBuffer messages.
|
||||
* Interface to represent a read-write buffers. This interface will be used to access and write
|
||||
* FlexBuffer messages.
|
||||
*/
|
||||
public interface ReadWriteBuffer : ReadBuffer {
|
||||
/**
|
||||
@@ -160,9 +176,9 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
|
||||
/**
|
||||
* Request capacity of the buffer relative to [writePosition]. In case buffer is already larger
|
||||
* than the requested, this method will just return true. Otherwise,
|
||||
* It might try to resize the buffer. In case of being unable to allocate
|
||||
* enough memory, an exception will be thrown.
|
||||
* than the requested, this method will just return true. Otherwise, It might try to resize the
|
||||
* buffer. In case of being unable to allocate enough memory, an exception will be thrown.
|
||||
*
|
||||
* @param additional capacity in bytes to be added on top of [writePosition]
|
||||
* @param copyAtEnd copy current data at the end of new underlying buffer
|
||||
* @return new capacity in bytes
|
||||
@@ -171,10 +187,10 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
requestCapacity(writePosition + additional, copyAtEnd)
|
||||
|
||||
/**
|
||||
* Request capacity of the buffer in absolute values. In case buffer is already larger
|
||||
* than the requested the method is a no-op. Otherwise,
|
||||
* It might try to resize the buffer. In case of being unable to allocate
|
||||
* enough memory, an exception will be thrown.
|
||||
* Request capacity of the buffer in absolute values. In case buffer is already larger than the
|
||||
* requested the method is a no-op. Otherwise, It might try to resize the buffer. In case of being
|
||||
* unable to allocate enough memory, an exception will be thrown.
|
||||
*
|
||||
* @param capacity new capacity
|
||||
* @param copyAtEnd copy current data at the end of new underlying buffer
|
||||
* @return new capacity in bytes
|
||||
@@ -182,14 +198,16 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
public fun requestCapacity(capacity: Int, copyAtEnd: Boolean = false): Int
|
||||
|
||||
/**
|
||||
* Put a [Boolean] into the buffer at [writePosition] . Booleans as stored as single byte.
|
||||
* Write position will be incremented.
|
||||
* Put a [Boolean] into the buffer at [writePosition] . Booleans as stored as single byte. Write
|
||||
* position will be incremented.
|
||||
*
|
||||
* @return [Boolean] element
|
||||
*/
|
||||
public fun put(value: Boolean)
|
||||
|
||||
/**
|
||||
* Put an array of bytes into the buffer at [writePosition]. Write position will be incremented.
|
||||
*
|
||||
* @param value the data to be copied
|
||||
* @param start initial position on value to be copied
|
||||
* @param length amount of bytes to be copied
|
||||
@@ -198,74 +216,58 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
|
||||
/**
|
||||
* Put an array of bytes into the buffer at [writePosition]. Write position will be incremented.
|
||||
*
|
||||
* @param value [ReadBuffer] the data to be copied
|
||||
* @param start initial position on value to be copied
|
||||
* @param length amount of bytes to be copied
|
||||
*/
|
||||
public fun put(value: ReadBuffer, start: Int = 0, length: Int = value.limit - start)
|
||||
|
||||
/**
|
||||
* Write a [Byte] into the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
/** Write a [Byte] into the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: Byte)
|
||||
|
||||
/**
|
||||
* Write a [UByte] into the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
/** Write a [UByte] into the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: UByte)
|
||||
|
||||
/**
|
||||
* Write a [Short] into in the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
/** Write a [Short] into in the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: Short)
|
||||
|
||||
/**
|
||||
* Write a [UShort] into in the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
/** Write a [UShort] into in the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: UShort)
|
||||
|
||||
/**
|
||||
* Write a [Int] in the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
/** Write a [Int] in the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: Int)
|
||||
|
||||
/**
|
||||
* Write a [UInt] into in the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
/** Write a [UInt] into in the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: UInt)
|
||||
|
||||
/**
|
||||
* Write a [Long] into in the buffer at [writePosition]. Write position will be
|
||||
* incremented.
|
||||
*/
|
||||
/** Write a [Long] into in the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: Long)
|
||||
|
||||
/**
|
||||
* Write a [ULong] into in the buffer at [writePosition]. Write position will be
|
||||
* incremented.
|
||||
*/
|
||||
/** Write a [ULong] into in the buffer at [writePosition]. Write position will be incremented. */
|
||||
public fun put(value: ULong)
|
||||
|
||||
/**
|
||||
* Write a 32-bit [Float] into the buffer at [writePosition]. Write position will be
|
||||
* incremented.
|
||||
* Write a 32-bit [Float] into the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
public fun put(value: Float)
|
||||
|
||||
/**
|
||||
* Write a 64-bit [Double] into the buffer at [writePosition]. Write position will be
|
||||
* incremented.
|
||||
* Write a 64-bit [Double] into the buffer at [writePosition]. Write position will be incremented.
|
||||
*/
|
||||
public fun put(value: Double)
|
||||
|
||||
/**
|
||||
* Write a [String] encoded as UTF-8 into the buffer at [writePosition]. Write position will be incremented.
|
||||
* Write a [String] encoded as UTF-8 into the buffer at [writePosition]. Write position will be
|
||||
* incremented.
|
||||
*
|
||||
* @return size in bytes of the encoded string
|
||||
*/
|
||||
public fun put(value: CharSequence, encodedLength: Int = -1): Int
|
||||
|
||||
/**
|
||||
* Write an array of bytes into the buffer.
|
||||
*
|
||||
* @param dstIndex initial position where [src] will be copied into.
|
||||
* @param src the data to be copied.
|
||||
* @param srcStart initial position on [src] that will be copied.
|
||||
@@ -275,6 +277,7 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
|
||||
/**
|
||||
* Write an array of bytes into the buffer.
|
||||
*
|
||||
* @param dstIndex initial position where [src] will be copied into.
|
||||
* @param src the data to be copied.
|
||||
* @param srcStart initial position on [src] that will be copied.
|
||||
@@ -284,66 +287,77 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
|
||||
/**
|
||||
* Write [Boolean] into a given position [index] on the buffer. Booleans as stored as single byte.
|
||||
*
|
||||
* @param index position of the element in buffer
|
||||
*/
|
||||
public operator fun set(index: Int, value: Boolean)
|
||||
|
||||
/**
|
||||
* Write [Byte] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in the buffer
|
||||
*/
|
||||
public operator fun set(index: Int, value: Byte)
|
||||
|
||||
/**
|
||||
* Write [UByte] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in the buffer
|
||||
*/
|
||||
public operator fun set(index: Int, value: UByte)
|
||||
|
||||
/**
|
||||
Short
|
||||
* Short
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: Short)
|
||||
|
||||
/**
|
||||
* Write [UShort] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: UShort)
|
||||
|
||||
/**
|
||||
* Write [Int] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: Int)
|
||||
|
||||
/**
|
||||
* Write [UInt] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: UInt)
|
||||
|
||||
/**
|
||||
* Write [Long] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: Long)
|
||||
|
||||
/**
|
||||
* Write [ULong] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: ULong)
|
||||
|
||||
/**
|
||||
* Write [Float] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: Float)
|
||||
|
||||
/**
|
||||
* Write [Double] into a given position [index] on the buffer.
|
||||
*
|
||||
* @param index position of the element in [ReadBuffer]
|
||||
*/
|
||||
public fun set(index: Int, value: Double)
|
||||
@@ -351,12 +365,15 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
public fun fill(value: Byte, start: Int, end: Int)
|
||||
|
||||
/**
|
||||
* Current position of the buffer to be written. It will be automatically updated on [put] operations.
|
||||
* Current position of the buffer to be written. It will be automatically updated on [put]
|
||||
* operations.
|
||||
*/
|
||||
public var writePosition: Int
|
||||
|
||||
/**
|
||||
* Creates a new [ReadWriteBuffer] point to a region of the current buffer, starting at [offset] with size [size].
|
||||
* Creates a new [ReadWriteBuffer] point to a region of the current buffer, starting at [offset]
|
||||
* with size [size].
|
||||
*
|
||||
* @param offset starting position of the [ReadWriteBuffer]
|
||||
* @param size in bytes of the [ReadWriteBuffer]
|
||||
* @return [ReadWriteBuffer] slice.
|
||||
@@ -364,35 +381,35 @@ public interface ReadWriteBuffer : ReadBuffer {
|
||||
public fun writeSlice(offset: Int, size: Int): ReadWriteBuffer
|
||||
|
||||
/**
|
||||
* Special operation where we increase the backed buffer size to [capacity]
|
||||
* and shift all already written data to the end of the buffer.
|
||||
* Special operation where we increase the backed buffer size to [capacity] and shift all already
|
||||
* written data to the end of the buffer.
|
||||
*
|
||||
* This function is mostly used when creating a Flatbuffer message, as data is written from the
|
||||
* end of the buffer towards index 0.
|
||||
*
|
||||
* This function is mostly used when creating a Flatbuffer message, as
|
||||
* data is written from the end of the buffer towards index 0.
|
||||
* @param capacity required in bytes
|
||||
* @return new capacity in bytes
|
||||
*/
|
||||
public fun moveWrittenDataToEnd(capacity: Int): Int
|
||||
|
||||
/**
|
||||
* Maximum size in bytes that the backed buffer supports.
|
||||
*/
|
||||
/** Maximum size in bytes that the backed buffer supports. */
|
||||
public val capacity: Int
|
||||
|
||||
/**
|
||||
* Defines last relative position of the backed buffer that can be written.
|
||||
* Any addition to the buffer that goes beyond will throw an exception
|
||||
* instead of regrow the buffer (default behavior).
|
||||
* Defines last relative position of the backed buffer that can be written. Any addition to the
|
||||
* buffer that goes beyond will throw an exception instead of regrow the buffer (default
|
||||
* behavior).
|
||||
*/
|
||||
public val writeLimit: Int
|
||||
}
|
||||
|
||||
public open class ArrayReadBuffer(protected var buffer: ByteArray,
|
||||
public open class ArrayReadBuffer(
|
||||
protected var buffer: ByteArray,
|
||||
// offsets writePosition against backed buffer e.g. offset = 1, writePosition = 1
|
||||
// will write first byte at position 2 of the backed buffer
|
||||
internal val offset: Int = 0,
|
||||
override val limit: Int = buffer.size - offset) : ReadBuffer {
|
||||
|
||||
override val limit: Int = buffer.size - offset,
|
||||
) : ReadBuffer {
|
||||
|
||||
override fun findFirst(value: Byte, start: Int, end: Int): Int {
|
||||
val e = min(end, limit)
|
||||
@@ -423,8 +440,8 @@ public open class ArrayReadBuffer(protected var buffer: ByteArray,
|
||||
|
||||
override fun getDouble(index: Int): Double = buffer.getDouble(offset + index)
|
||||
|
||||
override fun getString(start: Int, size: Int): String = buffer.decodeToString(this.offset + start,
|
||||
this.offset + start + size)
|
||||
override fun getString(start: Int, size: Int): String =
|
||||
buffer.decodeToString(this.offset + start, this.offset + start + size)
|
||||
|
||||
override fun getBytes(array: ByteArray, start: Int, length: Int) {
|
||||
val end = min(this.offset + start + length, buffer.size)
|
||||
@@ -436,19 +453,19 @@ public open class ArrayReadBuffer(protected var buffer: ByteArray,
|
||||
|
||||
override fun data(): ByteArray = buffer
|
||||
|
||||
override fun slice(start: Int, size: Int): ReadBuffer = ArrayReadBuffer(buffer, this.offset + start, size)
|
||||
override fun slice(start: Int, size: Int): ReadBuffer =
|
||||
ArrayReadBuffer(buffer, this.offset + start, size)
|
||||
}
|
||||
|
||||
/**
|
||||
* Implements `[ReadWriteBuffer]` using [ByteArray] as backing buffer. Using array of bytes are
|
||||
* usually faster than `ByteBuffer`.
|
||||
*
|
||||
* This class is not thread-safe, meaning that
|
||||
* it must operate on a single thread. Operating from
|
||||
* This class is not thread-safe, meaning that it must operate on a single thread. Operating from
|
||||
* multiple thread leads into an undefined behavior
|
||||
*
|
||||
* All operations assume Little Endian byte order.
|
||||
*/
|
||||
|
||||
public class ArrayReadWriteBuffer(
|
||||
buffer: ByteArray,
|
||||
offset: Int = 0,
|
||||
@@ -456,12 +473,13 @@ public class ArrayReadWriteBuffer(
|
||||
// Any addition to the buffer that goes beyond will throw an exception
|
||||
// instead of regrow the buffer (default behavior).
|
||||
public override val writeLimit: Int = -1,
|
||||
override var writePosition: Int = offset
|
||||
override var writePosition: Int = offset,
|
||||
) : ArrayReadBuffer(buffer, offset, writePosition), ReadWriteBuffer {
|
||||
|
||||
public constructor(initialCapacity: Int = 10) : this(ByteArray(initialCapacity))
|
||||
|
||||
override val limit: Int get() = writePosition
|
||||
override val limit: Int
|
||||
get() = writePosition
|
||||
|
||||
override fun clear(): Unit = run { writePosition = 0 }
|
||||
|
||||
@@ -547,7 +565,9 @@ public class ArrayReadWriteBuffer(
|
||||
override operator fun set(dstIndex: Int, src: ReadBuffer, srcStart: Int, srcLength: Int) {
|
||||
when (src) {
|
||||
is ArrayReadBuffer -> {
|
||||
src.data().copyInto(buffer, dstIndex, src.offset + srcStart, src.offset + srcStart + srcLength)
|
||||
src
|
||||
.data()
|
||||
.copyInto(buffer, dstIndex, src.offset + srcStart, src.offset + srcStart + srcLength)
|
||||
}
|
||||
else -> {
|
||||
for (i in 0 until srcLength) {
|
||||
@@ -557,23 +577,55 @@ public class ArrayReadWriteBuffer(
|
||||
}
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: Byte) { buffer[index] = value }
|
||||
override operator fun set(index: Int, value: UByte) { buffer.setUByte(index, value) }
|
||||
override operator fun set(index: Int, value: Short) { buffer.setShort(index, value) }
|
||||
override operator fun set(index: Int, value: UShort) { buffer.setUShort(index, value) }
|
||||
override operator fun set(index: Int, value: Int) { buffer.setInt(index, value) }
|
||||
override operator fun set(index: Int, value: UInt) { buffer.setUInt(index, value) }
|
||||
override operator fun set(index: Int, value: Long) { buffer.setLong(index, value) }
|
||||
override operator fun set(index: Int, value: ULong) { buffer.setULong(index, value) }
|
||||
override operator fun set(index: Int, value: Float) { buffer.setFloat(index, value) }
|
||||
override operator fun set(index: Int, value: Double) { buffer.setDouble(index, value) }
|
||||
override fun fill(value: Byte, start: Int, end: Int) { buffer.fill(value, start, end) }
|
||||
override operator fun set(index: Int, value: Byte) {
|
||||
buffer[index] = value
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: UByte) {
|
||||
buffer.setUByte(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: Short) {
|
||||
buffer.setShort(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: UShort) {
|
||||
buffer.setUShort(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: Int) {
|
||||
buffer.setInt(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: UInt) {
|
||||
buffer.setUInt(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: Long) {
|
||||
buffer.setLong(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: ULong) {
|
||||
buffer.setULong(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: Float) {
|
||||
buffer.setFloat(index, value)
|
||||
}
|
||||
|
||||
override operator fun set(index: Int, value: Double) {
|
||||
buffer.setDouble(index, value)
|
||||
}
|
||||
|
||||
override fun fill(value: Byte, start: Int, end: Int) {
|
||||
buffer.fill(value, start, end)
|
||||
}
|
||||
|
||||
/**
|
||||
* Request capacity of the buffer. In case buffer is already larger
|
||||
* than the requested, it is a no-op. Otherwise,
|
||||
* It might try to resize the buffer. In case of being unable to allocate
|
||||
* enough memory, an exception will be thrown.
|
||||
* Request capacity of the buffer. In case buffer is already larger than the requested, it is a
|
||||
* no-op. Otherwise, It might try to resize the buffer. In case of being unable to allocate enough
|
||||
* memory, an exception will be thrown.
|
||||
*
|
||||
* @param capacity new capacity
|
||||
* @param copyAtEnd copy current data at the end of new underlying buffer
|
||||
*/
|
||||
@@ -582,9 +634,12 @@ public class ArrayReadWriteBuffer(
|
||||
|
||||
if (buffer.size >= capacity) return buffer.size
|
||||
|
||||
if (writeLimit > 0 && writeLimit + offset >= buffer.size) error("Buffer in writeLimit mode. In writeLimit mode" +
|
||||
if (writeLimit > 0 && writeLimit + offset >= buffer.size)
|
||||
error(
|
||||
"Buffer in writeLimit mode. In writeLimit mode" +
|
||||
" the buffer does not grow automatically and any write beyond writeLimit will throw exception. " +
|
||||
"(writeLimit: $writeLimit, newCapacity: $capacity")
|
||||
"(writeLimit: $writeLimit, newCapacity: $capacity"
|
||||
)
|
||||
// implemented in the same growing fashion as ArrayList
|
||||
val oldCapacity = buffer.size
|
||||
if (oldCapacity == Int.MAX_VALUE - 8) { // Ensure we don't grow beyond what fits in an int.
|
||||
@@ -610,7 +665,6 @@ public class ArrayReadWriteBuffer(
|
||||
|
||||
override val capacity: Int
|
||||
get() = buffer.size
|
||||
|
||||
}
|
||||
|
||||
public val emptyBuffer: ReadWriteBuffer = ArrayReadWriteBuffer(ByteArray(1))
|
||||
|
||||
@@ -19,37 +19,53 @@ package com.google.flatbuffers.kotlin
|
||||
|
||||
import kotlin.experimental.and
|
||||
|
||||
internal fun ByteArray.getString(index: Int, size: Int): String = Utf8.decodeUtf8Array(this, index, size)
|
||||
internal fun ByteArray.getString(index: Int, size: Int): String =
|
||||
Utf8.decodeUtf8Array(this, index, size)
|
||||
|
||||
internal fun ByteArray.setCharSequence(index: Int, value: CharSequence): Int =
|
||||
Utf8.encodeUtf8Array(value, this, index, this.size - index)
|
||||
|
||||
// List of functions that needs to be implemented on all platforms.
|
||||
internal expect inline fun ByteArray.getUByte(index: Int): UByte
|
||||
|
||||
internal expect inline fun ByteArray.getShort(index: Int): Short
|
||||
|
||||
internal expect inline fun ByteArray.getUShort(index: Int): UShort
|
||||
|
||||
internal expect inline fun ByteArray.getInt(index: Int): Int
|
||||
|
||||
internal expect inline fun ByteArray.getUInt(index: Int): UInt
|
||||
|
||||
internal expect inline fun ByteArray.getLong(index: Int): Long
|
||||
|
||||
internal expect inline fun ByteArray.getULong(index: Int): ULong
|
||||
|
||||
internal expect inline fun ByteArray.getFloat(index: Int): Float
|
||||
|
||||
internal expect inline fun ByteArray.getDouble(index: Int): Double
|
||||
|
||||
internal expect inline fun ByteArray.setUByte(index: Int, value: UByte)
|
||||
|
||||
public expect inline fun ByteArray.setShort(index: Int, value: Short)
|
||||
|
||||
internal expect inline fun ByteArray.setUShort(index: Int, value: UShort)
|
||||
|
||||
internal expect inline fun ByteArray.setInt(index: Int, value: Int)
|
||||
|
||||
internal expect inline fun ByteArray.setUInt(index: Int, value: UInt)
|
||||
|
||||
internal expect inline fun ByteArray.setLong(index: Int, value: Long)
|
||||
|
||||
internal expect inline fun ByteArray.setULong(index: Int, value: ULong)
|
||||
|
||||
internal expect inline fun ByteArray.setFloat(index: Int, value: Float)
|
||||
|
||||
internal expect inline fun ByteArray.setDouble(index: Int, value: Double)
|
||||
|
||||
/**
|
||||
* This implementation uses Little Endian order.
|
||||
*/
|
||||
/** This implementation uses Little Endian order. */
|
||||
public object ByteArrayOps {
|
||||
public inline fun getUByte(ary: ByteArray, index: Int): UByte = ary[index].toUByte()
|
||||
|
||||
public inline fun getShort(ary: ByteArray, index: Int): Short {
|
||||
return (ary[index + 1].toInt() shl 8 or (ary[index].toInt() and 0xff)).toShort()
|
||||
}
|
||||
@@ -57,19 +73,18 @@ public object ByteArrayOps {
|
||||
public inline fun getUShort(ary: ByteArray, index: Int): UShort = getShort(ary, index).toUShort()
|
||||
|
||||
public inline fun getInt(ary: ByteArray, index: Int): Int {
|
||||
return (
|
||||
(ary[index + 3].toInt() shl 24) or
|
||||
return ((ary[index + 3].toInt() shl 24) or
|
||||
((ary[index + 2].toInt() and 0xff) shl 16) or
|
||||
((ary[index + 1].toInt() and 0xff) shl 8) or
|
||||
((ary[index].toInt() and 0xff))
|
||||
)
|
||||
((ary[index].toInt() and 0xff)))
|
||||
}
|
||||
|
||||
public inline fun getUInt(ary: ByteArray, index: Int): UInt = getInt(ary, index).toUInt()
|
||||
|
||||
public inline fun getLong(ary: ByteArray, index: Int): Long {
|
||||
var idx = index
|
||||
return ary[idx++].toLong() and 0xff or
|
||||
return ary[idx++].toLong() and
|
||||
0xff or
|
||||
(ary[idx++].toLong() and 0xff shl 8) or
|
||||
(ary[idx++].toLong() and 0xff shl 16) or
|
||||
(ary[idx++].toLong() and 0xff shl 24) or
|
||||
@@ -84,13 +99,15 @@ public object ByteArrayOps {
|
||||
public inline fun setUByte(ary: ByteArray, index: Int, value: UByte) {
|
||||
ary[index] = value.toByte()
|
||||
}
|
||||
|
||||
public inline fun setShort(ary: ByteArray, index: Int, value: Short) {
|
||||
var idx = index
|
||||
ary[idx++] = (value and 0xff).toByte()
|
||||
ary[idx] = (value.toInt() shr 8 and 0xff).toByte()
|
||||
}
|
||||
|
||||
public inline fun setUShort(ary: ByteArray, index: Int, value: UShort): Unit = setShort(ary, index, value.toShort())
|
||||
public inline fun setUShort(ary: ByteArray, index: Int, value: UShort): Unit =
|
||||
setShort(ary, index, value.toShort())
|
||||
|
||||
public inline fun setInt(ary: ByteArray, index: Int, value: Int) {
|
||||
var idx = index
|
||||
@@ -100,7 +117,8 @@ public object ByteArrayOps {
|
||||
ary[idx] = (value shr 24 and 0xff).toByte()
|
||||
}
|
||||
|
||||
public inline fun setUInt(ary: ByteArray, index: Int, value: UInt): Unit = setInt(ary, index, value.toInt())
|
||||
public inline fun setUInt(ary: ByteArray, index: Int, value: UInt): Unit =
|
||||
setInt(ary, index, value.toInt())
|
||||
|
||||
public inline fun setLong(ary: ByteArray, index: Int, value: Long) {
|
||||
var i = value.toInt()
|
||||
@@ -109,7 +127,8 @@ public object ByteArrayOps {
|
||||
setInt(ary, index + 4, i)
|
||||
}
|
||||
|
||||
public inline fun setULong(ary: ByteArray, index: Int, value: ULong): Unit = setLong(ary, index, value.toLong())
|
||||
public inline fun setULong(ary: ByteArray, index: Int, value: ULong): Unit =
|
||||
setLong(ary, index, value.toLong())
|
||||
|
||||
public inline fun setFloat(ary: ByteArray, index: Int, value: Float) {
|
||||
setInt(ary, index, value.toRawBits())
|
||||
@@ -120,5 +139,7 @@ public object ByteArrayOps {
|
||||
}
|
||||
|
||||
public inline fun getFloat(ary: ByteArray, index: Int): Float = Float.fromBits(getInt(ary, index))
|
||||
public inline fun getDouble(ary: ByteArray, index: Int): Double = Double.fromBits(getLong(ary, index))
|
||||
|
||||
public inline fun getDouble(ary: ByteArray, index: Int): Double =
|
||||
Double.fromBits(getLong(ary, index))
|
||||
}
|
||||
|
||||
@@ -17,14 +17,15 @@ package com.google.flatbuffers.kotlin
|
||||
|
||||
import kotlin.jvm.JvmOverloads
|
||||
|
||||
|
||||
/**
|
||||
* Class that helps you build a FlatBuffer. See the section
|
||||
* "Use in Kotlin" in the main FlatBuffers documentation.
|
||||
* Class that helps you build a FlatBuffer. See the section "Use in Kotlin" in the main FlatBuffers
|
||||
* documentation.
|
||||
*/
|
||||
public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
public class FlatBufferBuilder
|
||||
@JvmOverloads
|
||||
constructor(
|
||||
private val initialSize: Int = 1024,
|
||||
private var buffer: ReadWriteBuffer = ArrayReadWriteBuffer(initialSize)
|
||||
private var buffer: ReadWriteBuffer = ArrayReadWriteBuffer(initialSize),
|
||||
) {
|
||||
// Remaining space in the ByteBuffer.
|
||||
private var space: Int = buffer.capacity
|
||||
@@ -62,9 +63,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
// map used to cache shared strings.
|
||||
private var stringPool: MutableMap<CharSequence, Offset<String>>? = null
|
||||
|
||||
/**
|
||||
* Reset the FlatBufferBuilder by purging all data that it holds.
|
||||
*/
|
||||
/** Reset the FlatBufferBuilder by purging all data that it holds. */
|
||||
public fun clear() {
|
||||
space = buffer.capacity
|
||||
buffer.clear()
|
||||
@@ -96,11 +95,10 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare to write an element of `size` after `additional_bytes`
|
||||
* have been written, e.g. if you write a string, you need to align such
|
||||
* the int length field is aligned to [com.google.flatbuffers.Int.SIZE_BYTES], and
|
||||
* the string data follows it directly. If all you need to do is alignment, `additional_bytes`
|
||||
* will be 0.
|
||||
* Prepare to write an element of `size` after `additional_bytes` have been written, e.g. if you
|
||||
* write a string, you need to align such the int length field is aligned to
|
||||
* [com.google.flatbuffers.Int.SIZE_BYTES], and the string data follows it directly. If all you
|
||||
* need to do is alignment, `additional_bytes` will be 0.
|
||||
*
|
||||
* @param size This is the of the new element to write.
|
||||
* @param additionalBytes The padding size.
|
||||
@@ -124,8 +122,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a `boolean` to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a `boolean` to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A `boolean` to put into the buffer.
|
||||
*/
|
||||
@@ -135,16 +133,16 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [UByte] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [UByte] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [UByte] to put into the buffer.
|
||||
*/
|
||||
public fun put(x: UByte): Unit = put(x.toByte())
|
||||
|
||||
/**
|
||||
* Add a [Byte] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [Byte] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [Byte] to put into the buffer.
|
||||
*/
|
||||
@@ -154,16 +152,16 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [UShort] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [UShort] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [UShort] to put into the buffer.
|
||||
*/
|
||||
public fun put(x: UShort): Unit = put(x.toShort())
|
||||
|
||||
/**
|
||||
* Add a [Short] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [Short] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [Short] to put into the buffer.
|
||||
*/
|
||||
@@ -173,16 +171,16 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add an [UInt] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add an [UInt] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x An [UInt] to put into the buffer.
|
||||
*/
|
||||
public fun put(x: UInt): Unit = put(x.toInt())
|
||||
|
||||
/**
|
||||
* Add an [Int] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add an [Int] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x An [Int] to put into the buffer.
|
||||
*/
|
||||
@@ -192,16 +190,16 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [ULong] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [ULong] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [ULong] to put into the buffer.
|
||||
*/
|
||||
public fun put(x: ULong): Unit = put(x.toLong())
|
||||
|
||||
/**
|
||||
* Add a [Long] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [Long] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [Long] to put into the buffer.
|
||||
*/
|
||||
@@ -211,8 +209,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [Float] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [Float] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [Float] to put into the buffer.
|
||||
*/
|
||||
@@ -222,8 +220,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [Double] to the buffer, backwards from the current location. Doesn't align nor
|
||||
* check for space.
|
||||
* Add a [Double] to the buffer, backwards from the current location. Doesn't align nor check for
|
||||
* space.
|
||||
*
|
||||
* @param x A [Double] to put into the buffer.
|
||||
*/
|
||||
@@ -336,27 +334,24 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
* @param off The offset to add.
|
||||
*/
|
||||
public fun add(off: Offset<*>): Unit = addOffset(off.value)
|
||||
|
||||
public fun add(off: VectorOffset<*>): Unit = addOffset(off.value)
|
||||
|
||||
private fun addOffset(off: Int) {
|
||||
prep(Int.SIZE_BYTES, 0) // Ensure alignment is already done.
|
||||
put(buffer.capacity - space - off + Int.SIZE_BYTES)
|
||||
}
|
||||
|
||||
/**
|
||||
* Start a new array/vector of objects. Users usually will not call
|
||||
* this directly. The `FlatBuffers` compiler will create a start/end
|
||||
* method for vector types in generated code.
|
||||
*
|
||||
* Start a new array/vector of objects. Users usually will not call this directly. The
|
||||
* `FlatBuffers` compiler will create a start/end method for vector types in generated code.
|
||||
*
|
||||
* The expected sequence of calls is:
|
||||
*
|
||||
* 1. Start the array using this method.
|
||||
* 1. Call [.addOffset] `num_elems` number of times to set
|
||||
* the offset of each element in the array.
|
||||
* 1. Call [.addOffset] `num_elems` number of times to set the offset of each element in the
|
||||
* array.
|
||||
* 1. Call [.endVector] to retrieve the offset of the array.
|
||||
*
|
||||
*
|
||||
*
|
||||
* For example, to create an array of strings, do:
|
||||
* <pre>`// Need 10 strings
|
||||
* FlatBufferBuilder builder = new FlatBufferBuilder(existingBuffer);
|
||||
@@ -379,7 +374,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
*
|
||||
* // Finish off the vector
|
||||
* int offsetOfTheVector = fbb.endVector();
|
||||
`</pre> *
|
||||
* `</pre> *
|
||||
*
|
||||
* @param elemSize The size of each element in the array.
|
||||
* @param numElems The number of elements in the array.
|
||||
@@ -392,11 +387,12 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
prep(alignment, elemSize * numElems) // Just in case alignment > int.
|
||||
nested = true
|
||||
}
|
||||
|
||||
public fun startString(numElems: Int): Unit = startVector(1, numElems, 1)
|
||||
|
||||
/**
|
||||
* Finish off the creation of an array and all its elements. The array
|
||||
* must be created with [.startVector].
|
||||
* Finish off the creation of an array and all its elements. The array must be created with
|
||||
* [.startVector].
|
||||
*
|
||||
* @return The offset at which the newly created array starts.
|
||||
* @see .startVector
|
||||
@@ -423,16 +419,19 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new array/vector and return a ByteBuffer to be filled later.
|
||||
* Call [endVector] after this method to get an offset to the beginning
|
||||
* of vector.
|
||||
* Create a new array/vector and return a ByteBuffer to be filled later. Call [endVector] after
|
||||
* this method to get an offset to the beginning of vector.
|
||||
*
|
||||
* @param elemSize the size of each element in bytes.
|
||||
* @param numElems number of elements in the vector.
|
||||
* @param alignment byte alignment.
|
||||
* @return ByteBuffer with position and limit set to the space allocated for the array.
|
||||
*/
|
||||
public fun createUnintializedVector(elemSize: Int, numElems: Int, alignment: Int): ReadWriteBuffer {
|
||||
public fun createUnintializedVector(
|
||||
elemSize: Int,
|
||||
numElems: Int,
|
||||
alignment: Int,
|
||||
): ReadWriteBuffer {
|
||||
val length = elemSize * numElems
|
||||
startVector(elemSize, numElems, alignment)
|
||||
space -= length
|
||||
@@ -460,19 +459,21 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
* @param offsets Offsets of the tables.
|
||||
* @return Returns offset of the sorted vector.
|
||||
*/
|
||||
public fun <T : Table> createSortedVectorOfTables(obj: T, offsets: Array<Offset<T>>): VectorOffset<T> {
|
||||
public fun <T : Table> createSortedVectorOfTables(
|
||||
obj: T,
|
||||
offsets: Array<Offset<T>>,
|
||||
): VectorOffset<T> {
|
||||
obj.sortTables(offsets, buffer)
|
||||
return createVectorOfTables(offsets)
|
||||
}
|
||||
|
||||
/**
|
||||
* Encode the String `s` in the buffer using UTF-8. If a String with
|
||||
* this exact contents has already been serialized using this method,
|
||||
* instead simply returns the offset of the existing String.
|
||||
* Encode the String `s` in the buffer using UTF-8. If a String with this exact contents has
|
||||
* already been serialized using this method, instead simply returns the offset of the existing
|
||||
* String.
|
||||
*
|
||||
* Usage of the method will incur into additional allocations,
|
||||
* so it is advisable to use it only when it is known upfront that
|
||||
* your message will have several repeated strings.
|
||||
* Usage of the method will incur into additional allocations, so it is advisable to use it only
|
||||
* when it is known upfront that your message will have several repeated strings.
|
||||
*
|
||||
* @param s The String to encode.
|
||||
* @return The offset in the buffer where the encoded String starts.
|
||||
@@ -494,6 +495,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
|
||||
/**
|
||||
* Encode the [CharSequence] `s` in the buffer using UTF-8.
|
||||
*
|
||||
* @param s The [CharSequence] to encode.
|
||||
* @return The offset in the buffer where the encoded string starts.
|
||||
*/
|
||||
@@ -557,13 +559,16 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
/**
|
||||
* Create a byte array in the buffer.
|
||||
*
|
||||
* The source [ReadBuffer] position is advanced until [ReadBuffer.limit]
|
||||
* after this call.
|
||||
* The source [ReadBuffer] position is advanced until [ReadBuffer.limit] after this call.
|
||||
*
|
||||
* @param data A source [ReadBuffer] with data.
|
||||
* @return The offset in the buffer where the encoded array starts.
|
||||
*/
|
||||
public fun createByteVector(data: ReadBuffer, from: Int = 0, until: Int = data.limit): VectorOffset<Byte> {
|
||||
public fun createByteVector(
|
||||
data: ReadBuffer,
|
||||
from: Int = 0,
|
||||
until: Int = data.limit,
|
||||
): VectorOffset<Byte> {
|
||||
val length: Int = until - from
|
||||
startVector(1, length, 1)
|
||||
space -= length
|
||||
@@ -572,28 +577,25 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
return VectorOffset(endVector())
|
||||
}
|
||||
|
||||
/**
|
||||
* Should not be accessing the final buffer before it is finished.
|
||||
*/
|
||||
/** Should not be accessing the final buffer before it is finished. */
|
||||
public fun finished() {
|
||||
if (!finished) throw AssertionError(
|
||||
if (!finished)
|
||||
throw AssertionError(
|
||||
"FlatBuffers: you can only access the serialized buffer after it has been" +
|
||||
" finished by FlatBufferBuilder.finish()."
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Should not be creating any other object, string or vector
|
||||
* while an object is being constructed.
|
||||
* Should not be creating any other object, string or vector while an object is being constructed.
|
||||
*/
|
||||
public fun notNested() {
|
||||
if (nested) throw AssertionError("FlatBuffers: object serialization must not be nested.")
|
||||
}
|
||||
|
||||
/**
|
||||
* Structures are always stored inline, they need to be created right
|
||||
* where they're used. You'll get this assertion failure if you
|
||||
* created it elsewhere.
|
||||
* Structures are always stored inline, they need to be created right where they're used. You'll
|
||||
* get this assertion failure if you created it elsewhere.
|
||||
*
|
||||
* @param obj The offset of the created object.
|
||||
*/
|
||||
@@ -602,14 +604,11 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Start encoding a new object in the buffer. Users will not usually need to
|
||||
* call this directly. The `FlatBuffers` compiler will generate helper methods
|
||||
* that call this method internally.
|
||||
*
|
||||
*
|
||||
* For example, using the "Monster" code found on the "landing page". An
|
||||
* object of type `Monster` can be created using the following code:
|
||||
* Start encoding a new object in the buffer. Users will not usually need to call this directly.
|
||||
* The `FlatBuffers` compiler will generate helper methods that call this method internally.
|
||||
*
|
||||
* For example, using the "Monster" code found on the "landing page". An object of type `Monster`
|
||||
* can be created using the following code:
|
||||
* <pre>`int testArrayOfString = Monster.createTestarrayofstringVector(fbb, new int[] {
|
||||
* fbb.createString("test1"),
|
||||
* fbb.createString("test2")
|
||||
@@ -626,19 +625,15 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
* Monster.addTest4(fbb, test4);
|
||||
* Monster.addTestarrayofstring(fbb, testArrayOfString);
|
||||
* int mon = Monster.endMonster(fbb);
|
||||
`</pre> *
|
||||
*
|
||||
* `</pre> *
|
||||
*
|
||||
* Here:
|
||||
*
|
||||
* * The call to `Monster#startMonster(FlatBufferBuilder)` will call this
|
||||
* method with the right number of fields set.
|
||||
* * The call to `Monster#startMonster(FlatBufferBuilder)` will call this method with the right
|
||||
* number of fields set.
|
||||
* * `Monster#endMonster(FlatBufferBuilder)` will ensure [.endObject] is called.
|
||||
*
|
||||
*
|
||||
*
|
||||
* It's not recommended to call this method directly. If it's called manually, you must ensure
|
||||
* to audit all calls to it whenever fields are added or removed from your schema. This is
|
||||
* It's not recommended to call this method directly. If it's called manually, you must ensure to
|
||||
* audit all calls to it whenever fields are added or removed from your schema. This is
|
||||
* automatically done by the code generated by the `FlatBuffers` compiler.
|
||||
*
|
||||
* @param numFields The number of fields found in this object.
|
||||
@@ -649,15 +644,14 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
vtable = IntArray(numFields)
|
||||
}
|
||||
vtableInUse = numFields
|
||||
for (i in 0 until vtableInUse)
|
||||
vtable[i] = 0
|
||||
for (i in 0 until vtableInUse) vtable[i] = 0
|
||||
nested = true
|
||||
objectStart = offset()
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [Boolean] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Boolean] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Boolean, d: Boolean?) {
|
||||
@@ -666,6 +660,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Boolean, d: Boolean) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -675,17 +670,18 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [UByte] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [UByte] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: UByte, d: UByte?): Unit = add(o, x.toByte(), d?.toByte())
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: UByte, d: UByte): Unit = add(o, x.toByte(), d.toByte())
|
||||
|
||||
/**
|
||||
* Add a [Byte] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Byte] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Byte, d: Byte?) {
|
||||
@@ -694,6 +690,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Byte, d: Byte) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -701,19 +698,20 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [UShort] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [UShort] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: UShort, d: UShort?): Unit = add(o, x.toShort(), d?.toShort())
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: UShort, d: UShort): Unit = add(o, x.toShort(), d.toShort())
|
||||
|
||||
|
||||
/**
|
||||
* Add a [Short] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Short] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Short, d: Short?) {
|
||||
@@ -722,6 +720,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Short, d: Short) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -731,17 +730,18 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [UInt] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [UInt] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: UInt, d: UInt?): Unit = add(o, x.toInt(), d?.toInt())
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: UInt, d: UInt): Unit = add(o, x.toInt(), d.toInt())
|
||||
|
||||
/**
|
||||
* Add a [Int] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Int] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Int, d: Int?) {
|
||||
@@ -750,6 +750,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Int, d: Int) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -757,17 +758,20 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [ULong] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [ULong] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: ULong, d: ULong?): Unit = add(o, x.toLong(), d?.toLong())
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: ULong, d: ULong): Unit = add(o, x.toLong(), d.toLong())
|
||||
|
||||
/**
|
||||
* Add a [Long] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Long] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Long, d: Long?) {
|
||||
@@ -776,6 +780,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Long, d: Long) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -785,8 +790,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [Float] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Float] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Float, d: Float?) {
|
||||
@@ -795,6 +800,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Float, d: Float) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -804,8 +810,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a [Double] to a table at `o` into its vtable, with value `x` and default `d`.
|
||||
* If `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* Add a [Double] to a table at `o` into its vtable, with value `x` and default `d`. If
|
||||
* `force_defaults` is `false`, compare `x` against the default value `d`. If `x` contains the
|
||||
* default value, it can be skipped.
|
||||
*/
|
||||
public fun add(o: Int, x: Double, d: Double?) {
|
||||
@@ -814,6 +820,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun add(o: Int, x: Double, d: Double) {
|
||||
if (forceDefaults || x != d) {
|
||||
@@ -837,6 +844,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
slot(o)
|
||||
}
|
||||
}
|
||||
|
||||
public fun add(o: Int, x: VectorOffset<*>, d: Int) {
|
||||
if (forceDefaults || x.value != d) {
|
||||
add(x)
|
||||
@@ -851,15 +859,20 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
* @param x The offset of the created struct.
|
||||
* @param d The default value is always `0`.
|
||||
*/
|
||||
public fun addStruct(vOffset: Int, x: Offset<*>, d: Offset<*>?): Unit = addStruct(vOffset, x.value, d?.value)
|
||||
public fun addStruct(vOffset: Int, x: Offset<*>, d: Offset<*>?): Unit =
|
||||
addStruct(vOffset, x.value, d?.value)
|
||||
|
||||
// unboxed specialization
|
||||
public fun addStruct(vOffset: Int, x: Offset<*>, d: Offset<*>): Unit = addStruct(vOffset, x.value, d.value)
|
||||
public fun addStruct(vOffset: Int, x: Offset<*>, d: Offset<*>): Unit =
|
||||
addStruct(vOffset, x.value, d.value)
|
||||
|
||||
public fun addStruct(vOffset: Int, x: Int, d: Int?) {
|
||||
if (x != d) {
|
||||
nested(x)
|
||||
slot(vOffset)
|
||||
}
|
||||
}
|
||||
|
||||
// unboxed specialization
|
||||
public fun addStruct(vOffset: Int, x: Int, d: Int) {
|
||||
if (x != d) {
|
||||
@@ -871,8 +884,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
/**
|
||||
* Set the current vtable at `voffset` to the current location in the buffer.
|
||||
*
|
||||
* @param vOffset The index into the vtable to store the offset relative to the end of the
|
||||
* buffer.
|
||||
* @param vOffset The index into the vtable to store the offset relative to the end of the buffer.
|
||||
*/
|
||||
public fun slot(vOffset: Int) {
|
||||
vtable[vOffset] = offset()
|
||||
@@ -947,8 +959,7 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks that a required field has been set in a given table that has
|
||||
* just been constructed.
|
||||
* Checks that a required field has been set in a given table that has just been constructed.
|
||||
*
|
||||
* @param table The offset to the start of the table from the `ByteBuffer` capacity.
|
||||
* @param field The offset to the field in the vtable.
|
||||
@@ -1006,10 +1017,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
protected fun finish(rootTable: Offset<*>, fileIdentifier: String, sizePrefix: Boolean) {
|
||||
val identifierSize = 4
|
||||
prep(minalign, Int.SIZE_BYTES + identifierSize + if (sizePrefix) Int.SIZE_BYTES else 0)
|
||||
if (fileIdentifier.length != identifierSize) throw AssertionError(
|
||||
"FlatBuffers: file identifier must be length " +
|
||||
identifierSize
|
||||
)
|
||||
if (fileIdentifier.length != identifierSize)
|
||||
throw AssertionError("FlatBuffers: file identifier must be length " + identifierSize)
|
||||
for (i in identifierSize - 1 downTo 0) {
|
||||
add(fileIdentifier[i].code.toByte())
|
||||
}
|
||||
@@ -1039,9 +1048,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* In order to save space, fields that are set to their default value
|
||||
* don't get serialized into the buffer. Forcing defaults provides a
|
||||
* way to manually disable this optimization.
|
||||
* In order to save space, fields that are set to their default value don't get serialized into
|
||||
* the buffer. Forcing defaults provides a way to manually disable this optimization.
|
||||
*
|
||||
* @param forceDefaults When set to `true`, always serializes default values.
|
||||
* @return Returns `this`.
|
||||
@@ -1052,9 +1060,8 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the ByteBuffer representing the FlatBuffer. Only call this after you've
|
||||
* called `finish()`. The actual data starts at the ByteBuffer's current position,
|
||||
* not necessarily at `0`.
|
||||
* Get the ByteBuffer representing the FlatBuffer. Only call this after you've called `finish()`.
|
||||
* The actual data starts at the ByteBuffer's current position, not necessarily at `0`.
|
||||
*
|
||||
* @return The [ReadBuffer] representing the FlatBuffer
|
||||
*/
|
||||
@@ -1084,21 +1091,24 @@ public class FlatBufferBuilder @JvmOverloads constructor(
|
||||
public fun Table.isFieldPresent(offset: Int): Boolean = this.offset(offset) != 0
|
||||
}
|
||||
|
||||
public fun Double.sign(): Double = when {
|
||||
public fun Double.sign(): Double =
|
||||
when {
|
||||
this.isNaN() -> Double.NaN
|
||||
this > 0 -> 1.0
|
||||
this < 0 -> -1.0
|
||||
else -> this
|
||||
}
|
||||
|
||||
public fun Float.sign(): Float = when {
|
||||
public fun Float.sign(): Float =
|
||||
when {
|
||||
this.isNaN() -> Float.NaN
|
||||
this > 0 -> 1.0f
|
||||
this < 0 -> -1.0f
|
||||
else -> this
|
||||
}
|
||||
|
||||
public fun Int.sign(): Int = when {
|
||||
public fun Int.sign(): Int =
|
||||
when {
|
||||
this > 0 -> 1
|
||||
this < 0 -> -1
|
||||
else -> this
|
||||
|
||||
@@ -20,29 +20,33 @@ import kotlin.math.min
|
||||
|
||||
// For now a typealias to guarantee type safety.
|
||||
public typealias UnionOffset = Offset<Any>
|
||||
|
||||
public typealias UnionOffsetArray = OffsetArray<Any>
|
||||
|
||||
public typealias StringOffsetArray = OffsetArray<String>
|
||||
|
||||
public inline fun UnionOffsetArray(size: Int, crossinline call: (Int) -> Offset<Any>): UnionOffsetArray =
|
||||
UnionOffsetArray(IntArray(size) { call(it).value })
|
||||
public inline fun StringOffsetArray(size: Int, crossinline call: (Int) -> Offset<String>): StringOffsetArray =
|
||||
StringOffsetArray(IntArray(size) { call(it).value })
|
||||
/**
|
||||
* Represents a "pointer" to a pointer types (table, string, struct) within the buffer
|
||||
*/
|
||||
public inline fun UnionOffsetArray(
|
||||
size: Int,
|
||||
crossinline call: (Int) -> Offset<Any>,
|
||||
): UnionOffsetArray = UnionOffsetArray(IntArray(size) { call(it).value })
|
||||
|
||||
public inline fun StringOffsetArray(
|
||||
size: Int,
|
||||
crossinline call: (Int) -> Offset<String>,
|
||||
): StringOffsetArray = StringOffsetArray(IntArray(size) { call(it).value })
|
||||
|
||||
/** Represents a "pointer" to a pointer types (table, string, struct) within the buffer */
|
||||
@JvmInline
|
||||
public value class Offset<T>(public val value: Int) {
|
||||
public fun toUnion(): UnionOffset = UnionOffset(value)
|
||||
}
|
||||
|
||||
/**
|
||||
* Represents an array of offsets. Used to avoid boxing
|
||||
* offset types.
|
||||
*/
|
||||
/** Represents an array of offsets. Used to avoid boxing offset types. */
|
||||
@JvmInline
|
||||
public value class OffsetArray<T>(public val value: IntArray) {
|
||||
public inline val size: Int
|
||||
get() = value.size
|
||||
|
||||
public inline operator fun get(index: Int): Offset<T> = Offset(value[index])
|
||||
}
|
||||
|
||||
@@ -50,12 +54,8 @@ public inline fun <T> OffsetArray(size: Int, crossinline call: (Int) -> Offset<T
|
||||
return OffsetArray(IntArray(size) { call(it).value })
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Represents a "pointer" to a vector type with elements T
|
||||
*/
|
||||
@JvmInline
|
||||
public value class VectorOffset<T>(public val value: Int)
|
||||
/** Represents a "pointer" to a vector type with elements T */
|
||||
@JvmInline public value class VectorOffset<T>(public val value: Int)
|
||||
|
||||
public fun <T> Int.toOffset(): Offset<T> = Offset(this)
|
||||
|
||||
@@ -64,9 +64,8 @@ public operator fun <T> Offset<T>.minus(other: Int): Offset<T> = Offset(this.val
|
||||
public operator fun <T> Int.minus(other: Offset<T>): Int {
|
||||
return this - other.value
|
||||
}
|
||||
/**
|
||||
* All tables in the generated code derive from this class, and add their own accessors.
|
||||
*/
|
||||
|
||||
/** All tables in the generated code derive from this class, and add their own accessors. */
|
||||
public open class Table {
|
||||
|
||||
/** Used to hold the position of the `bb` buffer. */
|
||||
@@ -84,8 +83,11 @@ public open class Table {
|
||||
protected inline fun <reified T> Int.invalid(default: T, crossinline valid: (Int) -> T): T =
|
||||
if (this != 0) valid(this) else default
|
||||
|
||||
protected inline fun <reified T> lookupField(i: Int, default: T, crossinline found: (Int) -> T) : T =
|
||||
offset(i).invalid(default) { found(it) }
|
||||
protected inline fun <reified T> lookupField(
|
||||
i: Int,
|
||||
default: T,
|
||||
crossinline found: (Int) -> T,
|
||||
): T = offset(i).invalid(default) { found(it) }
|
||||
|
||||
/**
|
||||
* Look up a field in the vtable.
|
||||
@@ -107,10 +109,10 @@ public open class Table {
|
||||
/**
|
||||
* Create a Java `String` from UTF-8 data stored inside the FlatBuffer.
|
||||
*
|
||||
* This allocates a new string and converts to wide chars upon each access,
|
||||
* which is not very efficient. Instead, each FlatBuffer string also comes with an
|
||||
* accessor based on __vector_as_ReadWriteBuffer below, which is much more efficient,
|
||||
* assuming your Java program can handle UTF-8 data directly.
|
||||
* This allocates a new string and converts to wide chars upon each access, which is not very
|
||||
* efficient. Instead, each FlatBuffer string also comes with an accessor based on
|
||||
* __vector_as_ReadWriteBuffer below, which is much more efficient, assuming your Java program can
|
||||
* handle UTF-8 data directly.
|
||||
*
|
||||
* @param offset An `int` index into the Table's ReadWriteBuffer.
|
||||
* @return Returns a `String` from the data stored inside the FlatBuffer at `offset`.
|
||||
@@ -141,11 +143,12 @@ public open class Table {
|
||||
newOffset += bufferPos
|
||||
return newOffset + bb.getInt(newOffset) + Int.SIZE_BYTES // data starts after the length
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize vector as a ReadWriteBuffer.
|
||||
*
|
||||
* This is more efficient than using duplicate, since it doesn't copy the data
|
||||
* nor allocates a new [ReadBuffer], creating no garbage to be collected.
|
||||
* This is more efficient than using duplicate, since it doesn't copy the data nor allocates a new
|
||||
* [ReadBuffer], creating no garbage to be collected.
|
||||
*
|
||||
* @param buffer The [ReadBuffer] for the array
|
||||
* @param vectorOffset The position of the vector in the byte buffer
|
||||
@@ -212,8 +215,8 @@ public open class Table {
|
||||
* Resets the internal state with a null `ReadWriteBuffer` and a zero position.
|
||||
*
|
||||
* This method exists primarily to allow recycling Table instances without risking memory leaks
|
||||
* due to `ReadWriteBuffer` references. The instance will be unusable until it is assigned
|
||||
* again to a `ReadWriteBuffer`.
|
||||
* due to `ReadWriteBuffer` references. The instance will be unusable until it is assigned again
|
||||
* to a `ReadWriteBuffer`.
|
||||
*/
|
||||
public inline fun <reified T : Table> reset(): T = reset(0, emptyBuffer)
|
||||
|
||||
@@ -238,10 +241,10 @@ public open class Table {
|
||||
/**
|
||||
* Create a Java `String` from UTF-8 data stored inside the FlatBuffer.
|
||||
*
|
||||
* This allocates a new string and converts to wide chars upon each access,
|
||||
* which is not very efficient. Instead, each FlatBuffer string also comes with an
|
||||
* accessor based on __vector_as_ReadWriteBuffer below, which is much more efficient,
|
||||
* assuming your Java program can handle UTF-8 data directly.
|
||||
* This allocates a new string and converts to wide chars upon each access, which is not very
|
||||
* efficient. Instead, each FlatBuffer string also comes with an accessor based on
|
||||
* __vector_as_ReadWriteBuffer below, which is much more efficient, assuming your Java program
|
||||
* can handle UTF-8 data directly.
|
||||
*
|
||||
* @param offset An `int` index into the Table's ReadWriteBuffer.
|
||||
* @param bb Table ReadWriteBuffer used to read a string at given offset.
|
||||
@@ -268,8 +271,7 @@ public open class Table {
|
||||
/**
|
||||
* Check if a [ReadWriteBuffer] contains a file identifier.
|
||||
*
|
||||
* @param bb A `ReadWriteBuffer` to check if it contains the identifier
|
||||
* `ident`.
|
||||
* @param bb A `ReadWriteBuffer` to check if it contains the identifier `ident`.
|
||||
* @param ident A `String` identifier of the FlatBuffer file.
|
||||
* @return True if the buffer contains the file identifier
|
||||
*/
|
||||
@@ -330,9 +332,7 @@ public open class Table {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* All structs in the generated code derive from this class, and add their own accessors.
|
||||
*/
|
||||
/** All structs in the generated code derive from this class, and add their own accessors. */
|
||||
public open class Struct {
|
||||
/** Used to hold the position of the `bb` buffer. */
|
||||
protected var bufferPos: Int = 0
|
||||
@@ -356,12 +356,13 @@ public open class Struct {
|
||||
* Resets internal state with a null `ByteBuffer` and a zero position.
|
||||
*
|
||||
* This method exists primarily to allow recycling Struct instances without risking memory leaks
|
||||
* due to `ByteBuffer` references. The instance will be unusable until it is assigned
|
||||
* again to a `ByteBuffer`.
|
||||
* due to `ByteBuffer` references. The instance will be unusable until it is assigned again to a
|
||||
* `ByteBuffer`.
|
||||
*/
|
||||
private inline fun <reified T : Struct> reset(): T = reset(0, emptyBuffer)
|
||||
}
|
||||
|
||||
public inline val <T> T.value: T get() = this
|
||||
public inline val <T> T.value: T
|
||||
get() = this
|
||||
|
||||
public const val VERSION_2_0_8: Int = 1
|
||||
|
||||
@@ -15,13 +15,14 @@
|
||||
*/
|
||||
@file:Suppress("NOTHING_TO_INLINE")
|
||||
@file:JvmName("FlexBuffers")
|
||||
|
||||
package com.google.flatbuffers.kotlin
|
||||
|
||||
import kotlin.jvm.JvmName
|
||||
|
||||
/**
|
||||
* Reads a FlexBuffer message in ReadBuf and returns [Reference] to
|
||||
* the root element.
|
||||
* Reads a FlexBuffer message in ReadBuf and returns [Reference] to the root element.
|
||||
*
|
||||
* @param buffer ReadBuf containing FlexBuffer message
|
||||
* @return [Reference] to the root object
|
||||
*/
|
||||
@@ -34,199 +35,231 @@ public fun getRoot(buffer: ReadBuffer): Reference {
|
||||
}
|
||||
|
||||
/**
|
||||
* Represents an generic element in the buffer. It can be specialized into scalar types, using for example,
|
||||
* [Reference.toInt], or casted into Flexbuffer object types, like [Reference.toMap] or [Reference.toBlob].
|
||||
* Represents an generic element in the buffer. It can be specialized into scalar types, using for
|
||||
* example, [Reference.toInt], or casted into Flexbuffer object types, like [Reference.toMap] or
|
||||
* [Reference.toBlob].
|
||||
*/
|
||||
@Suppress("NOTHING_TO_INLINE")
|
||||
public class Reference internal constructor(
|
||||
public class Reference
|
||||
internal constructor(
|
||||
internal val buffer: ReadBuffer,
|
||||
internal val end: Int,
|
||||
internal val parentWidth: ByteWidth,
|
||||
internal val byteWidth: ByteWidth,
|
||||
public val type: FlexBufferType
|
||||
public val type: FlexBufferType,
|
||||
) {
|
||||
|
||||
internal constructor(bb: ReadBuffer, end: Int, parentWidth: ByteWidth, packedType: Int) :
|
||||
this(bb, end, parentWidth, ByteWidth(1 shl (packedType and 3)), FlexBufferType((packedType shr 2)))
|
||||
internal constructor(
|
||||
bb: ReadBuffer,
|
||||
end: Int,
|
||||
parentWidth: ByteWidth,
|
||||
packedType: Int,
|
||||
) : this(
|
||||
bb,
|
||||
end,
|
||||
parentWidth,
|
||||
ByteWidth(1 shl (packedType and 3)),
|
||||
FlexBufferType((packedType shr 2)),
|
||||
)
|
||||
|
||||
/**
|
||||
* Checks whether the element is null type
|
||||
*
|
||||
* @return true if null type
|
||||
*/
|
||||
public val isNull: Boolean get() = type == T_NULL
|
||||
public val isNull: Boolean
|
||||
get() = type == T_NULL
|
||||
|
||||
/**
|
||||
* Checks whether the element is boolean type
|
||||
*
|
||||
* @return true if boolean type
|
||||
*/
|
||||
public val isBoolean: Boolean get() = type == T_BOOL
|
||||
public val isBoolean: Boolean
|
||||
get() = type == T_BOOL
|
||||
|
||||
/**
|
||||
* Checks whether the element type is numeric (signed/unsigned integers and floats)
|
||||
*
|
||||
* @return true if numeric type
|
||||
*/
|
||||
public val isNumeric: Boolean get() = isIntOrUInt || isFloat
|
||||
public val isNumeric: Boolean
|
||||
get() = isIntOrUInt || isFloat
|
||||
|
||||
/**
|
||||
* Checks whether the element type is signed or unsigned integers
|
||||
*
|
||||
* @return true if an integer type
|
||||
*/
|
||||
public val isIntOrUInt: Boolean get() = isInt || isUInt
|
||||
public val isIntOrUInt: Boolean
|
||||
get() = isInt || isUInt
|
||||
|
||||
/**
|
||||
* Checks whether the element type is float
|
||||
*
|
||||
* @return true if a float type
|
||||
*/
|
||||
public val isFloat: Boolean get() = type == T_FLOAT || type == T_INDIRECT_FLOAT
|
||||
public val isFloat: Boolean
|
||||
get() = type == T_FLOAT || type == T_INDIRECT_FLOAT
|
||||
|
||||
/**
|
||||
* Checks whether the element type is signed integer
|
||||
*
|
||||
* @return true if a signed integer type
|
||||
*/
|
||||
public val isInt: Boolean get() = type == T_INT || type == T_INDIRECT_INT
|
||||
public val isInt: Boolean
|
||||
get() = type == T_INT || type == T_INDIRECT_INT
|
||||
|
||||
/**
|
||||
* Checks whether the element type is signed integer
|
||||
*
|
||||
* @return true if a signed integer type
|
||||
*/
|
||||
public val isUInt: Boolean get() = type == T_UINT || type == T_INDIRECT_UINT
|
||||
public val isUInt: Boolean
|
||||
get() = type == T_UINT || type == T_INDIRECT_UINT
|
||||
|
||||
/**
|
||||
* Checks whether the element type is string
|
||||
*
|
||||
* @return true if a string type
|
||||
*/
|
||||
public val isString: Boolean get() = type == T_STRING
|
||||
public val isString: Boolean
|
||||
get() = type == T_STRING
|
||||
|
||||
/**
|
||||
* Checks whether the element type is key
|
||||
*
|
||||
* @return true if a key type
|
||||
*/
|
||||
public val isKey: Boolean get() = type == T_KEY
|
||||
public val isKey: Boolean
|
||||
get() = type == T_KEY
|
||||
|
||||
/**
|
||||
* Checks whether the element type is vector or a map. [TypedVector] are considered different types and will return
|
||||
* false.
|
||||
* Checks whether the element type is vector or a map. [TypedVector] are considered different
|
||||
* types and will return false.
|
||||
*
|
||||
* @return true if a vector type
|
||||
*/
|
||||
public val isVector: Boolean get() = type == T_VECTOR || type == T_MAP
|
||||
public val isVector: Boolean
|
||||
get() = type == T_VECTOR || type == T_MAP
|
||||
|
||||
/**
|
||||
* Checks whether the element type is typed vector
|
||||
*
|
||||
* @return true if a typed vector type
|
||||
*/
|
||||
public val isTypedVector: Boolean get() = type.isTypedVector()
|
||||
public val isTypedVector: Boolean
|
||||
get() = type.isTypedVector()
|
||||
|
||||
/**
|
||||
* Checks whether the element type is a map
|
||||
*
|
||||
* @return true if a map type
|
||||
*/
|
||||
public val isMap: Boolean get() = type == T_MAP
|
||||
public val isMap: Boolean
|
||||
get() = type == T_MAP
|
||||
|
||||
/**
|
||||
* Checks whether the element type is a blob
|
||||
*
|
||||
* @return true if a blob type
|
||||
*/
|
||||
public val isBlob: Boolean get() = type == T_BLOB
|
||||
public val isBlob: Boolean
|
||||
get() = type == T_BLOB
|
||||
|
||||
/**
|
||||
* Assumes [Reference] as a [Vector] and returns a [Reference] at index [index].
|
||||
*/
|
||||
/** Assumes [Reference] as a [Vector] and returns a [Reference] at index [index]. */
|
||||
public operator fun get(index: Int): Reference = toVector()[index]
|
||||
|
||||
/**
|
||||
* Assumes [Reference] as a [Map] and returns a [Reference] for the value at key [key].
|
||||
*/
|
||||
/** Assumes [Reference] as a [Map] and returns a [Reference] for the value at key [key]. */
|
||||
public operator fun get(key: String): Reference = toMap()[key]
|
||||
|
||||
/**
|
||||
* Returns element as a [Boolean].
|
||||
* If element type is not boolean, it will be casted to integer and compared against 0
|
||||
* Returns element as a [Boolean]. If element type is not boolean, it will be casted to integer
|
||||
* and compared against 0
|
||||
*
|
||||
* @return element as [Boolean]
|
||||
*/
|
||||
public fun toBoolean(): Boolean = if (isBoolean) buffer.getBoolean(end) else toUInt() != 0u
|
||||
|
||||
/**
|
||||
* Returns element as [Byte].
|
||||
* For vector types, it will return size of the vector.
|
||||
* For String type, it will be parsed as integer.
|
||||
* Unsigned elements will become signed (with possible overflow).
|
||||
* Float elements will be casted to [Byte].
|
||||
* Returns element as [Byte]. For vector types, it will return size of the vector. For String
|
||||
* type, it will be parsed as integer. Unsigned elements will become signed (with possible
|
||||
* overflow). Float elements will be casted to [Byte].
|
||||
*
|
||||
* @return [Byte] or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public fun toByte(): Byte = toULong().toByte()
|
||||
|
||||
/**
|
||||
* Returns element as [Short].
|
||||
* For vector types, it will return size of the vector.
|
||||
* For String type, it will type to be parsed as integer.
|
||||
* Unsigned elements will become signed (with possible overflow).
|
||||
* Float elements will be casted to [Short]
|
||||
* Returns element as [Short]. For vector types, it will return size of the vector. For String
|
||||
* type, it will type to be parsed as integer. Unsigned elements will become signed (with possible
|
||||
* overflow). Float elements will be casted to [Short]
|
||||
*
|
||||
* @return [Short] or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public fun toShort(): Short = toULong().toShort()
|
||||
|
||||
/**
|
||||
* Returns element as [Int].
|
||||
* For vector types, it will return size of the vector.
|
||||
* For String type, it will type to be parsed as integer.
|
||||
* Unsigned elements will become signed (with possible overflow).
|
||||
* Float elements will be casted to [Int]
|
||||
* Returns element as [Int]. For vector types, it will return size of the vector. For String type,
|
||||
* it will type to be parsed as integer. Unsigned elements will become signed (with possible
|
||||
* overflow). Float elements will be casted to [Int]
|
||||
*
|
||||
* @return [Int] or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public fun toInt(): Int = toULong().toInt()
|
||||
|
||||
/**
|
||||
* Returns element as [Long].
|
||||
* For vector types, it will return size of the vector
|
||||
* For String type, it will type to be parsed as integer
|
||||
* Unsigned elements will become negative
|
||||
* Float elements will be casted to integer
|
||||
* Returns element as [Long]. For vector types, it will return size of the vector For String type,
|
||||
* it will type to be parsed as integer Unsigned elements will become negative Float elements will
|
||||
* be casted to integer
|
||||
*
|
||||
* @return [Long] integer or 0 if fail to convert element to long.
|
||||
*/
|
||||
public fun toLong(): Long = toULong().toLong()
|
||||
|
||||
/**
|
||||
* Returns element as [UByte].
|
||||
* For vector types, it will return size of the vector.
|
||||
* For String type, it will type to be parsed as integer.
|
||||
* Negative elements will become unsigned counterpart.
|
||||
* Returns element as [UByte]. For vector types, it will return size of the vector. For String
|
||||
* type, it will type to be parsed as integer. Negative elements will become unsigned counterpart.
|
||||
* Float elements will be casted to [UByte]
|
||||
*
|
||||
* @return [UByte] or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public fun toUByte(): UByte = toULong().toUByte()
|
||||
|
||||
/**
|
||||
* Returns element as [UShort].
|
||||
* For vector types, it will return size of the vector.
|
||||
* For String type, it will type to be parsed as integer.
|
||||
* Negative elements will become unsigned counterpart.
|
||||
* Returns element as [UShort]. For vector types, it will return size of the vector. For String
|
||||
* type, it will type to be parsed as integer. Negative elements will become unsigned counterpart.
|
||||
* Float elements will be casted to [UShort]
|
||||
*
|
||||
* @return [UShort] or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public fun toUShort(): UShort = toULong().toUShort()
|
||||
|
||||
/**
|
||||
* Returns element as [UInt].
|
||||
* For vector types, it will return size of the vector.
|
||||
* For String type, it will type to be parsed as integer.
|
||||
* Negative elements will become unsigned counterpart.
|
||||
* Returns element as [UInt]. For vector types, it will return size of the vector. For String
|
||||
* type, it will type to be parsed as integer. Negative elements will become unsigned counterpart.
|
||||
* Float elements will be casted to [UInt]
|
||||
*
|
||||
* @return [UInt] or 0 if fail to convert element to integer.
|
||||
*/
|
||||
public fun toUInt(): UInt = toULong().toUInt()
|
||||
|
||||
/**
|
||||
* Returns element as [ULong] integer.
|
||||
* For vector types, it will return size of the vector
|
||||
* For String type, it will type to be parsed as integer
|
||||
* Negative elements will become unsigned counterpart.
|
||||
* Float elements will be casted to integer
|
||||
* Returns element as [ULong] integer. For vector types, it will return size of the vector For
|
||||
* String type, it will type to be parsed as integer Negative elements will become unsigned
|
||||
* counterpart. Float elements will be casted to integer
|
||||
*
|
||||
* @return [ULong] integer or 0 if fail to convert element to long.
|
||||
*/
|
||||
public fun toULong(): ULong = resolve { pos: Int, width: ByteWidth ->
|
||||
when (type) {
|
||||
T_INDIRECT_INT, T_INDIRECT_UINT, T_INT, T_BOOL, T_UINT -> buffer.readULong(pos, width)
|
||||
T_FLOAT, T_INDIRECT_FLOAT -> buffer.readFloat(pos, width).toULong()
|
||||
T_INDIRECT_INT,
|
||||
T_INDIRECT_UINT,
|
||||
T_INT,
|
||||
T_BOOL,
|
||||
T_UINT -> buffer.readULong(pos, width)
|
||||
T_FLOAT,
|
||||
T_INDIRECT_FLOAT -> buffer.readFloat(pos, width).toULong()
|
||||
T_STRING -> toString().toULong()
|
||||
T_VECTOR -> toVector().size.toULong()
|
||||
else -> 0UL
|
||||
@@ -234,17 +267,18 @@ public class Reference internal constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element as [Float].
|
||||
* For vector types, it will return size of the vector
|
||||
* For String type, it will type to be parsed as [Float]
|
||||
* Float elements will be casted to integer
|
||||
* Returns element as [Float]. For vector types, it will return size of the vector For String
|
||||
* type, it will type to be parsed as [Float] Float elements will be casted to integer
|
||||
*
|
||||
* @return [Float] integer or 0 if fail to convert element to long.
|
||||
*/
|
||||
public fun toFloat(): Float = resolve { pos: Int, width: ByteWidth ->
|
||||
when (type) {
|
||||
T_INDIRECT_FLOAT, T_FLOAT -> buffer.readFloat(pos, width).toFloat()
|
||||
T_INDIRECT_FLOAT,
|
||||
T_FLOAT -> buffer.readFloat(pos, width).toFloat()
|
||||
T_INT -> buffer.readInt(end, parentWidth).toFloat()
|
||||
T_UINT, T_BOOL -> buffer.readUInt(end, parentWidth).toFloat()
|
||||
T_UINT,
|
||||
T_BOOL -> buffer.readUInt(end, parentWidth).toFloat()
|
||||
T_INDIRECT_INT -> buffer.readInt(pos, width).toFloat()
|
||||
T_INDIRECT_UINT -> buffer.readUInt(pos, width).toFloat()
|
||||
T_NULL -> 0.0f
|
||||
@@ -255,16 +289,18 @@ public class Reference internal constructor(
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element as [Double].
|
||||
* For vector types, it will return size of the vector
|
||||
* For String type, it will type to be parsed as [Double]
|
||||
* Returns element as [Double]. For vector types, it will return size of the vector For String
|
||||
* type, it will type to be parsed as [Double]
|
||||
*
|
||||
* @return [Float] integer or 0 if fail to convert element to long.
|
||||
*/
|
||||
public fun toDouble(): Double = resolve { pos: Int, width: ByteWidth ->
|
||||
when (type) {
|
||||
T_INDIRECT_FLOAT, T_FLOAT -> buffer.readFloat(pos, width)
|
||||
T_INDIRECT_FLOAT,
|
||||
T_FLOAT -> buffer.readFloat(pos, width)
|
||||
T_INT -> buffer.readInt(pos, width).toDouble()
|
||||
T_UINT, T_BOOL -> buffer.readUInt(pos, width).toDouble()
|
||||
T_UINT,
|
||||
T_BOOL -> buffer.readUInt(pos, width).toDouble()
|
||||
T_INDIRECT_INT -> buffer.readInt(pos, width).toDouble()
|
||||
T_INDIRECT_UINT -> buffer.readUInt(pos, width).toDouble()
|
||||
T_NULL -> 0.0
|
||||
@@ -274,18 +310,20 @@ public class Reference internal constructor(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element as [Key] or invalid key.
|
||||
*/
|
||||
public fun toKey(): Key = when (type) {
|
||||
/** Returns element as [Key] or invalid key. */
|
||||
public fun toKey(): Key =
|
||||
when (type) {
|
||||
T_KEY -> Key(buffer, buffer.indirect(end, parentWidth))
|
||||
else -> nullKey()
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element as a [String]
|
||||
*
|
||||
* @return element as [String] or empty [String] if fail
|
||||
*/
|
||||
override fun toString(): String = when (type) {
|
||||
override fun toString(): String =
|
||||
when (type) {
|
||||
T_STRING -> {
|
||||
val start = buffer.indirect(end, parentWidth)
|
||||
val size = buffer.readULong(start - byteWidth, byteWidth).toInt()
|
||||
@@ -293,9 +331,13 @@ public class Reference internal constructor(
|
||||
}
|
||||
T_KEY -> buffer.getKeyString(buffer.indirect(end, parentWidth))
|
||||
T_MAP -> "{ ${toMap().entries.joinToString(", ") { "${it.key}: ${it.value}"}} }"
|
||||
T_VECTOR, T_VECTOR_BOOL, T_VECTOR_FLOAT, T_VECTOR_INT,
|
||||
T_VECTOR_UINT, T_VECTOR_KEY, T_VECTOR_STRING_DEPRECATED ->
|
||||
"[ ${toVector().joinToString(", ") { it.toString() }} ]"
|
||||
T_VECTOR,
|
||||
T_VECTOR_BOOL,
|
||||
T_VECTOR_FLOAT,
|
||||
T_VECTOR_INT,
|
||||
T_VECTOR_UINT,
|
||||
T_VECTOR_KEY,
|
||||
T_VECTOR_STRING_DEPRECATED -> "[ ${toVector().joinToString(", ") { it.toString() }} ]"
|
||||
T_INT -> toLong().toString()
|
||||
T_UINT -> toULong().toString()
|
||||
T_FLOAT -> toDouble().toString()
|
||||
@@ -304,10 +346,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [ByteArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [ByteArray] or empty [ByteArray] if fail.
|
||||
*/
|
||||
public fun toByteArray(): ByteArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> ByteArray(vec.size) { vec.getInt(it).toByte() }
|
||||
T_VECTOR_UINT -> ByteArray(vec.size) { vec.getUInt(it).toByte() }
|
||||
@@ -319,10 +363,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [ByteArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [ByteArray] or empty [ByteArray] if fail.
|
||||
*/
|
||||
public fun toShortArray(): ShortArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> ShortArray(vec.size) { vec.getInt(it).toShort() }
|
||||
T_VECTOR_UINT -> ShortArray(vec.size) { vec.getUInt(it).toShort() }
|
||||
@@ -334,10 +380,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [IntArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [IntArray] or empty [IntArray] if fail.
|
||||
*/
|
||||
public fun toIntArray(): IntArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> IntArray(vec.size) { vec.getInt(it).toInt() }
|
||||
T_VECTOR_UINT -> IntArray(vec.size) { vec.getUInt(it).toInt() }
|
||||
@@ -349,10 +397,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [LongArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [LongArray] or empty [LongArray] if fail.
|
||||
*/
|
||||
public fun toLongArray(): LongArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> LongArray(vec.size) { vec.getInt(it) }
|
||||
T_VECTOR_UINT -> LongArray(vec.size) { vec.getInt(it) }
|
||||
@@ -364,10 +414,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [UByteArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [UByteArray] or empty [UByteArray] if fail.
|
||||
*/
|
||||
public fun toUByteArray(): UByteArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> UByteArray(vec.size) { vec.getInt(it).toUByte() }
|
||||
T_VECTOR_UINT -> UByteArray(vec.size) { vec.getUInt(it).toUByte() }
|
||||
@@ -379,10 +431,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [UIntArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [UIntArray] or empty [UIntArray] if fail.
|
||||
*/
|
||||
public fun toUShortArray(): UShortArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> UShortArray(vec.size) { vec.getInt(it).toUShort() }
|
||||
T_VECTOR_UINT -> UShortArray(vec.size) { vec.getUInt(it).toUShort() }
|
||||
@@ -394,10 +448,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [UIntArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [UIntArray] or empty [UIntArray] if fail.
|
||||
*/
|
||||
public fun toUIntArray(): UIntArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> UIntArray(vec.size) { vec.getInt(it).toUInt() }
|
||||
T_VECTOR_UINT -> UIntArray(vec.size) { vec.getUInt(it).toUInt() }
|
||||
@@ -409,10 +465,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [ULongArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [ULongArray] or empty [ULongArray] if fail.
|
||||
*/
|
||||
public fun toULongArray(): ULongArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_INT -> ULongArray(vec.size) { vec.getUInt(it) }
|
||||
T_VECTOR_UINT -> ULongArray(vec.size) { vec.getUInt(it) }
|
||||
@@ -424,10 +482,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [FloatArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [FloatArray] or empty [FloatArray] if fail.
|
||||
*/
|
||||
public fun toFloatArray(): FloatArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_FLOAT -> FloatArray(vec.size) { vec.getFloat(it).toFloat() }
|
||||
T_VECTOR_INT -> FloatArray(vec.size) { vec.getInt(it).toFloat() }
|
||||
@@ -439,10 +499,12 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [DoubleArray], converting scalar types when possible.
|
||||
*
|
||||
* @return element as [DoubleArray] or empty [DoubleArray] if fail.
|
||||
*/
|
||||
public fun toDoubleArray(): DoubleArray {
|
||||
val vec = TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
val vec =
|
||||
TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
return when (type) {
|
||||
T_VECTOR_FLOAT -> DoubleArray(vec.size) { vec[it].toDouble() }
|
||||
T_VECTOR_INT -> DoubleArray(vec.size) { vec[it].toDouble() }
|
||||
@@ -454,32 +516,43 @@ public class Reference internal constructor(
|
||||
|
||||
/**
|
||||
* Returns element as a [Vector]
|
||||
*
|
||||
* @return element as [Vector] or empty [Vector] if fail
|
||||
*/
|
||||
public fun toVector(): Vector {
|
||||
return when {
|
||||
isVector -> Vector(buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
isTypedVector -> TypedVector(type.toElementTypedVector(), buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
isTypedVector ->
|
||||
TypedVector(
|
||||
type.toElementTypedVector(),
|
||||
buffer,
|
||||
buffer.indirect(end, parentWidth),
|
||||
byteWidth,
|
||||
)
|
||||
else -> emptyVector()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element as a [Blob]
|
||||
*
|
||||
* @return element as [Blob] or empty [Blob] if fail
|
||||
*/
|
||||
public fun toBlob(): Blob {
|
||||
return when (type) {
|
||||
T_BLOB, T_STRING -> Blob(buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
T_BLOB,
|
||||
T_STRING -> Blob(buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
else -> emptyBlob()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns element as a [Map].
|
||||
*
|
||||
* @return element as [Map] or empty [Map] if fail
|
||||
*/
|
||||
public fun toMap(): Map = when (type) {
|
||||
public fun toMap(): Map =
|
||||
when (type) {
|
||||
T_MAP -> Map(buffer, buffer.indirect(end, parentWidth), byteWidth)
|
||||
else -> emptyMap()
|
||||
}
|
||||
@@ -496,12 +569,14 @@ public class Reference internal constructor(
|
||||
if (this === other) return true
|
||||
if (other == null || this::class != other::class) return false
|
||||
other as Reference
|
||||
if (buffer != other.buffer ||
|
||||
if (
|
||||
buffer != other.buffer ||
|
||||
end != other.end ||
|
||||
parentWidth != other.parentWidth ||
|
||||
byteWidth != other.byteWidth ||
|
||||
type != other.type
|
||||
) return false
|
||||
)
|
||||
return false
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -518,30 +593,28 @@ public class Reference internal constructor(
|
||||
/**
|
||||
* Represents any element that has a size property to it, like: [Map], [Vector] and [TypedVector].
|
||||
*/
|
||||
public open class Sized internal constructor(
|
||||
public open class Sized
|
||||
internal constructor(
|
||||
public val buffer: ReadBuffer,
|
||||
public val end: Int,
|
||||
public val byteWidth: ByteWidth
|
||||
public val byteWidth: ByteWidth,
|
||||
) {
|
||||
public open val size: Int = buffer.readSize(end, byteWidth)
|
||||
}
|
||||
|
||||
/**
|
||||
* Represent an array of bytes in the buffer.
|
||||
*/
|
||||
public open class Blob internal constructor(
|
||||
buffer: ReadBuffer,
|
||||
end: Int,
|
||||
byteWidth: ByteWidth
|
||||
) : Sized(buffer, end, byteWidth) {
|
||||
/** Represent an array of bytes in the buffer. */
|
||||
public open class Blob internal constructor(buffer: ReadBuffer, end: Int, byteWidth: ByteWidth) :
|
||||
Sized(buffer, end, byteWidth) {
|
||||
/**
|
||||
* Return [Blob] as [ReadBuffer]
|
||||
*
|
||||
* @return blob as [ReadBuffer]
|
||||
*/
|
||||
public fun data(): ReadBuffer = buffer.slice(end, size)
|
||||
|
||||
/**
|
||||
* Copy [Blob] into a [ByteArray]
|
||||
*
|
||||
* @return A [ByteArray] containing the blob data.
|
||||
*/
|
||||
public fun toByteArray(): ByteArray {
|
||||
@@ -554,6 +627,7 @@ public open class Blob internal constructor(
|
||||
|
||||
/**
|
||||
* Return individual byte at a given position
|
||||
*
|
||||
* @param pos position of the byte to be read
|
||||
*/
|
||||
public operator fun get(pos: Int): Byte {
|
||||
@@ -564,18 +638,13 @@ public open class Blob internal constructor(
|
||||
override fun toString(): String = buffer.getString(end, size)
|
||||
}
|
||||
|
||||
/**
|
||||
* [Vector] represents an array of elements in the buffer. The element can be of any type.
|
||||
*/
|
||||
public open class Vector internal constructor(
|
||||
buffer: ReadBuffer,
|
||||
end: Int,
|
||||
byteWidth: ByteWidth
|
||||
) : Collection<Reference>,
|
||||
Sized(buffer, end, byteWidth) {
|
||||
/** [Vector] represents an array of elements in the buffer. The element can be of any type. */
|
||||
public open class Vector internal constructor(buffer: ReadBuffer, end: Int, byteWidth: ByteWidth) :
|
||||
Collection<Reference>, Sized(buffer, end, byteWidth) {
|
||||
|
||||
/**
|
||||
* Returns a [Reference] from the [Vector] at position [index]. Returns a null reference
|
||||
*
|
||||
* @param index position in the vector.
|
||||
* @return [Reference] for a key or a null [Reference] if not found.
|
||||
*/
|
||||
@@ -597,25 +666,27 @@ public open class Vector internal constructor(
|
||||
|
||||
override fun isEmpty(): Boolean = size == 0
|
||||
|
||||
override fun iterator(): Iterator<Reference> = object : Iterator<Reference> {
|
||||
override fun iterator(): Iterator<Reference> =
|
||||
object : Iterator<Reference> {
|
||||
var position = 0
|
||||
|
||||
override fun hasNext(): Boolean = position != size
|
||||
|
||||
override fun next(): Reference = get(position++)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* [TypedVector] represents an array of scalar elements of the same type in the buffer.
|
||||
*/
|
||||
/** [TypedVector] represents an array of scalar elements of the same type in the buffer. */
|
||||
public open class TypedVector(
|
||||
private val elementType: FlexBufferType,
|
||||
buffer: ReadBuffer,
|
||||
end: Int,
|
||||
byteWidth: ByteWidth
|
||||
byteWidth: ByteWidth,
|
||||
) : Vector(buffer, end, byteWidth) {
|
||||
|
||||
/**
|
||||
* Returns a [Reference] from the [TypedVector] at position [index]. Returns a null reference
|
||||
*
|
||||
* @param index position in the vector.
|
||||
* @return [Reference] for a key or a null [Reference] if not found.
|
||||
*/
|
||||
@@ -630,28 +701,24 @@ public open class TypedVector(
|
||||
return block(childPos, byteWidth)
|
||||
}
|
||||
|
||||
internal fun getBoolean(index: Int): Boolean = resolveAt(index) {
|
||||
pos: Int, _: ByteWidth -> buffer.getBoolean(pos)
|
||||
}
|
||||
internal fun getInt(index: Int): Long = resolveAt(index) {
|
||||
pos: Int, width: ByteWidth -> buffer.readLong(pos, width)
|
||||
}
|
||||
internal fun getUInt(index: Int): ULong = resolveAt(index) {
|
||||
pos: Int, width: ByteWidth -> buffer.readULong(pos, width)
|
||||
}
|
||||
internal fun getFloat(index: Int): Double = resolveAt(index) {
|
||||
pos: Int, width: ByteWidth -> buffer.readFloat(pos, width)
|
||||
}
|
||||
internal fun getBoolean(index: Int): Boolean =
|
||||
resolveAt(index) { pos: Int, _: ByteWidth -> buffer.getBoolean(pos) }
|
||||
|
||||
internal fun getInt(index: Int): Long =
|
||||
resolveAt(index) { pos: Int, width: ByteWidth -> buffer.readLong(pos, width) }
|
||||
|
||||
internal fun getUInt(index: Int): ULong =
|
||||
resolveAt(index) { pos: Int, width: ByteWidth -> buffer.readULong(pos, width) }
|
||||
|
||||
internal fun getFloat(index: Int): Double =
|
||||
resolveAt(index) { pos: Int, width: ByteWidth -> buffer.readFloat(pos, width) }
|
||||
}
|
||||
|
||||
/**
|
||||
* Represents a key element in the buffer. Keys are
|
||||
* used to reference objects in a [Map]
|
||||
*/
|
||||
/** Represents a key element in the buffer. Keys are used to reference objects in a [Map] */
|
||||
public data class Key(
|
||||
public val buffer: ReadBuffer,
|
||||
public val start: Int,
|
||||
public val end: Int = buffer.findFirst(ZeroByte, start)
|
||||
public val end: Int = buffer.findFirst(ZeroByte, start),
|
||||
) {
|
||||
|
||||
val sizeInBytes: Int = end - start
|
||||
@@ -704,25 +771,21 @@ public data class Key(
|
||||
}
|
||||
}
|
||||
|
||||
override fun toString(): String = if (sizeInBytes > 0) buffer.getString(start, sizeInBytes) else ""
|
||||
override fun toString(): String =
|
||||
if (sizeInBytes > 0) buffer.getString(start, sizeInBytes) else ""
|
||||
|
||||
/**
|
||||
* Checks whether Key is invalid or not.
|
||||
*/
|
||||
/** Checks whether Key is invalid or not. */
|
||||
public fun isInvalid(): Boolean = sizeInBytes <= 0
|
||||
}
|
||||
|
||||
/**
|
||||
* A Map class that provide support to access Key-Value data from Flexbuffers.
|
||||
*/
|
||||
public class Map
|
||||
internal constructor(buffer: ReadBuffer, end: Int, byteWidth: ByteWidth):
|
||||
Sized(buffer, end, byteWidth),
|
||||
kotlin.collections.Map<Key, Reference> {
|
||||
/** A Map class that provide support to access Key-Value data from Flexbuffers. */
|
||||
public class Map internal constructor(buffer: ReadBuffer, end: Int, byteWidth: ByteWidth) :
|
||||
Sized(buffer, end, byteWidth), kotlin.collections.Map<Key, Reference> {
|
||||
|
||||
// used for accessing the key vector elements
|
||||
private var keyVectorEnd: Int
|
||||
private var keyVectorByteWidth: ByteWidth
|
||||
|
||||
init {
|
||||
val keysOffset = end - (3 * byteWidth) // 3 is number of prefixed fields
|
||||
keyVectorEnd = buffer.indirect(keysOffset, byteWidth)
|
||||
@@ -731,6 +794,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Returns a [Reference] from the [Map] at position [index]. Returns a null reference
|
||||
*
|
||||
* @param index position in the map
|
||||
* @return [Reference] for a key or a null [Reference] if not found.
|
||||
*/
|
||||
@@ -744,6 +808,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Returns a [Reference] from the [Map] for a given [String] [key].
|
||||
*
|
||||
* @param key access key to element on map
|
||||
* @return [Reference] for a key or a null [Reference] if not found.
|
||||
*/
|
||||
@@ -756,6 +821,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Returns a [Reference] from the [Map] for a given [Key] [key].
|
||||
*
|
||||
* @param key access key to element on map
|
||||
* @return [Reference] for a key or a null [Reference] if not found.
|
||||
*/
|
||||
@@ -768,6 +834,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Checks whether the map contains a [key].
|
||||
*
|
||||
* @param key [String]
|
||||
* @return true if key is found in the map, otherwise false.
|
||||
*/
|
||||
@@ -775,6 +842,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Returns a [Key] for a given position [index] in the [Map].
|
||||
*
|
||||
* @param index of the key in the map
|
||||
* @return a Key for the given index. Out of bounds indexes returns invalid keys.
|
||||
*/
|
||||
@@ -785,6 +853,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Returns a [Key] as [String] for a given position [index] in the [Map].
|
||||
*
|
||||
* @param index of the key in the map
|
||||
* @return a Key for the given index. Out of bounds indexes returns empty string.
|
||||
*/
|
||||
@@ -815,6 +884,7 @@ public class Map
|
||||
|
||||
/**
|
||||
* Returns a [Vector] for accessing all values in the [Map].
|
||||
*
|
||||
* @return [Vector] of values.
|
||||
*/
|
||||
override val values: Collection<Reference>
|
||||
@@ -822,8 +892,7 @@ public class Map
|
||||
|
||||
override fun containsKey(key: Key): Boolean {
|
||||
for (i in 0 until size) {
|
||||
if (key == keyAt(i))
|
||||
return true
|
||||
if (key == keyAt(i)) return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
@@ -833,7 +902,10 @@ public class Map
|
||||
override fun isEmpty(): Boolean = size == 0
|
||||
|
||||
// Performs a binary search on a key vector and return index of the key in key vector
|
||||
private fun binarySearch(searchedKey: String) = binarySearch { compareCharSequence(it, searchedKey) }
|
||||
private fun binarySearch(searchedKey: String) = binarySearch {
|
||||
compareCharSequence(it, searchedKey)
|
||||
}
|
||||
|
||||
// Performs a binary search on a key vector and return index of the key in key vector
|
||||
private fun binarySearch(key: Key): Int = binarySearch { compareKeys(it, key.start) }
|
||||
|
||||
@@ -891,8 +963,7 @@ public class Map
|
||||
++bufferPos
|
||||
++otherPos
|
||||
}
|
||||
if (bufferPos < limit)
|
||||
return 0
|
||||
if (bufferPos < limit) return 0
|
||||
|
||||
val comparisonBuffer = ByteArray(4)
|
||||
while (bufferPos < limit) {
|
||||
|
||||
@@ -20,11 +20,13 @@ package com.google.flatbuffers.kotlin
|
||||
@ExperimentalUnsignedTypes
|
||||
public class FlexBuffersBuilder(
|
||||
public val buffer: ReadWriteBuffer,
|
||||
private val shareFlag: Int = SHARE_KEYS
|
||||
private val shareFlag: Int = SHARE_KEYS,
|
||||
) {
|
||||
|
||||
public constructor(initialCapacity: Int = 1024, shareFlag: Int = SHARE_KEYS) :
|
||||
this(ArrayReadWriteBuffer(initialCapacity), shareFlag)
|
||||
public constructor(
|
||||
initialCapacity: Int = 1024,
|
||||
shareFlag: Int = SHARE_KEYS,
|
||||
) : this(ArrayReadWriteBuffer(initialCapacity), shareFlag)
|
||||
|
||||
private val stringValuePool: HashMap<String, Value> = HashMap()
|
||||
private val stringKeyPool: HashMap<String, Int> = HashMap()
|
||||
@@ -32,8 +34,8 @@ public class FlexBuffersBuilder(
|
||||
private var finished: Boolean = false
|
||||
|
||||
/**
|
||||
* Reset the FlexBuffersBuilder by purging all data that it holds. Buffer might
|
||||
* keep its capacity after a reset.
|
||||
* Reset the FlexBuffersBuilder by purging all data that it holds. Buffer might keep its capacity
|
||||
* after a reset.
|
||||
*/
|
||||
public fun clear() {
|
||||
buffer.clear()
|
||||
@@ -44,9 +46,9 @@ public class FlexBuffersBuilder(
|
||||
}
|
||||
|
||||
/**
|
||||
* Finish writing the message into the buffer. After that no other element must
|
||||
* be inserted into the buffer. Also, you must call this function before start using the
|
||||
* FlexBuffer message
|
||||
* Finish writing the message into the buffer. After that no other element must be inserted into
|
||||
* the buffer. Also, you must call this function before start using the FlexBuffer message
|
||||
*
|
||||
* @return [ReadBuffer] containing the FlexBuffer message
|
||||
*/
|
||||
public fun finish(): ReadBuffer {
|
||||
@@ -69,45 +71,46 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Insert a single [Boolean] into the buffer
|
||||
*
|
||||
* @param value true or false
|
||||
*/
|
||||
public fun put(value: Boolean): Unit = run { this[null] = value }
|
||||
|
||||
/**
|
||||
* Insert a null reference into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a null reference into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public fun putNull(key: String? = null): Unit =
|
||||
run { stack.add(Value(T_NULL, putKey(key), W_8, 0UL)) }
|
||||
public fun putNull(key: String? = null): Unit = run {
|
||||
stack.add(Value(T_NULL, putKey(key), W_8, 0UL))
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a single [Boolean] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [Boolean] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: Boolean): Unit =
|
||||
run { stack.add(Value(T_BOOL, putKey(key), W_8, if (value) 1UL else 0UL)) }
|
||||
public operator fun set(key: String? = null, value: Boolean): Unit = run {
|
||||
stack.add(Value(T_BOOL, putKey(key), W_8, if (value) 1UL else 0UL))
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a single [Byte] into the buffer
|
||||
*/
|
||||
/** Insert a single [Byte] into the buffer */
|
||||
public fun put(value: Byte): Unit = set(null, value.toLong())
|
||||
|
||||
/**
|
||||
* Insert a single [Byte] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [Byte] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: Byte): Unit = set(key, value.toLong())
|
||||
|
||||
/**
|
||||
* Insert a single [Short] into the buffer.
|
||||
*/
|
||||
/** Insert a single [Short] into the buffer. */
|
||||
public fun put(value: Short): Unit = set(null, value.toLong())
|
||||
|
||||
/**
|
||||
* Insert a single [Short] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [Short] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public inline operator fun set(key: String? = null, value: Short): Unit = set(key, value.toLong())
|
||||
|
||||
/**
|
||||
* Insert a single [Int] into the buffer.
|
||||
*/
|
||||
/** Insert a single [Int] into the buffer. */
|
||||
public fun put(value: Int): Unit = set(null, value.toLong())
|
||||
|
||||
/**
|
||||
@@ -115,94 +118,94 @@ public class FlexBuffersBuilder(
|
||||
*/
|
||||
public inline operator fun set(key: String? = null, value: Int): Unit = set(key, value.toLong())
|
||||
|
||||
/**
|
||||
* Insert a single [Long] into the buffer.
|
||||
*/
|
||||
/** Insert a single [Long] into the buffer. */
|
||||
public fun put(value: Long): Unit = set(null, value)
|
||||
|
||||
/**
|
||||
* Insert a single [Long] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [Long] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: Long): Unit =
|
||||
run { stack.add(Value(T_INT, putKey(key), value.toULong().widthInUBits(), value.toULong())) }
|
||||
public operator fun set(key: String? = null, value: Long): Unit = run {
|
||||
stack.add(Value(T_INT, putKey(key), value.toULong().widthInUBits(), value.toULong()))
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a single [UByte] into the buffer
|
||||
*/
|
||||
/** Insert a single [UByte] into the buffer */
|
||||
public fun put(value: UByte): Unit = set(null, value.toULong())
|
||||
|
||||
/**
|
||||
* Insert a single [UByte] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [UByte] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public inline operator fun set(key: String? = null, value: UByte): Unit = set(key, value.toULong())
|
||||
public inline operator fun set(key: String? = null, value: UByte): Unit =
|
||||
set(key, value.toULong())
|
||||
|
||||
/**
|
||||
* Insert a single [UShort] into the buffer.
|
||||
*/
|
||||
/** Insert a single [UShort] into the buffer. */
|
||||
public fun put(value: UShort): Unit = set(null, value.toULong())
|
||||
|
||||
/**
|
||||
* Insert a single [UShort] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [UShort] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
private inline operator fun set(key: String? = null, value: UShort): Unit = set(key, value.toULong())
|
||||
private inline operator fun set(key: String? = null, value: UShort): Unit =
|
||||
set(key, value.toULong())
|
||||
|
||||
/**
|
||||
* Insert a single [UInt] into the buffer.
|
||||
*/
|
||||
/** Insert a single [UInt] into the buffer. */
|
||||
public fun put(value: UInt): Unit = set(null, value.toULong())
|
||||
|
||||
/**
|
||||
* Insert a single [UInt] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [UInt] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
private inline operator fun set(key: String? = null, value: UInt): Unit = set(key, value.toULong())
|
||||
private inline operator fun set(key: String? = null, value: UInt): Unit =
|
||||
set(key, value.toULong())
|
||||
|
||||
/**
|
||||
* Insert a single [ULong] into the buffer.
|
||||
*/
|
||||
/** Insert a single [ULong] into the buffer. */
|
||||
public fun put(value: ULong): Unit = set(null, value)
|
||||
|
||||
/**
|
||||
* Insert a single [ULong] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [ULong] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: ULong): Unit =
|
||||
run { stack.add(Value(T_UINT, putKey(key), value.widthInUBits(), value)) }
|
||||
public operator fun set(key: String? = null, value: ULong): Unit = run {
|
||||
stack.add(Value(T_UINT, putKey(key), value.widthInUBits(), value))
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a single [Float] into the buffer.
|
||||
*/
|
||||
/** Insert a single [Float] into the buffer. */
|
||||
public fun put(value: Float): Unit = run { this[null] = value }
|
||||
|
||||
/**
|
||||
* Insert a single [Float] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [Float] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: Float): Unit =
|
||||
run { stack.add(Value(T_FLOAT, putKey(key), W_32, dValue = value.toDouble())) }
|
||||
public operator fun set(key: String? = null, value: Float): Unit = run {
|
||||
stack.add(Value(T_FLOAT, putKey(key), W_32, dValue = value.toDouble()))
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a single [Double] into the buffer.
|
||||
*/
|
||||
/** Insert a single [Double] into the buffer. */
|
||||
public fun put(value: Double): Unit = run { this[null] = value }
|
||||
|
||||
/**
|
||||
* Insert a single [Double] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [Double] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: Double): Unit =
|
||||
run { stack.add(Value(T_FLOAT, putKey(key), W_64, dValue = value)) }
|
||||
public operator fun set(key: String? = null, value: Double): Unit = run {
|
||||
stack.add(Value(T_FLOAT, putKey(key), W_64, dValue = value))
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a single [String] into the buffer.
|
||||
*/
|
||||
/** Insert a single [String] into the buffer. */
|
||||
public fun put(value: String): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Insert a single [String] into the buffer. A key must be present if element is inserted into a map.
|
||||
* Insert a single [String] into the buffer. A key must be present if element is inserted into a
|
||||
* map.
|
||||
*/
|
||||
public operator fun set(key: String? = null, value: String): Int {
|
||||
val iKey = putKey(key)
|
||||
val holder = if (shareFlag and SHARE_STRINGS != 0) {
|
||||
stringValuePool.getOrPut(value) {
|
||||
writeString(iKey, value).also { stringValuePool[value] = it }
|
||||
}.copy(key = iKey)
|
||||
val holder =
|
||||
if (shareFlag and SHARE_STRINGS != 0) {
|
||||
stringValuePool
|
||||
.getOrPut(value) { writeString(iKey, value).also { stringValuePool[value] = it } }
|
||||
.copy(key = iKey)
|
||||
} else {
|
||||
writeString(iKey, value)
|
||||
}
|
||||
@@ -212,13 +215,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [ByteArray] into the message as a [Blob].
|
||||
*
|
||||
* @param value byte array
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: ByteArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [ByteArray] into the message as a [Blob]. A key must be present if element is inserted into a map.
|
||||
* Adds a [ByteArray] into the message as a [Blob]. A key must be present if element is inserted
|
||||
* into a map.
|
||||
*
|
||||
* @param value byte array
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -230,14 +236,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [IntArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [IntArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: IntArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [IntArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [IntArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [IntArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -246,14 +254,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [ShortArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [ShortArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: ShortArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [ShortArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [ShortArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [ShortArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -262,14 +272,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [LongArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [LongArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: LongArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [LongArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [LongArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [LongArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -278,14 +290,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [FloatArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [FloatArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: FloatArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [FloatArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [FloatArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [FloatArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -294,14 +308,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [DoubleArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [DoubleArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: DoubleArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [DoubleArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [DoubleArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [DoubleArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -310,14 +326,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [UByteArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [UByteArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: UByteArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [UByteArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [UByteArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [UByteArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -326,14 +344,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [UShortArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [UShortArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: UShortArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [UShortArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [UShortArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [UShortArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -342,14 +362,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [UIntArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [UIntArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: UIntArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [UIntArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [UIntArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [UIntArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -358,14 +380,16 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Adds a [ULongArray] into the message as a typed vector of fixed size.
|
||||
*
|
||||
* @param value [ULongArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public fun put(value: ULongArray): Int = set(null, value)
|
||||
|
||||
/**
|
||||
* Adds a [ULongArray] into the message as a typed vector of fixed size.
|
||||
* A key must be present if element is inserted into a map.
|
||||
* Adds a [ULongArray] into the message as a typed vector of fixed size. A key must be present if
|
||||
* element is inserted into a map.
|
||||
*
|
||||
* @param value [ULongArray]
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -374,6 +398,7 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Creates a new vector will all elements inserted in [block].
|
||||
*
|
||||
* @param block where elements will be inserted
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -385,6 +410,7 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Creates a new typed vector will all elements inserted in [block].
|
||||
*
|
||||
* @param block where elements will be inserted
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
@@ -394,40 +420,44 @@ public class FlexBuffersBuilder(
|
||||
return endTypedVector(pos)
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to return position for starting a new vector.
|
||||
*/
|
||||
/** Helper function to return position for starting a new vector. */
|
||||
public fun startVector(): Int = stack.size
|
||||
|
||||
/**
|
||||
* Finishes a vector element. The initial position of the vector must be passed
|
||||
*
|
||||
* @param position position at the start of the vector
|
||||
*/
|
||||
public fun endVector(position: Int): Int = endVector(null, position)
|
||||
|
||||
/**
|
||||
* Finishes a vector element. The initial position of the vector must be passed
|
||||
*
|
||||
* @param position position at the start of the vector
|
||||
*/
|
||||
public fun endVector(key: String? = null, position: Int): Int =
|
||||
endAnyVector(position) { createVector(putKey(key), position, stack.size - position) }
|
||||
|
||||
/**
|
||||
* Finishes a typed vector element. The initial position of the vector must be passed
|
||||
*
|
||||
* @param position position at the start of the vector
|
||||
*/
|
||||
public fun endTypedVector(position: Int): Int = endTypedVector(position, null)
|
||||
|
||||
/**
|
||||
* Helper function to return position for starting a new vector.
|
||||
*/
|
||||
/** Helper function to return position for starting a new vector. */
|
||||
public fun startMap(): Int = stack.size
|
||||
|
||||
/**
|
||||
* Creates a new map will all elements inserted in [block].
|
||||
*
|
||||
* @param block where elements will be inserted
|
||||
* @return position in buffer as the start of byte array
|
||||
*/
|
||||
public inline fun putMap(key: String? = null, crossinline block: FlexBuffersBuilder.() -> Unit): Int {
|
||||
public inline fun putMap(
|
||||
key: String? = null,
|
||||
crossinline block: FlexBuffersBuilder.() -> Unit,
|
||||
): Int {
|
||||
val pos = startMap()
|
||||
this.block()
|
||||
return endMap(pos, key)
|
||||
@@ -435,6 +465,7 @@ public class FlexBuffersBuilder(
|
||||
|
||||
/**
|
||||
* Finishes a map, but writing the information in the buffer
|
||||
*
|
||||
* @param key key used to store element in map
|
||||
* @return Reference to the map
|
||||
*/
|
||||
@@ -456,7 +487,7 @@ public class FlexBuffersBuilder(
|
||||
length: Int,
|
||||
vecType: FlexBufferType,
|
||||
bitWidth: BitWidth,
|
||||
crossinline writeBlock: (ByteWidth) -> Unit
|
||||
crossinline writeBlock: (ByteWidth) -> Unit,
|
||||
): Int {
|
||||
val keyPos = putKey(key)
|
||||
val byteWidth = align(bitWidth)
|
||||
@@ -471,7 +502,10 @@ public class FlexBuffersBuilder(
|
||||
return vloc
|
||||
}
|
||||
|
||||
private inline fun setTypedVec(key: String? = null, crossinline block: FlexBuffersBuilder.() -> Unit): Int {
|
||||
private inline fun setTypedVec(
|
||||
key: String? = null,
|
||||
crossinline block: FlexBuffersBuilder.() -> Unit,
|
||||
): Int {
|
||||
val pos = startVector()
|
||||
this.block()
|
||||
return endTypedVector(pos, key)
|
||||
@@ -511,8 +545,12 @@ public class FlexBuffersBuilder(
|
||||
}
|
||||
}
|
||||
|
||||
private fun writeAny(toWrite: Value, byteWidth: ByteWidth) = when (toWrite.type) {
|
||||
T_NULL, T_BOOL, T_INT, T_UINT -> writeInt(toWrite.iValue, byteWidth)
|
||||
private fun writeAny(toWrite: Value, byteWidth: ByteWidth) =
|
||||
when (toWrite.type) {
|
||||
T_NULL,
|
||||
T_BOOL,
|
||||
T_INT,
|
||||
T_UINT -> writeInt(toWrite.iValue, byteWidth)
|
||||
T_FLOAT -> writeDouble(toWrite.dValue, byteWidth)
|
||||
else -> writeOffset(toWrite.iValue.toInt(), byteWidth)
|
||||
}
|
||||
@@ -526,8 +564,7 @@ public class FlexBuffersBuilder(
|
||||
|
||||
buffer.requestAdditionalCapacity(encodedSize + 1)
|
||||
val sloc: Int = buffer.writePosition
|
||||
if (encodedSize > 0)
|
||||
buffer.put(s, encodedSize)
|
||||
if (encodedSize > 0) buffer.put(s, encodedSize)
|
||||
buffer.put(ZeroByte)
|
||||
return Value(T_STRING, key, bitWidth, sloc.toULong())
|
||||
}
|
||||
@@ -544,11 +581,17 @@ public class FlexBuffersBuilder(
|
||||
private fun writeOffset(toWrite: Int, byteWidth: ByteWidth) {
|
||||
buffer.requestAdditionalCapacity(byteWidth.value)
|
||||
val relativeOffset = (buffer.writePosition - toWrite)
|
||||
if (byteWidth.value != 8 && relativeOffset >= 1L shl byteWidth.value * 8) error("invalid offset $relativeOffset, writer pos ${buffer.writePosition}")
|
||||
if (byteWidth.value != 8 && relativeOffset >= 1L shl byteWidth.value * 8)
|
||||
error("invalid offset $relativeOffset, writer pos ${buffer.writePosition}")
|
||||
writeInt(relativeOffset, byteWidth)
|
||||
}
|
||||
|
||||
private inline fun writeBlob(key: Int, blob: ByteArray, type: FlexBufferType, trailing: Boolean): Value {
|
||||
private inline fun writeBlob(
|
||||
key: Int,
|
||||
blob: ByteArray,
|
||||
type: FlexBufferType,
|
||||
trailing: Boolean,
|
||||
): Value {
|
||||
val bitWidth = blob.size.toULong().widthInUBits()
|
||||
val byteWidth = align(bitWidth)
|
||||
|
||||
@@ -586,20 +629,24 @@ public class FlexBuffersBuilder(
|
||||
start: Int,
|
||||
size: Int,
|
||||
byteWidth: ByteWidth,
|
||||
crossinline valueBlock: (Int) -> ULong
|
||||
crossinline valueBlock: (Int) -> ULong,
|
||||
) {
|
||||
buffer.requestAdditionalCapacity(size * byteWidth.value)
|
||||
return when (byteWidth.value) {
|
||||
1 -> for (i in start until start + size) {
|
||||
1 ->
|
||||
for (i in start until start + size) {
|
||||
buffer.put(valueBlock(i).toUByte())
|
||||
}
|
||||
2 -> for (i in start until start + size) {
|
||||
2 ->
|
||||
for (i in start until start + size) {
|
||||
buffer.put(valueBlock(i).toUShort())
|
||||
}
|
||||
4 -> for (i in start until start + size) {
|
||||
4 ->
|
||||
for (i in start until start + size) {
|
||||
buffer.put(valueBlock(i).toUInt())
|
||||
}
|
||||
8 -> for (i in start until start + size) {
|
||||
8 ->
|
||||
for (i in start until start + size) {
|
||||
buffer.put(valueBlock(i))
|
||||
}
|
||||
else -> Unit
|
||||
@@ -646,7 +693,8 @@ public class FlexBuffersBuilder(
|
||||
val prefixElems = 1
|
||||
// Check bit widths and types for all elements.
|
||||
for (i in start until stack.size) {
|
||||
val elemWidth = elemWidth(T_KEY, W_8, stack[i].key.toLong(), buffer.writePosition, i + prefixElems)
|
||||
val elemWidth =
|
||||
elemWidth(T_KEY, W_8, stack[i].key.toLong(), buffer.writePosition, i + prefixElems)
|
||||
width = width.max(elemWidth)
|
||||
}
|
||||
return width
|
||||
@@ -689,13 +737,20 @@ public class FlexBuffersBuilder(
|
||||
}
|
||||
}
|
||||
|
||||
private inline fun createTypedVector(key: Int, start: Int, length: Int, keys: Value? = null): Value {
|
||||
private inline fun createTypedVector(
|
||||
key: Int,
|
||||
start: Int,
|
||||
length: Int,
|
||||
keys: Value? = null,
|
||||
): Value {
|
||||
// We assume the callers of this method guarantees all elements are of the same type.
|
||||
val elementType: FlexBufferType = stack[start].type
|
||||
for (i in start + 1 until length) {
|
||||
if (elementType != stack[i].type) error("TypedVector does not support array of different element types")
|
||||
if (elementType != stack[i].type)
|
||||
error("TypedVector does not support array of different element types")
|
||||
}
|
||||
if (!elementType.isTypedVectorElementType()) error("TypedVector does not support this element type")
|
||||
if (!elementType.isTypedVectorElementType())
|
||||
error("TypedVector does not support this element type")
|
||||
return createAnyVector(key, start, length, elementType.toTypedVector(), keys)
|
||||
}
|
||||
|
||||
@@ -705,7 +760,7 @@ public class FlexBuffersBuilder(
|
||||
length: Int,
|
||||
type: FlexBufferType,
|
||||
keys: Value? = null,
|
||||
crossinline typeBlock: (BitWidth) -> Unit = {}
|
||||
crossinline typeBlock: (BitWidth) -> Unit = {},
|
||||
): Value {
|
||||
// Figure out the smallest bit width we can store this vector with.
|
||||
var bitWidth = W_8.max(length.toULong().widthInUBits())
|
||||
@@ -742,7 +797,8 @@ public class FlexBuffersBuilder(
|
||||
}
|
||||
|
||||
// A lambda to sort map keys
|
||||
internal val keyComparator = object : Comparator<Value> {
|
||||
internal val keyComparator =
|
||||
object : Comparator<Value> {
|
||||
override fun compare(a: Value, b: Value): Int {
|
||||
var ia: Int = a.key
|
||||
var io: Int = b.key
|
||||
@@ -760,27 +816,24 @@ public class FlexBuffersBuilder(
|
||||
}
|
||||
|
||||
public companion object {
|
||||
/**
|
||||
* No keys or strings will be shared
|
||||
*/
|
||||
/** No keys or strings will be shared */
|
||||
public const val SHARE_NONE: Int = 0
|
||||
|
||||
/**
|
||||
* Keys will be shared between elements. Identical keys will only be serialized once, thus possibly saving space.
|
||||
* But serialization performance might be slower and consumes more memory.
|
||||
* Keys will be shared between elements. Identical keys will only be serialized once, thus
|
||||
* possibly saving space. But serialization performance might be slower and consumes more
|
||||
* memory.
|
||||
*/
|
||||
public const val SHARE_KEYS: Int = 1
|
||||
|
||||
/**
|
||||
* Strings will be shared between elements. Identical strings will only be serialized once, thus possibly saving space.
|
||||
* But serialization performance might be slower and consumes more memory. This is ideal if you expect many repeated
|
||||
* strings on the message.
|
||||
* Strings will be shared between elements. Identical strings will only be serialized once, thus
|
||||
* possibly saving space. But serialization performance might be slower and consumes more
|
||||
* memory. This is ideal if you expect many repeated strings on the message.
|
||||
*/
|
||||
public const val SHARE_STRINGS: Int = 2
|
||||
|
||||
/**
|
||||
* Strings and keys will be shared between elements.
|
||||
*/
|
||||
/** Strings and keys will be shared between elements. */
|
||||
public const val SHARE_KEYS_AND_STRINGS: Int = 3
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,19 +24,25 @@ public value class BitWidth(public val value: Int) {
|
||||
public inline fun max(other: BitWidth): BitWidth = if (this.value >= other.value) this else other
|
||||
}
|
||||
|
||||
@JvmInline
|
||||
public value class ByteWidth(public val value: Int)
|
||||
@JvmInline public value class ByteWidth(public val value: Int)
|
||||
|
||||
@JvmInline
|
||||
public value class FlexBufferType(public val value: Int) {
|
||||
public operator fun minus(other: FlexBufferType): FlexBufferType = FlexBufferType(this.value - other.value)
|
||||
public operator fun plus(other: FlexBufferType): FlexBufferType = FlexBufferType(this.value + other.value)
|
||||
public operator fun minus(other: FlexBufferType): FlexBufferType =
|
||||
FlexBufferType(this.value - other.value)
|
||||
|
||||
public operator fun plus(other: FlexBufferType): FlexBufferType =
|
||||
FlexBufferType(this.value + other.value)
|
||||
|
||||
public operator fun compareTo(other: FlexBufferType): Int = this.value - other.value
|
||||
}
|
||||
|
||||
internal operator fun Int.times(width: ByteWidth): Int = this * width.value
|
||||
|
||||
internal operator fun Int.minus(width: ByteWidth): Int = this - width.value
|
||||
|
||||
internal operator fun Int.plus(width: ByteWidth): Int = this + width.value
|
||||
|
||||
internal operator fun Int.minus(type: FlexBufferType): Int = this - type.value
|
||||
|
||||
// Returns a Key string from the buffer starting at index [start]. Key Strings are stored as
|
||||
@@ -61,23 +67,42 @@ internal inline fun ReadBuffer.readFloat(end: Int, byteWidth: ByteWidth): Double
|
||||
return when (byteWidth.value) {
|
||||
4 -> this.getFloat(end).toDouble()
|
||||
8 -> this.getDouble(end)
|
||||
else -> error("invalid byte width $byteWidth for floating point scalar") // we should never reach here
|
||||
else ->
|
||||
error("invalid byte width $byteWidth for floating point scalar") // we should never reach here
|
||||
}
|
||||
}
|
||||
|
||||
// return position on the [ReadBuffer] of the element that the offset is pointing to
|
||||
// we assume all offset fits on a int, since ReadBuffer operates with that assumption
|
||||
internal inline fun ReadBuffer.indirect(offset: Int, byteWidth: ByteWidth): Int = offset - readInt(offset, byteWidth)
|
||||
internal inline fun ReadBuffer.indirect(offset: Int, byteWidth: ByteWidth): Int =
|
||||
offset - readInt(offset, byteWidth)
|
||||
|
||||
// returns the size of an array-like element from [ReadBuffer].
|
||||
internal inline fun ReadBuffer.readSize(end: Int, byteWidth: ByteWidth) = readInt(end - byteWidth, byteWidth)
|
||||
internal inline fun ReadBuffer.readUInt(end: Int, byteWidth: ByteWidth): UInt = readULong(end, byteWidth).toUInt()
|
||||
internal inline fun ReadBuffer.readInt(end: Int, byteWidth: ByteWidth): Int = readULong(end, byteWidth).toInt()
|
||||
internal inline fun ReadBuffer.readLong(end: Int, byteWidth: ByteWidth): Long = readULong(end, byteWidth).toLong()
|
||||
internal inline fun ReadBuffer.readSize(end: Int, byteWidth: ByteWidth) =
|
||||
readInt(end - byteWidth, byteWidth)
|
||||
|
||||
internal fun IntArray.widthInUBits(): BitWidth = arrayWidthInUBits(this.size) { this[it].toULong().widthInUBits() }
|
||||
internal fun ShortArray.widthInUBits(): BitWidth = arrayWidthInUBits(this.size) { this[it].toULong().widthInUBits() }
|
||||
internal fun LongArray.widthInUBits(): BitWidth = arrayWidthInUBits(this.size) { this[it].toULong().widthInUBits() }
|
||||
internal inline fun ReadBuffer.readUInt(end: Int, byteWidth: ByteWidth): UInt =
|
||||
readULong(end, byteWidth).toUInt()
|
||||
|
||||
private inline fun arrayWidthInUBits(size: Int, crossinline elemWidthBlock: (Int) -> BitWidth): BitWidth {
|
||||
internal inline fun ReadBuffer.readInt(end: Int, byteWidth: ByteWidth): Int =
|
||||
readULong(end, byteWidth).toInt()
|
||||
|
||||
internal inline fun ReadBuffer.readLong(end: Int, byteWidth: ByteWidth): Long =
|
||||
readULong(end, byteWidth).toLong()
|
||||
|
||||
internal fun IntArray.widthInUBits(): BitWidth =
|
||||
arrayWidthInUBits(this.size) { this[it].toULong().widthInUBits() }
|
||||
|
||||
internal fun ShortArray.widthInUBits(): BitWidth =
|
||||
arrayWidthInUBits(this.size) { this[it].toULong().widthInUBits() }
|
||||
|
||||
internal fun LongArray.widthInUBits(): BitWidth =
|
||||
arrayWidthInUBits(this.size) { this[it].toULong().widthInUBits() }
|
||||
|
||||
private inline fun arrayWidthInUBits(
|
||||
size: Int,
|
||||
crossinline elemWidthBlock: (Int) -> BitWidth,
|
||||
): BitWidth {
|
||||
// Figure out smallest bit width we can store this vector with.
|
||||
var bitWidth = W_8.max(size.toULong().widthInUBits())
|
||||
// Check bit widths and types for all elements.
|
||||
@@ -88,7 +113,8 @@ private inline fun arrayWidthInUBits(size: Int, crossinline elemWidthBlock: (Int
|
||||
return bitWidth
|
||||
}
|
||||
|
||||
internal fun ULong.widthInUBits(): BitWidth = when {
|
||||
internal fun ULong.widthInUBits(): BitWidth =
|
||||
when {
|
||||
this <= MAX_UBYTE_ULONG -> W_8
|
||||
this <= UShort.MAX_VALUE -> W_16
|
||||
this <= UInt.MAX_VALUE -> W_32
|
||||
@@ -96,17 +122,26 @@ internal fun ULong.widthInUBits(): BitWidth = when {
|
||||
}
|
||||
|
||||
// returns the number of bytes needed for padding the scalar of size scalarSize.
|
||||
internal inline fun paddingBytes(bufSize: Int, scalarSize: Int): Int = bufSize.inv() + 1 and scalarSize - 1
|
||||
internal inline fun paddingBytes(bufSize: Int, scalarSize: Int): Int =
|
||||
bufSize.inv() + 1 and scalarSize - 1
|
||||
|
||||
internal inline fun FlexBufferType.isInline(): Boolean = this.value <= T_FLOAT.value || this == T_BOOL
|
||||
internal inline fun FlexBufferType.isInline(): Boolean =
|
||||
this.value <= T_FLOAT.value || this == T_BOOL
|
||||
|
||||
internal fun FlexBufferType.isScalar(): Boolean = when (this) {
|
||||
T_INT, T_UINT, T_FLOAT, T_BOOL -> true
|
||||
internal fun FlexBufferType.isScalar(): Boolean =
|
||||
when (this) {
|
||||
T_INT,
|
||||
T_UINT,
|
||||
T_FLOAT,
|
||||
T_BOOL -> true
|
||||
else -> false
|
||||
}
|
||||
|
||||
internal fun FlexBufferType.isIndirectScalar(): Boolean = when (this) {
|
||||
T_INDIRECT_INT, T_INDIRECT_UINT, T_INDIRECT_FLOAT -> true
|
||||
internal fun FlexBufferType.isIndirectScalar(): Boolean =
|
||||
when (this) {
|
||||
T_INDIRECT_INT,
|
||||
T_INDIRECT_UINT,
|
||||
T_INDIRECT_FLOAT -> true
|
||||
else -> false
|
||||
}
|
||||
|
||||
@@ -118,6 +153,7 @@ internal fun FlexBufferType.isTypedVectorElementType(): Boolean =
|
||||
|
||||
// returns the typed vector of a given scalar type.
|
||||
internal fun FlexBufferType.toTypedVector(): FlexBufferType = (this - T_INT) + T_VECTOR_INT
|
||||
|
||||
// returns the element type of given typed vector.
|
||||
internal fun FlexBufferType.toElementTypedVector(): FlexBufferType = this - T_VECTOR_INT + T_INT
|
||||
|
||||
@@ -127,10 +163,11 @@ internal data class Value(
|
||||
var key: Int = -1,
|
||||
var minBitWidth: BitWidth = W_8,
|
||||
var iValue: ULong = 0UL, // integer value
|
||||
var dValue: Double = 0.0 // TODO(paulovap): maybe we can keep floating type on iValue as well.
|
||||
var dValue: Double = 0.0, // TODO(paulovap): maybe we can keep floating type on iValue as well.
|
||||
) { // float value
|
||||
|
||||
inline fun storedPackedType(parentBitWidth: BitWidth = W_8): Byte = packedType(storedWidth(parentBitWidth), type)
|
||||
inline fun storedPackedType(parentBitWidth: BitWidth = W_8): Byte =
|
||||
packedType(storedWidth(parentBitWidth), type)
|
||||
|
||||
private inline fun packedType(bitWidth: BitWidth, type: FlexBufferType): Byte =
|
||||
(bitWidth.value or (type.value shl 2)).toByte()
|
||||
@@ -147,7 +184,7 @@ internal fun elemWidth(
|
||||
minBitWidth: BitWidth,
|
||||
iValue: Long,
|
||||
bufSize: Int,
|
||||
elemIndex: Int
|
||||
elemIndex: Int,
|
||||
): BitWidth {
|
||||
if (type.isInline()) return minBitWidth
|
||||
|
||||
@@ -173,7 +210,8 @@ internal fun elemWidth(
|
||||
}
|
||||
|
||||
// For debugging purposes, convert type to a human-readable string.
|
||||
internal fun FlexBufferType.typeToString(): String = when (this) {
|
||||
internal fun FlexBufferType.typeToString(): String =
|
||||
when (this) {
|
||||
T_NULL -> "Null"
|
||||
T_INT -> "Int"
|
||||
T_UINT -> "UInt"
|
||||
@@ -207,9 +245,13 @@ internal fun FlexBufferType.typeToString(): String = when (this) {
|
||||
|
||||
// Few repeated values used in hot path is cached here
|
||||
internal fun emptyBlob() = Blob(emptyBuffer, 1, ByteWidth(1))
|
||||
|
||||
internal fun emptyVector() = Vector(emptyBuffer, 1, ByteWidth(1))
|
||||
|
||||
internal fun emptyMap() = Map(ArrayReadWriteBuffer(3), 3, ByteWidth(1))
|
||||
|
||||
internal fun nullReference() = Reference(emptyBuffer, 1, ByteWidth(0), T_NULL.value)
|
||||
|
||||
internal fun nullKey() = Key(emptyBuffer, 1)
|
||||
|
||||
internal const val ZeroByte = 0.toByte()
|
||||
@@ -228,7 +270,8 @@ internal val T_INVALID = FlexBufferType(-1)
|
||||
internal val T_NULL = FlexBufferType(0)
|
||||
internal val T_INT = FlexBufferType(1)
|
||||
internal val T_UINT = FlexBufferType(2)
|
||||
internal val T_FLOAT = FlexBufferType(3) // Types above stored inline, types below are stored in an offset.
|
||||
internal val T_FLOAT =
|
||||
FlexBufferType(3) // Types above stored inline, types below are stored in an offset.
|
||||
internal val T_KEY = FlexBufferType(4)
|
||||
internal val T_STRING = FlexBufferType(5)
|
||||
internal val T_INDIRECT_INT = FlexBufferType(6)
|
||||
@@ -254,4 +297,5 @@ internal val T_VECTOR_UINT4 = FlexBufferType(23)
|
||||
internal val T_VECTOR_FLOAT4 = FlexBufferType(24)
|
||||
internal val T_BLOB = FlexBufferType(25)
|
||||
internal val T_BOOL = FlexBufferType(26)
|
||||
internal val T_VECTOR_BOOL = FlexBufferType(36) // To Allow the same type of conversion of type to vector type
|
||||
internal val T_VECTOR_BOOL =
|
||||
FlexBufferType(36) // To Allow the same type of conversion of type to vector type
|
||||
|
||||
@@ -19,12 +19,10 @@ package com.google.flatbuffers.kotlin
|
||||
|
||||
public object Utf8 {
|
||||
/**
|
||||
* Returns the number of bytes in the UTF-8-encoded form of `sequence`. For a string,
|
||||
* this method is equivalent to `string.getBytes(UTF_8).length`, but is more efficient in
|
||||
* both time and space.
|
||||
* Returns the number of bytes in the UTF-8-encoded form of `sequence`. For a string, this method
|
||||
* is equivalent to `string.getBytes(UTF_8).length`, but is more efficient in both time and space.
|
||||
*
|
||||
* @throws IllegalArgumentException if `sequence` contains ill-formed UTF-16 (unpaired
|
||||
* surrogates)
|
||||
* @throws IllegalArgumentException if `sequence` contains ill-formed UTF-16 (unpaired surrogates)
|
||||
*/
|
||||
private fun computeEncodedLength(sequence: CharSequence): Int {
|
||||
// Warning to maintainers: this implementation is highly optimized.
|
||||
@@ -80,45 +78,30 @@ public object Utf8 {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of bytes in the UTF-8-encoded form of `sequence`. For a string,
|
||||
* this method is equivalent to `string.getBytes(UTF_8).length`, but is more efficient in
|
||||
* both time and space.
|
||||
* Returns the number of bytes in the UTF-8-encoded form of `sequence`. For a string, this method
|
||||
* is equivalent to `string.getBytes(UTF_8).length`, but is more efficient in both time and space.
|
||||
*
|
||||
* @throws IllegalArgumentException if `sequence` contains ill-formed UTF-16 (unpaired
|
||||
* surrogates)
|
||||
* @throws IllegalArgumentException if `sequence` contains ill-formed UTF-16 (unpaired surrogates)
|
||||
*/
|
||||
public fun encodedLength(sequence: CharSequence): Int = computeEncodedLength(sequence)
|
||||
|
||||
/**
|
||||
* Returns whether this is a single-byte codepoint (i.e., ASCII) with the form '0XXXXXXX'.
|
||||
*/
|
||||
/** Returns whether this is a single-byte codepoint (i.e., ASCII) with the form '0XXXXXXX'. */
|
||||
public inline fun isOneByte(b: Byte): Boolean = b >= 0
|
||||
|
||||
/**
|
||||
* Returns whether this is a two-byte codepoint with the form 110xxxxx 0xC0..0xDF.
|
||||
*/
|
||||
/** Returns whether this is a two-byte codepoint with the form 110xxxxx 0xC0..0xDF. */
|
||||
public inline fun isTwoBytes(b: Byte): Boolean = b < 0xE0.toByte()
|
||||
|
||||
/**
|
||||
* Returns whether this is a three-byte codepoint with the form 1110xxxx 0xE0..0xEF.
|
||||
*/
|
||||
/** Returns whether this is a three-byte codepoint with the form 1110xxxx 0xE0..0xEF. */
|
||||
public inline fun isThreeBytes(b: Byte): Boolean = b < 0xF0.toByte()
|
||||
|
||||
/**
|
||||
* Returns whether this is a four-byte codepoint with the form 11110xxx 0xF0..0xF4.
|
||||
*/
|
||||
/** Returns whether this is a four-byte codepoint with the form 11110xxx 0xF0..0xF4. */
|
||||
public inline fun isFourByte(b: Byte): Boolean = b < 0xF8.toByte()
|
||||
|
||||
public fun handleOneByte(byte1: Byte, resultArr: CharArray, resultPos: Int) {
|
||||
resultArr[resultPos] = byte1.toInt().toChar()
|
||||
}
|
||||
|
||||
public fun handleTwoBytes(
|
||||
byte1: Byte,
|
||||
byte2: Byte,
|
||||
resultArr: CharArray,
|
||||
resultPos: Int
|
||||
) {
|
||||
public fun handleTwoBytes(byte1: Byte, byte2: Byte, resultArr: CharArray, resultPos: Int) {
|
||||
// Simultaneously checks for illegal trailing-byte in leading position (<= '11000000') and
|
||||
// overlong 2-byte, '11000001'.
|
||||
if (byte1 < 0xC2.toByte()) {
|
||||
@@ -135,9 +118,10 @@ public object Utf8 {
|
||||
byte2: Byte,
|
||||
byte3: Byte,
|
||||
resultArr: CharArray,
|
||||
resultPos: Int
|
||||
resultPos: Int,
|
||||
) {
|
||||
if (isNotTrailingByte(byte2) || // overlong? 5 most significant bits must not all be zero
|
||||
if (
|
||||
isNotTrailingByte(byte2) || // overlong? 5 most significant bits must not all be zero
|
||||
byte1 == 0xE0.toByte() && byte2 < 0xA0.toByte() || // check for illegal surrogate codepoints
|
||||
byte1 == 0xED.toByte() && byte2 >= 0xA0.toByte() ||
|
||||
isNotTrailingByte(byte3)
|
||||
@@ -145,7 +129,12 @@ public object Utf8 {
|
||||
error("Invalid UTF-8")
|
||||
}
|
||||
resultArr[resultPos] =
|
||||
(byte1.toInt() and 0x0F shl 12 or (trailingByteValue(byte2) shl 6) or trailingByteValue(byte3)).toChar()
|
||||
(byte1.toInt() and
|
||||
0x0F shl
|
||||
12 or
|
||||
(trailingByteValue(byte2) shl 6) or
|
||||
trailingByteValue(byte3))
|
||||
.toChar()
|
||||
}
|
||||
|
||||
public fun handleFourBytes(
|
||||
@@ -154,50 +143,47 @@ public object Utf8 {
|
||||
byte3: Byte,
|
||||
byte4: Byte,
|
||||
resultArr: CharArray,
|
||||
resultPos: Int
|
||||
resultPos: Int,
|
||||
) {
|
||||
if (isNotTrailingByte(byte2) || // Check that 1 <= plane <= 16. Tricky optimized form of:
|
||||
if (
|
||||
isNotTrailingByte(byte2) || // Check that 1 <= plane <= 16. Tricky optimized form of:
|
||||
// valid 4-byte leading byte?
|
||||
// if (byte1 > (byte) 0xF4 ||
|
||||
// overlong? 4 most significant bits must not all be zero
|
||||
// byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
|
||||
// codepoint larger than the highest code point (U+10FFFF)?
|
||||
// byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
|
||||
(byte1.toInt() shl 28) + (byte2 - 0x90.toByte()) shr 30 != 0 || isNotTrailingByte(byte3) ||
|
||||
(byte1.toInt() shl 28) + (byte2 - 0x90.toByte()) shr 30 != 0 ||
|
||||
isNotTrailingByte(byte3) ||
|
||||
isNotTrailingByte(byte4)
|
||||
) {
|
||||
error("Invalid UTF-8")
|
||||
}
|
||||
val codepoint: Int = (
|
||||
byte1.toInt() and 0x07 shl 18
|
||||
or (trailingByteValue(byte2) shl 12)
|
||||
or (trailingByteValue(byte3) shl 6)
|
||||
or trailingByteValue(byte4)
|
||||
)
|
||||
val codepoint: Int =
|
||||
(byte1.toInt() and
|
||||
0x07 shl
|
||||
18 or
|
||||
(trailingByteValue(byte2) shl 12) or
|
||||
(trailingByteValue(byte3) shl 6) or
|
||||
trailingByteValue(byte4))
|
||||
resultArr[resultPos] = highSurrogate(codepoint)
|
||||
resultArr[resultPos + 1] = lowSurrogate(codepoint)
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the byte is not a valid continuation of the form '10XXXXXX'.
|
||||
*/
|
||||
/** Returns whether the byte is not a valid continuation of the form '10XXXXXX'. */
|
||||
private fun isNotTrailingByte(b: Byte): Boolean = b > 0xBF.toByte()
|
||||
|
||||
/**
|
||||
* Returns the actual value of the trailing byte (removes the prefix '10') for composition.
|
||||
*/
|
||||
/** Returns the actual value of the trailing byte (removes the prefix '10') for composition. */
|
||||
private fun trailingByteValue(b: Byte): Int = b.toInt() and 0x3F
|
||||
|
||||
private fun highSurrogate(codePoint: Int): Char =
|
||||
(
|
||||
Char.MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT ushr 10) +
|
||||
(codePoint ushr 10)
|
||||
)
|
||||
(Char.MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT ushr 10) + (codePoint ushr 10))
|
||||
|
||||
private fun lowSurrogate(codePoint: Int): Char = (Char.MIN_LOW_SURROGATE + (codePoint and 0x3ff))
|
||||
|
||||
/**
|
||||
* Encode a [CharSequence] UTF8 codepoint into a byte array.
|
||||
*
|
||||
* @param `in` CharSequence to be encoded
|
||||
* @param start start position of the first char in the codepoint
|
||||
* @param out byte array of 4 bytes to be filled
|
||||
@@ -297,10 +283,7 @@ public object Utf8 {
|
||||
if (offset >= limit) {
|
||||
error("Invalid UTF-8")
|
||||
}
|
||||
handleTwoBytes(
|
||||
byte1, /* byte2 */
|
||||
bytes[offset++], resultArr, resultPos++
|
||||
)
|
||||
handleTwoBytes(byte1, /* byte2 */ bytes[offset++], resultArr, resultPos++)
|
||||
} else if (isThreeBytes(byte1)) {
|
||||
if (offset >= limit - 1) {
|
||||
error("Invalid UTF-8")
|
||||
@@ -310,7 +293,7 @@ public object Utf8 {
|
||||
bytes[offset++], /* byte3 */
|
||||
bytes[offset++],
|
||||
resultArr,
|
||||
resultPos++
|
||||
resultPos++,
|
||||
)
|
||||
} else {
|
||||
if (offset >= limit - 2) {
|
||||
@@ -322,7 +305,7 @@ public object Utf8 {
|
||||
bytes[offset++], /* byte4 */
|
||||
bytes[offset++],
|
||||
resultArr,
|
||||
resultPos++
|
||||
resultPos++,
|
||||
)
|
||||
// 4-byte case requires two chars.
|
||||
resultPos++
|
||||
@@ -331,10 +314,12 @@ public object Utf8 {
|
||||
return resultArr.concatToString(0, resultPos)
|
||||
}
|
||||
|
||||
public fun encodeUtf8Array(input: CharSequence,
|
||||
public fun encodeUtf8Array(
|
||||
input: CharSequence,
|
||||
out: ByteArray,
|
||||
offset: Int = 0,
|
||||
length: Int = out.size - offset): Int {
|
||||
length: Int = out.size - offset,
|
||||
): Int {
|
||||
val utf16Length = input.length
|
||||
var j = offset
|
||||
var i = 0
|
||||
@@ -342,8 +327,7 @@ public object Utf8 {
|
||||
// Designed to take advantage of
|
||||
// https://wikis.oracle.com/display/HotSpotInternals/RangeCheckElimination
|
||||
|
||||
if (utf16Length == 0)
|
||||
return 0
|
||||
if (utf16Length == 0) return 0
|
||||
var cc: Char = input[i]
|
||||
while (i < utf16Length && i + j < limit && input[i].also { cc = it }.code < 0x80) {
|
||||
out[j + i] = cc.code.toByte()
|
||||
@@ -370,9 +354,7 @@ public object Utf8 {
|
||||
// Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
|
||||
// four UTF-8 bytes
|
||||
var low: Char = Char.MIN_VALUE
|
||||
if (i + 1 == input.length ||
|
||||
!isSurrogatePair(c, input[++i].also { low = it })
|
||||
) {
|
||||
if (i + 1 == input.length || !isSurrogatePair(c, input[++i].also { low = it })) {
|
||||
errorSurrogate(i - 1, utf16Length)
|
||||
}
|
||||
val codePoint: Int = toCodePoint(c, low)
|
||||
@@ -383,7 +365,9 @@ public object Utf8 {
|
||||
} else {
|
||||
// If we are surrogates and we're not a surrogate pair, always throw an
|
||||
// UnpairedSurrogateException instead of an ArrayOutOfBoundsException.
|
||||
if (Char.MIN_SURROGATE <= c && c <= Char.MAX_SURROGATE &&
|
||||
if (
|
||||
Char.MIN_SURROGATE <= c &&
|
||||
c <= Char.MAX_SURROGATE &&
|
||||
(i + 1 == input.length || !isSurrogatePair(c, input[i + 1]))
|
||||
) {
|
||||
errorSurrogate(i, utf16Length)
|
||||
@@ -407,10 +391,15 @@ public object Utf8 {
|
||||
return c1.code
|
||||
}
|
||||
|
||||
private fun isSurrogatePair(high: Char, low: Char) = high.isHighSurrogate() and low.isLowSurrogate()
|
||||
private fun isSurrogatePair(high: Char, low: Char) =
|
||||
high.isHighSurrogate() and low.isLowSurrogate()
|
||||
|
||||
private fun toCodePoint(high: Char, low: Char): Int = (high.code shl 10) + low.code +
|
||||
(MIN_SUPPLEMENTARY_CODE_POINT - (Char.MIN_HIGH_SURROGATE.code shl 10) - Char.MIN_LOW_SURROGATE.code)
|
||||
private fun toCodePoint(high: Char, low: Char): Int =
|
||||
(high.code shl 10) +
|
||||
low.code +
|
||||
(MIN_SUPPLEMENTARY_CODE_POINT -
|
||||
(Char.MIN_HIGH_SURROGATE.code shl 10) -
|
||||
Char.MIN_LOW_SURROGATE.code)
|
||||
|
||||
private fun errorSurrogate(i: Int, utf16Length: Int): Unit =
|
||||
error("Unpaired surrogate at index $i of $utf16Length length")
|
||||
|
||||
@@ -22,10 +22,9 @@ import kotlin.experimental.and
|
||||
import kotlin.jvm.JvmInline
|
||||
import kotlin.math.pow
|
||||
|
||||
/**
|
||||
* Returns a minified version of this FlexBuffer as a JSON.
|
||||
*/
|
||||
public fun Reference.toJson(): String = ArrayReadWriteBuffer(1024).let {
|
||||
/** Returns a minified version of this FlexBuffer as a JSON. */
|
||||
public fun Reference.toJson(): String =
|
||||
ArrayReadWriteBuffer(1024).let {
|
||||
toJson(it)
|
||||
val data = it.data() // it.getString(0, it.writePosition)
|
||||
return data.decodeToString(0, it.writePosition)
|
||||
@@ -33,6 +32,7 @@ public fun Reference.toJson(): String = ArrayReadWriteBuffer(1024).let {
|
||||
|
||||
/**
|
||||
* Returns a minified version of this FlexBuffer as a JSON.
|
||||
*
|
||||
* @param out [ReadWriteBuffer] the JSON will be written.
|
||||
*/
|
||||
public fun Reference.toJson(out: ReadWriteBuffer) {
|
||||
@@ -57,19 +57,27 @@ public fun Reference.toJson(out: ReadWriteBuffer) {
|
||||
T_NULL -> out.put("null")
|
||||
T_BOOL -> out.put(toBoolean().toString())
|
||||
T_MAP -> toMap().toJson(out)
|
||||
T_VECTOR, T_VECTOR_BOOL, T_VECTOR_FLOAT, T_VECTOR_INT,
|
||||
T_VECTOR_UINT, T_VECTOR_KEY, T_VECTOR_STRING_DEPRECATED -> toVector().toJson(out)
|
||||
T_VECTOR,
|
||||
T_VECTOR_BOOL,
|
||||
T_VECTOR_FLOAT,
|
||||
T_VECTOR_INT,
|
||||
T_VECTOR_UINT,
|
||||
T_VECTOR_KEY,
|
||||
T_VECTOR_STRING_DEPRECATED -> toVector().toJson(out)
|
||||
else -> error("Unable to convert type ${type.typeToString()} to JSON")
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a minified version of this FlexBuffer as a JSON.
|
||||
*/
|
||||
public fun Map.toJson(): String = ArrayReadWriteBuffer(1024).let { toJson(it); it.toString() }
|
||||
/** Returns a minified version of this FlexBuffer as a JSON. */
|
||||
public fun Map.toJson(): String =
|
||||
ArrayReadWriteBuffer(1024).let {
|
||||
toJson(it)
|
||||
it.toString()
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a minified version of this FlexBuffer as a JSON.
|
||||
*
|
||||
* @param out [ReadWriteBuffer] the JSON will be written.
|
||||
*/
|
||||
public fun Map.toJson(out: ReadWriteBuffer) {
|
||||
@@ -88,13 +96,16 @@ public fun Map.toJson(out: ReadWriteBuffer) {
|
||||
out.put('}'.code.toByte())
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a minified version of this FlexBuffer as a JSON.
|
||||
*/
|
||||
public fun Vector.toJson(): String = ArrayReadWriteBuffer(1024).let { toJson(it); it.toString() }
|
||||
/** Returns a minified version of this FlexBuffer as a JSON. */
|
||||
public fun Vector.toJson(): String =
|
||||
ArrayReadWriteBuffer(1024).let {
|
||||
toJson(it)
|
||||
it.toString()
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a minified version of this FlexBuffer as a JSON.
|
||||
*
|
||||
* @param out that the JSON is being concatenated.
|
||||
*/
|
||||
public fun Vector.toJson(out: ReadWriteBuffer) {
|
||||
@@ -109,27 +120,23 @@ public fun Vector.toJson(out: ReadWriteBuffer) {
|
||||
}
|
||||
|
||||
/**
|
||||
* JSONParser class is used to parse a JSON as FlexBuffers. Calling [JSONParser.parse] fiils [output]
|
||||
* and returns a [Reference] ready to be used.
|
||||
* JSONParser class is used to parse a JSON as FlexBuffers. Calling [JSONParser.parse] fiils
|
||||
* [output] and returns a [Reference] ready to be used.
|
||||
*/
|
||||
@ExperimentalUnsignedTypes
|
||||
public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuilder(1024, SHARE_KEYS_AND_STRINGS)) {
|
||||
public class JSONParser(
|
||||
public var output: FlexBuffersBuilder = FlexBuffersBuilder(1024, SHARE_KEYS_AND_STRINGS)
|
||||
) {
|
||||
private var readPos = 0
|
||||
private var scopes = ScopeStack()
|
||||
|
||||
/**
|
||||
* Parse a json as [String] and returns a [Reference] to a FlexBuffer.
|
||||
*/
|
||||
/** Parse a json as [String] and returns a [Reference] to a FlexBuffer. */
|
||||
public fun parse(data: String): Reference = parse(ArrayReadBuffer(data.encodeToByteArray()))
|
||||
|
||||
/**
|
||||
* Parse a json as [ByteArray] and returns a [Reference] to a FlexBuffer.
|
||||
*/
|
||||
/** Parse a json as [ByteArray] and returns a [Reference] to a FlexBuffer. */
|
||||
public fun parse(data: ByteArray): Reference = parse(ArrayReadBuffer(data))
|
||||
|
||||
/**
|
||||
* Parse a json as [ReadBuffer] and returns a [Reference] to a FlexBuffer.
|
||||
*/
|
||||
/** Parse a json as [ReadBuffer] and returns a [Reference] to a FlexBuffer. */
|
||||
public fun parse(data: ReadBuffer): Reference {
|
||||
reset()
|
||||
parseValue(data, nextToken(data), null)
|
||||
@@ -165,7 +172,8 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
when (val tok = nextToken(data)) {
|
||||
TOK_END_OBJECT -> {
|
||||
this.scopes.pop()
|
||||
output.endMap(fPos, key); return T_MAP
|
||||
output.endMap(fPos, key)
|
||||
return T_MAP
|
||||
}
|
||||
TOK_BEGIN_QUOTE -> {
|
||||
val childKey = readString(data)
|
||||
@@ -347,7 +355,11 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
return readString(data, limit) { data[it] }
|
||||
}
|
||||
|
||||
private inline fun readString(data: ReadBuffer, limit: Int, crossinline fetch: (Int) -> Byte): String {
|
||||
private inline fun readString(
|
||||
data: ReadBuffer,
|
||||
limit: Int,
|
||||
crossinline fetch: (Int) -> Byte,
|
||||
): String {
|
||||
var cursorPos = readPos
|
||||
var foundEscape = false
|
||||
var currentChar: Byte = 0
|
||||
@@ -420,7 +432,8 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
endOfString = pos + 1
|
||||
}
|
||||
else -> {
|
||||
endOfString = pos; break
|
||||
endOfString = pos
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -478,7 +491,8 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
else -> makeError(data, "Unfinished Array", c)
|
||||
}
|
||||
}
|
||||
SCOPE_OBJ_EMPTY, SCOPE_OBJ_FILLED -> {
|
||||
SCOPE_OBJ_EMPTY,
|
||||
SCOPE_OBJ_FILLED -> {
|
||||
this.scopes.last = SCOPE_OBJ_KEY
|
||||
// Look for a comma before the next element.
|
||||
if (scope == SCOPE_OBJ_FILLED) {
|
||||
@@ -490,7 +504,8 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
}
|
||||
return when (val c = skipWhitespace(data)) {
|
||||
CHAR_DOUBLE_QUOTE -> TOK_BEGIN_QUOTE
|
||||
CHAR_CLOSE_OBJECT -> if (scope != SCOPE_OBJ_FILLED) {
|
||||
CHAR_CLOSE_OBJECT ->
|
||||
if (scope != SCOPE_OBJ_FILLED) {
|
||||
TOK_END_OBJECT
|
||||
} else {
|
||||
makeError(data, "Expected Key", c)
|
||||
@@ -510,8 +525,7 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
SCOPE_DOC_EMPTY -> this.scopes.last = SCOPE_DOC_FILLED
|
||||
SCOPE_DOC_FILLED -> {
|
||||
val c = skipWhitespace(data)
|
||||
if (c != CHAR_EOF)
|
||||
makeError(data, "Root object already finished", c)
|
||||
if (c != CHAR_EOF) makeError(data, "Root object already finished", c)
|
||||
return TOK_EOF
|
||||
}
|
||||
}
|
||||
@@ -550,8 +564,18 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
readPos += 4
|
||||
return TOK_FALSE
|
||||
}
|
||||
CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, CHAR_5,
|
||||
CHAR_6, CHAR_7, CHAR_8, CHAR_9, CHAR_MINUS -> return TOK_NUMBER.also {
|
||||
CHAR_0,
|
||||
CHAR_1,
|
||||
CHAR_2,
|
||||
CHAR_3,
|
||||
CHAR_4,
|
||||
CHAR_5,
|
||||
CHAR_6,
|
||||
CHAR_7,
|
||||
CHAR_8,
|
||||
CHAR_9,
|
||||
CHAR_MINUS ->
|
||||
return TOK_NUMBER.also {
|
||||
readPos-- // rewind one position so we don't lose first digit
|
||||
}
|
||||
}
|
||||
@@ -593,7 +617,8 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
while (i < end) {
|
||||
val part: Byte = data[i]
|
||||
result = (result.code shl 4).toChar()
|
||||
result += when (part) {
|
||||
result +=
|
||||
when (part) {
|
||||
in CHAR_0..CHAR_9 -> part - CHAR_0
|
||||
in CHAR_a..CHAR_f -> part - CHAR_a + 10
|
||||
in CHAR_A..CHAR_F -> part - CHAR_A + 10
|
||||
@@ -608,12 +633,15 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
CHAR_r -> '\r'
|
||||
CHAR_n -> '\n'
|
||||
CHAR_f -> 12.toChar() // '\f'
|
||||
CHAR_DOUBLE_QUOTE, CHAR_BACKSLASH, CHAR_FORWARDSLASH -> byte1.toInt().toChar()
|
||||
CHAR_DOUBLE_QUOTE,
|
||||
CHAR_BACKSLASH,
|
||||
CHAR_FORWARDSLASH -> byte1.toInt().toChar()
|
||||
else -> makeError(data, "Invalid escape sequence.", byte1)
|
||||
}
|
||||
}
|
||||
|
||||
private fun Byte.print(): String = when (this) {
|
||||
private fun Byte.print(): String =
|
||||
when (this) {
|
||||
in 0x21..0x7E -> "'${this.toInt().toChar()}'" // visible ascii chars
|
||||
CHAR_EOF -> "EOF"
|
||||
else -> "'0x${this.toString(16)}'"
|
||||
@@ -634,8 +662,7 @@ public class JSONParser(public var output: FlexBuffersBuilder = FlexBuffersBuild
|
||||
}
|
||||
|
||||
private inline fun checkEOF(data: ReadBuffer, pos: Int) {
|
||||
if (pos >= data.limit)
|
||||
makeError(data, "Unexpected end of file", -1)
|
||||
if (pos >= data.limit) makeError(data, "Unexpected end of file", -1)
|
||||
}
|
||||
|
||||
private fun calculateErrorPosition(data: ReadBuffer, endPos: Int): Pair<Int, Int> {
|
||||
@@ -686,7 +713,8 @@ private inline fun ReadWriteBuffer.jsonEscape(data: ReadBuffer, start: Int, size
|
||||
}
|
||||
|
||||
// Following escape strategy defined in RFC7159.
|
||||
private val JSON_ESCAPE_CHARS: Array<ByteArray?> = arrayOfNulls<ByteArray>(128).apply {
|
||||
private val JSON_ESCAPE_CHARS: Array<ByteArray?> =
|
||||
arrayOfNulls<ByteArray>(128).apply {
|
||||
this['\n'.code] = "\\n".encodeToByteArray()
|
||||
this['\t'.code] = "\\t".encodeToByteArray()
|
||||
this['\r'.code] = "\\r".encodeToByteArray()
|
||||
@@ -700,8 +728,8 @@ private val JSON_ESCAPE_CHARS: Array<ByteArray?> = arrayOfNulls<ByteArray>(128).
|
||||
}
|
||||
|
||||
// Scope is used to the define current space that the scanner is operating.
|
||||
@JvmInline
|
||||
private value class Scope(val id: Int)
|
||||
@JvmInline private value class Scope(val id: Int)
|
||||
|
||||
private val SCOPE_DOC_EMPTY = Scope(0)
|
||||
private val SCOPE_DOC_FILLED = Scope(1)
|
||||
private val SCOPE_OBJ_EMPTY = Scope(2)
|
||||
@@ -714,7 +742,7 @@ private val SCOPE_ARRAY_FILLED = Scope(6)
|
||||
// max stack size of 22, as per tests cases defined in http://json.org/JSON_checker/
|
||||
private class ScopeStack(
|
||||
private val ary: IntArray = IntArray(22) { SCOPE_DOC_EMPTY.id },
|
||||
var lastPos: Int = 0
|
||||
var lastPos: Int = 0,
|
||||
) {
|
||||
var last: Scope
|
||||
get() = Scope(ary[lastPos])
|
||||
@@ -743,7 +771,8 @@ private class ScopeStack(
|
||||
|
||||
@JvmInline
|
||||
private value class Token(val id: Int) {
|
||||
fun print(): String = when (this) {
|
||||
fun print(): String =
|
||||
when (this) {
|
||||
TOK_EOF -> "TOK_EOF"
|
||||
TOK_NONE -> "TOK_NONE"
|
||||
TOK_BEGIN_OBJECT -> "TOK_BEGIN_OBJECT"
|
||||
@@ -813,20 +842,265 @@ private const val CHAR_DOT = '.'.code.toByte()
|
||||
// bit 0 (1) - set if: plain ASCII string character
|
||||
// bit 1 (2) - set if: whitespace
|
||||
// bit 4 (0x10) - set if: 0-9 e E .
|
||||
private val parseFlags = byteArrayOf(
|
||||
private val parseFlags =
|
||||
byteArrayOf(
|
||||
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 2, 0, 0, // 0
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
|
||||
3, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0x11, 1, // 2
|
||||
0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 1, 1, 1, 1, 1, 1, // 3
|
||||
1, 1, 1, 1, 1, 0x11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 4
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, // 5
|
||||
1, 1, 1, 1, 1, 0x11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 6
|
||||
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 7
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
2,
|
||||
2,
|
||||
0,
|
||||
0,
|
||||
2,
|
||||
0,
|
||||
0, // 0
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0, // 1
|
||||
3,
|
||||
1,
|
||||
0,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
0x11,
|
||||
1, // 2
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
0x11,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1, // 3
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
0x11,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1, // 4
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
0,
|
||||
1,
|
||||
1,
|
||||
1, // 5
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
0x11,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1, // 6
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
1, // 7
|
||||
|
||||
// 128-255
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
)
|
||||
|
||||
@@ -35,8 +35,7 @@ fun arrayFailMessage(expected: ShortArray, actual: ShortArray): String =
|
||||
fun arrayFailMessage(expected: LongArray, actual: LongArray): String =
|
||||
failMessage(expected.contentToString(), actual.contentToString())
|
||||
|
||||
fun failMessage(expected: String, actual: String): String =
|
||||
"Expected: $expected\nActual: $actual"
|
||||
fun failMessage(expected: String, actual: String): String = "Expected: $expected\nActual: $actual"
|
||||
|
||||
fun arrayFailMessage(expected: FloatArray, actual: FloatArray): String {
|
||||
return "Expected: ${expected.contentToString()}\nActual: ${actual.contentToString()}"
|
||||
|
||||
@@ -17,17 +17,17 @@ package com.google.flatbuffers.kotlin
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testByte() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
67.toByte() to byteArrayOf(67),
|
||||
Byte.MIN_VALUE to byteArrayOf(-128),
|
||||
Byte.MAX_VALUE to byteArrayOf(127),
|
||||
0.toByte() to byteArrayOf(0)
|
||||
0.toByte() to byteArrayOf(0),
|
||||
)
|
||||
val data = ByteArray(1)
|
||||
testSet.forEach {
|
||||
@@ -39,11 +39,12 @@ class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testShort() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
6712.toShort() to byteArrayOf(56, 26),
|
||||
Short.MIN_VALUE to byteArrayOf(0, -128),
|
||||
Short.MAX_VALUE to byteArrayOf(-1, 127),
|
||||
0.toShort() to byteArrayOf(0, 0,)
|
||||
0.toShort() to byteArrayOf(0, 0),
|
||||
)
|
||||
|
||||
val data = ByteArray(Short.SIZE_BYTES)
|
||||
@@ -56,11 +57,12 @@ class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testInt() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
33333500 to byteArrayOf(-4, -96, -4, 1),
|
||||
Int.MIN_VALUE to byteArrayOf(0, 0, 0, -128),
|
||||
Int.MAX_VALUE to byteArrayOf(-1, -1, -1, 127),
|
||||
0 to byteArrayOf(0, 0, 0, 0)
|
||||
0 to byteArrayOf(0, 0, 0, 0),
|
||||
)
|
||||
val data = ByteArray(Int.SIZE_BYTES)
|
||||
testSet.forEach {
|
||||
@@ -72,12 +74,13 @@ class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testLong() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
1234567123122890123L to byteArrayOf(-117, -91, 29, -23, 65, 16, 34, 17),
|
||||
-1L to byteArrayOf(-1, -1, -1, -1, -1, -1, -1, -1),
|
||||
Long.MIN_VALUE to byteArrayOf(0, 0, 0, 0, 0, 0, 0, -128),
|
||||
Long.MAX_VALUE to byteArrayOf(-1, -1, -1, -1, -1, -1, -1, 127),
|
||||
0L to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0)
|
||||
0L to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
)
|
||||
val data = ByteArray(Long.SIZE_BYTES)
|
||||
testSet.forEach {
|
||||
@@ -89,11 +92,12 @@ class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testULong() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
1234567123122890123UL to byteArrayOf(-117, -91, 29, -23, 65, 16, 34, 17),
|
||||
ULong.MIN_VALUE to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
(-1L).toULong() to byteArrayOf(-1, -1, -1, -1, -1, -1, -1, -1),
|
||||
0UL to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0)
|
||||
0UL to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
)
|
||||
val data = ByteArray(ULong.SIZE_BYTES)
|
||||
testSet.forEach {
|
||||
@@ -105,11 +109,12 @@ class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testFloat() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
3545.56337f to byteArrayOf(4, -103, 93, 69),
|
||||
Float.MIN_VALUE to byteArrayOf(1, 0, 0, 0),
|
||||
Float.MAX_VALUE to byteArrayOf(-1, -1, 127, 127),
|
||||
0f to byteArrayOf(0, 0, 0, 0)
|
||||
0f to byteArrayOf(0, 0, 0, 0),
|
||||
)
|
||||
val data = ByteArray(Float.SIZE_BYTES)
|
||||
testSet.forEach {
|
||||
@@ -120,11 +125,12 @@ class ByteArrayTest {
|
||||
|
||||
@Test
|
||||
fun testDouble() {
|
||||
val testSet = arrayOf(
|
||||
val testSet =
|
||||
arrayOf(
|
||||
123456.523423423412 to byteArrayOf(88, 61, -15, 95, 8, 36, -2, 64),
|
||||
Double.MIN_VALUE to byteArrayOf(1, 0, 0, 0, 0, 0, 0, 0),
|
||||
Double.MAX_VALUE to byteArrayOf(-1, -1, -1, -1, -1, -1, -17, 127),
|
||||
0.0 to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0)
|
||||
0.0 to byteArrayOf(0, 0, 0, 0, 0, 0, 0, 0),
|
||||
)
|
||||
val data = ByteArray(Long.SIZE_BYTES)
|
||||
testSet.forEach {
|
||||
@@ -144,4 +150,3 @@ class ByteArrayTest {
|
||||
assertEquals(testSet, data.getString(0, encoded.size))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -18,19 +18,17 @@
|
||||
package com.google.flatbuffers.kotlin
|
||||
|
||||
import Attacker
|
||||
import AttackerOffsetArray
|
||||
import CharacterEArray
|
||||
import dictionaryLookup.LongFloatEntry
|
||||
import dictionaryLookup.LongFloatMap
|
||||
import Movie
|
||||
import dictionaryLookup.LongFloatEntry
|
||||
import dictionaryLookup.LongFloatEntryOffsetArray
|
||||
import dictionaryLookup.LongFloatMap
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import myGame.example.*
|
||||
import myGame.example.Test.Companion.createTest
|
||||
import optionalScalars.OptionalByte
|
||||
import optionalScalars.ScalarStuff
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
|
||||
@ExperimentalUnsignedTypes
|
||||
class FlatBufferBuilderTest {
|
||||
@@ -43,10 +41,8 @@ class FlatBufferBuilderTest {
|
||||
val inv = Monster.createInventoryVector(fbb, invValues)
|
||||
Monster.startMonster(fbb)
|
||||
Monster.addPos(
|
||||
fbb, Vec3.createVec3(
|
||||
fbb, 1.0f, 2.0f, 3.0f, 3.0,
|
||||
Color.Green, 5.toShort(), 6.toByte()
|
||||
)
|
||||
fbb,
|
||||
Vec3.createVec3(fbb, 1.0f, 2.0f, 3.0f, 3.0, Color.Green, 5.toShort(), 6.toByte()),
|
||||
)
|
||||
Monster.addHp(fbb, 80.toShort())
|
||||
Monster.addName(fbb, name)
|
||||
@@ -86,8 +82,10 @@ class FlatBufferBuilderTest {
|
||||
@Test
|
||||
fun testSortedVector() {
|
||||
val fbb = FlatBufferBuilder()
|
||||
val names = arrayOf(fbb.createString("Frodo"), fbb.createString("Barney"), fbb.createString("Wilma"))
|
||||
val monsters = MonsterOffsetArray(3) {
|
||||
val names =
|
||||
arrayOf(fbb.createString("Frodo"), fbb.createString("Barney"), fbb.createString("Wilma"))
|
||||
val monsters =
|
||||
MonsterOffsetArray(3) {
|
||||
Monster.startMonster(fbb)
|
||||
Monster.addName(fbb, names[it])
|
||||
Monster.endMonster(fbb)
|
||||
@@ -161,7 +159,8 @@ class FlatBufferBuilderTest {
|
||||
@Test
|
||||
fun testBuilderBasics() {
|
||||
val fbb = FlatBufferBuilder()
|
||||
val names = arrayOf(fbb.createString("Frodo"), fbb.createString("Barney"), fbb.createString("Wilma"))
|
||||
val names =
|
||||
arrayOf(fbb.createString("Frodo"), fbb.createString("Barney"), fbb.createString("Wilma"))
|
||||
val off = Array<Offset<Monster>>(3) { Offset(0) }
|
||||
Monster.startMonster(fbb)
|
||||
Monster.addName(fbb, names[0])
|
||||
@@ -189,15 +188,14 @@ class FlatBufferBuilderTest {
|
||||
val test4 = fbb.endVector<myGame.example.Test>()
|
||||
|
||||
val strings = StringOffsetArray(2) { fbb.createString("test$it") }
|
||||
val testArrayOfString =
|
||||
Monster.createTestarrayofstringVector(fbb, strings)
|
||||
val testArrayOfString = Monster.createTestarrayofstringVector(fbb, strings)
|
||||
|
||||
Monster.startMonster(fbb)
|
||||
Monster.addName(fbb, names[0])
|
||||
Monster.addPos(fbb, Vec3.createVec3(
|
||||
fbb, 1.0f, 2.0f, 3.0f, 3.0,
|
||||
Color.Green, 5.toShort(), 6.toByte()
|
||||
))
|
||||
Monster.addPos(
|
||||
fbb,
|
||||
Vec3.createVec3(fbb, 1.0f, 2.0f, 3.0f, 3.0, Color.Green, 5.toShort(), 6.toByte()),
|
||||
)
|
||||
Monster.addHp(fbb, 80)
|
||||
Monster.addMana(fbb, 150)
|
||||
Monster.addInventory(fbb, inv)
|
||||
@@ -255,14 +253,12 @@ class FlatBufferBuilderTest {
|
||||
CharacterE.MuLan,
|
||||
attacker,
|
||||
Movie.createCharactersTypeVector(fbb, characters),
|
||||
Movie.createCharactersVector(fbb, attackers)
|
||||
)
|
||||
Movie.createCharactersVector(fbb, attackers),
|
||||
),
|
||||
)
|
||||
|
||||
val movie: Movie = Movie.asRoot(fbb.dataBuffer())
|
||||
|
||||
|
||||
|
||||
assertEquals(movie.charactersTypeLength, 1)
|
||||
assertEquals(movie.charactersLength, 1)
|
||||
|
||||
@@ -558,7 +554,8 @@ class FlatBufferBuilderTest {
|
||||
fun testDictionaryLookup() {
|
||||
val fbb = FlatBufferBuilder(16)
|
||||
val lfIndex = LongFloatEntry.createLongFloatEntry(fbb, 0, 99.0f)
|
||||
val vectorEntriesIdx = LongFloatMap.createEntriesVector(fbb, LongFloatEntryOffsetArray(1) { lfIndex })
|
||||
val vectorEntriesIdx =
|
||||
LongFloatMap.createEntriesVector(fbb, LongFloatEntryOffsetArray(1) { lfIndex })
|
||||
val rootIdx = LongFloatMap.createLongFloatMap(fbb, vectorEntriesIdx)
|
||||
LongFloatMap.finishLongFloatMapBuffer(fbb, rootIdx)
|
||||
val map: LongFloatMap = LongFloatMap.asRoot(fbb.dataBuffer())
|
||||
|
||||
@@ -24,11 +24,12 @@ class FlexBuffersTest {
|
||||
|
||||
@Test
|
||||
fun testWriteInt() {
|
||||
val values = listOf(
|
||||
val values =
|
||||
listOf(
|
||||
Byte.MAX_VALUE.toLong() to 3,
|
||||
Short.MAX_VALUE.toLong() to 4,
|
||||
Int.MAX_VALUE.toLong() to 6,
|
||||
Long.MAX_VALUE to 10
|
||||
Long.MAX_VALUE to 10,
|
||||
)
|
||||
val builder = FlexBuffersBuilder()
|
||||
values.forEach {
|
||||
@@ -44,11 +45,12 @@ class FlexBuffersTest {
|
||||
|
||||
@Test
|
||||
fun testWriteUInt() {
|
||||
val values = listOf(
|
||||
val values =
|
||||
listOf(
|
||||
UByte.MAX_VALUE.toULong() to 3,
|
||||
UShort.MAX_VALUE.toULong() to 4,
|
||||
UInt.MAX_VALUE.toULong() to 6,
|
||||
ULong.MAX_VALUE to 10
|
||||
ULong.MAX_VALUE to 10,
|
||||
)
|
||||
val builder = FlexBuffersBuilder()
|
||||
values.forEach {
|
||||
@@ -126,7 +128,8 @@ class FlexBuffersTest {
|
||||
|
||||
@Test
|
||||
fun testLongArray() {
|
||||
val ary: LongArray = longArrayOf(0, Short.MIN_VALUE.toLong(), Int.MAX_VALUE.toLong(), Long.MAX_VALUE)
|
||||
val ary: LongArray =
|
||||
longArrayOf(0, Short.MIN_VALUE.toLong(), Int.MAX_VALUE.toLong(), Long.MAX_VALUE)
|
||||
val builder = FlexBuffersBuilder()
|
||||
builder.put(ary)
|
||||
val data = builder.finish()
|
||||
@@ -139,9 +142,7 @@ class FlexBuffersTest {
|
||||
fun testStringArray() {
|
||||
val ary = Array(5) { "Hello world number: $it" }
|
||||
val builder = FlexBuffersBuilder(ArrayReadWriteBuffer(20), SHARE_NONE)
|
||||
builder.putVector {
|
||||
ary.forEach { put(it) }
|
||||
}
|
||||
builder.putVector { ary.forEach { put(it) } }
|
||||
val data = builder.finish()
|
||||
val vec = getRoot(data).toVector()
|
||||
// although we put a long, it is shrink to a byte
|
||||
@@ -237,9 +238,7 @@ class FlexBuffersTest {
|
||||
this["int"] = 10
|
||||
this["float"] = 12.3
|
||||
this["intarray"] = intArrayOf(1, 2, 3, 4, 5)
|
||||
this.putMap("myMap") {
|
||||
this["cool"] = "beans"
|
||||
}
|
||||
this.putMap("myMap") { this["cool"] = "beans" }
|
||||
}
|
||||
|
||||
val ref = getRoot(builder.finish())
|
||||
@@ -257,7 +256,9 @@ class FlexBuffersTest {
|
||||
assertEquals(true, ref["invalid_key"].isNull)
|
||||
|
||||
val keys = map.keys.toTypedArray()
|
||||
arrayOf("hello", "int", "float", "intarray", "myMap").sortedArray().forEachIndexed { i: Int, it: String ->
|
||||
arrayOf("hello", "int", "float", "intarray", "myMap").sortedArray().forEachIndexed {
|
||||
i: Int,
|
||||
it: String ->
|
||||
assertEquals(it, keys[i].toString())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,9 +23,11 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun parse2Test() {
|
||||
val dataStr = """
|
||||
val dataStr =
|
||||
"""
|
||||
{ "myKey" : [1, "yay"] }
|
||||
""".trimIndent()
|
||||
"""
|
||||
.trimIndent()
|
||||
val data = dataStr.encodeToByteArray()
|
||||
val buffer = ArrayReadWriteBuffer(data, writePosition = data.size)
|
||||
val parser = JSONParser()
|
||||
@@ -35,7 +37,8 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun parseSample() {
|
||||
val dataStr = """
|
||||
val dataStr =
|
||||
"""
|
||||
{
|
||||
"ary" : [1, 2, 3],
|
||||
"boolean_false": false,
|
||||
@@ -69,16 +72,19 @@ class JSONTest {
|
||||
val obj = map["object"]
|
||||
assertEquals(true, obj.isMap)
|
||||
assertEquals("{\"field1\":\"hello\"}", obj.toJson())
|
||||
// TODO: Kotlin Double.toString() produce different strings dependending on the platform, so on JVM
|
||||
// TODO: Kotlin Double.toString() produce different strings dependending on the platform, so on
|
||||
// JVM
|
||||
// is 1.2E33, while on js is 1.2e+33. For now we are disabling this test.
|
||||
//
|
||||
// val minified = data.filterNot { it == ' '.toByte() || it == '\n'.toByte() }.toByteArray().decodeToString()
|
||||
// val minified = data.filterNot { it == ' '.toByte() || it == '\n'.toByte()
|
||||
// }.toByteArray().decodeToString()
|
||||
// assertEquals(minified, root.toJson())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testDoubles() {
|
||||
val values = arrayOf(
|
||||
val values =
|
||||
arrayOf(
|
||||
"-0.0",
|
||||
"1.0",
|
||||
"1.7976931348613157",
|
||||
@@ -103,7 +109,8 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun testInts() {
|
||||
val values = arrayOf(
|
||||
val values =
|
||||
arrayOf(
|
||||
"-0",
|
||||
"0",
|
||||
"-1",
|
||||
@@ -125,11 +132,7 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun testBooleansAndNull() {
|
||||
val values = arrayOf(
|
||||
"true",
|
||||
"false",
|
||||
"null"
|
||||
)
|
||||
val values = arrayOf("true", "false", "null")
|
||||
val parser = JSONParser()
|
||||
|
||||
assertEquals(true, parser.parse(values[0]).toBoolean())
|
||||
@@ -139,7 +142,8 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun testStrings() {
|
||||
val values = arrayOf(
|
||||
val values =
|
||||
arrayOf(
|
||||
"\"\"",
|
||||
"\"a\"",
|
||||
"\"hello world\"",
|
||||
@@ -189,7 +193,8 @@ class JSONTest {
|
||||
@Test
|
||||
fun testUnicode() {
|
||||
// took from test/unicode_test.json
|
||||
val data = """
|
||||
val data =
|
||||
"""
|
||||
{
|
||||
"name": "unicode_test",
|
||||
"testarrayofstring": [
|
||||
@@ -221,7 +226,8 @@ class JSONTest {
|
||||
}
|
||||
]
|
||||
}
|
||||
""".trimIndent()
|
||||
"""
|
||||
.trimIndent()
|
||||
val parser = JSONParser()
|
||||
val ref = parser.parse(data)
|
||||
|
||||
@@ -248,14 +254,15 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun testArrays() {
|
||||
val values = arrayOf(
|
||||
val values =
|
||||
arrayOf(
|
||||
"[]",
|
||||
"[1]",
|
||||
"[0,1, 2,3 , 4 ]",
|
||||
"[1.0, 2.2250738585072014E-308, 4.9E-320]",
|
||||
"[1.0, 2, \"hello world\"] ",
|
||||
"[ 1.1, 2, [ \"hello\" ] ]",
|
||||
"[[[1]]]"
|
||||
"[[[1]]]",
|
||||
)
|
||||
val parser = JSONParser()
|
||||
|
||||
@@ -300,14 +307,14 @@ class JSONTest {
|
||||
}
|
||||
|
||||
/**
|
||||
* Several test cases provided by json.org
|
||||
* For more details, see: http://json.org/JSON_checker/, with only
|
||||
* one exception. Single strings are considered accepted, whereas on
|
||||
* the test suit is should fail.
|
||||
* Several test cases provided by json.org For more details, see: http://json.org/JSON_checker/,
|
||||
* with only one exception. Single strings are considered accepted, whereas on the test suit is
|
||||
* should fail.
|
||||
*/
|
||||
@Test
|
||||
fun testParseMustFail() {
|
||||
val failList = listOf(
|
||||
val failList =
|
||||
listOf(
|
||||
"[\"Unclosed array\"",
|
||||
"{unquoted_key: \"keys must be quoted\"}",
|
||||
"[\"extra comma\",]",
|
||||
@@ -339,7 +346,7 @@ class JSONTest {
|
||||
"[0e+]",
|
||||
"[0e+-1]",
|
||||
"{\"Comma instead if closing brace\": true,",
|
||||
"[\"mismatch\"}"
|
||||
"[\"mismatch\"}",
|
||||
)
|
||||
for (data in failList) {
|
||||
try {
|
||||
@@ -353,7 +360,8 @@ class JSONTest {
|
||||
|
||||
@Test
|
||||
fun testParseMustPass() {
|
||||
val passList = listOf(
|
||||
val passList =
|
||||
listOf(
|
||||
"[\n" +
|
||||
" \"JSON Test Pattern pass1\",\n" +
|
||||
" {\"object with 1 member\":[\"array with 1 element\"]},\n" +
|
||||
|
||||
@@ -17,25 +17,50 @@
|
||||
|
||||
package com.google.flatbuffers.kotlin
|
||||
|
||||
/**
|
||||
* This implementation uses Little Endian order.
|
||||
*/
|
||||
/** This implementation uses Little Endian order. */
|
||||
public actual inline fun ByteArray.getUByte(index: Int): UByte = ByteArrayOps.getUByte(this, index)
|
||||
public actual inline fun ByteArray.getShort(index: Int): Short = ByteArrayOps.getShort(this, index)
|
||||
public actual inline fun ByteArray.getUShort(index: Int): UShort = ByteArrayOps.getUShort(this, index)
|
||||
public actual inline fun ByteArray.getInt(index: Int): Int = ByteArrayOps.getInt(this, index)
|
||||
public actual inline fun ByteArray.getUInt(index: Int): UInt = ByteArrayOps.getUInt(this, index)
|
||||
public actual inline fun ByteArray.getLong(index: Int): Long = ByteArrayOps.getLong(this, index)
|
||||
public actual inline fun ByteArray.getULong(index: Int): ULong = ByteArrayOps.getULong(this, index)
|
||||
public actual inline fun ByteArray.getFloat(index: Int): Float = ByteArrayOps.getFloat(this, index)
|
||||
public actual inline fun ByteArray.getDouble(index: Int): Double = ByteArrayOps.getDouble(this, index)
|
||||
|
||||
public actual inline fun ByteArray.setUByte(index: Int, value: UByte): Unit = ByteArrayOps.setUByte(this, index, value)
|
||||
public actual inline fun ByteArray.setShort(index: Int, value: Short): Unit = ByteArrayOps.setShort(this, index, value)
|
||||
public actual inline fun ByteArray.setUShort(index: Int, value: UShort): Unit = ByteArrayOps.setUShort(this, index, value)
|
||||
public actual inline fun ByteArray.setInt(index: Int, value: Int): Unit = ByteArrayOps.setInt(this, index, value)
|
||||
public actual inline fun ByteArray.setUInt(index: Int, value: UInt): Unit = ByteArrayOps.setUInt(this, index, value)
|
||||
public actual inline fun ByteArray.setLong(index: Int, value: Long): Unit = ByteArrayOps.setLong(this, index, value)
|
||||
public actual inline fun ByteArray.setULong(index: Int, value: ULong): Unit = ByteArrayOps.setULong(this, index, value)
|
||||
public actual inline fun ByteArray.setFloat(index: Int, value: Float): Unit = ByteArrayOps.setFloat(this, index, value)
|
||||
public actual inline fun ByteArray.setDouble(index: Int, value: Double): Unit = ByteArrayOps.setDouble(this, index, value)
|
||||
public actual inline fun ByteArray.getShort(index: Int): Short = ByteArrayOps.getShort(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getUShort(index: Int): UShort =
|
||||
ByteArrayOps.getUShort(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getInt(index: Int): Int = ByteArrayOps.getInt(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getUInt(index: Int): UInt = ByteArrayOps.getUInt(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getLong(index: Int): Long = ByteArrayOps.getLong(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getULong(index: Int): ULong = ByteArrayOps.getULong(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getFloat(index: Int): Float = ByteArrayOps.getFloat(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getDouble(index: Int): Double =
|
||||
ByteArrayOps.getDouble(this, index)
|
||||
|
||||
public actual inline fun ByteArray.setUByte(index: Int, value: UByte): Unit =
|
||||
ByteArrayOps.setUByte(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setShort(index: Int, value: Short): Unit =
|
||||
ByteArrayOps.setShort(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setUShort(index: Int, value: UShort): Unit =
|
||||
ByteArrayOps.setUShort(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setInt(index: Int, value: Int): Unit =
|
||||
ByteArrayOps.setInt(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setUInt(index: Int, value: UInt): Unit =
|
||||
ByteArrayOps.setUInt(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setLong(index: Int, value: Long): Unit =
|
||||
ByteArrayOps.setLong(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setULong(index: Int, value: ULong): Unit =
|
||||
ByteArrayOps.setULong(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setFloat(index: Int, value: Float): Unit =
|
||||
ByteArrayOps.setFloat(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setDouble(index: Int, value: Double): Unit =
|
||||
ByteArrayOps.setDouble(this, index, value)
|
||||
|
||||
@@ -19,25 +19,50 @@
|
||||
|
||||
package com.google.flatbuffers.kotlin
|
||||
|
||||
/**
|
||||
* This implementation uses Little Endian order.
|
||||
*/
|
||||
/** This implementation uses Little Endian order. */
|
||||
public actual inline fun ByteArray.getUByte(index: Int): UByte = ByteArrayOps.getUByte(this, index)
|
||||
public actual inline fun ByteArray.getShort(index: Int): Short = ByteArrayOps.getShort(this, index)
|
||||
public actual inline fun ByteArray.getUShort(index: Int): UShort = ByteArrayOps.getUShort(this, index)
|
||||
public actual inline fun ByteArray.getInt(index: Int): Int = ByteArrayOps.getInt(this, index)
|
||||
public actual inline fun ByteArray.getUInt(index: Int): UInt = ByteArrayOps.getUInt(this, index)
|
||||
public actual inline fun ByteArray.getLong(index: Int): Long = ByteArrayOps.getLong(this, index)
|
||||
public actual inline fun ByteArray.getULong(index: Int): ULong = ByteArrayOps.getULong(this, index)
|
||||
public actual inline fun ByteArray.getFloat(index: Int): Float = ByteArrayOps.getFloat(this, index)
|
||||
public actual inline fun ByteArray.getDouble(index: Int): Double = ByteArrayOps.getDouble(this, index)
|
||||
|
||||
public actual inline fun ByteArray.setUByte(index: Int, value: UByte): Unit = ByteArrayOps.setUByte(this, index, value)
|
||||
public actual inline fun ByteArray.setShort(index: Int, value: Short): Unit = ByteArrayOps.setShort(this, index, value)
|
||||
public actual inline fun ByteArray.setUShort(index: Int, value: UShort): Unit = ByteArrayOps.setUShort(this, index, value)
|
||||
public actual inline fun ByteArray.setInt(index: Int, value: Int): Unit = ByteArrayOps.setInt(this, index, value)
|
||||
public actual inline fun ByteArray.setUInt(index: Int, value: UInt): Unit = ByteArrayOps.setUInt(this, index, value)
|
||||
public actual inline fun ByteArray.setLong(index: Int, value: Long): Unit = ByteArrayOps.setLong(this, index, value)
|
||||
public actual inline fun ByteArray.setULong(index: Int, value: ULong): Unit = ByteArrayOps.setULong(this, index, value)
|
||||
public actual inline fun ByteArray.setFloat(index: Int, value: Float): Unit = ByteArrayOps.setFloat(this, index, value)
|
||||
public actual inline fun ByteArray.setDouble(index: Int, value: Double): Unit = ByteArrayOps.setDouble(this, index, value)
|
||||
public actual inline fun ByteArray.getShort(index: Int): Short = ByteArrayOps.getShort(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getUShort(index: Int): UShort =
|
||||
ByteArrayOps.getUShort(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getInt(index: Int): Int = ByteArrayOps.getInt(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getUInt(index: Int): UInt = ByteArrayOps.getUInt(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getLong(index: Int): Long = ByteArrayOps.getLong(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getULong(index: Int): ULong = ByteArrayOps.getULong(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getFloat(index: Int): Float = ByteArrayOps.getFloat(this, index)
|
||||
|
||||
public actual inline fun ByteArray.getDouble(index: Int): Double =
|
||||
ByteArrayOps.getDouble(this, index)
|
||||
|
||||
public actual inline fun ByteArray.setUByte(index: Int, value: UByte): Unit =
|
||||
ByteArrayOps.setUByte(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setShort(index: Int, value: Short): Unit =
|
||||
ByteArrayOps.setShort(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setUShort(index: Int, value: UShort): Unit =
|
||||
ByteArrayOps.setUShort(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setInt(index: Int, value: Int): Unit =
|
||||
ByteArrayOps.setInt(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setUInt(index: Int, value: UInt): Unit =
|
||||
ByteArrayOps.setUInt(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setLong(index: Int, value: Long): Unit =
|
||||
ByteArrayOps.setLong(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setULong(index: Int, value: ULong): Unit =
|
||||
ByteArrayOps.setULong(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setFloat(index: Int, value: Float): Unit =
|
||||
ByteArrayOps.setFloat(this, index, value)
|
||||
|
||||
public actual inline fun ByteArray.setDouble(index: Int, value: Double): Unit =
|
||||
ByteArrayOps.setDouble(this, index, value)
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user