Skip to content

Commit caf3b49

Browse files
dbaileychessdbaileychess
authored
bulk code format fix (#8707)
1 parent 0e04786 commit caf3b49

559 files changed

Lines changed: 38859 additions & 31264 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Package.swift‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,24 @@ let package = Package(
5757
extension Array where Element == Package.Dependency {
5858
static var dependencies: [Package.Dependency] {
5959
#if os(Windows)
60-
[]
60+
[]
6161
#else
62-
// Test only Dependency
63-
[.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1")]
62+
// Test only Dependency
63+
[.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.4.1")]
6464
#endif
6565
}
6666
}
6767

6868
extension Array where Element == PackageDescription.Target.Dependency {
6969
static var dependencies: [PackageDescription.Target.Dependency] {
7070
#if os(Windows)
71-
["FlatBuffers"]
71+
["FlatBuffers"]
7272
#else
73-
// Test only Dependency
74-
[
75-
.product(name: "GRPC", package: "grpc-swift"),
76-
"FlatBuffers",
77-
]
73+
// Test only Dependency
74+
[
75+
.product(name: "GRPC", package: "grpc-swift"),
76+
"FlatBuffers",
77+
]
7878
#endif
7979
}
8080
}

‎android/app/src/main/cpp/generated/animal_generated.h‎

Lines changed: 24 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// automatically generated by the FlatBuffers compiler, do not modify
22

3-
43
#ifndef FLATBUFFERS_GENERATED_ANIMAL_COM_FBS_APP_H_
54
#define FLATBUFFERS_GENERATED_ANIMAL_COM_FBS_APP_H_
65

@@ -9,9 +8,9 @@
98
// Ensure the included flatbuffers.h is the same version as when this file was
109
// generated, otherwise it may not be compatible.
1110
static_assert(FLATBUFFERS_VERSION_MAJOR == 24 &&
12-
FLATBUFFERS_VERSION_MINOR == 12 &&
13-
FLATBUFFERS_VERSION_REVISION == 23,
14-
"Non-compatible flatbuffers version included");
11+
FLATBUFFERS_VERSION_MINOR == 12 &&
12+
FLATBUFFERS_VERSION_REVISION == 23,
13+
"Non-compatible flatbuffers version included");
1514

1615
namespace com {
1716
namespace fbs {
@@ -27,29 +26,24 @@ struct Animal FLATBUFFERS_FINAL_CLASS : private ::flatbuffers::Table {
2726
VT_SOUND = 6,
2827
VT_WEIGHT = 8
2928
};
30-
const ::flatbuffers::String *name() const {
31-
return GetPointer<const ::flatbuffers::String *>(VT_NAME);
32-
}
33-
const ::flatbuffers::String *sound() const {
34-
return GetPointer<const ::flatbuffers::String *>(VT_SOUND);
29+
const ::flatbuffers::String* name() const {
30+
return GetPointer<const ::flatbuffers::String*>(VT_NAME);
3531
}
36-
uint16_t weight() const {
37-
return GetField<uint16_t>(VT_WEIGHT, 0);
32+
const ::flatbuffers::String* sound() const {
33+
return GetPointer<const ::flatbuffers::String*>(VT_SOUND);
3834
}
39-
bool Verify(::flatbuffers::Verifier &verifier) const {
40-
return VerifyTableStart(verifier) &&
41-
VerifyOffset(verifier, VT_NAME) &&
42-
verifier.VerifyString(name()) &&
43-
VerifyOffset(verifier, VT_SOUND) &&
35+
uint16_t weight() const { return GetField<uint16_t>(VT_WEIGHT, 0); }
36+
bool Verify(::flatbuffers::Verifier& verifier) const {
37+
return VerifyTableStart(verifier) && VerifyOffset(verifier, VT_NAME) &&
38+
verifier.VerifyString(name()) && VerifyOffset(verifier, VT_SOUND) &&
4439
verifier.VerifyString(sound()) &&
45-
VerifyField<uint16_t>(verifier, VT_WEIGHT, 2) &&
46-
verifier.EndTable();
40+
VerifyField<uint16_t>(verifier, VT_WEIGHT, 2) && verifier.EndTable();
4741
}
4842
};
4943

5044
struct AnimalBuilder {
5145
typedef Animal Table;
52-
::flatbuffers::FlatBufferBuilder &fbb_;
46+
::flatbuffers::FlatBufferBuilder& fbb_;
5347
::flatbuffers::uoffset_t start_;
5448
void add_name(::flatbuffers::Offset<::flatbuffers::String> name) {
5549
fbb_.AddOffset(Animal::VT_NAME, name);
@@ -60,8 +54,7 @@ struct AnimalBuilder {
6054
void add_weight(uint16_t weight) {
6155
fbb_.AddElement<uint16_t>(Animal::VT_WEIGHT, weight, 0);
6256
}
63-
explicit AnimalBuilder(::flatbuffers::FlatBufferBuilder &_fbb)
64-
: fbb_(_fbb) {
57+
explicit AnimalBuilder(::flatbuffers::FlatBufferBuilder& _fbb) : fbb_(_fbb) {
6558
start_ = fbb_.StartTable();
6659
}
6760
::flatbuffers::Offset<Animal> Finish() {
@@ -72,7 +65,7 @@ struct AnimalBuilder {
7265
};
7366

7467
inline ::flatbuffers::Offset<Animal> CreateAnimal(
75-
::flatbuffers::FlatBufferBuilder &_fbb,
68+
::flatbuffers::FlatBufferBuilder& _fbb,
7669
::flatbuffers::Offset<::flatbuffers::String> name = 0,
7770
::flatbuffers::Offset<::flatbuffers::String> sound = 0,
7871
uint16_t weight = 0) {
@@ -84,45 +77,37 @@ inline ::flatbuffers::Offset<Animal> CreateAnimal(
8477
}
8578

8679
inline ::flatbuffers::Offset<Animal> CreateAnimalDirect(
87-
::flatbuffers::FlatBufferBuilder &_fbb,
88-
const char *name = nullptr,
89-
const char *sound = nullptr,
90-
uint16_t weight = 0) {
80+
::flatbuffers::FlatBufferBuilder& _fbb, const char* name = nullptr,
81+
const char* sound = nullptr, uint16_t weight = 0) {
9182
auto name__ = name ? _fbb.CreateString(name) : 0;
9283
auto sound__ = sound ? _fbb.CreateString(sound) : 0;
93-
return com::fbs::app::CreateAnimal(
94-
_fbb,
95-
name__,
96-
sound__,
97-
weight);
84+
return com::fbs::app::CreateAnimal(_fbb, name__, sound__, weight);
9885
}
9986

100-
inline const com::fbs::app::Animal *GetAnimal(const void *buf) {
87+
inline const com::fbs::app::Animal* GetAnimal(const void* buf) {
10188
return ::flatbuffers::GetRoot<com::fbs::app::Animal>(buf);
10289
}
10390

104-
inline const com::fbs::app::Animal *GetSizePrefixedAnimal(const void *buf) {
91+
inline const com::fbs::app::Animal* GetSizePrefixedAnimal(const void* buf) {
10592
return ::flatbuffers::GetSizePrefixedRoot<com::fbs::app::Animal>(buf);
10693
}
10794

108-
inline bool VerifyAnimalBuffer(
109-
::flatbuffers::Verifier &verifier) {
95+
inline bool VerifyAnimalBuffer(::flatbuffers::Verifier& verifier) {
11096
return verifier.VerifyBuffer<com::fbs::app::Animal>(nullptr);
11197
}
11298

113-
inline bool VerifySizePrefixedAnimalBuffer(
114-
::flatbuffers::Verifier &verifier) {
99+
inline bool VerifySizePrefixedAnimalBuffer(::flatbuffers::Verifier& verifier) {
115100
return verifier.VerifySizePrefixedBuffer<com::fbs::app::Animal>(nullptr);
116101
}
117102

118103
inline void FinishAnimalBuffer(
119-
::flatbuffers::FlatBufferBuilder &fbb,
104+
::flatbuffers::FlatBufferBuilder& fbb,
120105
::flatbuffers::Offset<com::fbs::app::Animal> root) {
121106
fbb.Finish(root);
122107
}
123108

124109
inline void FinishSizePrefixedAnimalBuffer(
125-
::flatbuffers::FlatBufferBuilder &fbb,
110+
::flatbuffers::FlatBufferBuilder& fbb,
126111
::flatbuffers::Offset<com::fbs::app::Animal> root) {
127112
fbb.FinishSizePrefixed(root);
128113
}

‎android/app/src/main/java/com/flatbuffers/app/MainActivity.kt‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.flatbuffers.app
22

33
import android.annotation.SuppressLint
4-
import androidx.appcompat.app.AppCompatActivity
54
import android.os.Bundle
65
import android.widget.TextView
6+
import androidx.appcompat.app.AppCompatActivity
77
import com.fbs.app.Animal
88
import com.google.flatbuffers.FlatBufferBuilder
99
import java.nio.ByteBuffer
@@ -27,14 +27,15 @@ class MainActivity : AppCompatActivity() {
2727
private external fun createAnimalFromJNI(): ByteArray
2828

2929
// Create a "Cow" Animal flatbuffers from Kotlin
30-
private fun createAnimalFromKotlin():Animal {
30+
private fun createAnimalFromKotlin(): Animal {
3131
val fb = FlatBufferBuilder(100)
32-
val cowOffset = Animal.createAnimal(
33-
builder = fb,
34-
nameOffset = fb.createString("Cow"),
35-
soundOffset = fb.createString("Moo"),
36-
weight = 720u
37-
)
32+
val cowOffset =
33+
Animal.createAnimal(
34+
builder = fb,
35+
nameOffset = fb.createString("Cow"),
36+
soundOffset = fb.createString("Moo"),
37+
weight = 720u,
38+
)
3839
fb.finish(cowOffset)
3940
return Animal.getRootAsAnimal(fb.dataBuffer())
4041
}

‎android/app/src/main/java/generated/com/fbs/app/Animal.kt‎

Lines changed: 84 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,101 @@
22

33
package com.fbs.app
44

5-
import com.google.flatbuffers.BaseVector
6-
import com.google.flatbuffers.BooleanVector
7-
import com.google.flatbuffers.ByteVector
85
import com.google.flatbuffers.Constants
9-
import com.google.flatbuffers.DoubleVector
106
import com.google.flatbuffers.FlatBufferBuilder
11-
import com.google.flatbuffers.FloatVector
12-
import com.google.flatbuffers.LongVector
13-
import com.google.flatbuffers.StringVector
14-
import com.google.flatbuffers.Struct
157
import com.google.flatbuffers.Table
16-
import com.google.flatbuffers.UnionVector
178
import java.nio.ByteBuffer
189
import java.nio.ByteOrder
19-
import kotlin.math.sign
2010

2111
@Suppress("unused")
2212
@kotlin.ExperimentalUnsignedTypes
2313
class Animal : Table() {
2414

25-
fun __init(_i: Int, _bb: ByteBuffer) {
26-
__reset(_i, _bb)
15+
fun __init(_i: Int, _bb: ByteBuffer) {
16+
__reset(_i, _bb)
17+
}
18+
19+
fun __assign(_i: Int, _bb: ByteBuffer): Animal {
20+
__init(_i, _bb)
21+
return this
22+
}
23+
24+
val name: String?
25+
get() {
26+
val o = __offset(4)
27+
return if (o != 0) {
28+
__string(o + bb_pos)
29+
} else {
30+
null
31+
}
32+
}
33+
34+
val nameAsByteBuffer: ByteBuffer
35+
get() = __vector_as_bytebuffer(4, 1)
36+
37+
fun nameInByteBuffer(_bb: ByteBuffer): ByteBuffer = __vector_in_bytebuffer(_bb, 4, 1)
38+
39+
val sound: String?
40+
get() {
41+
val o = __offset(6)
42+
return if (o != 0) {
43+
__string(o + bb_pos)
44+
} else {
45+
null
46+
}
47+
}
48+
49+
val soundAsByteBuffer: ByteBuffer
50+
get() = __vector_as_bytebuffer(6, 1)
51+
52+
fun soundInByteBuffer(_bb: ByteBuffer): ByteBuffer = __vector_in_bytebuffer(_bb, 6, 1)
53+
54+
val weight: UShort
55+
get() {
56+
val o = __offset(8)
57+
return if (o != 0) bb.getShort(o + bb_pos).toUShort() else 0u
58+
}
59+
60+
companion object {
61+
fun validateVersion() = Constants.FLATBUFFERS_25_2_10()
62+
63+
fun getRootAsAnimal(_bb: ByteBuffer): Animal = getRootAsAnimal(_bb, Animal())
64+
65+
fun getRootAsAnimal(_bb: ByteBuffer, obj: Animal): Animal {
66+
_bb.order(ByteOrder.LITTLE_ENDIAN)
67+
return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb))
2768
}
28-
fun __assign(_i: Int, _bb: ByteBuffer) : Animal {
29-
__init(_i, _bb)
30-
return this
69+
70+
fun createAnimal(
71+
builder: FlatBufferBuilder,
72+
nameOffset: Int,
73+
soundOffset: Int,
74+
weight: UShort,
75+
): Int {
76+
builder.startTable(3)
77+
addSound(builder, soundOffset)
78+
addName(builder, nameOffset)
79+
addWeight(builder, weight)
80+
return endAnimal(builder)
3181
}
32-
val name : String?
33-
get() {
34-
val o = __offset(4)
35-
return if (o != 0) {
36-
__string(o + bb_pos)
37-
} else {
38-
null
39-
}
40-
}
41-
val nameAsByteBuffer : ByteBuffer get() = __vector_as_bytebuffer(4, 1)
42-
fun nameInByteBuffer(_bb: ByteBuffer) : ByteBuffer = __vector_in_bytebuffer(_bb, 4, 1)
43-
val sound : String?
44-
get() {
45-
val o = __offset(6)
46-
return if (o != 0) {
47-
__string(o + bb_pos)
48-
} else {
49-
null
50-
}
51-
}
52-
val soundAsByteBuffer : ByteBuffer get() = __vector_as_bytebuffer(6, 1)
53-
fun soundInByteBuffer(_bb: ByteBuffer) : ByteBuffer = __vector_in_bytebuffer(_bb, 6, 1)
54-
val weight : UShort
55-
get() {
56-
val o = __offset(8)
57-
return if(o != 0) bb.getShort(o + bb_pos).toUShort() else 0u
58-
}
59-
companion object {
60-
fun validateVersion() = Constants.FLATBUFFERS_25_2_10()
61-
fun getRootAsAnimal(_bb: ByteBuffer): Animal = getRootAsAnimal(_bb, Animal())
62-
fun getRootAsAnimal(_bb: ByteBuffer, obj: Animal): Animal {
63-
_bb.order(ByteOrder.LITTLE_ENDIAN)
64-
return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb))
65-
}
66-
fun createAnimal(builder: FlatBufferBuilder, nameOffset: Int, soundOffset: Int, weight: UShort) : Int {
67-
builder.startTable(3)
68-
addSound(builder, soundOffset)
69-
addName(builder, nameOffset)
70-
addWeight(builder, weight)
71-
return endAnimal(builder)
72-
}
73-
fun startAnimal(builder: FlatBufferBuilder) = builder.startTable(3)
74-
fun addName(builder: FlatBufferBuilder, name: Int) = builder.addOffset(0, name, 0)
75-
fun addSound(builder: FlatBufferBuilder, sound: Int) = builder.addOffset(1, sound, 0)
76-
fun addWeight(builder: FlatBufferBuilder, weight: UShort) = builder.addShort(2, weight.toShort(), 0)
77-
fun endAnimal(builder: FlatBufferBuilder) : Int {
78-
val o = builder.endTable()
79-
return o
80-
}
81-
fun finishAnimalBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finish(offset)
82-
fun finishSizePrefixedAnimalBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finishSizePrefixed(offset)
82+
83+
fun startAnimal(builder: FlatBufferBuilder) = builder.startTable(3)
84+
85+
fun addName(builder: FlatBufferBuilder, name: Int) = builder.addOffset(0, name, 0)
86+
87+
fun addSound(builder: FlatBufferBuilder, sound: Int) = builder.addOffset(1, sound, 0)
88+
89+
fun addWeight(builder: FlatBufferBuilder, weight: UShort) =
90+
builder.addShort(2, weight.toShort(), 0)
91+
92+
fun endAnimal(builder: FlatBufferBuilder): Int {
93+
val o = builder.endTable()
94+
return o
8395
}
96+
97+
fun finishAnimalBuffer(builder: FlatBufferBuilder, offset: Int) = builder.finish(offset)
98+
99+
fun finishSizePrefixedAnimalBuffer(builder: FlatBufferBuilder, offset: Int) =
100+
builder.finishSizePrefixed(offset)
101+
}
84102
}

‎benchmarks/cpp/bench.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ struct Bench {
88

99
inline void Add(int64_t value) { sum += value; }
1010

11-
virtual uint8_t *Encode(void *buf, int64_t &len) = 0;
12-
virtual void *Decode(void *buf, int64_t len) = 0;
13-
virtual int64_t Use(void *decoded) = 0;
14-
virtual void Dealloc(void *decoded) = 0;
11+
virtual uint8_t* Encode(void* buf, int64_t& len) = 0;
12+
virtual void* Decode(void* buf, int64_t len) = 0;
13+
virtual int64_t Use(void* decoded) = 0;
14+
virtual void Dealloc(void* decoded) = 0;
1515

1616
int64_t sum = 0;
1717
};
1818

19-
#endif // BENCHMARKS_CPP_BENCH_H_
19+
#endif // BENCHMARKS_CPP_BENCH_H_

0 commit comments

Comments
 (0)