THRIFT-991: Refactor Haskell code and generator. Part 1: clean up code generator style.
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1032342 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compiler/cpp/src/generate/t_hs_generator.cc b/compiler/cpp/src/generate/t_hs_generator.cc
index 9e08d37..36eb36c 100644
--- a/compiler/cpp/src/generate/t_hs_generator.cc
+++ b/compiler/cpp/src/generate/t_hs_generator.cc
@@ -26,10 +26,11 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sstream>
+
#include "t_oop_generator.h"
#include "platform.h"
-using namespace std;
+using namespace std;
/**
* Haskell code generator.
@@ -37,10 +38,9 @@
*/
class t_hs_generator : public t_oop_generator {
public:
- t_hs_generator(
- t_program* program,
- const std::map<std::string, std::string>& parsed_options,
- const std::string& option_string)
+ t_hs_generator(t_program* program,
+ const map<string, string>& parsed_options,
+ const string& option_string)
: t_oop_generator(program)
{
out_dir_base_ = "gen-hs";
@@ -63,105 +63,118 @@
void generate_xception (t_struct* txception);
void generate_service (t_service* tservice);
- std::string render_const_value(t_type* type, t_const_value* value);
+ string render_const_value(t_type* type, t_const_value* value);
/**
* Struct generation code
*/
- void generate_hs_struct(t_struct* tstruct, bool is_exception);
- void generate_hs_struct_definition(std::ofstream &out,t_struct* tstruct, bool is_xception=false,bool helper=false);
- void generate_hs_struct_reader(std::ofstream& out, t_struct* tstruct);
- void generate_hs_struct_writer(std::ofstream& out, t_struct* tstruct);
- void generate_hs_function_helpers(t_function* tfunction);
+ void generate_hs_struct (t_struct* tstruct,
+ bool is_exception);
+
+ void generate_hs_struct_definition (ofstream &out,
+ t_struct* tstruct,
+ bool is_xception = false,
+ bool helper = false);
+
+ void generate_hs_struct_reader (ofstream& out,
+ t_struct* tstruct);
+
+ void generate_hs_struct_writer (ofstream& out,
+ t_struct* tstruct);
+
+ void generate_hs_function_helpers (t_function* tfunction);
/**
* Service-level generation functions
*/
- void generate_service_helpers (t_service* tservice);
+ void generate_service_helpers (t_service* tservice);
void generate_service_interface (t_service* tservice);
void generate_service_client (t_service* tservice);
void generate_service_server (t_service* tservice);
- void generate_process_function (t_service* tservice, t_function* tfunction);
+ 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);
+ void generate_deserialize_field (ofstream &out,
+ t_field* tfield,
+ string prefix);
- void generate_deserialize_struct (std::ofstream &out,
- t_struct* tstruct);
+ void generate_deserialize_struct (ofstream &out,
+ t_struct* tstruct);
- void generate_deserialize_container (std::ofstream &out,
- t_type* ttype);
+ void generate_deserialize_container (ofstream &out,
+ t_type* ttype);
- void generate_deserialize_set_element (std::ofstream &out,
- t_set* tset);
+ void generate_deserialize_set_element (ofstream &out,
+ t_set* tset);
- void generate_deserialize_list_element (std::ofstream &out,
- t_list* tlist,
- std::string prefix="");
- void generate_deserialize_type (std::ofstream &out,
+ void generate_deserialize_list_element (ofstream &out,
+ t_list* tlist,
+ string prefix = "");
+
+ void generate_deserialize_type (ofstream &out,
t_type* type);
- void generate_serialize_field (std::ofstream &out,
- t_field* tfield,
- std::string name= "");
+ void generate_serialize_field (ofstream &out,
+ t_field* tfield,
+ string name = "");
- void generate_serialize_struct (std::ofstream &out,
- t_struct* tstruct,
- std::string prefix="");
+ void generate_serialize_struct (ofstream &out,
+ t_struct* tstruct,
+ string prefix = "");
- void generate_serialize_container (std::ofstream &out,
- t_type* ttype,
- std::string prefix="");
+ void generate_serialize_container (ofstream &out,
+ t_type* ttype,
+ string prefix = "");
- void generate_serialize_map_element (std::ofstream &out,
- t_map* tmap,
- std::string kiter,
- std::string viter);
+ void generate_serialize_map_element (ofstream &out,
+ t_map* tmap,
+ string kiter,
+ string viter);
- void generate_serialize_set_element (std::ofstream &out,
- t_set* tmap,
- std::string iter);
+ void generate_serialize_set_element (ofstream &out,
+ t_set* tmap,
+ string iter);
- void generate_serialize_list_element (std::ofstream &out,
- t_list* tlist,
- std::string iter);
+ void generate_serialize_list_element (ofstream &out,
+ t_list* tlist,
+ string iter);
/**
* Helper rendering functions
*/
- std::string hs_autogen_comment();
- std::string hs_language_pragma();
- std::string hs_imports();
- std::string type_name(t_type* ttype, string function_prefix = "");
- std::string function_type(t_function* tfunc, bool options = false, bool io = false, bool method = false);
- std::string type_to_enum(t_type* ttype);
- std::string render_hs_type(t_type* type, bool needs_parens = true);
+ string hs_autogen_comment();
+ string hs_language_pragma();
+ string hs_imports();
+ string type_name(t_type* ttype,
+ string function_prefix = "");
+
+ string function_type(t_function* tfunc,
+ bool options = false,
+ bool io = false,
+ bool method = false);
+
+ string type_to_enum(t_type* ttype);
+
+ string render_hs_type(t_type* type,
+ bool needs_parens = true);
private:
-
- /**
- * File streams
- */
-
- std::ofstream f_types_;
- std::ofstream f_consts_;
- std::ofstream f_service_;
- std::ofstream f_iface_;
- std::ofstream f_client_;
-
+ ofstream f_types_;
+ ofstream f_consts_;
+ ofstream f_service_;
+ ofstream f_iface_;
+ ofstream f_client_;
};
-
/**
* Prepares for file generation by opening up the necessary file output
* streams.
@@ -173,51 +186,44 @@
MKDIR(get_out_dir().c_str());
// Make output file
-
string pname = capitalize(program_name_);
- string f_types_name = get_out_dir()+pname+"_Types.hs";
+ string f_types_name = get_out_dir() + pname + "_Types.hs";
f_types_.open(f_types_name.c_str());
- string f_consts_name = get_out_dir()+pname+"_Consts.hs";
+ string f_consts_name = get_out_dir() + pname + "_Consts.hs";
f_consts_.open(f_consts_name.c_str());
-
-
// Print header
- f_types_ <<
- hs_language_pragma() << endl <<
- hs_autogen_comment() << endl <<
- "module " << pname <<"_Types where" << endl <<
- hs_imports() << endl;
+ f_types_ << hs_language_pragma() << endl;
+ f_types_ << hs_autogen_comment() << endl;
+ f_types_ << "module " << pname << "_Types where" << endl;
+ f_types_ << hs_imports() << endl;
- f_consts_ <<
- hs_language_pragma() << endl <<
- hs_autogen_comment() << endl <<
- "module " << pname <<"_Consts where" << endl <<
- hs_imports() << endl <<
- "import " << pname<<"_Types"<< endl;
-
+ f_consts_ << hs_language_pragma() << endl;
+ f_consts_ << hs_autogen_comment() << endl;
+ f_consts_ << "module " << pname << "_Consts where" << endl;
+ f_consts_ << hs_imports() << endl;
+ f_consts_ << "import " << pname << "_Types" << endl;
}
string t_hs_generator::hs_language_pragma() {
- return std::string("{-# LANGUAGE DeriveDataTypeable #-}\n"
- "{-# OPTIONS_GHC -fno-warn-missing-fields #-}\n"
- "{-# OPTIONS_GHC -fno-warn-missing-signatures #-}\n"
- "{-# OPTIONS_GHC -fno-warn-name-shadowing #-}\n"
- "{-# OPTIONS_GHC -fno-warn-unused-imports #-}\n"
- "{-# OPTIONS_GHC -fno-warn-unused-matches #-}\n");
+ return string("{-# LANGUAGE DeriveDataTypeable #-}\n"
+ "{-# OPTIONS_GHC -fno-warn-missing-fields #-}\n"
+ "{-# OPTIONS_GHC -fno-warn-missing-signatures #-}\n"
+ "{-# OPTIONS_GHC -fno-warn-name-shadowing #-}\n"
+ "{-# OPTIONS_GHC -fno-warn-unused-imports #-}\n"
+ "{-# OPTIONS_GHC -fno-warn-unused-matches #-}\n");
}
/**
* Autogen'd comment
*/
string t_hs_generator::hs_autogen_comment() {
- return
- std::string("-----------------------------------------------------------------\n") +
- "-- Autogenerated by Thrift --\n" +
- "-- --\n" +
- "-- DO NOT EDIT UNLESS YOU ARE SURE YOU KNOW WHAT YOU ARE DOING --\n" +
- "-----------------------------------------------------------------\n";
+ return string("-----------------------------------------------------------------\n") +
+ "-- Autogenerated by Thrift --\n" +
+ "-- --\n" +
+ "-- DO NOT EDIT UNLESS YOU ARE SURE YOU KNOW WHAT YOU ARE DOING --\n" +
+ "-----------------------------------------------------------------\n";
}
/**
@@ -225,15 +231,28 @@
*/
string t_hs_generator::hs_imports() {
const vector<t_program*>& includes = program_->get_includes();
- string result = "";
- for (size_t i = 0; i < includes.size(); ++i) {
- result += "import qualified " + capitalize(includes[i]->get_name()) + "_Types\n";
- }
- if (includes.size() > 0) {
- result += "\n";
- }
+ string result = string(
+ "import Prelude ( Bool(..), Enum, Double, String, Maybe(..),\n"
+ " Eq, Show, Ord,\n"
+ " return, length, IO, fromIntegral, fromEnum, toEnum,\n"
+ " (&&), (||), (==), (++), ($), (-) )\n"
+ "\n"
+ "import Control.Exception\n"
+ "import Data.ByteString.Lazy\n"
+ "import Data.Int\n"
+ "import Data.Typeable ( Typeable )\n"
+ "import qualified Data.Map as Map\n"
+ "import qualified Data.Set as Set\n"
+ "\n"
+ "import Thrift\n"
+ "\n");
- result += "import Thrift\nimport Data.Typeable ( Typeable )\nimport Control.Exception\nimport qualified Data.Map as Map\nimport qualified Data.Set as Set\nimport Data.ByteString.Lazy\nimport Data.Int\nimport Prelude ((==), String, Eq, Show, Ord, Maybe(..), (&&), (||), return, IO, Enum, fromIntegral, fromEnum, toEnum, Bool(..), (++), ($), Double, (-), length)";
+ for (size_t i = 0; i < includes.size(); ++i)
+ result += "import qualified " + capitalize(includes[i]->get_name()) + "_Types\n";
+
+ if (includes.size() > 0)
+ result += "\n";
+
return result;
}
@@ -252,8 +271,10 @@
* @param ttypedef The type definition
*/
void t_hs_generator::generate_typedef(t_typedef* ttypedef) {
- f_types_ <<
- indent() << "type "<< capitalize(ttypedef->get_symbolic()) << " = " << render_hs_type(ttypedef->get_type(), false) << endl << endl;
+ string tname = capitalize(ttypedef->get_symbolic());
+ string tdef = render_hs_type(ttypedef->get_type(), false);
+ indent(f_types_) << "type " << tname << " = " << tdef << endl;
+ f_types_ << endl;
}
/**
@@ -263,26 +284,28 @@
* @param tenum The enumeration
*/
void t_hs_generator::generate_enum(t_enum* tenum) {
- indent(f_types_) << "data "<<capitalize(tenum->get_name())<<" = ";
+ indent(f_types_) << "data " << capitalize(tenum->get_name()) << " = ";
indent_up();
vector<t_enum_value*> constants = tenum->get_constants();
vector<t_enum_value*>::iterator c_iter;
+
bool first = true;
for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
string name = capitalize((*c_iter)->get_name());
- if(first)
- first=false;
- else
- f_types_ << "|";
+ f_types_ << (first ? "" : "|");
f_types_ << name;
+ first = false;
}
indent(f_types_) << "deriving (Show,Eq, Typeable, Ord)" << endl;
indent_down();
- indent(f_types_) << "instance Enum " << capitalize(tenum->get_name()) << " where" << endl;
+ string ename = capitalize(tenum->get_name());
+ indent(f_types_) << "instance Enum " << ename << " where" << endl;
indent_up();
+
indent(f_types_) << "fromEnum t = case t of" << endl;
indent_up();
+
for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
int value = (*c_iter)->get_value();
string name = capitalize((*c_iter)->get_name());
@@ -292,6 +315,7 @@
indent(f_types_) << "toEnum t = case t of" << endl;
indent_up();
+
for(c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
int value = (*c_iter)->get_value();
string name = capitalize((*c_iter)->get_name());
@@ -308,10 +332,12 @@
void t_hs_generator::generate_const(t_const* tconst) {
t_type* type = tconst->get_type();
string name = decapitalize(tconst->get_name());
+
t_const_value* value = tconst->get_value();
indent(f_consts_) << name << " :: " << render_hs_type(type, false) << endl;
- indent(f_consts_) << name << " = " << render_const_value(type, value) << endl << endl;
+ indent(f_consts_) << name << " = " << render_const_value(type, value) << endl;
+ f_consts_ << endl;
}
/**
@@ -321,7 +347,8 @@
*/
string t_hs_generator::render_const_value(t_type* type, t_const_value* value) {
type = get_true_type(type);
- std::ostringstream out;
+ ostringstream out;
+
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
@@ -357,9 +384,11 @@
out << value->get_double();
}
break;
+
default:
throw "compiler error: no const of base type " + t_base_type::t_base_name(tbase);
}
+
} else if (type->is_enum()) {
t_enum* tenum = (t_enum*)type;
vector<t_enum_value*> constants = tenum->get_constants();
@@ -371,82 +400,86 @@
break;
}
}
+
} else if (type->is_struct() || type->is_xception()) {
string cname = type_name(type);
indent(out) << cname << "{";
+
const vector<t_field*>& fields = ((t_struct*)type)->get_members();
vector<t_field*>::const_iterator f_iter;
+
const map<t_const_value*, t_const_value*>& val = value->get_map();
map<t_const_value*, t_const_value*>::const_iterator v_iter;
+
bool first = true;
for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
t_type* field_type = NULL;
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if ((*f_iter)->get_name() == v_iter->first->get_string()) {
- field_type = (*f_iter)->get_type();
- }
- }
- if (field_type == NULL) {
- throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
- }
- string fname = v_iter->first->get_string();
- if(first)
- first=false;
- else
- out << ",";
- out << "f_" << cname << "_" << fname << " = Just (" << render_const_value(field_type, v_iter->second) << ")";
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter)
+ if ((*f_iter)->get_name() == v_iter->first->get_string())
+ field_type = (*f_iter)->get_type();
+
+ if (field_type == NULL)
+ throw "type error: " + type->get_name() + " has no field " + v_iter->first->get_string();
+
+ string fname = v_iter->first->get_string();
+ string const_value = render_const_value(field_type, v_iter->second);
+
+ out << (first ? "" : ",");
+ out << "f_" << cname << "_" << fname << " = Just (" << const_value << ")";
+ first = false;
}
+
indent(out) << "}";
+
} else if (type->is_map()) {
t_type* ktype = ((t_map*)type)->get_key_type();
t_type* vtype = ((t_map*)type)->get_val_type();
+
const map<t_const_value*, t_const_value*>& val = value->get_map();
map<t_const_value*, t_const_value*>::const_iterator v_iter;
+
out << "(Map.fromList [";
- bool first=true;
+
+ bool first = true;
for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
string key = render_const_value(ktype, v_iter->first);
string val = render_const_value(vtype, v_iter->second);
- if(first)
- first=false;
- else
- out << ",";
- out << "(" << key << ","<< val << ")";
+ out << (first ? "" : ",");
+ out << "(" << key << "," << val << ")";
+ first = false;
}
out << "])";
- } else if (type->is_list() || type->is_set()) {
- t_type* etype;
- if (type->is_list()) {
- etype = ((t_list*) type)->get_elem_type();
- } else {
- etype = ((t_set*) type)->get_elem_type();
- }
+ } else if (type->is_list() || type->is_set()) {
+ t_type* etype = type->is_list()
+ ? ((t_list*) type)->get_elem_type()
+ : ((t_set*) type)->get_elem_type();
const vector<t_const_value*>& val = value->get_list();
vector<t_const_value*>::const_iterator v_iter;
- bool first = true;
if (type->is_set())
- out << "(Set.fromList ";
+ out << "(Set.fromList ";
out << "[";
+ bool first = true;
for (v_iter = val.begin(); v_iter != val.end(); ++v_iter) {
- if(first)
- first=false;
- else
- out << ",";
+ out << (first ? "" : ",");
out << render_const_value(etype, *v_iter);
+ first = false;
}
out << "]";
+
if (type->is_set())
- out << ")";
+ out << ")";
+
} else {
throw "CANNOT GENERATE CONSTANT FOR TYPE: " + type->get_name();
}
+
return out.str();
}
@@ -471,7 +504,7 @@
* Generates a Haskell struct
*/
void t_hs_generator::generate_hs_struct(t_struct* tstruct,
- bool is_exception) {
+ bool is_exception) {
generate_hs_struct_definition(f_types_,tstruct, is_exception,false);
}
@@ -486,100 +519,107 @@
bool helper) {
string tname = type_name(tstruct);
string name = tstruct->get_name();
+
const vector<t_field*>& members = tstruct->get_members();
vector<t_field*>::const_iterator m_iter;
- indent(out) << "data "<<tname<<" = "<<tname;
+ indent(out) << "data " << tname << " = " << tname;
if (members.size() > 0) {
out << "{";
- bool first=true;
+
+ bool first = true;
for (m_iter = members.begin(); m_iter != members.end(); ++m_iter) {
- if(first)
- first=false;
- else
- out << ",";
string mname = (*m_iter)->get_name();
+ out << (first ? "" : ",");
out << "f_" << tname << "_" << mname << " :: Maybe " << render_hs_type((*m_iter)->get_type());
+ first = false;
}
out << "}";
}
out << " deriving (Show,Eq,Ord,Typeable)" << endl;
- if (is_exception) out << "instance Exception " << tname << endl;
+
+ if (is_exception)
+ out << "instance Exception " << tname << endl;
+
generate_hs_struct_writer(out, tstruct);
-
generate_hs_struct_reader(out, tstruct);
- //f_struct_.close();
}
-
-
/**
* Generates the read method for a struct
*/
void t_hs_generator::generate_hs_struct_reader(ofstream& out, t_struct* tstruct) {
const vector<t_field*>& fields = tstruct->get_members();
vector<t_field*>::const_iterator f_iter;
+
string sname = type_name(tstruct);
string str = tmp("_str");
string t = tmp("_t");
string id = tmp("_id");
indent(out) << "read_" << sname << "_fields iprot record = do" << endl;
- indent_up(); // do
+ indent_up();
// Read beginning field marker
- indent(out) << "(_," << t <<","<<id<<") <- readFieldBegin iprot" << endl;
+ indent(out) << "(_," << t << "," << id << ") <- readFieldBegin iprot" << endl;
+
// Check for field STOP marker and break
- indent(out) <<
- "if " << t <<" == T_STOP then return record else" << endl;
- indent_up(); // if
- indent(out) << "case " << id<<" of " << endl;
- indent_up(); // case
+ indent(out) << "if " << t << " == T_STOP then return record else" << endl;
+
+ indent_up();
+ indent(out) << "case " << id << " of " << endl;
+ indent_up();
+
// Generate deserialization code for known cases
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- indent(out) << (*f_iter)->get_key() << " -> ";
- out << "if " << t <<" == " << type_to_enum((*f_iter)->get_type()) << " then do" << endl;
- indent_up(); // if
+ int32_t key = (*f_iter)->get_key();
+ string etype = type_to_enum((*f_iter)->get_type());
+ indent(out) << key << " -> " << "if " << t << " == " << etype << " then do" << endl;
+
+ indent_up();
indent(out) << "s <- ";
generate_deserialize_field(out, *f_iter,str);
out << endl;
- indent(out) << "read_"<<sname<<"_fields iprot record{f_"<<sname<<"_"<< decapitalize((*f_iter)->get_name()) <<"=Just s}" << endl;
- out <<
- indent() << "else do" << endl;
+
+ string fname = decapitalize((*f_iter)->get_name());
+ indent(out) << "read_" << sname << "_fields iprot record{f_" << sname << "_" << fname << "=Just s}" << endl;
+
+ indent(out) << "else do" << endl;
+
indent_up();
- indent(out) << "skip iprot "<< t << endl;
- indent(out) << "read_"<<sname<<"_fields iprot record" << endl;
- indent_down(); // -do
- indent_down(); // -if
+ indent(out) << "skip iprot " << t << endl;
+
+ indent(out) << "read_" << sname << "_fields iprot record" << endl;
+
+ indent_down();
+ indent_down();
}
-
// In the default case we skip the field
- out <<
- indent() << "_ -> do" << endl;
+ indent(out) << "_ -> do" << endl;
indent_up();
- indent(out) << "skip iprot "<<t<< endl;
+ indent(out) << "skip iprot " << t << endl;
indent(out) << "readFieldEnd iprot" << endl;
- indent(out) << "read_"<<sname<<"_fields iprot record" << endl;
- indent_down(); // -case
- indent_down(); // -if
- indent_down(); // -do
+ indent(out) << "read_" << sname << "_fields iprot record" << endl;
+ indent_down();
+ indent_down();
+ indent_down();
indent_down();
// read
- indent(out) << "read_"<<sname<<" iprot = do" << endl;
+ indent(out) << "read_" << sname << " iprot = do" << endl;
indent_up();
indent(out) << "_ <- readStructBegin iprot" << endl;
- indent(out) << "record <- read_"<<sname<<"_fields iprot ("<<sname<<"{";
+ indent(out) << "record <- read_" << sname << "_fields iprot (" << sname << "{";
+
bool first = true;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if(first)
- first=false;
- else
- out << ",";
+ out << (first ? "" : ",");
out << "f_" << sname << "_" << decapitalize((*f_iter)->get_name()) << "=Nothing";
+ first = false;
}
+
out << "})" << endl;
indent(out) << "readStructEnd iprot" << endl;
indent(out) << "return record" << endl;
@@ -594,34 +634,33 @@
string str = tmp("_str");
string f = tmp("_f");
- indent(out) <<
- "write_"<<name<<" oprot record = do" << endl;
+ indent(out) << "write_" << name << " oprot record = do" << endl;
indent_up();
- indent(out) <<
- "writeStructBegin oprot \""<<name<<"\"" << endl;
+ indent(out) << "writeStructBegin oprot \"" << name << "\"" << endl;
+
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
// Write field header
string mname = (*f_iter)->get_name();
- indent(out) <<
- "case f_" << name << "_" << mname << " record of {Nothing -> return (); Just _v -> do" << endl;
+ indent(out) << "case f_" << name << "_" << mname << " record of {Nothing -> return (); Just _v -> do" << endl;
+
indent_up();
- indent(out) << "writeFieldBegin oprot (\""<< (*f_iter)->get_name()<<"\","
- <<type_to_enum((*f_iter)->get_type())<<","
- <<(*f_iter)->get_key()<<")" << endl;
+ indent(out) << "writeFieldBegin oprot (\"" << (*f_iter)->get_name() << "\","
+ << type_to_enum((*f_iter)->get_type()) << ","
+ << (*f_iter)->get_key() << ")" << endl;
// Write field contents
- out << indent();
+ indent(out);
generate_serialize_field(out, *f_iter, "_v");
out << endl;
+
// Write field closer
indent(out) << "writeFieldEnd oprot}" << endl;
indent_down();
}
// Write the struct map
- out <<
- indent() << "writeFieldStop oprot" << endl <<
- indent() << "writeStructEnd oprot" << endl;
+ indent(out) << "writeFieldStop oprot" << endl;
+ indent(out) << "writeStructEnd oprot" << endl;
indent_down();
}
@@ -632,26 +671,20 @@
* @param tservice The service definition
*/
void t_hs_generator::generate_service(t_service* tservice) {
- string f_service_name = get_out_dir()+capitalize(service_name_)+".hs";
+ string f_service_name = get_out_dir() + capitalize(service_name_) + ".hs";
f_service_.open(f_service_name.c_str());
- f_service_ <<
- hs_language_pragma() << endl <<
- hs_autogen_comment() << endl <<
- "module " << capitalize(service_name_) << " where" << endl <<
- hs_imports() << endl;
+ f_service_ << hs_language_pragma() << endl;
+ f_service_ << hs_autogen_comment() << endl;
+ f_service_ << "module " << capitalize(service_name_) << " where" << endl;
+ f_service_ << hs_imports() << endl;
-
- if(tservice->get_extends()){
- f_service_ <<
- "import qualified " << capitalize(tservice->get_extends()->get_name()) << endl;
+ if (tservice->get_extends()) {
+ f_service_ << "import qualified " << capitalize(tservice->get_extends()->get_name()) << endl;
}
-
- f_service_ <<
- "import " << capitalize(program_name_) << "_Types" << endl <<
- "import qualified " << capitalize(service_name_) << "_Iface as Iface" << endl;
-
+ f_service_ << "import " << capitalize(program_name_) << "_Types" << endl;
+ f_service_ << "import qualified " << capitalize(service_name_) << "_Iface as Iface" << endl;
// Generate the three main parts of the service
generate_service_helpers(tservice);
@@ -659,7 +692,6 @@
generate_service_client(tservice);
generate_service_server(tservice);
-
// Close service file
f_service_.close();
}
@@ -673,8 +705,8 @@
vector<t_function*> functions = tservice->get_functions();
vector<t_function*>::iterator f_iter;
- indent(f_service_) <<
- "-- HELPER FUNCTIONS AND STRUCTURES --" << endl << endl;
+ indent(f_service_) << "-- HELPER FUNCTIONS AND STRUCTURES --" << endl;
+ indent(f_service_) << endl;
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
t_struct* ts = (*f_iter)->get_arglist();
@@ -691,16 +723,17 @@
void t_hs_generator::generate_hs_function_helpers(t_function* tfunction) {
t_struct result(program_, decapitalize(tfunction->get_name()) + "_result");
t_field success(tfunction->get_returntype(), "success", 0);
- if (!tfunction->get_returntype()->is_void()) {
+
+ 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) {
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter)
result.append(*f_iter);
- }
+
generate_hs_struct_definition(f_service_,&result, false);
}
@@ -710,38 +743,40 @@
* @param tservice The service to generate a header definition for
*/
void t_hs_generator::generate_service_interface(t_service* tservice) {
- string f_iface_name = get_out_dir()+capitalize(service_name_)+"_Iface.hs";
+ string f_iface_name = get_out_dir() + capitalize(service_name_) + "_Iface.hs";
f_iface_.open(f_iface_name.c_str());
- f_iface_ <<
- hs_language_pragma() << endl <<
- hs_autogen_comment() << endl;
- indent(f_iface_) << "module " << capitalize(service_name_) << "_Iface where" << endl;
+ f_iface_ << hs_language_pragma() << endl;
+ f_iface_ << hs_autogen_comment() << endl;
- indent(f_iface_) <<
- hs_imports() << endl <<
- "import " << capitalize(program_name_) << "_Types" << endl <<
- endl;
+ f_iface_ << "module " << capitalize(service_name_) << "_Iface where" << endl;
+ f_iface_ << hs_imports() << endl;
+ f_iface_ << "import " << capitalize(program_name_) << "_Types" << endl;
+ f_iface_ << endl;
+
+ string sname = capitalize(service_name_);
if (tservice->get_extends() != NULL) {
string extends = type_name(tservice->get_extends());
- indent(f_iface_) << "import " << extends <<"_Iface" << endl;
- indent(f_iface_) << "class "<< extends << "_Iface a => " << capitalize(service_name_) << "_Iface a where" << endl;
+
+ indent(f_iface_) << "import " << extends << "_Iface" << endl;
+ indent(f_iface_) << "class " << extends << "_Iface a => " << sname << "_Iface a where" << endl;
+
} else {
- f_iface_ << indent() << "class " << capitalize(service_name_) << "_Iface a where" << endl;
+ indent(f_iface_) << "class " << sname << "_Iface a where" << endl;
}
+
indent_up();
vector<t_function*> functions = tservice->get_functions();
vector<t_function*>::iterator f_iter;
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- string ft = function_type(*f_iter,true,true,true);
- f_iface_ <<
- indent() << decapitalize((*f_iter)->get_name()) << " :: a -> " << ft << endl;
+ string ft = function_type(*f_iter, true, true, true);
+ indent(f_iface_) << decapitalize((*f_iter)->get_name()) << " :: a -> " << ft << endl;
}
+
indent_down();
f_iface_.close();
-
}
/**
@@ -751,42 +786,42 @@
* @param tservice The service to generate a server for.
*/
void t_hs_generator::generate_service_client(t_service* tservice) {
- string f_client_name = get_out_dir()+capitalize(service_name_)+"_Client.hs";
+ string f_client_name = get_out_dir() + capitalize(service_name_) + "_Client.hs";
f_client_.open(f_client_name.c_str());
- f_client_ <<
- hs_language_pragma() << endl <<
- hs_autogen_comment() << endl;
+ f_client_ << hs_language_pragma() << endl;
+ f_client_ << hs_autogen_comment() << endl;
vector<t_function*> functions = tservice->get_functions();
vector<t_function*>::const_iterator f_iter;
string extends = "";
- string exports="";
+ string exports = "";
+
bool first = true;
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
- if(first)
- first=false;
- else
- exports+=",";
+ exports += (first ? "" : ",");
string funname = (*f_iter)->get_name();
exports += decapitalize(funname);
+ first = false;
}
- indent(f_client_) << "module " << capitalize(service_name_) << "_Client(" << exports << ") where" << endl;
+
+ string sname = capitalize(service_name_);
+ indent(f_client_) << "module " << sname << "_Client(" << exports << ") where" << endl;
if (tservice->get_extends() != NULL) {
extends = type_name(tservice->get_extends());
indent(f_client_) << "import " << extends << "_Client" << endl;
}
+
indent(f_client_) << "import Data.IORef" << endl;
indent(f_client_) << hs_imports() << endl;
indent(f_client_) << "import " << capitalize(program_name_) << "_Types" << endl;
indent(f_client_) << "import " << capitalize(service_name_) << endl;
+
// DATS RITE A GLOBAL VAR
indent(f_client_) << "seqid = newIORef 0" << endl;
-
// Generate client method implementations
-
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
t_struct* arg_struct = (*f_iter)->get_arglist();
const vector<t_field*>& fields = arg_struct->get_members();
@@ -794,9 +829,8 @@
string funname = (*f_iter)->get_name();
string fargs = "";
- for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
- fargs+= " arg_" + decapitalize((*fld_iter)->get_name());
- }
+ for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter)
+ fargs += " arg_" + decapitalize((*fld_iter)->get_name());
// Open function
indent(f_client_) << decapitalize(funname) << " (ip,op)" << fargs << " = do" << endl;
@@ -805,115 +839,100 @@
f_client_ << endl;
- if (!(*f_iter)->is_oneway()) {
- f_client_ << indent();
- f_client_ <<
- "recv_" << funname << " ip" << endl;
- }
+ if (!(*f_iter)->is_oneway())
+ indent(f_client_) << "recv_" << funname << " ip" << endl;
+
indent_down();
- indent(f_client_) <<
- "send_" << funname << " op" << fargs << " = do" << endl;
+ indent(f_client_) << "send_" << funname << " op" << fargs << " = do" << endl;
indent_up();
+
indent(f_client_) << "seq <- seqid" << endl;
indent(f_client_) << "seqn <- readIORef seq" << endl;
- std::string argsname = capitalize((*f_iter)->get_name() + "_args");
+ string argsname = capitalize((*f_iter)->get_name() + "_args");
// Serialize the request header
- f_client_ <<
- indent() << "writeMessageBegin op (\"" << (*f_iter)->get_name() << "\", M_CALL, seqn)" << endl;
- f_client_ << indent() << "write_" << argsname << " op ("<<argsname<<"{";
+ string fname = (*f_iter)->get_name();
+ indent(f_client_) << "writeMessageBegin op (\"" << fname << "\", M_CALL, seqn)" << endl;
+ indent(f_client_) << "write_" << argsname << " op (" << argsname << "{";
+
bool first = true;
for (fld_iter = fields.begin(); fld_iter != fields.end(); ++fld_iter) {
- if(first)
- first=false;
- else
- f_client_ << ",";
- f_client_ << "f_" << argsname <<"_" << (*fld_iter)->get_name() << "=Just arg_" << (*fld_iter)->get_name();
+ string fieldname = (*fld_iter)->get_name();
+ f_client_ << (first ? "" : ",");
+ f_client_ << "f_" << argsname << "_" << fieldname << "=Just arg_" << fieldname;
+ first = false;
}
f_client_ << "})" << endl;
// Write to the stream
- f_client_ <<
- indent() << "writeMessageEnd op" << endl <<
- indent() << "tFlush (getTransport op)" << endl;
-
+ indent(f_client_) << "writeMessageEnd op" << endl;
+ indent(f_client_) << "tFlush (getTransport op)" << endl;
indent_down();
if (!(*f_iter)->is_oneway()) {
- std::string resultname = capitalize((*f_iter)->get_name() + "_result");
+ string resultname = capitalize((*f_iter)->get_name() + "_result");
t_struct noargs(program_);
- std::string funname = string("recv_") + (*f_iter)->get_name();
+ string funname = string("recv_") + (*f_iter)->get_name();
+ t_function recv_function((*f_iter)->get_returntype(), funname, &noargs);
- t_function recv_function((*f_iter)->get_returntype(),
- funname,
- &noargs);
// Open function
- f_client_ <<
- indent() << funname << " ip = do" << endl;
- indent_up(); // fun
+ indent(f_client_) << funname << " ip = do" << endl;
+ indent_up();
// TODO(mcslee): Validate message reply here, seq ids etc.
-
- f_client_ <<
- indent() << "(fname, mtype, rseqid) <- readMessageBegin ip" << endl;
- f_client_ <<
- indent() << "if mtype == M_EXCEPTION then do" << endl <<
- indent() << " x <- readAppExn ip" << endl <<
- indent() << " readMessageEnd ip" << endl;
- f_client_ <<
- indent() << " throw x" << endl;
- f_client_ <<
- indent() << " else return ()" << endl;
+ indent(f_client_) << "(fname, mtype, rseqid) <- readMessageBegin ip" << endl;
+ indent(f_client_) << "if mtype == M_EXCEPTION then do" << endl;
+ indent(f_client_) << " x <- readAppExn ip" << endl;
+ indent(f_client_) << " readMessageEnd ip" << endl;
+ indent(f_client_) << " throw x" << endl;
+ indent(f_client_) << " else return ()" << endl;
t_struct* xs = (*f_iter)->get_xceptions();
- const std::vector<t_field*>& xceptions = xs->get_members();
+ const vector<t_field*>& xceptions = xs->get_members();
- f_client_ <<
- indent() << "res <- read_" << resultname << " ip" << endl;
- f_client_ <<
- indent() << "readMessageEnd ip" << endl;
+ indent(f_client_) << "res <- read_" << resultname << " ip" << endl;
+ indent(f_client_) << "readMessageEnd ip" << endl;
// Careful, only return _result if not a void function
if (!(*f_iter)->get_returntype()->is_void()) {
- f_client_ <<
- indent() << "case f_" << resultname << "_success res of" << endl;
- indent_up(); // case
+ indent(f_client_) << "case f_" << resultname << "_success res of" << endl;
+ indent_up();
+
indent(f_client_) << "Just v -> return v" << endl;
indent(f_client_) << "Nothing -> do" << endl;
- indent_up(); // none
+ indent_up();
}
-
vector<t_field*>::const_iterator x_iter;
for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
- f_client_ <<
- indent() << "case f_"<< resultname << "_" << (*x_iter)->get_name() << " res of" << endl;
- indent_up(); //case
+ string xname = (*x_iter)->get_name();
+ indent(f_client_) << "case f_" << resultname << "_" << xname << " res of" << endl;
+ indent_up();
+
indent(f_client_) << "Nothing -> return ()" << endl;
indent(f_client_) << "Just _v -> throw _v" << endl;
- indent_down(); //-case
+ indent_down();
}
// Careful, only return _result if not a void function
if ((*f_iter)->get_returntype()->is_void()) {
- indent(f_client_) <<
- "return ()" << endl;
+ indent(f_client_) << "return ()" << endl;
+
} else {
- f_client_ <<
- indent() << "throw (AppExn AE_MISSING_RESULT \"" << (*f_iter)->get_name() << " failed: unknown result\")" << endl;
- indent_down(); //-none
- indent_down(); //-case
+ string tname = (*f_iter)->get_name();
+ indent(f_client_) << "throw (AppExn AE_MISSING_RESULT \"" << tname << " failed: unknown result\")" << endl;
+ indent_down();
+ indent_down();
}
// Close function
- indent_down(); //-fun
+ indent_down();
}
}
+
f_client_.close();
-
-
}
/**
@@ -927,20 +946,21 @@
vector<t_function*>::iterator f_iter;
// Generate the process subfunctions
- for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+ for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter)
generate_process_function(tservice, *f_iter);
- }
-
indent(f_service_) << "proc_ handler (iprot,oprot) (name,typ,seqid) = case name of" << endl;
indent_up();
+
for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
string fname = (*f_iter)->get_name();
- indent(f_service_) << "\""<<fname<<"\" -> process_" << decapitalize(fname) << " (seqid,iprot,oprot,handler)" << endl;
+ indent(f_service_) << "\"" << fname << "\" -> process_" << decapitalize(fname) << " (seqid,iprot,oprot,handler)" << endl;
}
+
indent(f_service_) << "_ -> ";
- if(tservice->get_extends() != NULL){
+ if (tservice->get_extends() != NULL) {
f_service_ << type_name(tservice->get_extends()) << ".proc_ handler (iprot,oprot) (name,typ,seqid)" << endl;
+
} else {
f_service_ << "do" << endl;
indent_up();
@@ -952,19 +972,17 @@
indent(f_service_) << "tFlush (getTransport oprot)" << endl;
indent_down();
}
+
indent_down();
// Generate the server implementation
- indent(f_service_) <<
- "process handler (iprot, oprot) = do" << endl;
+ indent(f_service_) << "process handler (iprot, oprot) = do" << endl;
indent_up();
- f_service_ <<
- indent() << "(name, typ, seqid) <- readMessageBegin iprot" << endl;
- f_service_ << indent() << "proc_ handler (iprot,oprot) (name,typ,seqid)" << endl;
+ indent(f_service_) << "(name, typ, seqid) <- readMessageBegin iprot" << endl;
+ indent(f_service_) << "proc_ handler (iprot,oprot) (name,typ,seqid)" << endl;
indent(f_service_) << "return True" << endl;
indent_down();
-
}
/**
@@ -975,8 +993,8 @@
void t_hs_generator::generate_process_function(t_service* tservice,
t_function* tfunction) {
// Open function
- indent(f_service_) <<
- "process_" << decapitalize(tfunction->get_name()) << " (seqid, iprot, oprot, handler) = do" << endl;
+ string funname = decapitalize(tfunction->get_name());
+ indent(f_service_) << "process_" << funname << " (seqid, iprot, oprot, handler) = do" << endl;
indent_up();
string argsname = capitalize(tfunction->get_name()) + "_args";
@@ -984,94 +1002,91 @@
// Generate the function call
t_struct* arg_struct = tfunction->get_arglist();
- const std::vector<t_field*>& fields = arg_struct->get_members();
+ const vector<t_field*>& fields = arg_struct->get_members();
vector<t_field*>::const_iterator f_iter;
-
- f_service_ <<
- indent() << "args <- read_" << argsname << " iprot" << endl;
- f_service_ <<
- indent() << "readMessageEnd iprot" << endl;
+ indent(f_service_) << "args <- read_" << argsname << " iprot" << endl;
+ indent(f_service_) << "readMessageEnd iprot" << endl;
t_struct* xs = tfunction->get_xceptions();
- const std::vector<t_field*>& xceptions = xs->get_members();
+ const vector<t_field*>& xceptions = xs->get_members();
vector<t_field*>::const_iterator x_iter;
- int n = xceptions.size();
- if (!tfunction->is_oneway()){
- if(!tfunction->get_returntype()->is_void()){
+
+ size_t n = xceptions.size();
+ if (!tfunction->is_oneway()) {
+ if (!tfunction->get_returntype()->is_void())
n++;
- }
+
indent(f_service_) << "rs <- return (" << resultname;
- for(int i=0; i<n;i++){
+ for(size_t i = 0; i < n; i++)
f_service_ << " Nothing";
- }
+
f_service_ << ")" << endl;
}
indent(f_service_) << "res <- ";
// Try block for a function with exceptions
if (xceptions.size() > 0) {
- for(unsigned int i=0;i<xceptions.size();i++){
+ for(size_t i = 0; i < xceptions.size(); i++) {
f_service_ << "(Control.Exception.catch" << endl;
indent_up();
- f_service_ << indent();
+ indent(f_service_);
}
}
f_service_ << "(do" << endl;
indent_up();
- f_service_ << indent();
- if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()){
+ indent(f_service_);
+
+ if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void())
f_service_ << "res <- ";
- }
+
f_service_ << "Iface." << decapitalize(tfunction->get_name()) << " handler";
- for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
+ for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter)
f_service_ << " (f_" << argsname << "_" << (*f_iter)->get_name() << " args)";
- }
-
- if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()){
+ if (!tfunction->is_oneway() && !tfunction->get_returntype()->is_void()) {
f_service_ << endl;
- indent(f_service_) << "return rs{f_"<<resultname<<"_success= Just res}";
- } else if (!tfunction->is_oneway()){
+ indent(f_service_) << "return rs{f_" << resultname << "_success= Just res}";
+
+ } else if (!tfunction->is_oneway()) {
f_service_ << endl;
indent(f_service_) << "return rs";
}
+
f_service_ << ")" << endl;
indent_down();
if (xceptions.size() > 0 && !tfunction->is_oneway()) {
for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) {
- indent(f_service_) << "(\\e -> " <<endl;
+ indent(f_service_) << "(\\e -> " << endl;
indent_up();
- if(!tfunction->is_oneway()){
- f_service_ <<
- indent() << "return rs{f_"<<resultname<<"_" << (*x_iter)->get_name() << " =Just e}";
+
+ if (!tfunction->is_oneway()) {
+ indent(f_service_) << "return rs{f_" << resultname << "_" << (*x_iter)->get_name() << " =Just e}";
+
} else {
indent(f_service_) << "return ()";
}
+
f_service_ << "))" << endl;
indent_down();
indent_down();
}
}
-
-
// Shortcut out here for oneway functions
if (tfunction->is_oneway()) {
- f_service_ <<
- indent() << "return ()" << endl;
+ indent(f_service_) << "return ()" << endl;
indent_down();
return;
}
- f_service_ <<
- indent() << "writeMessageBegin oprot (\"" << tfunction->get_name() << "\", M_REPLY, seqid);" << endl <<
- indent() << "write_"<<resultname<<" oprot res" << endl <<
- indent() << "writeMessageEnd oprot" << endl <<
- indent() << "tFlush (getTransport oprot)" << endl;
+ indent(f_service_ ) << "writeMessageBegin oprot (\"" << tfunction->get_name() << "\", M_REPLY, seqid);" << endl;
+ indent(f_service_ ) << "write_" << resultname << " oprot res" << endl;
+ indent(f_service_ ) << "writeMessageEnd oprot" << endl;
+ indent(f_service_ ) << "tFlush (getTransport oprot)" << endl;
// Close function
indent_down();
@@ -1081,32 +1096,31 @@
* Deserializes a field of any type.
*/
void t_hs_generator::generate_deserialize_field(ofstream &out,
- t_field* tfield,
- string prefix){
+ t_field* tfield,
+ string prefix) {
t_type* type = tfield->get_type();
generate_deserialize_type(out,type);
}
-
/**
* Deserializes a field of any type.
*/
void t_hs_generator::generate_deserialize_type(ofstream &out,
- t_type* type){
+ t_type* type) {
type = get_true_type(type);
- if (type->is_void()) {
+ if (type->is_void())
throw "CANNOT GENERATE DESERIALIZE CODE FOR void TYPE";
- }
-
if (type->is_struct() || type->is_xception()) {
- generate_deserialize_struct(out,
- (t_struct*)type);
+ generate_deserialize_struct(out, (t_struct*)type);
+
} else if (type->is_container()) {
generate_deserialize_container(out, type);
+
} else if (type->is_base_type()) {
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";
@@ -1136,9 +1150,11 @@
throw "compiler error: no PHP name for base type " + t_base_type::t_base_name(tbase);
}
out << " iprot";
+
} else if (type->is_enum()) {
string ename = capitalize(type->get_name());
out << "(do {i <- readI32 iprot; return $ toEnum $ fromIntegral i})";
+
} else {
printf("DO NOT KNOW HOW TO DESERIALIZE TYPE '%s'\n",
type->get_name().c_str());
@@ -1150,10 +1166,9 @@
* Generates an unserializer for a struct, calling read()
*/
void t_hs_generator::generate_deserialize_struct(ofstream &out,
- t_struct* tstruct) {
+ t_struct* tstruct) {
string name = capitalize(tstruct->get_name());
out << "(read_" << name << " iprot)";
-
}
/**
@@ -1177,21 +1192,24 @@
if (ttype->is_map()) {
out << "(let {f 0 = return []; f n = do {k <- ";
generate_deserialize_type(out,((t_map*)ttype)->get_key_type());
+
out << "; v <- ";
generate_deserialize_type(out,((t_map*)ttype)->get_val_type());
- out << ";r <- f (n-1); return $ (k,v):r}} in do {("<<ktype<<","<<vtype<<","<<size<<") <- readMapBegin iprot; l <- f " << size << "; return $ Map.fromList l})";
+
+ out << ";r <- f (n-1); return $ (k,v):r}} in do {(" << ktype << "," << vtype << "," << size << ") <- readMapBegin iprot; l <- f " << size << "; return $ Map.fromList l})";
+
} else if (ttype->is_set()) {
out << "(let {f 0 = return []; f n = do {v <- ";
generate_deserialize_type(out,((t_map*)ttype)->get_key_type());
- out << ";r <- f (n-1); return $ v:r}} in do {("<<etype<<","<<size<<") <- readSetBegin iprot; l <- f " << size << "; return $ Set.fromList l})";
+ out << ";r <- f (n-1); return $ v:r}} in do {(" << etype << "," << size << ") <- readSetBegin iprot; l <- f " << size << "; return $ Set.fromList l})";
+
} else if (ttype->is_list()) {
out << "(let {f 0 = return []; f n = do {v <- ";
generate_deserialize_type(out,((t_map*)ttype)->get_key_type());
- out << ";r <- f (n-1); return $ v:r}} in do {("<<etype<<","<<size<<") <- readListBegin iprot; f " << size << "})";
+ out << ";r <- f (n-1); return $ v:r}} in do {(" << etype << "," << size << ") <- readListBegin iprot; f " << size << "})";
}
}
-
/**
* Serializes a field of any type.
*
@@ -1199,28 +1217,23 @@
* @param prefix Name to prepend to field name
*/
void t_hs_generator::generate_serialize_field(ofstream &out,
- t_field* tfield,
- string name) {
+ t_field* tfield,
+ string name) {
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: " +
- tfield->get_name();
- }
+ if (type->is_void())
+ throw "CANNOT GENERATE SERIALIZE CODE FOR void TYPE: " + tfield->get_name();
- if(name.length() == 0){
+ if (name.length() == 0)
name = decapitalize(tfield->get_name());
- }
if (type->is_struct() || type->is_xception()) {
- generate_serialize_struct(out,
- (t_struct*)type,
- name);
+ generate_serialize_struct(out, (t_struct*)type, name);
+
} else if (type->is_container()) {
- generate_serialize_container(out,
- type,
- name);
+ generate_serialize_container(out, type, name);
+
} else if (type->is_base_type() || type->is_enum()) {
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
@@ -1229,34 +1242,42 @@
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") << " oprot " << name;
break;
+
case t_base_type::TYPE_BOOL:
out << "writeBool oprot " << name;
break;
+
case t_base_type::TYPE_BYTE:
out << "writeByte oprot " << name;
break;
+
case t_base_type::TYPE_I16:
out << "writeI16 oprot " << name;
break;
+
case t_base_type::TYPE_I32:
out << "writeI32 oprot " << name;
break;
+
case t_base_type::TYPE_I64:
out << "writeI64 oprot " << name;
break;
+
case t_base_type::TYPE_DOUBLE:
out << "writeDouble oprot " << name;
break;
+
default:
throw "compiler error: no hs name for base type " + t_base_type::t_base_name(tbase);
}
} else if (type->is_enum()) {
string ename = capitalize(type->get_name());
- out << "writeI32 oprot (fromIntegral $ fromEnum "<< name << ")";
+ out << "writeI32 oprot (fromIntegral $ fromEnum " << name << ")";
}
} else {
@@ -1284,19 +1305,21 @@
if (ttype->is_map()) {
string k = tmp("_kiter");
string v = tmp("_viter");
- out << "(let {f [] = return (); f (("<<k<<","<<v<<"):t) = do {";
+ out << "(let {f [] = return (); f ((" << k << "," << v << "):t) = do {";
generate_serialize_map_element(out, (t_map*)ttype, k, v);
- out << ";f t}} in do {writeMapBegin oprot ("<< type_to_enum(((t_map*)ttype)->get_key_type())<<","<< type_to_enum(((t_map*)ttype)->get_val_type())<<",fromIntegral $ Map.size " << prefix << "); f (Map.toList " << prefix << ");writeMapEnd oprot})";
+ out << ";f t}} in do {writeMapBegin oprot (" << type_to_enum(((t_map*)ttype)->get_key_type()) << "," << type_to_enum(((t_map*)ttype)->get_val_type()) << ",fromIntegral $ Map.size " << prefix << "); f (Map.toList " << prefix << ");writeMapEnd oprot})";
+
} else if (ttype->is_set()) {
string v = tmp("_viter");
- out << "(let {f [] = return (); f ("<<v<<":t) = do {";
+ out << "(let {f [] = return (); f (" << v << ":t) = do {";
generate_serialize_set_element(out, (t_set*)ttype, v);
- out << ";f t}} in do {writeSetBegin oprot ("<< type_to_enum(((t_set*)ttype)->get_elem_type())<<",fromIntegral $ Set.size " << prefix << "); f (Set.toList " << prefix << ");writeSetEnd oprot})";
+ out << ";f t}} in do {writeSetBegin oprot (" << type_to_enum(((t_set*)ttype)->get_elem_type()) << ",fromIntegral $ Set.size " << prefix << "); f (Set.toList " << prefix << ");writeSetEnd oprot})";
+
} else if (ttype->is_list()) {
string v = tmp("_viter");
- out << "(let {f [] = return (); f ("<<v<<":t) = do {";
+ out << "(let {f [] = return (); f (" << v << ":t) = do {";
generate_serialize_list_element(out, (t_list*)ttype, v);
- out << ";f t}} in do {writeListBegin oprot ("<< type_to_enum(((t_list*)ttype)->get_elem_type())<<",fromIntegral $ Prelude.length " << prefix << "); f " << prefix << ";writeListEnd oprot})";
+ out << ";f t}} in do {writeListBegin oprot (" << type_to_enum(((t_list*)ttype)->get_elem_type()) << ",fromIntegral $ Prelude.length " << prefix << "); f " << prefix << ";writeListEnd oprot})";
}
}
@@ -1306,13 +1329,14 @@
*
*/
void t_hs_generator::generate_serialize_map_element(ofstream &out,
- t_map* tmap,
- string kiter,
- string viter) {
+ t_map* tmap,
+ string kiter,
+ string viter) {
t_field kfield(tmap->get_key_type(), kiter);
out << "do {";
generate_serialize_field(out, &kfield);
out << ";";
+
t_field vfield(tmap->get_val_type(), viter);
generate_serialize_field(out, &vfield);
out << "}";
@@ -1322,8 +1346,8 @@
* Serializes the members of a set.
*/
void t_hs_generator::generate_serialize_set_element(ofstream &out,
- t_set* tset,
- string iter) {
+ t_set* tset,
+ string iter) {
t_field efield(tset->get_elem_type(), iter);
generate_serialize_field(out, &efield);
}
@@ -1332,27 +1356,29 @@
* Serializes the members of a list.
*/
void t_hs_generator::generate_serialize_list_element(ofstream &out,
- t_list* tlist,
- string iter) {
+ t_list* tlist,
+ string iter) {
t_field efield(tlist->get_elem_type(), iter);
generate_serialize_field(out, &efield);
}
-
-string t_hs_generator::function_type(t_function* tfunc, bool options, bool io, bool method){
- string result="";
+string t_hs_generator::function_type(t_function* tfunc, bool options, bool io, bool method) {
+ string result = "";
const vector<t_field*>& fields = tfunc->get_arglist()->get_members();
vector<t_field*>::const_iterator f_iter;
for (f_iter = fields.begin(); f_iter != fields.end(); ++f_iter) {
- if(options) result += "Maybe ";
+ if (options) result += "Maybe ";
result += render_hs_type((*f_iter)->get_type(), options);
result += " -> ";
}
- if(fields.empty() && !method){
+
+ if (fields.empty() && !method)
result += "() -> ";
- }
- if(io) result += "IO ";
+
+ if (io)
+ result += "IO ";
+
result += render_hs_type(tfunc->get_returntype(), io);
return result;
}
@@ -1361,19 +1387,12 @@
string t_hs_generator::type_name(t_type* ttype, string function_prefix) {
string prefix = "";
t_program* program = ttype->get_program();
- if (program != NULL && program != program_) {
- if (!ttype->is_service()) {
- prefix = capitalize(program->get_name()) + "_Types.";
- }
- }
- string name = ttype->get_name();
- if(ttype->is_service()){
- name = capitalize(name);
- } else {
- name = capitalize(name);
- }
- return prefix + function_prefix + name;
+ if (program != NULL && program != program_)
+ if (!ttype->is_service())
+ prefix = capitalize(program->get_name()) + "_Types.";
+
+ return prefix + function_prefix + capitalize(ttype->get_name());
}
/**
@@ -1385,31 +1404,28 @@
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
- case t_base_type::TYPE_VOID:
- return "T_VOID";
- case t_base_type::TYPE_STRING:
- return "T_STRING";
- case t_base_type::TYPE_BOOL:
- return "T_BOOL";
- case t_base_type::TYPE_BYTE:
- return "T_BYTE";
- case t_base_type::TYPE_I16:
- return "T_I16";
- case t_base_type::TYPE_I32:
- return "T_I32";
- case t_base_type::TYPE_I64:
- return "T_I64";
- case t_base_type::TYPE_DOUBLE:
- return "T_DOUBLE";
+ case t_base_type::TYPE_VOID: return "T_VOID";
+ case t_base_type::TYPE_STRING: return "T_STRING";
+ case t_base_type::TYPE_BOOL: return "T_BOOL";
+ case t_base_type::TYPE_BYTE: return "T_BYTE";
+ case t_base_type::TYPE_I16: return "T_I16";
+ case t_base_type::TYPE_I32: return "T_I32";
+ case t_base_type::TYPE_I64: return "T_I64";
+ case t_base_type::TYPE_DOUBLE: return "T_DOUBLE";
}
+
} else if (type->is_enum()) {
return "T_I32";
+
} else if (type->is_struct() || type->is_xception()) {
return "T_STRUCT";
+
} else if (type->is_map()) {
return "T_MAP";
+
} else if (type->is_set()) {
return "T_SET";
+
} else if (type->is_list()) {
return "T_LIST";
}
@@ -1427,39 +1443,35 @@
if (type->is_base_type()) {
t_base_type::t_base tbase = ((t_base_type*)type)->get_base();
switch (tbase) {
- case t_base_type::TYPE_VOID:
- return "()";
- case t_base_type::TYPE_STRING:
- return (((t_base_type*)type)->is_binary() ? "ByteString" : "String");
- case t_base_type::TYPE_BOOL:
- return "Bool";
- case t_base_type::TYPE_BYTE:
- return "Int8";
- case t_base_type::TYPE_I16:
- return "Int16";
- case t_base_type::TYPE_I32:
- return "Int32";
- case t_base_type::TYPE_I64:
- return "Int64";
- case t_base_type::TYPE_DOUBLE:
- return "Double";
+ case t_base_type::TYPE_VOID: return "()";
+ case t_base_type::TYPE_STRING: return (((t_base_type*)type)->is_binary() ? "ByteString" : "String");
+ case t_base_type::TYPE_BOOL: return "Bool";
+ case t_base_type::TYPE_BYTE: return "Int8";
+ case t_base_type::TYPE_I16: return "Int16";
+ case t_base_type::TYPE_I32: return "Int32";
+ case t_base_type::TYPE_I64: return "Int64";
+ case t_base_type::TYPE_DOUBLE: return "Double";
}
+
} else if (type->is_enum()) {
return capitalize(((t_enum*)type)->get_name());
+
} else if (type->is_struct() || type->is_xception()) {
return type_name((t_struct*)type);
+
} else if (type->is_map()) {
t_type* ktype = ((t_map*)type)->get_key_type();
t_type* vtype = ((t_map*)type)->get_val_type();
-
type_repr = "Map.Map " + render_hs_type(ktype, true) + " " + render_hs_type(vtype, true);
+
} else if (type->is_set()) {
t_type* etype = ((t_set*)type)->get_elem_type();
-
type_repr = "Set.Set " + render_hs_type(etype, true) ;
+
} else if (type->is_list()) {
t_type* etype = ((t_list*)type)->get_elem_type();
return "[" + render_hs_type(etype, false) + "]";
+
} else {
throw "INVALID TYPE IN type_to_enum: " + type->get_name();
}
@@ -1467,6 +1479,4 @@
return needs_parens ? "(" + type_repr + ")" : type_repr;
}
-
THRIFT_REGISTER_GENERATOR(hs, "Haskell", "")
-