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

Mass Refactoring to use IsString and other BASE_TYPE helpers (#6193)

Browse Source 
* Updated SupportsAdvancedUnionFeatures to look out for string

* Mass refactoring to use BASE_TYPE helper functions.

Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2020-10-20 08:00:31 -07:00
committed by GitHub
parent 8f6fa4b715
commit fe8e3c7e5d
15 changed files with 125 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/idl_gen_swift.cpp
View File

@@ -508,8 +508,8 @@ class SwiftGenerator : public BaseGenerator {
code_.SetValue("OFFSET", name);
code_.SetValue("CONSTANT", field.value.constant);
std::string check_if_vector =
(field.value.type.base_type == BASE_TYPE_VECTOR ||
field.value.type.base_type == BASE_TYPE_ARRAY)
(IsVector(field.value.type) ||
IsArray(field.value.type))
? "VectorOf("
: "(";
auto body = "add" + check_if_vector + name + ": ";
@@ -565,12 +565,12 @@ class SwiftGenerator : public BaseGenerator {
return;
}
auto offset_type = field.value.type.base_type == BASE_TYPE_STRING
auto offset_type = IsString(field.value.type)
? "Offset<String>"
: "Offset<UOffset>";
auto camel_case_name =
(field.value.type.base_type == BASE_TYPE_VECTOR ||
field.value.type.base_type == BASE_TYPE_ARRAY
(IsVector(field.value.type) ||
IsArray(field.value.type)
? "vectorOf"
: "offsetOf") +
MakeCamel(name, true);
@@ -586,8 +586,8 @@ class SwiftGenerator : public BaseGenerator {
if ((vectortype.base_type == BASE_TYPE_STRUCT &&
field.value.type.struct_def->fixed) &&
(field.value.type.base_type == BASE_TYPE_VECTOR ||
field.value.type.base_type == BASE_TYPE_ARRAY)) {
(IsVector(field.value.type) ||
IsArray(field.value.type))) {
auto field_name = NameWrappedInNameSpace(*vectortype.struct_def);
code_ += "public static func startVectorOf" + MakeCamel(name, true) +
"(_ size: Int, in builder: inout "
@@ -738,7 +738,7 @@ class SwiftGenerator : public BaseGenerator {
return;
}
if (vectortype.base_type == BASE_TYPE_STRING) {
if (IsString(vectortype)) {
code_ +=
"{{ACCESS}}.directString(at: {{ACCESS}}.vector(at: o) + "
"index * {{SIZE}}) }";
@@ -915,8 +915,8 @@ class SwiftGenerator : public BaseGenerator {
auto name = Name(field);
auto type = GenType(field.value.type);
std::string check_if_vector =
(field.value.type.base_type == BASE_TYPE_VECTOR ||
field.value.type.base_type == BASE_TYPE_ARRAY)
(IsVector(field.value.type) ||
IsArray(field.value.type))
? "VectorOf("
: "(";
std::string body = "add" + check_if_vector + name + ": ";
@@ -1192,7 +1192,7 @@ class SwiftGenerator : public BaseGenerator {
}
case BASE_TYPE_UTYPE: break;
default: {
code_.SetValue("VALUETYPE", (vectortype.base_type == BASE_TYPE_STRING
code_.SetValue("VALUETYPE", (IsString(vectortype)
? "String?"
: GenType(vectortype)));
code_ += "{{ACCESS_TYPE}} var {{VALUENAME}}: [{{VALUETYPE}}]";
@@ -1224,7 +1224,7 @@ class SwiftGenerator : public BaseGenerator {
auto type = GenType(field.union_type);
if (field.union_type.base_type == BASE_TYPE_NONE ||
field.union_type.base_type == BASE_TYPE_STRING) {
IsString(field.union_type)) {
continue;
}
code_ += "case ." + ev_name + ":";
@@ -1254,7 +1254,7 @@ class SwiftGenerator : public BaseGenerator {
auto field = **it;
auto ev_name = Name(field);
if (field.union_type.base_type == BASE_TYPE_NONE ||
field.union_type.base_type == BASE_TYPE_STRING) {
IsString(field.union_type)) {
continue;
}
buffer_constructor.push_back(indentation + "case ." + ev_name + ":");
@@ -1291,7 +1291,7 @@ class SwiftGenerator : public BaseGenerator {
"fbb: "
"ByteBuffer) -> {{VALUENAME}}? {";
Indent();
if (key_field.value.type.base_type == BASE_TYPE_STRING)
if (IsString(key_field.value.type))
code_ += "let key = key.utf8.map { $0 }";
code_ += "var span = fbb.read(def: Int32.self, position: Int(vector - 4))";
code_ += "var start: Int32 = 0";
@@ -1300,7 +1300,7 @@ class SwiftGenerator : public BaseGenerator {
code_ += "var middle = span / 2";
code_ +=
"let tableOffset = Table.indirect(vector + 4 * (start + middle), fbb)";
if (key_field.value.type.base_type == BASE_TYPE_STRING) {
if (IsString(key_field.value.type)) {
code_ += "let comp = Table.compare(" + offset_reader + ", key, fbb: fbb)";
} else {
code_ += "let comp = fbb.read(def: {{TYPE}}.self, position: Int(" +