You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by dr...@apache.org on 2008/06/11 03:15:47 UTC
svn commit: r666481 - in /incubator/thrift/trunk: ./ compiler/cpp/
compiler/cpp/src/ compiler/cpp/src/generate/ lib/ lib/alterl/
lib/alterl/build/ lib/alterl/include/ lib/alterl/src/ lib/erl/
lib/erl/build/ lib/erl/include/ lib/erl/src/ test/erl/ tutor...
Author: dreiss
Date: Tue Jun 10 18:15:45 2008
New Revision: 666481
URL: http://svn.apache.org/viewvc?rev=666481&view=rev
Log:
Rename "alterl" to "erl".
Added:
incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc
- copied, changed from r666480, incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.cc
incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.h
- copied, changed from r666480, incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.h
incubator/thrift/trunk/lib/erl/COPYING
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/COPYING
incubator/thrift/trunk/lib/erl/LICENSE
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/LICENSE
incubator/thrift/trunk/lib/erl/Makefile
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/Makefile
incubator/thrift/trunk/lib/erl/README
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/README
incubator/thrift/trunk/lib/erl/build/beamver
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/beamver
incubator/thrift/trunk/lib/erl/build/buildtargets.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/buildtargets.mk
incubator/thrift/trunk/lib/erl/build/colors.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/colors.mk
incubator/thrift/trunk/lib/erl/build/docs.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/docs.mk
incubator/thrift/trunk/lib/erl/build/mime.types
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/mime.types
incubator/thrift/trunk/lib/erl/build/otp.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/otp.mk
incubator/thrift/trunk/lib/erl/build/otp_subdir.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/otp_subdir.mk
incubator/thrift/trunk/lib/erl/build/raw_test.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/build/raw_test.mk
incubator/thrift/trunk/lib/erl/include/thrift_constants.hrl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/include/thrift_constants.hrl
incubator/thrift/trunk/lib/erl/include/thrift_protocol.hrl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/include/thrift_protocol.hrl
incubator/thrift/trunk/lib/erl/src/Makefile
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/Makefile
incubator/thrift/trunk/lib/erl/src/test_handler.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/test_handler.erl
incubator/thrift/trunk/lib/erl/src/test_service.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/test_service.erl
incubator/thrift/trunk/lib/erl/src/thrift.app.src
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift.app.src
incubator/thrift/trunk/lib/erl/src/thrift.appup.src
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift.appup.src
incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_base64_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl
incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_buffered_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_client.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_client.erl
incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_disk_log_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_file_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_framed_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_http_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_processor.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_processor.erl
incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_protocol.erl
incubator/thrift/trunk/lib/erl/src/thrift_server.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_server.erl
incubator/thrift/trunk/lib/erl/src/thrift_service.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_service.erl
incubator/thrift/trunk/lib/erl/src/thrift_socket_server.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl
incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl
incubator/thrift/trunk/lib/erl/src/thrift_transport.erl
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_transport.erl
incubator/thrift/trunk/lib/erl/vsn.mk
- copied, changed from r666480, incubator/thrift/trunk/lib/alterl/vsn.mk
incubator/thrift/trunk/tutorial/erl/client.erl
- copied, changed from r666480, incubator/thrift/trunk/tutorial/alterl/client.erl
incubator/thrift/trunk/tutorial/erl/client.sh (contents, props changed)
- copied, changed from r666480, incubator/thrift/trunk/tutorial/alterl/client.sh
incubator/thrift/trunk/tutorial/erl/server.erl
- copied, changed from r666480, incubator/thrift/trunk/tutorial/alterl/server.erl
incubator/thrift/trunk/tutorial/erl/server.sh
- copied, changed from r666480, incubator/thrift/trunk/tutorial/alterl/server.sh
Removed:
incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.cc
incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.h
incubator/thrift/trunk/lib/alterl/COPYING
incubator/thrift/trunk/lib/alterl/LICENSE
incubator/thrift/trunk/lib/alterl/Makefile
incubator/thrift/trunk/lib/alterl/README
incubator/thrift/trunk/lib/alterl/build/beamver
incubator/thrift/trunk/lib/alterl/build/buildtargets.mk
incubator/thrift/trunk/lib/alterl/build/colors.mk
incubator/thrift/trunk/lib/alterl/build/docs.mk
incubator/thrift/trunk/lib/alterl/build/mime.types
incubator/thrift/trunk/lib/alterl/build/otp.mk
incubator/thrift/trunk/lib/alterl/build/otp_subdir.mk
incubator/thrift/trunk/lib/alterl/build/raw_test.mk
incubator/thrift/trunk/lib/alterl/include/thrift_constants.hrl
incubator/thrift/trunk/lib/alterl/include/thrift_protocol.hrl
incubator/thrift/trunk/lib/alterl/src/Makefile
incubator/thrift/trunk/lib/alterl/src/test_handler.erl
incubator/thrift/trunk/lib/alterl/src/test_service.erl
incubator/thrift/trunk/lib/alterl/src/thrift.app.src
incubator/thrift/trunk/lib/alterl/src/thrift.appup.src
incubator/thrift/trunk/lib/alterl/src/thrift_base64_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl
incubator/thrift/trunk/lib/alterl/src/thrift_buffered_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_client.erl
incubator/thrift/trunk/lib/alterl/src/thrift_disk_log_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_file_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_framed_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_http_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_processor.erl
incubator/thrift/trunk/lib/alterl/src/thrift_protocol.erl
incubator/thrift/trunk/lib/alterl/src/thrift_server.erl
incubator/thrift/trunk/lib/alterl/src/thrift_service.erl
incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl
incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl
incubator/thrift/trunk/lib/alterl/src/thrift_transport.erl
incubator/thrift/trunk/lib/alterl/vsn.mk
incubator/thrift/trunk/tutorial/alterl/client.erl
incubator/thrift/trunk/tutorial/alterl/client.sh
incubator/thrift/trunk/tutorial/alterl/server.erl
incubator/thrift/trunk/tutorial/alterl/server.sh
Modified:
incubator/thrift/trunk/.gitignore
incubator/thrift/trunk/compiler/cpp/Makefile.am
incubator/thrift/trunk/compiler/cpp/src/main.cc
incubator/thrift/trunk/lib/Makefile.am
incubator/thrift/trunk/test/erl/Makefile
Modified: incubator/thrift/trunk/.gitignore
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/.gitignore?rev=666481&r1=666480&r2=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/.gitignore (original)
+++ incubator/thrift/trunk/.gitignore Tue Jun 10 18:15:45 2008
@@ -21,7 +21,7 @@
install-sh
lib/Makefile
lib/Makefile.in
-lib/alterl/ebin
+lib/erl/ebin
lib/cpp/.deps
lib/cpp/.libs
lib/cpp/Makefile
Modified: incubator/thrift/trunk/compiler/cpp/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/Makefile.am?rev=666481&r1=666480&r2=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/Makefile.am (original)
+++ incubator/thrift/trunk/compiler/cpp/Makefile.am Tue Jun 10 18:15:45 2008
@@ -11,7 +11,7 @@
src/generate/t_generator.cc \
src/generate/t_php_generator.cc \
src/generate/t_xsd_generator.cc \
- src/generate/t_alterl_generator.cc \
+ src/generate/t_erl_generator.cc \
src/globals.h \
src/main.h \
src/platform.h \
@@ -38,7 +38,7 @@
src/generate/t_oop_generator.h \
src/generate/t_php_generator.h \
src/generate/t_xsd_generator.h \
- src/generate/t_alterl_generator.h
+ src/generate/t_erl_generator.h
if THRIFT_GEN_cpp
thrift_SOURCES += src/generate/t_cpp_generator.cc
Copied: incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc (from r666480, incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.cc)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc?p2=incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc&p1=incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.cc&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.cc Tue Jun 10 18:15:45 2008
@@ -8,7 +8,7 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <sstream>
-#include "t_alterl_generator.h"
+#include "t_erl_generator.h"
using namespace std;
@@ -18,7 +18,7 @@
*
* @param tprogram The program to generate
*/
-void t_alterl_generator::init_generator() {
+void t_erl_generator::init_generator() {
// Make output directory
mkdir(get_out_dir().c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
@@ -60,19 +60,19 @@
/**
* Boilerplate at beginning and end of header files
*/
-void t_alterl_generator::hrl_header(ostream& out, string name) {
+void t_erl_generator::hrl_header(ostream& out, string name) {
out << "-ifndef(_" << name << "_included)." << endl <<
"-define(_" << name << "_included, yeah)." << endl;
}
-void t_alterl_generator::hrl_footer(ostream& out, string name) {
+void t_erl_generator::hrl_footer(ostream& out, string name) {
out << "-endif." << endl;
}
/**
* Renders all the imports necessary for including another Thrift program
*/
-string t_alterl_generator::render_includes() {
+string t_erl_generator::render_includes() {
const vector<t_program*>& includes = program_->get_includes();
string result = "";
for (size_t i = 0; i < includes.size(); ++i) {
@@ -87,7 +87,7 @@
/**
* Autogen'd comment
*/
-string t_alterl_generator::erl_autogen_comment() {
+string t_erl_generator::erl_autogen_comment() {
return
std::string("%%\n") +
"%% Autogenerated by Thrift\n" +
@@ -99,14 +99,14 @@
/**
* Prints standard thrift imports
*/
-string t_alterl_generator::erl_imports() {
+string t_erl_generator::erl_imports() {
return "";
}
/**
* Closes the type files
*/
-void t_alterl_generator::close_generator() {
+void t_erl_generator::close_generator() {
// Close types file
export_types_string("struct_info", 1);
@@ -126,7 +126,7 @@
*
* @param ttypedef The type definition
*/
-void t_alterl_generator::generate_typedef(t_typedef* ttypedef) {
+void t_erl_generator::generate_typedef(t_typedef* ttypedef) {
}
/**
@@ -135,7 +135,7 @@
*
* @param tenum The enumeration
*/
-void t_alterl_generator::generate_enum(t_enum* tenum) {
+void t_erl_generator::generate_enum(t_enum* tenum) {
vector<t_enum_value*> constants = tenum->get_constants();
vector<t_enum_value*>::iterator c_iter;
@@ -160,7 +160,7 @@
/**
* Generate a constant value
*/
-void t_alterl_generator::generate_const(t_const* tconst) {
+void t_erl_generator::generate_const(t_const* tconst) {
t_type* type = tconst->get_type();
string name = capitalize(tconst->get_name());
t_const_value* value = tconst->get_value();
@@ -173,7 +173,7 @@
* is NOT performed in this function as it is always run beforehand using the
* validate_types method in main.cc
*/
-string t_alterl_generator::render_const_value(t_type* type, t_const_value* value) {
+string t_erl_generator::render_const_value(t_type* type, t_const_value* value) {
std::ostringstream out;
if (type->is_base_type()) {
@@ -297,7 +297,7 @@
/**
* Generates a struct
*/
-void t_alterl_generator::generate_struct(t_struct* tstruct) {
+void t_erl_generator::generate_struct(t_struct* tstruct) {
generate_erl_struct(tstruct, false);
}
@@ -307,14 +307,14 @@
*
* @param txception The struct definition
*/
-void t_alterl_generator::generate_xception(t_struct* txception) {
+void t_erl_generator::generate_xception(t_struct* txception) {
generate_erl_struct(txception, true);
}
/**
* Generates a struct
*/
-void t_alterl_generator::generate_erl_struct(t_struct* tstruct,
+void t_erl_generator::generate_erl_struct(t_struct* tstruct,
bool is_exception) {
generate_erl_struct_definition(f_types_, f_types_hrl_file_, tstruct, is_exception);
}
@@ -324,7 +324,7 @@
*
* @param tstruct The struct definition
*/
-void t_alterl_generator::generate_erl_struct_definition(ostream& out,
+void t_erl_generator::generate_erl_struct_definition(ostream& out,
ostream& hrl_out,
t_struct* tstruct,
bool is_exception,
@@ -372,7 +372,7 @@
/**
* Generates the read method for a struct
*/
-void t_alterl_generator::generate_erl_struct_info(ostream& out,
+void t_erl_generator::generate_erl_struct_info(ostream& out,
t_struct* tstruct) {
string name = type_name(tstruct);
@@ -391,7 +391,7 @@
*
* @param tservice The service definition
*/
-void t_alterl_generator::generate_service(t_service* tservice) {
+void t_erl_generator::generate_service(t_service* tservice) {
// somehow this point is reached before the constructor and it's not downcased yet
// ...awesome
service_name_[0] = tolower(service_name_[0]);
@@ -448,7 +448,7 @@
*
* @param tservice The service to generate a header definition for
*/
-void t_alterl_generator::generate_service_helpers(t_service* tservice) {
+void t_erl_generator::generate_service_helpers(t_service* tservice) {
vector<t_function*> functions = tservice->get_functions();
vector<t_function*>::iterator f_iter;
@@ -468,7 +468,7 @@
*
* @param tfunction The function
*/
-void t_alterl_generator::generate_erl_function_helpers(t_function* tfunction) {
+void t_erl_generator::generate_erl_function_helpers(t_function* tfunction) {
}
/**
@@ -476,7 +476,7 @@
*
* @param tservice The service to generate a header definition for
*/
-void t_alterl_generator::generate_service_interface(t_service* tservice) {
+void t_erl_generator::generate_service_interface(t_service* tservice) {
export_string("function_info", 2);
@@ -510,7 +510,7 @@
* Generates a function_info(FunctionName, params_type) and
* function_info(FunctionName, reply_type)
*/
-void t_alterl_generator::generate_function_info(t_service* tservice,
+void t_erl_generator::generate_function_info(t_service* tservice,
t_function* tfunction) {
string name_atom = "'" + tfunction->get_name() + "'";
@@ -556,7 +556,7 @@
*
* @param ttype The type
*/
-string t_alterl_generator::declare_field(t_field* tfield) { // TODO
+string t_erl_generator::declare_field(t_field* tfield) { // TODO
string result = "@" + tfield->get_name();
t_type* type = get_true_type(tfield->get_type());
if (tfield->get_value() != NULL) {
@@ -573,7 +573,7 @@
* @param tfunction Function definition
* @return String of rendered function definition
*/
-string t_alterl_generator::function_signature(t_function* tfunction,
+string t_erl_generator::function_signature(t_function* tfunction,
string prefix) {
return
prefix + tfunction->get_name() +
@@ -583,7 +583,7 @@
/**
* Add a function to the exports list
*/
-void t_alterl_generator::export_string(string name, int num) {
+void t_erl_generator::export_string(string name, int num) {
if (export_lines_first_) {
export_lines_first_ = false;
} else {
@@ -592,7 +592,7 @@
export_lines_ << name << "/" << num;
}
-void t_alterl_generator::export_types_function(t_function* tfunction,
+void t_erl_generator::export_types_function(t_function* tfunction,
string prefix) {
export_types_string(prefix + tfunction->get_name(),
@@ -601,7 +601,7 @@
);
}
-void t_alterl_generator::export_types_string(string name, int num) {
+void t_erl_generator::export_types_string(string name, int num) {
if (export_types_lines_first_) {
export_types_lines_first_ = false;
} else {
@@ -610,7 +610,7 @@
export_types_lines_ << name << "/" << num;
}
-void t_alterl_generator::export_function(t_function* tfunction,
+void t_erl_generator::export_function(t_function* tfunction,
string prefix) {
export_string(prefix + tfunction->get_name(),
@@ -623,7 +623,7 @@
/**
* Renders a field list
*/
-string t_alterl_generator::argument_list(t_struct* tstruct) {
+string t_erl_generator::argument_list(t_struct* tstruct) {
string result = "";
const vector<t_field*>& fields = tstruct->get_members();
@@ -641,7 +641,7 @@
return result;
}
-string t_alterl_generator::type_name(t_type* ttype) {
+string t_erl_generator::type_name(t_type* ttype) {
string prefix = "";
string name = ttype->get_name();
@@ -655,7 +655,7 @@
/**
* Converts the parse type to a Erlang "type" (macro for int constants)
*/
-string t_alterl_generator::type_to_enum(t_type* type) {
+string t_erl_generator::type_to_enum(t_type* type) {
type = get_true_type(type);
if (type->is_base_type()) {
@@ -697,7 +697,7 @@
/**
* Generate an Erlang term which represents a thrift type
*/
-std::string t_alterl_generator::generate_type_term(t_type* type,
+std::string t_erl_generator::generate_type_term(t_type* type,
bool expand_structs) {
type = get_true_type(type);
@@ -773,6 +773,6 @@
throw "INVALID TYPE IN type_to_enum: " + type->get_name();
}
-std::string t_alterl_generator::type_module(t_type* ttype) {
+std::string t_erl_generator::type_module(t_type* ttype) {
return uncapitalize(ttype->get_program()->get_name()) + "_types";
}
Copied: incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.h (from r666480, incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.h)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.h?p2=incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.h&p1=incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.h&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/generate/t_alterl_generator.h (original)
+++ incubator/thrift/trunk/compiler/cpp/src/generate/t_erl_generator.h Tue Jun 10 18:15:45 2008
@@ -1,5 +1,5 @@
-#ifndef T_ALTERL_GENERATOR_H
-#define T_ALTERL_GENERATOR_H
+#ifndef T_ERL_GENERATOR_H
+#define T_ERL_GENERATOR_H
#include <string>
#include <fstream>
@@ -13,9 +13,9 @@
*
* @author
*/
-class t_alterl_generator : public t_generator {
+class t_erl_generator : public t_generator {
public:
- t_alterl_generator(t_program* program) :
+ t_erl_generator(t_program* program) :
t_generator(program)
{
program_name_[0] = tolower(program_name_[0]);
Modified: incubator/thrift/trunk/compiler/cpp/src/main.cc
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/compiler/cpp/src/main.cc?rev=666481&r1=666480&r2=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/compiler/cpp/src/main.cc (original)
+++ incubator/thrift/trunk/compiler/cpp/src/main.cc Tue Jun 10 18:15:45 2008
@@ -38,7 +38,7 @@
#include "parse/t_scope.h"
#include "generate/t_php_generator.h"
#include "generate/t_xsd_generator.h"
-#include "generate/t_alterl_generator.h"
+#include "generate/t_erl_generator.h"
using namespace std;
@@ -151,7 +151,7 @@
bool gen_phpo = false;
bool gen_rest = false;
bool gen_perl = false;
-bool gen_alterl = false;
+bool gen_erl = false;
bool gen_ocaml = false;
bool gen_hs = false;
bool gen_cocoa = false;
@@ -601,7 +601,7 @@
fprintf(stderr, " -phpa Generate PHP with autoload (with -php)\n");
fprintf(stderr, " -phpo Generate PHP with object oriented subclasses (with -php)\n");
fprintf(stderr, " -xsd Generate XSD output files\n");
- fprintf(stderr, " -alterl Generate Alternative Erlang output files\n");
+ fprintf(stderr, " -erl Generate Erlang output files\n");
fprintf(stderr, " -o dir Set the output directory for gen-* packages\n");
fprintf(stderr, " (default: current directory)\n");
fprintf(stderr, " -I dir Add a directory to the list of directories\n");
@@ -871,11 +871,11 @@
delete xsd;
}
- if (gen_alterl) {
- pverbose("Generating Alternative Erlang\n");
- t_alterl_generator* alterl = new t_alterl_generator(program);
- alterl->generate_program();
- delete alterl;
+ if (gen_erl) {
+ pverbose("Generating Erlang\n");
+ t_erl_generator* erl = new t_erl_generator(program);
+ erl->generate_program();
+ delete erl;
}
if (dump_docs) {
@@ -992,8 +992,8 @@
gen_xsd = true;
} else if (strcmp(arg, "-perl") == 0) {
gen_perl = true;
- } else if (strcmp(arg, "-alterl") == 0) {
- gen_alterl = true;
+ } else if (strcmp(arg, "-erl") == 0) {
+ gen_erl = true;
} else if (strcmp(arg, "-ocaml") == 0) {
gen_ocaml = true;
} else if (strcmp(arg, "-hs") == 0) {
@@ -1105,7 +1105,7 @@
}
// You gotta generate something!
- if (!gen_php && !gen_phpi && !gen_xsd && !gen_alterl && generator_strings.empty()) {
+ if (!gen_php && !gen_phpi && !gen_xsd && !gen_erl && generator_strings.empty()) {
fprintf(stderr, "!!! No output language(s) specified\n\n");
usage();
}
Modified: incubator/thrift/trunk/lib/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/Makefile.am?rev=666481&r1=666480&r2=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/Makefile.am (original)
+++ incubator/thrift/trunk/lib/Makefile.am Tue Jun 10 18:15:45 2008
@@ -11,7 +11,7 @@
endif
if ENABLE_ERLANG
-SUBDIRS += alterl
+SUBDIRS += erl
endif
EXTRA_DIST = \
Copied: incubator/thrift/trunk/lib/erl/COPYING (from r666480, incubator/thrift/trunk/lib/alterl/COPYING)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/COPYING?p2=incubator/thrift/trunk/lib/erl/COPYING&p1=incubator/thrift/trunk/lib/alterl/COPYING&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/LICENSE (from r666480, incubator/thrift/trunk/lib/alterl/LICENSE)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/LICENSE?p2=incubator/thrift/trunk/lib/erl/LICENSE&p1=incubator/thrift/trunk/lib/alterl/LICENSE&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/Makefile (from r666480, incubator/thrift/trunk/lib/alterl/Makefile)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/Makefile?p2=incubator/thrift/trunk/lib/erl/Makefile&p1=incubator/thrift/trunk/lib/alterl/Makefile&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/README (from r666480, incubator/thrift/trunk/lib/alterl/README)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/README?p2=incubator/thrift/trunk/lib/erl/README&p1=incubator/thrift/trunk/lib/alterl/README&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/beamver (from r666480, incubator/thrift/trunk/lib/alterl/build/beamver)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/beamver?p2=incubator/thrift/trunk/lib/erl/build/beamver&p1=incubator/thrift/trunk/lib/alterl/build/beamver&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/buildtargets.mk (from r666480, incubator/thrift/trunk/lib/alterl/build/buildtargets.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/buildtargets.mk?p2=incubator/thrift/trunk/lib/erl/build/buildtargets.mk&p1=incubator/thrift/trunk/lib/alterl/build/buildtargets.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/colors.mk (from r666480, incubator/thrift/trunk/lib/alterl/build/colors.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/colors.mk?p2=incubator/thrift/trunk/lib/erl/build/colors.mk&p1=incubator/thrift/trunk/lib/alterl/build/colors.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/docs.mk (from r666480, incubator/thrift/trunk/lib/alterl/build/docs.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/docs.mk?p2=incubator/thrift/trunk/lib/erl/build/docs.mk&p1=incubator/thrift/trunk/lib/alterl/build/docs.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/mime.types (from r666480, incubator/thrift/trunk/lib/alterl/build/mime.types)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/mime.types?p2=incubator/thrift/trunk/lib/erl/build/mime.types&p1=incubator/thrift/trunk/lib/alterl/build/mime.types&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/otp.mk (from r666480, incubator/thrift/trunk/lib/alterl/build/otp.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/otp.mk?p2=incubator/thrift/trunk/lib/erl/build/otp.mk&p1=incubator/thrift/trunk/lib/alterl/build/otp.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/otp_subdir.mk (from r666480, incubator/thrift/trunk/lib/alterl/build/otp_subdir.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/otp_subdir.mk?p2=incubator/thrift/trunk/lib/erl/build/otp_subdir.mk&p1=incubator/thrift/trunk/lib/alterl/build/otp_subdir.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/build/raw_test.mk (from r666480, incubator/thrift/trunk/lib/alterl/build/raw_test.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/build/raw_test.mk?p2=incubator/thrift/trunk/lib/erl/build/raw_test.mk&p1=incubator/thrift/trunk/lib/alterl/build/raw_test.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/include/thrift_constants.hrl (from r666480, incubator/thrift/trunk/lib/alterl/include/thrift_constants.hrl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/include/thrift_constants.hrl?p2=incubator/thrift/trunk/lib/erl/include/thrift_constants.hrl&p1=incubator/thrift/trunk/lib/alterl/include/thrift_constants.hrl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/include/thrift_protocol.hrl (from r666480, incubator/thrift/trunk/lib/alterl/include/thrift_protocol.hrl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/include/thrift_protocol.hrl?p2=incubator/thrift/trunk/lib/erl/include/thrift_protocol.hrl&p1=incubator/thrift/trunk/lib/alterl/include/thrift_protocol.hrl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/Makefile (from r666480, incubator/thrift/trunk/lib/alterl/src/Makefile)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/Makefile?p2=incubator/thrift/trunk/lib/erl/src/Makefile&p1=incubator/thrift/trunk/lib/alterl/src/Makefile&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/test_handler.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/test_handler.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/test_handler.erl?p2=incubator/thrift/trunk/lib/erl/src/test_handler.erl&p1=incubator/thrift/trunk/lib/alterl/src/test_handler.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/test_service.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/test_service.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/test_service.erl?p2=incubator/thrift/trunk/lib/erl/src/test_service.erl&p1=incubator/thrift/trunk/lib/alterl/src/test_service.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift.app.src (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift.app.src)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift.app.src?p2=incubator/thrift/trunk/lib/erl/src/thrift.app.src&p1=incubator/thrift/trunk/lib/alterl/src/thrift.app.src&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift.appup.src (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift.appup.src)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift.appup.src?p2=incubator/thrift/trunk/lib/erl/src/thrift.appup.src&p1=incubator/thrift/trunk/lib/alterl/src/thrift.appup.src&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_base64_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_base64_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_binary_protocol.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_binary_protocol.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_buffered_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_buffered_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_client.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_client.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_client.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_client.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_client.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_disk_log_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_disk_log_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_file_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_file_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_framed_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_framed_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_http_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_http_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_processor.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_processor.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_processor.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_processor.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_processor.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_protocol.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_protocol.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_protocol.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_server.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_server.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_server.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_server.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_server.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_service.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_service.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_service.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_service.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_service.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_socket_server.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_socket_server.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_socket_server.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_socket_server.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_socket_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/src/thrift_transport.erl (from r666480, incubator/thrift/trunk/lib/alterl/src/thrift_transport.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_transport.erl?p2=incubator/thrift/trunk/lib/erl/src/thrift_transport.erl&p1=incubator/thrift/trunk/lib/alterl/src/thrift_transport.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/lib/erl/vsn.mk (from r666480, incubator/thrift/trunk/lib/alterl/vsn.mk)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/vsn.mk?p2=incubator/thrift/trunk/lib/erl/vsn.mk&p1=incubator/thrift/trunk/lib/alterl/vsn.mk&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Modified: incubator/thrift/trunk/test/erl/Makefile
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/erl/Makefile?rev=666481&r1=666480&r2=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/test/erl/Makefile (original)
+++ incubator/thrift/trunk/test/erl/Makefile Tue Jun 10 18:15:45 2008
@@ -7,7 +7,7 @@
TARGETDIR=ebin
SRCDIR=src
-ALL_INCLUDEDIR=$(GEN_INCLUDEDIR) $(INCLUDEDIR) ../../lib/alterl/include
+ALL_INCLUDEDIR=$(GEN_INCLUDEDIR) $(INCLUDEDIR) ../../lib/erl/include
INCLUDEFLAGS=$(patsubst %,-I%, ${ALL_INCLUDEDIR})
MODULES = stress_server test_server test_disklog
@@ -24,8 +24,8 @@
${GENDIR}/: ${RPCFILE}
rm -rf ${GENDIR}
- ${THRIFT} -alterl ${TEST_RPCFILE}
- ${THRIFT} -alterl ${STRESS_RPCFILE}
+ ${THRIFT} -erl ${TEST_RPCFILE}
+ ${THRIFT} -erl ${STRESS_RPCFILE}
mkdir -p ${GEN_INCLUDEDIR}
mkdir -p ${GEN_SRCDIR}
mkdir -p ${GEN_TARGETDIR}
Copied: incubator/thrift/trunk/tutorial/erl/client.erl (from r666480, incubator/thrift/trunk/tutorial/alterl/client.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/erl/client.erl?p2=incubator/thrift/trunk/tutorial/erl/client.erl&p1=incubator/thrift/trunk/tutorial/alterl/client.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/tutorial/erl/client.sh (from r666480, incubator/thrift/trunk/tutorial/alterl/client.sh)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/erl/client.sh?p2=incubator/thrift/trunk/tutorial/erl/client.sh&p1=incubator/thrift/trunk/tutorial/alterl/client.sh&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Propchange: incubator/thrift/trunk/tutorial/erl/client.sh
------------------------------------------------------------------------------
svn:special = *
Copied: incubator/thrift/trunk/tutorial/erl/server.erl (from r666480, incubator/thrift/trunk/tutorial/alterl/server.erl)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/erl/server.erl?p2=incubator/thrift/trunk/tutorial/erl/server.erl&p1=incubator/thrift/trunk/tutorial/alterl/server.erl&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
(empty)
Copied: incubator/thrift/trunk/tutorial/erl/server.sh (from r666480, incubator/thrift/trunk/tutorial/alterl/server.sh)
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/tutorial/erl/server.sh?p2=incubator/thrift/trunk/tutorial/erl/server.sh&p1=incubator/thrift/trunk/tutorial/alterl/server.sh&r1=666480&r2=666481&rev=666481&view=diff
==============================================================================
--- incubator/thrift/trunk/tutorial/alterl/server.sh (original)
+++ incubator/thrift/trunk/tutorial/erl/server.sh Tue Jun 10 18:15:45 2008
@@ -1,6 +1,6 @@
#!/bin/sh
-ERL_THRIFT=../../lib/alterl
+ERL_THRIFT=../../lib/erl
if ! [ -d ${ERL_THRIFT}/ebin ]; then
echo "Please build the Thrift library by running \`make' in ${ERL_THRIFT}"