BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 04:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix union unpacking (#8748)

Browse Source
This commit is contained in:
Jakob Kordež
2025-10-31 17:58:30 +01:00
committed by GitHub
parent 4c0eecd25a
commit 4b09586652
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dart/test/keyword_test_keyword_test_generated.dart
View File

@@ -276,7 +276,7 @@ class Table2 {
Table2T unpack() => Table2T(
typeType: typeType,
type: type);
type: type?.unpack());
static int pack(fb.Builder fbBuilder, Table2T? object) {
if (object == null) return 0;

6
dart/test/monster_test_my_game.example_generated.dart
View File

@@ -1337,7 +1337,7 @@ class Monster {
).vTableGetNullable(_bc, _bcOffset, 14),
color: color,
testType: testType,
test: test,
test: test?.unpack(),
test4: test4?.map((e) => e.unpack()).toList(),
testarrayofstring: const fb.ListReader<String>(
fb.StringReader(),
@@ -1405,9 +1405,9 @@ class Monster {
lazy: false,
).vTableGetNullable(_bc, _bcOffset, 88),
anyUniqueType: anyUniqueType,
anyUnique: anyUnique,
anyUnique: anyUnique?.unpack(),
anyAmbiguousType: anyAmbiguousType,
anyAmbiguous: anyAmbiguous,
anyAmbiguous: anyAmbiguous?.unpack(),
vectorOfEnums: const fb.ListReader<Color>(
Color.reader,
lazy: false,

3
src/idl_gen_dart.cpp
View File

@@ -606,7 +606,8 @@ class DartGenerator : public BaseGenerator {
std::string defaultValue = getDefaultValue(field.value);
bool isNullable = defaultValue.empty() && !struct_def.fixed;
std::string nullableValueAccessOperator = isNullable ? "?" : "";
if (type.base_type == BASE_TYPE_STRUCT) {
if (type.base_type == BASE_TYPE_STRUCT ||
type.base_type == BASE_TYPE_UNION) {
constructor_args +=
field_name + nullableValueAccessOperator + ".unpack()";
} else if (type.base_type == BASE_TYPE_VECTOR) {

6
tests/monster_test_my_game.example_generated.dart
View File

@@ -1213,7 +1213,7 @@ class Monster {
inventory: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 14),
color: color,
testType: testType,
test: test,
test: test?.unpack(),
test4: test4?.map((e) => e.unpack()).toList(),
testarrayofstring: const fb.ListReader<String>(fb.StringReader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 24),
testarrayoftables: testarrayoftables?.map((e) => e.unpack()).toList(),
@@ -1249,9 +1249,9 @@ class Monster {
nonOwningReference: nonOwningReference,
vectorOfNonOwningReferences: const fb.ListReader<int>(fb.Uint64Reader(), lazy: false).vTableGetNullable(_bc, _bcOffset, 88),
anyUniqueType: anyUniqueType,
anyUnique: anyUnique,
anyUnique: anyUnique?.unpack(),
anyAmbiguousType: anyAmbiguousType,
anyAmbiguous: anyAmbiguous,
anyAmbiguous: anyAmbiguous?.unpack(),
vectorOfEnums: const fb.ListReader<Color>(Color.reader, lazy: false).vTableGetNullable(_bc, _bcOffset, 98),
signedEnum: signedEnum,
testrequirednestedflatbuffer: const fb.Uint8ListReader(lazy: false).vTableGetNullable(_bc, _bcOffset, 102),