Author: Wim Lavrijsen <[email protected]>
Branch: reflex-support
Changeset: r62676:e83ef78604e7
Date: 2013-03-22 17:43 -0700
http://bitbucket.org/pypy/pypy/changeset/e83ef78604e7/
Log: coding style fixes
diff --git a/pypy/module/cppyy/test/advancedcpp.h
b/pypy/module/cppyy/test/advancedcpp.h
--- a/pypy/module/cppyy/test/advancedcpp.h
+++ b/pypy/module/cppyy/test/advancedcpp.h
@@ -26,81 +26,81 @@
//===========================================================================
class base_class { // for simple inheritance testing
public:
- base_class() { m_b = 1; m_db = 1.1; }
- virtual ~base_class() {}
- virtual int get_value() { return m_b; }
- double get_base_value() { return m_db; }
+ base_class() { m_b = 1; m_db = 1.1; }
+ virtual ~base_class() {}
+ virtual int get_value() { return m_b; }
+ double get_base_value() { return m_db; }
- virtual base_class* cycle(base_class* b) { return b; }
- virtual base_class* clone() { return new base_class; }
+ virtual base_class* cycle(base_class* b) { return b; }
+ virtual base_class* clone() { return new base_class; }
public:
- int m_b;
- double m_db;
+ int m_b;
+ double m_db;
};
class derived_class : public base_class {
public:
- derived_class() { m_d = 2; m_dd = 2.2;}
- virtual int get_value() { return m_d; }
- double get_derived_value() { return m_dd; }
- virtual base_class* clone() { return new derived_class; }
+ derived_class() { m_d = 2; m_dd = 2.2;}
+ virtual int get_value() { return m_d; }
+ double get_derived_value() { return m_dd; }
+ virtual base_class* clone() { return new derived_class; }
public:
- int m_d;
- double m_dd;
+ int m_d;
+ double m_dd;
};
//===========================================================================
class a_class { // for esoteric inheritance testing
public:
- a_class() { m_a = 1; m_da = 1.1; }
- ~a_class() {}
- virtual int get_value() = 0;
+ a_class() { m_a = 1; m_da = 1.1; }
+ ~a_class() {}
+ virtual int get_value() = 0;
public:
- int m_a;
- double m_da;
+ int m_a;
+ double m_da;
};
class b_class : public virtual a_class {
public:
- b_class() { m_b = 2; m_db = 2.2;}
- virtual int get_value() { return m_b; }
+ b_class() { m_b = 2; m_db = 2.2;}
+ virtual int get_value() { return m_b; }
public:
- int m_b;
- double m_db;
+ int m_b;
+ double m_db;
};
class c_class_1 : public virtual a_class, public virtual b_class {
public:
- c_class_1() { m_c = 3; }
- virtual int get_value() { return m_c; }
+ c_class_1() { m_c = 3; }
+ virtual int get_value() { return m_c; }
public:
- int m_c;
+ int m_c;
};
class c_class_2 : public virtual b_class, public virtual a_class {
public:
- c_class_2() { m_c = 3; }
- virtual int get_value() { return m_c; }
+ c_class_2() { m_c = 3; }
+ virtual int get_value() { return m_c; }
public:
- int m_c;
+ int m_c;
};
typedef c_class_2 c_class;
class d_class : public virtual c_class, public virtual a_class {
public:
- d_class() { m_d = 4; }
- virtual int get_value() { return m_d; }
+ d_class() { m_d = 4; }
+ virtual int get_value() { return m_d; }
public:
- int m_d;
+ int m_d;
};
a_class* create_c1();
@@ -114,38 +114,38 @@
//===========================================================================
namespace a_ns { // for namespace testing
- extern int g_a;
- int get_g_a();
+ extern int g_a;
+ int get_g_a();
- struct b_class {
- b_class() { m_b = -2; }
- int m_b;
- static int s_b;
+ struct b_class {
+ b_class() { m_b = -2; }
+ int m_b;
+ static int s_b;
- struct c_class {
- c_class() { m_c = -3; }
- int m_c;
- static int s_c;
- };
- };
+ struct c_class {
+ c_class() { m_c = -3; }
+ int m_c;
+ static int s_c;
+ };
+ };
- namespace d_ns {
- extern int g_d;
- int get_g_d();
+ namespace d_ns {
+ extern int g_d;
+ int get_g_d();
- struct e_class {
- e_class() { m_e = -5; }
- int m_e;
- static int s_e;
+ struct e_class {
+ e_class() { m_e = -5; }
+ int m_e;
+ static int s_e;
- struct f_class {
- f_class() { m_f = -6; }
- int m_f;
- static int s_f;
- };
- };
+ struct f_class {
+ f_class() { m_f = -6; }
+ int m_f;
+ static int s_f;
+ };
+ };
- } // namespace d_ns
+ } // namespace d_ns
} // namespace a_ns
@@ -154,46 +154,46 @@
template<typename T> // for template testing
class T1 {
public:
- T1(T t = T(1)) : m_t1(t) {}
- T get_value() { return m_t1; }
+ T1(T t = T(1)) : m_t1(t) {}
+ T get_value() { return m_t1; }
public:
- T m_t1;
+ T m_t1;
};
template<typename T>
class T2 {
public:
- T2(T t = T(2)) : m_t2(t) {}
- T get_value() { return m_t2; }
+ T2(T t = T(2)) : m_t2(t) {}
+ T get_value() { return m_t2; }
public:
- T m_t2;
+ T m_t2;
};
template<typename T, typename U>
class T3 {
public:
- T3(T t = T(3), U u = U(33)) : m_t3(t), m_u3(u) {}
- T get_value_t() { return m_t3; }
- U get_value_u() { return m_u3; }
+ T3(T t = T(3), U u = U(33)) : m_t3(t), m_u3(u) {}
+ T get_value_t() { return m_t3; }
+ U get_value_u() { return m_u3; }
public:
- T m_t3;
- U m_u3;
+ T m_t3;
+ U m_u3;
};
namespace a_ns {
- template<typename T>
- class T4 {
- public:
- T4(T t = T(4)) : m_t4(t) {}
- T get_value() { return m_t4; }
+ template<typename T>
+ class T4 {
+ public:
+ T4(T t = T(4)) : m_t4(t) {}
+ T get_value() { return m_t4; }
- public:
- T m_t4;
- };
+ public:
+ T m_t4;
+ };
} // namespace a_ns
@@ -218,49 +218,46 @@
//===========================================================================
class some_abstract_class { // to test abstract class handling
public:
- virtual void a_virtual_method() = 0;
+ virtual void a_virtual_method() = 0;
};
class some_concrete_class : public some_abstract_class {
public:
- virtual void a_virtual_method() {}
+ virtual void a_virtual_method() {}
};
//===========================================================================
-/*
-TODO: methptrgetter support for std::vector<>
class ref_tester { // for assignment by-ref testing
public:
- ref_tester() : m_i(-99) {}
- ref_tester(int i) : m_i(i) {}
- ref_tester(const ref_tester& s) : m_i(s.m_i) {}
- ref_tester& operator=(const ref_tester& s) {
- if (&s != this) m_i = s.m_i;
- return *this;
- }
- ~ref_tester() {}
+ ref_tester() : m_i(-99) {}
+ ref_tester(int i) : m_i(i) {}
+ ref_tester(const ref_tester& s) : m_i(s.m_i) {}
+ ref_tester& operator=(const ref_tester& s) {
+ if (&s != this) m_i = s.m_i;
+ return *this;
+ }
+ ~ref_tester() {}
public:
- int m_i;
+ int m_i;
};
-template class std::vector< ref_tester >;
-*/
+template class std::vector<ref_tester>;
//===========================================================================
class some_convertible { // for math conversions testing
public:
- some_convertible() : m_i(-99), m_d(-99.) {}
+ some_convertible() : m_i(-99), m_d(-99.) {}
- operator int() { return m_i; }
- operator long() { return m_i; }
- operator double() { return m_d; }
+ operator int() { return m_i; }
+ operator long() { return m_i; }
+ operator double() { return m_d; }
public:
- int m_i;
- double m_d;
+ int m_i;
+ double m_d;
};
@@ -279,25 +276,25 @@
//===========================================================================
class some_class_with_data { // for life-line and identity testing
public:
- class some_data {
- public:
- some_data() { ++s_num_data; }
- some_data(const some_data&) { ++s_num_data; }
- ~some_data() { --s_num_data; }
+ class some_data {
+ public:
+ some_data() { ++s_num_data; }
+ some_data(const some_data&) { ++s_num_data; }
+ ~some_data() { --s_num_data; }
- static int s_num_data;
- };
+ static int s_num_data;
+ };
- some_class_with_data gime_copy() {
- return *this;
- }
+ some_class_with_data gime_copy() {
+ return *this;
+ }
- const some_data& gime_data() { /* TODO: methptrgetter const support */
- return m_data;
- }
+ const some_data& gime_data() { /* TODO: methptrgetter const support */
+ return m_data;
+ }
- int m_padding;
- some_data m_data;
+ int m_padding;
+ some_data m_data;
};
@@ -389,19 +386,19 @@
class my_templated_method_class {
public:
- long get_size(); // to get around bug in genreflex
- template<class B> long get_size();
+ long get_size(); // to get around bug in genreflex
+ template<class B> long get_size();
- long get_char_size();
- long get_int_size();
- long get_long_size();
- long get_float_size();
- long get_double_size();
+ long get_char_size();
+ long get_int_size();
+ long get_long_size();
+ long get_float_size();
+ long get_double_size();
- long get_self_size();
+ long get_self_size();
private:
- double m_data[3];
+ double m_data[3];
};
template<class B>
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
