You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by hc...@apache.org on 2014/11/18 11:34:13 UTC
[21/37] thrift git commit: Revert "THRIFT-2729: C++ - .clang-format
created and applied"
http://git-wip-us.apache.org/repos/asf/thrift/blob/240120c8/compiler/cpp/src/generate/t_js_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc
index 0fdde4d..d753bbb 100644
--- a/compiler/cpp/src/generate/t_js_generator.cc
+++ b/compiler/cpp/src/generate/t_js_generator.cc
@@ -37,7 +37,7 @@ using std::string;
using std::stringstream;
using std::vector;
-static const string endl = "\n"; // avoid ostream << std::endl flushes
+static const string endl = "\n"; // avoid ostream << std::endl flushes
#include "t_oop_generator.h"
@@ -45,40 +45,40 @@ static const string endl = "\n"; // avoid ostream << std::endl flushes
* JS code generator.
*/
class t_js_generator : public t_oop_generator {
-public:
+ public:
t_js_generator(t_program* program,
- const std::map<std::string, std::string>& parsed_options,
- const std::string& option_string)
- : t_oop_generator(program) {
- (void)option_string;
+ const std::map<std::string, std::string>& parsed_options,
+ const std::string& option_string) :
+ t_oop_generator(program) {
+ (void) option_string;
- std::map<std::string, std::string>::const_iterator iter;
+ std::map<std::string, std::string>::const_iterator iter;
- iter = parsed_options.find("node");
- gen_node_ = (iter != parsed_options.end());
+ iter = parsed_options.find("node");
+ gen_node_ = (iter != parsed_options.end());
- iter = parsed_options.find("jquery");
- gen_jquery_ = (iter != parsed_options.end());
+ iter = parsed_options.find("jquery");
+ gen_jquery_ = (iter != parsed_options.end());
- if (!gen_node_) {
- iter = parsed_options.find("ts");
- gen_ts_ = (iter != parsed_options.end());
- } else {
- gen_ts_ = false;
- }
+ if (!gen_node_) {
+ iter = parsed_options.find("ts");
+ gen_ts_ = (iter != parsed_options.end());
+ }
+ else {
+ gen_ts_ = false;
+ }
- if (gen_node_ && gen_jquery_) {
- throw "Invalid switch: [-gen js:node,jquery] options not compatible, try: [-gen js:node -gen "
- "js:jquery]";
- }
+ if (gen_node_ && gen_jquery_) {
+ throw "Invalid switch: [-gen js:node,jquery] options not compatible, try: [-gen js:node -gen js:jquery]";
+ }
- if (gen_node_) {
- out_dir_base_ = "gen-nodejs";
- } else {
- out_dir_base_ = "gen-js";
- }
+ if (gen_node_) {
+ out_dir_base_ = "gen-nodejs";
+ } else {
+ out_dir_base_ = "gen-js";
+ }
- escape_['\''] = "\\'";
+ escape_['\''] = "\\'";
}
/**
@@ -92,26 +92,24 @@ public:
* Program-level generation functions
*/
- void generate_typedef(t_typedef* ttypedef);
- void generate_enum(t_enum* tenum);
- void generate_const(t_const* tconst);
- void generate_struct(t_struct* tstruct);
- void generate_xception(t_struct* txception);
- void generate_service(t_service* tservice);
+ void generate_typedef (t_typedef* ttypedef);
+ void generate_enum (t_enum* tenum);
+ void generate_const (t_const* tconst);
+ void generate_struct (t_struct* tstruct);
+ void generate_xception (t_struct* txception);
+ void generate_service (t_service* tservice);
std::string render_recv_throw(std::string var);
std::string render_recv_return(std::string var);
std::string render_const_value(t_type* type, t_const_value* value);
+
/**
* Structs!
*/
void generate_js_struct(t_struct* tstruct, bool is_exception);
- void generate_js_struct_definition(std::ofstream& out,
- t_struct* tstruct,
- bool is_xception = false,
- bool is_exported = true);
+ void generate_js_struct_definition(std::ofstream& out, t_struct* tstruct, bool is_xception=false, bool is_exported=true);
void generate_js_struct_reader(std::ofstream& out, t_struct* tstruct);
void generate_js_struct_writer(std::ofstream& out, t_struct* tstruct);
void generate_js_function_helpers(t_function* tfunction);
@@ -119,48 +117,66 @@ public:
/**
* Service-level generation functions
*/
- void generate_service_helpers(t_service* tservice);
- void generate_service_interface(t_service* tservice);
- void generate_service_rest(t_service* tservice);
- void generate_service_client(t_service* tservice);
- void generate_service_processor(t_service* tservice);
- void generate_process_function(t_service* tservice, t_function* tfunction);
+ void generate_service_helpers (t_service* tservice);
+ void generate_service_interface (t_service* tservice);
+ void generate_service_rest (t_service* tservice);
+ void generate_service_client (t_service* tservice);
+ void generate_service_processor (t_service* tservice);
+ void generate_process_function (t_service* tservice, t_function* tfunction);
/**
* Serialization constructs
*/
- void generate_deserialize_field(std::ofstream& out,
- t_field* tfield,
- std::string prefix = "",
- bool inclass = false);
+ void generate_deserialize_field (std::ofstream &out,
+ t_field* tfield,
+ std::string prefix="",
+ bool inclass=false);
- void generate_deserialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
+ void generate_deserialize_struct (std::ofstream &out,
+ t_struct* tstruct,
+ 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,
+ std::string prefix="");
- void generate_deserialize_set_element(std::ofstream& out, t_set* tset, std::string prefix = "");
+ void generate_deserialize_set_element (std::ofstream &out,
+ t_set* tset,
+ std::string prefix="");
- void generate_deserialize_map_element(std::ofstream& out, t_map* tmap, std::string prefix = "");
+ void generate_deserialize_map_element (std::ofstream &out,
+ t_map* tmap,
+ std::string prefix="");
- void generate_deserialize_list_element(std::ofstream& out,
- t_list* tlist,
- std::string prefix = "");
+ void generate_deserialize_list_element (std::ofstream &out,
+ t_list* tlist,
+ std::string prefix="");
- void generate_serialize_field(std::ofstream& out, t_field* tfield, std::string prefix = "");
+ void generate_serialize_field (std::ofstream &out,
+ t_field* tfield,
+ std::string prefix="");
- void generate_serialize_struct(std::ofstream& out, t_struct* tstruct, std::string prefix = "");
+ void generate_serialize_struct (std::ofstream &out,
+ t_struct* tstruct,
+ std::string prefix="");
- void generate_serialize_container(std::ofstream& out, t_type* ttype, std::string prefix = "");
+ void generate_serialize_container (std::ofstream &out,
+ t_type* ttype,
+ std::string prefix="");
- void generate_serialize_map_element(std::ofstream& out,
- t_map* tmap,
- std::string kiter,
- std::string viter);
+ void generate_serialize_map_element (std::ofstream &out,
+ t_map* tmap,
+ std::string kiter,
+ std::string viter);
- void generate_serialize_set_element(std::ofstream& out, t_set* tmap, std::string iter);
+ void generate_serialize_set_element (std::ofstream &out,
+ t_set* tmap,
+ std::string iter);
- void generate_serialize_list_element(std::ofstream& out, t_list* tlist, std::string iter);
+ void generate_serialize_list_element (std::ofstream &out,
+ t_list* tlist,
+ std::string iter);
/**
* Helper rendering functions
@@ -168,37 +184,38 @@ public:
std::string js_includes();
std::string render_includes();
- std::string declare_field(t_field* tfield, bool init = false, bool obj = false);
- std::string function_signature(t_function* tfunction,
- std::string prefix = "",
- bool include_callback = false);
- std::string argument_list(t_struct* tstruct, bool include_callback = false);
+ std::string declare_field(t_field* tfield, bool init=false, bool obj=false);
+ std::string function_signature(t_function* tfunction, std::string prefix="", bool include_callback=false);
+ std::string argument_list(t_struct* tstruct, bool include_callback=false);
std::string type_to_enum(t_type* ttype);
std::string autogen_comment() {
- return std::string("//\n") + "// Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n"
- + "//\n" + "// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n"
- + "//\n";
+ return
+ std::string("//\n") +
+ "// Autogenerated by Thrift Compiler (" + THRIFT_VERSION + ")\n" +
+ "//\n" +
+ "// DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING\n" +
+ "//\n";
}
std::vector<std::string> js_namespace_pieces(t_program* p) {
- std::string ns = p->get_namespace("js");
+ std::string ns = p->get_namespace("js");
- std::string::size_type loc;
- std::vector<std::string> pieces;
+ std::string::size_type loc;
+ std::vector<std::string> pieces;
- if (ns.size() > 0) {
- while ((loc = ns.find(".")) != std::string::npos) {
- pieces.push_back(ns.substr(0, loc));
- ns = ns.substr(loc + 1);
+ if (ns.size() > 0) {
+ while ((loc = ns.find(".")) != std::string::npos) {
+ pieces.push_back(ns.substr(0, loc));
+ ns = ns.substr(loc+1);
+ }
}
- }
- if (ns.size() > 0) {
- pieces.push_back(ns);
- }
+ if (ns.size() > 0) {
+ pieces.push_back(ns);
+ }
- return pieces;
+ return pieces;
}
std::string js_type_namespace(t_program* p) {
@@ -219,12 +236,13 @@ public:
}
std::string js_namespace(t_program* p) {
- std::string ns = p->get_namespace("js");
- if (ns.size() > 0) {
- ns += ".";
- }
+ std::string ns = p->get_namespace("js");
+ if (ns.size() > 0) {
+ ns += ".";
+ }
- return ns;
+
+ return ns;
}
/**
@@ -239,20 +257,26 @@ public:
* Returns the normal indentation + " " if a module was defined.
* @return string
*/
- string ts_indent() { return indent() + (!ts_module_.empty() ? " " : ""); }
+ string ts_indent() {
+ return indent() + (!ts_module_.empty() ? " " : "");
+ }
/**
* Returns "declare " if no module was defined.
* @return string
*/
- string ts_declare() { return (ts_module_.empty() ? "declare " : ""); }
+ string ts_declare() {
+ return (ts_module_.empty() ? "declare " : "");
+ }
/**
* Returns "?" if the given field is optional.
* @param t_field The field to check
* @return string
*/
- string ts_get_req(t_field* field) { return (field->get_req() == t_field::T_OPTIONAL ? "?" : ""); }
+ string ts_get_req(t_field* field) {
+ return (field->get_req() == t_field::T_OPTIONAL ? "?" : "");
+ }
/**
* Returns the documentation, if the provided documentable object has one.
@@ -275,7 +299,8 @@ public:
return result;
}
-private:
+ private:
+
/**
* True if we should generate NodeJS-friendly RPC services.
*/
@@ -305,6 +330,7 @@ private:
std::ofstream f_service_ts_;
};
+
/**
* Prepares for file generation by opening up the necessary file output
* streams.
@@ -318,7 +344,7 @@ void t_js_generator::init_generator() {
string outdir = get_out_dir();
// Make output file(s)
- string f_types_name = outdir + program_->get_name() + "_types.js";
+ string f_types_name = outdir+program_->get_name()+"_types.js";
f_types_.open(f_types_name.c_str());
if (gen_ts_) {
@@ -327,7 +353,10 @@ void t_js_generator::init_generator() {
}
// Print header
- f_types_ << autogen_comment() << js_includes() << endl << render_includes() << endl;
+ f_types_ <<
+ autogen_comment() <<
+ js_includes() << endl <<
+ render_includes() << endl;
if (gen_ts_) {
f_types_ts_ << autogen_comment() << endl;
@@ -339,21 +368,22 @@ void t_js_generator::init_generator() {
string pns;
- // setup the namespace
+ //setup the namespace
// TODO should the namespace just be in the directory structure for node?
- vector<string> ns_pieces = js_namespace_pieces(program_);
- if (ns_pieces.size() > 0) {
- for (size_t i = 0; i < ns_pieces.size(); ++i) {
+ vector<string> ns_pieces = js_namespace_pieces( program_ );
+ if( ns_pieces.size() > 0){
+ for(size_t i = 0; i < ns_pieces.size(); ++i) {
pns += ((i == 0) ? "" : ".") + ns_pieces[i];
f_types_ << "if (typeof " << pns << " === 'undefined') {" << endl;
- f_types_ << " " << pns << " = {};" << endl;
- f_types_ << "}" << endl;
+ f_types_ << " " << pns << " = {};" << endl;
+ f_types_ << "}" << endl;
}
if (gen_ts_) {
ts_module_ = pns;
f_types_ts_ << "declare module " << ts_module_ << " {";
}
}
+
}
/**
@@ -361,10 +391,9 @@ void t_js_generator::init_generator() {
*/
string t_js_generator::js_includes() {
if (gen_node_) {
- return string(
- "var thrift = require('thrift');\n"
- "var Thrift = thrift.Thrift;\n"
- "var Q = thrift.Q;\n");
+ return string("var thrift = require('thrift');\n"
+ "var Thrift = thrift.Thrift;\n"
+ "var Q = thrift.Q;\n");
}
return "";
@@ -379,8 +408,7 @@ string t_js_generator::render_includes() {
if (gen_node_) {
const vector<t_program*>& includes = program_->get_includes();
for (size_t i = 0; i < includes.size(); ++i) {
- result += "var " + includes[i]->get_name() + "_ttypes = require('./" + includes[i]->get_name()
- + "_types')\n";
+ result += "var " + includes[i]->get_name() + "_ttypes = require('./" + includes[i]->get_name() + "_types')\n";
}
if (includes.size() > 0) {
result += "\n";
@@ -412,7 +440,7 @@ void t_js_generator::close_generator() {
* @param ttypedef The type definition
*/
void t_js_generator::generate_typedef(t_typedef* ttypedef) {
- (void)ttypedef;
+ (void) ttypedef;
}
/**
@@ -422,11 +450,12 @@ void t_js_generator::generate_typedef(t_typedef* ttypedef) {
* @param tenum The enumeration
*/
void t_js_generator::generate_enum(t_enum* tenum) {
- f_types_ << js_type_namespace(tenum->get_program()) << tenum->get_name() << " = {" << endl;
+ f_types_ << js_type_namespace(tenum->get_program())<<tenum->get_name()<<" = {"<<endl;
if (gen_ts_) {
- f_types_ts_ << ts_print_doc(tenum) << ts_indent() << ts_declare() << "enum "
- << tenum->get_name() << " {" << endl;
+ f_types_ts_ <<
+ ts_print_doc(tenum) <<
+ ts_indent() << ts_declare() << "enum " << tenum->get_name() << " {" << endl;
}
indent_up();
@@ -437,19 +466,19 @@ void t_js_generator::generate_enum(t_enum* tenum) {
int value = (*c_iter)->get_value();
if (gen_ts_) {
f_types_ts_ << ts_indent() << "'" << (*c_iter)->get_name() << "' = " << value << "," << endl;
- // add 'value: key' in addition to 'key: value' for TypeScript enums
+ //add 'value: key' in addition to 'key: value' for TypeScript enums
f_types_ << indent() << "'" << value << "' : '" << (*c_iter)->get_name() << "'," << endl;
}
f_types_ << indent() << "'" << (*c_iter)->get_name() << "' : " << value;
- if (c_iter != constants.end() - 1) {
- f_types_ << ",";
+ if (c_iter != constants.end()-1) {
+ f_types_ << ",";
}
f_types_ << endl;
}
indent_down();
- f_types_ << "};" << endl;
+ f_types_ << "};"<<endl;
if (gen_ts_) {
f_types_ts_ << ts_indent() << "}" << endl;
@@ -464,12 +493,13 @@ void t_js_generator::generate_const(t_const* tconst) {
string name = tconst->get_name();
t_const_value* value = tconst->get_value();
- f_types_ << js_type_namespace(program_) << name << " = ";
+ f_types_ << js_type_namespace(program_) << name << " = ";
f_types_ << render_const_value(type, value) << ";" << endl;
if (gen_ts_) {
- f_types_ts_ << ts_print_doc(tconst) << ts_indent() << ts_declare() << "var " << name << ": "
- << ts_get_type(type) << ";" << endl;
+ f_types_ts_ <<
+ ts_print_doc(tconst) <<
+ ts_indent() << ts_declare() << "var " << name << ": " << ts_get_type(type) << ";" << endl;
}
}
@@ -544,13 +574,13 @@ string t_js_generator::render_const_value(t_type* type, t_const_value* value) {
const map<t_const_value*, t_const_value*>& val = value->get_map();
map<t_const_value*, t_const_value*>::const_iterator v_iter;
for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
- if (v_iter != val.begin())
- out << "," << endl;
+ if (v_iter != val.begin())
+ out << "," << endl;
- out << render_const_value(ktype, v_iter->first);
+ out << render_const_value(ktype, v_iter->first);
- out << " : ";
- out << render_const_value(vtype, v_iter->second);
+ out << " : ";
+ out << render_const_value(vtype, v_iter->second);
}
out << endl << "}";
@@ -594,7 +624,8 @@ void t_js_generator::generate_xception(t_struct* txception) {
/**
* Structs can be normal or exceptions.
*/
-void t_js_generator::generate_js_struct(t_struct* tstruct, bool is_exception) {
+void t_js_generator::generate_js_struct(t_struct* tstruct,
+ bool is_exception) {
generate_js_struct_definition(f_types_, tstruct, is_exception);
}
@@ -606,52 +637,49 @@ void t_js_generator::generate_js_struct(t_struct* tstruct, bool is_exception) {
* @param tstruct The struct definition
*/
void t_js_generator::generate_js_struct_definition(ofstream& out,
- t_struct* tstruct,
- bool is_exception,
- bool is_exported) {
+ t_struct* tstruct,
+ bool is_exception,
+ bool is_exported) {
const vector<t_field*>& members = tstruct->get_members();
vector<t_field*>::const_iterator m_iter;
if (gen_node_) {
if (is_exported) {
- out << js_namespace(tstruct->get_program()) << tstruct->get_name() << " = "
- << "module.exports." << tstruct->get_name() << " = function(args) {" << endl;
+ out << js_namespace(tstruct->get_program()) << tstruct->get_name() << " = " <<
+ "module.exports." << tstruct->get_name() << " = function(args) {" << endl;
} else {
- out << js_namespace(tstruct->get_program()) << tstruct->get_name() << " = function(args) {"
- << endl;
+ out << js_namespace(tstruct->get_program()) << tstruct->get_name() << " = function(args) {" << endl;
}
} else {
- out << js_namespace(tstruct->get_program()) << tstruct->get_name() << " = function(args) {"
- << endl;
+ out << js_namespace(tstruct->get_program()) << tstruct->get_name() <<" = function(args) {" << endl;
if (gen_ts_) {
- f_types_ts_ << ts_print_doc(tstruct) << ts_indent() << ts_declare() << "class "
- << tstruct->get_name() << (is_exception ? " extends Thrift.TException" : "")
- << " {" << endl;
+ f_types_ts_ <<
+ ts_print_doc(tstruct) <<
+ ts_indent() << ts_declare() << "class " << tstruct->get_name() << (is_exception ? " extends Thrift.TException" : "" ) << " {" << endl;
}
}
indent_up();
if (gen_node_ && is_exception) {
- out << indent() << "Thrift.TException.call(this, \"" << js_namespace(tstruct->get_program())
- << tstruct->get_name() << "\")" << endl;
- out << indent() << "this.name = \"" << js_namespace(tstruct->get_program())
- << tstruct->get_name() << "\"" << endl;
+ out << indent() << "Thrift.TException.call(this, \"" <<
+ js_namespace(tstruct->get_program()) << tstruct->get_name() << "\")" << endl;
+ out << indent() << "this.name = \"" <<
+ js_namespace(tstruct->get_program()) << tstruct->get_name() << "\"" << endl;
}
- // members with arguments
+ //members with arguments
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
- string dval = declare_field(*m_iter, false, true);
+ string dval = declare_field(*m_iter,false,true);
t_type* t = get_true_type((*m_iter)->get_type());
if ((*m_iter)->get_value() != NULL && !(t->is_struct() || t->is_xception())) {
- dval = render_const_value((*m_iter)->get_type(), (*m_iter)->get_value());
- out << indent() << "this." << (*m_iter)->get_name() << " = " << dval << ";" << endl;
+ dval = render_const_value((*m_iter)->get_type(), (*m_iter)->get_value());
+ out << indent() << "this." << (*m_iter)->get_name() << " = " << dval << ";" << endl;
} else {
- out << indent() << dval << ";" << endl;
+ out << indent() << dval << ";" << endl;
}
if (gen_ts_) {
- f_types_ts_ << ts_indent() << (*m_iter)->get_name() << ": "
- << ts_get_type((*m_iter)->get_type()) << ";" << endl;
+ f_types_ts_ << ts_indent() << (*m_iter)->get_name() << ": " << ts_get_type((*m_iter)->get_type()) << ";" << endl;
}
}
@@ -661,47 +689,44 @@ void t_js_generator::generate_js_struct_definition(ofstream& out,
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
t_type* t = get_true_type((*m_iter)->get_type());
if ((*m_iter)->get_value() != NULL && (t->is_struct() || t->is_xception())) {
- indent(out) << "this." << (*m_iter)->get_name() << " = "
- << render_const_value(t, (*m_iter)->get_value()) << ";" << endl;
+ indent(out) << "this." << (*m_iter)->get_name() << " = " << render_const_value(t, (*m_iter)->get_value()) << ";" << endl;
}
}
// Early returns for exceptions
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
- t_type* t = get_true_type((*m_iter)->get_type());
- if (t->is_xception()) {
- out << indent() << "if (args instanceof " << js_type_namespace(t->get_program())
- << t->get_name() << ") {" << endl << indent() << indent() << "this."
- << (*m_iter)->get_name() << " = args;" << endl << indent() << indent() << "return;"
- << endl << indent() << "}" << endl;
- }
+ t_type* t = get_true_type((*m_iter)->get_type());
+ if (t->is_xception()) {
+ out << indent() << "if (args instanceof " << js_type_namespace(t->get_program()) << t->get_name() << ") {" << endl
+ << indent() << indent() << "this." << (*m_iter)->get_name() << " = args;" << endl
+ << indent() << indent() << "return;" << endl
+ << indent() << "}" << endl;
+ }
}
- out << indent() << "if (args) {" << endl;
+ out << indent() << "if (args) {" << endl;
if (gen_ts_) {
f_types_ts_ << endl << ts_indent() << "constructor(args?: { ";
}
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
- out << indent() << indent() << "if (args." << (*m_iter)->get_name() << " !== undefined) {"
- << endl << indent() << indent() << indent() << "this." << (*m_iter)->get_name()
- << " = args." << (*m_iter)->get_name() << ";" << endl;
- if (!(*m_iter)->get_req()) {
- out << indent() << indent() << "} else {" << endl << indent() << indent() << indent()
- << "throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.UNKNOWN, "
- "'Required field " << (*m_iter)->get_name() << " is unset!');" << endl;
- }
- out << indent() << indent() << "}" << endl;
- if (gen_ts_) {
- f_types_ts_ << (*m_iter)->get_name() << ts_get_req(*m_iter) << ": "
- << ts_get_type((*m_iter)->get_type()) << "; ";
- }
+ out << indent() << indent() << "if (args." << (*m_iter)->get_name() << " !== undefined) {" << endl
+ << indent() << indent() << indent() << "this." << (*m_iter)->get_name() << " = args." << (*m_iter)->get_name() << ";" << endl;
+ if (!(*m_iter)->get_req()) {
+ out << indent() << indent() << "} else {" << endl
+ << indent() << indent() << indent() << "throw new Thrift.TProtocolException(Thrift.TProtocolExceptionType.UNKNOWN, 'Required field " << (*m_iter)->get_name() << " is unset!');" << endl;
+ }
+ out << indent() << indent() << "}" << endl;
+ if (gen_ts_) {
+ f_types_ts_ << (*m_iter)->get_name() << ts_get_req(*m_iter) << ": " << ts_get_type((*m_iter)->get_type()) << "; ";
+ }
}
- out << indent() << "}" << endl;
+ out << indent() << "}" << endl;
if (gen_ts_) {
f_types_ts_ << "});" << endl;
}
+
}
indent_down();
@@ -711,34 +736,36 @@ void t_js_generator::generate_js_struct_definition(ofstream& out,
}
if (is_exception) {
- out << "Thrift.inherits(" << js_namespace(tstruct->get_program()) << tstruct->get_name()
- << ", Thrift.TException);" << endl;
- out << js_namespace(tstruct->get_program()) << tstruct->get_name() << ".prototype.name = '"
- << tstruct->get_name() << "';" << endl;
+ out << "Thrift.inherits(" <<
+ js_namespace(tstruct->get_program()) <<
+ tstruct->get_name() << ", Thrift.TException);" << endl;
+ out << js_namespace(tstruct->get_program())<<tstruct->get_name() <<".prototype.name = '" << tstruct->get_name() << "';" << endl;
} else {
- // init prototype
- out << js_namespace(tstruct->get_program()) << tstruct->get_name() << ".prototype = {};"
- << endl;
+ //init prototype
+ out << js_namespace(tstruct->get_program())<<tstruct->get_name() <<".prototype = {};" << endl;
}
+
generate_js_struct_reader(out, tstruct);
generate_js_struct_writer(out, tstruct);
+
}
/**
* Generates the read() method for a struct
*/
-void t_js_generator::generate_js_struct_reader(ofstream& out, t_struct* tstruct) {
+void t_js_generator::generate_js_struct_reader(ofstream& out,
+ t_struct* tstruct) {
const vector<t_field*>& fields = tstruct->get_members();
vector<t_field*>::const_iterator f_iter;
- out << js_namespace(tstruct->get_program()) << tstruct->get_name()
- << ".prototype.read = function(input) {" << endl;
+ out << js_namespace(tstruct->get_program())<<tstruct->get_name() << ".prototype.read = function(input) {"<<endl;
indent_up();
indent(out) << "input.readStructBegin();" << endl;
+
// Loop over reading in fields
indent(out) << "while (true)" << endl;
@@ -747,7 +774,8 @@ void t_js_generator::generate_js_struct_reader(ofstream& out, t_struct* tstruct)
indent(out) << "var ret = input.readFieldBegin();" << endl;
indent(out) << "var fname = ret.fname;" << endl;
indent(out) << "var ftype = ret.ftype;" << endl;
- indent(out) << "var fid = ret.fid;" << endl;
+ indent(out) << "var fid = ret.fid;" << endl;
+
// Check for field STOP marker and break
indent(out) << "if (ftype == Thrift.Type.STOP) {" << endl;
@@ -773,19 +801,22 @@ void t_js_generator::generate_js_struct_reader(ofstream& out, t_struct* tstruct)
indent(out) << "} else {" << endl;
- indent(out) << " input.skip(ftype);" << endl;
+ indent(out) << " input.skip(ftype);" << endl;
+
+ out <<
+ indent() << "}" << endl <<
+ indent() << "break;" << endl;
- out << indent() << "}" << endl << indent() << "break;" << endl;
}
if (fields.size() == 1) {
// pseudo case to make jslint happy
- indent(out) << "case 0:" << endl;
- indent(out) << " input.skip(ftype);" << endl;
- indent(out) << " break;" << endl;
+ indent(out) << "case 0:" << endl;
+ indent(out) << " input.skip(ftype);" << endl;
+ indent(out) << " break;" << endl;
}
// In the default case we skip the field
- indent(out) << "default:" << endl;
- indent(out) << " input.skip(ftype);" << endl;
+ indent(out) << "default:" << endl;
+ indent(out) << " input.skip(ftype);" << endl;
scope_down(out);
} else {
@@ -807,43 +838,50 @@ void t_js_generator::generate_js_struct_reader(ofstream& out, t_struct* tstruct)
/**
* Generates the write() method for a struct
*/
-void t_js_generator::generate_js_struct_writer(ofstream& out, t_struct* tstruct) {
+void t_js_generator::generate_js_struct_writer(ofstream& out,
+ t_struct* tstruct) {
string name = tstruct->get_name();
const vector<t_field*>& fields = tstruct->get_members();
vector<t_field*>::const_iterator f_iter;
- out << js_namespace(tstruct->get_program()) << tstruct->get_name()
- << ".prototype.write = function(output) {" << endl;
+ out << js_namespace(tstruct->get_program())<< tstruct->get_name() << ".prototype.write = function(output) {"<<endl;
indent_up();
indent(out) << "output.writeStructBegin('" << name << "');" << endl;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- out << indent() << "if (this." << (*f_iter)->get_name() << " !== null && this."
- << (*f_iter)->get_name() << " !== undefined) {" << endl;
+ out << indent() << "if (this." << (*f_iter)->get_name() << " !== null && this." << (*f_iter)->get_name() << " !== undefined) {" << endl;
indent_up();
- indent(out) << "output.writeFieldBegin("
- << "'" << (*f_iter)->get_name() << "', " << type_to_enum((*f_iter)->get_type())
- << ", " << (*f_iter)->get_key() << ");" << endl;
+ indent(out) <<
+ "output.writeFieldBegin(" <<
+ "'" << (*f_iter)->get_name() << "', " <<
+ type_to_enum((*f_iter)->get_type()) << ", " <<
+ (*f_iter)->get_key() << ");" << endl;
+
// Write field contents
generate_serialize_field(out, *f_iter, "this.");
- indent(out) << "output.writeFieldEnd();" << endl;
+ indent(out) <<
+ "output.writeFieldEnd();" << endl;
indent_down();
indent(out) << "}" << endl;
}
- out << indent() << "output.writeFieldStop();" << endl << indent() << "output.writeStructEnd();"
- << endl;
- out << indent() << "return;" << endl;
+ out <<
+ indent() << "output.writeFieldStop();" << endl <<
+ indent() << "output.writeStructEnd();" << endl;
+
+ out <<indent() << "return;" << endl;
indent_down();
- out << indent() << "};" << endl << endl;
+ out <<
+ indent() << "};" << endl <<
+ endl;
}
/**
@@ -852,55 +890,59 @@ void t_js_generator::generate_js_struct_writer(ofstream& out, t_struct* tstruct)
* @param tservice The service definition
*/
void t_js_generator::generate_service(t_service* tservice) {
- string f_service_name = get_out_dir() + service_name_ + ".js";
- f_service_.open(f_service_name.c_str());
+ string f_service_name = get_out_dir()+service_name_+".js";
+ f_service_.open(f_service_name.c_str());
- if (gen_ts_) {
- string f_service_ts_name = get_out_dir() + service_name_ + ".d.ts";
- f_service_ts_.open(f_service_ts_name.c_str());
- }
+ if (gen_ts_) {
+ string f_service_ts_name = get_out_dir() + service_name_ + ".d.ts";
+ f_service_ts_.open(f_service_ts_name.c_str());
+ }
- f_service_ << autogen_comment() << js_includes() << endl << render_includes() << endl;
+ f_service_ <<
+ autogen_comment() <<
+ js_includes() << endl <<
+ render_includes() << endl;
- if (gen_ts_) {
- if (tservice->get_extends() != NULL) {
- f_service_ts_ << "/// <reference path=\"" << tservice->get_extends()->get_name()
- << ".d.ts\" />" << endl;
- }
- f_service_ts_ << autogen_comment() << endl;
- if (!ts_module_.empty()) {
- f_service_ts_ << "declare module " << ts_module_ << " {";
+ if (gen_ts_) {
+ if (tservice->get_extends() != NULL) {
+ f_service_ts_ << "/// <reference path=\"" << tservice->get_extends()->get_name() << ".d.ts\" />" << endl;
+ }
+ f_service_ts_ << autogen_comment() << endl;
+ if (!ts_module_.empty()) {
+ f_service_ts_ << "declare module " << ts_module_ << " {";
+ }
}
- }
- if (gen_node_) {
- if (tservice->get_extends() != NULL) {
- f_service_ << "var " << tservice->get_extends()->get_name() << " = require('./"
- << tservice->get_extends()->get_name() << "')" << endl << "var "
- << tservice->get_extends()->get_name()
- << "Client = " << tservice->get_extends()->get_name() << ".Client" << endl
- << "var " << tservice->get_extends()->get_name()
- << "Processor = " << tservice->get_extends()->get_name() << ".Processor" << endl;
- }
+ if (gen_node_) {
+ if (tservice->get_extends() != NULL) {
+ f_service_ <<
+ "var " << tservice->get_extends()->get_name() <<
+ " = require('./" << tservice->get_extends()->get_name() << "')" << endl <<
+ "var " << tservice->get_extends()->get_name() << "Client = " <<
+ tservice->get_extends()->get_name() << ".Client" << endl <<
+ "var " << tservice->get_extends()->get_name() << "Processor = " <<
+ tservice->get_extends()->get_name() << ".Processor" << endl;
+ }
- f_service_ << "var ttypes = require('./" + program_->get_name() + "_types');" << endl;
- }
+ f_service_ <<
+ "var ttypes = require('./" + program_->get_name() + "_types');" << endl;
+ }
- generate_service_helpers(tservice);
- generate_service_interface(tservice);
- generate_service_client(tservice);
+ generate_service_helpers(tservice);
+ generate_service_interface(tservice);
+ generate_service_client(tservice);
- if (gen_node_) {
- generate_service_processor(tservice);
- }
+ if (gen_node_) {
+ generate_service_processor(tservice);
+ }
- f_service_.close();
- if (gen_ts_) {
- if (!ts_module_.empty()) {
- f_service_ts_ << "}";
+ f_service_.close();
+ if (gen_ts_) {
+ if (!ts_module_.empty()) {
+ f_service_ts_ << "}";
+ }
+ f_service_ts_.close();
}
- f_service_ts_.close();
- }
}
/**
@@ -909,50 +951,52 @@ void t_js_generator::generate_service(t_service* tservice) {
* @param tservice The service to generate a server for.
*/
void t_js_generator::generate_service_processor(t_service* tservice) {
- vector<t_function*> functions = tservice->get_functions();
- vector<t_function*>::iterator f_iter;
+ vector<t_function*> functions = tservice->get_functions();
+ vector<t_function*>::iterator f_iter;
- f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Processor = "
- << "exports.Processor = function(handler) ";
+ f_service_ <<
+ js_namespace(tservice->get_program()) << service_name_ << "Processor = " <<
+ "exports.Processor = function(handler) ";
- scope_up(f_service_);
+ scope_up(f_service_);
- f_service_ << indent() << "this._handler = handler" << endl;
+ f_service_ << indent() << "this._handler = handler" << endl;
- scope_down(f_service_);
+ scope_down(f_service_);
- if (tservice->get_extends() != NULL) {
- indent(f_service_) << "Thrift.inherits(" << js_namespace(tservice->get_program())
- << service_name_ << "Processor, " << tservice->get_extends()->get_name()
- << "Processor)" << endl;
- }
+ if (tservice->get_extends() != NULL) {
+ indent(f_service_) << "Thrift.inherits(" <<
+ js_namespace(tservice->get_program()) <<
+ service_name_ << "Processor, " <<
+ tservice->get_extends()->get_name() << "Processor)" << endl;
+ }
- // Generate the server implementation
- indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
- << "Processor.prototype.process = function(input, output) ";
-
- scope_up(f_service_);
-
- f_service_ << indent() << "var r = input.readMessageBegin();" << endl << indent()
- << "if (this['process_' + r.fname]) {" << endl << indent()
- << " return this['process_' + r.fname].call(this, r.rseqid, input, output);" << endl
- << indent() << "} else {" << endl << indent() << " input.skip(Thrift.Type.STRUCT);"
- << endl << indent() << " input.readMessageEnd();" << endl << indent()
- << " var x = new "
- "Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN_METHOD, "
- "'Unknown function ' + r.fname);" << endl << indent()
- << " output.writeMessageBegin(r.fname, Thrift.MessageType.EXCEPTION, r.rseqid);"
- << endl << indent() << " x.write(output);" << endl << indent()
- << " output.writeMessageEnd();" << endl << indent() << " output.flush();" << endl
- << indent() << "}" << endl;
-
- scope_down(f_service_);
- f_service_ << endl;
-
- // Generate the process subfunctions
- for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- generate_process_function(tservice, *f_iter);
- }
+ // Generate the server implementation
+ indent(f_service_) <<
+ js_namespace(tservice->get_program()) << service_name_ << "Processor.prototype.process = function(input, output) ";
+
+ scope_up(f_service_);
+
+ f_service_ << indent() << "var r = input.readMessageBegin();" << endl
+ << indent() << "if (this['process_' + r.fname]) {" << endl
+ << indent() << " return this['process_' + r.fname].call(this, r.rseqid, input, output);" << endl
+ << indent() << "} else {" << endl
+ << indent() << " input.skip(Thrift.Type.STRUCT);" << endl
+ << indent() << " input.readMessageEnd();" << endl
+ << indent() << " var x = new Thrift.TApplicationException(Thrift.TApplicationExceptionType.UNKNOWN_METHOD, 'Unknown function ' + r.fname);" << endl
+ << indent() << " output.writeMessageBegin(r.fname, Thrift.MessageType.EXCEPTION, r.rseqid);" << endl
+ << indent() << " x.write(output);" << endl
+ << indent() << " output.writeMessageEnd();" << endl
+ << indent() << " output.flush();" << endl
+ << indent() << "}" << endl;
+
+ scope_down(f_service_);
+ f_service_ << endl;
+
+ // Generate the process subfunctions
+ for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+ generate_process_function(tservice, *f_iter);
+ }
}
/**
@@ -960,99 +1004,105 @@ void t_js_generator::generate_service_processor(t_service* tservice) {
*
* @param tfunction The function to write a dispatcher for
*/
-void t_js_generator::generate_process_function(t_service* tservice, t_function* tfunction) {
- indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
- << "Processor.prototype.process_" + tfunction->get_name()
- + " = function(seqid, input, output) ";
+void t_js_generator::generate_process_function(t_service* tservice,
+ t_function* tfunction) {
+ indent(f_service_) <<
+ js_namespace(tservice->get_program()) << service_name_ << "Processor.prototype.process_" + tfunction->get_name() + " = function(seqid, input, output) ";
- scope_up(f_service_);
+ scope_up(f_service_);
- string argsname = js_namespace(program_) + service_name_ + "_" + tfunction->get_name() + "_args";
- string resultname = js_namespace(program_) + service_name_ + "_" + tfunction->get_name()
- + "_result";
+ string argsname = js_namespace(program_)+ service_name_ + "_" + tfunction->get_name() + "_args";
+ string resultname = js_namespace(program_)+ service_name_ + "_" + tfunction->get_name() + "_result";
- f_service_ << indent() << "var args = new " << argsname << "();" << endl << indent()
- << "args.read(input);" << endl << indent() << "input.readMessageEnd();" << endl;
+ f_service_ <<
+ indent() << "var args = new " << argsname << "();" << endl <<
+ indent() << "args.read(input);" << endl <<
+ indent() << "input.readMessageEnd();" << endl;
- // Generate the function call
- t_struct* arg_struct = tfunction->get_arglist();
- const std::vector<t_field*>& fields = arg_struct->get_members();
- vector<t_field*>::const_iterator f_iter;
+ // Generate the function call
+ t_struct* arg_struct = tfunction->get_arglist();
+ const std::vector<t_field*>& fields = arg_struct->get_members();
+ vector<t_field*>::const_iterator f_iter;
- // Shortcut out here for oneway functions
- if (tfunction->is_oneway()) {
- indent(f_service_) << "this._handler." << tfunction->get_name() << "(";
+ // Shortcut out here for oneway functions
+ if (tfunction->is_oneway()) {
+ indent(f_service_) << "this._handler." << tfunction->get_name() << "(";
- bool first = true;
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if (first) {
- first = false;
- } else {
- f_service_ << ", ";
+ bool first = true;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ if (first) {
+ first = false;
+ } else {
+ f_service_ << ", ";
+ }
+ f_service_ << "args." << (*f_iter)->get_name();
}
- f_service_ << "args." << (*f_iter)->get_name();
- }
- f_service_ << ")" << endl;
- scope_down(f_service_);
- f_service_ << endl;
- return;
- }
+ f_service_ << ")" << endl;
+ scope_down(f_service_);
+ f_service_ << endl;
+ return;
+ }
- f_service_ << indent() << "if (this._handler." << tfunction->get_name()
- << ".length === " << fields.size() << ") {" << endl;
- indent_up();
- indent(f_service_) << "Q.fcall(this._handler." << tfunction->get_name();
+ f_service_ <<
+ indent() << "if (this._handler." << tfunction->get_name() << ".length === " << fields.size() <<") {" << endl;
+ indent_up();
+ indent(f_service_) << "Q.fcall(this._handler." << tfunction->get_name();
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- f_service_ << ", args." << (*f_iter)->get_name();
- }
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ f_service_ << ", args." << (*f_iter)->get_name();
+ }
- f_service_ << ")" << endl;
- indent_up();
- indent(f_service_) << ".then(function(result) {" << endl;
- indent_up();
- f_service_ << indent() << "var result = new " << resultname << "({success: result});" << endl
- << indent() << "output.writeMessageBegin(\"" << tfunction->get_name()
- << "\", Thrift.MessageType.REPLY, seqid);" << endl << indent()
- << "result.write(output);" << endl << indent() << "output.writeMessageEnd();" << endl
- << indent() << "output.flush();" << endl;
- indent_down();
- indent(f_service_) << "}, function (err) {" << endl;
- indent_up();
- f_service_ << indent() << "var result = new " << resultname << "(err);" << endl << indent()
- << "output.writeMessageBegin(\"" << tfunction->get_name()
- << "\", Thrift.MessageType.REPLY, seqid);" << endl << indent()
- << "result.write(output);" << endl << indent() << "output.writeMessageEnd();" << endl
- << indent() << "output.flush();" << endl;
- indent_down();
- indent(f_service_) << "});" << endl;
- indent_down();
- indent_down();
- indent(f_service_) << "} else {" << endl;
- indent_up();
- indent(f_service_) << "this._handler." << tfunction->get_name() << "(";
+ f_service_ << ")" << endl;
+ indent_up();
+ indent(f_service_) << ".then(function(result) {" << endl;
+ indent_up();
+ f_service_ <<
+ indent() << "var result = new " << resultname << "({success: result});" << endl <<
+ indent() << "output.writeMessageBegin(\"" << tfunction->get_name() <<
+ "\", Thrift.MessageType.REPLY, seqid);" << endl <<
+ indent() << "result.write(output);" << endl <<
+ indent() << "output.writeMessageEnd();" << endl <<
+ indent() << "output.flush();" << endl;
+ indent_down();
+ indent(f_service_) << "}, function (err) {" << endl;
+ indent_up();
+ f_service_ <<
+ indent() << "var result = new " << resultname << "(err);" << endl <<
+ indent() << "output.writeMessageBegin(\"" << tfunction->get_name() <<
+ "\", Thrift.MessageType.REPLY, seqid);" << endl <<
+ indent() << "result.write(output);" << endl <<
+ indent() << "output.writeMessageEnd();" << endl <<
+ indent() << "output.flush();" << endl;
+ indent_down();
+ indent(f_service_) << "});" << endl;
+ indent_down();
+ indent_down();
+ indent(f_service_) << "} else {" << endl;
+ indent_up();
+ indent(f_service_) << "this._handler." << tfunction->get_name() << "(";
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- f_service_ << "args." << (*f_iter)->get_name() << ", ";
- }
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ f_service_ << "args." << (*f_iter)->get_name() << ", ";
+ }
- f_service_ << " function (err, result) {" << endl;
- indent_up();
+ f_service_ << " function (err, result) {" << endl;
+ indent_up();
- f_service_ << indent() << "var result = new " << resultname
- << "((err != null ? err : {success: result}));" << endl << indent()
- << "output.writeMessageBegin(\"" << tfunction->get_name()
- << "\", Thrift.MessageType.REPLY, seqid);" << endl << indent()
- << "result.write(output);" << endl << indent() << "output.writeMessageEnd();" << endl
- << indent() << "output.flush();" << endl;
+ f_service_ <<
+ indent() << "var result = new " << resultname << "((err != null ? err : {success: result}));" << endl <<
+ indent() << "output.writeMessageBegin(\"" << tfunction->get_name() <<
+ "\", Thrift.MessageType.REPLY, seqid);" << endl <<
+ indent() << "result.write(output);" << endl <<
+ indent() << "output.writeMessageEnd();" << endl <<
+ indent() << "output.flush();" << endl;
- indent_down();
- indent(f_service_) << "});" << endl;
- indent_down();
- indent(f_service_) << "}" << endl;
- scope_down(f_service_);
- f_service_ << endl;
+ indent_down();
+ indent(f_service_) << "});" << endl;
+ indent_down();
+ indent(f_service_) << "}" << endl;
+ scope_down(f_service_);
+ f_service_ << endl;
}
/**
@@ -1061,25 +1111,26 @@ void t_js_generator::generate_process_function(t_service* tservice, t_function*
* @param tservice The service to generate a header definition for
*/
void t_js_generator::generate_service_helpers(t_service* tservice) {
- // Do not generate TS definitions for helper functions
- bool gen_ts_tmp = gen_ts_;
- gen_ts_ = false;
-
- vector<t_function*> functions = tservice->get_functions();
- vector<t_function*>::iterator f_iter;
-
- f_service_ << "//HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
-
- for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- t_struct* ts = (*f_iter)->get_arglist();
- string name = ts->get_name();
- ts->set_name(service_name_ + "_" + name);
- generate_js_struct_definition(f_service_, ts, false, false);
- generate_js_function_helpers(*f_iter);
- ts->set_name(name);
- }
+ //Do not generate TS definitions for helper functions
+ bool gen_ts_tmp = gen_ts_;
+ gen_ts_ = false;
+
+ vector<t_function*> functions = tservice->get_functions();
+ vector<t_function*>::iterator f_iter;
+
+ f_service_ <<
+ "//HELPER FUNCTIONS AND STRUCTURES" << endl << endl;
+
+ for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+ t_struct* ts = (*f_iter)->get_arglist();
+ string name = ts->get_name();
+ ts->set_name(service_name_ + "_" + name);
+ generate_js_struct_definition(f_service_, ts, false, false);
+ generate_js_function_helpers(*f_iter);
+ ts->set_name(name);
+ }
- gen_ts_ = gen_ts_tmp;
+ gen_ts_ = gen_ts_tmp;
}
/**
@@ -1088,20 +1139,20 @@ void t_js_generator::generate_service_helpers(t_service* tservice) {
* @param tfunction The function
*/
void t_js_generator::generate_js_function_helpers(t_function* tfunction) {
- t_struct result(program_, service_name_ + "_" + tfunction->get_name() + "_result");
- t_field success(tfunction->get_returntype(), "success", 0);
- if (!tfunction->get_returntype()->is_void()) {
- result.append(&success);
- }
+ t_struct result(program_, service_name_ + "_" + tfunction->get_name() + "_result");
+ t_field success(tfunction->get_returntype(), "success", 0);
+ if (!tfunction->get_returntype()->is_void()) {
+ result.append(&success);
+ }
- t_struct* xs = tfunction->get_xceptions();
- const vector<t_field*>& fields = xs->get_members();
- vector<t_field*>::const_iterator f_iter;
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- result.append(*f_iter);
- }
+ t_struct* xs = tfunction->get_xceptions();
+ const vector<t_field*>& fields = xs->get_members();
+ vector<t_field*>::const_iterator f_iter;
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ result.append(*f_iter);
+ }
- generate_js_struct_definition(f_service_, &result, false, false);
+ generate_js_struct_definition(f_service_, &result, false, false);
}
/**
@@ -1110,14 +1161,14 @@ void t_js_generator::generate_js_function_helpers(t_function* tfunction) {
* @param tservice The service to generate a header definition for
*/
void t_js_generator::generate_service_interface(t_service* tservice) {
- (void)tservice;
+ (void) tservice;
}
/**
* Generates a REST interface
*/
void t_js_generator::generate_service_rest(t_service* tservice) {
- (void)tservice;
+ (void) tservice;
}
/**
@@ -1127,14 +1178,16 @@ void t_js_generator::generate_service_rest(t_service* tservice) {
*/
void t_js_generator::generate_service_client(t_service* tservice) {
if (gen_node_) {
- f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Client = "
- << "exports.Client = function(output, pClass) {" << endl;
+ f_service_ <<
+ js_namespace(tservice->get_program()) << service_name_ << "Client = " <<
+ "exports.Client = function(output, pClass) {"<<endl;
} else {
- f_service_ << js_namespace(tservice->get_program()) << service_name_
- << "Client = function(input, output) {" << endl;
+ f_service_ <<
+ js_namespace(tservice->get_program()) << service_name_ << "Client = function(input, output) {"<<endl;
if (gen_ts_) {
- f_service_ts_ << ts_print_doc(tservice) << ts_indent() << ts_declare() << "class "
- << service_name_ << "Client ";
+ f_service_ts_ <<
+ ts_print_doc(tservice) <<
+ ts_indent() << ts_declare() << "class " << service_name_ << "Client ";
if (tservice->get_extends() != NULL) {
f_service_ts_ << "extends " << tservice->get_extends()->get_name() << "Client ";
}
@@ -1144,45 +1197,50 @@ void t_js_generator::generate_service_client(t_service* tservice) {
indent_up();
+
if (gen_node_) {
- f_service_ << indent() << " this.output = output;" << endl << indent()
- << " this.pClass = pClass;" << endl << indent() << " this._seqid = 0;" << endl
- << indent() << " this._reqs = {};" << endl;
+ f_service_ <<
+ indent() << " this.output = output;" << endl <<
+ indent() << " this.pClass = pClass;" << endl <<
+ indent() << " this._seqid = 0;" << endl <<
+ indent() << " this._reqs = {};" << endl;
} else {
- f_service_ << indent() << " this.input = input;" << endl << indent()
- << " this.output = (!output) ? input : output;" << endl << indent()
- << " this.seqid = 0;" << endl;
+ f_service_ <<
+ indent() << " this.input = input;" << endl <<
+ indent() << " this.output = (!output) ? input : output;" << endl <<
+ indent() << " this.seqid = 0;" << endl;
if (gen_ts_) {
- f_service_ts_ << ts_indent() << "input: Thrift.TJSONProtocol;" << endl << ts_indent()
- << "output: Thrift.TJSONProtocol;" << endl << ts_indent() << "seqid: number;"
- << endl << endl << ts_indent()
- << "constructor(input: Thrift.TJSONProtocol, output?: Thrift.TJSONProtocol);"
- << endl;
+ f_service_ts_ <<
+ ts_indent() << "input: Thrift.TJSONProtocol;" << endl <<
+ ts_indent() << "output: Thrift.TJSONProtocol;" << endl <<
+ ts_indent() << "seqid: number;" << endl <<
+ endl <<
+ ts_indent() << "constructor(input: Thrift.TJSONProtocol, output?: Thrift.TJSONProtocol);" << endl;
}
}
+
indent_down();
- f_service_ << indent() << "};" << endl;
+ f_service_ <<
+ indent() << "};" << endl;
+
if (tservice->get_extends() != NULL) {
- indent(f_service_) << "Thrift.inherits(" << js_namespace(tservice->get_program())
- << service_name_ << "Client, "
- << js_namespace(tservice->get_extends()->get_program())
- << tservice->get_extends()->get_name() << "Client);" << endl;
+ indent(f_service_) << "Thrift.inherits(" <<
+ js_namespace(tservice->get_program()) <<
+ service_name_ << "Client, " <<
+ js_namespace(tservice->get_extends()->get_program()) <<
+ tservice->get_extends()->get_name() << "Client);" << endl;
} else {
- // init prototype
- indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype = {};" << endl;
+ //init prototype
+ indent(f_service_) << js_namespace(tservice->get_program())<<service_name_ << "Client.prototype = {};"<<endl;
}
// utils for multiplexed services
if (gen_node_) {
- indent(f_service_) << js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype.seqid = function() { return this._seqid; }" << endl
- << js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype.new_seqid = function() { return this._seqid += 1; }"
- << endl;
+ indent(f_service_) << js_namespace(tservice->get_program())<<service_name_ << "Client.prototype.seqid = function() { return this._seqid; }" << endl <<
+ js_namespace(tservice->get_program())<<service_name_ << "Client.prototype.new_seqid = function() { return this._seqid += 1; }" << endl;
}
// Generate client method implementations
vector<t_function*> functions = tservice->get_functions();
@@ -1195,25 +1253,29 @@ void t_js_generator::generate_service_client(t_service* tservice) {
string arglist = argument_list(arg_struct);
// Open function
- f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Client.prototype."
- << function_signature(*f_iter, "", true) << " {" << endl;
+ f_service_ << js_namespace(tservice->get_program())<<service_name_<<"Client.prototype." <<
+ function_signature(*f_iter, "", true) << " {" << endl;
indent_up();
if (gen_ts_) {
- f_service_ts_ << ts_print_doc(*f_iter) <<
- // function definition without callback
- ts_indent() << ts_function_signature(*f_iter, false) << endl << ts_print_doc(*f_iter) <<
- // overload with callback
- ts_indent() << ts_function_signature(*f_iter, true) << endl;
+ f_service_ts_ <<
+ ts_print_doc(*f_iter) <<
+ //function definition without callback
+ ts_indent() << ts_function_signature(*f_iter, false) << endl <<
+ ts_print_doc(*f_iter) <<
+ //overload with callback
+ ts_indent() << ts_function_signature(*f_iter, true) << endl;
}
- if (gen_node_) { // Node.js output ./gen-nodejs
- f_service_ << indent() << "this._seqid = this.new_seqid();" << endl << indent()
- << "if (callback === undefined) {" << endl;
+ if (gen_node_) { //Node.js output ./gen-nodejs
+ f_service_ <<
+ indent() << "this._seqid = this.new_seqid();" << endl <<
+ indent() << "if (callback === undefined) {" << endl;
indent_up();
- f_service_ << indent() << "var _defer = Q.defer();" << endl << indent()
- << "this._reqs[this.seqid()] = function(error, result) {" << endl;
+ f_service_ <<
+ indent() << "var _defer = Q.defer();" << endl <<
+ indent() << "this._reqs[this.seqid()] = function(error, result) {" << endl;
indent_up();
indent(f_service_) << "if (error) {" << endl;
indent_up();
@@ -1226,17 +1288,20 @@ void t_js_generator::generate_service_client(t_service* tservice) {
indent(f_service_) << "}" << endl;
indent_down();
indent(f_service_) << "};" << endl;
- f_service_ << indent() << "this.send_" << funname << "(" << arglist << ");" << endl
- << indent() << "return _defer.promise;" << endl;
+ f_service_ <<
+ indent() << "this.send_" << funname << "(" << arglist << ");" << endl <<
+ indent() << "return _defer.promise;" << endl;
indent_down();
indent(f_service_) << "} else {" << endl;
indent_up();
- f_service_ << indent() << "this._reqs[this.seqid()] = callback;" << endl << indent()
- << "this.send_" << funname << "(" << arglist << ");" << endl;
+ f_service_ <<
+ indent() << "this._reqs[this.seqid()] = callback;" << endl <<
+ indent() << "this.send_" << funname << "(" << arglist << ");" << endl;
indent_down();
indent(f_service_) << "}" << endl;
- } else if (gen_jquery_) { // jQuery output ./gen-js
- f_service_ << indent() << "if (callback === undefined) {" << endl;
+ }
+ else if (gen_jquery_) { //jQuery output ./gen-js
+ f_service_ << indent() << "if (callback === undefined) {" << endl;
indent_up();
f_service_ << indent() << "this.send_" << funname << "(" << arglist << ");" << endl;
if (!(*f_iter)->is_oneway()) {
@@ -1249,20 +1314,19 @@ void t_js_generator::generate_service_client(t_service* tservice) {
indent_down();
f_service_ << indent() << "} else {" << endl;
indent_up();
- f_service_ << indent() << "var postData = this.send_" << funname << "(" << arglist
- << (arglist.empty() ? "" : ", ") << "true);" << endl;
+ f_service_ << indent() << "var postData = this.send_" << funname <<
+ "(" << arglist << (arglist.empty() ? "" : ", ") << "true);" << endl;
f_service_ << indent() << "return this.output.getTransport()" << endl;
indent_up();
- f_service_ << indent() << ".jqRequest(this, postData, arguments, this.recv_" << funname
- << ");" << endl;
+ f_service_ << indent() << ".jqRequest(this, postData, arguments, this.recv_" << funname << ");" << endl;
indent_down();
indent_down();
f_service_ << indent() << "}" << endl;
- } else { // Standard JavaScript ./gen-js
- f_service_ << indent() << "this.send_" << funname << "(" << arglist
- << (arglist.empty() ? "" : ", ") << "callback); " << endl;
+ } else { //Standard JavaScript ./gen-js
+ f_service_ << indent() <<
+ "this.send_" << funname << "(" << arglist << (arglist.empty() ? "" : ", ") << "callback); " << endl;
if (!(*f_iter)->is_oneway()) {
- f_service_ << indent() << "if (!callback) {" << endl;
+ f_service_ << indent() << "if (!callback) {" << endl;
f_service_ << indent();
if (!(*f_iter)->get_returntype()->is_void()) {
f_service_ << " return ";
@@ -1276,45 +1340,52 @@ void t_js_generator::generate_service_client(t_service* tservice) {
f_service_ << "};" << endl << endl;
+
// Send function
- f_service_ << js_namespace(tservice->get_program()) << service_name_ << "Client.prototype.send_"
- << function_signature(*f_iter, "", !gen_node_) << " {" << endl;
+ f_service_ << js_namespace(tservice->get_program())<<service_name_ <<
+ "Client.prototype.send_" << function_signature(*f_iter, "", !gen_node_) << " {" << endl;
indent_up();
std::string outputVar;
if (gen_node_) {
- f_service_ << indent() << "var output = new this.pClass(this.output);" << endl;
+ f_service_ <<
+ indent() << "var output = new this.pClass(this.output);" << endl;
outputVar = "output";
} else {
outputVar = "this.output";
}
- std::string argsname = js_namespace(program_) + service_name_ + "_" + (*f_iter)->get_name()
- + "_args";
+ std::string argsname = js_namespace(program_)+ service_name_ + "_" + (*f_iter)->get_name() + "_args";
- std::string messageType = (*f_iter)->is_oneway() ? "Thrift.MessageType.ONEWAY"
- : "Thrift.MessageType.CALL";
+ std::string messageType
+ = (*f_iter)->is_oneway() ? "Thrift.MessageType.ONEWAY" : "Thrift.MessageType.CALL";
// Serialize the request header
if (gen_node_) {
- f_service_ << indent() << outputVar << ".writeMessageBegin('" << (*f_iter)->get_name()
- << "', " << messageType << ", this.seqid());" << endl;
- } else {
- f_service_ << indent() << outputVar << ".writeMessageBegin('" << (*f_iter)->get_name()
- << "', " << messageType << ", this.seqid);" << endl;
+ f_service_ <<
+ indent() << outputVar << ".writeMessageBegin('" << (*f_iter)->get_name()
+ << "', " << messageType << ", this.seqid());" << endl;
+ }
+ else {
+ f_service_ <<
+ indent() << outputVar << ".writeMessageBegin('"
+ << (*f_iter)->get_name() << "', "
+ << messageType << ", this.seqid);" << endl;
}
- f_service_ << indent() << "var args = new " << argsname << "();" << endl;
+ f_service_ <<
+ indent() << "var args = new " << argsname << "();" << endl;
for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
- f_service_ << indent() << "args." << (*fld_iter)->get_name() << " = "
- << (*fld_iter)->get_name() << ";" << endl;
+ f_service_ <<
+ indent() << "args." << (*fld_iter)->get_name() << " = " << (*fld_iter)->get_name() << ";" << endl;
}
// Write to the stream
- f_service_ << indent() << "args.write(" << outputVar << ");" << endl << indent() << outputVar
- << ".writeMessageEnd();" << endl;
+ f_service_ <<
+ indent() << "args.write(" << outputVar << ");" << endl <<
+ indent() << outputVar << ".writeMessageEnd();" << endl;
if (gen_node_) {
f_service_ << indent() << "return this.output.flush();" << endl;
@@ -1343,15 +1414,15 @@ void t_js_generator::generate_service_client(t_service* tservice) {
f_service_ << "};" << endl;
+
if (!(*f_iter)->is_oneway()) {
- std::string resultname = js_namespace(tservice->get_program()) + service_name_ + "_"
- + (*f_iter)->get_name() + "_result";
+ std::string resultname = js_namespace(tservice->get_program()) + service_name_ + "_" + (*f_iter)->get_name() + "_result";
if (gen_node_) {
// Open function
- f_service_ << endl << js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype.recv_" << (*f_iter)->get_name()
- << " = function(input,mtype,rseqid) {" << endl;
+ f_service_ <<
+ endl << js_namespace(tservice->get_program())<<service_name_ <<
+ "Client.prototype.recv_" << (*f_iter)->get_name() << " = function(input,mtype,rseqid) {" << endl;
} else {
t_struct noargs(program_);
@@ -1359,8 +1430,9 @@ void t_js_generator::generate_service_client(t_service* tservice) {
string("recv_") + (*f_iter)->get_name(),
&noargs);
// Open function
- f_service_ << endl << js_namespace(tservice->get_program()) << service_name_
- << "Client.prototype." << function_signature(&recv_function) << " {" << endl;
+ f_service_ <<
+ endl << js_namespace(tservice->get_program())<<service_name_ <<
+ "Client.prototype." << function_signature(&recv_function) << " {" << endl;
}
indent_up();
@@ -1373,58 +1445,73 @@ void t_js_generator::generate_service_client(t_service* tservice) {
}
if (gen_node_) {
- f_service_ << indent() << "var callback = this._reqs[rseqid] || function() {};" << endl
- << indent() << "delete this._reqs[rseqid];" << endl;
+ f_service_ <<
+ indent() << "var callback = this._reqs[rseqid] || function() {};" << endl <<
+ indent() << "delete this._reqs[rseqid];" << endl;
} else {
- f_service_ << indent() << "var ret = this.input.readMessageBegin();" << endl << indent()
- << "var fname = ret.fname;" << endl << indent() << "var mtype = ret.mtype;"
- << endl << indent() << "var rseqid = ret.rseqid;" << endl;
+ f_service_ <<
+ indent() << "var ret = this.input.readMessageBegin();" << endl <<
+ indent() << "var fname = ret.fname;" << endl <<
+ indent() << "var mtype = ret.mtype;" << endl <<
+ indent() << "var rseqid = ret.rseqid;" <<endl;
}
- f_service_ << indent() << "if (mtype == Thrift.MessageType.EXCEPTION) {" << endl << indent()
- << " var x = new Thrift.TApplicationException();" << endl << indent()
- << " x.read(" << inputVar << ");" << endl << indent() << " " << inputVar
- << ".readMessageEnd();" << endl << indent() << " " << render_recv_throw("x")
- << endl << indent() << "}" << endl;
+ f_service_ <<
+ indent() << "if (mtype == Thrift.MessageType.EXCEPTION) {" << endl <<
+ indent() << " var x = new Thrift.TApplicationException();" << endl <<
+ indent() << " x.read(" << inputVar << ");" << endl <<
+ indent() << " " << inputVar << ".readMessageEnd();" << endl <<
+ indent() << " " << render_recv_throw("x") << endl <<
+ indent() << "}" << endl;
+
+
+ f_service_ <<
+ indent() << "var result = new " << resultname << "();" << endl <<
+ indent() << "result.read(" << inputVar << ");" << endl;
+
- f_service_ << indent() << "var result = new " << resultname << "();" << endl << indent()
- << "result.read(" << inputVar << ");" << endl;
+ f_service_ <<
+ indent() << inputVar << ".readMessageEnd();" << endl <<
+ endl;
- f_service_ << indent() << inputVar << ".readMessageEnd();" << endl << endl;
t_struct* xs = (*f_iter)->get_xceptions();
const std::vector<t_field*>& xceptions = xs->get_members();
vector<t_field*>::const_iterator x_iter;
for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
- f_service_ << indent() << "if (null !== result." << (*x_iter)->get_name() << ") {" << endl
- << indent() << " " << render_recv_throw("result." + (*x_iter)->get_name())
- << endl << indent() << "}" << endl;
+ f_service_ <<
+ indent() << "if (null !== result." << (*x_iter)->get_name() << ") {" << endl <<
+ indent() << " " << render_recv_throw("result." + (*x_iter)->get_name()) << endl <<
+ indent() << "}" << endl;
}
// Careful, only return result if not a void function
if (!(*f_iter)->get_returntype()->is_void()) {
- f_service_ << indent() << "if (null !== result.success) {" << endl << indent() << " "
- << render_recv_return("result.success") << endl << indent() << "}" << endl;
- f_service_ << indent()
- << render_recv_throw("'" + (*f_iter)->get_name() + " failed: unknown result'")
- << endl;
+ f_service_ <<
+ indent() << "if (null !== result.success) {" << endl <<
+ indent() << " " << render_recv_return("result.success") << endl <<
+ indent() << "}" << endl;
+ f_service_ <<
+ indent() << render_recv_throw("'" + (*f_iter)->get_name() + " failed: unknown result'") << endl;
} else {
- if (gen_node_) {
- indent(f_service_) << "callback(null)" << endl;
- } else {
- indent(f_service_) << "return;" << endl;
- }
+ if (gen_node_) {
+ indent(f_service_) << "callback(null)" << endl;
+ } else {
+ indent(f_service_) << "return;" << endl;
+ }
}
// Close function
indent_down();
- f_service_ << "};" << endl;
+ f_service_ << "};"<<endl;
+
}
}
if (gen_ts_) {
- f_service_ts_ << ts_indent() << "}" << endl;
+ f_service_ts_ << ts_indent() << "}" << endl;
}
+
}
std::string t_js_generator::render_recv_throw(std::string var) {
@@ -1446,21 +1533,24 @@ std::string t_js_generator::render_recv_return(std::string var) {
/**
* Deserializes a field of any type.
*/
-void t_js_generator::generate_deserialize_field(ofstream& out,
- t_field* tfield,
- string prefix,
- bool inclass) {
- (void)inclass;
+void t_js_generator::generate_deserialize_field(ofstream &out,
+ t_field* tfield,
+ string prefix,
+ bool inclass) {
+ (void) inclass;
t_type* type = get_true_type(tfield->get_type());
if (type->is_void()) {
- throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
+ throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE: " +
+ prefix + tfield->get_name();
}
- string name = prefix + tfield->get_name();
+ 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,
+ name);
} else if (type->is_container()) {
generate_deserialize_container(out, type, name);
} else if (type->is_base_type() || type->is_enum()) {
@@ -1470,7 +1560,8 @@ void t_js_generator::generate_deserialize_field(ofstream& out,
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
case t_base_type::TYPE_VOID:
- throw "compiler error: cannot serialize void field in a struct: " + name;
+ throw "compiler error: cannot serialize void field in a struct: " +
+ name;
break;
case t_base_type::TYPE_STRING:
out << (((t_base_type*)type)->is_binary() ? "readBinary()" : "readString()");
@@ -1501,14 +1592,13 @@ void t_js_generator::generate_deserialize_field(ofstream& out,
}
if (!gen_node_) {
- out << ".value";
+ out << ".value";
}
out << ";" << endl;
} else {
printf("DO NOT KNOW HOW TO DESERIALIZE FIELD '%s' TYPE '%s'\n",
- tfield->get_name().c_str(),
- type->get_name().c_str());
+ tfield->get_name().c_str(), type->get_name().c_str());
}
}
@@ -1518,12 +1608,18 @@ void t_js_generator::generate_deserialize_field(ofstream& out,
* buffer for deserialization, and that there is a variable protocol which
* is a reference to a TProtocol serialization object.
*/
-void t_js_generator::generate_deserialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
- out << indent() << prefix << " = new " << js_type_namespace(tstruct->get_program())
- << tstruct->get_name() << "();" << endl << indent() << prefix << ".read(input);" << endl;
+void t_js_generator::generate_deserialize_struct(ofstream &out,
+ t_struct* tstruct,
+ string prefix) {
+ out <<
+ indent() << prefix << " = new " << js_type_namespace(tstruct->get_program())<<tstruct->get_name() << "();" << endl <<
+ indent() << prefix << ".read(input);" << endl;
+
}
-void t_js_generator::generate_deserialize_container(ofstream& out, t_type* ttype, string prefix) {
+void t_js_generator::generate_deserialize_container(ofstream &out,
+ t_type* ttype,
+ string prefix) {
string size = tmp("_size");
string ktype = tmp("_ktype");
string vtype = tmp("_vtype");
@@ -1538,41 +1634,55 @@ void t_js_generator::generate_deserialize_container(ofstream& out, t_type* ttype
out << indent() << "var " << size << " = 0;" << endl;
out << indent() << "var " << rtmp3 << ";" << endl;
+
// Declare variables, read header
if (ttype->is_map()) {
- out << indent() << prefix << " = {};" << endl << indent() << "var " << ktype << " = 0;" << endl
- << indent() << "var " << vtype << " = 0;" << endl;
+ out <<
+ indent() << prefix << " = {};" << endl <<
+ indent() << "var " << ktype << " = 0;" << endl <<
+ indent() << "var " << vtype << " = 0;" << endl;
+
+ out << indent() << rtmp3 << " = input.readMapBegin();" << endl;
+ out << indent() << ktype << " = " << rtmp3 << ".ktype;" << endl;
+ out << indent() << vtype << " = " << rtmp3 << ".vtype;" << endl;
+ out << indent() << size << " = " << rtmp3 << ".size;" << endl;
- out << indent() << rtmp3 << " = input.readMapBegin();" << endl;
- out << indent() << ktype << " = " << rtmp3 << ".ktype;" << endl;
- out << indent() << vtype << " = " << rtmp3 << ".vtype;" << endl;
- out << indent() << size << " = " << rtmp3 << ".size;" << endl;
} else if (ttype->is_set()) {
- out << indent() << prefix << " = [];" << endl << indent() << "var " << etype << " = 0;" << endl
- << indent() << rtmp3 << " = input.readSetBegin();" << endl << indent() << etype << " = "
- << rtmp3 << ".etype;" << endl << indent() << size << " = " << rtmp3 << ".size;" << endl;
+ out <<
+ indent() << prefix << " = [];" << endl <<
+ indent() << "var " << etype << " = 0;" << endl <<
+ indent() << rtmp3 << " = input.readSetBegin();" << endl <<
+ indent() << etype << " = " << rtmp3 << ".etype;"<<endl<<
+ indent() << size << " = " << rtmp3 << ".size;"<<endl;
} else if (ttype->is_list()) {
- out << indent() << prefix << " = [];" << endl << indent() << "var " << etype << " = 0;" << endl
- << indent() << rtmp3 << " = input.readListBegin();" << endl << indent() << etype << " = "
- << rtmp3 << ".etype;" << endl << indent() << size << " = " << rtmp3 << ".size;" << endl;
+ out <<
+ indent() << prefix << " = [];" << endl <<
+ indent() << "var " << etype << " = 0;" << endl <<
+ indent() << rtmp3 << " = input.readListBegin();" << endl <<
+ indent() << etype << " = " << rtmp3 << ".etype;"<<endl<<
+ indent() << size << " = " << rtmp3 << ".size;"<<endl;
}
// For loop iterates over elements
string i = tmp("_i");
- indent(out) << "for (var " << i << " = 0; " << i << " < " << size << "; ++" << i << ")" << endl;
+ indent(out) <<
+ "for (var " <<
+ i << " = 0; " << i << " < " << size << "; ++" << i << ")" << endl;
scope_up(out);
if (ttype->is_map()) {
if (!gen_node_) {
- out << indent() << "if (" << i << " > 0 ) {" << endl << indent()
- << " if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {" << endl
- << indent() << " input.rstack.pop();" << endl << indent() << " }" << endl << indent()
- << "}" << endl;
+ out <<
+ indent() << "if (" << i << " > 0 ) {" << endl <<
+ indent() << " if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) {" << endl <<
+ indent() << " input.rstack.pop();" << endl <<
+ indent() << " }" << endl <<
+ indent() << "}" << endl;
}
generate_deserialize_map_element(out, (t_map*)ttype, prefix);
@@ -1584,6 +1694,7 @@ void t_js_generator::generate_deserialize_container(ofstream& out, t_type* ttype
scope_down(out);
+
// Read container end
if (ttype->is_map()) {
indent(out) << "input.readMapEnd();" << endl;
@@ -1594,72 +1705,92 @@ void t_js_generator::generate_deserialize_container(ofstream& out, t_type* ttype
}
}
+
/**
* Generates code to deserialize a map
*/
-void t_js_generator::generate_deserialize_map_element(ofstream& out, t_map* tmap, string prefix) {
+void t_js_generator::generate_deserialize_map_element(ofstream &out,
+ t_map* tmap,
+ string prefix) {
string key = tmp("key");
string val = tmp("val");
t_field fkey(tmap->get_key_type(), key);
t_field fval(tmap->get_val_type(), val);
- indent(out) << declare_field(&fkey, false, false) << ";" << endl;
- indent(out) << declare_field(&fval, false, false) << ";" << endl;
+ indent(out) <<
+ declare_field(&fkey, false, false) << ";" << endl;
+ indent(out) <<
+ declare_field(&fval, false, false) << ";" << endl;
generate_deserialize_field(out, &fkey);
generate_deserialize_field(out, &fval);
- indent(out) << prefix << "[" << key << "] = " << val << ";" << endl;
+ indent(out) <<
+ prefix << "[" << key << "] = " << val << ";" << endl;
}
-void t_js_generator::generate_deserialize_set_element(ofstream& out, t_set* tset, string prefix) {
+void t_js_generator::generate_deserialize_set_element(ofstream &out,
+ t_set* tset,
+ string prefix) {
string elem = tmp("elem");
t_field felem(tset->get_elem_type(), elem);
- indent(out) << "var " << elem << " = null;" << endl;
+ indent(out) <<
+ "var " << elem << " = null;" << endl;
generate_deserialize_field(out, &felem);
- indent(out) << prefix << ".push(" << elem << ");" << endl;
+ indent(out) <<
+ prefix << ".push(" << elem << ");" << endl;
}
-void t_js_generator::generate_deserialize_list_element(ofstream& out,
- t_list* tlist,
- string prefix) {
+void t_js_generator::generate_deserialize_list_element(ofstream &out,
+ t_list* tlist,
+ string prefix) {
string elem = tmp("elem");
t_field felem(tlist->get_elem_type(), elem);
- indent(out) << "var " << elem << " = null;" << endl;
+ indent(out) <<
+ "var " << elem << " = null;" << endl;
generate_deserialize_field(out, &felem);
- indent(out) << prefix << ".push(" << elem << ");" << endl;
+ indent(out) <<
+ prefix << ".push(" << elem << ");" << endl;
}
+
/**
* Serializes a field of any type.
*
* @param tfield The field to serialize
* @param prefix Name to prepend to field name
*/
-void t_js_generator::generate_serialize_field(ofstream& out, t_field* tfield, string prefix) {
+void t_js_generator::generate_serialize_field(ofstream &out,
+ t_field* tfield,
+ string prefix) {
t_type* type = get_true_type(tfield->get_type());
// Do nothing for void types
if (type->is_void()) {
- throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + prefix + tfield->get_name();
+ throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " +
+ prefix + tfield->get_name();
}
if (type->is_struct() || type->is_xception()) {
- generate_serialize_struct(out, (t_struct*)type, prefix + tfield->get_name());
+ generate_serialize_struct(out,
+ (t_struct*)type,
+ prefix +tfield->get_name() );
} else if (type->is_container()) {
- generate_serialize_container(out, type, prefix + tfield->get_name());
+ generate_serialize_container(out,
+ type,
+ prefix + tfield->get_name());
} else if (type->is_base_type() || type->is_enum()) {
string name = tfield->get_name();
- // Hack for when prefix is defined (always a hash ref)
- if (!prefix.empty())
+ //Hack for when prefix is defined (always a hash ref)
+ if(!prefix.empty())
name = prefix + tfield->get_name();
indent(out) << "output.";
@@ -1668,7 +1799,8 @@ void t_js_generator::generate_serialize_field(ofstream& out, t_field* tfield, st
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
case t_base_type::TYPE_VOID:
- throw "compiler error: cannot serialize void field in a struct: " + name;
+ throw
+ "compiler error: cannot serialize void field in a struct: " + name;
break;
case t_base_type::TYPE_STRING:
out << (((t_base_type*)type)->is_binary() ? "writeBinary(" : "writeString(") << name << ")";
@@ -1713,70 +1845,88 @@ void t_js_generator::generate_serialize_field(ofstream& out, t_field* tfield, st
* @param tstruct The struct to serialize
* @param prefix String prefix to attach to all fields
*/
-void t_js_generator::generate_serialize_struct(ofstream& out, t_struct* tstruct, string prefix) {
- (void)tstruct;
+void t_js_generator::generate_serialize_struct(ofstream &out,
+ t_struct* tstruct,
+ string prefix) {
+ (void) tstruct;
indent(out) << prefix << ".write(output);" << endl;
}
/**
* Writes out a container
*/
-void t_js_generator::generate_serialize_container(ofstream& out, t_type* ttype, string prefix) {
+void t_js_generator::generate_serialize_container(ofstream &out,
+ t_type* ttype,
+ string prefix) {
if (ttype->is_map()) {
- indent(out) << "output.writeMapBegin(" << type_to_enum(((t_map*)ttype)->get_key_type()) << ", "
- << type_to_enum(((t_map*)ttype)->get_val_type()) << ", "
- << "Thrift.objectLength(" << prefix << "));" << endl;
+ indent(out) <<
+ "output.writeMapBegin(" <<
+ type_to_enum(((t_map*)ttype)->get_key_type()) << ", " <<
+ type_to_enum(((t_map*)ttype)->get_val_type()) << ", " <<
+ "Thrift.objectLength(" << prefix << "));" << endl;
} else if (ttype->is_set()) {
- indent(out) << "output.writeSetBegin(" << type_to_enum(((t_set*)ttype)->get_elem_type()) << ", "
- << prefix << ".length);" << endl;
+ indent(out) <<
+ "output.writeSetBegin(" <<
+ type_to_enum(((t_set*)ttype)->get_elem_type()) << ", " <<
+ prefix << ".length);" << endl;
} else if (ttype->is_list()) {
- indent(out) << "output.writeListBegin(" << type_to_enum(((t_list*)ttype)->get_elem_type())
- << ", " << prefix << ".length);" << endl;
+ indent(out) <<
+ "output.writeListBegin(" <<
+ type_to_enum(((t_list*)ttype)->get_elem_type()) << ", " <<
+ prefix << ".length);" << endl;
+
}
if (ttype->is_map()) {
string kiter = tmp("kiter");
string viter = tmp("viter");
- indent(out) << "for (var " << kiter << " in " << prefix << ")" << endl;
+ indent(out) << "for (var "<<kiter<<" in "<<prefix<<")" << endl;
scope_up(out);
- indent(out) << "if (" << prefix << ".hasOwnProperty(" << kiter << "))" << endl;
+ indent(out) << "if ("<<prefix<<".hasOwnProperty("<<kiter<<"))" <<endl;
scope_up(out);
- indent(out) << "var " << viter << " = " << prefix << "[" << kiter << "];" << endl;
+ indent(out) << "var "<<viter<<" = "<<prefix<<"["<<kiter<<"];"<<endl;
generate_serialize_map_element(out, (t_map*)ttype, kiter, viter);
scope_down(out);
scope_down(out);
+
} else if (ttype->is_set()) {
string iter = tmp("iter");
- indent(out) << "for (var " << iter << " in " << prefix << ")" << endl;
+ indent(out) <<
+ "for (var "<<iter<<" in " << prefix << ")" << endl;
scope_up(out);
- indent(out) << "if (" << prefix << ".hasOwnProperty(" << iter << "))" << endl;
+ indent(out) << "if ("<<prefix<<".hasOwnProperty("<<iter<<"))" <<endl;
scope_up(out);
- indent(out) << iter << " = " << prefix << "[" << iter << "];" << endl;
+ indent(out) << iter << " = " << prefix << "[" << iter << "];"<< endl;
generate_serialize_set_element(out, (t_set*)ttype, iter);
scope_down(out);
scope_down(out);
+
} else if (ttype->is_list()) {
string iter = tmp("iter");
- indent(out) << "for (var " << iter << " in " << prefix << ")" << endl;
+ indent(out) <<
+ "for (var "<<iter<<" in "<< prefix << ")" << endl;
scope_up(out);
- indent(out) << "if (" << prefix << ".hasOwnProperty(" << iter << "))" << endl;
+ indent(out) << "if ("<<prefix<<".hasOwnProperty("<<iter<<"))" <<endl;
scope_up(out);
- indent(out) << iter << " = " << prefix << "[" << iter << "];" << endl;
+ indent(out) << iter << " = " << prefix << "[" << iter << "];"<< endl;
generate_serialize_list_element(out, (t_list*)ttype, iter);
scope_down(out);
scope_down(out);
}
if (ttype->is_map()) {
- indent(out) << "output.writeMapEnd();" << endl;
+ indent(out) <<
+ "output.writeMapEnd();" << endl;
} else if (ttype->is_set()) {
- indent(out) << "output.writeSetEnd();" << endl;
+ indent(out) <<
+ "output.writeSetEnd();" << endl;
} else if (ttype->is_list()) {
- indent(out) << "output.writeListEnd();" << endl;
+ indent(out) <<
+ "output.writeListEnd();" << endl;
}
}
@@ -1784,10 +1934,10 @@ void t_js_generator::generate_serialize_container(ofstream& out, t_type* ttype,
* Serializes the members of a map.
*
*/
-void t_js_generator::generate_serialize_map_element(ofstream& out,
- t_map* tmap,
- string kiter,
- string viter) {
+void t_js_generator::generate_serialize_map_element(ofstream &out,
+ t_map* tmap,
+ string kiter,
+ string viter) {
t_field kfield(tmap->get_key_type(), kiter);
generate_serialize_field(out, &kfield);
@@ -1798,7 +1948,9 @@ void t_js_generator::generate_serialize_map_element(ofstream& out,
/**
* Serializes the members of a set.
*/
-void t_js_generator::generate_serialize_set_element(ofstream& out, t_set* tset, string iter) {
+void t_js_generator::generate_serialize_set_element(ofstream &out,
+
<TRUNCATED>