From 86c87b0fe1581a4a27b603119327a3f9eb602fa7 Mon Sep 17 00:00:00 2001 From: Mark Slee Date: Tue, 6 Feb 2007 07:11:23 +0000 Subject: [PATCH] NAmespace PHP exceptions in catch block properly and add getName() method to generated structs Reviewed By: ari git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664980 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_php_generator.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc index 936156ba..7ebf747d 100644 --- a/compiler/cpp/src/generate/t_php_generator.cc +++ b/compiler/cpp/src/generate/t_php_generator.cc @@ -326,6 +326,12 @@ void t_php_generator::generate_php_struct_definition(ofstream& out, endl; } + out << + indent() << "public function getName() {" << endl << + indent() << " return '" << tstruct->get_name() << "';" << endl << + indent() << "}" << endl << + endl; + generate_php_struct_reader(out, tstruct); generate_php_struct_writer(out, tstruct); @@ -716,7 +722,7 @@ void t_php_generator::generate_process_function(t_service* tservice, indent_down(); for (x_iter = xceptions.begin(); x_iter != xceptions.end(); ++x_iter) { f_service_ << - indent() << "} catch (" << (*x_iter)->get_type()->get_name() << " $" << (*x_iter)->get_name() << ") {" << endl; + indent() << "} catch (" << php_namespace((*x_iter)->get_type()->get_program()) << (*x_iter)->get_type()->get_name() << " $" << (*x_iter)->get_name() << ") {" << endl; if (!tfunction->is_async()) { indent_up(); f_service_ << -- 2.17.1