THRIFT-2311 Go: invalid code generated when exception name is a go keyword
Patch: Krzysztof Godlewski
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index bf1a03a..f3d9100 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -1746,9 +1746,12 @@
vector<t_field*>::const_iterator x_iter;
for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
+ const std::string varname = variable_name_to_go_name((*x_iter)->get_name());
+ const std::string pubname = publicize(varname);
+
f_service_ <<
- indent() << "if " << result << "." << publicize((*x_iter)->get_name()) << " != nil {" << endl <<
- indent() << " " << (*x_iter)->get_name() << " = " << result << "." << publicize((*x_iter)->get_name()) << endl <<
+ indent() << "if " << result << "." << pubname << " != nil {" << endl <<
+ indent() << " " << varname << " = " << result << "." << pubname << endl <<
indent() << "}" << endl;
}