You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by je...@apache.org on 2015/03/07 14:28:56 UTC
[3/3] thrift git commit: THRIFT-3023 Go compiler is a little overly
conservative with names of attributes Client: Go Patch: Paul Magrath
THRIFT-3023 Go compiler is a little overly conservative with names of attributes
Client: Go
Patch: Paul Magrath <pa...@swiftkey.com>
This closes #389
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/28c1c19f
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/28c1c19f
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/28c1c19f
Branch: refs/heads/master
Commit: 28c1c19f913a4bee97a8309cf4b65914f705faea
Parents: c7cf379
Author: Jens Geyer <je...@apache.org>
Authored: Sat Mar 7 14:18:01 2015 +0100
Committer: Jens Geyer <je...@apache.org>
Committed: Sat Mar 7 14:25:00 2015 +0100
----------------------------------------------------------------------
compiler/cpp/src/generate/t_go_generator.cc | 32 ++++++++++------------
lib/go/test/Makefile.am | 10 +++++--
lib/go/test/NamesTest.thrift | 22 +++++++++++++++
lib/go/test/tests/names_test.go | 35 ++++++++++++++++++++++++
4 files changed, 79 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/28c1c19f/compiler/cpp/src/generate/t_go_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index cb1ec80..74960da 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -1030,8 +1030,7 @@ void t_go_generator::get_publicized_name_and_def_value(t_field* tfield,
t_const_value** OUT_def_value) const {
const string base_field_name = tfield->get_name();
const string escaped_field_name = escape_string(base_field_name);
- const string go_safe_name = variable_name_to_go_name(escaped_field_name);
- *OUT_pub_name = publicize(go_safe_name);
+ *OUT_pub_name = publicize(escaped_field_name);
*OUT_def_value = tfield->get_value();
}
@@ -1132,7 +1131,7 @@ void t_go_generator::generate_go_struct_definition(ofstream& out,
if (it != (*m_iter)->annotations_.end()) {
gotag = it->second;
}
- indent(out) << publicize(variable_name_to_go_name((*m_iter)->get_name())) << " " << goType
+ indent(out) << publicize((*m_iter)->get_name()) << " " << goType
<< " `thrift:\"" << escape_string((*m_iter)->get_name()) << ","
<< sorted_keys_pos;
@@ -1230,7 +1229,7 @@ void t_go_generator::generate_isset_helpers(ofstream& out,
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
const string field_name(
- publicize(variable_name_to_go_name(escape_string((*f_iter)->get_name()))));
+ publicize(escape_string((*f_iter)->get_name())));
if ((*f_iter)->get_req() == t_field::T_OPTIONAL || is_pointer_field(*f_iter)) {
out << indent() << "func (p *" << tstruct_name << ") IsSet" << field_name << "() bool {"
<< endl;
@@ -1281,7 +1280,7 @@ void t_go_generator::generate_countsetfields_helper(ofstream& out,
continue;
const string field_name(
- publicize(variable_name_to_go_name(escape_string((*f_iter)->get_name()))));
+ publicize(escape_string((*f_iter)->get_name())));
out << indent() << "if (p.IsSet" << field_name << "()) {" << endl;
indent_up();
@@ -1319,7 +1318,7 @@ void t_go_generator::generate_go_struct_reader(ofstream& out,
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
const string field_name(
- publicize(variable_name_to_go_name(escape_string((*f_iter)->get_name()))));
+ publicize(escape_string((*f_iter)->get_name())));
indent(out) << "var isset" << field_name << " bool = false;" << endl;
}
}
@@ -1375,7 +1374,7 @@ void t_go_generator::generate_go_struct_reader(ofstream& out,
// Mark required field as read
if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
const string field_name(
- publicize(variable_name_to_go_name(escape_string((*f_iter)->get_name()))));
+ publicize(escape_string((*f_iter)->get_name())));
out << indent() << "isset" << field_name << " = true" << endl;
}
@@ -1414,7 +1413,7 @@ void t_go_generator::generate_go_struct_reader(ofstream& out,
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
if ((*f_iter)->get_req() == t_field::T_REQUIRED) {
const string field_name(
- publicize(variable_name_to_go_name(escape_string((*f_iter)->get_name()))));
+ publicize(escape_string((*f_iter)->get_name())));
out << indent() << "if !isset" << field_name << "{" << endl;
out << indent() << " return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, "
"fmt.Errorf(\"Required field " << field_name << " is not set\"));" << endl;
@@ -1516,7 +1515,7 @@ void t_go_generator::generate_go_struct_writer(ofstream& out,
indent_up();
if (field_required == t_field::T_OPTIONAL) {
- out << indent() << "if p.IsSet" << publicize(variable_name_to_go_name(field_name)) << "() {"
+ out << indent() << "if p.IsSet" << publicize(field_name) << "() {"
<< endl;
indent_up();
}
@@ -1827,7 +1826,7 @@ void t_go_generator::generate_service_client(t_service* tservice) {
f_service_ << indent() << "args := " << argsname << "{" << endl;
for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
- f_service_ << indent() << publicize(variable_name_to_go_name((*fld_iter)->get_name()))
+ f_service_ << indent() << publicize((*fld_iter)->get_name())
<< " : " << variable_name_to_go_name((*fld_iter)->get_name()) << "," << endl;
}
f_service_ << indent() << "}" << endl;
@@ -1917,8 +1916,7 @@ void t_go_generator::generate_service_client(t_service* tservice) {
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);
+ const std::string pubname = publicize((*x_iter)->get_name());
f_service_ << indent() << "if result." << pubname << " != nil {" << endl;
f_service_ << indent() << " err = result." << pubname << endl;
@@ -2561,7 +2559,7 @@ void t_go_generator::generate_process_function(t_service* tservice, t_function*
f_service_ << ", ";
}
- f_service_ << "args." << publicize(variable_name_to_go_name((*f_iter)->get_name()));
+ f_service_ << "args." << publicize((*f_iter)->get_name());
}
f_service_ << "); err2 != nil {" << endl;
@@ -2577,7 +2575,7 @@ void t_go_generator::generate_process_function(t_service* tservice, t_function*
f_service_ << indent() << " case " << type_to_go_type(((*xf_iter)->get_type())) << ":"
<< endl;
f_service_ << indent() << "result."
- << publicize(variable_name_to_go_name((*xf_iter)->get_name())) << " = v" << endl;
+ << publicize((*xf_iter)->get_name()) << " = v" << endl;
}
f_service_ << indent() << " default:" << endl;
@@ -2659,7 +2657,7 @@ void t_go_generator::generate_deserialize_field(ofstream& out,
(void)coerceData;
t_type* orig_type = tfield->get_type();
t_type* type = get_true_type(orig_type);
- string name(prefix + publicize(variable_name_to_go_name(tfield->get_name())));
+ string name(prefix + publicize(tfield->get_name()));
if (type->is_void()) {
throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + name;
@@ -2920,7 +2918,7 @@ void t_go_generator::generate_serialize_field(ofstream& out,
string prefix,
bool inkey) {
t_type* type = get_true_type(tfield->get_type());
- string name(prefix + publicize(variable_name_to_go_name(tfield->get_name())));
+ string name(prefix + publicize(tfield->get_name()));
// Do nothing for void types
if (type->is_void()) {
@@ -3156,7 +3154,7 @@ void t_go_generator::generate_go_docstring(ofstream& out,
for (p_iter = fields.begin(); p_iter != fields.end(); ++p_iter) {
t_field* p = *p_iter;
- ss << " - " << publicize(variable_name_to_go_name(p->get_name()));
+ ss << " - " << publicize(p->get_name());
if (p->has_doc()) {
ss << ": " << p->get_doc();
http://git-wip-us.apache.org/repos/asf/thrift/blob/28c1c19f/lib/go/test/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/go/test/Makefile.am b/lib/go/test/Makefile.am
index a93318a..f34b577 100644
--- a/lib/go/test/Makefile.am
+++ b/lib/go/test/Makefile.am
@@ -31,7 +31,8 @@ gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) \
GoTagTest.thrift \
TypedefFieldTest.thrift \
RefAnnotationFieldsTest.thrift \
- ErrorTest.thrift
+ ErrorTest.thrift \
+ NamesTest.thrift
mkdir -p gopath/src
grep -v list.*map.*list.*map $(THRIFTTEST) | grep -v 'set<Insanity>' > ThriftTest.thrift
$(THRIFT) -r IncludesTest.thrift
@@ -44,6 +45,7 @@ gopath: $(top_srcdir)/compiler/cpp/thrift $(THRIFTTEST) \
$(THRIFT) TypedefFieldTest.thrift
$(THRIFT) RefAnnotationFieldsTest.thrift
$(THRIFT) ErrorTest.thrift
+ $(THRIFT) NamesTest.thrift
GOPATH=`pwd`/gopath $(GO) get code.google.com/p/gomock/gomock
ln -nfs ../../../thrift gopath/src/thrift
ln -nfs ../../tests gopath/src/tests
@@ -56,7 +58,8 @@ check: gopath
servicestest \
typedeffieldtest \
refannotationfieldstest \
- errortest
+ errortest \
+ namestest
GOPATH=`pwd`/gopath $(GO) test thrift tests
clean-local:
@@ -77,4 +80,5 @@ EXTRA_DIST = \
RefAnnotationFieldsTest.thrift \
ServicesTest.thrift \
TypedefFieldTest.thrift \
- ErrorTest.thrift
+ ErrorTest.thrift \
+ NamesTest.thrift
http://git-wip-us.apache.org/repos/asf/thrift/blob/28c1c19f/lib/go/test/NamesTest.thrift
----------------------------------------------------------------------
diff --git a/lib/go/test/NamesTest.thrift b/lib/go/test/NamesTest.thrift
new file mode 100644
index 0000000..b59a5e0
--- /dev/null
+++ b/lib/go/test/NamesTest.thrift
@@ -0,0 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+struct NamesTest {
+ 1: required string type
+}
http://git-wip-us.apache.org/repos/asf/thrift/blob/28c1c19f/lib/go/test/tests/names_test.go
----------------------------------------------------------------------
diff --git a/lib/go/test/tests/names_test.go b/lib/go/test/tests/names_test.go
new file mode 100644
index 0000000..90b63a3
--- /dev/null
+++ b/lib/go/test/tests/names_test.go
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package tests
+
+import (
+ "namestest"
+ "reflect"
+ "testing"
+)
+
+func TestThatAttributeNameSubstituionDoesNotOccur(t *testing.T) {
+ s := namestest.NamesTest{}
+ st := reflect.TypeOf(s)
+ _, ok := st.FieldByName("Type")
+ if !ok {
+ t.Error("Type attribute is missing!")
+ }
+}