From: Jens Geyer <jensg@apache.org>
Date: Fri, 30 May 2014 15:51:14 +0000 (+0200)
Subject: THRIFT-2555 excessive "unused field" comments
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=eb1e1d5567cabe4a4f7f58c380f651325cdba77e;p=common%2Fthrift.git

THRIFT-2555 excessive "unused field" comments
Client: Go
Patch: Jens Geyer
---

diff --git a/compiler/cpp/src/generate/t_go_generator.cc b/compiler/cpp/src/generate/t_go_generator.cc
index c581ffa8..19f502df 100644
--- a/compiler/cpp/src/generate/t_go_generator.cc
+++ b/compiler/cpp/src/generate/t_go_generator.cc
@@ -1144,9 +1144,16 @@ void t_go_generator::generate_go_struct_definition(ofstream& out,
         int sorted_keys_pos = 0;
 
         for (m_iter = sorted_members.begin(); m_iter != sorted_members.end(); ++m_iter) {
-            for (; sorted_keys_pos != (*m_iter)->get_key(); sorted_keys_pos++) {
-                if (sorted_keys_pos != 0) {
-                    indent(out) << "// unused field # " << sorted_keys_pos << endl;
+            if( sorted_keys_pos != (*m_iter)->get_key()) {
+                int first_unused = std::max(1,sorted_keys_pos++);
+                while( sorted_keys_pos != (*m_iter)->get_key()) {
+                    ++sorted_keys_pos;
+                }
+                int last_unused = sorted_keys_pos - 1;
+                if (first_unused < last_unused) {
+                    indent(out) << "// unused fields # " << first_unused << " to "<< last_unused << endl;
+                } else if (first_unused == last_unused) {
+                    indent(out) << "// unused field # " << first_unused << endl;
                 }
             }