Skip to content

Commit 3218ab2

Browse files
committed
update generated code -- seems to be a bug in ts that I need to chase down
1 parent 2e97ecd commit 3218ab2

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

include/flatbuffers/reflection_generated.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct SchemaFileBuilder;
4545
struct Schema;
4646
struct SchemaBuilder;
4747

48-
enum BaseType : int8_t {
48+
enum BaseType {
4949
None = 0,
5050
UType = 1,
5151
Bool = 2,
@@ -128,7 +128,7 @@ inline const char *EnumNameBaseType(BaseType e) {
128128
}
129129

130130
/// New schema language features that are not supported by old code generators.
131-
enum AdvancedFeatures : uint64_t {
131+
enum AdvancedFeatures {
132132
AdvancedArrayFeatures = 1ULL,
133133
AdvancedUnionFeatures = 2ULL,
134134
OptionalScalars = 4ULL,

java/src/main/java/com/google/flatbuffers/reflection/Field.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ public final class Field extends Table {
5959
* If the field uses 64-bit offsets.
6060
*/
6161
public boolean offset64() { int o = __offset(30); return o != 0 ? 0!=bb.get(o + bb_pos) : false; }
62+
public String defaultNonScalar() { int o = __offset(32); return o != 0 ? __string(o + bb_pos) : null; }
63+
public ByteBuffer defaultNonScalarAsByteBuffer() { return __vector_as_bytebuffer(32, 1); }
64+
public ByteBuffer defaultNonScalarInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 32, 1); }
6265

6366
public static int createField(FlatBufferBuilder builder,
6467
int nameOffset,
@@ -74,10 +77,12 @@ public static int createField(FlatBufferBuilder builder,
7477
int documentationOffset,
7578
boolean optional,
7679
int padding,
77-
boolean offset64) {
78-
builder.startTable(14);
80+
boolean offset64,
81+
int defaultNonScalarOffset) {
82+
builder.startTable(15);
7983
Field.addDefaultReal(builder, defaultReal);
8084
Field.addDefaultInteger(builder, defaultInteger);
85+
Field.addDefaultNonScalar(builder, defaultNonScalarOffset);
8186
Field.addDocumentation(builder, documentationOffset);
8287
Field.addAttributes(builder, attributesOffset);
8388
Field.addType(builder, typeOffset);
@@ -93,7 +98,7 @@ public static int createField(FlatBufferBuilder builder,
9398
return Field.endField(builder);
9499
}
95100

96-
public static void startField(FlatBufferBuilder builder) { builder.startTable(14); }
101+
public static void startField(FlatBufferBuilder builder) { builder.startTable(15); }
97102
public static void addName(FlatBufferBuilder builder, int nameOffset) { builder.addOffset(nameOffset); builder.slot(0); }
98103
public static void addType(FlatBufferBuilder builder, int typeOffset) { builder.addOffset(1, typeOffset, 0); }
99104
public static void addId(FlatBufferBuilder builder, int id) { builder.addShort(2, (short) id, (short) 0); }
@@ -112,6 +117,7 @@ public static int createField(FlatBufferBuilder builder,
112117
public static void addOptional(FlatBufferBuilder builder, boolean optional) { builder.addBoolean(11, optional, false); }
113118
public static void addPadding(FlatBufferBuilder builder, int padding) { builder.addShort(12, (short) padding, (short) 0); }
114119
public static void addOffset64(FlatBufferBuilder builder, boolean offset64) { builder.addBoolean(13, offset64, false); }
120+
public static void addDefaultNonScalar(FlatBufferBuilder builder, int defaultNonScalarOffset) { builder.addOffset(14, defaultNonScalarOffset, 0); }
115121
public static int endField(FlatBufferBuilder builder) {
116122
int o = builder.endTable();
117123
builder.required(o, 4); // name

python/flatbuffers/reflection/Field.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,15 @@ def Offset64(self):
163163
return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos))
164164
return False
165165

166+
# Field
167+
def DefaultNonScalar(self):
168+
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(32))
169+
if o != 0:
170+
return self._tab.String(o + self._tab.Pos)
171+
return None
172+
166173
def FieldStart(builder):
167-
builder.StartObject(14)
174+
builder.StartObject(15)
168175

169176
def Start(builder):
170177
FieldStart(builder)
@@ -265,6 +272,12 @@ def FieldAddOffset64(builder, offset64):
265272
def AddOffset64(builder, offset64):
266273
FieldAddOffset64(builder, offset64)
267274

275+
def FieldAddDefaultNonScalar(builder, defaultNonScalar):
276+
builder.PrependUOffsetTRelativeSlot(14, flatbuffers.number_types.UOffsetTFlags.py_type(defaultNonScalar), 0)
277+
278+
def AddDefaultNonScalar(builder, defaultNonScalar):
279+
FieldAddDefaultNonScalar(builder, defaultNonScalar)
280+
268281
def FieldEnd(builder):
269282
return builder.EndObject()
270283

0 commit comments

Comments
 (0)