Skip to content

Commit 43ceaf7

Browse files
Jens-GJens-G
committed
THRIFT-3043 go compiler generator uses non C++98 code
Client: Go Patch: Jens Geyer
1 parent 65cf6c1 commit 43ceaf7

File tree

1 file changed

+47
-15
lines changed

1 file changed

+47
-15
lines changed

‎compiler/cpp/src/generate/t_go_generator.cc

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,12 @@ class t_go_generator : public t_generator {
293293
std::string package_name_;
294294
std::string package_dir_;
295295

296-
static std::string camelcase(const std::string& value);
297-
static std::string publicize(const std::string& value, bool is_args_or_result = false);
298-
static std::string new_prefix(const std::string& value);
299-
static std::string privatize(const std::string& value);
296+
std::set<std::string> commonInitialisms;
297+
298+
std::string camelcase(const std::string& value) const;
299+
std::string publicize(const std::string& value, bool is_args_or_result = false) const;
300+
std::string privatize(const std::string& value) const;
301+
std::string new_prefix(const std::string& value) const;
300302
static std::string variable_name_to_go_name(const std::string& value);
301303
static bool is_pointer_field(t_field* tfield, bool in_container = false);
302304
static bool omit_initialization(t_field* tfield);
@@ -408,14 +410,7 @@ bool t_go_generator::is_pointer_field(t_field* tfield, bool in_container_value)
408410
throw "INVALID TYPE IN type_to_go_type: " + type->get_name();
409411
}
410412

411-
// This set is taken from https://github.com/golang/lint/blob/master/lint.go#L692
412-
const std::set<std::string> commonInitialisms = {"API", "ASCII", "CPU", "CSS",
413-
"DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "LHS",
414-
"QPS", "RAM", "RHS", "RPC", "SLA", "SMTP", "SSH", "TCP", "TLS", "TTL", "UDP",
415-
"UI", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XSRF", "XSS",};
416-
417-
std::string t_go_generator::camelcase(const std::string& value) {
418-
413+
std::string t_go_generator::camelcase(const std::string& value) const {
419414
std::string value2(value);
420415
std::setlocale(LC_ALL, "C"); // set locale to classic
421416

@@ -436,7 +431,7 @@ std::string t_go_generator::camelcase(const std::string& value) {
436431
return value2;
437432
}
438433

439-
std::string t_go_generator::publicize(const std::string& value, bool is_args_or_result) {
434+
std::string t_go_generator::publicize(const std::string& value, bool is_args_or_result) const {
440435
if (value.size() <= 0) {
441436
return value;
442437
}
@@ -479,7 +474,7 @@ std::string t_go_generator::publicize(const std::string& value, bool is_args_or_
479474
return prefix + value2;
480475
}
481476

482-
std::string t_go_generator::new_prefix(const std::string& value) {
477+
std::string t_go_generator::new_prefix(const std::string& value) const {
483478
if (value.size() <= 0) {
484479
return value;
485480
}
@@ -491,7 +486,7 @@ std::string t_go_generator::new_prefix(const std::string& value) {
491486
return "New" + publicize(value);
492487
}
493488

494-
std::string t_go_generator::privatize(const std::string& value) {
489+
std::string t_go_generator::privatize(const std::string& value) const {
495490
if (value.size() <= 0) {
496491
return value;
497492
}
@@ -639,6 +634,43 @@ void t_go_generator::init_generator() {
639634
string target = module;
640635
package_dir_ = get_out_dir();
641636

637+
// This set is taken from https://github.com/golang/lint/blob/master/lint.go#L692
638+
commonInitialisms.insert("API");
639+
commonInitialisms.insert("ASCII");
640+
commonInitialisms.insert("CPU");
641+
commonInitialisms.insert("CSS");
642+
commonInitialisms.insert("DNS");
643+
commonInitialisms.insert("EOF");
644+
commonInitialisms.insert("GUID");
645+
commonInitialisms.insert("HTML");
646+
commonInitialisms.insert("HTTP");
647+
commonInitialisms.insert("HTTPS");
648+
commonInitialisms.insert("ID");
649+
commonInitialisms.insert("IP");
650+
commonInitialisms.insert("JSON");
651+
commonInitialisms.insert("LHS");
652+
commonInitialisms.insert("QPS");
653+
commonInitialisms.insert("RAM");
654+
commonInitialisms.insert("RHS");
655+
commonInitialisms.insert("RPC");
656+
commonInitialisms.insert("SLA");
657+
commonInitialisms.insert("SMTP");
658+
commonInitialisms.insert("SSH");
659+
commonInitialisms.insert("TCP");
660+
commonInitialisms.insert("TLS");
661+
commonInitialisms.insert("TTL");
662+
commonInitialisms.insert("UDP");
663+
commonInitialisms.insert("UI");
664+
commonInitialisms.insert("UID");
665+
commonInitialisms.insert("UUID");
666+
commonInitialisms.insert("URI");
667+
commonInitialisms.insert("URL");
668+
commonInitialisms.insert("UTF8");
669+
commonInitialisms.insert("VM");
670+
commonInitialisms.insert("XML");
671+
commonInitialisms.insert("XSRF");
672+
commonInitialisms.insert("XSS");
673+
642674
while (true) {
643675
// TODO: Do better error checking here.
644676
MKDIR(package_dir_.c_str());

0 commit comments

Comments
 (0)