commit 811d279d581c7daffcee846492f5efca12fda3db
author Jens Geyer <jensg@apache.org> Sun Apr 26 17:42:54 2015 +0200
committer Jens Geyer <jensg@apache.org> Sun Apr 26 17:47:58 2015 +0200
tree c3658663e21f10f522a6fbfeafc68e18769fdfad
parent 958a7a242a59bc2d3965399483fbbb0dbeafa0e8

THRIFT-3114 Using local temp variables to not pollute the global table
Client: Lua
Patch: Xin Li <lixin.lab@gmail.com>

This closes #463

compiler/cpp/src/generate/t_lua_generator.cc

diff --git a/compiler/cpp/src/generate/t_lua_generator.cc b/compiler/cpp/src/generate/t_lua_generator.cc
index 46a9a90..1b3dac6 100644
--- a/compiler/cpp/src/generate/t_lua_generator.cc
+++ b/compiler/cpp/src/generate/t_lua_generator.cc
@@ -93,11 +93,11 @@
   /**
    * Deserialization (Read)
    */
-  void generate_deserialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
+  void generate_deserialize_field(std::ofstream& out, t_field* tfield, bool local, std::string prefix = "");
 
-  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
+  void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, bool local, std::string prefix = "");
 
-  void generate_deserialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
+  void generate_deserialize_container(std::ofstream& out, t_type* ttype, bool local, std::string prefix = "");
 
   void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
 
@@ -415,7 +415,7 @@
     indent_up();
 
     // Read field contents
-    generate_deserialize_field(out, *f_iter, "self.");
+    generate_deserialize_field(out, *f_iter, false, "self.");
 
     indent_down();
     indent(out) << "else" << endl;
@@ -747,7 +747,7 @@
 /**
  * Deserialize (Read)
  */
-void t_lua_generator::generate_deserialize_field(ofstream& out, t_field* tfield, string prefix) {
+void t_lua_generator::generate_deserialize_field(ofstream& out, t_field* tfield, bool local, string prefix) {
   t_type* type = get_true_type(tfield->get_type());
 
   if (type->is_void()) {
@@ -757,11 +757,11 @@
   string name = prefix + tfield->get_name();
 
   if (type->is_struct() || type->is_xception()) {
-    generate_deserialize_struct(out, (t_struct*)type, name);
+    generate_deserialize_struct(out, (t_struct*)type, local, name);
   } else if (type->is_container()) {
-    generate_deserialize_container(out, type, name);
+    generate_deserialize_container(out, type, local, name);
   } else if (type->is_base_type() || type->is_enum()) {
-    indent(out) << name << " = iprot:";
+    indent(out) << (local ? "local " : "") << name << " = iprot:";
 
     if (type->is_base_type()) {
       t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
@@ -805,12 +805,12 @@
   }
 }
 
-void t_lua_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
-  indent(out) << prefix << " = " << tstruct->get_name() << ":new{}" << endl << indent() << prefix
+void t_lua_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, bool local, string prefix) {
+  indent(out) << (local ? "local " : "") << prefix << " = " << tstruct->get_name() << ":new{}" << endl << indent() << prefix
               << ":read(iprot)" << endl;
 }
 
-void t_lua_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
+void t_lua_generator::generate_deserialize_container(ofstream& out, t_type* ttype, bool local, string prefix) {
   string size = tmp("_size");
   string ktype = tmp("_ktype");
   string vtype = tmp("_vtype");
@@ -822,7 +822,7 @@
   t_field fetype(g_type_byte, etype);
 
   // Declare variables, read header
-  indent(out) << prefix << " = {}" << endl;
+  indent(out) << (local ? "local " : "") << prefix << " = {}" << endl;
   if (ttype->is_map()) {
     indent(out) << "local " << ktype << ", " << vtype << ", " << size << " = iprot:readMapBegin() "
                 << endl;
@@ -864,8 +864,8 @@
   t_field fkey(tmap->get_key_type(), key);
   t_field fval(tmap->get_val_type(), val);
 
-  generate_deserialize_field(out, &fkey);
-  generate_deserialize_field(out, &fval);
+  generate_deserialize_field(out, &fkey, true);
+  generate_deserialize_field(out, &fval, true);
 
   indent(out) << prefix << "[" << key << "] = " << val << endl;
 }
@@ -875,7 +875,7 @@
   string elem = tmp("_elem");
   t_field felem(tset->get_elem_type(), elem);
 
-  generate_deserialize_field(out, &felem);
+  generate_deserialize_field(out, &felem, true);
 
   indent(out) << prefix << "[" << elem << "] = " << elem << endl;
 }
@@ -888,7 +888,7 @@
   string elem = tmp("_elem");
   t_field felem(tlist->get_elem_type(), elem);
 
-  generate_deserialize_field(out, &felem);
+  generate_deserialize_field(out, &felem, true);
 
   indent(out) << "table.insert(" << prefix << ", " << elem << ")" << endl;
 }