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

GO: add _ postfix to identiy conflict golang keyword (#4221)

Browse Source 
* add _ postfix to identiy conflict golang keyword

* make VS2010 happy
This commit is contained in:
Flier Lu
2017-03-16 09:34:53 +08:00
committed by Wouter van Oortmerssen
parent d9bc5ec047
commit 4cd71d67f1
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/idl_gen_go.cpp
View File

@@ -35,6 +35,13 @@
namespace flatbuffers { namespace flatbuffers {
namespace go { namespace go {
// see https://golang.org/ref/spec#Keywords
static const char *g_golang_keywords[] = {
"break", "default", "func", "interface", "select", "case", "defer", "go",
"map", "struct", "chan", "else", "goto", "package", "switch", "const",
"fallthrough", "if", "range", "type", "continue", "for", "import", "return", "var",
};
static std::string GenGetter(const Type &type); static std::string GenGetter(const Type &type);
static std::string GenMethod(const FieldDef &field); static std::string GenMethod(const FieldDef &field);
static void GenStructBuilder(const StructDef &struct_def, static void GenStructBuilder(const StructDef &struct_def,
@@ -43,6 +50,15 @@ static void GenReceiver(const StructDef &struct_def, std::string *code_ptr);
static std::string GenTypeBasic(const Type &type); static std::string GenTypeBasic(const Type &type);
static std::string GenTypeGet(const Type &type); static std::string GenTypeGet(const Type &type);
static std::string TypeName(const FieldDef &field); static std::string TypeName(const FieldDef &field);
static std::string GoIdentity(const std::string& name) {
for (size_t i=0; i<sizeof(g_golang_keywords)/sizeof(g_golang_keywords[0]); i++) {
if (name == g_golang_keywords[i]) {
return MakeCamel(name + "_", false);
}
}
return MakeCamel(name, false);
}
// Most field accessors need to retrieve and test the field offset first, // Most field accessors need to retrieve and test the field offset first,
@@ -368,7 +384,7 @@ static void StructBuilderArgs(const StructDef &struct_def,
} else { } else {
std::string &code = *code_ptr; std::string &code = *code_ptr;
code += (std::string)", " + nameprefix; code += (std::string)", " + nameprefix;
code += MakeCamel(field.name, false); code += GoIdentity(field.name);
code += " " + GenTypeBasic(field.value.type); code += " " + GenTypeBasic(field.value.type);
} }
} }
@@ -400,7 +416,7 @@ static void StructBuilderBody(const StructDef &struct_def,
code_ptr); code_ptr);
} else { } else {
code += "\tbuilder.Prepend" + GenMethod(field) + "("; code += "\tbuilder.Prepend" + GenMethod(field) + "(";
code += nameprefix + MakeCamel(field.name, false) + ")\n"; code += nameprefix + GoIdentity(field.name) + ")\n";
} }
} }
} }
@@ -430,7 +446,7 @@ static void BuildFieldOfTable(const StructDef &struct_def,
std::string &code = *code_ptr; std::string &code = *code_ptr;
code += "func " + struct_def.name + "Add" + MakeCamel(field.name); code += "func " + struct_def.name + "Add" + MakeCamel(field.name);
code += "(builder *flatbuffers.Builder, "; code += "(builder *flatbuffers.Builder, ";
code += MakeCamel(field.name, false) + " "; code += GoIdentity(field.name) + " ";
if (!IsScalar(field.value.type.base_type) && (!struct_def.fixed)) { if (!IsScalar(field.value.type.base_type) && (!struct_def.fixed)) {
code += "flatbuffers.UOffsetT"; code += "flatbuffers.UOffsetT";
} else { } else {
@@ -443,9 +459,9 @@ static void BuildFieldOfTable(const StructDef &struct_def,
if (!IsScalar(field.value.type.base_type) && (!struct_def.fixed)) { if (!IsScalar(field.value.type.base_type) && (!struct_def.fixed)) {
code += "flatbuffers.UOffsetT"; code += "flatbuffers.UOffsetT";
code += "("; code += "(";
code += MakeCamel(field.name, false) + ")"; code += GoIdentity(field.name) + ")";
} else { } else {
code += MakeCamel(field.name, false); code += GoIdentity(field.name);
} }
code += ", " + field.value.constant; code += ", " + field.value.constant;
code += ")\n}\n"; code += ")\n}\n";