Revert "THRIFT-2729: C++ - .clang-format created and applied"
This reverts commit 74260aa9099c3bb209bc8e524b0e8ba603f62c41.
diff --git a/compiler/cpp/src/parse/t_struct.h b/compiler/cpp/src/parse/t_struct.h
index 2282676..8dd4c73 100644
--- a/compiler/cpp/src/parse/t_struct.h
+++ b/compiler/cpp/src/parse/t_struct.h
@@ -37,59 +37,58 @@
*
*/
class t_struct : public t_type {
-public:
+ public:
typedef std::vector<t_field*> members_type;
- t_struct(t_program* program)
- : t_type(program),
- is_xception_(false),
- is_union_(false),
- members_validated(false),
- members_with_value(0),
- xsd_all_(false) {}
+ t_struct(t_program* program) :
+ t_type(program),
+ is_xception_(false),
+ is_union_(false),
+ members_validated(false),
+ members_with_value(0),
+ xsd_all_(false) {}
- t_struct(t_program* program, const std::string& name)
- : t_type(program, name),
- is_xception_(false),
- is_union_(false),
- members_validated(false),
- members_with_value(0),
- xsd_all_(false) {}
+ t_struct(t_program* program, const std::string& name) :
+ t_type(program, name),
+ is_xception_(false),
+ is_union_(false),
+ members_validated(false),
+ members_with_value(0),
+ xsd_all_(false) {}
void set_name(const std::string& name) {
name_ = name;
validate_union_members();
}
- void set_xception(bool is_xception) { is_xception_ = is_xception; }
+ void set_xception(bool is_xception) {
+ is_xception_ = is_xception;
+ }
- void validate_union_member(t_field* field) {
- if (is_union_ && (!name_.empty())) {
+ void validate_union_member( t_field * field) {
+ if( is_union_ && (! name_.empty())) {
// unions can't have required fields
- if (field->get_req() == t_field::T_REQUIRED) {
- pwarning(1,
- "Required field %s of union %s set to optional.\n",
- field->get_name().c_str(),
- name_.c_str());
- field->set_req(t_field::T_OPTIONAL);
+ if( field->get_req() == t_field::T_REQUIRED) {
+ pwarning( 1, "Required field %s of union %s set to optional.\n", field->get_name().c_str(), name_.c_str());
+ field->set_req( t_field::T_OPTIONAL);
}
// unions may have up to one member defaulted, but not more
- if (field->get_value() != NULL) {
- if (1 < ++members_with_value) {
- throw "Error: Field " + field->get_name() + " provides another default value for union "
- + name_;
+ if( field->get_value() != NULL) {
+ if( 1 < ++members_with_value) {
+ throw "Error: Field "+field->get_name()+" provides another default value for union "+name_;
}
}
}
+
}
void validate_union_members() {
- if (is_union_ && (!name_.empty()) && (!members_validated)) {
+ if( is_union_ && (! name_.empty()) && (!members_validated)) {
members_type::const_iterator m_iter;
for (m_iter = members_in_id_order_.begin(); m_iter != members_in_id_order_.end(); ++m_iter) {
- validate_union_member(*m_iter);
+ validate_union_member( *m_iter);
}
members_validated = true;
}
@@ -100,16 +99,19 @@
validate_union_members();
}
- void set_xsd_all(bool xsd_all) { xsd_all_ = xsd_all; }
+ void set_xsd_all(bool xsd_all) {
+ xsd_all_ = xsd_all;
+ }
- bool get_xsd_all() const { return xsd_all_; }
+ bool get_xsd_all() const {
+ return xsd_all_;
+ }
bool append(t_field* elem) {
typedef members_type::iterator iter_type;
- std::pair<iter_type, iter_type> bounds = std::equal_range(members_in_id_order_.begin(),
- members_in_id_order_.end(),
- elem,
- t_field::key_compare());
+ std::pair<iter_type, iter_type> bounds = std::equal_range(
+ members_in_id_order_.begin(), members_in_id_order_.end(), elem, t_field::key_compare()
+ );
if (bounds.first != bounds.second) {
return false;
}
@@ -119,19 +121,29 @@
}
members_.push_back(elem);
members_in_id_order_.insert(bounds.second, elem);
- validate_union_member(elem);
+ validate_union_member( elem);
return true;
}
- const members_type& get_members() { return members_; }
+ const members_type& get_members() {
+ return members_;
+ }
- const members_type& get_sorted_members() { return members_in_id_order_; }
+ const members_type& get_sorted_members() {
+ return members_in_id_order_;
+ }
- bool is_struct() const { return !is_xception_; }
+ bool is_struct() const {
+ return !is_xception_;
+ }
- bool is_xception() const { return is_xception_; }
+ bool is_xception() const {
+ return is_xception_;
+ }
- bool is_union() const { return is_union_; }
+ bool is_union() const {
+ return is_union_;
+ }
virtual std::string get_fingerprint_material() const {
std::string rv = "{";
@@ -142,9 +154,9 @@
rv += (*m_iter)->get_fingerprint_material();
rv += ";";
- if (do_reserve) {
+ if( do_reserve) {
estimation = members_in_id_order_.size() * rv.size() + 16;
- rv.reserve(estimation);
+ rv.reserve( estimation);
do_reserve = false;
}
}
@@ -170,13 +182,14 @@
return NULL;
}
-private:
+ private:
+
members_type members_;
members_type members_in_id_order_;
bool is_xception_;
bool is_union_;
bool members_validated;
- int members_with_value;
+ int members_with_value;
bool xsd_all_;
};