Skip to content

Commit 3e65b4d

Browse files
committed
Code gen harmonize
1 parent 924b424 commit 3e65b4d

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

tests/ts/TypeScriptTest.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def flatc(options, schema, prefix=None, include=None, data=None, cwd=tests_path)
6161

6262
print("Invoking flatc...")
6363
flatc(
64-
options=["--ts", "--gen-name-strings", "--gen-mutable", "--gen-object-api"],
64+
options=["--ts", "--reflect-names", "--gen-name-strings", "--gen-mutable", "--gen-object-api"],
6565
schema="../monster_test.fbs",
6666
include="../include_test",
6767
)
@@ -74,18 +74,18 @@ def flatc(options, schema, prefix=None, include=None, data=None, cwd=tests_path)
7474
)
7575

7676
flatc(
77-
options=["--ts", "--gen-name-strings", "--gen-mutable", "--gen-object-api"],
77+
options=["--ts", "--reflect-names", "--gen-name-strings", "--gen-mutable", "--gen-object-api"],
7878
schema="../union_vector/union_vector.fbs",
7979
prefix="union_vector",
8080
)
8181

8282
flatc(
83-
options=["--ts", "--gen-name-strings"],
83+
options=["--ts", "--reflect-names", "--gen-name-strings"],
8484
schema="../optional_scalars.fbs",
8585
)
8686

8787
flatc(
88-
options=["--ts", "--gen-name-strings", "--gen-mutable", "--gen-object-api"],
88+
options=["--ts", "--reflect-names", "--gen-name-strings", "--gen-mutable", "--gen-object-api"],
8989
schema=[
9090
"typescript_keywords.fbs",
9191
"test_dir/typescript_include.fbs",
@@ -98,6 +98,7 @@ def flatc(options, schema, prefix=None, include=None, data=None, cwd=tests_path)
9898
flatc(
9999
options=[
100100
"--ts",
101+
"--reflect-names",
101102
"--gen-name-strings",
102103
"--gen-mutable",
103104
"--gen-object-api",

tests/union_vector/union_vector_generated.h

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) Rapunzel FLATBUFFERS_FINAL_CLASS {
356356
static const flatbuffers::TypeTable *MiniReflectTypeTable() {
357357
return RapunzelTypeTable();
358358
}
359-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
360-
return "Rapunzel";
361-
}
362359
Rapunzel()
363360
: hair_length_(0) {
364361
}
@@ -392,9 +389,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) BookReader FLATBUFFERS_FINAL_CLASS {
392389
static const flatbuffers::TypeTable *MiniReflectTypeTable() {
393390
return BookReaderTypeTable();
394391
}
395-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
396-
return "BookReader";
397-
}
398392
BookReader()
399393
: books_read_(0) {
400394
}
@@ -428,9 +422,6 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(4) FallingTub FLATBUFFERS_FINAL_CLASS {
428422
static const flatbuffers::TypeTable *MiniReflectTypeTable() {
429423
return FallingTubTypeTable();
430424
}
431-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
432-
return "FallingTub";
433-
}
434425
FallingTub()
435426
: weight_(0) {
436427
}
@@ -458,9 +449,6 @@ inline bool operator!=(const FallingTub &lhs, const FallingTub &rhs) {
458449

459450
struct AttackerT : public flatbuffers::NativeTable {
460451
typedef Attacker TableType;
461-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
462-
return "AttackerT";
463-
}
464452
int32_t sword_attack_damage = 0;
465453
};
466454

@@ -470,9 +458,6 @@ struct Attacker FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
470458
static const flatbuffers::TypeTable *MiniReflectTypeTable() {
471459
return AttackerTypeTable();
472460
}
473-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
474-
return "Attacker";
475-
}
476461
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
477462
VT_SWORD_ATTACK_DAMAGE = 4
478463
};
@@ -522,9 +507,6 @@ flatbuffers::Offset<Attacker> CreateAttacker(flatbuffers::FlatBufferBuilder &_fb
522507

523508
struct HandFanT : public flatbuffers::NativeTable {
524509
typedef HandFan TableType;
525-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
526-
return "HandFanT";
527-
}
528510
int32_t length = 0;
529511
};
530512

@@ -534,9 +516,6 @@ struct HandFan FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
534516
static const flatbuffers::TypeTable *MiniReflectTypeTable() {
535517
return HandFanTypeTable();
536518
}
537-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
538-
return "HandFan";
539-
}
540519
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
541520
VT_LENGTH = 4
542521
};
@@ -586,9 +565,6 @@ flatbuffers::Offset<HandFan> CreateHandFan(flatbuffers::FlatBufferBuilder &_fbb,
586565

587566
struct MovieT : public flatbuffers::NativeTable {
588567
typedef Movie TableType;
589-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
590-
return "MovieT";
591-
}
592568
CharacterUnion main_character{};
593569
std::vector<CharacterUnion> characters{};
594570
};
@@ -599,9 +575,6 @@ struct Movie FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
599575
static const flatbuffers::TypeTable *MiniReflectTypeTable() {
600576
return MovieTypeTable();
601577
}
602-
static FLATBUFFERS_CONSTEXPR_CPP11 const char *GetFullyQualifiedName() {
603-
return "Movie";
604-
}
605578
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
606579
VT_MAIN_CHARACTER_TYPE = 4,
607580
VT_MAIN_CHARACTER = 6,

0 commit comments

Comments
 (0)