diff options
Diffstat (limited to 'debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp')
599 files changed, 12414 insertions, 0 deletions
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp new file mode 100644 index 00000000..e0379b43 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2138.cpp @@ -0,0 +1 @@ +int i = 0; /* a b *//* a b */ int b = 0; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp new file mode 100644 index 00000000..6f874926 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2185.cpp @@ -0,0 +1,13 @@ +typedef enum { + HAL_USART_ENABLED = 64, ///< Requested task impossible while + ///< peripheral in question is + ///< enabled + HAL_USART_DISABLED, ///< Requested task impossible while + ///< peripheral in question is + ///< disabled + HAL_USART_GPIO_ERROR, ///< GPIO tied with USART peripheral + ///< returned error state + HAL_USART_BUFFER_DEPLETED, ///< Not enough data to be read + HAL_USART_BUFFER_FULL ///< Data requested to be written + ///< didn't fit into buffer +} hal_usart_errors_t; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp new file mode 100644 index 00000000..4a2c05fa --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/2203.cpp @@ -0,0 +1 @@ +using Foo = std::function<void (const bool)>; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp new file mode 100644 index 00000000..bd28a5e8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/621_this-spacing.cpp @@ -0,0 +1,2 @@ +result = (Foo)this;
+result = (Foo)foo;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp new file mode 100644 index 00000000..a6aface7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/622_ifdef-indentation.cpp @@ -0,0 +1,16 @@ +f()
+{
+ {
+ {
+ {
+# if 1
+ return 0;
+# endif
+
+ #if 1
+ return 0;
+ #endif
+ }
+ }
+ }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp new file mode 100644 index 00000000..ad1ed6f7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/623_caret-spacing.cpp @@ -0,0 +1,3 @@ +Foo^ foo = dynamic_cast<Bar^>(bar);
+Foo* foo = dynamic_cast<Bar*>(bar);
+x = a^b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp new file mode 100644 index 00000000..4e18c597 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/633_decl-in-func-typedef.cpp @@ -0,0 +1,5 @@ +typedef void (*func)(); +typedef void (__stdcall *func)(); + +typedef std::vector<string *> * (* Finder )(std::string *); +typedef vector<std::string *> * (* Handler )(std::map< std::string * , vector *> *); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp new file mode 100644 index 00000000..bb6b14fb --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/634_extern-c-no-block.cpp @@ -0,0 +1,9 @@ +extern "C" int* i;
+extern "C" { int* i; }
+int* i;
+extern "C" NSString* i;
+extern "C" { NSString* i; }
+NSString* i;
+
+__attribute__((visibility ("default"))) int* i;
+__attribute__((visibility ("default"))) NSString* i;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp new file mode 100644 index 00000000..1b8f4bc8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DB.cpp @@ -0,0 +1,5 @@ +void AkonadiServer::createDatabase() +{ + DbConfig::configuredDatabase()->apply(db); + db.setDatabaseName(DbConfig::configuredDatabase()->databaseName()); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp new file mode 100644 index 00000000..3c4f3b9e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DefaultAndDelete.cpp @@ -0,0 +1,12 @@ +class Foo +{ + public: + Foo( int bar)=0; + Foo( int bar = 777 ); + Foo( const Foo & ) = delete; + Foo( int boo ) =default; + Foo( unsigned int ) =default; + Foo( unsigned int boo=999 ); + Foo &operator= ( const Foo & ) = delete; + ~Foo(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp new file mode 100644 index 00000000..dfa5a906 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/DoxygenComments.cpp @@ -0,0 +1,2 @@ + //a cpp comment + ///<a Doygen comment diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h new file mode 100644 index 00000000..deede79a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Example.h @@ -0,0 +1,10 @@ +class Example
+{
+
+ Example()
+ : member(0)
+ {}
+
+ int member;
+
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp new file mode 100644 index 00000000..365df31f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-1.cpp @@ -0,0 +1 @@ +::some::very::looong::_and::complicated::name::MyType & a;
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp new file mode 100644 index 00000000..c3765ce4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-2.cpp @@ -0,0 +1,7 @@ +class MyClass +{ +public: + void foo(::some::very::looong::_and::complicated::name::MyType& a, + ::some::very::looong::_and::complicated::name::MyType& b, + some::very::looong::_and::complicated::name::MyType& c); +};
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp new file mode 100644 index 00000000..6c48cb63 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I1112-3.cpp @@ -0,0 +1,5 @@ +class MyClass +{ +public: + ::some::name * foo; +};
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp new file mode 100644 index 00000000..d8cf883a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2102.cpp @@ -0,0 +1,2 @@ +unsigned __int32 b = 1ui32; +unsigned __int64 b = 1ui64; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp new file mode 100644 index 00000000..ba6386dd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/I2103.cpp @@ -0,0 +1,2 @@ +int i1 = EEnumType::a & EEnumType::b; +int i2 = a & b; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp new file mode 100644 index 00000000..19461b71 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1052.cpp @@ -0,0 +1,3 @@ +ut8 u32s[sizeof (ut32)] = { +0 +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp new file mode 100644 index 00000000..6a9042c2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1167.cpp @@ -0,0 +1 @@ +typedef ::foo::moon::extra::common::super::VeryLongClassName <::foo::moon::extra::common::super::ISuperNice, ::foo::moon::extra::common::super::NiceStoryAboutTheSea, ::foo::moon::extra::common::super::TheVeryLastParameter> AVeryLongNameForDemonstration; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp new file mode 100644 index 00000000..7c69e7fb --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1184.cpp @@ -0,0 +1,4 @@ +char buf [2000]; + +buf [0] = 5; +buf [1] = 6; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h new file mode 100644 index 00000000..63787999 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1460.h @@ -0,0 +1,5 @@ +#define MGT_TYPE_WINDOW (mgt_window_get_type ()) + +G_DECLARE_FINAL_TYPE (MgtWindow, mgt_window, MGT, WINDOW, GtkApplicationWindow) + +MgtWindow *mgt_window_new (MgtApplication *app); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp new file mode 100644 index 00000000..2583c0e3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1511.cpp @@ -0,0 +1 @@ +int getFoo() { return foo; } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp new file mode 100644 index 00000000..4a2c97b5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1692.cpp @@ -0,0 +1,6 @@ +switch (a) +{ + case 0: + // code + break; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp new file mode 100644 index 00000000..bca40664 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1703.cpp @@ -0,0 +1 @@ +#define NUM_LPM_TESTS (sizeof(tests) / sizeof(tests[0])) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp new file mode 100644 index 00000000..90cb2049 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1704.cpp @@ -0,0 +1 @@ +#define INC_REF_COUNT(ref_count) ++ref_count diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp new file mode 100644 index 00000000..10be5586 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1733.cpp @@ -0,0 +1,14 @@ +class X15 +{ +enum Enum +{ + e1 +}; + +operator Enum(); +}; + +::X15::operator ::X15::Enum() +{ + return e1; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp new file mode 100644 index 00000000..31d08c29 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1734.cpp @@ -0,0 +1,14 @@ +class X16 +{ +public: +X16(); +}; + +// https://en.cppreference.com/w/cpp/language/function-try-block +X16::X16() +try +{ +} +catch (...) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp new file mode 100644 index 00000000..fd8b1384 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1737.cpp @@ -0,0 +1,11 @@ +template<class T> +class foo +{ +public: + T x; + foo<T>(int a): x(a) + { + int y = a; + int z = 13; + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp new file mode 100644 index 00000000..bf5530c3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1753.cpp @@ -0,0 +1,9 @@ +void x() +{ + a = c0*d0(); + a = b?c+d:e; + a = b?c*d:e; + a = b?c+d():e; + a = b1?c1*d1():e1; + a = b2?c2()*d2:e2; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp new file mode 100644 index 00000000..9c02605a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-2.cpp @@ -0,0 +1,11 @@ +namespace n1 { + namespace n2 { + + void func() { + another_func([]() { + return 42; + }); + } + + } + } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp new file mode 100644 index 00000000..93e0799c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813-3.cpp @@ -0,0 +1,13 @@ +namespace n1 { + namespace n2 { + namespace n3 { + + void func() { + another_func([]() { + return 42; + }); + } + + } + } + } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp new file mode 100644 index 00000000..0c07555d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1813.cpp @@ -0,0 +1,29 @@ +namespace ns1 +{ +namespace ns2 +{ +void func0() +{ +functionThatTakesALambda( [&] () -> void +{ +lambdaBody; +}); +functionThatTakesALambda( [&] __device__ () -> void +{ +lambdaBody; +}); +functionThatTakesALambda( [&] __host__ __device__ () -> void +{ +lambdaBody; +}); +functionThatTakesALambda( [&] DEVICE_LAMBDA_CONTEXT () -> void +{ +lambdaBody; +}); +functionThatTakesALambda( [&] HOST_DEVICE_LAMBDA_CONTEXT () -> void +{ +lambdaBody; +}); +} +} +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp new file mode 100644 index 00000000..e5b3ceeb --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1923.cpp @@ -0,0 +1,5 @@ +int x1 = 0; +foobar long_x2 = 0; +foo<int> x3 = 0; +int x4[] = {1, 2, 3}; +decltype(x1) x5 = 0; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp new file mode 100644 index 00000000..80b7ddc7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_1966.cpp @@ -0,0 +1,2 @@ +#define FLAG1 0x101 /* struct foo should not be used. +The struct is unsafe */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp new file mode 100644 index 00000000..94d0aa28 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2020.cpp @@ -0,0 +1,20 @@ +class X21 +{ +public: +void f( +int p1, int p2); +}; + +void +X21::f( +int p1, int p2) +{ +} + +void +n1() +{ + X21 x21; + x21.f( +111, 122); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp new file mode 100644 index 00000000..627eba3f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2045.cpp @@ -0,0 +1,12 @@ +void wpa_smk_send_error(struct wpa_authenticator *wpa_auth, + struct wpa_state_machine *sm, const u8 *peer, + u16 mui, u16 error_type) +{ + u8 kde[2 + RSN_SELECTOR_LEN + ETH_ALEN + + 2 + RSN_SELECTOR_LEN + sizeof(struct rsn_error_kde)]; + u8 *pos; + struct rsn_error_kde error; + + wpa_auth_logger(wpa_auth, sm->addr, LOGGER_DEBUG, + "Sending SMK Error"); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp new file mode 100644 index 00000000..581f4db4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2085.cpp @@ -0,0 +1 @@ +typedef std::function<size_t (int arg)> Fail; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp new file mode 100644 index 00000000..6e32d683 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2091.cpp @@ -0,0 +1,5 @@ +#include <AClass.h> +#include <SomeClass.h> +#include <TheClass.h> +#include <iostream> +#include <vector> diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp new file mode 100644 index 00000000..4726f44b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2099.cpp @@ -0,0 +1,2 @@ +void GoAbsolutePosition( /* [in1] */ double arg1_, + /* [in2] */ double arg2_ ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp new file mode 100644 index 00000000..3e07c686 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2101.cpp @@ -0,0 +1,5 @@ +void Test() +{ + aaaaaa = condition ? FunctionWithVeryLongName( andWithVeryLongArgumentsToo1, andWithVeryLongArgumentsToo2 ) + : FunctionWithVeryLongName( andWithVeryLongArgumentsToo2, andWithVeryLongArgumentsToo1 ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp new file mode 100644 index 00000000..ad53fa57 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2138.cpp @@ -0,0 +1,2 @@ +void funcName() const; +void ncName() override; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp new file mode 100644 index 00000000..88fb2249 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2149.cpp @@ -0,0 +1,7 @@ +namespace +{ + enum EnumValue + { + EnumValue1 = 1 << 1 + }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp new file mode 100644 index 00000000..1e4d6bf5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2150.cpp @@ -0,0 +1,17 @@ +int f( int a ) +{ + switch ( a ) + { + case 1: + { + return a; + } + case 2: +#if 1 + case 3: +#endif + { + return a; + } + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp new file mode 100644 index 00000000..dce02df3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2151.cpp @@ -0,0 +1,5 @@ +void f( int a ) +{ + namespace C { enum { Value }; } + const bool ok = ( a & C::Value ) && true; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp new file mode 100644 index 00000000..543b9827 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2163.cpp @@ -0,0 +1,15 @@ +/* + * m + */ +void +m(){ return 0; } +/* + * n + */ +void +n(){ return 0; } +/* + * n + */ +int& +n( int& x ){ return x; } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp new file mode 100644 index 00000000..d9ac55c7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2166.cpp @@ -0,0 +1,7 @@ +void f1() +{ + int a; + int b; + auto lambda1 = [ &a ](){ return true; }; + auto lambda2 = [ &a = b ](){ return true; }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp new file mode 100644 index 00000000..beeffc7e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2170.cpp @@ -0,0 +1,8 @@ +class Foo +{ + public: + Foo( int bar = 1 ); + Foo( const Foo & ) = delete; + Foo &operator= ( const Foo & ) = delete; + ~Foo(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp new file mode 100644 index 00000000..c9cbacda --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2186.cpp @@ -0,0 +1,14 @@ +using namespace std; + +namespace ui { class CClass; } // Expected to stay as-is +namespace ui::dlg { class CClassDlg; } // Expected to stay as-is (new in C++17) + +namespace ui { // Brace should be on the next line +class CClass1; // Should be indented +class CClass2; +class CClass3; +class CClass4; +class CClass5; +class CClass6; +class CClass7; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp new file mode 100644 index 00000000..3573b20d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2195.cpp @@ -0,0 +1,44 @@ +void Launcher::signal(int code) +{ + /* + 1 HUP 2 INT 3 QUIT 4 ILL 5 TRAP 6 ABRT 7 BUS + 8 FPE 9 KILL 10 USR1 11 SEGV 12 USR2 13 PIPE 14 ALRM + 15 TERM 16 STKFLT 17 CHLD 18 CONT 19 STOP 20 TSTP 21 TTIN + 22 TTOU 23 URG 24 XCPU 25 XFSZ 26 VTALRM 27 PROF 28 WINCH + 29 POLL 30 PWR 31 SYS + + + Operation WinCode NixCode + Status 128 1 (HUP) + Terminate N/A 2 (INT) Linux or macOS uses this for CTRL-C. + 129 3 + 130 4 + 131 5 + 132 6 + 133 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + Terminate N/A 15 (TERM) Linux or macOS uses this for CTRL-C. + 16 + N/A 17 (CHILD) Child process exited. + N/A 28 WINCH, window changed size. + */ + + // Convert to lower range + if (code >= 128) + { + code -= 127; + } + + + + + + + event_queue.push(code); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp new file mode 100644 index 00000000..cb6e24bf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2219.cpp @@ -0,0 +1,5 @@ +void foo() +{ +for(int i = 0;i < 1;i++) {return (false);} +float g = 0.13; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp new file mode 100644 index 00000000..65382eb9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2224.cpp @@ -0,0 +1,6 @@ +static void GPUFailedMsgA(const long long int error, const char* file, int line) +{ +if (GPUFailedMsgAI(error, file, line)) { +throw std::runtime_error("Failure"); +} +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp new file mode 100644 index 00000000..9f575dc1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2229.cpp @@ -0,0 +1,6 @@ +int foo() +{ +if (false) {return 1;} +if (true) {return 2;} +float a = 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp new file mode 100644 index 00000000..7632ed27 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2232.cpp @@ -0,0 +1,7 @@ +void main() +{ +if (true) { return;} + +mInitialized = true; +return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp new file mode 100644 index 00000000..5dbc4fbe --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2236.cpp @@ -0,0 +1,8 @@ +class A +{ +public: + virtual void f11111111( int a, int b, int c ) = 0; + virtual void f2( int* ptr2 = nullptr ) = 0; + virtual void f2333( int* ptr3 = 3 ) = delete; + void f244444( int* ptr4 = 4 ) = default; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp new file mode 100644 index 00000000..9268c2e3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2250.cpp @@ -0,0 +1,9 @@ +SettingsDelta::SettingsDelta( + const LastEffectiveContextData& lastEffCtxData) + : Member2(lastEffCtxData.member2()) + , Member3(lastEffCtxData.member3().c_str()) + , Functor([this](const int& num) { Callback(num); }) + , Member4(lastEffCtxData.member4().c_str()) + , Member5(lastEffCtxData.member5()) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp new file mode 100644 index 00000000..44b9e75f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2281.cpp @@ -0,0 +1,24 @@ +int foo(int op) +{ + switch (op) + { + case 1: + do_something(); + break; + case 2: + do_something_else(); + case 3: + if (do_something_different()) + { + do_this(); + break; // this should be indented like the surrounding code + } + do_something_more(); + break; + } + return -1; + for (;;) + { + break; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp new file mode 100644 index 00000000..4763c574 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2302.cpp @@ -0,0 +1,6 @@ +template<class T> +class Foo<T>::Baz { + Baz() noexcept + : i(0) + {} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp new file mode 100644 index 00000000..1b35ac11 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2305.cpp @@ -0,0 +1,6 @@ +template<class T> +class Foo<T>::Bar { + void + Bar(int iii) : iii(0) + {} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp new file mode 100644 index 00000000..8c0ae3e9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2319.cpp @@ -0,0 +1,2 @@ +using AbstractLinkPtr = AbstractLink*; +using AbstractLinkPtrPtr = AbstractLink**; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp new file mode 100644 index 00000000..0bc9cf8f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2332.cpp @@ -0,0 +1,6 @@ +CPoint GetPoint() +{ + return { obj_.GetCoordinateXFromObject(), + obj_.GetCoordinateYFromObject(), + obj_.GetCoordinateZFromObject() }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg new file mode 100644 index 00000000..955a1f9a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cfg @@ -0,0 +1,17 @@ +output_tab_size = 4 +indent_columns = 4 +indent_with_tabs = 0 +indent_cmt_with_tabs = false +indent_class_on_colon = true +indent_constr_colon = true +indent_relative_single_line_comments = true +indent_access_spec_body = true +nl_func_leave_one_liners = true +nl_end_of_file = force +nl_end_of_file_min = 4 +nl_before_opening_brace_func_class_def = force +nl_class_colon = add +pos_class_colon = lead +align_var_class_span = 3 +align_var_struct_span = 3 +pp_if_indent_code = true diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp new file mode 100644 index 00000000..837b0506 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2343.cpp @@ -0,0 +1,143 @@ +class Capteur { + public: + Capteur (); + public: + float val_num; + float val_num_prec; // La valeur précédente pour la comparaison + String tendance; // La variable text récupérée du flux Internet + String val_texte; // La variable text récupérée du flux Internet +}; + +class Capteur_CO2 : public Capteur { + public: + Capteur_CO2() : + un_membre_en_plus ( 0 ) {} + public: + int un_membre_en_plus; +}; + + +class Salon { + public: + Capteur temperature; + Capteur humidite; + Capteur pression; + Capteur_CO2 CO2; +}; + + +typedef struct Exterieur Exterieur; +struct Exterieur { // Structure qui regroupe toutes les variables de la station météo + float temp_num; + float temp_num_prec; // La valeur précédente pour la comparaison + int humidite; + int humidite_prec; // La valeur précédente pour la comparaison + String temp_tendance; // La variable text récupérée du flux Internet + String temp_texte; // La variable text récupérée du flux Internet + String humidite_texte; // La variable text récupérée du flux Internet + Exterieur () : + temp_num ( -99.9 ), + temp_num_prec ( -99.9 ), + humidite ( 0 ), + humidite_prec ( 0 ), + temp_tendance ( "up" ), + temp_texte ( "" ), + humidite_texte ( "" ) {} +}; + + + +for ( int i = 3; i < 42; i++ ) { + Serial.print ( "TEXTE(AC" ); + Serial.print ( i ); + Serial.print ( ";\"0\");\",\";" ); +} +#define OLIVE 0x7BE0 +#define LIGHTGREY 0xC618 +#ifndef _NETATMO_FONCTIONS_WIFI_h + #define _NETATMO_FONCTIONS_WIFI_h + #if defined ( ARDUINO ) && ARDUINO >= 100 + #include "arduino.h" + #if defined ( RORO ) + #define qsijnqsijdn 1323 + // asbdsqhbdsqibd + #endif + #define qsijnqsijdn 1323 + + #else + #define qsijnqsijdn 1323 + + #include "WProgram.h" + #endif // if defined ( ARDUINO ) && ARDUINO >= 100 + #define qsijnqsijdn 1323 + +#endif // ifndef _NETATMO_FONCTIONS_WIFI_h + +// Essaie de signe=se+szde/szz-sszzd%zdzd +zzez = { 1, 2, 3 }; +toto += 1 + 2 / 9 - 3 / 2; + +int fonction ( ( int *zeze ), ( ss ) ) { ksjbshjdbshjdb = 1;} +fonction ( ( &zeze ), ( ss ) ); +fonction (); +// Définition des structures de données +typedef struct Exterieur Exterieur; +struct Exterieur { // Structure qui regroupe toutes les variables de la station météo + float temp_num; + float temp_num_prec; // La valeur précédente pour la comparaison + int humidite; + int humidite_prec; // La valeur précédente pour la comparaison + String temp_tendance; // La variable text récupérée du flux Internet +}; +Exterieur tototot = { -99, -99, -99, -99, 99 }; + +// Température Extérieure +float _Temp_Ext = -99.9; +float _Temp_Ext_Precedente = -99.9; // La valeur précédente pour la comparaison +String _Temp_Ext_Tendance = "up"; + +UTFT myGLCD ( SSD1963_800 = 1, 38, 39, 40, 41 ); // (byte model, int RS, int WR, int CS, int RST, int SER) +UTFT_Geometry geo_myGLCD ( &myGLCD ); + +const char *jour_semaine[[1], [2]] = { + "\0", + "Vendredi\0", + "Dimanche\0" +}; + +void Centrer_Nombre_Int_dans_Zone ( int _nbr, int Y, int X1, int X2, int COULEUR ); +void Centrer_Nombre_Float_dans_Zone ( float _nbr, int Y, int X1, int X2, int COULEUR ); + +void Centrer_Nombre_Int_dans_Zone ( int _nbr, int Y, int X1, int X2, int COULEUR ) { + toto = 1 + 2 / 9 - 3 / 2; + String _texte = String ( _nbr, 1 ); + if ( X2 > X1 ) { + X = X1 + ( X2 - X1 + 1 - _texte.length () * myGLCD.getFontXsize () ) / 2; + } + else { + X = X2 + ( X1 - X2 - myGLCD.getFontXsize () ) / 2; + } + if ( X <= 0 ) { + Serial.print ( F ( "-- Erreur dans le fonction Centrer_Nombre_Int_dans_Zone : la valeur calculée de X est négative ou nulle, elle vaut :" ) ); + Serial.println ( X ); + Serial.print ( F ( "Le texte qui génère cette erreur est : " ) ); + Serial.println ( _texte ); + } + else { + myGLCD.setColor ( COULEUR ); + myGLCD.printNumI ( _nbr, X, Y ); + } +} + +void Texte_Bonjour () { + myGLCD.setColor ( VGA_AQUA ); + myGLCD.setBackColor ( VGA_TRANSPARENT ); + + + + myGLCD.setFont ( Grotesk32x64 ); + myGLCD.print ( F ( "BONJOUR" ), CENTER, 20 ); + myGLCD.setFont ( BigFont ); + myGLCD.print ( F ( "*** NETATMO AFFICHAGE DEPORTE ***" ), CENTER, 100 ); + myGLCD.print ( F ( "Debut : Mai 2019 / MAJ : Juillet 2019" ), CENTER, 120 ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp new file mode 100644 index 00000000..787ce29b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-3.cpp @@ -0,0 +1,5 @@ +namespace fooD { + void a(); + void b(); + void c(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp new file mode 100644 index 00000000..9478d63e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2345-4.cpp @@ -0,0 +1,6 @@ +namespace fooD { + void a(); + void b(); + void c(); + void d(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp new file mode 100644 index 00000000..08d0556b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2368.cpp @@ -0,0 +1,10 @@ +void Func1() +{ + OtherFunc( 5, b ); +} + +void Func2() +{ + Func3( p1, p2, p3 ); + Func3( p111, p222, p333 ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp new file mode 100644 index 00000000..356fd9af --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2383.cpp @@ -0,0 +1,7 @@ +// Smooth +// Copyright (C) 2017 Per +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp new file mode 100644 index 00000000..ac0b1dd4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2386.cpp @@ -0,0 +1,19 @@ +// A + + +std::string getText() +{ + return "Hello World"; +} + +int main(int argc, char *argv[]) +{ + std::cout << getText() << std::endl; + return 0; +} + // This is Hello World with a function call and + +// form feed characters in it for emacs page-break-lines extension +// which draws a horizontal line for each FF char it finds. +// +// this file contains two single h. lines and two consecutive h. lines diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp new file mode 100644 index 00000000..af00e16e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2387.cpp @@ -0,0 +1,14 @@ +namespace bar +{ +void none(); +}; + +void foo() +{ + namespace // does not + x // start a + = // namespace + bar; + + x::none(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp new file mode 100644 index 00000000..c919d5a5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2428.cpp @@ -0,0 +1,5 @@ +void test() +{ + int { 0 }; + int abcdef { 0 }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp new file mode 100644 index 00000000..2a64bd8f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2437.cpp @@ -0,0 +1,2 @@ +void timer_cb1(struct timer_node *n); +typedef void timer_cb (struct timer_node *n); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp new file mode 100644 index 00000000..c52c30da --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440.cpp @@ -0,0 +1,2 @@ +#pragma region +#pragma endregion diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp new file mode 100644 index 00000000..c52c30da --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2440_nl.cpp @@ -0,0 +1,2 @@ +#pragma region +#pragma endregion diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp new file mode 100644 index 00000000..fbcfec1f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2478.cpp @@ -0,0 +1,41 @@ +//example file +typedef int X35GlobalT1; +typedef int X35T2; + +void fooX35a() +{ + ::X35GlobalT1 a1; + X35T2 a2; + + ::X35GlobalT1 a3 = 1; + X35T2 a4 = 1; +} + +void fooX35b() +{ + X35GlobalT1 a1; + X35T2 a2; + + X35GlobalT1 a3 = 1; + X35T2 a4 = 1; +} + +class X35_1a +{ + private: + ::X35GlobalT1 a1; + X35T2 a2; + + ::X35GlobalT1 a3 = 1; + X35T2 a4 = 1; +}; + +class X35_1b +{ + private: + X35GlobalT1 a1; + X35T2 a2; + + X35GlobalT1 a3= 1; + X35T2 a4 = 1; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp new file mode 100644 index 00000000..15232fc4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2561.cpp @@ -0,0 +1,10 @@ +#include <stdio.h> + +int getFoo() { return foo; } + +int main (int argc, char *argv[]) +{ + printf("hello world!\n"); + + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp new file mode 100644 index 00000000..721d4d78 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2565.cpp @@ -0,0 +1,3 @@ +template +<bool = (sizeof(unsigned long) >= sizeof(size_t))> +struct LongFitsIntoSizeTMinusOne { ... } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp new file mode 100644 index 00000000..44373e77 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2570.cpp @@ -0,0 +1,3 @@ +class [[nodiscard]] CClass final +{ +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp new file mode 100644 index 00000000..fc79cd0d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2574.cpp @@ -0,0 +1,13 @@ +#include <pybind11/pybind11.h> +namespace py = pybind11; +PYBIND11_MODULE(example, m) +{ + py::class_<Pet>(m, "Pet").def(py::init<const std::string&>()).def( + "setName_T", + &Pet::setName).def("getName", &Pet::getName); +} + +auto three()->int +{ + return 3; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp new file mode 100644 index 00000000..adf9bfe9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2582.cpp @@ -0,0 +1,3 @@ +int fail = doSomething( + argument +).doNotIndentMe(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp new file mode 100644 index 00000000..01ed232e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2591.cpp @@ -0,0 +1,3 @@ +const auto lambda = [this](int arg) { + doSomething(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp new file mode 100644 index 00000000..798a719a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2594.cpp @@ -0,0 +1,16 @@ +int GPUReconstructionOCL2Backend::GetOCLPrograms() +{ + +#ifdef OPENCL2_ENABLED_SPIRV // clang-format off + if (ver >= 2.2) { + mInternals->program = clCreateProgramWithIL(mInternals->context, _makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_spirv, _makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_spirv_size, &ocl_error); + } else + { + size_t program_sizes[1] = {_makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_src_size}; + char* programs_sources[1] = {_makefile_opencl_program_Base_opencl_GPUReconstructionOCL2_cl_src}; + mInternals->program = clCreateProgramWithSource(mInternals->context, (cl_uint) 1, (const char**) &programs_sources, program_sizes, &ocl_error); + } +#endif // clang-format on + + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp new file mode 100644 index 00000000..d2517e8b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2596.cpp @@ -0,0 +1,5 @@ +void function(void) { + int a = 0; + int b = (a==1)?1:2; + int c = (a==1) ? 1 : 2; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp new file mode 100644 index 00000000..e73c67a8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2604.cpp @@ -0,0 +1,15 @@ +void funcPROTO( int parameter1, int parameter2, + int parameter3, int parameter4, + int parameter5, int parameter6, + int parameter7); + +void funcDEF( int parameter1, int parameter2, + int parameter3, int parameter4, + int parameter5, int parameter6, + int parameter7) +{ +funcCALL( parameter1, parameter2, + parameter3, parameter4, + parameter5, parameter6, + parameter7 ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp new file mode 100644 index 00000000..1e2f5d02 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2668.cpp @@ -0,0 +1,9 @@ +class SubClass2 : public SuperClass +{ +bool variable; +int abcde; +SubClass2() + : SuperClass() +{ +} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp new file mode 100644 index 00000000..d29d2c47 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-a.cpp @@ -0,0 +1,10 @@ +struct Point2D +{ + float x; + float y; +}; + +struct : Point2D +{ + float z; +} point; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp new file mode 100644 index 00000000..f484d4ff --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2672-b.cpp @@ -0,0 +1,2 @@ +struct BaseStruct {}; +struct : BaseStruct {}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp new file mode 100644 index 00000000..0b394620 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2688.cpp @@ -0,0 +1,7 @@ +{ +std::vector<Object> someVector = { + flag && (hasFeedback != nil) + ? objectA + : objectB, +}; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp new file mode 100644 index 00000000..ef3b5a4b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2689.cpp @@ -0,0 +1,5 @@ +class C +{ +public: + size_t f4 : 8 * sizeof(size_t) - 2; // <-- this star is treated a pointer token +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp new file mode 100644 index 00000000..4173ad5d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2692.cpp @@ -0,0 +1,5 @@ +class Class +{ +std::mutex* a; +int* b; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp new file mode 100644 index 00000000..ec4554e9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2703.cpp @@ -0,0 +1,14 @@ +#define DEFINE_OPERATORS(classT, flagsT) \ + inline classT::flagsT \ + operator&(const classT::flagsT& lh1, \ + const classT::flagsT::EnumType rh1) \ + { \ + return classT::flagsT(lhs) &= rhs; \ + } \ + \ + inline classT::flagsT \ + operator&(const classT::flagsT::EnumType lh2, \ + const classT::flagsT& rh2) \ + { \ + return classT::flagsT(lhs) &= rhs; \ + } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp new file mode 100644 index 00000000..7b76eb43 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2726.cpp @@ -0,0 +1,13 @@ +VIEW_CONTROLLER_MACRO(ThreadButton) +UIViewController * MSGCreate(MBAMailbox * mailbox, NSNumber * threadKey); + + +NS_SWIFT_NAME(Create(String)) +Controller * create(NSString * str); + + +MACRO_FUNCTION +Object * create( NSString * str, NSDictionary<NSString *, NSArray *> * data, string ** str) +{ + return nullptr; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp new file mode 100644 index 00000000..7b85c0ec --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2734.cpp @@ -0,0 +1 @@ +connect(server, SIGNAL(newConnection()), this, SLOT(ok())); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp new file mode 100644 index 00000000..f83e3536 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2735.cpp @@ -0,0 +1,24 @@ +void func(int a){ + switch (a) + { + case 1: + ; + break; + + case 2: + ; + break; + + case 3: + { + int b = 3; + } + break; + + case 4: + { + float f = 4.0; + } + break; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp new file mode 100644 index 00000000..9d76fe44 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2742.cpp @@ -0,0 +1,7 @@ + +#define FOO \ +\ + int my_type; \ + int a; \ + float b; \ + double c; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp new file mode 100644 index 00000000..237c8ce1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2752.cpp @@ -0,0 +1 @@ +int main() {} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp new file mode 100644 index 00000000..3c84969b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2757.cpp @@ -0,0 +1,5 @@ +void +foo(map< int, int >& aaa, +int bbb) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp new file mode 100644 index 00000000..1ac9a86e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2758.cpp @@ -0,0 +1,2 @@ +// a function call: +int a = b(5); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp new file mode 100644 index 00000000..cbe9c4a5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2759.cpp @@ -0,0 +1,6 @@ +Foo::Foo(int a, + int b) + : a_(a), // the comment should stay here + b_(b) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp new file mode 100644 index 00000000..ab7c285f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2771.cpp @@ -0,0 +1,4 @@ +class CDiagnostic +{ + CDiagnostic& operator<<( int value_ ) { return ns::operator<<( *this, value_ ); } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp new file mode 100644 index 00000000..03f2ae4c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2794.cpp @@ -0,0 +1,14 @@ +int +main() +{ +int i, j, k, l, m, q; + +i = rand(); +k = rand(); +l = rand(); +m = rand(); +j = rand(); +q = i * j + (2 * l) /m - ( 100 * k ) + k * k - i * i + 3000 * j + 1000 ; /* this is a very long trailing c comment */ + +// the trailing * */ above should be */ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp new file mode 100644 index 00000000..6cb7e112 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2795.cpp @@ -0,0 +1,3 @@ +void SnRequestTracefork::onCurlTestError(QProcess::ProcessError _error) { + myerror(QString("Curl process failed with error %1").arg(_error)); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp new file mode 100644 index 00000000..eb0228c9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2823.cpp @@ -0,0 +1,3 @@ +namespace farm::animal::chicken::leg +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp new file mode 100644 index 00000000..f2dc1717 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2831.cpp @@ -0,0 +1,8 @@ +class Test { +public: + void funca() + { + static_cast<A>(funcb(static_cast<B>( + info))); + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp new file mode 100644 index 00000000..44272d56 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2836.cpp @@ -0,0 +1,4 @@ +module x; +static if (1) {{ + int x; +}} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp new file mode 100644 index 00000000..af3020d3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2873.cpp @@ -0,0 +1,22 @@ +class Capteur_CO2 + : public Capteur + , aabc + , def +{ +public: + Capteur_CO2() + : un ( 1 ) + , deux(2) { + } +}; +class Capteur_CO3 + : public Capteur, + aabc, + def +{ +public: + Capteur_CO3() + : un ( 1 ), + deux(2) { + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp new file mode 100644 index 00000000..294c5e85 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2879.cpp @@ -0,0 +1,7 @@ +class CObject +{ +void f() +{ + CObject obj( b1 && c1, b2 && c2 ); +} +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp new file mode 100644 index 00000000..0474c710 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2886.cpp @@ -0,0 +1 @@ +ValuePrimaryKey<int64_t, Schema, ColumnId1{0}> id = { kTableName, kColumnNameId }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp new file mode 100644 index 00000000..cea47724 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2890.cpp @@ -0,0 +1,45 @@ +#include <iostream> +#include <sstream> +#include <string> + +struct StringBuilder +{ + template <typename T> + StringBuilder& append(const T& thing) + { + ss << thing; + return *this; + } + std::string build() + { + return ss.str(); + } + std::stringstream ss; +}; + +int main() +{ + std::string my_____String = StringBuilder().append(7).append(" + ").append(21).append(" = ").append(7 + 21).build(); + std::string my_____String = StringBuilder() + .append(7) + .append(" + ") + .append(21) + .append(" = ") + .append(7 + 21) + .build(); + + std::cout << my___String << std::endl; +} + +void function() +{ + auto response = ResponseBuilder_1(1) + .setStatus_1(status) + .finish_1(); + + ResponseBuilder_2(request) + .setStatus_2(status) + .finish_2(); + + return ResponseBuilder_3(request).setStatus_3(status).finish_3(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp new file mode 100644 index 00000000..ae10d5a9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2902.cpp @@ -0,0 +1 @@ +enum empty {}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp new file mode 100644 index 00000000..9d42a72d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2907.cpp @@ -0,0 +1,7 @@ +template< typename Enum > class Flags +{ + public: + constexpr Flags() : value{ 0 } {} + constexpr Flags( Enum f ) : value( static_cast< value_t >( f ) ) {} + constexpr Flags( Flags const& ) = default; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp new file mode 100644 index 00000000..82c2bec9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2910.cpp @@ -0,0 +1,4 @@ +auto foo() -> decltype(0) +{ + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp new file mode 100644 index 00000000..c2cd8b59 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2914.cpp @@ -0,0 +1,6 @@ +void f() +{ + CallFunction( //-V556: Warning disabled because blablabla + param1, + param2 ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp new file mode 100644 index 00000000..43e19e96 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2921.cpp @@ -0,0 +1,34 @@ +namespace Namespace1 +{ + namespace Namespace2 + { + namespace Namespace3 + { + namespace Namespace4 + { + namespace Namespace5 + { + namespace Namespace6 + { + namespace Namespace7 + { + namespace Namespace8 + { + class ClassName + { + public: + ClassName(int a, + int b); + + private: + int a; + int b; + }; + } + } + } + } + } + } + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp new file mode 100644 index 00000000..9b130982 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2930.cpp @@ -0,0 +1,3 @@ +int main(int argc, char** argv) { + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp new file mode 100644 index 00000000..e5bc781f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2942.cpp @@ -0,0 +1 @@ +if (p == b); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp new file mode 100644 index 00000000..d37d7ac3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_2949.cpp @@ -0,0 +1,7 @@ +int index = -1; + +int main(void) +{ + const int x = 2; + int y = index < -x ? 1 : index > x ? 2 : 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp new file mode 100644 index 00000000..b546e7be --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3010.cpp @@ -0,0 +1,16 @@ +namespace SomeLongNamespaceName { +class Foo { }; +} + +class Bar : SomeLongNamespaceName::Foo { +public: +Bar() + : SomeLongNamespaceName::Foo(), + myNumber(3), // <-- this line + myOtherNumber(5) +{ +} +private: +int myNumber; +int myOtherNumber; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp new file mode 100644 index 00000000..ddbb473e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3018.cpp @@ -0,0 +1,7 @@ +class Class +{ +int fa(); +int* fpa(); +int fb(); +int& frb(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp new file mode 100644 index 00000000..9e64526e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3025.cpp @@ -0,0 +1,2 @@ +int a;// Рука +int d;/* Рука */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp new file mode 100644 index 00000000..b91f431d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3034.cpp @@ -0,0 +1,13 @@ +void main() +{ + while (*stringcur) + { +#ifdef NO8BIT + if (((*bufcur++ ^ *stringcur) & 0x7F) != 0) +#else /* NO8BIT */ + if (*bufcur++ != *stringcur) +#endif /* NO8BIT */ /* Issue #3034 */ + break; + } +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp new file mode 100644 index 00000000..fe9aed25 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3040.cpp @@ -0,0 +1,57 @@ +int main() +{ + switch (opcode) + { + case 1: + return Number(localeCompare(s, a0.toString(exec))); + +#ifndef A + case 2: + result = String("<big>" + s + "</big>"); + break; +#endif + + } + + switch (ev->command) + { + case (3): + ev->note = *ptrdata; ptrdata++; currentpos++; + ev->vel = *ptrdata; ptrdata++; currentpos++; + if (ev->vel==0) + note[ev->chn][ev->note]=FALSE; + else + note[ev->chn][ev->note]=TRUE; + +#ifdef B + if (ev->chn==6) { + if (ev->vel==0) printfdebug("Note Onf\n"); + else printfdebug("Note On\n"); + }; +#endif + break; + case (4) : +#ifdef C + if (ev->chn==6) printfdebug("Note Off\n"); +#endif + ev->note = *ptrdata;ptrdata++;currentpos++; + ev->vel = *ptrdata;ptrdata++;currentpos++; + note[ev->chn][ev->note]=FALSE; + + break; + case (5) : +#ifdef D + if (ev->chn==6) printfdebug ("Key press\n"); +#endif + ev->note = *ptrdata;ptrdata++;currentpos++; + ev->vel = *ptrdata;ptrdata++;currentpos++; + break; + +#ifndef E + case 6: + result = String("<big>" + s + "</big>"); + break; +#endif + } +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp new file mode 100644 index 00000000..739b1305 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3044.cpp @@ -0,0 +1,38 @@ +int main() +{ + int af; + int A; + int B; + switch (af) + { + case 1: + B = 2; + case 2: + return 1; + case 3: + A = 1; + break; +#ifdef ALL_THE_CASE + case 4: + return 2; +#endif +#ifdef ALL_THE_CASE + case 5: + B = 2; +#endif + case (6): + B=13; +#ifdef PART_OF_THE_CASE_UNDER + A=1; +#endif + break; + case (7) : +#ifdef PART_OF_THE_CASE_ABOVE + A=5; +#endif + B=7; + break; + default: + B= 50; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp new file mode 100644 index 00000000..678d6ce4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3048.cpp @@ -0,0 +1,40 @@ +int main() +{ + int sa_family; + int d; + int scopeid; + switch (sa_family) + { + case 1: +#ifdef AF_INET6 + if (d == 1) + scopeid = 1; + else + scopeid = 2; + return 5; +#else + return 6; +#endif + + case 2: +#ifdef AF_INET6 + TQString scopeid("%"); + if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id) + scopeid += TQString::number(d->addr.in6->sin6_scope_id); + else + scopeid.truncate(0); + return d->ref.ipAddress().toString() + scopeid; +#endif + + case 3: +#ifdef AF_INET6 + TQString scopeid("%"); + if (d->addr.generic->sa_family == AF_INET6 && d->addr.in6->sin6_scope_id) + scopeid += TQString::number(d->addr.in6->sin6_scope_id); + else + scopeid.truncate(0); + return d->ref.ipAddress().toString() + scopeid; +#endif + } +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp new file mode 100644 index 00000000..cb468be3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3052.cpp @@ -0,0 +1,11 @@ +#define VTABLE_DECLARE \ + extern struct vtable_struct_name_macro vtable_base_macro; \ + struct vtable_struct_name_macro + +#define VTABLE_METHOD(retvalue, method, args ...) \ + retvalue(*method)(args) + +VTABLE_DECLARE { + VTABLE_METHOD(int, get, const char *name); + VTABLE_METHOD(int, set, const char *name, int value); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp new file mode 100644 index 00000000..77d0d337 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054-2.cpp @@ -0,0 +1,6 @@ +void func(){ + parallel_for(0, 100, [&](int aaaaaa, int bbbbbbb, int ccccccc, int ddddddd, const int eee){ + // do something + return a; + }); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp new file mode 100644 index 00000000..2d8b38d0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3054.cpp @@ -0,0 +1,7 @@ +void func() +{ + parallel_for(0, 100, [ & ] ( const int i ) { + const std::vector<int> values = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }; + return values[i]; + }); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp new file mode 100644 index 00000000..85c9b7e8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055-a.cpp @@ -0,0 +1,13 @@ +#ifndef ABC +# define ABC + +#ifdef XYZ1 +extern "C" { +#endif + +#ifdef XYZ2 +} +#endif + +#endif +int a; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp new file mode 100644 index 00000000..4d66bbf3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3055.cpp @@ -0,0 +1,12 @@ +#ifndef ABC +# define ABC + +#ifdef XYZ1 +extern "C" { +#endif + +#ifdef XYZ2 +} +#endif + +#endif diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp new file mode 100644 index 00000000..f94e88e7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3058.cpp @@ -0,0 +1,70 @@ +KJS::Value KJS::KateJSViewProtoFunc::call(KJS::ExecState *exec, KJS::Object &thisObj, const KJS::List &args) +{ + switch (id) + { + case KateJSView::SetCursorPositionReal: + return KJS::Boolean( view->setCursorPositionReal( args[0].toUInt32(exec), args[1].toUInt32(exec) ) ); + + // SelectionInterface goes in the view, in anticipation of the future + case KateJSView::Selection: + return KJS::String( view->selection() ); + } + + return KJS::Undefined(); +} + +void KateXmlIndent::getLineInfo (uint line, uint &prevIndent, int &numTags, + uint &attrCol, bool &unclosedTag) +{ + for(pos = 0; pos < len; ++pos) { + int ch = text.at(pos).unicode(); + switch(ch) { + case '<': + ++numTags; + break; + + // don't indent because of DOCTYPE, comment, CDATA, etc. + case '!': + if(lastCh == '<') --numTags; + break; + + // don't indent because of xml decl or PI + case '?': + if(lastCh == '<') --numTags; + break; + } + } +} + +static YYSIZE_T yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + for (;;) + switch (*++yyp) + { + case '\\': + if (*++yyp != '\\') + yyres[yyn] = *yyp; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + } + } + return yystpcpy (yyres, yystr) - yyres; +} + +Value RegExpProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args) +{ + if (!thisObj.inherits(&RegExpImp::info)) { + if (thisObj.inherits(&RegExpPrototypeImp::info)) { + switch (id) { + case ToString: return String("//"); // FireFox returns /(?:)/ + } + } + return err; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp new file mode 100644 index 00000000..2a76b5a3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_0nl.cpp @@ -0,0 +1,8 @@ +DCOPClient::DCOPClient() +{ + TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this, + TQT_SLOT(processPostedMessagesInternal())); + TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout())); +} + +#include <dcopclient.moc>
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp new file mode 100644 index 00000000..fd369e24 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_1nl.cpp @@ -0,0 +1,8 @@ +DCOPClient::DCOPClient() +{ + TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this, + TQT_SLOT(processPostedMessagesInternal())); + TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout())); +} + +#include <dcopclient.moc> diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp new file mode 100644 index 00000000..25906e08 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3061_2nl.cpp @@ -0,0 +1,9 @@ +DCOPClient::DCOPClient() +{ + TQObject::connect(&d->postMessageTimer, TQT_SIGNAL(timeout()), this, + TQT_SLOT(processPostedMessagesInternal())); + TQObject::connect(&d->eventLoopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(eventLoopTimeout())); +} + +#include <dcopclient.moc> + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp new file mode 100644 index 00000000..75c6072b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3080.cpp @@ -0,0 +1,2 @@ +auto j = int{0}; +auto j = decltype(int){0}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp new file mode 100644 index 00000000..04119de3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3097.cpp @@ -0,0 +1,8 @@ +void foo() +{ + for( unsigned p = 0; p < np; + ++p ) + { + double* o = bar[p]; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp new file mode 100644 index 00000000..63090f4a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_3113.cpp @@ -0,0 +1 @@ +#define CONTINUE_IF(expr) { if ((expr)) continue; } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp new file mode 100644 index 00000000..90084874 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_931.cpp @@ -0,0 +1,7 @@ +//we manually indented continuation here to prevent 'reallyLongArgumentName' from crossing +//our line length limit +void ReallyLongClassName::ReallyLongMethondName(int arg1, + int reallyLongArgumentName) + +void LongClassName::LongMethondName(int arg1, + int reallyLongArgumentName) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp new file mode 100644 index 00000000..05eca611 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Issue_995-do.cpp @@ -0,0 +1,3 @@ + do { + xxx = _error; + }while(0) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp new file mode 100644 index 00000000..9c7f1ee9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine.cpp @@ -0,0 +1,9 @@ + + +{ + /* + * test for new lines, everywhere + */ +} + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp new file mode 100644 index 00000000..01e7cc97 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/NewLine0.cpp @@ -0,0 +1,5 @@ +{ + /* + * test for new lines, everywhere + */ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp new file mode 100644 index 00000000..b0e13d6a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/PR326_invalid-backslash-eol-csharp.cpp @@ -0,0 +1,2 @@ +// test \
+blah()
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp new file mode 100644 index 00000000..ee6239f9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_2.cpp @@ -0,0 +1,10 @@ +bool AkonadiServer::quit() +{ + QTimer::singleShot( 0, this, SLOT ( doQuit( ) ) ); +} + +void AkonadiServer::incomingConnection(quintptr socketDescriptor) +{ + QPointer<ConnectionThread> thread = new ConnectionThread(socketDescriptor, this); + connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater())); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp new file mode 100644 index 00000000..d3ef9396 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_EMIT.cpp @@ -0,0 +1,5 @@ +bool Handler::failureResponse(const QByteArray &failureMessage) +{ + response.setString(failureMessage); + Q_EMIT responseAvailable(response); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp new file mode 100644 index 00000000..37156618 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREACH.cpp @@ -0,0 +1,6 @@ +void Cache::collection() +{ + Q_FOREACH(QString partName, lParts) { + a = 5; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp new file mode 100644 index 00000000..a0fb07d5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_FOREVER.cpp @@ -0,0 +1,6 @@ +void Cache::collection() +{ + Q_FOREVER{ + a = 5; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp new file mode 100644 index 00000000..5a4c8e7d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Q_SIGNAL_SLOT.cpp @@ -0,0 +1,23 @@ +bool AkonadiServer :: init () +{ + connect ( watcher , SIGNAL( serviceOwnerChanged ( QString, QString,QString ) ), + this, SLOT(serviceOwnerChanged(QString,QString, QString))); + return true; +} + +connect(&mapper, SIGNAL(mapped(Q1 &)), this, SLOT(onSomeEvent(const Q2 &))); + +connect(&mapper, + SIGNAL(mapped(Q1 &)), + this, + SLOT(onSomeEvent(const Q2 &))); + +connect(&mapper, + SIGNAL(emitted(Q1 *)), + this, + SLOT(accept(const Q2 *))); + +connect(&mapper, + SIGNAL(emitted(X< int >)), + this, + SLOT(accept(X< int >))); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp new file mode 100644 index 00000000..ea1c724e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/STUCK_macro-difficulties.cpp @@ -0,0 +1,5 @@ +#define inline_2 __forceinline
+#define inline(i) inline_##i
+inline(2) f()
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h new file mode 100644 index 00000000..60dc3791 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/Timestamp.h @@ -0,0 +1,169 @@ +/**
+ * @file Timestamp.h
+ * Definition of class example::Timestamp.
+ */
+
+#ifndef __Timestamp_h_
+#define __Timestamp_h_
+
+#include <string>
+
+namespace example {
+
+class IStreamable;
+class InStream;
+class OutStream;
+
+/**
+ * Timestamp is a timestamp with nanosecond resolution.
+ */
+class Timestamp
+ : public IStreamable
+{
+
+public:
+
+ /**
+ * Default constructor.
+ */
+ Timestamp();
+
+ /**
+ * Constructor.
+ *
+ * @param sec The seconds
+ * @param nsec The nanoseconds
+ */
+ Timestamp(long sec, unsigned long nsec);
+
+ /**
+ * Destructor.
+ */
+ virtual ~Timestamp();
+
+ /**
+ * Adds two timestamps.
+ *
+ * @param rhs The other timestamp
+ * @return The resulting timestamp
+ */
+ Timestamp operator+ (const Timestamp& rhs) const;
+
+ /**
+ * Substracts two timestamps.
+ *
+ * @param rhs The other timestamp
+ * @return The resulting timestamp
+ */
+ Timestamp operator- (const Timestamp& rhs) const;
+
+ /**
+ * Compares two timestamps.
+ *
+ * @param rhs The other timestamp
+ * @return true if timestamp is smaller than the given timestamp
+ */
+ bool operator< (const Timestamp& rhs) const;
+
+ /**
+ * Compares two timestamps.
+ *
+ * @param rhs The other timestamp
+ * @return true if timestamp is greater than the given timestamp
+ */
+ bool operator> (const Timestamp& rhs) const;
+
+ /**
+ * Compares two timestamps.
+ *
+ * @param rhs The other timestamp
+ * @return true if timestamp is equal to the given timestamp
+ */
+ bool operator== (const Timestamp& rhs) const;
+
+ /**
+ * Compares two timestamps.
+ *
+ * @param rhs The other timestamp
+ * @return true if timestamp is not equal to the given timestamp
+ */
+ bool operator!= (const Timestamp& rhs) const;
+
+ /**
+ * Adds an other timestamp.
+ *
+ * @param rhs The other timestamp
+ */
+ void operator+= (const Timestamp& rhs);
+
+ /**
+ * Adds milliseconds.
+ *
+ * @param ms The milliseconds
+ * @return The resulting timestamp
+ */
+ Timestamp addMilliseconds(unsigned long ms) const;
+
+ /**
+ * Adds nanoseconds.
+ *
+ * @param ns The nanoseconds
+ * @return The resulting timestamp
+ */
+ Timestamp addNanoseconds(unsigned long ns) const;
+
+ /**
+ * Checks if this timestamp is zero.
+ *
+ * @return true if timestamp is zero
+ */
+ bool isZero() const;
+
+ /**
+ * Gets the milliseconds.
+ * @attention Negativ timestamp return zero
+ *
+ * @return The milliseconds
+ */
+ unsigned long getMilliseconds() const;
+
+ /**
+ * Divide timestamps by two.
+ *
+ * @return The resulting timestamp
+ */
+ Timestamp divideByTwo();
+
+ /**
+ * Gets the string-representation.
+ *
+ * @return The string representation
+ */
+ std::string getString() const;
+
+ /**
+ * Gets the string-representation in milliseconds.
+ *
+ * @return The string representation
+ */
+ std::string getStringMilliseconds() const;
+
+ /**
+ * Resets the timestamp.
+ */
+ void reset();
+
+ /** The seconds */
+ long sec;
+
+ /** The nanoseconds */
+ unsigned long nsec;
+
+ InStream& operator << (InStream& in);
+
+ OutStream& operator >> (OutStream& out) const;
+
+};
+} // namespace
+
+#endif // __Timestamp_h_
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp new file mode 100644 index 00000000..3228cf2a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-10496.cpp @@ -0,0 +1,11 @@ +friend class :: GameObject;
+void GameObject :: Foo();
+
+auto x = :: GlobalFunc();
+
+friend void ::testing:: PrintDebugInformationForFakesInUse();
+
+template<class TransferFunction>
+void ::DateTime :: Transfer(TransferFunction & transfer)
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp new file mode 100755 index 00000000..9cc7b13f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-12046.cpp @@ -0,0 +1,2 @@ +//The space shouldn't be removed. This is a STRUCT +struct ALIGN_TYPE(16) StructName;
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp new file mode 100644 index 00000000..38ded76c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1288.cpp @@ -0,0 +1,10 @@ +if (Application.platform == RuntimePlatform.LinuxEditor) +{ + return new ProcessStartInfo("smthg") + { + Arguments = string.Format ("-9 --ss -S aa \"{0}\"", file), + WorkingDirectory = Directory.GetCurrentDirectory(), + UseShellExecute = false, + CreateNoWindow = true + }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp new file mode 100644 index 00000000..278cd1a2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1334.cpp @@ -0,0 +1,7 @@ +// This should not be screwing with the trailing backslash and indentation of contents!
+// unless it's on the first line where it's controlled by sp_before_nl_cont which we have set on add.
+// Devs should expect misalignment of the nl_cont tokens because we're not messing with the nl_cont from the define body.
+
+#define MY_DEFINE(param1, param2)\
+ my_long_foo_function(param1);\
+ bar(param2);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp new file mode 100644 index 00000000..2f3ad2a2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1335.cpp @@ -0,0 +1,9 @@ +// Change in Configuration\UnityConfigure.h:
+
+ #define FOO_MACRO 0 /////@TODO: COMMENT?????
+ // ^^^ space removed after 0
+
+// Foo\Bar\Baz\Fizz\Test.cpp
+
+ #define BAR_MACRO FOO_BAR_MACRO //FOO_BAR_BAZ_NONE
+ // ^^^ space removed after _MACRO
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp new file mode 100644 index 00000000..59635c19 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1337.cpp @@ -0,0 +1,9 @@ +// Runtime\Allocator\BucketAllocator.cpp
+
+void foo()
+{
+ void* p1 = new(ptr) Block(bucketsSize);
+ // becomes...
+ void* p1 = new(ptr)Block(bucketsSize);
+ // missing space after ')'
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp new file mode 100644 index 00000000..255db223 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1339.cpp @@ -0,0 +1,2 @@ +auto c = a < b >> 1;
+auto c = a < b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp new file mode 100644 index 00000000..2f743294 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1340.cpp @@ -0,0 +1,4 @@ +namespace dudeNamespace { class ForwardFooClass; }
+
+namespace dudeNamespace
+{ class ForwardFooClass; }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp new file mode 100644 index 00000000..c898df76 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1344.cpp @@ -0,0 +1,20 @@ +// Asm blocks have their own special indentation where lables must remain at indent 0 relative to __asm__ block.
+// They few ways of being opened and closed depending on the compiler.
+// For now, we can at least detect and ignore the contents, including alignment.
+
+// Workaround: can always fall back on disable/enable_processing_cmt.
+
+void foo()
+{
+ int head, bar;
+ __asm__ __volatile__
+ (
+ "movq %0,%%xmm0\n\t" /* asm template */
+ "0:\n\t"
+ "bar %0, [%4]\n\t" // in template
+ "1:\n\t"
+ : "=a", (bar)
+ : "=&b", (&head), "+m", (bar)
+ : "cc"
+ );
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp new file mode 100644 index 00000000..0261a306 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1346.cpp @@ -0,0 +1,24 @@ +// Fix doxygen support to include member groups
+
+// See http://www.stack.nl/~dimitri/doxygen/manual/grouping.html#memgroup
+
+// Note that the spec says three slashes, but their example has only two slashes.
+
+// Once this is done, we can try turning on sp_cmt_cpp_start in Uncrustify.Common-CStyle.cfg.
+
+/// Bucket allocator is used for allocations up to 64 bytes of memory.
+/// It is represented by 4 blocks of a fixed-size "buckets" (for allocations of 16/32/48/64 bytes of memory).
+/// Allocation is lockless, blocks are only growable.
+class Class
+{
+public:
+ ///@{ Doxygen group 1
+ virtual void* Foo();
+ virtual void* Bar();
+ ///@}
+
+ //@{ Doxygen group 2
+ virtual void* Foo();
+ virtual void* Bar();
+ //@}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp new file mode 100644 index 00000000..ac2184f0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1347.cpp @@ -0,0 +1,10 @@ +// Extern "C" blocks need an alignment option somehow. I can do a "set NAMESPACE extern" in the cfg but that will probably screw other stuff up.
+
+// See External\Audio\NativePluginDemo\NativeCode\TeleportLib.h for an example. Yeah it's in external (so have to force-format it) but it's a good case.
+
+// (Actually it's in https://bitbucket.org/Unity-Technologies/nativeaudioplugins, but just published here to external)
+
+extern "C"
+{
+typedef EXPORT_API int (*Foo)(int arg);
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp new file mode 100644 index 00000000..7353e915 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1350.cpp @@ -0,0 +1,5 @@ +// Can't set sp_inside_braces_struct=add otherwise Uncrustify starts applying it to initializers combined with old-C-style struct usage.
+
+struct in_addr addr = {0};
+// ... --> ...
+struct in_addr addr = { 0 };
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp new file mode 100644 index 00000000..8a1aab54 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1356.cpp @@ -0,0 +1,27 @@ +// Hi,
+// When using "space only" and "indent continue", I notice a wrong indentation in C language (at least)
+// function call when the retrun value is assigned to a variable and the call is split in two or more line.
+// In that case the indent is twice the indent set in "indent_continue"
+// This only appears when "indent_with_tabs" is set to 0 "space only" and 1
+// "indent with tabs to brace level, align with spaces"
+// Version tested:
+// 0.59: good indentation
+// 0.60: wrong indentation
+// master (sha1 fc5228e): wrong indentation
+// Here are some details about thats issue:
+// orignal code
+// The long line are manually split and not indented to test uncrustify indent
+
+int main (int argc, char *argv[])
+{
+ double a_very_long_variable = test (foobar1, foobar2, foobar3, foobar4,
+ foobar5, foobar6);
+
+ double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa +
+ asdfasdfasdf - asdfasdf + 56598;
+
+ testadsfa (dfasdf, fdssaf, dsfasdf, sadfa, sadfas, fsadfa,
+ aaafsdfa, afsd, asfdas, asdfa, asfasdfa, afsda, asfdasfds, asdfasf);
+
+ return 0;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp new file mode 100644 index 00000000..770bf0c1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1358.cpp @@ -0,0 +1,15 @@ +// MIDL_INTERFACE includes 'class' in its definition but is not tokenised as such
+// A pretty common pattern would be nice to have proper formatting.
+
+EXTERN_C const IID IID_IFileDialogEvents;
+
+MIDL_INTERFACE("973510db-7d7f-452b-8975-74a85828d354")
+IFileDialogEvents : public IUnknown
+{
+public:
+ virtual HRESULT STDMETHODCALLTYPE OnStuff(
+ /* [in] */ __RPC__in_opt IFileDialog *pfd,
+ /* [in] */ __RPC__in_opt IShellItem *psi,
+ /* [out] */ __RPC__out FDE_SHAREVIOLATION_RESPONSE *pGoodResponse,
+ /* [out] */ __RPC__out FDE_OVERWRITE_RESPONSE *pBadResponse) = 0;
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp new file mode 100644 index 00000000..7f042642 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-16283.cpp @@ -0,0 +1,5 @@ +// It is deleting the space after the pointer marker +void foo() +{ + extern void BillboardRenderer_RenderMultiple(const RenderBatchedData& renderData, ShaderChannelMask channels); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp new file mode 100644 index 00000000..0c40e831 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18439.cpp @@ -0,0 +1,12 @@ +floatNx3 randomRotationMatrices[3]; +if (rotationRandomnessX > epsilon() || rotationRandomnessY > epsilon()) +{ +// Parameters are being double indented. + floatNx3 rotationEuler = floatNx3( + (GenerateRandom(randomSeed + intN(kParticleSystemExternalForcesRotationRandomnessXId)) * 2 - 1) * rotationRandomnessX, + (GenerateRandom(randomSeed + intN(kParticleSystemExternalForcesRotationRandomnessYId)) * 2 - 1) * rotationRandomnessY, + floatN(ZERO)); + eulerToMatrix(rotationEuler, randomRotationMatrices); + + toForce = mul(randomRotationMatrices, toForce); +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp new file mode 100644 index 00000000..0f177fdc --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-18777.cpp @@ -0,0 +1,9 @@ +// I want to keeep the function call indented +Thingy + .Select() + .ToList(); + +// it works with a var +var x = Thingy + .Select() + .ToList(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp new file mode 100644 index 00000000..97940716 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1980.cpp @@ -0,0 +1,8 @@ +// First: scan more FAKE_FUNCTION diffs and see how common this problem is.
+
+// The & should be attached to RefType because it's in a function prototype. Most likely being detected as ARITH.
+
+// We need to figure out how to support this with some setting in our cpp cfg for uncrustify.
+
+FAKE_FUNCTION(Boo, RefType& (void));
+FAKE_FUNCTION(Foo, (MyAwesomeType* (void)));
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp new file mode 100644 index 00000000..a20f4c43 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1981.cpp @@ -0,0 +1,16 @@ +#if DOXYGEN
+class Class
+#else
+struct Struct
+#endif
+{
+ UInt32 m_myAwesomeMember1 : kEnumValue
+ UInt32 m_myAwesomeMember11 : kEnumValue
+ UInt32 m_myAwesomeMember111 : 1;
+ UInt32 m_myAwesomeMember1111 : 1;
+ UInt32 m_myAwesomeMember11111 : 1;
+ UInt32 m_myAwesomeMember111111 : 1;
+ UInt32 m_myAwesomeMember1111111 : 1;
+ UInt32 m_myAwesomeMember11111111 : kEnumValue
+ UInt32 m_myAwesomeMember11111111 : kEnumValue
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp new file mode 100644 index 00000000..e7d9de6d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-1983.cpp @@ -0,0 +1 @@ +typedef HRESULT (WINAPI *Foo)(const void* pData, SIZE_T size, UINT flags, const char* szStr, D3D10BlobHack** ppBlob);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp new file mode 100644 index 00000000..ef5fe7cf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-19894.cpp @@ -0,0 +1,16 @@ +//It is applying double indentation +m_ApplicationView = AppC::ApplicationView::GetForCurrentView(); +m_ViewConsolidateEvtToken = m_ApplicationView->Consolidated += + ref new AppC::TypedEventHandler<AppC::ApplicationView^, AppC::ApplicationViewConsolidatedEventArgs^>(this, &FrameworkView::InternalOnViewConsolidated); + +m_WindowActivatedEvtToken = m_CoreWindow->Activated += + ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::WindowActivatedEventArgs^>(this, &FrameworkView::InternalOnWindowActivated); + +m_SizeChangedEvtToken = m_CoreWindow->SizeChanged += + ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::WindowSizeChangedEventArgs^>(this, &FrameworkView::InternalOnWindowSizeChanged); + +m_VisibilityChangedEvtToken = m_CoreWindow->VisibilityChanged += + ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::VisibilityChangedEventArgs^>(this, &FrameworkView::InternalOnWindowVisibilityChanged); + +m_WindowClosedEvtToken = m_CoreWindow->Closed += + ref new AppC::TypedEventHandler<AppC::CoreWindow^, AppC::CoreWindowEventArgs^>(this, &FrameworkView::InternalOnWindowClosed);
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp new file mode 100644 index 00000000..7c64f76a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2049.cpp @@ -0,0 +1,8 @@ +// Pointer mark should be formatted (WINAPI* SetXX) +typedef DWORD (WINAPI *SetDllDirectory) (LPCSTR); +// Pointer mark should be formatted (EXCEPTION_POINTERS* pExt) +static LONG WINAPI CustomUnhandledExceptionFilter(EXCEPTION_POINTERS * pExInfo) +{ + if (EXCEPTION_BREAKPOINT == pExInfo->ExceptionRecord->ExceptionCode) // Breakpoint. Don't treat this as a normal crash. + return EXCEPTION_CONTINUE_SEARCH; +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp new file mode 100644 index 00000000..a8c5f2df --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21506.cpp @@ -0,0 +1,13 @@ +struct bar
+{
+ void (Namespace::*method)(Class& param);
+};
+
+void Class::Foo(void (*callback)(const Class& entry))
+{
+}
+
+void foo()
+{
+ int a = 1; // if you comment this out, the bug stops reproducing
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp new file mode 100644 index 00000000..bde48ee7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21509.cpp @@ -0,0 +1,15 @@ +void (*foo)(int);
+static bar(void (*foo)(int))
+{
+}
+
+bool (*comp_func)(const TypeA*const a, const TypeB& value) = NULL;
+static foo(bool (*comp_func)(const TypeA*const a, const TypeB& value));
+static foo(bool (*comp_func)(const TypeA*const a, const TypeB& value) = NULL)
+{
+}
+
+void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const TypeA* lhs, const TypeB& rhs));
+void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const TypeA* lhs, const TypeB& rhs) = NULL)
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp new file mode 100644 index 00000000..ea406fbe --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21510.cpp @@ -0,0 +1 @@ +typedef std::pair<Type* const, TypeB> Object;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp new file mode 100644 index 00000000..991d2631 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21727.cpp @@ -0,0 +1,18 @@ +void foo()
+{
+ int error = 0;
+#if defined(SUPPORT_FEATURE)
+ error = feature_bar();
+#else // feature not supported
+ // we call bar otherwise
+ error = bar();
+#endif // SUPPORT_FEATURE
+ // continue with function logic
+ if (error != 0)
+ {
+#if 0 // TODO: this is disabled
+ // call final bar
+ error_bar(error);
+#endif
+ }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp new file mode 100644 index 00000000..658fba68 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21728.cpp @@ -0,0 +1 @@ +friend std::ostream& operator<<(std::ostream& os, const ScriptingObjectPtr& o);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp new file mode 100644 index 00000000..4b8d1d59 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-21729.cpp @@ -0,0 +1,3 @@ +extern "C" void __declspec(dllexport) GetAccountNameAndDomain(HWND /*hwndParent*/, int string_size, TCHAR * variables, stack_t** stacktop, extra_parameters* /*extra*/)
+{
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp new file mode 100644 index 00000000..b9ced773 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2650.cpp @@ -0,0 +1,13 @@ +MergeJSFiles(new string[] { + GetDecompressor(), + Paths.Combine(buildToolsDir, "UnityConfig"), + Paths.Combine(args.stagingAreaData, kOutputFileLoaderFileName), +}, unityLoader +); + + +throw new System.Exception( + "'Fast Rebuild' option requires prebuilt JavaScript version of Unity engine. The following files are missing: " + + (!File.Exists(UnityNativeJs) ? "\n" + UnityNativeJs : "") + + (!File.Exists(UnityNativeJs + ".mem") ? "\n" + UnityNativeJs + ".mem" : "") +); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp new file mode 100644 index 00000000..b6aa5bd7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2680.cpp @@ -0,0 +1,3 @@ +A(B(C( + D(a | + b | c)))); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp new file mode 100755 index 00000000..5da60d3f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-2683.cpp @@ -0,0 +1,2 @@ +// It shouldn't add a space after Unity::Type +static Object* Produce(const Unity::Type* type, InstanceID instanceID = InstanceID_None, MemLabelId = kMemBaseObject, ObjectCreationMode mode = kCreateObjectDefault);
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp new file mode 100644 index 00000000..a6cf3fc5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-29935.cpp @@ -0,0 +1,6 @@ +void Foo1(BarType& x, void BarFunc()); + +void Bar() +{ + void BarFunc2(BarType& x); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp new file mode 100644 index 00000000..1fd5c1fe --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30088.cpp @@ -0,0 +1,9 @@ +void Foo(int value)
+{
+ m_Foo[0].prop
+ = m_Foo[1].prop
+ = m_Foo[2].prop
+ = m_Foo[3].prop
+ = m_Foo[4].prop
+ = m_Foo[5].prop = value;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp new file mode 100644 index 00000000..ffa60026 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-30628.cpp @@ -0,0 +1,7 @@ +// Regression 1 FAKE_METHOD expands to a function prototype. Could possibly use PROTO_WRAP like for FAKE_FUNCTION
+class Foo
+{
+ FAKE_FUNCTION(Bar, GetBarInfo, const BarInfo &());
+ FAKE_METHOD(Bar, GetBarInfo, const BarInfo &());
+ FAKE_FUNCTION_WITH_LOCAL_NAME(FakeGetCommonScriptingClasses, GetCommonScriptingClasses, const CommonScriptingClasses &());
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp new file mode 100644 index 00000000..9151231a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-32657.cpp @@ -0,0 +1,10 @@ +void UNITY_INTERFACE_API XREnvironment::DepthSetNumberOfPointsImpl(
+ IUnityXRDepthDataAllocator* allocator,
+ size_t numPoints)
+{
+}
+
+UnityXRRaycastHit* (UNITY_INTERFACE_API* Raycast_SetNumberOfHits)(
+ IUnityXRRaycastAllocator* allocator,
+ size_t numHits);
+
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp new file mode 100644 index 00000000..701b55b2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-38381.cpp @@ -0,0 +1,5 @@ +#if UNITY_DEFER_GRAPHICS_JOBS_SCHEDULE +void GfxDevice::ScheduleAsyncJob(AsyncCommandJobFunc* jobFunc, GfxDeviceAsyncCommand* cmd, const JobFence& depends, JobBatchDispatcher& dispatcher) +#else +JobFence& GfxDevice::ScheduleAsyncJob(AsyncCommandJobFunc* jobFunc, GfxDeviceAsyncCommand* cmd, const JobFence& depends, JobBatchDispatcher& dispatcher) +#endif // #if UNITY_DEFER_GRAPHICS_JOBS_SCHEDULE diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp new file mode 100644 index 00000000..c4005d7c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-64325.cpp @@ -0,0 +1,13 @@ +class function_ref +{ +public: + template<typename CallableT> + function_ref(CallableT &&t) noexcept + : m_Ptr((void *)std::addressof(t)) + , m_ErasedFn([](void *ptr, Args... args) -> ReturnValue + { + // Type erasure lambda: cast ptr back to original type and dispatch the call + return (*reinterpret_cast<std::add_pointer_t<CallableT>>(ptr))(std::forward<Args>(args)...); + }) + {} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp new file mode 100644 index 00000000..f6dba01b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/UNI-9650.cpp @@ -0,0 +1,7 @@ +// make sure that we ignore sp_inside_angle=remove if it will cause a digraph to be created
+
+ops.pProgressCallback = reinterpret_cast< ::ProgressCallback* >( progressCallback);
+ops.pProgressCallback = reinterpret_cast< ::ProgressCallback*>(progressCallback);
+ops.pProgressCallback = reinterpret_cast<::ProgressCallback*>(progressCallback);
+ops.pProgressCallback = reinterpret_cast<ProgressCallback*>(progressCallback);
+ops.pProgressCallback = reinterpret_cast< ProgressCallback*>(progressCallback);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp new file mode 100644 index 00000000..3c232dec --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/al.cpp @@ -0,0 +1,28 @@ +/* ctest4 */ +fm_status fm2000EventHandlingInitialize(fm_int sw); +fm_status fm2000MacTableOverflowStart(fm_int sw); +fm_bool fm2000ProcessMATableEntry( fm_mac_table_work_list *pWork, + fm_int sw, + fm_int index, + fm_thread * event_handler, + fm_uint32 * numUpdates, + fm_event **event); +void foo() +{ + Logger log = new Logger(); + Logger log= new Logger( ); + + log.foo.bar = 5; + log.narf.sweat = "cat"; +for (i = 0; i<5; i++) bar(i); +} +int this_works(int x); +int bug(int); // BUG: left-aligned +typedef int fooman; + enum FLAGS + { + FLAGS_decimal = 1, // decimal + FLAGS_unsigned = 2, // u or U suffix + FLAGS_long = 4, // l or L suffix + }; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp new file mode 100644 index 00000000..0ba91720 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-330.cpp @@ -0,0 +1,6 @@ +\ +#define CTOR(i, _) : \ + T(X()), \ + y() \ +{ } + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp new file mode 100644 index 00000000..2e55d59d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-assign-mixed.cpp @@ -0,0 +1,11 @@ +class X16 +{ +X16() = delete; +public: +void z(int x = 0); +virtual void f(int x, int y) = 0; +int hhi = 9; +void g(int x = 0); +int i = 9; +void x(int ggs = 0); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp new file mode 100644 index 00000000..29a7a23a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align-star-amp-pos.cpp @@ -0,0 +1,47 @@ + +/** First, the typedefs */ +typedef int MY_INT; +typedef int * MY_INTP; +typedef int & MY_INTR; +typedef CFoo& foo_ref_t; +typedef int(*foo_t)(void *bar); +typedef const char *(*somefunc_t)(void *barstool); + +/* Now, the types */ +struct foo1 { + unsigned int d_ino; + const char *d_reclen; + unsigned short d_namlen; + char d_name[1]; + CFoo&fref; +}; + +struct foo { int a; char *b }; + +static int idx; +static const char **tmp; + CFoo&fref; + +static char buf[64]; +static unsigned long how_long; +// comment +static int **tmp; +static char buf[64]; + + +void bar(int someval, + void *puser, + const char *filename, + struct willy *the_list, + int list_len) +{ + int idx; + const char **tmp; + char buf[64]; + CFoo&fref; + + unsigned long how_long; + + return(-1); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp new file mode 100644 index 00000000..f47f0c80 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_across_braces.cpp @@ -0,0 +1,7 @@ +enum foo // comment +{ + long_enum_value, // these comments should be aligned + another_value, // with each other, but not + shorter, // with the first line +}; // this comment should start a new group +void bar(); // this one should align with the previous line diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp new file mode 100644 index 00000000..0c816099 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_assign_func_proto.cpp @@ -0,0 +1,7 @@ +const int *ptr const = 0;
+ virtual void f1()= 0;
+ virtual void f2()= 0;
+ virtual void f3() const = 0;
+ virtual void f4() const = 0;
+ virtual void f5() = 0;
+ virtual void f6()= 0;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp new file mode 100644 index 00000000..4b325b1e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_asterisk_after_type_cast.cpp @@ -0,0 +1,30 @@ +#define MEM_ASSERT1(x) if (!(x)) * (volatile int *)0 = 1 +#define MEM_ASSERT2(x) if (!(x))*(volatile int*)0 = 1 +#define MEM_ASSERT3(x) if (!(x)) * (volatile int *)0 = 1; +#define MEM_ASSERT4(x) if (!(x))*(volatile int*)0 = 1; +#define MEM_ASSERT5(x) if (!(x)) { * (volatile int *)0 = 1; } +#define MEM_ASSERT6(x) if (!(x)) { *(volatile int*)0 = 1; } + +#define FOO1(x) while (!(x)) { * (volatile int*)0 = 1; } +#define FOO2(x) while (!(x)) * (volatile int*)0 = 1; +#define FOO3(x) { * (volatile int*)0 = 1; } +#define FOO4(x) * (volatile int*)0 = 1; +#define FOO5(x) for(;;) (!(x)) { * (volatile int*)0 = 1; } +#define FOO6(x) for(;;) (!(x)) * (volatile int*)0 = 1; +#define FOO7(x) do { * (volatile int*)0 = 1; } while (false); + +void foo1(int x) { + if (!(x)) * (volatile int *)0 = 1; +} + +void foo2(int x) { + if (!(x))*(volatile int*)0 = 1; +} + +void foo3(int x) { + if (!(x)) { * (volatile int *)0 = 1; } +} + +void foo4(int x) { + if (!(x)) { *(volatile int*)0 = 1; } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp new file mode 100644 index 00000000..2be3c8e8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class-constr.cpp @@ -0,0 +1,6 @@ +class foo : public my_Class +{ + void bar_c(int tttt, int uu, int abc, int defxx) : tttt(4444) +, uu(22) , abc(333) , defxx(55555) + {} +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp new file mode 100644 index 00000000..d47e77bb --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_class.cpp @@ -0,0 +1,14 @@ +//---------------------------------------------------------------------------
+// Statics |
+//---------------------------------------------------------------------------
+void CTdrFile::SetDistanceMode( TDistMode dm ) { CTdrFile::ms_DistMode = dm; }
+TDistMode CTdrFile::GetDistanceMode( void ) { return CTdrFile::ms_DistMode; }
+String CTdrFile::GetDistanceModeUnits( void ) { return ( CTdrFile::GetDistanceMode() == dmKM ) ? "km" : "Miles"; }
+void CTdrFile::SetBSTCompensation( bool bUseBST ){ ms_bCompBST = bUseBST; }
+void CTdrFile::SetFactoryMode( bool bFactory ) { ms_bFactory = bFactory; }
+bool CTdrFile::GetFactoryMode( void ) { return ms_bFactory; }
+
+unsigned int CAgentCharacter::iReferenceCount = 0;
+IAgentEx* CAgentCharacter::pAgentEx = NULL;
+CAgentNotifySink* CAgentCharacter::pSink = NULL;
+
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp new file mode 100644 index 00000000..1a22f6d9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_constr.cpp @@ -0,0 +1,16 @@ +struct TelegramIndex +{ +TelegramIndex(const char* pN, unsigned long nI) : +pTelName(pN), +nTelIndex(n) +{ +} + +~TelegramIndex() +{ +} + +const char* const pTelName; +unsigned long nTelIndex; +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp new file mode 100644 index 00000000..c0c066b8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_continuation_left_shift.cpp @@ -0,0 +1,25 @@ +std::string foo(struct tm* local) { + std::stringstream timestamp; + timestamp << + (local->tm_year + 1900) << "." << + (local->tm_mon + 1) << "." << + local->tm_mday << "-" << + local->tm_hour << "." << + local->tm_min << "." << + local->tm_sec; + return timestamp.str(); +} + +std::string foo2(struct tm* local) { + std::stringstream timestamp; + int year = local->tm_year + 1900; + int mon = local->tm_mon + 1; + timestamp << + year << "." << + mon << "." << + local->tm_mday << "-" << + local->tm_hour << "." << + local->tm_min << "." << + local->tm_sec; + return timestamp.str(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp new file mode 100644 index 00000000..de21686c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_default_after_override.cpp @@ -0,0 +1,28 @@ +class B +{ +public: +B() = default; +virtual ~B() = default; +}; + +class D1 : public B +{ +public: +D1() = default; +~D1() = default; +D1(const D1&) = delete; +D1(D1&&) = delete; +D1& operator=(const D1&) = delete; +D1& operator=(const D1&&) = delete; +}; + +class D2 : public B +{ +public: +D2() = default; +~D2() override = default; +D2(const D2&) = delete; +D2(D2&&) = delete; +D2& operator=(const D2&) = delete; +D2& operator=(D2&&) = delete; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp new file mode 100644 index 00000000..c27ed9d1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_fcall.cpp @@ -0,0 +1,18 @@ +void foo() +{ +abc(1,2,3); +abc(10,20,30); +abc(100,200,300); +cab(3,2,1,0); +brat("foo",2000,3000); +brat("question",2,-42); +brat("a",-22, 1); +while (1) +{ +brat("foo",2000,3000); +brat("question",2,-42); +brat("a",-22, 1); +} +brat("foo",2000,3000); +brat("a",-22, 1); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp new file mode 100644 index 00000000..a90155fd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_params.cpp @@ -0,0 +1,111 @@ +class SomeClass +{ + public: + // Short parameters + TYPE_EXPORT method1(int a, + float b); + + TYPE_EXPORT method2(int& d, + float e); + + TYPE_EXPORT method3(int* f, + float g); + + // Parameters with '&' and '*' + TYPE_EXPORT method4(int a); + TYPE_EXPORT method5(int & a); + TYPE_EXPORT method6(int * a); + + TYPE_EXPORT method7(float a); + TYPE_EXPORT method8(float & a); + TYPE_EXPORT method9(float * a); + + // Single short and long parameters + void method10(int a); + void method11(float & a); + void method12(SomeLongNamespace::SomeLongType long_parameter_name); + void method13(double * a); + void method14(SomeLongType long_parameter_name); + + // Long parameters + void method20(int * int_param, + SomeLongNamespace::SomeLongType long_parameter_name, + float & float_param); + + // Possible bug: different aligning in method21 and method22 + // align_func_params_span = 1, align_func_params_thresh = 8 + void method21(SomeLoooooooooooooongType long_param_1, + const string& string_param_1, + const TimePoint& time_param, + double double_param_1, + double double_param_2, + const string& string_param_2, + SomeLoooooooooooooongType long_param_2 ); + void method22(SomeLoooooooooooooongType long_param_1, + const string& string_param_1, + double double_param_1, + double double_param_2, + const TimePoint& time_param, + const string& string_param_2, + SomeLoooooooooooooongType long_param_2 ); + + void method23(int int_param, + int * int_ptr_param, + float float_param, + float & float_ref_param, + SomeLongNamespace::SomeLongType long_parameter_name, + int * other_int_param, + SomeLooooongType long_parameter_name, + SomeLoooooooooongType looong_parameter_name, + SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_parameter_name, + int * int_ptr_param, + float float_param, + float & float_ref_param, + double & double_param, + SomeLongNamespace::SomeLongType long_parameter_name, + int * other_int_param); + + // Don't align several parameters in one line + void method30(int* f, char foo, + float g); + + // Short parameters in method definition + void method40(int a, + float b) + { + int c; + + if ( true ) callProc; + // do stuff. + } + + // Long parameters in method definition + void method50(int int_param, + SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name, + float float_param, + double double_param, + const string & string_param) + { + doSomething(); + } + + void method51( + int int_param, + SomeLongNamespace::OtherLongNamespace::SomeLongType long_parameter_name, + float float_param, + double double_param, + const string & string_param) + { + doSomething(); + } + void increasing_length( + int int_param, + float float_param, + double double_param, + ah_long_t & string_param, + very_long_type t_param, + even_longer_type l_param) + { + doSomething(); + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp new file mode 100644 index 00000000..df6b4dca --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh.cpp @@ -0,0 +1,15 @@ +class AlignFuncProtoTest { + public: + void test1(); + void test2(); + SomeLongType findSomeLongType(); + void* test3(); + void test4(){ a=1;} + double test5(); + void test6(); + SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType(); + void test7(); + void test8(); + void test9(); + SomeLongNamespace::SomeLongType long_var; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp new file mode 100644 index 00000000..b0960a11 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_func_proto_thresh2.cpp @@ -0,0 +1,19 @@ +class AlignFuncProtoTest { + public: + virtual void test1(std::wstring & name, std::pair<Space1::Space2::SomeType, Space1::Space2::otherType> param1) = 0; + virtual SomeLongType findSomeLongType()= 0; + virtual Some::Type test2() = 0; + virtual SomeNameSpace::TypeA test3()= 0; + virtual SomeNameSpace::SubNameSpace1::TypeA test4()= 0; + virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::TypeB test5()= 0; + virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::TypeC test6()= 0; + virtual SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::TypeD test7()= 0; + double test5(); + void test6(); + SomeLongNamespace::OtherLongNamespace::SomeLongType findSomeLongType(); + void test7(); + void test8(); + void test9(); + SomeLongNamespace::SomeLongType long_var; + SomeNameSpace::SubNameSpace1::SubNameSpace2::SubNameSpace3::SubNameSpace4::SubNameSpace5::TypeE test7(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp new file mode 100644 index 00000000..3cf7a744 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift.cpp @@ -0,0 +1,41 @@ +#include <iostream> +#define MACRO(x) x +int main() +{ + int X[1]; + MACRO(std::cout << X + << X[0]); + std::cout << X + << X; + std::cout2 << X + << X; + std::cout << X + << X[0]; + std::cout << +X << +Y; + std::cout +<< X +<< Y; + std::cout +<< +X +<< +Y; +} + +#define A_LONG_MACRO_NAME(x) x + +void f() { + std::cout << "Hello, " + << "World!" + << std::endl; + A_LONG_MACRO_NAME(std::cout << "Hello, " + << "World!" + << std::endl); + A_LONG_MACRO_NAME( + std::cout << "Hello, " + << "World!" + << std::endl); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp new file mode 100644 index 00000000..c90ae71f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_left_shift2.cpp @@ -0,0 +1,32 @@ +void g() +{ + RLOGD(m_log) + << "str1" + << var; + + if (something) + cout << "blah"; + +} + +void f() +{ + cout << something( + arg); + cout + << "something"; + cout << + "something"; + + RLOGD(m_log) + << "WriteReqSize()"; + + RLOGD(m_log) << + base::sprintfT( + "something %u ", + m_pendingAccepts); + + RLOGDD(m_log) << sprintfT( + "something id=%u", + newSocket->GetId()); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp new file mode 100644 index 00000000..43a2a70f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_right_comment.cpp @@ -0,0 +1,29 @@ +namespace A +{ +namespace B +{ +namespace C +{ + + +struct D +{ + int a; // a. + int b; + int c; +}; // struct D + + +} // namespace C + + +struct E {}; + + +} // namespace B + + +struct F {}; + + +} // namespace C diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp new file mode 100644 index 00000000..3942f227 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/align_var_def_thresh.cpp @@ -0,0 +1,64 @@ +void testShortTypes() +{ +// No stars +float a; +double b; + +// All stars +float& a; +double& b; + +float * a; +double * b; + +float &a; +double &b; + +// One star before +double& a; +float b; + +double & a; +float b; + +double &a; +float b; + +// One star after +float b; +double& a; + +float b; +double & a; + +float b; +double &a; +} + +void testLongTypes() +{ +int int_var; +int * int_ptr_var; +int *int_ptr_var; +float float_var; +float &float_ref_var; +float & float_ref_var; +double & double_var; +long_type little_long_var; + SomeLongNamespace::SomeLongType long_var; + int * other_int_var; + SomeLooooongType long_var; + SomeLoooooooooongType looong_var; + int int_var; + SomeLongNamespace::OtherLongNamespace::SomeLongType very_long_var; +int * int_ptr_var; +float float_var; +float & float_ref_var; +double & double_var; + SomeLongNamespace::SomeLongType long_var; +float float_var; + int * other_int_var; + int other_int_var; + int *other_int_var; + int& other_int_var; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp new file mode 100644 index 00000000..fcaf1392 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/alt_tokens.cpp @@ -0,0 +1,7 @@ +// how to use digraps: +// https://en.wikipedia.org/wiki/Digraphs_and_trigraphs + +int main(int argc, char *argv[]) <% // { +int array<:10:>; // int array[10]; +%> // } + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp new file mode 100644 index 00000000..0cf8426d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/anonymous_enum.cpp @@ -0,0 +1,37 @@ +enum { + E11=0, + E12=1, + E13=2 +}; + +enum Enum1 { + E21=0, + E22=1, + E23=2 +}; + +enum Enum2:int { + E31=0, + E32=1, + E33=2 +}; + +enum Enum3 +:int { + E41=0, + E42=1, + E43=2 +}; + +enum:int { + E51=0, + E52=1, + E53=2 +}; + +enum +:int { + E61=0, + E62=1, + E63=2 +};
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp new file mode 100644 index 00000000..744b3404 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/attribute_specifier_seqs.cpp @@ -0,0 +1,112 @@ +void asd(void) +{ + a < up_lim() ? do_hi() : do_low; + a[ a<b>c] = d; +} + +[[nodiscard]] inline static CFErrorRef _Nullable CreateErrorIfError(CFStringRef const inDomain, CFIndex const inCode, CFDictionaryRef const inInformation) { +[[maybe_unused]] auto const [iterator, inserted]{ super_type::insert(ioFileReference) }; +if (inCode == 0) { +return nullptr; +} +return ::CFErrorCreate(kCFAllocatorDefault, inDomain, inCode, inInformation); +} + +[[gnu::always_inline]] [[gnu::hot]] [[gnu::const]] [[nodiscard]] +inline int f(); +[[gnu::always_inline, gnu::const, gnu::hot, nodiscard]] +int f(); +[[using gnu : const, always_inline, hot]] [[nodiscard]] +int f[[gnu::always_inline]](); + +int f(int i) [[expects: i > 0]] [[ensures audit x: x < 1]]; + +void f() { +int i [[cats::meow([[]])]]; +int x [[unused]] = f(); +} + +int f(int i) [[deprecated]] { +switch(i) { +case 1: [[fallthrough]]; +[[likely]] case 2: return 1; +} +return 2; +} + +[[ +unused, deprecated("keeping for reference only") +]] +void f() +{ +} + +[[noreturn]] void f() [[deprecated("because")]] { +throw "error"; +} + +void print2(int * [[carries_dependency]] val) +{ +std::cout<<*p<<std::endl; +} + +class X { +public: +int v() const { return x; } +int g() [[expects: v() > 0]]; +private: +int k() [[expects: x > 0]]; +int x; +}; + +class [[foo, bar("baz")]] /**/ Y :private Foo, Bar { +public: +int v(int &x) { return x; } +}; + +class +[[foo]] +[[bar("baz")]] +Z:Foo, public Bar { +public: +int v(int * x) { return *x; } +}; + +int g(int* p) [[ensures: p != nullptr]] +{ +*p = 42; +} + +bool meow(const int&) { return true; } +void i(int& x) [[ensures: meow(x)]] +{ +++x; +} + +enum Enum { +a, b }; +enum class [[foo]] Enum { +a, b }; +enum struct [[foo]] /**/ [[bar("baz")]] Enum { +a, b }; +enum [[foo]] +Enum { +a, b }; +enum class [[foo]] // +[[bar("baz")]] Enum { +a, b }; +enum struct // +[[bar("baz")]] Enum { +a, b }; +enum +[[foo]] [[bar("baz")]] /**/ Enum { +a, b }; +enum class /**/ [[foo]] [[bar("baz")]] +Enum { +a, b }; +enum // +struct +[[foo]] +[[bar("baz")]] +Enum { +a, b }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h new file mode 100644 index 00000000..7a90197c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/av.h @@ -0,0 +1,49 @@ +/* +2) There seems to be a problem handling .h-files compared to .cpp-files. +The following problem only occurs in header-files, in source-files the +output is as desired. +*/ + +static inline void foo() +{ +//BEFORE: +if (cond) callFunc(); +// DESIRED: +if (cond) { + callFunc(); +} +// AFTER: +if (cond) {callFunc();} + + +/* +3) The spacing around pointer stars is not always maintained as desired. +*/ +//BEFORE: + Buffer<T>* buffer; +//AFTER: + Buffer<T>*buffer; + + +/* +4) Inside of casts the types are not formatted as outside. +*/ +//BEFORE: +T* t = dynamic_cast<T*>(obj); +//AFTER: +T* t = dynamic_cast<T *>(obj); + +/* +5) Inside some template-stuff the spacing goes weird. Multiple spaces +are inserted, although the configuration (should) say otherwise. +*/ +//BEFORE: +for (std::map<Key, Value*>::iterator it = map.begin(); it != map.end(); it++) { + bar(it); +} +//AFTER: +for (std::map < Key, Value * > ::iterator it = map.begin(); it != map.end(); it++) { + bar(it); +} + } + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp new file mode 100644 index 00000000..b593255b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bit-colon.cpp @@ -0,0 +1,21 @@ +class C +{ +public: + size_t f1 : 1; + size_t f1:1; + size_t f2 : sizeof(size_t) - 1; + +Q_SIGNALS: + void somesignal(); +}; + +struct S +{ +private: + size_t f1 : 1; + size_t f1:1; + size_t f2 : sizeof(size_t) - 1; + +Q_SIGNALS: + void somesignal(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp new file mode 100644 index 00000000..9c7ac70b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/block_pointer.cpp @@ -0,0 +1,16 @@ +__block __weak void (^ weak_recurseTreeNodes)(int a); +void (^ strong_recurseTreeNodes)(int a) = ^ (int a) { +}; + +the result file: +Foo^ foo = dynamic_cast<Bar^>(bar); +Foo* foo = dynamic_cast<Bar*>(bar); +x = a ^ b; +int main(Platform::Array<Platform::String^>^ /*args*/) +{ +} + +void (*fun_ptr)(int) = &fun; + +typedef void (*foo)(void); +void (*foo)(void); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp new file mode 100644 index 00000000..7ee7e7e6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bom.cpp @@ -0,0 +1,3 @@ +// the file is UTF-8 Unicode (with BOM) +// Euro character +€; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp new file mode 100644 index 00000000..30d4cb29 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bool.cpp @@ -0,0 +1,11 @@ +bool foo(char c) +{ + if (c == 'a') + { + return true; + } + else + { + return false; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp new file mode 100644 index 00000000..ef8b96ed --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/brace_brace_init_lst.cpp @@ -0,0 +1,22 @@ +int main() +{ + int a0[][] = {{ 1 }}; + unknown_type b0 = {{ 2 }}; + auto c0 = unknown_type {{ 3 }}; + auto d0 = func( {{ 3 }} ); + auto e0 = func( unknown_type {{ 3 }} ); + + int a1[][] = { {1} }; + unknown_type b1 = { {2} }; + auto c1 = unknown_type{ {3} }; + auto d1 = func({ {3} }); + auto e1 = func(unknown_type{ {3} }); + + int a2[][] = {{1}}; + unknown_type b2 = {{2}}; + auto c2 = unknown_type{{3}}; + auto d2 = func({{3}}); + auto e2 = func(unknown_type{{3}}); + + return 1; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp new file mode 100644 index 00000000..e245f34c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_list.cpp @@ -0,0 +1,260 @@ +#include <vector> +#include <algorithm> + +using some_type = int; +namespace Ns { +using some_type = int; +} + +class BracedInitListBase { +public: +BracedInitListBase() + : a{int{1}}, + b(int(some_type(1))), + c(int{some_type(1)}), + d{int(some_type(1))}, + e{some_type{some_type{a}}} +{ +} + +virtual int getA() const { + return a; +} +private: +int a{}; +int b{1}; +int c = {1}; +int d = int{1}; +some_type e{1}; +some_type f = {1}; +some_type g = some_type{1}; +std::vector<some_type> h{some_type{4}, 5}; +::std::vector<some_type> i = ::std::vector<some_type>{4, some_type{5}}; +some_type j = ::std::vector<some_type>{4, some_type{5}}[1]; +some_type k[2]{1, 2}; +some_type l[2] = {1, 2}; + +union SomeUnion { +int a; +some_type b{}; +}; +}; + +class BracedInitListDerived : public BracedInitListBase { +public: +int getA() const override { + return BracedInitListBase::getA(); +} +}; + +some_type inc(some_type a) +{ + return some_type{++a}; +} + +some_type sum(some_type a, some_type b = some_type{1}) +{ + return a + inc(some_type{b - some_type{1}}); +} + +void braced_init_list_int() +{ + { + int a{}; + int b = {}; + int c = int{}; + int d = int{int{}}; + int{}; + int{int{}}; + } + { + int a{1}; + int b = {1}; + int c = int{1}; + int d = int{int{1}}; + int{1}; + int{int{1}}; + } +} + +void braced_init_list_some_type() +{ + { + some_type a{}; + some_type b = {}; + some_type c = some_type{}; + some_type d = some_type{some_type{}}; + some_type{}; + some_type{some_type{}}; + } + { + some_type a{1}; + some_type b = {1}; + some_type c = some_type{1}; + some_type d = some_type{some_type{1}}; + some_type{1}; + some_type{some_type{1}}; + } + { + ::some_type a{1}; + ::some_type b = {1}; + ::some_type c = ::some_type{1}; + ::some_type d = ::some_type{::some_type{1}}; + ::some_type{1}; + ::some_type{::some_type{1}}; + } + { + Ns::some_type a{1}; + Ns::some_type b = {1}; + Ns::some_type c = Ns::some_type{1}; + Ns::some_type d = Ns::some_type{Ns::some_type{1}}; + Ns::some_type{1}; + Ns::some_type{Ns::some_type{1}}; + } + { + ::Ns::some_type a{1}; + ::Ns::some_type b = {1}; + ::Ns::some_type c = ::Ns::some_type{1}; + ::Ns::some_type d = ::Ns::some_type{::Ns::some_type{1}}; + ::Ns::some_type{1}; + ::Ns::some_type{::Ns::some_type{1}}; + } +} + +void braced_init_list_some_type_auto() +{ + { + auto b = some_type{}; + auto c = some_type{some_type{}}; + } + { + auto a = {1}; + auto b = some_type{1}; + auto c = some_type{some_type{1}}; + } + { + auto b = ::some_type{1}; + auto c = ::some_type{::some_type{1}}; + } + { + auto b = Ns::some_type{1}; + auto c = Ns::some_type{Ns::some_type{1}}; + } + { + auto b = ::Ns::some_type{1}; + auto c = ::Ns::some_type{::Ns::some_type{1}}; + } +} + +void braced_init_list_function_call() +{ + { + some_type a{sum(some_type{}, some_type{})}; + some_type b = sum(some_type{}, some_type{}); + some_type c = some_type{sum(some_type{}, some_type{})}; + some_type{sum(some_type{}, some_type{})}; + some_type{some_type{sum(some_type{}, some_type{})}}; + } + { + some_type a{sum(some_type{1}, some_type{1})}; + some_type b = sum(some_type{1}, some_type{1}); + some_type c = some_type{sum(some_type{1}, some_type{1})}; + some_type{sum(some_type{a}, some_type{b})}; + some_type{some_type{sum(some_type{a}, some_type{b})}}; + } + { + ::some_type a{sum(::some_type{1}, ::some_type{1})}; + ::some_type b = sum(::some_type{1}, ::some_type{1}); + ::some_type c = ::some_type{sum(::some_type{1}, ::some_type{1})}; + ::some_type{sum(::some_type{a}, ::some_type{b})}; + ::some_type{::some_type{sum(::some_type{a}, ::some_type{b})}}; + } + { + Ns::some_type a{sum(Ns::some_type{1}, Ns::some_type{1})}; + Ns::some_type b = sum(Ns::some_type{1}, Ns::some_type{1}); + Ns::some_type c = Ns::some_type{sum(Ns::some_type{1}, Ns::some_type{1})}; + Ns::some_type{sum(Ns::some_type{a}, Ns::some_type{b})}; + Ns::some_type{Ns::some_type{sum(Ns::some_type{a}, Ns::some_type{b})}}; + } + { + ::Ns::some_type a{sum(::Ns::some_type{1}, ::Ns::some_type{1})}; + ::Ns::some_type b = sum(::Ns::some_type{1}, ::Ns::some_type{1}); + ::Ns::some_type c = ::Ns::some_type{sum(::Ns::some_type{1}, ::Ns::some_type{1})}; + ::Ns::some_type{sum(::Ns::some_type{a}, ::Ns::some_type{b})}; + ::Ns::some_type{::Ns::some_type{sum(::Ns::some_type{a}, ::Ns::some_type{b})}}; + } +} + +void braced_init_list_function_call_newline() +{ + { + some_type a{ + sum(some_type{}, + some_type{} + ) + }; + some_type b = sum( + some_type{}, some_type{}); + some_type c = some_type{ + sum( + some_type{}, some_type{})}; + some_type + {sum + (some_type{}, + some_type{} + ) + }; + some_type + {some_type{sum + (some_type{}, some_type{})}}; + } +} + +void braced_init_list_array() +{ + { + some_type a[]{}; + some_type b[] = {}; + some_type c[] = {{}, {}}; + } + { + some_type a[]{1, 2}; + some_type b[] = {1, 2}; + some_type c[] = {some_type{1}, some_type{2}}; + } +} + +void braced_init_list_template() +{ + { + std::vector<some_type> a{}; + std::vector<some_type> b = {}; + std::vector<some_type> c = {{}, {}}; + std::vector<some_type> d = std::vector<some_type>{}; + std::vector<some_type> e = std::vector<some_type>{{}, {}}; + std::vector<some_type> f = std::vector<some_type>{some_type{}, some_type{}}; + std::vector<some_type>{}; + std::vector<some_type>{{}, {}}; + std::vector<some_type>{some_type{}, some_type{}}; + } + { + std::vector<some_type> a{1, 2}; + std::vector<some_type> b = {1, 2}; + std::vector<some_type> c = std::vector<some_type>{1, 2}; + std::vector<some_type> d = std::vector<some_type>{some_type{1}, some_type{2}}; + std::vector<some_type>{1, 2}; + std::vector<some_type>{some_type{1}, some_type{2}}; + } +} + +void braced_init_list_lambda() +{ + std::vector<some_type> a{1, 2}; + some_type b{2}; + + auto c = []{return true;}; + auto d = [](){return true;}; + + std::find_if(a.begin(), a.end(), [&b](const some_type &v){return v == b;}); + std::find_if(a.begin(), a.end(), [](const some_type &v){some_type b{2}; return v == b;}); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp new file mode 100644 index 00000000..bfd5ef86 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braced_init_template_decltype.cpp @@ -0,0 +1,8 @@ +#include <algorithm> +#include <type_traits> + +template<typename Arg, typename ... Args, typename std::enable_if <!std::is_same<Arg, decltype (std::make_index_sequence<5> { })>::value, int>::type = 0> +void foo(Arg &&arg, Args && ... args) +{ + +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp new file mode 100644 index 00000000..ca99edc6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_align.cpp @@ -0,0 +1,13 @@ +char *array_assign[2][4]=
+{
+ {
+ // foo
+ {"foo"},
+ {"foo@1"},{"foo@2"},{"foo@3"}
+ },
+ {
+ // bar
+ {"bar"},
+ {"bar@1"},{"bar@2"},{"bar@3"}
+ }
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp new file mode 100644 index 00000000..583c7fa1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/braces_empty.cpp @@ -0,0 +1,9 @@ +class Parser::ParserPrivate { }; + +template <typename T> class to { }; + +my $all = { }; + +enum FocusEffect { }; + +struct error { }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp new file mode 100644 index 00000000..b0ce9a06 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1001.cpp @@ -0,0 +1,4 @@ +template< > +struct Bar< false > : Foo +{ +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp new file mode 100644 index 00000000..713018e4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1002.cpp @@ -0,0 +1,8 @@ +template< class B1 = void, class B2 = void > +struct conjunction : bool_constant<B1::value1 && B2::value2> +{ +}; +template< class B1 = void, class B2 = void > +struct conjunction : bool_constant<B1::value1&&B2::value2> +{ +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp new file mode 100644 index 00000000..7495b93d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1003.cpp @@ -0,0 +1,33 @@ +class Foo +{ +public: + Foo( + int x_, + int y_ + ) : x(x_), y(y_) + { + } +private: + int x; + int y; +}; + +class Bar +{ +public: + // Splits 3,5 onto newlines + Bar() : Bar(3, 5) + { + } + + // No split here + Bar( + int x, + int y + ) : foo(x, y) + { + } + + Foo foo; +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp new file mode 100644 index 00000000..3287be1c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1004.cpp @@ -0,0 +1,14 @@ +int main() +{ + int b = 3; + int* p = &b; + + // Should stay as b * *p + int a = b * *p; + + // Correctly formats as a * b; + int c = b*a; + + // Correctly formats as d = *p; + int d = * p; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp new file mode 100644 index 00000000..01a457d0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1005.cpp @@ -0,0 +1 @@ +friend void ::test::swap< >(future< T >&, future< T >&); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp new file mode 100644 index 00000000..ec80e915 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1020.cpp @@ -0,0 +1,4 @@ +void HouseNumberData(Translation const & trans = Translation { }, Orientation const & orient = Orientation { }, CategoryIds const & cats = CategoryIds(), std::string const & txt = std::string { }, bool active = false); + +void HouseNumberData(Translation const & trans______________, Orientation const & orient______________________, CategoryIds const & cats_____________________, std::string const & txt___________________, bool active_________); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp new file mode 100644 index 00000000..5ccafd2b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1027.cpp @@ -0,0 +1,5 @@ +int * fn1(); +mytype * fn2(); +myttype<float> * fn3(); +myttype<float> * myclass::fn4(); +myttype * myclass::fn5(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp new file mode 100644 index 00000000..80078efe --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1032.cpp @@ -0,0 +1 @@ +int variable1 = items_array[index<int>()]; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp new file mode 100644 index 00000000..74fbc8e7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1068.cpp @@ -0,0 +1,55 @@ +// No extra line added +void test1() +{ + if ( i == 10 ) + i++; +} + +// No extra line added +void test2() +{ + if ( i == 10 ) + { + i++; + } +} + +// No extra line added +void test3() +{ + if ( i == 10 ) + { + if ( j == 10 ) + { + i++; + } + } +} + +// No extra line added +void test4() +{ + if ( i == 10 ) + { + if ( j == 10 ) + i++; + } +} + +// Extra line added (after Uncrustify) +void test5() +{ + if ( i == 10 ) + if ( j == 10 ) + { + i++; + } +} + +// Extra line added (after Uncrustify) +void test6() +{ + if ( i == 10 ) + if ( j == 10 ) + i++; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp new file mode 100644 index 00000000..573a9810 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1108.cpp @@ -0,0 +1,8 @@ +int foo() + { + const std::map<std::string, int> bar = + { + { "abcXYZ", -13 }, + }; + return 5; + } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp new file mode 100644 index 00000000..e6537641 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1112.cpp @@ -0,0 +1,2 @@ +::std::vector<int> & foo(); +std::vector<int> & bar(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp new file mode 100644 index 00000000..9ee98743 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1127.cpp @@ -0,0 +1,20 @@ +#include <iostream> + +template<size_t T> +class MyFoo +{ +public: + MyFoo() + { + std::cout << T << std::endl; + } +}; + +int main() +{ + const size_t mySize = INT8_MAX* 2; + MyFoo<mySize * 2> foo1; + MyFoo<mySize/2> foo2; + MyFoo<2*mySize> foo1; + MyFoo<2/mySize> foo2; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp new file mode 100644 index 00000000..369b70f1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1134.cpp @@ -0,0 +1,2 @@ +#define ABC 123 // Start trailing comment.. + // ..end with aligned comment. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp new file mode 100644 index 00000000..47463232 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1139.cpp @@ -0,0 +1,42 @@ +void a() +{ + if((tmp == nullptr) || + ((tmp->type != CT_NUMBER) && + (tmp->type != CT_SIZEOF) && + !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) || + (tmp->type == CT_NEWLINE) + ) + { + set_chunk_type(next, CT_LABEL_COLON); + } +else if ((tmp == nullptr) || + ((tmp->type != CT_NUMBER) && + (tmp->type != CT_SIZEOF) && + !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) || + (tmp->type == CT_NEWLINE) + ) + { + set_chunk_type(next, CT_LABEL_COLON); + } + + + if ((tmp == nullptr) || + ((tmp->type != CT_NUMBER) && + (tmp->type != CT_SIZEOF) && + !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) || + (tmp->type == CT_NEWLINE)) + { + set_chunk_type(next, CT_LABEL_COLON); + } + + if ((tmp == nullptr) || + ((tmp->type != CT_NUMBER) && + (tmp->type != CT_SIZEOF) && + !(tmp->flags & (PCF_IN_STRUCT | PCF_IN_CLASS))) || + (tmp->type == CT_NEWLINE) + +) + { + set_chunk_type(next, CT_LABEL_COLON); + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp new file mode 100644 index 00000000..e92da160 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1158.cpp @@ -0,0 +1,4 @@ +void Class1::Func(void) +{ + while (Next()) ; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp new file mode 100644 index 00000000..8dc7a9d1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1160.cpp @@ -0,0 +1,7 @@ +template<typename T1> +class Class1 +{ +public: + status.time_count = duration_cast<::milliseconds> + (steady_clock::now().time_since_epoch()).count(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp new file mode 100644 index 00000000..535c3be7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1161.cpp @@ -0,0 +1,54 @@ +// Use case from issue #1161 +class test +{ + // comment 1 (gets methods) + public: + // get 1 + int get1(); + // get 2 + int get2(); + + + + + // comment 2 (sets methods) + public: + // set 1 + int set1(); + // set2 + int set2(); + +}; + +// Use cases from issue #2704 +class Foo +{ +public: + /// @name Constructors + /// @{ + + Foo(int value) : value_(value) + {} + + /// @} + +private: + int value_; +}; + +class Bar +{ +public: + /*! + * @name Constructors + * @{ + */ + + Bar(int value) : value_(value) + {} + + /*! @} */ + +private: + int value_; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp new file mode 100644 index 00000000..aa56008a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1169.cpp @@ -0,0 +1,24 @@ +class MyClass +{ + public: + virtual void f1ooooooooooooooo(const int bar); + virtual void f2oooooooooooooooo(const int bar); + virtual void f3ooooooooooooooooo(const int bar); + virtual void f4oooooooooooooooooo(const int bar); + virtual void f5ooooooooooooooooooo(const int bar); +}; + +virtual void f1oooooooooooooooooo(const int bar); +virtual void f2ooooooooooooooooooo(const int bar); +virtual void f3oooooooooooooooooooo(const int bar); +virtual void f4ooooooooooooooooooooo(const int bar); +virtual void f5oooooooooooooooooooooo(const int bar); + +void foo() +{ + std::string s1 = "f1oooooooooooooooooooooooo"; + std::string s2 = "f2ooooooooooooooooooooooooo"; + std::string s3 = "f3oooooooooooooooooooooooooo"; + std::string s4 = "f4ooooooooooooooooooooooooooo"; + std::string s5 = "f5oooooooooooooooooooooooooooo"; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp new file mode 100644 index 00000000..35dd772f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1170.cpp @@ -0,0 +1,6 @@ +template<class CLASS_PARAMETER_0, class CLASS_PARAMETER_1, class CLASS_PARAMETER_2, class CLASS_PARAMETER_3, class CLASS_PARAMETER_4, class CLASS_PARAMETER_5> +class MyTemplateClass +{ +public: + MyTemplateClass<my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type, my::super::cool::_and::fancy::type> foo(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp new file mode 100644 index 00000000..b9ff78a1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1235.cpp @@ -0,0 +1 @@ +namespace dudeNamespace { class ForwardFooClass; } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp new file mode 100644 index 00000000..8acaaed2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1236.cpp @@ -0,0 +1,14 @@ +void foo() +{ + int head, bar; + __asm__ __volatile__ + ( + "movq %0,%%xmm0\n\t" /* asm template */ + "0:\n\t" + "bar\t%0, [%4]\n\t" // in template + "1:\n\t" + : "=a", (bar) + : "=&b", (&head), "+m", (bar) + : "cc" + ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp new file mode 100644 index 00000000..975dc82c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1249.cpp @@ -0,0 +1,11 @@ +friend class :: GameObject; +void GameObject :: Foo(); + +auto x = :: GlobalFunc(); + +friend void ::testing:: PrintDebugInformationForFakesInUse(); + +template<class TransferFunction> +void ::DateTime :: Transfer(TransferFunction & transfer) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp new file mode 100644 index 00000000..94444cf9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1288.cpp @@ -0,0 +1 @@ +friend std::ostream& operator<<(std::ostream& os, const ScriptingObjectPtr& o); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp new file mode 100644 index 00000000..42663477 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1289.cpp @@ -0,0 +1,3 @@ +extern "C" void __declspec(dllexport) GetAccountNameAndDomain(HWND /*hwndParent*/, int string_size, TCHAR * variables, stack_t** stacktop, extra_parameters* /*extra*/) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp new file mode 100644 index 00000000..699025fc --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1296.cpp @@ -0,0 +1,7 @@ +int main() +{ + auto lambda2 = [&]() + { + code(); + }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp new file mode 100644 index 00000000..080c9233 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1315.cpp @@ -0,0 +1,17 @@ +dookie::wookie << "asd" + << "bag" + << "sag"; + +typedef enum +{ + A = 0, + B = 1 << 0, + C = 1 << 1 +}; + +enum +{ + A = 0, + B = 1 << 0, + C = 1 << 1 +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp new file mode 100644 index 00000000..c381f91c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1321.cpp @@ -0,0 +1,6 @@ +#include <utility> + +template <typename Fun, typename ... Args> +inline decltype(auto) Invoke(Fun&& f, Args&&... args) + noexcept(noexcept(std::forward<Fun>(f)(std::forward<Args>(args) ...))) +{ return std::forward<Fun>(f)(std::forward<Args>(args) ...); } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp new file mode 100644 index 00000000..5df154f3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1324.cpp @@ -0,0 +1,10 @@ +{ + for (i = 0; i < 10; i++) + { + b = i + 1; + } + for (;;) + { + b = b + 1; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp new file mode 100644 index 00000000..04b4cd8a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1338.cpp @@ -0,0 +1,6 @@ +/* *INDENT-OFF* */ +printf("Hello World!\n"); + + +//test +/* *INDENT-ON* */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp new file mode 100644 index 00000000..680d6d51 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1340.cpp @@ -0,0 +1,20 @@ +double t = 111; +double t1 = 222; +double t123 = 333; + + +auto f = [](double x) -> double + { + double t = 1111; + double t1 = 1222; + double t123 = 1333; + }; + + +std::transform(v1.begin(), v1.end(), v2.begin(), + [](double x) -> double + { + double t = 2111; + double t1 = 2222; + double t123 = 2333; + }; ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h new file mode 100644 index 00000000..21fe1c44 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1346.h @@ -0,0 +1,10 @@ +typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type dummy(const std::function<T*(const S&)>& pFunc, const QVector<S>& pItems) +{ + return QVector<T>(); +} + + +typename std::enable_if<!std::is_void<T>::value, QVector<T> >::type filter(const std::function<bool(const T&)>& pFunc, const QVector<T>& pItems) +{ + return QVector<T>(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp new file mode 100644 index 00000000..aa1938e8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1349.cpp @@ -0,0 +1,6 @@ +uint8_t a[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t b[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t c[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t d[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t e[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; +uint8_t f[][8]={{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp new file mode 100644 index 00000000..00694ce9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1395.cpp @@ -0,0 +1,5 @@ +Type tmp = call_function(getObj().x, + getObj().y, + getObj().z, + getObj().w); +getObj().result = tmp; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp new file mode 100644 index 00000000..9b001a44 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1402.cpp @@ -0,0 +1,12 @@ +namespace Constants +{ +double PI = 3.14; +} +int factor = 41; +double result = Constants::PI * factor; + +return Constants::PI * factor; + +void func(int value) { + return SomeClass(value, Constants::PI * value); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp new file mode 100644 index 00000000..71f67f75 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1403.cpp @@ -0,0 +1,6 @@ +int main() +{ +float x; +float y; +float result(1 + x*y); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp new file mode 100644 index 00000000..575a21c8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1432.cpp @@ -0,0 +1,2 @@ +void set(); +vector<int> get(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp new file mode 100644 index 00000000..d560522b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1439.cpp @@ -0,0 +1,2 @@ +struct A; +struct B; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp new file mode 100755 index 00000000..d7fcf753 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1452.cpp @@ -0,0 +1,6 @@ +struct foobar { + char *foobarz() { return "foobar"; } + char *foo_bar() { return "foo_bar"; } + + int foo; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp new file mode 100644 index 00000000..5170b9a9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1462.cpp @@ -0,0 +1,26 @@ +#include <type_traits> + +template < + typename... Args, + typename E = typename std::enable_if<(sizeof...(Args) >= 1), bool>::type +> +void fun1(Args&& ...args) +{ +} + +template < + typename... Args, + typename E = typename std::enable_if<(sizeof...(Args) > 1), bool>::type +> +void fun2(Args&& ...args) +{ +} + +template < + typename... Args, + typename E = typename std::enable_if<(sizeof...(Args) < 3), bool>::type +> +void fun3(Args&& ...args) +{ +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp new file mode 100644 index 00000000..9e4e47d3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1607.cpp @@ -0,0 +1,2 @@ +decltype(i * d) prod = i * d; +decltype(i + d) sum; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp new file mode 100644 index 00000000..4ab5eea8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1649.cpp @@ -0,0 +1,3 @@ +Foo() +noexcept () +{} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp new file mode 100644 index 00000000..795bb572 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1689.cpp @@ -0,0 +1,3 @@ +using value_type = int; +using reference = value_type &; +using const_reference = const value_type &; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp new file mode 100644 index 00000000..2d5d1204 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1691.cpp @@ -0,0 +1,14 @@ +#include <string> + +std::string foo() +{ + return std::string{"abc"}; +} +int main() +{ + const std::string&& name1 = foo(); + std::string&& name2 = foo(); + + const auto&& name3 = foo(); + auto&& name4 = foo(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp new file mode 100644 index 00000000..a1adcf5f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1717.cpp @@ -0,0 +1,10 @@ +class X14 +{ +public: +X14(); +~X14() = default; +X14(const X14& rhs) = default; +X14& operator=(const X14& rhs) = default; +X14(X14&& rhs) = delete; +X14& operator=(X14&& rhs) = delete; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp new file mode 100644 index 00000000..b324fbda --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758-f.cpp @@ -0,0 +1,10 @@ +int main() +{ + +for(int f=0; f < 1; f++) +{ + auto a = int{1}; +} + +return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp new file mode 100644 index 00000000..b0f35107 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1758.cpp @@ -0,0 +1,12 @@ +for(int f=0; f<(Element::nf)*2; f++) +{ + if (f%2==1) p = p-1; + { + this->pInterpolation[i]=p; + this->cInterpolation[i]=0.; + this->dofInterpolation[i]=e+f; + this->coefInterpolation[i]=1.; + i++; + p++; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp new file mode 100644 index 00000000..29cc2774 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1854.cpp @@ -0,0 +1 @@ +while (*p++ = ' ') ; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp new file mode 100644 index 00000000..78958bb1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_1862.cpp @@ -0,0 +1,11 @@ +#if _MSC_VER < 1300 +#define __func__ "???" +#else /* comment 1 */ +#define __func__ __FUNCTION__ +#endif /* comment 2 */ + +#if _MSC_VER < 1300 +#define __func__ "???" +#else // comment 1 +#define __func__ __FUNCTION__ +#endif // comment 2 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp new file mode 100644 index 00000000..14a85090 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2285.cpp @@ -0,0 +1,11 @@ +class __attribute__ ((visibility ("default"))) Test +{ +public: +Test() : member1(), member2() +{ +} + +private: +int member1; +int member2; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp new file mode 100644 index 00000000..f9768c40 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2322.cpp @@ -0,0 +1,12 @@ +void main() +{ + if (foo()) { bar(); } + else if (baz({ rick, morty })) { anime(); } + else if (a) while (true) { amime2(); } + else if (b) do { amime3(); } while(false); + else if (c) for(;;) { amime5(); } + else if (d) while(true) {} + else if (e) do {} while(false); + else if (f) for(;;) {} + else { amime6(); } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp new file mode 100644 index 00000000..26444ad3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2371.cpp @@ -0,0 +1,101 @@ +class CMyClass +{ + CMyClass( int a = 0, int b = 0 ); +}; + +class CMyClass2 +{ + CMyClass2( int a = 0, int b = 0 ); + CMyClass2( int a = 0 ); +}; + +class CMyClass3 +{ + CMyClass3( int a, int b = 0 ); + CMyClass3( int a = 0 ); +}; + +class CMyClass4 +{ + CMyClass4( int a = 0, int b = 0 ); + CMyClass4( short aa = 0, char * p = 0 ); +}; + +class CMyClass5 +{ + CMyClass5() = default; + CMyClass5( int a = 0, int b = 0 ); + CMyClass5( short aa = 0, char * p = 0 ); +}; + +class CMyClass6 +{ + CMyClass6( const CMyClass6& ) = default; + CMyClass6( int a = 0, int b = 0 ); + CMyClass6( short aa = 0, char * p = 0 ); +}; + +class CMyClass7 +{ + virtual void foo( const void* p = nullptr ) = 0; + CMyClass7( int a = 0, int b = 0 ); + CMyClass7( short aa = 0, char * p = 0 ); +}; + +class CMyClass8 +{ + CMyClass8( int a = 0, int b = 0 ); + CMyClass8( short aa = 0, char * p = 0 ); + virtual void foo( const void* p = nullptr ) = 0; +}; + +class CMyClass9 +{ + CMyClass9( int a = 0, int b = 0 ); + CMyClass9( short aa = 0, char * p = 0 ); + virtual void foo( const void* = nullptr ) = 0; +}; + +class CMyClassA +{ + CMyClassA( int a = 0, int b = 0 ); + CMyClassA( short aa = 0, char * p = 0 ); + virtual void foo( const void* /* p */ = nullptr ) = 0; +}; + +class CMyClassB +{ + CMyClassB( int a = 0, int b = 0 ); + CMyClassB( short aa = 0, char * p = 0 ); + virtual void foo( const void* /* p */ = NULL ) = 0; +}; + +#define UNUSED(x) + +class CMyClassC +{ + CMyClassC( int a = 0, int b = 0 ); + CMyClassC( short aa = 0, char * p = 0 ); + virtual void foo( const void* UNUSED(p) = NULL ) = 0; +}; + +class CMyClassD +{ + CMyClassD( int a = 0, int b = 0 ); + CMyClassD( short aa = 0, char * p = 0 ); + virtual void foo( const std::string s = "" ) = 0; +}; + +class CMyClassE +{ + CMyClassE( int a = 0, int b = 0 ); + CMyClassE( short aa = 0, char * p = 0 ); + virtual void foo( const std::string s = std::string() ) = 0; +}; + +class CMyClassF +{ + CMyClassF( int a = 0, int b = 0 ); + CMyClassF( short aa = 0, char * p = 0 ); + virtual void foo( const CString& s = _T( "" ) ) = 0; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp new file mode 100644 index 00000000..92731c19 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2402.cpp @@ -0,0 +1,8 @@ +void +h1(const int a) +{ + switch (a) + { + case 1: {callFunction(a); break;} + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp new file mode 100644 index 00000000..d19718f5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_1.cpp @@ -0,0 +1,8 @@ +namespace A { +namespace S { +class C +{ +}; +} // namespace S +}; // namespace A + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp new file mode 100644 index 00000000..9da12944 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_2433_2.cpp @@ -0,0 +1,22 @@ +void f(); +namespace A { +void f2(); +namespace S { +void f3(); +class C +{ +}; +void f4(); +} // namespace S +void f5(); +} // namespace A +void f6(); +namespace E +{ +void f7(); +class D +{ +};; +void f9(); +}; +void f10(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp new file mode 100644 index 00000000..1339ede1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_33056.cpp @@ -0,0 +1,7 @@ +inline T* * someFunc(foo** p, bar&& q) +{ +} + +inline T && someFunc(foo * *p, bar && q) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp new file mode 100644 index 00000000..753d9519 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_472.cpp @@ -0,0 +1,3 @@ +// comment + void +func( dbgTrace, (void) ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp new file mode 100644 index 00000000..03c4a828 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_481.cpp @@ -0,0 +1,2 @@ +//comment +void argvInter( int argc, char* argv[], Config * config ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp new file mode 100644 index 00000000..4c582e86 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_484.cpp @@ -0,0 +1,6 @@ + TestId::TestId( char* name ) : + n_( ( char* )name ) + { + n_( (char*)name ); + } + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp new file mode 100644 index 00000000..4865da64 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_485.cpp @@ -0,0 +1,20 @@ +void Tst::test( Msg* message_p ) + { + switch (message_p) + { + case A: + { + const table* entry2 = findMsg( message_p ); + table* entry3 = findMsg( message_p ); + } + break; + + case B: + const table* entry2 = findMsg( message_p ); + table* entry3 = findMsg( message_p ); + break; + + default: + break; + } + } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp new file mode 100644 index 00000000..382beced --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_488.cpp @@ -0,0 +1,12 @@ +void baz() +{ + foobar= bar[a + b + (c + + d)]; + + foobar = bar(a + b + (c + + + d)); + + foo = bar[a] + b + qux(c + + + d); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp new file mode 100644 index 00000000..f356c302 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_495.cpp @@ -0,0 +1,9 @@ +void f() +{ +toto +foo1(int); +toto +foo2(bar); +int +foo3; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp new file mode 100644 index 00000000..38253f15 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_612.cpp @@ -0,0 +1,23 @@ +void foo(void) +{ +int a = 0, b = 0; +char chvar = 0, var = 0; + +a = 0; +b = 0; +chvar = 0; +var = 0; +} + +void bar(void) +{ +int a = 0; +int b = 0; +char chvar = 0; +char var = 0; + +a = 0; +b = 0; +chvar = 0; +var = 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp new file mode 100644 index 00000000..e110d383 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_631.cpp @@ -0,0 +1,4 @@ +static inline auto myFunc(MyType const& myValue) +->std::string + +static inline std::string myFunc(MyType const& myValue) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp new file mode 100644 index 00000000..5b672b47 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_633.cpp @@ -0,0 +1,29 @@ +typedef void (*func)(); +typedef void (__stdcall *func)(); + +class CDataObject : public IDataObject +{ +public: + // IUnknown members + HRESULT __stdcall QueryInterface(REFIID iid, void ** ppvObject); + ULONG __stdcall AddRef(void); + ULONG __stdcall Release(void); + + // IDataObject members + HRESULT __stdcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); + HRESULT __stdcall GetDataHere(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); + HRESULT __stdcall QueryGetData(FORMATETC *pFormatEtc); + HRESULT __stdcall GetCanonicalFormatEtc(FORMATETC *pFormatEct, FORMATETC *pFormatEtcOut); + HRESULT __stdcall SetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium, BOOL fRelease); + HRESULT __stdcall EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumFormatEtc); + HRESULT __stdcall DAdvise(FORMATETC *pFormatEtc, DWORD advf, IAdviseSink *, DWORD *); + HRESULT __stdcall DUnadvise(DWORD dwConnection); + HRESULT __stdcall EnumDAdvise(IEnumSTATDATA **ppEnumAdvise); + + // exercise others + HRESULT __cdecl GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); + HRESULT __clrcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); + HRESULT __fastcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); + HRESULT __thiscall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); + HRESULT __vectorcall GetData(FORMATETC *pFormatEtc, STGMEDIUM *pmedium); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp new file mode 100644 index 00000000..febbf7b3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_634.cpp @@ -0,0 +1,2 @@ +__attribute__((visibility ("default"))) NSString* i; +extern "C" NSString* i; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp new file mode 100644 index 00000000..55e3e309 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_643.cpp @@ -0,0 +1,6 @@ +class test_Dummy + : public QObject +{ + Q_OBJECT + test_Dummy* settings = nullptr; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp new file mode 100644 index 00000000..b36e182a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_651.cpp @@ -0,0 +1,16 @@ +int a () +{ + double a_very_long_variable = test (foobar1, + foobar5); + + double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa + + asdfasdfasdf - asdfasdf + 56598; + + a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa + + asdfasdfasdf - asdfasdf + 56598; + + testadsfa (dfasdf, + aaafsdfa); + + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp new file mode 100644 index 00000000..1bf853d6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_653.cpp @@ -0,0 +1,4 @@ +/* + * + **Some comment + */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp new file mode 100644 index 00000000..8baaeb1c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_654.cpp @@ -0,0 +1,7 @@ +A( b, c, d); +connect(&mapper, SIGNAL(mapped(Q1 &)), this, SLOT(onSomeEvent(const Q2 &))); +connect(&mapper, + SIGNAL(mapped(Q1 &)), + this, + SLOT(onSomeEvent(const Q2 &))); +A( b, c, d); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp new file mode 100644 index 00000000..230b96b3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_657.cpp @@ -0,0 +1 @@ +class NewClass: public OldClass/*somecomment*/, public SomeClass; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp new file mode 100644 index 00000000..f8b0f8a8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_662.cpp @@ -0,0 +1,13 @@ +///foo +///<foo +//!foo +//!<foo + +//@{ +//@} + +///@{ +///@} + +//!@{ +//!@} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp new file mode 100644 index 00000000..869320c0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_663.cpp @@ -0,0 +1,11 @@ +#define SOME_MACRO TemplateClass<T> +int i; +#if defined(_MSC_VER) + #if _MSC_VER < 1300 + #define __func__ "unknown function" + #else + #define __func__ __FUNCTION__ + #endif /* _MSC_VER < 1300 */ +#endif /* defined(_MSC_VER) */ + +#define bug_demo (1 > 2) ? (1 : 2) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp new file mode 100644 index 00000000..148201b0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_664.cpp @@ -0,0 +1,6 @@ +bool dllInit = + []() +//34567890 +{ +}(); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp new file mode 100644 index 00000000..00adec83 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_666.cpp @@ -0,0 +1,12 @@ +bool test() +{ + if ( true ) + { + i = 10; + } + else + if ( true ) + { + i = 10; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp new file mode 100644 index 00000000..e9229a8e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.cpp @@ -0,0 +1,5 @@ +//3456789=123456789=123456789=123456789=123456789=123456789=12 +std::map<int, std::string> FOO::foo(int key, std::string value) +{ + return std::map<int, std::string>(key, value); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h new file mode 100644 index 00000000..ea503b10 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_670.h @@ -0,0 +1,2 @@ +//3456789=123456789=123456789=123456789=123456789=123456789=12 +std::map<int, std::string> FOO::foo(int key, std::string value); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h new file mode 100644 index 00000000..8ff7bfca --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_671.h @@ -0,0 +1,8 @@ +#define FOO_MAX 10 + +bool foo[FOO_MAX]; + +void +foo_bar( int a, + int* b, + bool foo[FOO_MAX] ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp new file mode 100644 index 00000000..512d2e45 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_858.cpp @@ -0,0 +1,16 @@ +enum { + item1=123, + item2 // comment 2 +} + +enum +{ + item3, + item4, // comment 4 +} +enum { x, y }; +enum { x, y=0 }; +enum { x, y=0 /*comment*/ }; +enum { x, y,}; +enum { x, y=0,}; +enum { x, y=0,/*comment*/ }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp new file mode 100644 index 00000000..eb51f587 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_902.cpp @@ -0,0 +1,65 @@ +// unc_add_option("sp_cond_colon", UO_sp_cond_colon, AT_IARF, +// "Add or remove space around the ':' in 'b ? t : f'"); +// unc_add_option("sp_cond_question", UO_sp_cond_question, AT_IARF, +// "Add or remove space around the '?' in 'b ? t : f'"); + + +void detect_options(void) +{ + detect_space_options(); +} + +int i = 0; + +//a +void a(){ return 0; } + +//0 +/*b*/ +void b(){ return 0; } + +/*0*/ +//c +void c(){ return 0; } + + +//d +//d +//d +void d(){ return 0; } + +//0 + +//h +//h +void h(){ return 0; } + +/*0*/ +/*e*/ +void e(){ return 0; } + +void f(){ return 0; } + +int i = 0; +void g(){ return 0; } + +void i(){ return 0; } +void j(){ return 0; } +void k(){ return 0; } + +//0 + +void l(){ return 0; } + +/* + * 0 + */ + +void m(){ return 0; } + +/* + * n + * n + * n + */ +void n(){ return 0; } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp new file mode 100644 index 00000000..06da6b3e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_1000.cpp @@ -0,0 +1,7 @@ +int main() +{ + // Newline inserted between '}' and ')' + v.push_back({ 2, 3.0 }); + v.push_back({ 2, 3.0 } + ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp new file mode 100644 index 00000000..e86698fd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_197.cpp @@ -0,0 +1 @@ +struct A {int a;}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp new file mode 100644 index 00000000..bc7e687f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_322.cpp @@ -0,0 +1,4 @@ +class STDMETHOD +{ +STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp new file mode 100644 index 00000000..ea141156 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_323.cpp @@ -0,0 +1,4 @@ +class ATL_NO_VTABLE CProxy : + public ATL::CComCoClass<CProxy, &CLSID_Proxy> +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp new file mode 100644 index 00000000..294e3afb --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_359.cpp @@ -0,0 +1,14 @@ +int main() +{ + int foo = 42; + switch (foo) { + case 1: + std::cout << "1" << std::endl; + break; + case 2: + std::cout << "2" << std::endl; + break; + default: + std::cout << "Neither 1 nor 2." << std::endl; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp new file mode 100644 index 00000000..eda9b0dd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_405.cpp @@ -0,0 +1,12 @@ +namespace shark { + template<class Closure> + struct indexed_iterator { + typedef typename boost::mpl::if_< + boost::is_const< + Closure + >, + typename Closure::const_reference, + typename Closure::reference + >::type reference; + }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp new file mode 100644 index 00000000..b3b51488 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_409.cpp @@ -0,0 +1,11 @@ +if(X == Y) X = Z; +if(Y == Z) + Y = X; + +for (i=0; i<5; i++) foo(i); +for (i=0; i<5; i++) + foo(i); + +while (i<5) foo(i++); +while (i<5) + foo(i++); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp new file mode 100644 index 00000000..647570f2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_411.cpp @@ -0,0 +1,10 @@ +class settings final +{ +public: +settings(); +~settings( ); +settings(const settings&); +settings & operator=(const settings&); +void set_something(const std::string& p_settings_name); +void set_another_setting(const std::string& p_settings_name); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp new file mode 100644 index 00000000..857d48f7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_478.cpp @@ -0,0 +1,24 @@ +{ +QString fileName = QFileDialog::getOpenFileName(this, +tr("Choose Configuration File"), ui->leStrategyFile->text(), +tr("Configuration Files (*.cfg);; All Files (*.*)"), 0); + +pSettings = new QSettings(QCoreApplication::applicationDirPath() + "/" + +QCoreApplication::applicationName() + ".ini", +QSettings::IniFormat); +} +int a () +{ + double a_very_long_variable = test (foobar1, + foobar5); + + double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa + + asdfasdfasdf - asdfasdf + 56598; + + a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa + + asdfasdfasdf - asdfasdf + 56598; + + testadsfa (dfasdf, + aaafsdfa); + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp new file mode 100644 index 00000000..2a4e6b8f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_481.cpp @@ -0,0 +1,3 @@ +{ + connect( timer, SIGNAL( timeout( ) ), this, SLOT( timeoutImage( ) ) ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp new file mode 100644 index 00000000..3c5951a8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_503.cpp @@ -0,0 +1,8 @@ +0B8h +__asm +{ + mov al, 0B8h + mov al, 2 + mov dx, 0xD007 + out dx, al +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp new file mode 100644 index 00000000..3b4de434 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_512.cpp @@ -0,0 +1,4 @@ +template<typename TType> +class TTypeSpecialization1<TType> +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp new file mode 100644 index 00000000..d0773475 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_525.cpp @@ -0,0 +1,13 @@ +EXEC SQL BEGIN DECLARE SECTION; + static char *tbuf; +EXEC SQL END DECLARE SECTION; + +void myfunc1() +{ + exec sql execute immediate :tbuf; +} + +void myfunc2() +{ + EXEC SQL EXECUTE IMMEDIATE :tbuf; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp new file mode 100644 index 00000000..5a0704de --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_552.cpp @@ -0,0 +1,13 @@ +char *array_assign[2][4]= +{ + { + // foo + {"foo"}, + {"foo@1"},{"foo@2"},{"foo@3"} + }, + { + // bar + {"bar"}, + {"bar@1"},{"bar@2"},{"bar@3"} + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp new file mode 100644 index 00000000..7b93e223 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_568.cpp @@ -0,0 +1,23 @@ +enum { // Keep this line as it is. It's a regression test for checking pc->prev->prev-> on CT_BRACE_OPEN. + kEnumValue = 5, +}; + +struct foo +{ + int bar : kEnumValue; + int pad : 3; +}; + +class cls +{ + int bar : kEnumValue; + int pad : 3; + + void func() + { + goto end; + bar = 1; + end: + pad = 2; + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp new file mode 100644 index 00000000..3ef21f1f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_575.cpp @@ -0,0 +1,8 @@ +void Foo::doo() +{ + m_stackCache[m_currentStackNr]->operator [](0) = new QStandardItem(QString::number(m_currentStackNr)); + m_stackCache[m_currentStackNr]->operator [](1) = new QStandardItem(tr("OK")); + m_stackCache[m_currentStackNr]->operator [](2) = new QStandardItem("0"); + m_stackCache[m_currentStackNr]->operator [](3) = new QStandardItem("0"); + m_stackCache[m_currentStackNr]->operator [](4) = new QStandardItem(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp new file mode 100644 index 00000000..88f77e34 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_596.cpp @@ -0,0 +1,10 @@ +#include "child.h" +int main(int argc, char*argv[]) { + (void)argc; + (void)argv; + Child child; + for (auto &attribute : * child.GetAttributes()) { + std::cout << attribute << std::endl; + } + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp new file mode 100644 index 00000000..f89b6416 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_646.cpp @@ -0,0 +1 @@ +friend class ::MultiLabelMeshPipeline; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp new file mode 100644 index 00000000..2a473bc7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_663.cpp @@ -0,0 +1,19 @@ +void test() +{ + switch ( n ) + { + case 1: + std::cout << "1"; + break; + + case 2: + { + std::cout << "2"; + } + break; + + case 3: + { std::cout << "3"; } + break; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp new file mode 100644 index 00000000..00adec83 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_666.cpp @@ -0,0 +1,12 @@ +bool test() +{ + if ( true ) + { + i = 10; + } + else + if ( true ) + { + i = 10; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h new file mode 100644 index 00000000..8f1fc31f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_682.h @@ -0,0 +1,4 @@ +void foo()
+{
+ return [=](T* t) { };
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp new file mode 100644 index 00000000..0f9e8155 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_687.cpp @@ -0,0 +1,3 @@ +struct S { static if (false) void bar() { }; } + +struct S { static if (false) { void bar() { }; } } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp new file mode 100644 index 00000000..b0b77452 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_752.cpp @@ -0,0 +1,14 @@ +int a() +{ + for(QStringList::const_iterator codesIt = _codes.constBegin(); codesIt != _codes.constEnd(); ++codesIt) { + if( // Current codes enough to compare: + ( ( *codesIt ).size() <= strId ) || + // Character on this slot was not readable: + ( ( *codesIt ).at( strId ) == m_wildcard ) || + // This character is matching: + ( code.at( strId ) == ( *codesIt ).at( strId ) ) ) { + // Ignore this slot: + continue; + } + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp new file mode 100644 index 00000000..07cc31fe --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_753.cpp @@ -0,0 +1,9 @@ +void Test::init() +{ + connect( m_ppcCom, + SIGNAL( sigReceivedBundle(QString) ), + SLOT( doProcessBundle(QString) ) ); + connect( m_ppcCom, + SIGNAL( sigReceivedBundle ), + SLOT( doProcessBundle ) ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp new file mode 100644 index 00000000..6777bfa5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_793.cpp @@ -0,0 +1,4 @@ +static void h() +{ + typedef int IntGroup; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp new file mode 100644 index 00000000..d3f89db7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_825.cpp @@ -0,0 +1,5 @@ +void a() +{ + int i = 0; + int h = 0h; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp new file mode 100644 index 00000000..270f0695 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_889.cpp @@ -0,0 +1,8 @@ +a::b c() +{ +mapped_file_source abc((int) CW1A(sTemp)); +mapped_file_source abc((int) ::CW2A(sTemp)); +mapped_file_source abc((int) A::CW3A(sTemp)); +} + +boost::iostreams::mapped_file_source pdf((LPSTR) ATL::CW2A(sTemp)); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp new file mode 100644 index 00000000..d2878656 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_928.cpp @@ -0,0 +1,12 @@ +namespace Test1 { namespace Test { + +CodeConstructor::CodeConstructor() +{ +} + +CodeConstructor::getSomething() +{ + return 0; +} + +}} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h new file mode 100644 index 00000000..b13997a6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_938.h @@ -0,0 +1,2 @@ + +void function(void); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp new file mode 100644 index 00000000..2a5d64a4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_999.cpp @@ -0,0 +1,2 @@ +template< class T, unsigned N = 0 > +constexpr unsigned long extent_v = extent< T, N >::value; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp new file mode 100644 index 00000000..08f7888e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/bug_i_width.cpp @@ -0,0 +1,4 @@ +{ + // test if no split is possible + aaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccddddddddddddd; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp new file mode 100644 index 00000000..4666e464 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-2.cpp @@ -0,0 +1,6 @@ +int&aa(int&x,int&b); // Sp Before Byref Func, Sp After Byref Func, Sp Before Byref, Sp After Byref +int aa(int&x,int&) // Sp Before Byref, Sp Before Unnamed Byref, Sp After Byref +{ + b = aa(x,b); + c = aa(&y,&d); // Sp Addr +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp new file mode 100644 index 00000000..28da2d74 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref-3.cpp @@ -0,0 +1,11 @@ +void test(void) { + auto const ic = 1; + auto iv = 1; + auto const & ric = ic; + auto & riv = iv; + const auto & ric2 = ic; + if (auto const & r(ric); r > 0) { + } + if (auto & r(riv); r > 0) { + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp new file mode 100644 index 00000000..85669bc6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/byref.cpp @@ -0,0 +1,46 @@ +bool foo(int & idx) +{ + if (idx < m_count) + { + idx++; + return m_bool[idx-1]; + } + return false; +} + +class Foo { +public: + Foo(); + Foo(const Foo& f); +}; + +class NS::Foo { +public: +Foo(Bar & b); +}; + +template< class T > class ListManager +{ +protected: + T head; + +public: + ListManager() + { + head.next = head.prev = &head; + } + + ListManager(const ListManager& ref) + { + head.next = head.prev = &head; + } +} + +const Foo & Foo::operator ==(Foo& me){ + ::sockaddr* ptr = (::sockaddr*)&host; + return me; +} + +MyType& MyClass::myMethode() { + const MyType& t = getSomewhere(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp new file mode 100644 index 00000000..11f92ee3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/call_brace_init_lst.cpp @@ -0,0 +1,26 @@ +void bar() +{ + foo(42, {1, 2, 3, 4}); + foo(42, + {1, 2, 3, 4}); + + foo(42, vector{1, 2, 3, 4}); + foo(42, + vector{1, 2, 3, 4}); + foo(42, vector + {1, 2, 3, 4}); + + foo(42, vector<int>{1, 2, 3, 4}); + foo(42, + vector<int>{1, 2, 3, 4}); + foo(42, vector<int> + {1, 2, 3, 4}); + foo(42, vector + <int>{1, 2, 3, 4}); + + foo(42, decltype(something){1, 2, 3, 4}); + foo(42, + decltype(something){1, 2, 3, 4}); + foo(42, decltype(something) + {1, 2, 3, 4}); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp new file mode 100644 index 00000000..421ff658 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/case-brace-remove.cpp @@ -0,0 +1,22 @@ +int SomeClass::method() +{ + switch (1) { + case 0: + { + double v; + break; + } + + case 1: + { + double v; + v = this->mat.operator()(0, 0); + break; + } + + case 2: + { + foo(); + } + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp new file mode 100644 index 00000000..d558e7f6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cast.cpp @@ -0,0 +1,4 @@ +{ + a = ( int)5.6; + b = int (5.6 ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp new file mode 100644 index 00000000..0bcab0d9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/casts.cpp @@ -0,0 +1,6 @@ +void f() +{ + uint32 x = (uint8)b; + uint32 x = (uint16)f(a, b); + uint32 x = (uint32)std::distance(a, b); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h new file mode 100644 index 00000000..ea539afa --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-addr.h @@ -0,0 +1,11 @@ +class C +{ +public: +A* B; +C& D; +const C& D; +static C& D; +public C& D; +E=c& D; +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp new file mode 100644 index 00000000..05eb69cf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-implementation.cpp @@ -0,0 +1,25 @@ +template<class T> +class TestTemp +{ +public: + TestTemp(); + void SetValue( T obj_i ); + T Getalue(); +private: + T m_Obj; +}; + +template <class T> +TestTemp<T>::TestTemp() +{ +} +template <class T> +void TestTemp<T>::SetValue( T obj_i ) +{ +} + +template <class T> +T TestTemp<T>::Getalue() +{ + return m_Obj; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp new file mode 100644 index 00000000..af06e31a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class-init.cpp @@ -0,0 +1,62 @@ + +class Foo : public Bar +{ + +}; + +#define CTOR(i, _) : T(X()), \ + y() \ +{ } + +class Foo2 : +public Bar +{ + +}; + +class GLOX_API ClientBase : public Class, public OtherClass, + public ThridClass, public ForthClass + { +public: + ClientBase(const ClientBase & f){ + // do something + } + }; + +ClientBase :: ClientBase (const std::string& ns, + const std::string& ns1, + const std::string& ns2) +{ + +} + +Foo::Foo(int bar) : someVar(bar), othervar(0) +{ +} + +Foo::Foo(int bar) : someVar(bar), + othervar(0) +{ +} + +Foo::Foo(int bar) +: someVar(bar), othervar(0) +{ +} + +Foo::Foo(int bar) : +someVar(bar), othervar(0) +{ +} + +Foo::Foo(int bar) : +someVar(bar), + othervar(0) +{ +} + +Foo::Foo(int bar) +: someVar(bar), + othervar(0) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h new file mode 100644 index 00000000..0048604d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/class.h @@ -0,0 +1,52 @@ +#ifndef _FOO_BAR_H_INCLUDED_ +#define _FOO_BAR_H_INCLUDED_ + +class CFooBarDlg : public CDialog +{ +// Construction +public: + CFooBarDlg(CFooBar *pDataMan, + CWnd* pParent = NULL ); + virtual ~CFooBarDlg(); + + void Initialize( BYTE nDelay=100 ); + + UINT GetCount() { return (m_nCount); } + + void SetCount(int count=1) + { + if ((count > 0) && (count < MAX_COUNT)) + { + m_nCount = count; + } + }; + + // Dialog Data + //{{AFX_DATA(CATCSMgrDlg) + enum { IDD = IDD_ATCS_MGR_DLG }; + //}}AFX_DATA + +protected: + int m_nCount; + +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CATCSMgrDlg) +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + //}}AFX_VIRTUAL + +// Implementation + + // Generated message map functions + //{{AFX_MSG(CATCSMgrDlg) + virtual BOOL OnInitDialog(); + afx_msg void OnTimer(UINT nIDEvent); + afx_msg void OnBtnSendFooBar(); + afx_msg void OnSelchangeFooBarCombo(); + //}}AFX_MSG + DECLARE_MESSAGE_MAP() +}; + +#endif /* _FOO_BAR_H_INCLUDED_ */ + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp new file mode 100644 index 00000000..8885e36b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-cpp-cont.cpp @@ -0,0 +1,17 @@ +#include "foo.h" + +// +// plshade z xmin xmax ymin ymax \ +// sh_min sh_max sh_cmap sh_color sh_width \ +// min_col min_wid max_col max_wid \ +rect [[pltr x y] | NULL ] [wrap] +//-------------------------------------------------------------------------- + +void foo() +{ + // plshade z xmin xmax ymin ymax \ + // sh_min sh_max sh_cmap sh_color sh_width \ + // min_col min_wid max_col max_wid \ + rect [[pltr x y] | NULL ] [wrap] + //-------------------------------------------------------------------------- +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp new file mode 100644 index 00000000..adb5a6ab --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt-reflow.cpp @@ -0,0 +1,43 @@ + +typedef enum stuff +{ +Value1 = 0x00000400 , // Just a comment for the value +Value2 = 0x00000800 , // A much longer comment that needs to be truncated to fit within a set character width. In this case, its 80 characters so two truncates are required. +} JustAnEnum; + +// this is another comment that is meant to exceed the code width so that it can be wrapped +// and combined to see how that works. + +/* this is another comment that is meant to exceed the code width so that it can be wrapped + * and combined to see how that works. */ + +/* Line A */ + +/* Line 1 */ +/* line 2 */ +/* line 3 */ +/* line 4 */ + +int cnt; /* This is a counter variable with a long comment. this should cause the comment to be wrapped. */ + +/** + * Multi-line comment + */ +void foo(void) +{ +/** + * Multi-line comment + */ + int idx; + /** + * Multi-line comment + */ +} + +/* Start Change #95 */ +/*INITIALIZE Variable(contExtnElgInd); /# Change #61 #/ */ +/*/# Start Change #35 #/ */ + +/** + * OneBigWordThatCannotBeSplitYetExceedsTheCommentWidthSettingSoThatWrappingShouldBeAttempted. + */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp new file mode 100644 index 00000000..e56aec25 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_backslash_eol.cpp @@ -0,0 +1,4 @@ +foo(); +// test \ +blah(); +bar(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp new file mode 100644 index 00000000..32ff32d3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_convert_tab_to_spaces.cpp @@ -0,0 +1,5 @@ +void f() { + /* Comment with <TAB> here + * and here again + */ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp new file mode 100644 index 00000000..542a0fd2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent.cpp @@ -0,0 +1,32 @@ +namespace { + + /* If we're in the middle of the original line, copy the string + only up to the cursor position into buf, so tab completion + will result in buf's containing only the tab-completed + path/filename. */ + + class Test { + + Test() {} + ~Test() {} + + /** Call this method to + run the test + + \param n test number + \returns the test result + */ + bool Run(int n); + + /** Call this method to + stop the test + + \param n test number + \returns the test result + */ + bool Run(int n); + + }; + +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h new file mode 100644 index 00000000..25253f09 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_indent_pp.h @@ -0,0 +1,8 @@ +class MyClass : public BaseClass +{ + //@{ BaseClass interface +#if VERY_LONG_AND_COMPLICATED_DEFINE + void foo(); +#endif // VERY_LONG_AND_COMPLICATED_DEFINE + //@} +};
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp new file mode 100644 index 00000000..a5ae87d5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_insert.cpp @@ -0,0 +1,45 @@ +#include <string> + +class CFoo +{ +CFoo(int arg); +CFoo(char arg) { +} +~CFoo(); +int foo1(int arg); +int foo2(); +int foo3(char ch, int xx) +{ +} +}; + +CFoo::CFoo(int arg) { +} + +CFoo::~CFoo() { +} + +int CFoo::foo1(int arg, int arg2) +{ +} + +int CFoo::foo2() +{ +} + +int CFoo::operator +() +{ +} + +map<string, int> func() +{ + // some codes +} + +int some_func(void) +{ +} + +class some_class_declaration; + +int some_func_declaration(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp new file mode 100644 index 00000000..121ea044 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cmt_right.cpp @@ -0,0 +1,26 @@ +class X +{ + struct Zone + { + // int a; + // int b; + int c; + int d; + double e; + inline Zone(int _c) : c(_c) + { } // constructor for zone search + + inline Zone( + //int _a, + //int _b, + int _c, + int _d, double _e) : + //a(_a), + //b(_b), + c(_c), + d(_d), + e(_e) + { } + }; +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp new file mode 100644 index 00000000..73dab5ec --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align-multiline.cpp @@ -0,0 +1,13 @@ +#include <stdio.h> + +void function() +{ + printf( "Hello World\n" ); + /* + output_comment_multi_simple to test replacement of \r\n to \n keep the + following \r:
+ //test + /// Another comment +//end test +*/ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp new file mode 100644 index 00000000..403bf773 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/comment-align.cpp @@ -0,0 +1,34 @@ +template <class T> +inline void +x3(T & a, T & b, T & c) +{ + T temp; + if (b < a) + { + if (c < a) + { // b , c < a + if (b < c) + { // b < c < a + temp = a; + a = b; + b = c; + c = temp; + } + else + { // c <=b < a + std::swap(c, a); + } + } + else + { // b < a <=c + // second line of comment + std::swap(a, b); + } + } + 0; + 0; + 0; + if (1) // always + do_something(); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp new file mode 100644 index 00000000..f0d1773d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/const_throw.cpp @@ -0,0 +1,13 @@ +void GetFoo(void) +const + { return (m_Foo); } + +int GetFoo(void) + throw (std::bad_alloc) + { return (m_Foo); } + +class foo{ + void bar(void) + const; +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp new file mode 100644 index 00000000..6c0706e5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constr_colon.cpp @@ -0,0 +1,9 @@ +class foo +{ + void bar_c(int t, int u) + : t(222) + , u(88) + { + // code + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp new file mode 100644 index 00000000..46abf36a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/constructor.cpp @@ -0,0 +1,31 @@ + +IMPLEMENT_DYNAMIC(CPropertiesDlg, CDialog) +CPropertiesDlg::CPropertiesDlg( CPtcMsgSimControlModule *pcmPtcMsg, + CWnd* pParent /*=NULL*/): + CDialog( CPropertiesDlg::IDD, pParent ), + m_pspRouter( pcmPtcMsg ), + m_pspScm( pcmPtcMsg ) +{ + m_pcmPtcMsg = pcmPtcMsg; +} + +CPropertiesDlg::~CPropertiesDlg() +{ +} + +void CPropertiesDlg::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); +} + +CFooBar::CFooBar(CWnd* pParent /*=NULL*/) + : CDialog(CFooBar::IDD, pParent), + m_parent(pParent) +{ + //{{AFX_DATA_INIT(CRouterBrowser) + //}}AFX_DATA_INIT + + m_nFoo = 0; + m_nBar = 0; +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp new file mode 100644 index 00000000..27b52dac --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/conversion_operator.cpp @@ -0,0 +1,5 @@ +template< class T > +operator T*() const +{ + return 0; +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp new file mode 100644 index 00000000..c3c9366d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cout.cpp @@ -0,0 +1,17 @@ +void foo() +{ + cout.setf(ios::showpoint); + cout.setf(ios::floatfield,ios::fixed); + + what.the.hell.cout << "hello" + << "world!" + << "This" + << "is a" + << "test!"; + + *aaaaaa = (bbbbb(cccccPtr->ddd) & YYYYYYYYYYYYYYYYYYYYYYYY) | + ((bbbbb(cccccPtr->nnnnnnnn) << ZZZZZZZZZZZZZZZZZZZZZZZZZZZ) + & WWWWWWWWWWWWWWWWWWWWWWWWWW) | ((bbbbb(cccccPtr->hhhhhhhhhhhhhh) + << FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF) + & EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp new file mode 100644 index 00000000..ba463284 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp17.cpp @@ -0,0 +1,8 @@ +bool CompareGenomeByFeatureResults::clickOnLink(std::string const& inLink) { + auto const[sequence, type, firstPosition, lastPosition] = parseLink(inLink); + if (sequence.empty()) { + return true; + } + return showFeature(statistics.nameDocumentA, type, firstPosition, lastPosition); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp new file mode 100644 index 00000000..cec9beb8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/cpp_move.cpp @@ -0,0 +1,2 @@ + +void Test(X&& val1, Y* val2); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp new file mode 100644 index 00000000..2551d8bd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ctor-var.cpp @@ -0,0 +1,4 @@ +int foo() +{ + TextBody textbody(GetBody().GetText()); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp new file mode 100644 index 00000000..422cb1bf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open-2.cpp @@ -0,0 +1,46 @@ + + +BEGIN_MESSAGE_MAP(CUSB2_camera_developementDlg, CDialog) +ON_COMMAND(IDC_ESCAPE, On_Escape) +ON_COMMAND(IDC_8_BIT, On_8_Bit) +ON_COMMAND(IDC_14_BIT, On_14_Bit) +ON_COMMAND(IDC_ACQUIRE, On_Acquire) +ON_COMMAND(IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages) +ON_COMMAND(IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages) +ON_WM_PAINT() +ON_WM_QUERYDRAGICON() +ON_WM_CTLCOLOR() +END_MESSAGE_MAP() + +namespace one +{ + namespace two + { + int Func(int a, + int b) + { + return a + b; + } + } +} + +using namespace one::two; + +void Func2(int c, + int d) +{ +} + +int main() +{ + int a; + + switch (a) + { + case 0: + Func2(1, Func(1, 2)); + Func2(1, one::two::Func(1, 2)); + break; + } +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp new file mode 100644 index 00000000..1544fd74 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/custom-open.cpp @@ -0,0 +1,26 @@ + +void className::set(const objectName& obj) +{ + statement1(); +MACRO_BEGIN_STUFF(param) +DOSTUFF(params) +MACRO_ELSE_STUFF() +DOMORESTUFF(moreparams) +junk = 1; +MACRO2_BEGIN_STUFF +junk += 3; +MACRO2_ELSE_STUFF +junk += 4; +MACRO2_END_STUFF +DOLASTSTUFF(lastparams) +MACRO_END_STUFF() + statement2(); +} + + +MACRO2_BEGIN_STUFF + // comment +MACRO2_ELSE_STUFF + /* Comment */ +MACRO2_END_STUFF + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp new file mode 100644 index 00000000..69e924ee --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/define-indentation.cpp @@ -0,0 +1,2 @@ + #define EXTRACTX360ACHIEVEMENT X360Achievement_INTERNAL& mapping = ExtractMonoObjectData<X360Achievement_INTERNAL>(self); /*huh?*/ \
+ const XACHIEVEMENT_DETAILS* achievement = xenon::Achievements::GetDetails(mapping.m_index);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp new file mode 100644 index 00000000..fff916e3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/delete.cpp @@ -0,0 +1,10 @@ + +void x(int **d) { +delete *d; +} + +void x(int& d) { +delete &d; +} + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp new file mode 100644 index 00000000..abfb70c7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/deref.cpp @@ -0,0 +1,15 @@ + +myNewValue = something[arrayNumber] *someOtherValue; +myNewValue = multidimentional[arrayNumber][anotherNumber] *someOtherValue; +myNewValue = noArrayVariableWorksFine * someOtherValue; + + +int func(int * thingy, +volatile int *arrayThingy[NUMBER]); + +int func(int * thingy, +volatile int *arrayThingy[NUMBER][anotherNumber]); + +int func(int * thingy, +volatile int *noArrayThingyWorksFine); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp new file mode 100644 index 00000000..57cfddf5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/digraph.cpp @@ -0,0 +1,5 @@ +x = reinterpret_cast< ::Symbol*>();
+
+int b() {
+ char f <: 32 :> = <% 0 %>;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp new file mode 100644 index 00000000..cb9fc307 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/disable_macro.cpp @@ -0,0 +1,24 @@ +#include <stdio.h> + +// this macro should NOT be modified ... +#define CHK(...) \ + do \ + { \ + a+=1; \ + a=b=0; \ + c<<1; \ + } while (0+0) + + +// ... whereas this should be indented and formatted +int main() +{ + int a,b,c=0; + if (a<c) + { + c+=1; + } + a=b=0; + c<<1; + CHK; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp new file mode 100644 index 00000000..fd622c3c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-detab-strings.cpp @@ -0,0 +1,6 @@ +void f() {
+ auto x = " test\t ... ???";
+// *INDENT-OFF*
+ auto x = " test\t ... ???";
+// *INDENT-ON*
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp new file mode 100644 index 00000000..a0a58f85 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/dont-process-defines.cpp @@ -0,0 +1,6 @@ +#define inline_2 __forceinline
+#define inline(i) inline_##i
+#define foo(x) inline(2) x()
+#define PLD(reg,offset) pld [reg, offset] \
+ pld [reg, offset] \
+ pld [reg, offset]
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp new file mode 100644 index 00000000..8753aee2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eat_blanks_after_codewidth.cpp @@ -0,0 +1,7 @@ +class A
+{
+ void func1(){
+ // comment
+ }
+ void func2(){auto result = 1 + 2 + 3 + 4;}
+};
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp new file mode 100644 index 00000000..4e228311 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/eigen.cpp @@ -0,0 +1,7 @@ +void foo() +{ + transform << 0, 1, 0, 0, + 1, 0, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp new file mode 100644 index 00000000..7f87591e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum.cpp @@ -0,0 +1,207 @@ + enum + class + angle_state_e + : + unsigned +int { + NONE=0, OPEN=1, //'<' found +CLOSE = 2 , //'>' found +}; + +// align.cpp +enum class comment_align_e : unsigned int +{ + REGULAR, + BRACE, + ENDIF, +}; + +// chunk_list.h +enum class scope_e : unsigned int +{ + ALL, /**< search in all kind of chunks */ + PREPROC, /**< search only in preprocessor chunks */ +}; + +// chunk_list.cpp +enum class direction_e : unsigned int +{ + FORWARD, + BACKWARD +}; + +// combine.cpp +{ + enum class angle_state_e : unsigned int + { + NONE = 0, + OPEN = 1, // '<' found + CLOSE = 2, // '>' found + }; +} + +// indent.cpp +enum class align_mode_e : unsigned int +{ + SHIFT, /* shift relative to the current column */ + KEEP_ABS, /* try to keep the original absolute column */ + KEEP_REL, /* try to keep the original gap */ +}; + +// align_stack.h +{ + enum StarStyle + { + SS_IGNORE, // don't look for prev stars + SS_INCLUDE, // include prev * before add + SS_DANGLE // include prev * after add + }; +} + +// log_levels.h +enum log_sev_t +{ + LSYS = 0, + LERR = 1, + LWARN = 2, + LNOTE = 3, + LINFO = 4, + LDATA = 5, + + LFILELIST = 8, /* Files in the file list file */ + LLINEENDS = 9, /* Show which line endings are used */ + LCASTS = 10, /* align casts */ + LALBR = 11, /* align braces */ + LALTD = 12, /* Align Typedef */ + LALPP = 13, /* align #define */ + LALPROTO = 14, /* align prototype */ + LALNLC = 15, /* align backslash-newline */ + LALTC = 16, /* align trailing comments */ + LALADD = 17, /* align add */ + LALASS = 18, /* align assign */ + LFVD = 19, /* fix_var_def */ + LFVD2 = 20, /* fix_var_def-2 */ + LINDENT = 21, /* indent_text */ + LINDENT2 = 22, /* indent_text tab level */ + LINDPSE = 23, /* indent_text stack */ + LINDPC = 24, /* indent play-by-play */ + LNEWLINE = 25, /* newlines */ + LPF = 26, /* Parse Frame */ + LSTMT = 27, /* Marking statements/expressions */ + LTOK = 28, /* Tokenize */ + LALRC = 29, /* align right comment */ + LCMTIND = 30, /* Comment Indent */ + LINDLINE = 31, /* indent line */ + LSIB = 32, /* Scan IB */ + LRETURN = 33, /* add/remove parens for return */ + LBRDEL = 34, /* brace removal */ + LFCN = 35, /* function detection */ + LFCNP = 36, /* function parameters */ + LPCU = 37, /* parse cleanup */ + LDYNKW = 38, /* dynamic keywords */ + LOUTIND = 39, /* output indent */ + LBCSAFTER = 40, /* Brace cleanup stack - after each token */ + LBCSPOP = 41, /* Brace cleanup stack - log pops */ + LBCSPUSH = 42, /* Brace cleanup stack - log push */ + LBCSSWAP = 43, /* Brace cleanup stack - log swaps */ + LFTOR = 44, /* Class Ctor or Dtor */ + LAS = 45, /* align_stack */ + LPPIS = 46, /* Preprocessor Indent and Space */ + LTYPEDEF = 47, /* Typedef and function types */ + LVARDEF = 48, /* Variable def marking */ + LDEFVAL = 49, /* define values */ + LPVSEMI = 50, /* Pawn: virtual semicolons */ + LPFUNC = 51, /* Pawn: function recognition */ + LSPLIT = 52, /* Line splitting */ + LFTYPE = 53, /* Function type detection */ + LTEMPL = 54, /* Template detection */ + LPARADD = 55, /* adding parens in if/while */ + LPARADD2 = 56, /* adding parens in if/while - details */ + LBLANKD = 57, /* blank line details */ + LTEMPFUNC = 58, /* Template function detection */ + LSCANSEMI = 59, /* scan semi colon removal */ + LDELSEMI = 60, /* Removing semicolons */ + LFPARAM = 61, /* Testing for a full parameter */ + LNL1LINE = 62, /* NL check for 1 liners */ + LPFCHK = 63, /* Parse Frame check fcn call */ + LAVDB = 64, /* align var def braces */ + LSORT = 65, /* Sorting */ + LSPACE = 66, /* Space */ + LALIGN = 67, /* align */ + LALAGAIN = 68, /* align again */ + LOPERATOR = 69, /* operator */ + LASFCP = 70, /* Align Same Function Call Params */ + LINDLINED = 71, /* indent line details */ + LBCTRL = 72, /* beautifier control */ + LRMRETURN = 73, /* remove 'return;' */ + LPPIF = 74, /* #if/#else/#endif pair processing */ + LMCB = 75, /* mod_case_brace */ + LBRCH = 76, /* if brace chain */ + LFCNR = 77, /* function return type */ + LOCCLASS = 78, /* OC Class stuff */ + LOCMSG = 79, /* OC Message stuff */ + LBLANK = 80, /* Blank Lines */ + LOBJCWORD = 81, /* Convert keyword to CT_WORD in certain circumstances */ + LCHANGE = 82, /* something changed */ + LCONTTEXT = 83, /* comment cont_text set */ + LANNOT = 84, /* Java annotation */ + LOCBLK = 85, /* OC Block stuff */ + LFLPAREN = 86, /* Flag paren */ + LOCMSGD = 87, /* OC Message declaration */ + LINDENTAG = 88, /* indent again */ + LNFD = 89, /* newline-function-def */ + LJDBI = 90, /* Java Double Brace Init */ + LSETPAR = 91, /* set_chunk_parent() */ + LSETTYP = 92, /* set_chunk_type() */ + LSETFLG = 93, /* set_chunk_flags() */ + LNLFUNCT = 94, /* newlines before function */ + LCHUNK = 95, /* Add or del chunk */ + LGUY98 = 98, /* for guy-test */ + LGUY = 99, /* for guy-test */ +}; + +// options.h +enum argtype_e +{ + AT_BOOL, /**< true / false */ + AT_IARF, /**< Ignore / Add / Remove / Force */ + AT_NUM, /**< Number */ + AT_LINE, /**< Line Endings */ + AT_POS, /**< start/end or Trail/Lead */ + AT_STRING, /**< string value */ + AT_UNUM, /**< unsigned Number */ +}; + +enum argval_t +{ + AV_IGNORE = 0, + AV_ADD = 1, + AV_REMOVE = 2, + AV_FORCE = 3, /**< remove + add */ + AV_NOT_DEFINED = 4 /* to be used with QT, SIGNAL SLOT macros */ +}; + +enum lineends_e +{ + LE_LF, /* "\n" */ + LE_CRLF, /* "\r\n" */ + LE_CR, /* "\r" */ + + LE_AUTO, /* keep last */ +}; + +enum tokenpos_e +{ + TP_IGNORE = 0, /* don't change it */ + TP_BREAK = 1, /* add a newline before or after the if not present */ + TP_FORCE = 2, /* force a newline on one side and not the other */ + TP_LEAD = 4, /* at the start of a line or leading if wrapped line */ + TP_LEAD_BREAK = (TP_LEAD | TP_BREAK), + TP_LEAD_FORCE = (TP_LEAD | TP_FORCE), + TP_TRAIL = 8, /* at the end of a line or trailing if wrapped line */ + TP_TRAIL_BREAK = (TP_TRAIL | TP_BREAK), + TP_TRAIL_FORCE = (TP_TRAIL | TP_FORCE), + TP_JOIN = 16, /* remove newlines on both sides */ +}; + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h new file mode 100644 index 00000000..2ba9933f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_class.h @@ -0,0 +1,21 @@ +enum class A +{ +a, +b +} + +enum struct D +{ +a, +b +} + +class B { +private: + int x; +} +enum C +{ +a, +b +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h new file mode 100644 index 00000000..42ce2c53 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comma.h @@ -0,0 +1,8 @@ + +void function(int a, int b, int c); + +enum Test { + A, B + , C, + D, E +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp new file mode 100644 index 00000000..736e6718 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_comment_wrap.cpp @@ -0,0 +1,7 @@ +enum class Eee +{ + Foo, + AnotherFoo, // comment + Bar, + DifferentBar +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp new file mode 100644 index 00000000..8bde6273 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/enum_shr.cpp @@ -0,0 +1,7 @@ +enum MyEnum { + kOne = 0, + kTwo = 1 << 0, + kThree = 1 << 1, + kFour = 1 << 2 +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp new file mode 100644 index 00000000..7f29676e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/exception.cpp @@ -0,0 +1,33 @@ + #include <iostream> + + +void foo() +{ + char *buf; + try { + buf = new unsigned char[1024]; + if( buf == 0 ) + throw "Out of memory"; + } + catch( char * str ) { + cout << "Exception: " << str << '\n'; + } +} + +void bar() +{ + char *buf; + + try + { + buf = new unsigned char[1024]; + if( buf == 0 ) + throw "Out of memory"; + } + catch( char * str ) + { + cout << "Exception: " << str << '\n'; + } +} + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h new file mode 100644 index 00000000..e4943e50 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_c.h @@ -0,0 +1,33 @@ +#ifndef cRecordMarking_HEADER +#define cRecordMarking_HEADER + +#include "DIS/cPduSnapshot.h" + +typedef void* disConnectionH; + +#ifdef __cplusplus +extern "C" +#endif +{ + + disConnectionH createDisConnection(); + + void setAddressAndPort_DisConnect(disConnectionH record, const char *addr); + + /* Open network connection */ + int open_DisConnect(disConnectionH record); + + /* Close network connection */ + void close_DisConnect(disConnectionH record); + + /* Send one pdu */ + int sendPdu_DisConnect(disConnectionH record, pduSnapshotH pdu); + + /* Receive one pdu */ + int recvPdu_DisConnect(disConnectionH record, pduSnapshotH pdu); + + void FreeDisConnection(disConnectionH connection); + +} +#endif + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp new file mode 100644 index 00000000..24e90a37 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/extern_func.cpp @@ -0,0 +1,7 @@ +void foo(); +// hello +extern "C" +BAR_EXPORT +void bar() +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp new file mode 100644 index 00000000..0a729f01 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/first_len_minimum.cpp @@ -0,0 +1,4 @@ +/* + a + b + */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp new file mode 100644 index 00000000..0014b110 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/fix_for_relational_operators.cpp @@ -0,0 +1,8 @@ +void foo() +{ +while (a < b && c > d) +i++; + +for ( ;a < b && c > d; ) +i++; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp new file mode 100644 index 00000000..c62548f8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_auto.cpp @@ -0,0 +1,16 @@ +void foo() +{ + for (auto const& item : list) + bar(item); + for (const auto& item : list) + bar(item); + for (auto& item : list) + bar(item); + + auto* var = bar(); + auto& var = bar(); + auto var = bar(); + auto const* var = bar(); + auto const& var = bar(); + auto const var = bar(); +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp new file mode 100644 index 00000000..7685f614 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_long.cpp @@ -0,0 +1,8 @@ +void foo() +{ +for(std::map<std::string, std::string>::iterator it=m_stat_http_conn_total.m_stat_response_codes.begin(); it!=m_stat_http_conn_total.m_stat_response_codes.end(); ++i) +{ +bar(it); +} +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp new file mode 100644 index 00000000..cbfacf62 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/for_loop_head.cpp @@ -0,0 +1,10 @@ +for(int i = 1, + j = 2, + k = 3, + ; (i != 1 + && j != 2 + && k != 2) + ; i++, j++, k++ ) +{ +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp new file mode 100644 index 00000000..cfbe7963 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/foreach.cpp @@ -0,0 +1,4 @@ +void foo()
+{
+ for_each(it.begin(), it.end(), func);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp new file mode 100644 index 00000000..1b073b45 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/friends.cpp @@ -0,0 +1,6 @@ +class foo +{ +friend void bar(); +friend void none(); +template <typename T> friend vector<T> vec(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm new file mode 100644 index 00000000..16f98ce9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func-param-wrap-oc.mm @@ -0,0 +1,5 @@ + if(progress <= 0)
+ {
+ [[NSBezierPath bezierPathWithOvalInRect:NSMakeRect(NSMinX(pieRect)+stroke,NSMinY(pieRect)+stroke,
+ NSWidth(pieRect)-2*stroke,NSHeight(pieRect)-2*stroke)] fill];
+ }
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp new file mode 100644 index 00000000..6467560f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call.cpp @@ -0,0 +1,14 @@ +void f() +{ + auto x = func1( + arg, + arg); +} + +void f() +{ + return func2( + arg, + arg); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp new file mode 100644 index 00000000..7e2f3931 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_call_chain.cpp @@ -0,0 +1,7 @@ +void f() +{ + m_complete.back().m_replicas.clear(); + + m_complete.back().m_replicas.push_back(serverId); + m_pending.front().m_replicas.erase(r); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp new file mode 100644 index 00000000..64a11509 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.cpp @@ -0,0 +1,27 @@ +/** + * Reverse the bytes in 32-bit chunks. + */ +void MD5::reverse_u32(UINT8 *buf, int n_u32) +{ + UINT8 tmp; +} + +MD5::MD5() +{ + m_buf[0] = 0x01020304; +} + +class AlignStack +{ +public: + bool m_skip_first; + AlignStack() + { + } + ~ AlignStack() + { + } + void End() + { + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h new file mode 100644 index 00000000..168b0b3d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_class.h @@ -0,0 +1,16 @@ +void MD5::reverse_u32(UINT8 *buf, int n_u32); + +MD5::MD5(); + +class AlignStack +{ +public: + bool m_skip_first; + + AlignStack(); + + + ~ AlignStack(); + + void End(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp new file mode 100644 index 00000000..24b187c1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param.cpp @@ -0,0 +1,18 @@ +typedef short (* hello1) (char coolParam, + ushort *, + unsigned int anotherone); + +short (* hello2)(char coolParam, + ulong *, + uchar, + unsigned int anotherone); + +short hello3 (char coolParam, + ushort *, + unsigned int anotherone); + +void x (custom_t * e, void (*funcptr) ); +void x (custom_t * e, void (*funcptr)[] ); +void x (custom_t * e, void (*funcptr)(int, int) ); +void x (custom_t * e, void (*funcptr)(int, int)[] ); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp new file mode 100644 index 00000000..8c62d49b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/func_param_indent_leading_comma.cpp @@ -0,0 +1,7 @@ +uint32_t foo ( uint8_t param1 + , some_datatype param2 + , datatype param3 + , another_datatype *param4 + , uint16_t param5 + , uint32_t *param6 + );
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp new file mode 100644 index 00000000..7f5e05c4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/function-def.cpp @@ -0,0 +1,74 @@ +int &Function() +{ +static int x; +return (x); +} + +void foo1(int param1, int param2, char *param2); + +void foo2(int param1, + int param2, + char *param2); + +void foo3(int param1, + int param2, // comment + char *param2 + ); + +struct whoopee *foo4(int param1, int param2, char *param2 /* comment */); + +const struct snickers * +foo5(int param1, int param2, char *param2); + + +void foo(int param1, int param2, char *param2) +{ + printf("boo!\n"); +} + +int classname::method(); + +int classname::method() +{ + foo(); +} + +int +classname::method2(); + +int +classname::method2() +{ + foo2(); +} + +const int& className::method1(void) const +{ + // stuff +} + +const longtypename& className::method2(void) const +{ + // stuff +} + +int &foo(); + +int &foo() +{ + list_for_each(a,b) { + bar(a); + } + return nuts; +} + +void Foo::bar() {} + +Foo::Foo() {} + +Foo::~Foo() {} + +void func(void) +{ +Directory dir("arg"); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp new file mode 100644 index 00000000..5d2ff4fe --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/functype_param.cpp @@ -0,0 +1,2 @@ +void foo(int * (*f)(int)); +void foo(int & (*f)(int)); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp new file mode 100644 index 00000000..b188c210 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gcc_case_ellipsis.cpp @@ -0,0 +1,15 @@ +void f(int i) +{ + switch(i) + { + case 1 ... 2: + { + break; + } + case 3 ... 5: + break; + + default: + break + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp new file mode 100644 index 00000000..feb059d3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/gh555.cpp @@ -0,0 +1,8 @@ +class \u005FClass // underscore character +{ +}; + +int main() +{ + string IdentifierContainingTwoUCNCharacters\u1234\U00001234 = "\u005FClass"; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp new file mode 100644 index 00000000..0f50d182 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/goto.cpp @@ -0,0 +1,11 @@ +#define x struct z
+#define max(a, b) ((a) > (b) ? (a) : (b))
+
+void f()
+{
+ goto p;
+p:
+ goto q;
+q:
+ goto p;
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp new file mode 100644 index 00000000..06680c0e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1082.cpp @@ -0,0 +1,4 @@ +// there should be no break ups caused by suffix or separator +auto n2 = 1'000; +auto m1 = 0b0010'1010LL; +auto m2 = 0xfa'afUll;
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp new file mode 100644 index 00000000..c3123b59 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1165.cpp @@ -0,0 +1,14 @@ +#include <functional> + +int main() +{ + typedef std::function<void ()> C; + C callback = + [] () + { + C f([]() + { + int i; + }); + }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp new file mode 100644 index 00000000..1a959d34 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1181.cpp @@ -0,0 +1,6 @@ +int main() +{ + if(true) {return 1;} + else if(true) {return 1;} + else {return 1;} +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp new file mode 100644 index 00000000..0c8e1c92 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1207.cpp @@ -0,0 +1,10 @@ +#include <vector> +std::vector<int> f() +{; +return std::vector<int>{1}; +}; + +int main() +{; + return f()[0];;;;; +};
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp new file mode 100644 index 00000000..d4d05106 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1218.cpp @@ -0,0 +1,8 @@ +// Do not add a new line because of the vbrace close that is above col 25 +// after return 1; +int main() +{ + if(1) + return 1; + return 0; +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp new file mode 100644 index 00000000..e4005841 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1464.cpp @@ -0,0 +1 @@ +auto p = std::make_pair(r * cos(a), r * sin(a)); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp new file mode 100644 index 00000000..912488b3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1466.cpp @@ -0,0 +1 @@ +A a = {this->r * cos(b)};
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp new file mode 100644 index 00000000..d3e79ff6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509.cpp @@ -0,0 +1,5 @@ +void f() +{ + int i = A::B::C::bar(); + int ii = A::B::C::bar(); +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp new file mode 100644 index 00000000..1470d613 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1509_bug_1112_correction.cpp @@ -0,0 +1,26 @@ +void f() +{ +int i = A::B::C::bar(); +int ii = A::B::C::bar(); +} + +int A::foo() +{ +return 1; +} +int A::B::foo() +{ +return A::foo(); +} +int A::B::C::foo() +{ +return A::B::foo(); +} +int A::B::C::D::foo() +{ +return A::B::C::foo(); +} +int A::B::C::D::E::foo() +{ +return A::B::C::D::foo(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp new file mode 100644 index 00000000..dda01437 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1516.cpp @@ -0,0 +1,15 @@ +void myClass::foo() { + int bar; + std::string str; + DbConfig::configuredDatabase()->apply(db); + std::string str2; + + std::string str2; + f(); + DbConfig::configuredDatabase()->apply(db); + int bar; + std::string str; + + std::string str2; + f(); +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp new file mode 100644 index 00000000..2c33ec58 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1536.cpp @@ -0,0 +1,7 @@ +void FuncA(void) +{ +} + +void FuncB(void) +{ +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp new file mode 100644 index 00000000..5cb66589 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1565.cpp @@ -0,0 +1,9 @@ +namespace ns1 { +namespace ns2 { + + #define SOME_MACRO() \ + if(true) { \ + } + +} +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp new file mode 100644 index 00000000..1901e3db --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1617.cpp @@ -0,0 +1,5 @@ +namespace +{ +void f(){ +}; +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp new file mode 100644 index 00000000..7fa82285 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i1768.cpp @@ -0,0 +1,6 @@ +void f(int a, int b); + +void g() +{ + f(1, 2); +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp new file mode 100644 index 00000000..fd27cf6d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2033.cpp @@ -0,0 +1,7 @@ +/* *INDENT-OFF* */ +enum E_SUNSENSOR { + EXAMPLE1, + EXAMPLE2, + SN005 +}; +/* *INDENT-ON* */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp new file mode 100644 index 00000000..8011f572 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i2116.cpp @@ -0,0 +1,2 @@ +void f() +{} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp new file mode 100644 index 00000000..4d95c7ce --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/i683.cpp @@ -0,0 +1,42 @@ +#define concat0(a0,a1) a0 ??=??=a1 // trigraph ## +#define concat1(a0,a1) a0 %:%:a1 // digraph ## + + +#define STRINGIFY0(s) ??= s // trigraph # +#define STRINGIFY1(s) %: s // digraph # + +#define msg0(x) printf("%c: %d\n", ??=@ x, x) // trigraph #@ +#define msg1(x) printf("%c: %d\n", %:@ x, x) // digraph #@ + +// trigraph { +void x() ??< + + // trigraph [] + char a ??(??) = "a"; + // diigraph [] + char b <::> = "b"; + + bool f, g, h; + f = g = h = true; + + // trigraph || + f = g ??!??! h; + // trigraph |= + f ??!= g; + // trigraph | + f = g ??! h; + // trigraph ^= + f ??'= g; + // trigraph ^ + f = g ??' h; + + // trigraph [, ] + int m ??(5??); + // digraph [, ] + int n <:5:>; + +// trigraph } +return; ??> + +// digraph {, } +int y() <% return 1; %>
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp new file mode 100644 index 00000000..76f37f92 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if-constexpr.cpp @@ -0,0 +1,7 @@ +int foo() +{ + if constexpr (a == 0) { + return 1; + } + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp new file mode 100644 index 00000000..b544f2bf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_chain_braces.cpp @@ -0,0 +1,33 @@ + +int foo() { + if ( a ) + return 1; + else if ( b ) + return 2; + + if ( a ) + return 3; + else if ( b ) + return 4; + else { + a = 5; + return 5; + } + + if ( a ) + return 6; + else + return 7; + + if ( a ) + return 8; + + if ( b ) { + return 9; + } + + if ( b ) { + { b = 5; } + return 9; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp new file mode 100644 index 00000000..032f74ec --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/if_constexpr.cpp @@ -0,0 +1,8 @@ +static constexpr int test{ + if constexpr (condition_1) + return 1; + else if constexpr (condition_2) + return 2; + else + return 3; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp new file mode 100644 index 00000000..52f508f6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ifcomment.cpp @@ -0,0 +1,7 @@ +if (true) // indent_relative_single_line_comments = false
+ return;
+if ( foo ) { // true
+ bar(1); // action 1
+} else { // false
+ bar(2); // action 2
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp new file mode 100644 index 00000000..56633d0e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-c.cpp @@ -0,0 +1,1084 @@ +/** + * @file indent.cpp + * Does all the indenting stuff. + * + * $Id: indent.cpp 548 2006-10-21 02:31:55Z bengardner $ + */ +#include "uncrustify_types.h" +#include "chunk_list.h" +#include "prototypes.h" +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <cerrno> +#include <cctype> + + +/** + * General indenting approach: + * Indenting levels are put into a stack. + * + * The stack entries contain: + * - opening type + * - brace column + * - continuation column + * + * Items that start a new stack item: + * - preprocessor (new parse frame) + * - Brace Open (Virtual brace also) + * - Paren, Square, Angle open + * - Assignments + * - C++ '<<' operator (ie, cout << "blah") + * - case + * - class colon + * - return + * - types + * - any other continued statement + * + * Note that the column of items marked 'PCF_WAS_ALIGNED' is not changed. + * + * For an open brace: + * - indent increases by indent_columns + * - if part of if/else/do/while/switch/etc, an extra indent may be applied + * - if in a paren, then cont-col is set to column + 1, ie "({ some code })" + * + * Open paren/square/angle: + * cont-col is set to the column of the item after the open paren, unless + * followed by a newline, then it is set to (brace-col + indent_columns). + * Examples: + * a_really_long_funcion_name( + * param1, param2); + * a_really_long_funcion_name(param1, + * param2); + * + * Assignments: + * Assignments are continued aligned with the first item after the assignment, + * unless the assign is followed by a newline. + * Examples: + * some.variable = asdf + asdf + + * asdf; + * some.variable = + * asdf + asdf + asdf; + * + * C++ << operator: + * Handled the same as assignment. + * Examples: + * cout << "this is test number: " + * << test_number; + * + * case: + * Started with case or default. + * Terminated with close brace at level or another case or default. + * Special indenting according to various rules. + * - indent of case label + * - indent of case body + * - how to handle optional braces + * Examples: + * { + * case x: { + * a++; + * break; + * } + * case y: + * b--; + * break; + * default: + * c++; + * break; + * } + * + * Class colon: + * Indent continuation by indent_columns: + * class my_class : + * baseclass1, + * baseclass2 + * { + * + * Return: same as assignemts + * If the return statement is not fully paren'd, then the indent continues at + * the column of the item after the return. If it is paren'd, then the paren + * rules apply. + * return somevalue + + * othervalue; + * + * Type: pretty much the same as assignments + * Examples: + * int foo, + * bar, + * baz; + * + * Any other continued item: + * There shouldn't be anything not covered by the above cases, but any other + * continued item is indented by indent_columns: + * Example: + * somereallycrazylongname.with[lotsoflongstuff]. + * thatreallyannoysme.whenIhavetomaintain[thecode] = 3; + */ + +static void indent_comment(chunk_t *pc, int col); + + +void indent_to_column(chunk_t *pc, int column) +{ + if (column < pc->column) + { + column = pc->column; + } + reindent_line(pc, column); +} + +/** + * Changes the initial indent for a line to the given column + * + * @param pc The chunk at the start of the line + * @param column The desired column + */ +void reindent_line(chunk_t *pc, int column) +{ + int col_delta; + int min_col; + + LOG_FMT(LINDLINE, "%s: %d] col %d on %.*s [%s] => %d\n", + __func__, pc->orig_line, pc->column, pc->len, pc->str, + get_token_name(pc->type), column); + + if (column == pc->column) + { + return; + } + col_delta = column - pc->column; + pc->column = column; + min_col = pc->column; + + do + { + min_col += pc->len; + pc = chunk_get_next(pc); + if (pc != NULL) + { + if (chunk_is_comment(pc)) + { + pc->column = pc->orig_col; + if (pc->column < min_col) + { + pc->column = min_col + 1; + } + LOG_FMT(LINDLINE, "%s: set comment on line %d to col %d (orig %d)\n", + __func__, pc->orig_line, pc->column, pc->orig_col); + } + else + { + pc->column += col_delta; + if (pc->column < min_col) + { + pc->column = min_col; + } + } + } + } while ((pc != NULL) && (pc->nl_count == 0)); +} + + +/** + * Starts a new entry + * + * @param frm The parse frame + * @param pc The chunk causing the push + */ +static void indent_pse_push(struct parse_frame& frm, chunk_t *pc) +{ + static int ref = 0; + + /* check the stack depth */ + if (frm.pse_tos < (int)ARRAY_SIZE(frm.pse)) + { + /* Bump up the index and initialize it */ + frm.pse_tos++; + memset(&frm.pse[frm.pse_tos], 0, sizeof(frm.pse[frm.pse_tos])); + + LOG_FMT(LINDPSE, "%4d] OPEN [%d,%s] level=%d\n", + pc->orig_line, frm.pse_tos, get_token_name(pc->type), pc->level); + + frm.pse[frm.pse_tos].type = pc->type; + frm.pse[frm.pse_tos].level = pc->level; + frm.pse[frm.pse_tos].open_line = pc->orig_line; + frm.pse[frm.pse_tos].ref = ++ref; + frm.pse[frm.pse_tos].in_preproc = (pc->flags & PCF_IN_PREPROC) != 0; + } +} + + +/** + * Removes the top entry + * + * @param frm The parse frame + * @param pc The chunk causing the push + */ +static void indent_pse_pop(struct parse_frame& frm, chunk_t *pc) +{ + /* Bump up the index and initialize it */ + if (frm.pse_tos > 0) + { + if (pc != NULL) + { + LOG_FMT(LINDPSE, "%4d] CLOSE [%d,%s] on %s, started on line %d, level=%d/%d\n", + pc->orig_line, frm.pse_tos, + get_token_name(frm.pse[frm.pse_tos].type), + get_token_name(pc->type), + frm.pse[frm.pse_tos].open_line, + frm.pse[frm.pse_tos].level, + pc->level); + } + else + { + LOG_FMT(LINDPSE, " EOF] CLOSE [%d,%s], started on line %d\n", + frm.pse_tos, get_token_name(frm.pse[frm.pse_tos].type), + frm.pse[frm.pse_tos].open_line); + } + frm.pse_tos--; + } +} + + +static int token_indent(c_token_t type) +{ + switch (type) + { + case CT_IF: + case CT_DO: + return(3); + + case CT_FOR: + case CT_ELSE: // wacky, but that's what is wanted + return(4); + + case CT_WHILE: + return(6); + + case CT_SWITCH: + return(7); + + case CT_ELSEIF: + return(8); + + default: + return(0); //cpd.settings[UO_indent_braces].n; + } +} + + +/** + * Change the top-level indentation only by changing the column member in + * the chunk structures. + * The level indicator must already be set. + */ +void indent_text(void) +{ + chunk_t *pc; + chunk_t *next; + chunk_t *prev = NULL; + bool did_newline = true; + int idx; + int vardefcol = 0; + int indent_size = cpd.settings[UO_indent_columns].n; + int tmp; + struct parse_frame frm; + bool in_preproc = false, was_preproc = false; + int indent_column; + int cout_col = 0; // for aligning << stuff + int cout_level = 0; // for aligning << stuff + int parent_token_indent = 0; + + memset(&frm, 0, sizeof(frm)); + + /* dummy top-level entry */ + frm.pse[0].indent = 1; + frm.pse[0].indent_tmp = 1; + frm.pse[0].type = CT_EOF; + + pc = chunk_get_head(); + while (pc != NULL) + { + /* Handle proprocessor transitions */ + was_preproc = in_preproc; + in_preproc = (pc->flags & PCF_IN_PREPROC) != 0; + + if (cpd.settings[UO_indent_brace_parent].b) + { + parent_token_indent = token_indent(pc->parent_type); + } + + /* Clean up after a #define */ + if (!in_preproc) + { + while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc) + { + indent_pse_pop(frm, pc); + } + } + else + { + pf_check(&frm, pc); + + if (!was_preproc) + { + /* Transition into a preproc by creating a dummy indent */ + frm.level++; + indent_pse_push(frm, pc); + + frm.pse[frm.pse_tos].indent = 1 + indent_size; + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + } + } + + if ((cout_col > 0) && + (chunk_is_semicolon(pc) || + (pc->level < cout_level))) + { + cout_col = 0; + cout_level = 0; + } + + /** + * Handle non-brace closures + */ + + int old_pse_tos; + do + { + old_pse_tos = frm.pse_tos; + + /* End anything that drops a level + * REVISIT: not sure about the preproc check + */ + if (!chunk_is_newline(pc) && + !chunk_is_comment(pc) && + ((pc->flags & PCF_IN_PREPROC) == 0) && + (frm.pse[frm.pse_tos].level > pc->level)) + { + indent_pse_pop(frm, pc); + } + + if (frm.pse[frm.pse_tos].level == pc->level) + { + /* process virtual braces closes (no text output) */ + if ((pc->type == CT_VBRACE_CLOSE) && + (frm.pse[frm.pse_tos].type == CT_VBRACE_OPEN)) + { + indent_pse_pop(frm, pc); + frm.level--; + pc = chunk_get_next(pc); + } + + /* End any assign operations with a semicolon on the same level */ + if ((frm.pse[frm.pse_tos].type == CT_ASSIGN) && + (chunk_is_semicolon(pc) || + (pc->type == CT_COMMA) || + (pc->type == CT_BRACE_OPEN))) + { + indent_pse_pop(frm, pc); + } + + /* End any CPP class colon crap */ + if ((frm.pse[frm.pse_tos].type == CT_CLASS_COLON) && + ((pc->type == CT_BRACE_OPEN) || + chunk_is_semicolon(pc))) + { + indent_pse_pop(frm, pc); + } + + /* a case is ended with another case or a close brace */ + if ((frm.pse[frm.pse_tos].type == CT_CASE) && + ((pc->type == CT_BRACE_CLOSE) || + (pc->type == CT_CASE))) + { + indent_pse_pop(frm, pc); + } + + /* a return is ended with a semicolon */ + if ((frm.pse[frm.pse_tos].type == CT_RETURN) && + chunk_is_semicolon(pc)) + { + indent_pse_pop(frm, pc); + } + + /* Close out parens and squares */ + if ((frm.pse[frm.pse_tos].type == (pc->type - 1)) && + ((pc->type == CT_PAREN_CLOSE) || + (pc->type == CT_SPAREN_CLOSE) || + (pc->type == CT_FPAREN_CLOSE) || + (pc->type == CT_SQUARE_CLOSE) || + (pc->type == CT_ANGLE_CLOSE))) + { + indent_pse_pop(frm, pc); + frm.paren_count--; + } + } + } while (old_pse_tos > frm.pse_tos); + + /* Grab a copy of the current indent */ + indent_column = frm.pse[frm.pse_tos].indent_tmp; + + if (!chunk_is_newline(pc) && !chunk_is_comment(pc)) + { + LOG_FMT(LINDPC, " -=[ %.*s ]=- top=%d %s %d/%d\n", + pc->len, pc->str, + frm.pse_tos, + get_token_name(frm.pse[frm.pse_tos].type), + frm.pse[frm.pse_tos].indent_tmp, + frm.pse[frm.pse_tos].indent); + } + + /** + * Handle stuff that can affect the current indent: + * - brace close + * - vbrace open + * - brace open + * - case (immediate) + * - labels (immediate) + * - class colons (immediate) + * + * And some stuff that can't + * - open paren + * - open square + * - assignment + * - return + */ + + if (pc->type == CT_BRACE_CLOSE) + { + if (frm.pse[frm.pse_tos].type == CT_BRACE_OPEN) + { + indent_pse_pop(frm, pc); + frm.level--; + + /* Update the indent_column if needed */ + if (!cpd.settings[UO_indent_braces].b && + (parent_token_indent == 0)) + { + indent_column = frm.pse[frm.pse_tos].indent_tmp; + } + + if ((pc->parent_type == CT_IF) || + (pc->parent_type == CT_ELSE) || + (pc->parent_type == CT_ELSEIF) || + (pc->parent_type == CT_DO) || + (pc->parent_type == CT_WHILE) || + (pc->parent_type == CT_SWITCH) || + (pc->parent_type == CT_FOR)) + { + indent_column += cpd.settings[UO_indent_brace].n; + } + } + } + else if (pc->type == CT_VBRACE_OPEN) + { + frm.level++; + indent_pse_push(frm, pc); + + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size; + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + + /* Always indent on virtual braces */ + indent_column = frm.pse[frm.pse_tos].indent_tmp; + } + else if (pc->type == CT_BRACE_OPEN) + { + frm.level++; + indent_pse_push(frm, pc); + + if (frm.paren_count != 0) + { + /* We are inside ({ ... }) -- indent one tab from the paren */ + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size; + } + else + { + /* Use the prev indent level + indent_size. */ + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size; + + /* If this brace is part of a statement, bump it out by indent_brace */ + if ((pc->parent_type == CT_IF) || + (pc->parent_type == CT_ELSE) || + (pc->parent_type == CT_ELSEIF) || + (pc->parent_type == CT_DO) || + (pc->parent_type == CT_WHILE) || + (pc->parent_type == CT_SWITCH) || + (pc->parent_type == CT_FOR)) + { + if (parent_token_indent != 0) + { + frm.pse[frm.pse_tos].indent += parent_token_indent - indent_size; + } + else + { + frm.pse[frm.pse_tos].indent += cpd.settings[UO_indent_brace].n; + indent_column += cpd.settings[UO_indent_brace].n; + } + } + else if (pc->parent_type == CT_CASE) + { + /* The indent_case_brace setting affects the parent CT_CASE */ + frm.pse[frm.pse_tos].indent_tmp += cpd.settings[UO_indent_case_brace].n; + frm.pse[frm.pse_tos].indent += cpd.settings[UO_indent_case_brace].n; + } + else if ((pc->parent_type == CT_CLASS) && !cpd.settings[UO_indent_class].b) + { + frm.pse[frm.pse_tos].indent -= indent_size; + } + else if ((pc->parent_type == CT_NAMESPACE) && !cpd.settings[UO_indent_namespace].b) + { + frm.pse[frm.pse_tos].indent -= indent_size; + } + } + + if ((pc->flags & PCF_DONT_INDENT) != 0) + { + frm.pse[frm.pse_tos].indent = pc->column; + indent_column = pc->column; + } + else + { + /** + * If there isn't a newline between the open brace and the next + * item, just indent to wherever the next token is. + * This covers this sort of stuff: + * { a++; + * b--; }; + */ + next = chunk_get_next_ncnnl(pc); + if (!chunk_is_newline_between(pc, next)) + { + frm.pse[frm.pse_tos].indent = next->column; + } + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + frm.pse[frm.pse_tos].open_line = pc->orig_line; + + /* Update the indent_column if needed */ + if (cpd.settings[UO_indent_braces].n || + (parent_token_indent != 0)) + { + indent_column = frm.pse[frm.pse_tos].indent_tmp; + } + } + } + else if (pc->type == CT_CASE) + { + /* Start a case - indent UO_indent_switch_case from the switch level */ + tmp = frm.pse[frm.pse_tos].indent + cpd.settings[UO_indent_switch_case].n; + + indent_pse_push(frm, pc); + + frm.pse[frm.pse_tos].indent = tmp; + frm.pse[frm.pse_tos].indent_tmp = tmp - indent_size; + + /* Always set on case statements */ + indent_column = frm.pse[frm.pse_tos].indent_tmp; + } + else if (pc->type == CT_LABEL) + { + /* Labels get sent to the left or backed up */ + if (cpd.settings[UO_indent_label].n > 0) + { + indent_column = cpd.settings[UO_indent_label].n; + } + else + { + indent_column = frm.pse[frm.pse_tos].indent + + cpd.settings[UO_indent_label].n; + } + } + else if (pc->type == CT_CLASS_COLON) + { + /* just indent one level */ + indent_pse_push(frm, pc); + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size; + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + + indent_column = frm.pse[frm.pse_tos].indent_tmp; + + if (cpd.settings[UO_indent_class_colon].b) + { + prev = chunk_get_prev(pc); + if (chunk_is_newline(prev)) + { + frm.pse[frm.pse_tos].indent += 2; + /* don't change indent of current line */ + } + } + } + else if ((pc->type == CT_PAREN_OPEN) || + (pc->type == CT_SPAREN_OPEN) || + (pc->type == CT_FPAREN_OPEN) || + (pc->type == CT_SQUARE_OPEN) || + (pc->type == CT_ANGLE_OPEN)) + { + /* Open parens and squares - never update indent_column */ + indent_pse_push(frm, pc); + frm.pse[frm.pse_tos].indent = pc->column + pc->len; + + if (cpd.settings[UO_indent_func_call_param].b && + (pc->type == CT_FPAREN_OPEN) && + (pc->parent_type == CT_FUNC_CALL)) + { + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + indent_size; + } + + if ((chunk_is_str(pc, "(", 1) && !cpd.settings[UO_indent_paren_nl].b) || + (chunk_is_str(pc, "[", 1) && !cpd.settings[UO_indent_square_nl].b)) + { + next = chunk_get_next_nc(pc); + if (chunk_is_newline(next)) + { + int sub = 1; + if (frm.pse[frm.pse_tos - 1].type == CT_ASSIGN) + { + sub = 2; + } + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - sub].indent + indent_size; + } + } + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + frm.paren_count++; + } + else if (pc->type == CT_ASSIGN) + { + /** + * if there is a newline after the '=', just indent one level, + * otherwise align on the '='. + * Never update indent_column. + */ + next = chunk_get_next(pc); + if (next != NULL) + { + indent_pse_push(frm, pc); + if (chunk_is_newline(next)) + { + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent_tmp + indent_size; + } + else + { + frm.pse[frm.pse_tos].indent = pc->column + pc->len + 1; + } + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + } + } + else if (pc->type == CT_RETURN) + { + /* don't count returns inside a () or [] */ + if (pc->level == pc->brace_level) + { + indent_pse_push(frm, pc); + frm.pse[frm.pse_tos].indent = frm.pse[frm.pse_tos - 1].indent + pc->len + 1; + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos - 1].indent; + } + } + else if (chunk_is_str(pc, "<<", 2)) + { + if (cout_col == 0) + { + cout_col = pc->column; + cout_level = pc->level; + } + } + else + { + /* anything else? */ + } + + + /** + * Indent the line if needed + */ + if (did_newline && !chunk_is_newline(pc) && (pc->len != 0)) + { + /** + * Check for special continuations. + * Note that some of these could be done as a stack item like + * everything else + */ + + prev = chunk_get_prev_ncnnl(pc); + if ((pc->type == CT_MEMBER) || + (pc->type == CT_DC_MEMBER) || + ((prev != NULL) && + ((prev->type == CT_MEMBER) || + (prev->type == CT_DC_MEMBER)))) + { + tmp = cpd.settings[UO_indent_member].n + indent_column; + LOG_FMT(LINDENT, "%s: %d] member => %d\n", + __func__, pc->orig_line, tmp); + reindent_line(pc, tmp); + } + else if (chunk_is_str(pc, "<<", 2) && (cout_col > 0)) + { + LOG_FMT(LINDENT, "%s: %d] cout_col => %d\n", + __func__, pc->orig_line, cout_col); + reindent_line(pc, cout_col); + } + else if ((vardefcol > 0) && + (pc->type == CT_WORD) && + ((pc->flags & PCF_VAR_DEF) != 0) && + (prev != NULL) && (prev->type == CT_COMMA)) + { + LOG_FMT(LINDENT, "%s: %d] Vardefcol => %d\n", + __func__, pc->orig_line, vardefcol); + reindent_line(pc, vardefcol); + } + else if ((pc->type == CT_STRING) && (prev->type == CT_STRING) && + cpd.settings[UO_indent_align_string].b) + { + LOG_FMT(LINDENT, "%s: %d] String => %d\n", + __func__, pc->orig_line, prev->column); + reindent_line(pc, prev->column); + } + else if (chunk_is_comment(pc)) + { + LOG_FMT(LINDENT, "%s: %d] comment => %d\n", + __func__, pc->orig_line, frm.pse[frm.pse_tos].indent_tmp); + indent_comment(pc, frm.pse[frm.pse_tos].indent_tmp); + } + else if (pc->type == CT_PREPROC) + { + /* Preprocs are always in column 1. See indent_preproc() */ + if (pc->column != 1) + { + reindent_line(pc, 1); + } + } + else + { + if (pc->column != indent_column) + { + LOG_FMT(LINDENT, "%s: %d] indent => %d [%.*s]\n", + __func__, pc->orig_line, indent_column, pc->len, pc->str); + reindent_line(pc, indent_column); + } + } + did_newline = false; + } + + /** + * Handle variable definition continuation indenting + */ + if ((pc->type == CT_WORD) && + ((pc->flags & PCF_IN_FCN_DEF) == 0) && + ((pc->flags & PCF_VAR_1ST_DEF) == PCF_VAR_1ST_DEF)) + { + vardefcol = pc->column; + } + if (chunk_is_semicolon(pc) || + ((pc->type == CT_BRACE_OPEN) && (pc->parent_type == CT_FUNCTION))) + { + vardefcol = 0; + } + + /* if we hit a newline, reset indent_tmp */ + if (chunk_is_newline(pc) || + (pc->type == CT_COMMENT_MULTI) || + (pc->type == CT_COMMENT_CPP)) + { + frm.pse[frm.pse_tos].indent_tmp = frm.pse[frm.pse_tos].indent; + + /** + * Handle the case of a multi-line #define w/o anything on the + * first line (indent_tmp will be 1 or 0) + */ + if ((pc->type == CT_NL_CONT) && + (frm.pse[frm.pse_tos].indent_tmp <= indent_size)) + { + frm.pse[frm.pse_tos].indent_tmp = indent_size + 1; + } + + /* Get ready to indent the next item */ + did_newline = true; + } + + if (!chunk_is_comment(pc) && !chunk_is_newline(pc)) + { + prev = pc; + } + pc = chunk_get_next(pc); + } + + /* Throw out any stuff inside a preprocessor - no need to warn */ + while ((frm.pse_tos > 0) && frm.pse[frm.pse_tos].in_preproc) + { + indent_pse_pop(frm, pc); + } + + for (idx = 1; idx <= frm.pse_tos; idx++) + { + LOG_FMT(LWARN, "%s:%d Unmatched %s\n", + cpd.filename, frm.pse[idx].open_line, + get_token_name(frm.pse[idx].type)); + cpd.error_count++; + } +} + +/** + * returns true if forward scan reveals only single newlines or comments + * stops when hits code + * false if next thing hit is a closing brace, also if 2 newlines in a row + */ + + +static bool single_line_comment_indent_rule_applies(chunk_t *start) +{ + chunk_t *pc = start; + int nl_count = 0; + if (!chunk_is_single_line_comment(pc)) + { + return(false); + } + /* scan forward, if only single newlines and comments before next line of code, we want to apply */ + while ((pc = chunk_get_next(pc)) != NULL) + { + if (chunk_is_newline(pc)) + { + if (nl_count > 0 || pc->nl_count > 1) + { + return(false); + } + + nl_count++; + } + else + { + nl_count = 0; + if (!chunk_is_single_line_comment(pc)) + { + /* here we check for things to run into that we wouldn't want to indent the comment for */ + /* for example, non-single line comment, closing brace */ + if (chunk_is_comment(pc) || chunk_is_closing_brace(pc)) + { + return(false); + } + + return(true); + } + } + } + + return(false); +} + +/** + * REVISIT: This needs to be re-checked, maybe cleaned up + * + * Indents comments in a (hopefully) smart manner. + * + * There are two type of comments that get indented: + * - stand alone (ie, no tokens on the line before the comment) + * - trailing comments (last token on the line apart from a linefeed) + * + note that a stand-alone comment is a special case of a trailing + * + * The stand alone comments will get indented in one of three ways: + * - column 1: + * + There is an empty line before the comment AND the indent level is 0 + * + The comment was originally in column 1 + * + * - Same column as trailing comment on previous line (ie, aligned) + * + if originally within TBD (3) columns of the previous comment + * + * - syntax indent level + * + doesn't fit in the previous categories + * + * Options modify this behavior: + * - keep original column (don't move the comment, if possible) + * - keep relative column (move out the same amount as first item on line) + * - fix trailing comment in column TBD + * + * @param pc The comment, which is the first item on a line + * @param col The column if this is to be put at indent level + */ +static void indent_comment(chunk_t *pc, int col) +{ + chunk_t *nl; + chunk_t *prev; + + LOG_FMT(LCMTIND, "%s: line %d, col %d, level %d: ", __func__, + pc->orig_line, pc->orig_col, pc->level); + + /* force column 1 comment to column 1 if not changing them */ + if ((pc->orig_col == 1) && !cpd.settings[UO_indent_col1_comment].b) + { + LOG_FMT(LCMTIND, "rule 1 - keep in col 1\n"); + pc->column = 1; + return; + } + + nl = chunk_get_prev(pc); + + /* outside of any expression or statement? */ + if (pc->level == 0) + { + if ((nl != NULL) && (nl->nl_count > 1)) + { + LOG_FMT(LCMTIND, "rule 2 - level 0, nl before\n"); + pc->column = 1; + return; + } + } + + prev = chunk_get_prev(nl); + if (chunk_is_comment(prev) && (nl->nl_count == 1)) + { + int coldiff = prev->orig_col - pc->orig_col; + + if ((coldiff <= 3) && (coldiff >= -3)) + { + pc->column = prev->column; + LOG_FMT(LCMTIND, "rule 3 - prev comment, coldiff = %d, now in %d\n", + coldiff, pc->column); + return; + } + } + /* check if special single line comment rule applies */ + if (cpd.settings[UO_indent_sing_line_comments].n > 0 && single_line_comment_indent_rule_applies(pc)) + { + pc->column = col + cpd.settings[UO_indent_sing_line_comments].n; + LOG_FMT(LCMTIND, "rule 4 - single line comment indent, now in %d\n", pc->column); + return; + } + LOG_FMT(LCMTIND, "rule 5 - fall-through, stay in %d\n", col); + + pc->column = col; +} + + +/** + * Put spaces on either side of the preproc (#) symbol. + * This is done by pointing pc->str into pp_str and adjusting the + * length. + */ +void indent_preproc(void) +{ + chunk_t *pc; + chunk_t *next; + int pp_level; + int pp_level_sub = 0; + int tmp; + + /* Define a string of 16 spaces + # + 16 spaces */ + static const char *pp_str = " # "; + static const char *alt_str = " %: "; + + /* Scan to see if the whole file is covered by one #ifdef */ + int stage = 0; + + for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc)) + { + if (chunk_is_comment(pc) || chunk_is_newline(pc)) + { + continue; + } + + if (stage == 0) + { + /* Check the first PP, make sure it is an #if type */ + if (pc->type != CT_PREPROC) + { + break; + } + next = chunk_get_next(pc); + if ((next == NULL) || (next->type != CT_PP_IF)) + { + break; + } + stage = 1; + } + else if (stage == 1) + { + /* Scan until a PP at level 0 is found - the close to the #if */ + if ((pc->type == CT_PREPROC) && + (pc->pp_level == 0)) + { + stage = 2; + } + continue; + } + else if (stage == 2) + { + /* We should only see the rest of the preprocessor */ + if ((pc->type == CT_PREPROC) || + ((pc->flags & PCF_IN_PREPROC) == 0)) + { + stage = 0; + break; + } + } + } + + if (stage == 2) + { + LOG_FMT(LINFO, "The whole file is covered by a #IF\n"); + pp_level_sub = 1; + } + + for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc)) + { + if (pc->type != CT_PREPROC) + { + continue; + } + + if (pc->column != 1) + { + /* Don't handle preprocessors that aren't in column 1 */ + LOG_FMT(LINFO, "%s: Line %d doesn't start in column 1 (%d)\n", + __func__, pc->orig_line, pc->column); + continue; + } + + /* point into pp_str */ + if (pc->len == 2) + { + /* alternate token crap */ + pc->str = &alt_str[16]; + } + else + { + pc->str = &pp_str[16]; + } + + pp_level = pc->pp_level - pp_level_sub; + if (pp_level < 0) + { + pp_level = 0; + } + else if (pp_level > 16) + { + pp_level = 16; + } + + /* Note that the indent is removed by default */ + if ((cpd.settings[UO_pp_indent].a & AV_ADD) != 0) + { + /* Need to add some spaces */ + pc->str -= pp_level; + pc->len += pp_level; + } + else if (cpd.settings[UO_pp_indent].a == AV_IGNORE) + { + tmp = (pc->orig_col <= 16) ? pc->orig_col - 1 : 16; + pc->str -= tmp; + pc->len += tmp; + } + + /* Add spacing by adjusting the length */ + if ((cpd.settings[UO_pp_space].a & AV_ADD) != 0) + { + pc->len += pp_level; + } + + next = chunk_get_next(pc); + if (next != NULL) + { + reindent_line(next, pc->len + 1); + } + + LOG_FMT(LPPIS, "%s: Indent line %d to %d (len %d, next->col %d)\n", + __func__, pc->orig_line, pp_level, pc->len, next->column); + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp new file mode 100644 index 00000000..6cd779a3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-inside-ternary-operator.cpp @@ -0,0 +1,125 @@ +(tmp + ? chunk_is_newline(tmp) +? "newline" + : chunk_is_comment(tmp) + ? "comment" + : "other" + : chunk_is_newline(tmp) + ? "newline" + : chunk_is_comment(tmp) + ? "comment" + : "other"); + +a +? b + + c + : d + + e; + + return + outerFlag + ? RadioButton + : innerFlag + ? Badge + : nil; + +x = outerFlag + ? RadioButton( + arg1 + ) + : Checkbutton + .arg2; + + Builder + .child( + outerFlag + ? RadioButton( + buttonArg + ) + : innerFlag + ? Badge + .component( + LabelText) + : nil + ); + + +accessoryType + ? ConKSC1{} + : flag == false + ? ConKSC2{} + .build() + : flag == true + ? ConKSC3{} + .build() + : ConKSC4{} + .build(); + +options.meta == nil + ? metaCmpnt + : CBuilder() +.spacing(4) + .subCmpnt( + CBuilder() + .build()); + +options.meta == nil + ? CBuilder() + .spacing(4) +.subCmpnt( + CBuilder() +.build() +) +: Builder + .spacing; + + options == nil ? CBuilder() + .spacing(6) +: Builder + .spacing; + + options == nil ? CBuilder() + .spacing(6) : Builder + .spacing; + +flag + ? isChild + ? TypeBack +: TypeCancel + : nil; + + +func something() { + if (flag) { + x == flag + ? Builder + .spacing + : Builder + .spacing; + } +} + + +flag1 +? ( flag2 + ? ( flag3 + ? result1 + : result2 ) + : ( result3 ) + ) + : ( flag5 + ? ( flag + ? result4 + : result5) + : ( flag6 + ? result6 + : ( result7 ) + ) + ); + + +flag1 +? result1 + : ( + flag5 + ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp new file mode 100644 index 00000000..78a924f4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-misc.cpp @@ -0,0 +1,59 @@ +struct S +{ +int one, two; +S(int i = 1) +{ +one = i; +two = i + i; +} +bool check() const +{ +return one == 1; +} +}; + +struct S +{ +enum { +twentythree = 23, +fortytwoseven = 427 +}; +int one, two; +S(int i = 1) +{ +one = i; +two = i + i; +} +bool check() const +{ +return one == 1; +} +}; + +static uint jhash(K x) + { + ubyte *k; + uint a, + b, + c; + + uint +a, + b, + c; + + len = x.length; +} + +const char *token_names[] = +{ + [CT_POUND] = "POUND", + [CT_PREPROC] = "PREPROC", +}; + +struct whoopee * +foo4( + int param1, + int param2, + char *param2 + ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp new file mode 100644 index 00000000..79a7ad65 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent-off.cpp @@ -0,0 +1,25 @@ +struct X { +void operator-(int); +void operator+(int); +void operator()(); +}; +/* *INDENT-OFF* */ + struct Y { + void operator-(int){} + + + void operator+(int){} \ + void operator()(){} + + void func() { + auto x = " test\t ... ???";} + }; +/* *INDENT-ON* */ +struct Y { +void operator-(int){} +void operator+(int){} +void operator()(){} + void func() { + auto x = " test\t ... ???";} +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp new file mode 100644 index 00000000..a8c4a514 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent.cpp @@ -0,0 +1,20 @@ +int a () +{ + double a_very_long_variable = test (foobar1, + foobar5); +//3456789=123456789=123456789=123456789= + + double a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa + + asdfasdfasdf - asdfasdf + 56598; +//3456789=123456789=123456789=123456789= + + a_other_very_long = asdfasdfasdfasdfasdf + asdfasfafasdfa + + asdfasdfasdf - asdfasdf + 56598; +//3456789=123456789=123456789=123456789= + + testadsfa (dfasdf, + aaafsdfa); +//3456789=123456789=123456789=123456789= + + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h new file mode 100644 index 00000000..c5b39b37 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_braces_no.h @@ -0,0 +1,24 @@ + + +class MyClass +{ +public: + +struct something +{ +int one; +int two; +} + +MyClass() +{ +} + +void oneFunction() +{ +if (1 == 0) +{ +instructions; +} +} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp new file mode 100644 index 00000000..d417b5be --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_func.cpp @@ -0,0 +1,10 @@ +#include <string> + +extern char* externBufferWithAVeryLongName; +extern unsigned int externBufferSizeWithLongName; + +std::string foo() +{ + return std::string{ externBufferWithAVeryLongName + , externBufferSizeWithLongName }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp new file mode 100644 index 00000000..8e01afc6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comma_brace_glob.cpp @@ -0,0 +1,7 @@ +#include <string> + +extern char* externBufferWithAVeryLongName; +extern unsigned int externBufferSizeWithLongName; + +std::string foo{ externBufferWithAVeryLongName + , externBufferSizeWithLongName }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp new file mode 100644 index 00000000..7ddfacbf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_comment_align_thresh.cpp @@ -0,0 +1,153 @@ +// First comment + // Second comment + + // First comment +// Second comment + +// Issue #1134 +class MyClass : public BaseClass +{ + //@{ BaseClass interface +#if VERY_LONG_AND_COMPLICATED_DEFINE + void foo(); +#endif // VERY_LONG_AND_COMPLICATED_DEFINE + //@} +}; + +// Issue #1287 +void foo() +{ +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + if (error != 0) + { + } + +#if defined(SUPPORT_FEATURE) + bar(); +#endif // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + +# if defined(SUPPORT_FEATURE) + bar(); +# endif // SUPPORT_FEATURE + // SUPPORT_FEATURE + // Handle error + // Handle error + if (error != 0) + { + } + + #if defined(SUPPORT_FEATURE) + bar(); + #endif /* SUPPORT_FEATURE + SUPPORT_FEATURE */ + // Handle error + // Handle error + if (error != 0) + { + } +} + +// ----- Some namespace scope -------------------------------------------------- +// ----- FooNamespace scope ---------------------------------------------------- +namespace FooNamespace +{ +// ----- Some classes scope ---------------------------------------------------- +// ----- FooClass scope -------------------------------------------------------- +class FooClass +{ + using FooUsing = FooTemplate< + param1, + param2 + >; // FooTemplate + // Foo description + void foo() + { + if (a == b) + { +// Col1 comment + // Col1 comment + // Col1 comment + // Baz description + baz(); // Baz trailing comment begin + // Baz trailing comment ... + // Baz trailing comment end + } // if (a == b) + // Bar description begin + // Bar description ... + // Bar description end + bar( + a, + b + ); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + /*! Baz description begin + *Baz description ... + * Baz description end */ + baz(a, + b); /* Baz trailing comment begin + Baz trailing comment ... + Baz trailing comment end */ + // Bar description + bar(); // bar trailing comment begin + // bar trailing comment ... + // Baz trailing comment end + + // Baz description + baz(); + } + void bar(); + // Many methods + void baz(); +}; // FooClass +// ----- FooClass scope -------------------------------------------------------- + +// Many classes + // Many classes + // Many classes + +class BazClass +{ + void foo(); + +// Many methods + // Many methods + // Many methods + +// Overrides + // Overrides + //Overrides +protected: + // Bar description + void baz(); + //Overrides +}; // BazClass trailing comment begin + // BazClass trailing comment ... + // BazClass trailing comment end +// ----- Some classes scope ---------------------------------------------------- +} // FooNamespace trailing comment begin + // FooNamespace trailing comment end +// ----- FooNamespace scope ---------------------------------------------------- +// BarNamespace description +namespace BarNamespace +{ +} // namespace BarNamespace +// ----- Some namespace scope -------------------------------------------------- diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp new file mode 100644 index 00000000..d9fefe24 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_init.cpp @@ -0,0 +1,12 @@ +struct MyClass : public Foo, + private Bar { + MyClass(int a, int b, int c) + : m_a(a), m_b(b), + m_c(c) {} +private : + int m_a, m_b, m_c; +}; + +struct TheirClass +: public Foo, +private Bar {}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp new file mode 100644 index 00000000..4fbd1b4c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_ctor_members_twice.cpp @@ -0,0 +1,5 @@ +Foo::Foo() : + Base(12), + mValue(24) { + func(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h new file mode 100644 index 00000000..f97bd324 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace.h @@ -0,0 +1,32 @@ +namespace ns1 { + + void bar1(void); + + class foo1 + { + int i1; + }; +} + +namespace ns2 +{ + + void bar2(void); + + class foo2 + { + int i2; + }; +} + +namespace +{ + + void bar3(void); + class foo3 + { + int i3; + }; + +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h new file mode 100644 index 00000000..db2ce47d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace2.h @@ -0,0 +1,13 @@ +namespace ns1 { +namespace ns2 { +namespace ns3{ + + using namespace foo::os; + + class foo2 + { + int i2; + }; + } + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h new file mode 100644 index 00000000..97d57444 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_namespace_single_indent.h @@ -0,0 +1,100 @@ +namespace ns1 { + namespace ns2 { + namespace ns3 { + void a(); + } + } +} + +extern "C" { + namespace ns1 { + namespace ns2 { + namespace ns3 { + void b(); + } + } + } +} + +namespace ns1 { + extern "C" { + namespace ns2 { + namespace ns3 { + void c(); + } + } + } +} + +namespace ns1 { + namespace ns2 { + extern "C" { + namespace ns3 { + void d(); + } + } + } +} + +namespace ns1 { + namespace ns2 { + namespace ns3 { + extern "C" { + void e(); + } + } + } +} + +#define M1(ns1, ns2, ns3, f) \ + namespace ns1 { \ + namespace ns2 { \ + namespace ns3 { \ + void f(); \ + } \ + } \ + } + +#define M2(ns1, ns2, ns3, f) \ + extern "C" { \ + namespace ns1 { \ + namespace ns2 { \ + namespace ns3 { \ + void b(); \ + } \ + } \ + } \ + } + +#define M3(ns1, ns2, ns3, f) \ + namespace ns1 { \ + extern "C" { \ + namespace ns2 { \ + namespace ns3 { \ + void c(); \ + } \ + } \ + } \ + } + +#define M4(ns1, ns2, ns3, f) \ + namespace ns1 { \ + namespace ns2 { \ + extern "C" { \ + namespace ns3 { \ + void d(); \ + } \ + } \ + } \ + } + +#define M5(ns1, ns2, ns3, f) \ + namespace ns1 { \ + namespace ns2 { \ + namespace ns3 { \ + extern "C" { \ + void e(); \ + } \ + } \ + } \ + } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp new file mode 100644 index 00000000..58e24797 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_off_after_return.cpp @@ -0,0 +1,60 @@ +int foo1() +{ + return std::pair<int, int>{ + 1, 2 + }.first; +} + +int foo2() +{ + return + int{3} & 2; +} + +int foo3() +{ + constexpr static int x = 3; + return + decltype(x){x} & 2; +} + +int foo4() +{ + return + new Type(); +} + +int foo5() +{ + return + veryLongMethodCall( + arg1, + longMethodCall( + methodCall( + arg2, arg3 + ), arg4 + ) + ); +} + +int foo6() +{ + auto my_lambda = [] () + { + return 1 + + 2 + + 3; + + }; +} + +template<typename U> +U * +find(const std::string &name = "") const +{ + return find<U>([&name] (auto *pComposite) + { + return name.empty() || + pComposite->getName() == name; + }); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp new file mode 100644 index 00000000..c194141b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_param.cpp @@ -0,0 +1,4 @@ +extern int select(int __nfds, fd_set * __restrict __readfds, + fd_set * __restrict __writefds, + fd_set * __restrict __exceptfds, + struct timeval * __restrict __timeout); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp new file mode 100644 index 00000000..96b38fba --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_call.cpp @@ -0,0 +1,8 @@ +SomeClass::SomeClass()
+{
+ SomeFunction
+ (
+ aTest,
+ aResult
+ );
+}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp new file mode 100644 index 00000000..ff8c3e44 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_decl.cpp @@ -0,0 +1,8 @@ +class SomeClass {
+public:
+void SomeFunction
+(
+ int const aTest,
+ int const aResult
+);
+}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp new file mode 100644 index 00000000..703e0422 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_paren_after_func_def.cpp @@ -0,0 +1,12 @@ +class SomeClass
+{
+public:
+void SomeFunction
+(
+ int const aTest,
+ int const aResult
+)
+{
+ DoSomeStuff();
+}
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp new file mode 100644 index 00000000..54684fa7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_shift.cpp @@ -0,0 +1,139 @@ +// We want simple 4-space indentation for each nesting "level". + +// cannot find a way to tell uncrustify to indent the line with parenthesis +int case2() { + + if (condition) { + // some code here + } + + std::out << + "hello " << "world " << + (who ? "and " : "or ") << + "all " << + "others" << ";" << std::endl; + + // and + + if (condition) { + // some code here + } + + std::out << + "hello " << "world " << + ("and ") << + "all " << + "others" << ";" << std::endl; + + if (cond) + std::out << "hi"; + +if (cond) +std::out +<< "hi" +<< "and" +<< "more" +; + +switch (var) { + case 0: +log() << 5 +<< 5; + break; +} + +#if 0 + out + << 5; +#endif + + return log + >> var + >> second + ; +} + + +// uncrustify aligns (with the << on the first line) instead of indenting +void case3() +{ + + if (condition1) { + + if (condition2) { + + std::out << "hello " + << "world " + << (who ? "and " : "or ") + << "all " + << "others" << ";" << std::endl; + + } + } + + // this often works better, but has problems with parentheses: + + if (condition1) { + if (condition2) { + std::out << "hello " << + "world " << + (who ? "and " : "or ") << + "all " << + "others" << ";" << std::endl; + } + } +} + +// uncrustify does not indent >> at all! +void case4() +{ + if (condition) { + // some code here + } + + std::in >> a + >> b + >> (who ? c : d) >> + >> e; + + // and + + if (condition1) { + + if (condition2) { + std::in >> a >> + b >> + (who ? c : d) >> + e; + } + } +} + +void foo() { + + if (head()) + os << "HEAD,"; + else + if (tail()) + os << "TAIL,"; + + if (a >= 0 && + b <= 0) + cerr << "it is"; +} + +int list[] = { + 1, +2, + 1 << 5, + 1 << 6 +}; + +void check() { + ostream &os = Comment(1) << "error: " << workerName << + " terminated by signal " << WTERMSIG(exitStatus); + + return theAddr.addrN().family() == AF_INET6 ? + (theAddr.octet(idx * 2) << 8) + theAddr.octet(idx * 2 + 1) : + theAddr.octet(idx); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp new file mode 100644 index 00000000..1b76e218 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_switch_pp.cpp @@ -0,0 +1,20 @@ +// Example for not indenting preprocesser statements inside switch statements
+switch(...)
+{
+case 1:
+case 2:
+{
+int v;
+...
+}
+break;
+
+#if (USE_FIVE)
+case 3:
+doFive();
+break;
+#endif
+
+default:
+break;
+}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp new file mode 100644 index 00000000..394cfb63 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def.cpp @@ -0,0 +1,7 @@ +void function(){ +int n; +float f; +anotherFunction(); +char foo; +somethingelse(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp new file mode 100644 index 00000000..d273ae52 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/indent_var_def_cont.cpp @@ -0,0 +1,16 @@ +int +a, b, c; + +int d, +e, f; + +void bar(void) +{ + struct foobar +a = { 'x', 0 }; + struct foobar +b = { 'y', 2 }, +c = { 'z', 4 }; + struct foobar d = { 'y', 2 }, +e = { 'z', 4 }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp new file mode 100644 index 00000000..70451ac4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init-list-call.cpp @@ -0,0 +1 @@ +auto x = foo{0}(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h new file mode 100644 index 00000000..ff1dcc9b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/init_align.h @@ -0,0 +1,22 @@ +struct file_lang languages[] = +{ + { ".c", "C", LANG_C }, + { ".cpp", "CPP", LANG_CPP }, + { ".d", "D", LANG_D }, + { ".cs", "CS", LANG_CS }, + { ".vala", "VALA", LANG_VALA }, + { ".java", "JAVA", LANG_JAVA }, + { ".pawn", "PAWN", LANG_PAWN }, + { ".p", "", LANG_PAWN }, + { ".sma", "", LANG_PAWN }, + { ".inl", "", LANG_PAWN }, + { ".h", "", LANG_CPP }, + { ".cxx", "", LANG_CPP }, + { ".hpp", "", LANG_CPP }, + { ".hxx", "", LANG_CPP }, + { ".cc", "", LANG_CPP }, + { ".di", "", LANG_D }, + { ".m", "OC", LANG_OC }, + { ".sqc", "", LANG_C }, // embedded SQL +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp new file mode 100644 index 00000000..83188d77 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/initlist_leading_commas.cpp @@ -0,0 +1,5 @@ +MyClass::MyClass(Type *var1, Type *var2) : + BaseClass(parent) + , mVar1(var1) + , mVar2(var2) { +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp new file mode 100644 index 00000000..bc039e18 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/interface-keyword-in-cpp.cpp @@ -0,0 +1,62 @@ +#include "sdkconfig.h" + +#include <fs/nvs_storage.hpp> +#include <network/interface.hpp> + +extern "C" void app_main (void) { + fs::nvs_storage ::initialize (); + network::interface ::initialize (); +} + +#include "sdkconfig.h" +#include "esp_wifi.h" +#include "network/interface.hpp" + + +using namespace network; +void interface ::initialize () { + tcpip_adapter_init (); +} + +// ---------------------------------------- + +namespace A { + class interface { + public: + interface() { + } + + ~interface() { + } + + void foo() {} + }; +} + +namespace B { + class interface { + public: + interface(); + ~interface(); + void foo(); + }; + + inline interface :: interface() {} + inline interface :: ~interface() {} + inline void interface :: foo() {} +} + +namespace C { + class interface { + public: + interface(); + ~interface(); + void foo(); + }; + + interface :: interface() {} + interface :: ~interface() {} + void interface :: foo() {} +} + +interface :: external_iterface; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp new file mode 100644 index 00000000..e3be4d50 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1752.cpp @@ -0,0 +1,3 @@ +#define WARN_IF(EXP) \ + do { if (EXP) \ + fprintf (stderr, "Warning: " #EXP "\n"); } \ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp new file mode 100644 index 00000000..4eea46e0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1778.cpp @@ -0,0 +1,7 @@ +using x = Foo::foo_t; + +using a1 = decltype( &Foo::operator() ); +using a2 = Bar<decltype( &Foo::operator() )>; + +using b1 = decltype( *Foo::y ); +using b2 = Bar<decltype( *Foo::y )>; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp new file mode 100644 index 00000000..c12b83d0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1782.cpp @@ -0,0 +1,20 @@ +using a1 = decltype(bar()); +using b1 = decltype(bar<int>()); +using c1 = decltype(foo::bar<int>()); +using d1 = decltype(*(bar<int>())); +using e1 = decltype(*(foo::bar<int>())); + +using a2 = decltype( bar ( ) ); +using b2 = decltype( bar < int > ( ) ); +using c2 = decltype( foo::bar < int > ( ) ); +using d2 = decltype( *( bar < int > ( ) ) ); +using e2 = decltype( *( foo::bar < int > ( ) ) ); + +using a3 = decltype( bar ( 0 ) ); +using b3 = decltype( bar < int > ( 0 ) ); +using c3 = decltype( foo::bar < int > ( 0 ) ); +using d3 = decltype( *( bar < int > ( 0 ) ) ); +using e3 = decltype( *( foo::bar < int > ( 0 ) ) ); + +using x1 = decltype((0)); +using x2 = decltype( ( 0 ) ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp new file mode 100644 index 00000000..2923a4a2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1804.cpp @@ -0,0 +1,2 @@ +void foo1(int(&x)[2]); +void foo2( int ( & x ) [ 2 ] ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp new file mode 100644 index 00000000..4c819605 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1916.cpp @@ -0,0 +1,8 @@ +int x; + +decltype (x) y; +decltype (x) z = 5; + +decltype (char{5}) a = 'a'; + +using x_t = decltype (x) ; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp new file mode 100644 index 00000000..187065d6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1919.cpp @@ -0,0 +1,15 @@ +void foo() +{ + int a; + vector<unsigned> b; + long c; + decltype(a) d; +} + +void bar() +{ + int a; + std::vector<unsigned> b; + long c; + decltype(a) d; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp new file mode 100644 index 00000000..9682da68 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1946.cpp @@ -0,0 +1,5 @@ +namespace foo +{ +long_type_name_t &foo1(); +foo_t &foo2(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp new file mode 100644 index 00000000..4e5685a1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_1985.cpp @@ -0,0 +1,44 @@ +// Don't break a prototype followed by a one-liner +class foo1 +{ +foo1(); +foo1(int) {} +int bar(); +int bar(int) { return 0; } +foo1(long); +foo1(short) {} +int x; +}; + +// Don't break a one-liner followed by a prototype +class foo2 +{ +foo2(int) {} +foo2(); +int bar(int) { return 0; } +int bar(); +foo2(short) {} +foo2(long); +int x; +}; + +// Do break a prototype followed by a multi-line definition +class foo3 +{ +foo3(); +foo3(int) +{ + x = 0; +} +int bar(); +int bar(int) +{ + return 0; +} +foo3(long); +foo3(short) +{ + x = 0; +} +int x; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp new file mode 100644 index 00000000..aa324f2e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2000.cpp @@ -0,0 +1,14 @@ +int bar; +// blank line should be inserted before this comment +vector<int> foo() +{ + return {}; +} +// blank line should be inserted before this comment, not after +template<> +volatile +int x:: +foo() +{ + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp new file mode 100644 index 00000000..39b9446d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2001.cpp @@ -0,0 +1,2 @@ +extern int foo(); +extern int foo(size_t); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp new file mode 100644 index 00000000..8c582cf9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-1.cpp @@ -0,0 +1,48 @@ +if(x)[[likely]]{} +if(x) +[[unlikely]] +{} + +g(); + +if(x)[[likely]]l(); +if(x) +[[unlikely]] +l(); + +g(); + +if(x) +[[unlikely]] +l1(); +else +l2(); + +g(); + +if(x) +#if __has_cpp_attribute(likely) +[[likely]] +#endif + return false; +else + return true; + +g(); + +while(true)[[likely]]{break;} +while(true) +[[unlikely]] +{break;} + +g(); + +if(x) + [[likely]] +{ + if(y) + [[likely]] + {} +} + +g();
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp new file mode 100644 index 00000000..8c582cf9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2124-2.cpp @@ -0,0 +1,48 @@ +if(x)[[likely]]{} +if(x) +[[unlikely]] +{} + +g(); + +if(x)[[likely]]l(); +if(x) +[[unlikely]] +l(); + +g(); + +if(x) +[[unlikely]] +l1(); +else +l2(); + +g(); + +if(x) +#if __has_cpp_attribute(likely) +[[likely]] +#endif + return false; +else + return true; + +g(); + +while(true)[[likely]]{break;} +while(true) +[[unlikely]] +{break;} + +g(); + +if(x) + [[likely]] +{ + if(y) + [[likely]] + {} +} + +g();
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp new file mode 100644 index 00000000..a1ebb1a7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-1.cpp @@ -0,0 +1,8 @@ +namespace +{ + +void g(int a1234567890123456, int b1234567890123456, int c1234567890123456) +{ +} + +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp new file mode 100644 index 00000000..5725d3d7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2209-2.cpp @@ -0,0 +1,10 @@ +namespace +{ + +int f = 0; + +} + +void g(int a1234567890123456, int b1234567890123456, int c1234567890123456) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp new file mode 100644 index 00000000..5834e4b3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_2623.cpp @@ -0,0 +1,30 @@ +void child() { + static_cast< id<Mountable >> ( object); +} + +assert(x<0 && y>=3); +assert(y <0&&z> 2); +assert(a>>1); + +std::unique_ptr<Interface< T >> GetProjectionAdapter(const std::string& model_name); + +auto c = a< b>>c; +auto c = a << b >>c; + +if (Something<a> == c) { +} + +if (id< Something<a >> == c) { +} + +const std::vector< Eigen::Matrix<T, A, B >> & P_c; + +const unsigned int wl = w>> lvl; + +using Poly = Model<P, Poly<Dx,Dy, Dz>>; + +void Compute( + Image<E::Matrix< SType, Dim,Int >> const& src, + Image< E::Matrix< TType,Dim, std::string> >& dst); + +Opt<std::vector < std::unordered_set<FrameId> >> partition; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp new file mode 100644 index 00000000..6e007772 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116-2.cpp @@ -0,0 +1,41 @@ +obj.AddObject(Object::UniqueName(), 10, [this] { + holder.Access([this](const auto &info) { + if (IsGood(info)) { + Add(info); + } +}); +}); + +obj.AddObject( + Object::UniqueName(), + 10, + [this] { + holder.Access([this](const auto &info) { + if (IsGood(info)) { + Add(info); + } +}); +} +); + +{ + obj.AddObject(Object::UniqueName(), 10, [this] { + holder.Access([this](const auto &info) { + if (IsGood(info)) { + Add(info); + } + }); + }); + + obj.AddObject( + Object::UniqueName(), + 10, + [this] { + holder.Access([this](const auto &info) { + if (IsGood(info)) { + Add(info); + } + }); + } + ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp new file mode 100644 index 00000000..fcdcc715 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_3116.cpp @@ -0,0 +1,213 @@ +// Singular with various newline formats +auto f = [] -> void { + return; +}; + +auto f = [] -> void { + return; +}(); + +auto f = [] -> void +{ + return; +}(); + +auto f = +[] -> void { + return; +}; + +auto f = +[] -> void +{ + return; +}; + +auto f + = [] -> void { + int i = 0; + return; + }; + +auto f + = [] + { + int i = 0; + return; + }; + +// Nested lambda +auto f = [] { + auto g = [] { + auto h = [] { + return; + }; + return; + }; + return; +}; + +auto f = [] { + auto g = [] + { + auto h = [] { + return; + }; + return; + }; + return; +}; + +auto f = [] +{ + auto g = [] { + auto h = [] + { + return; + }; + return; + }; + return; +}; + +// Nested lambda within functions +Func( + [] { return; }, + [] { return; } +); + +Func([] { return; }, + [] { return; } +); + +Func([] { return; }, + [] { return; } +)(); + +Func([] { return; }, + [] { return; })(); + +Func([] { return; }, + [] { return; }); + +A( + B([] (const std::string &s) -> bool { + s = "hello"; + return true; + }), 1 + ); + +A( + B( + [] (const std::string &s) -> bool { + s = "hello"; + return true; + } + ), 1 + ); + +// Inside scope +{ + std::thread([](const char *c) { + std::cout << c << std::endl; + }).detach(); + + std::thread( + [](const char *c) { + std::cout << c << std::endl; + } + ).detach(); + + auto f = [&](int a) { + return b; + }; + + auto f = [&](int a) + { + return b; + }; +} + +Func(std::count_if(v.begin(), v.end(), [&](const auto &a) { + return a == 3; + })); + +Func( + std::count_if(v.begin(), v.end(), [&](const auto &a) + { + return a == 3; + })); + +Func( + std::count_if(v.begin(), v.end(), [&](const auto &a) { + return a == 3; + })); + +Func( + std::count_if(v.begin(), v.end(), [&](const auto &a) { + return a == 3; + }) + ); + +// Test case from issue #3116 +const auto compare = [] (const auto i, const auto j) +{ + return i >= j; +}; + +std::sort( + vector.begin(), + vector.end(), + [] (const auto i, const auto j) +{ + return i >= j; +} +); + +// Test case from issue #3116 +if(isWidgetOfCurrentRow) +{ + it = std::find_if( + reloaded.begin(), + reloaded.end(), + [&rowGuid](const auto& device) + { + return (device.thingGUID == rowGuid && !device.isWidget); + } + ); +} +else +{ + it = std::find_if( + reloaded.begin(), + reloaded.end(), + [&rowGuid](const auto& device) + { + return device.thingGUID == rowGuid; + } + ); +} + +// Test case from issue 1296 and some variants +obj->Func([&](int a) + { + return b; + }); + +obj->Func([] -> int + { + return b; + }); + +obj->Func([] + { + return b; + } + ); + +obj->Func( + Func([] + { + return b; + }) + ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp new file mode 100644 index 00000000..d203e398 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_523.cpp @@ -0,0 +1,4 @@ + +#define MACRO(templ_type) template <typename T> class Abc<templ_type<T> > { } + +template<typename T> class Foo<Bar<T> > { }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp new file mode 100644 index 00000000..cfbe7963 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_547_for_each.cpp @@ -0,0 +1,4 @@ +void foo()
+{
+ for_each(it.begin(), it.end(), func);
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp new file mode 100644 index 00000000..0c289a8a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_564.cpp @@ -0,0 +1,3 @@ +CGPathMoveToPoint (bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale -3, aPoint.y - aLength+1 +4);
+CGPathAddLineToPoint(bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale , aPoint.y - aLength+1 );
+CGPathAddLineToPoint(bottomArrow, NULL, round(aPoint.x) + .5/self.contentsScale +3, aPoint.y - aLength+1 +4);
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp new file mode 100644 index 00000000..96e910ca --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_574.cpp @@ -0,0 +1,13 @@ +class A {
+// crash (two parameter, 2nd string parameter has space)
+void check( const QObject* object, const QStringList& strList=QStringList(QString(QLatin1String("one two"))));
+// no crash (two parameter, 2nd string parameter has no space)
+void check( const QObject* object, const QStringList& strList= QStringList(QString(QLatin1String("one"))));
+// no crash (removed QLatin1String)
+void check( const QObject* object, const QStringList& strList =QStringList(QString(("one two"))));
+// no crash (removed QString(QLatin1String))
+void check( const QObject* object, const QStringList& strList = QStringList());
+// no crash (removed 1st parameter only)
+void check( const QStringList& strList = QStringList(QString(QLatin1String("one two"))) );
+};
+int A=5;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp new file mode 100644 index 00000000..255db223 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_624_angle.cpp @@ -0,0 +1,2 @@ +auto c = a < b >> 1;
+auto c = a < b;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp new file mode 100644 index 00000000..e99742ef --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_633_typename.cpp @@ -0,0 +1,24 @@ +template < typename TImage > +class MorphologicalContourInterpolator: + public ImageToImageFilter< TImage, TImage > +{ + template < typename T > + friend class MorphologicalContourInterpolatorParallelInvoker; + friend class ::MultiLabelMeshPipeline; + +public: + /** Standard class typedefs. */ + typedef MorphologicalContourInterpolator Self; + +protected: + MorphologicalContourInterpolator(); + ~MorphologicalContourInterpolator() {} + typename TImage::PixelType m_Label; + int m_Axis; + bool m_HeuristicAlignment; + +private: + MorphologicalContourInterpolator( const Self& ) ITK_DELETE_FUNCTION; + void + operator=( const Self& ) ITK_DELETE_FUNCTION; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp new file mode 100644 index 00000000..6d8dde90 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/issue_672.cpp @@ -0,0 +1,8 @@ +class +MyClass +{ +public: + void f123(MyType1 AAAAAAAAAAAAAA, MyType2 BBBBBBBBBBBB, int XXXXXXXXXXXXXXX); + void foo(::some::very::looong::_and::complicated::name::MyType& a, ::some::very::looong::_and::complicated::name::MyType& b, + some::very::looong::_and::complicated::name::MyType& c); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp new file mode 100644 index 00000000..e57868e2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst.cpp @@ -0,0 +1,32 @@ +#include <string> + +class CFoo +{ +int foo1(int arg); +int foo2(); +int foo3(char ch, int xx) +{ +} +}; + +int CFoo::foo1(int arg, int arg2) +{ +} + +int CFoo::foo2() +{ +} + +int CFoo::operator +() +{ +} + +map<string, int> func() +{ + // some codes +} + +int some_func(void) +{ +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp new file mode 100644 index 00000000..d167cc1c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/kw_subst2.cpp @@ -0,0 +1,36 @@ +#include <string> + +namespace bar +{ + +class CFoo +{ +int foo1(int arg); +private: +int foo2() +{ +} +}; + +int CFoo::foo1(int arg, char arg2) +{ +} + +int CFoo::foo2() +{ +} + +int CFoo::operator +() +{ +} + +map<string, int> func() +{ + // some codes +} + +int some_func(void) +{ +} + +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp new file mode 100644 index 00000000..bdc499a6 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda.cpp @@ -0,0 +1,77 @@ +void f1() +{ + auto a = + [=](int *a, Something & b) + { + std::cout << "blah: " << *a; + }; +} + +void f1a() +{ + std::for_each(a, b, + [](Something & b) + { + std::cout << "blah: " << *a; + }); +} + +void f1b() +{ + std::for_each(a, b, + [](int & b) -> foo + { + b += 3; + return b; + }); +} + +void f2() +{ + Invoke(a, b, + [&one, two](int *a, Something & b) + { + std::cout << "blah: " << *a; + }); +} + +void f3a() +{ + auto a = [] {}; + auto b = []{return true;}; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] + { + std::cout << "blah: " << one << two; + }); +} + +void f3c() +{ + int a[]{}; +} + +void g1() +{ + auto a = [ = ](int* a, Something &b) { std::cout << "blah: " << *a; }; +} + +void g1a() +{ + std::for_each(a, b, [](Something& b){std::cout<<"blah: "<<* a;}); +} + +void g1b() +{ + std::for_each(a, b, [] (int& b)->foo{ b+=3; return(b); }); +} + +void g2() +{ + Invoke(a, b, + [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; }); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp new file mode 100644 index 00000000..d641c281 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda2.cpp @@ -0,0 +1,82 @@ +void f1() +{ + auto a = + [=](int *a, Something & b) + { + std::cout << "blah: " << *a; + }; +} + +void f1a() +{ + std::for_each(a, b, + [](Something & b) + { + std::cout << "blah: " << *a; + } + ); +} + +void f1b() +{ + std::for_each(a, b, + [](int & b) -> foo + { + b += 3; + return b; + } + ); +} + +void f2() +{ + Invoke(a, b, + [&one, two](int *a, Something & b) + { + std::cout << "blah: " << *a; + } + ); +} + +void f3a() +{ + auto a = [] {}; + auto b = []{return true;}; +} + +void f3b() +{ + Invoke(a, b, + [&one, two] + { + std::cout << "blah: " << one << two; + } + ); +} + +void f3c() +{ + int a[]{}; +} + +void g1() +{ + auto a = [ = ](int* a, Something &b) { std::cout << "blah: " << *a; }; +} + +void g1a() +{ + std::for_each(a, b, [](Something& b){std::cout<<"blah: "<<* a;}); +} + +void g1b() +{ + std::for_each(a, b, [] (int& b)->foo{ b+=3; return(b); }); +} + +void g2() +{ + Invoke(a, b, + [&one, two] (int *a, Something&b){ std::cout << "blah: " << *a; }); + +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp new file mode 100644 index 00000000..da3db41f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_brace_list.cpp @@ -0,0 +1,9 @@ +template<typename T, typename U> +auto add(T t, U u) -> decltype(t + u) {return t + u;} + +int main() +{ + auto f1 = [&]() { return 1; }; + auto f2 = [&]() -> decltype(auto) { return 2; }; + string s1{ 'a', 'b' }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp new file mode 100644 index 00000000..c740c4bd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_in_one_liner.cpp @@ -0,0 +1,6 @@ +void bar(); + +struct foo +{ + foo() { []{ bar(); }(); } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp new file mode 100644 index 00000000..543290fa --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lambda_selfcalling.cpp @@ -0,0 +1,12 @@ +void f(){ + int i = 0; + const auto j = [](int k){ + return k+2; + } + (i); + + const auto l = ([](int k){ + return k+2; + }) + (i); +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp new file mode 100644 index 00000000..608952c0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Mac.cpp @@ -0,0 +1 @@ +int main ()
{
a = 5;
bbbb = 6.0;
int a = 5;
float bbbb = 6.0;
bbbb = 1.0
}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp new file mode 100644 index 00000000..cdbf7653 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Unix.cpp @@ -0,0 +1,9 @@ +int main () +{ + a = 5; + bbbb = 6.0; + int a = 5; + float bbbb = 6.0; + + bbbb = 1.0 +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp new file mode 100644 index 00000000..20fa083a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/lineEndings-Win.cpp @@ -0,0 +1,9 @@ +int main ()
+{
+ a = 5;
+ bbbb = 6.0;
+ int a = 5;
+ float bbbb = 6.0;
+
+ bbbb = 1.0
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp new file mode 100644 index 00000000..a7638876 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_br_cmt.cpp @@ -0,0 +1,59 @@ + +namespace a::b +{ +void foo::bar(int xx) +{ +switch(xx) +{ + +case 1: + // filler + while (true) +{ +if (something) +{ +do_something(); + + + +} +else if (something_else) +{ +do_something_else(); +} +else +{ +dont_do_anything(); +break; +} + +} +break; + +case 2: + handle_two(); + +default: + handle_the_rest(); + break; +} +} + +class long_class +{ +private: + +int m_a; +int m_name; + +public: +long_class(int a) {} + +void f1() {} + +void f2() {} + +void f3() {} + +}; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp new file mode 100644 index 00000000..89fe4435 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/long_namespace.cpp @@ -0,0 +1,15 @@ +namespace boo3 {
+int Fun1()
+{
+ return 42;
+}
+}
+
+namespace boo4 {
+ int Fun2()
+ {
+ int a = 7;
+ int b = 8;
+ return a+b;
+ }
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp new file mode 100644 index 00000000..c27c6b5d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/macro_spaces.cpp @@ -0,0 +1,2 @@ +#if (WINVER < 0x0601)
+#endif
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp new file mode 100644 index 00000000..8a73b431 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc.cpp @@ -0,0 +1,60 @@ + +/* Not detected as a prototype? Spacing wrong. */ +static struct my_entry *get_first_entry(const CHAR *blah); +static CFooo::entry *get_next_entry(const CHAR *blah); +static struct my_entry *get_next_entry(const CHAR *blah); + +/* Not handling prototype params: */ +typedef void (*function_name)(my_t * p_my, int foo); +typedef void (*function_name)(my_t * , int ); + +typedef enum +{ + one = 1, + three = 3, + five_hundred = 5, + a_really_really_big_number = 6, + two = 7, + a_really_really_really_big_number = 8, +}yuck_t; + +const char *names[] = +{ + one = "one", + three = "three", + five_hundred = "five_hundred", + a_really_really_big_number = "a_really_really_big_number", + two = "two", + a_really_really_really_big_number = "a_really_really_really_big_number", +}; + +bool foo(char c) +{ + xWindow *pWindow = ::RelatedWindow(); + + /* space between ] and ( */ + function_list[idx](param); + + /* Indenting with multiple members: */ + sass.asdfvas->asdfasd[asdfasdf]. + asdfasdf = 5; + + ::asdasda::adasd:: + asdfasdf = 5; + + dookie::wookie << "asd" + << "bag" + << "sag"; + + sp_sign = 4 - - 5; +sp_sign = -sp_sign; +sp_sign = 4 + + 7; +sp_sign = + sp_sign; +sp_sign = 4 + + sp_sign; +} + +#ifndef abc + +#define abc 123 /* some comment */ + +#endif /* another comment diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp new file mode 100644 index 00000000..f1be4478 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc2.cpp @@ -0,0 +1,59 @@ +/* +I tried to modify the spaces when using casts like static_cast etc. by +using sp_before_angle, sp_after_angle and sp_inside_angle. Even setting +all of those options to remove results in the following: +*/ + +myvar = dynamic_cast < MyClass<T>* > (other); +// expected: +//myvar = dynamic_cast<MyClass<T>*>(other); + +/* +Sometime pointers and references are still not detected correctly in +special cases - i guess. +*/ +//When using "sp_before_ptr_star = remove" the result is: +typedef std::list<StreamedData *>::iterator iterator; +//typedef std::list<StreamedData *>::iterator iterator; +//------------------------------^ This space show not be there + +typedef void (T::*Routine)(void); + +//Similar with "sp_before_byref = remove": +unsigned long allocate(unsigned long size, void* & p); +//unsigned long allocate(unsigned long size, void* & p); +//------------------------------------------------^ The same here + +void foo(void) +{ + List<byte>bob = new List<byte> (); + + /* Align assignments */ + align_assign(chunk_get_head(), + cpd.settings[UO_align_assign_span].n, + cpd.settings[UO_align_assign_thresh].n); +} + +Args::Args(int argc, char **argv) +{ + m_count = argc; + m_values = argv; + int len = (argc >> 3) + 1; + m_used = new UINT8[len]; + if (m_used != NULL) + { + memset(m_used, 0, len); + } +} + +void Args(int argc, char **argv) +{ + m_count = argc; + m_values = argv; + int len = (argc >> 3) + 1; + m_used = new UINT8[len]; + if (m_used != NULL) + { + memset(m_used, 0, len); + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp new file mode 100644 index 00000000..c7c10d6c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc3.cpp @@ -0,0 +1,25 @@ +// When constructing an object there should not be any space between the & and the variable name: + +MyClass my1(foo,& bar); +MyClass my2(foo, bar); +MyClass my3(foo, bar + 3); +MyClass my4(42); +MyClass my5(foo(), bar); +MyClass my6(int foo, int& bar); +MyClass my7(const int foo, int& bar); + + +//When using references inside of casts there is also an additional space after the &: + +MyClass& myInst = static_cast<MyClass& >(otherInst); + + +// When using the qt-specific signals and slots the pointer star is separated from the type with a space: + +connect(&mapper, SIGNAL(mapped(QWidget *)), this, SLOT(onSomeEvent(QWidget*))); + +extern int select(int __nfds, fd_set * __restrict __readfds, + fd_set * __restrict __writefds, + fd_set * __restrict __exceptfds, + struct timeval * __restrict __timeout); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp new file mode 100644 index 00000000..725fa160 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc4.cpp @@ -0,0 +1,28 @@ +struct X { + void operator deleteme(void*); + void deallocate(int*p){ + operator delete((void*)p); + delete((void*)q); + } +}; + +int f(bool b) { +typedef int mytype; +if (b) +return int(42.0); +else +return mytype(42.0); +} + +struct X { +double f(int n) +{ +return double(n); +} +}; + +inline value_type operator () () const + { + return (double(rnd32()) * (0.5 / 0x80000000)); + } + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp new file mode 100644 index 00000000..570a4a76 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc5.cpp @@ -0,0 +1,13 @@ +typedef std::list<StreamedData*>::iterator iterator; +double foo() +{ + if (a<bar()> c) +{ +throw int(); +return(double()); +} + call_a_function(42, + double(-1), + "charray"); +return(foo(n)); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp new file mode 100644 index 00000000..95cc0383 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/misc6.cpp @@ -0,0 +1,3 @@ +#include <vector> +void f(std::vector<int> * vip, std::vector<int> & vir); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp new file mode 100644 index 00000000..eb949c45 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return-2.cpp @@ -0,0 +1,10 @@ +namespace ComponentSpec { +void build(Context c) +{ + if (index == NSNotFound) { + return; + } + + invokeUpdateInvitees(c, invitees); +} +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp new file mode 100644 index 00000000..ca3105da --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/mod_remove_empty_return.cpp @@ -0,0 +1,4 @@ +void a() +{ + return; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp new file mode 100644 index 00000000..213393b9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ms-style-ref.cpp @@ -0,0 +1,9 @@ +Foo^ foo = dynamic_cast<Bar^>(bar); +Foo* foo = dynamic_cast<Bar*>(bar); +x = a^b; + +int main(Platform::Array<Platform::String^>^ /*args*/) +{ +} + +Platform::Array<unsigned char>^ a; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp new file mode 100644 index 00000000..df5f3a84 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/multi_line.cpp @@ -0,0 +1,43 @@ + +void func_a ( int a, string b, char c ); + +void func_b ( int a, + string b, char c ); + +void func_c ( int a, string b, char c + ); + +void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb, char cccccccccccccccccc ); + +void func_a ( int a, string b, char c ) +{ + return; +} + +void func_b ( int a, + string b, char c ) +{ + return; +} + +void func_c ( int a, string b, char c + ) +{ + return; +} + +void func_d ( int aaaaaaaaaaaaaa, string bbbbbbbbbbbbbb, char cccccccccccccccccc ) +{ + return; +} + +void func_call() +{ + func_a ( 1, 2, 3); + func_b ( 4, + 5, 6 ); + func_c ( 7, 8, 9 + ); + + func_d ( "aaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbb", "cccccccccccccccccccccc" ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp new file mode 100644 index 00000000..cf6f921e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/namespace_namespace.cpp @@ -0,0 +1,6 @@ +namespace hw { namespace stm32 { + +class RTC { +}; + +}} // namespace hw::stm32 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp new file mode 100644 index 00000000..828215e8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/new_op.cpp @@ -0,0 +1,9 @@ +Foo* foo = new Foo(a,v); + +Foo* foo = new(ptr,std::nothrow)Foo[]; +Foo* foo = new(ptr)Foo(); +Foo* foo = new(FOO(ptr))Foo(); + +Foo* foo = new ( ptr,std::nothrow ) Foo[]; +Foo* foo = new ( ptr ) Foo(); +Foo* foo = new ( FOO(ptr) ) Foo(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h new file mode 100644 index 00000000..128974b7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-class.h @@ -0,0 +1,59 @@ +#ifndef NL_CLASS_H_INCLUDED +#define NL_CLASS_H_INCLUDED + +#include <string> + +namespace example { + +class IStreamable; +class InStream; +class OutStream; + +/** + * Timestamp is a timestamp with nanosecond resolution. + */ +class Inher + : public IStreamable +{ + +public: + Inher(); + virtual ~Inher(); + +}; + +/** + * Timestamp is a timestamp with nanosecond resolution. + */ +class Inher2 + : public IStreamable { + +public: + + Inher2(); + Inher2(long sec, unsigned long nsec); + +}; + +class Simple { + +public: + + Simple(); + virtual ~Simple(); + +}; + +class Simple2 +{ + +public: + + Simple2(); + virtual ~Simple2(); + +}; + +} // namespace + +#endif // NL_CLASS_H_INCLUDED diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h new file mode 100644 index 00000000..a436fcb7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl-namespace.h @@ -0,0 +1,15 @@ +namespace ns1 { + + void *foo(void); + void bar(void); + +} + +namespace ns2 +{ + + void *foo(void); + void bar(void); + +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp new file mode 100644 index 00000000..cf3325f0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_assign_leave_one_liners.cpp @@ -0,0 +1 @@ +int q[] = { 3, 4 }; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h new file mode 100644 index 00000000..fb77edf1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_after.h @@ -0,0 +1,95 @@ +namespace A { +namespace S { +class C +{ +public: + virtual ~C() + { + } + + virtual void addSearch(const int &col) = 0; + + virtual void removeSearch(int id) = 0; +}; +} // namespace S +} // namespace A + +namespace B { +// This is a comment! +class D +{ +public: + D(); +}; +} // namespace B + +// This is also a comment! +class E +{ +public: + E(); +}; +namespace F { +} +void foo(); +class G +{ +}; +void bar(); + +void foo2(); +namespace E +{ +} +void bar2(); + +void foo3(); +namespace F +{ +} + +void bar3(); + +void foo4(); +class I +{ +}; +using namespace F; +namespace M +{ +void bar4(); +/* multiline test comment + before class */ +template<typename ... Args> +// test comment between template specification and associated class +class H +{ + // nested class +template<typename ...> +friend class I; +friend class J; + // nested class K +template<typename T> +class K +{ + // double-nested class L +class L { }; +}; +}; +} + +class AA; +class AB; + +namespace BA +{ +class BB; +class BC; + +class BD +{ +public: + friend class BE; + BD(); +}; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp new file mode 100644 index 00000000..c7cab4c7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_before_func_body_def.cpp @@ -0,0 +1,60 @@ +lass A +{ + void f0(void); + template<typename T, typename U> + void g(T s, U t) + { + return; + } + void f1(void); + template + <typename T, + typename U> + void h(T s, U t) + { + return; + } + void f2(void); + template + <typename T, + typename U> + void + i(T s, U t) + { + return; + } + void f3(void); + template + <typename T, + typename U> + void + j + (T s, U t) + { + return; + } + void f4(void); + template + <typename T, + typename U> + void + k + ( + T s, U t) + { + return; + } + void f5(void); + template + <typename T, + typename U> + void + l + ( + T s, + U t + ) + { + return; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp new file mode 100644 index 00000000..b698546a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_brace_brace.cpp @@ -0,0 +1,18 @@ + +SHOW_VAR status_vars[]= { { "Aborted_clients", (char *)&aborted_threads, +SHOW_LONGLONG, } }; + +SHOW_VAR status_vars[]= +{ +{ "Aborted_clients", (char *)&aborted_threads, +SHOW_LONGLONG, } +}; + +SHOW_VAR status_vars[]= +{ +{ +"Aborted_clients", (char *)&aborted_threads, +SHOW_LONGLONG, +} +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp new file mode 100644 index 00000000..6250d752 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-f.cpp @@ -0,0 +1,17 @@ +void f(){} +void f() +{} + +void f()const{} +void f()const +{} + +void f()noexcept(){} +void f()noexcept() +{} + +void f()/**/{} +void f()/**/ +{} +void f()// +{}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp new file mode 100644 index 00000000..6250d752 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-fr.cpp @@ -0,0 +1,17 @@ +void f(){} +void f() +{} + +void f()const{} +void f()const +{} + +void f()noexcept(){} +void f()noexcept() +{} + +void f()/**/{} +void f()/**/ +{} +void f()// +{}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp new file mode 100644 index 00000000..6250d752 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-r.cpp @@ -0,0 +1,17 @@ +void f(){} +void f() +{} + +void f()const{} +void f()const +{} + +void f()noexcept(){} +void f()noexcept() +{} + +void f()/**/{} +void f()/**/ +{} +void f()// +{}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp new file mode 100644 index 00000000..6250d752 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_fdef_brace_cond-rf.cpp @@ -0,0 +1,17 @@ +void f(){} +void f() +{} + +void f()const{} +void f()const +{} + +void f()noexcept(){} +void f()noexcept() +{} + +void f()/**/{} +void f()/**/ +{} +void f()// +{}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp new file mode 100644 index 00000000..382d2815 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_for_leave_one_liners.cpp @@ -0,0 +1 @@ +for (int i = 0; i < 10; ++i) i++;
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp new file mode 100644 index 00000000..e27d7e55 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func.cpp @@ -0,0 +1,23 @@ +class BSRRE1D_file : PhysicalFile +{ + int getFoo() { return(m_foo); } + void setFoo(int foo) { m_foo = foo; } + public BSRRE1D_file() + { + this.addFormatName("BSRRE1DF"); + } +private int m_foo; + public void xxx() + { + ahoj(); + } // comment + public void yyy() + { + ahoj(); + } + /* comment 2 */ + public void xxx() + { + ahoj(); + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp new file mode 100644 index 00000000..96cd4826 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_args_multi_line_ignore_closures.cpp @@ -0,0 +1,58 @@ +methodCall([] { + Log(); + }); + +funcCall(match ( [ & ]( const ContentProps &props) { + return PairingCmpnt() + })); + +match( [ & ]( const ContentProps &props) { + return PairingCmpnt() + }); + + +outerMethodCall(methodCall(^{ + // action +}, x) +); + +outerMethodCall(x, methodCall(^{ + // action +}, y)); + +options({ + .cornerRadius = CGFLOAT_MAX, + }); + +mapToPtr([&](const LeftAddOn::Props &addOnProps) { + FSTheme *const theme = AK::getTheme(); +}); + +mapToPtr(x, [&](const Props &addOnProps) { + FSTheme *const theme = AK::getTheme(); +}); + +mapToPtr([&](const Props &addOnProps) { + FSTheme *const theme = AK::getTheme(); +}); + +methodCall(arg1, arg2, +arg3); + +methodCall(arg1, arg2, arg3); + +methodCall(arg1, []{ + variant.action.send(Cmpnt); + }, arg3); + +methodCall(arg1, { + .x = 10, + }, arg3); + +methodCall({ + .x = 10, + }, arg3); + +methodCall(arg1, { + .x = 10, + }); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp new file mode 100644 index 00000000..6678ee18 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_empty.cpp @@ -0,0 +1,3 @@ +SomeFunction
+(
+);
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp new file mode 100644 index 00000000..309a65a9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren.cpp @@ -0,0 +1,4 @@ +SomeFunction(
+ someVar,
+ someOtherVar,
+ );
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp new file mode 100644 index 00000000..6678ee18 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_call_paren_empty.cpp @@ -0,0 +1,3 @@ +SomeFunction
+(
+);
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp new file mode 100644 index 00000000..91a7184f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_decl.cpp @@ -0,0 +1,31 @@ + +void bla ( ); +void ble +( +int a, +char b +); +void ble2 ( int a, char b ); + + +void bla() +{ +} + +void bla2 +( +) +{ +} + +void ble( int a, char b ) +{ +} + +void ble2 +( +int a, +char b +) +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp new file mode 100644 index 00000000..f1ba8607 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_def_paren_empty.cpp @@ -0,0 +1,21 @@ +void LocalClass::LocalClass()
+{
+ int Function
+ (
+ )
+ {
+ return 0;
+ }
+
+ int Function(
+ )
+ {
+ return 0;
+ }
+
+ int Function
+ ()
+ {
+ return 0;
+ }
+}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp new file mode 100644 index 00000000..19965aac --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_paren_empty.cpp @@ -0,0 +1,9 @@ +int Function
+ (
+ );
+
+int Function(
+ );
+
+int Function
+ ();
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp new file mode 100644 index 00000000..d221e974 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_scope_name.cpp @@ -0,0 +1,2 @@ +void A::f() +{} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp new file mode 100644 index 00000000..26e49663 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_func_type_name.cpp @@ -0,0 +1,73 @@ + +//zero +// one +// two +// three +void foo(void); + +struct A +{ +public: +long_complicated_type f(); +A& operator+(const A& other); +}; + +A& A::operator+(const A& other) +{} + +B +operator+(const B& other) +{} + +B foo(const B& other) +{} + +class A +{ +public: +explicit A(int); +int aFunct() { return a; } +int bFunc(); +}; + +// Another file +int +A::bFunc() +{ +// some code +} + +template<typename T> +typename Foo<T>::Type Foo<T>::Func() +{ +} + +void Foo::bar() {} + +namespace foo { +Foo::Foo() {} +} + +Foo::~Foo() {} + +class Object +{ + ~Object(void); +}; + +template <class T> +void SampleClassTemplate<T>::connect() +{ +} + +template <> +inline void bar<MyType>(MyType r) +{ + foo(r); +} + +template <T> +inline void baz<>(T r) +{ + foo(r); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp new file mode 100644 index 00000000..4bdcb394 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_inside_namespace.cpp @@ -0,0 +1,37 @@ +namespace cats +{ // rule + + +int count; +void meow(); + + +} + +namespace dogs { // drool + + +int count; +void bark(); + + +} + +namespace pigs { + + +int count; +void oink(); + + +} + +namespace owls +{ + + +int count; +void hoot(); + + +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp new file mode 100644 index 00000000..c87e6e68 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/nl_max_blank_in_func.cpp @@ -0,0 +1,142 @@ +//regular function +void func0() +{ + + + + + return; +} +// ======================================================================== +//member function +void cls::func1() +{ + + + + + return; +} +// ======================================================================== +//lambda function +const auto l = [](){ + + + + + return 1; +}; +// ======================================================================== +//regular function in class +class cls +{ +public: + + + + +void func0() +{ + + + + + return; +} + + + + +} +// ======================================================================== +//member function in class + +// ======================================================================== +//lambda function in class +class cls +{ +pubic: + + + + +const auto l = [](){ + + + + + return 1; +}; + + + + +} +// ======================================================================== +//regular function in class in namespace +namespace ns +{ + + + + +class cls +{ +public: + + + + +void func0() +{ + + + + + return; +} + + + + +} + + + + +} +// ======================================================================== +//member function in class in namespace + +// ======================================================================== +//lambda function in class in namespace +namespace ns +{ + + + + +class cls +{ +pubic: + + + + +const auto l = [](){ + + + + + return 1; +}; + + + + +} + + + + +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp new file mode 100644 index 00000000..e6ea9116 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/noexcept.cpp @@ -0,0 +1 @@ +foo()noexcept; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp new file mode 100644 index 00000000..a9c65439 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/not_lambda.cpp @@ -0,0 +1,8 @@ +int ff() +{ + // not a lambda fcn so don't surround "->" by spaces + f()[0]->size(); + if(true) { + return 1; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp new file mode 100644 index 00000000..4b79ca9e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/op_sym_empty.cpp @@ -0,0 +1,5 @@ +class Foo +{ +bool operator ==( const Foo & other ) const; +Bar & operator * ( ) const; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp new file mode 100644 index 00000000..6f2a7f03 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator.cpp @@ -0,0 +1,88 @@ + +struct bar; +struct foo +{ +operator bar*(); +auto operator <=> (const foo& rhs) const = default; +}; + +class Foo { + Foo operator+ (const Foo& rhs) const; + + const Foo& operator ==(Foo& me); + + bool operator> (const Foo& rhs) const; + + InStream& operator << (InStream& in); +} + +const Foo& Foo::operator ==(Foo& me) +{ +} + +Foo Foo::operator+ (const Foo& rhs) const +{ +} + +bool Foo::operator> (const Foo& rhs) const +{ +} + +class Example +{ + char m_array[256]; + + Example & operator=(const Example &rhs); + Example & operator+=(const Example &rhs); + const Example operator+(const Example &other) const; + bool operator==(const Example &other) const; + bool operator!=(const Example &other) const; + Example operator+ (const Example & x, const Example & y); + Example operator* (const Example & x, const Example & y); + + double& operator() (int row, int col); + double operator() (int row, int col) const; + void operator++ (); + int& operator* (); + Example& operator++ (); // prefix ++ + Example operator++ (int); // postfix ++ + + bool operator < (const Example& lhs, const Example& rhs) const; + + int operator()(int index) + { + i = ~ ~3; + return index + 1; + } + + char& operator[](unsigned i) + { + return m_array[i & 0xff]; + } +} + bool Example::operator==(const Example &other) const + { + /*TODO: compare something? */ + return false; + } + bool Example::operator!=(const Example &other) const + { + return ! operator ==(other); + } + + +void a() { +Op op = &X::operator==; +if (!A) +if (op != &X::operator==) +A(1) = a; +if (!A) { +if (op != &X::operator==) +A(1) = a; +} +} + +void *operator new(std::size_t) throw(std::bad_alloc); +void *operator new[ ](std::size_t) throw(std::bad_alloc); +void operator delete(void *) throw(); +void operator delete[ ](void *) throw(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp new file mode 100644 index 00000000..b14935ee --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/operator_proto.cpp @@ -0,0 +1,65 @@ +/* A collection of all the different known operator prototypes in C++ */ + +// arithmetic operators +Type1 operator + (const Type1& a); // +a +Type1 operator + (const Type1& a, const Type2& b); // a + b +Type1& operator ++(Type1& a); // ++a +Type1 operator ++(Type1& a, int); // a++ +Type1& operator +=(Type1& a, const Type1& b); // a += b +Type1 operator - (const Type1& a); // -a +Type1& operator --(Type1& a); // --a +Type1 operator --(Type1& a, int); // a-- +Type1& operator -=(Type1& a, const Type1& b); // a -= b +Type1 operator * (const Type1& a, const Type1& b); // a * b +Type1& operator *=(Type1& a, const Type1& b); // a *= b +Type1 operator / (const Type1& a, const Type1& b); // a / b +Type1& operator /=(Type1& a, const Type1& b); // a /= b +Type1 operator % (const Type1& a, const Type1& b); // a % b +Type1& operator %=(Type1& a, const Type1& b); // a %= b + +// comparison operators +bool operator < (const Type1& a, const Type1& b); // a < b +bool operator <= (const Type1& a, const Type1& b); // a <= b +bool operator > (const Type1& a, const Type1& b); // a > b +bool operator >= (const Type1& a, const Type1& b); // a >= b +bool operator != (const Type1& a, const Type1& b); // a != b +bool operator == (const Type1& a, const Type1& b); // a == b +bool operator <=>(const Type1& a, const Type1& b); // a <=> b + +// logical operators +bool operator ! (const Type1& a); // !a +bool operator &&(const Type1& a, const Type1& b); // a && b +bool operator ||(const Type1& a, const Type1& b); // a || b + +// bitwise operators +Type1 operator << (const Type1& a, const Type1& b); // a << b +Type1& operator <<=(Type1& a, const Type1& b); // a <<= b +Type1 operator >> (const Type1& a, const Type1& b); // a >> b +Type1& operator >>=(Type1& a, const Type1& b); // a >>= b +Type1 operator ~ (const Type1& a); // ~a +Type1 operator & (const Type1& a, const Type1& b); // a & b +Type1& operator &= (Type1& a, const Type1& b); // a &= b +Type1 operator | (const Type1& a, const Type1& b); // a | b +Type1& operator |= (Type1& a, const Type1& b); // a |= b +Type1 operator ^ (const Type1& a, const Type1& b); // a ^ b +Type1& operator ^= (Type1& a, const Type1& b); // a ^= b + +// other operators +Type1& Type1::operator = (const Type1& b); // a = b +void operator()(Type1& a); // a() +const Type2& operator[](const Type1& a, const Type1& b); // a[b] +Type2& operator*(const Type1& a); // *a +Type2* operator&(const Type1& a); // &a +Type2* Type1::operator->(); // a->b +Type1::operator type(); // (type)a +Type2& operator ,(const Type1& a, Type2& b); // a, b +void *Type1::operator new(size_t x); // new Type1 +void *Type1::operator new[](size_t x); // new Type1[n] +void *Type1::operator delete(size_t x); // delete a +void *Type1::operator delete[](size_t x); // delete [] a + +// Misc examples +int& operator* (); +Foo::operator const char *(); +Foo::operator const Bar&(); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp new file mode 100644 index 00000000..0dac74c3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/out-668.cpp @@ -0,0 +1,4 @@ +int b() +{ + int abcde= 13; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp new file mode 100644 index 00000000..4563c43b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/output.cpp @@ -0,0 +1,657 @@ +/** + * @file output.cpp + * Does all the output & comment formatting. + * + * $Id: output.cpp 510 2006-09-20 01:14:56Z bengardner $ + */ + +#include "uncrustify_types.h" +#include "prototypes.h" +#include "chunk_list.h" +#include <cstring> +#include <cstdlib> + + + +void add_char(char ch) +{ + /* convert a newline into the LF/CRLF/CR sequence */ + if (ch == '\n') + { + fputs(cpd.newline, cpd.fout); + cpd.column = 1; + cpd.did_newline = 1; + } + else + { + fputc(ch, cpd.fout); + if (ch == '\t') + { + cpd.column = next_tab_column(cpd.column); + } + else + { + cpd.column++; + } + } +} + +void add_text(const char *text) +{ + char ch; + + while ((ch = *text) != 0) + { + text++; + add_char(ch); + } +} + +void add_text_len(const char *text, int len) +{ + while (len-- > 0) + { + add_char(*text); + text++; + } +} + + +/** + * Advance to a specific column + * cpd.column is the current column + * + * @param column The column to advance to + */ +void output_to_column(int column, bool allow_tabs) +{ + int nc; + + cpd.did_newline = 0; + if (allow_tabs) + { + /* tab out as far as possible and then use spaces */ + while ((nc = next_tab_column(cpd.column)) <= column) + { + add_text("\t"); + } + } + /* space out the final bit */ + while (cpd.column < column) + { + add_text(" "); + } +} + +void output_indent(int column, int brace_col) +{ + if ((cpd.column == 1) && (cpd.settings[UO_indent_with_tabs].n != 0)) + { + if (cpd.settings[UO_indent_with_tabs].n == 2) + { + brace_col = column; + } + + /* tab out as far as possible and then use spaces */ + int nc; + while ((nc = next_tab_column(cpd.column)) <= brace_col) + { + add_text("\t"); + } + } + + /* space out the rest */ + while (cpd.column < column) + { + add_text(" "); + } +} + + + +void output_parsed(FILE *pfile) +{ + chunk_t *pc; + int cnt; + + output_options(pfile); + output_defines(pfile); + output_types(pfile); + + fprintf(pfile, "-=====-\n"); + fprintf(pfile, "Line Tag Parent Columns Br/Lvl/pp Flg Nl Text"); + for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc)) + { + fprintf(pfile, "\n%3d> %13.13s[%13.13s][%2d/%2d/%2d][%d/%d/%d][%6x][%d-%d]", + pc->orig_line, get_token_name(pc->type), + get_token_name(pc->parent_type), + pc->column, pc->orig_col, pc->orig_col_end, + pc->brace_level, pc->level, pc->pp_level, + pc->flags, pc->nl_count, pc->after_tab); + + if ((pc->type != CT_NEWLINE) && (pc->len != 0)) + { + for (cnt = 0; cnt < pc->column; cnt++) + { + fprintf(pfile, " "); + } + fprintf(pfile, "%.*s", pc->len, pc->str); + } + } + fprintf(pfile, "\n-=====-\n"); + fflush(pfile); +} + +void output_options(FILE *pfile) +{ + int idx; + const option_map_value *ptr; + + fprintf(pfile, "-== Options ==-\n"); + for (idx = 0; idx < UO_option_count; idx++) + { + ptr = get_option_name(idx); + if (ptr != NULL) + { + if (ptr->type == AT_BOOL) + { + fprintf(pfile, "%3d) %32s = %s\n", + ptr->id, ptr->name, + cpd.settings[ptr->id].b ? "True" : "False"); + } + else if (ptr->type == AT_IARF) + { + fprintf(pfile, "%3d) %32s = %s\n", + ptr->id, ptr->name, + (cpd.settings[ptr->id].a == AV_ADD) ? "Add" : + (cpd.settings[ptr->id].a == AV_REMOVE) ? "Remove" : + (cpd.settings[ptr->id].a == AV_FORCE) ? "Force" : "Ignore"); + } + else if (ptr->type == AT_LINE) + { + fprintf(pfile, "%3d) %32s = %s\n", + ptr->id, ptr->name, + (cpd.settings[ptr->id].le == LE_AUTO) ? "Auto" : + (cpd.settings[ptr->id].le == LE_LF) ? "LF" : + (cpd.settings[ptr->id].le == LE_CRLF) ? "CRLF" : + (cpd.settings[ptr->id].le == LE_CR) ? "CR" : "???"); + } + else /* AT_NUM */ + { + fprintf(pfile, "%3d) %32s = %d\n", + ptr->id, ptr->name, cpd.settings[ptr->id].n); + } + } + } +} + +/** + * This renders the chunk list to a file. + */ +void output_text(FILE *pfile) +{ + chunk_t *pc; + chunk_t *prev; + int cnt; + int lvlcol; + bool allow_tabs; + + cpd.fout = pfile; + + for (pc = chunk_get_head(); pc != NULL; pc = chunk_get_next(pc)) + { + if (pc->type == CT_NEWLINE) + { + for (cnt = 0; cnt < pc->nl_count; cnt++) + { + add_char('\n'); + } + cpd.did_newline = 1; + cpd.column = 1; + LOG_FMT(LOUTIND, " xx\n"); + } + else if (pc->type == CT_COMMENT_MULTI) + { + output_comment_multi(pc); + } + else if (pc->type == CT_COMMENT_CPP) + { + pc = output_comment_cpp(pc); + } + else if (pc->len == 0) + { + /* don't do anything for non-visible stuff */ + LOG_FMT(LOUTIND, " <%d> -", pc->column); + } + else + { + /* indent to the 'level' first */ + if (cpd.did_newline) + { + if (cpd.settings[UO_indent_with_tabs].n == 1) + { + lvlcol = 1 + (pc->brace_level * cpd.settings[UO_indent_columns].n); + if ((pc->column >= lvlcol) && (lvlcol > 1)) + { + output_to_column(lvlcol, true); + } + } + allow_tabs = (cpd.settings[UO_indent_with_tabs].n == 2) || + (chunk_is_comment(pc) && + (cpd.settings[UO_indent_with_tabs].n != 0)); + + LOG_FMT(LOUTIND, " %d> col %d/%d - ", pc->orig_line, pc->column, cpd.column); + } + else + { + /* not the first item on a line */ + if (cpd.settings[UO_align_keep_tabs].b) + { + allow_tabs = pc->after_tab; + } + else + { + prev = chunk_get_prev(pc); + allow_tabs = (cpd.settings[UO_align_with_tabs].b && + ((pc->flags & PCF_WAS_ALIGNED) != 0) && + (((pc->column - 1) % cpd.settings[UO_output_tab_size].n) == 0) && + ((prev->column + prev->len + 1) != pc->column)); + } + LOG_FMT(LOUTIND, " %d -", pc->column); + } + + output_to_column(pc->column, allow_tabs); + add_text_len(pc->str, pc->len); + cpd.did_newline = chunk_is_newline(pc); + } + } +} + + +/** + * Given a multi-line comemnt block that starts in column X, figure out how + * much subsequent lines should be indented. + * + * The answer is either 0 or 1. + * + * The decision is based on: + * - the first line length + * - the second line leader length + * - the last line length + * + * If the first and last line are the same length and don't contain any alnum + * chars and (the first line len > 2 or the second leader is the same as the + * first line length), then the indent is 0. + * + * If the leader on the second line is 1 wide or missing, then the indent is 1. + * + * Otherwise, the indent is 0. + * + * @param str The comment string + * @param len Length of the comment + * @param start_col Starting column + * @return 0 or 1 + */ +static int calculate_comment_body_indent(const char *str, int len, int start_col) +{ + int idx = 0; + int first_len = 0; + int last_len = 0; + int width = 0; + + /* find the last line length */ + for (idx = len - 1; idx > 0; idx--) + { + if ((str[idx] == '\n') || (str[idx] == '\r')) + { + idx++; + while ((idx < len) && ((str[idx] == ' ') || (str[idx] == '\t'))) + { + idx++; + } + last_len = len - idx; + break; + } + } + + /* find the first line length */ + for (idx = 0; idx < len; idx++) + { + if ((str[idx] == '\n') || (str[idx] == '\r')) + { + first_len = idx; + while ((str[first_len - 1] == ' ') || (str[first_len - 1] == '\t')) + { + first_len--; + } + + /* handle DOS endings */ + if ((str[idx] == '\r') && (str[idx + 1] == '\n')) + { + idx++; + } + idx++; + break; + } + } + + /* Scan the second line */ + width = 0; + for ( /* nada */; idx < len; idx++) + { + if ((str[idx] == ' ') || (str[idx] == '\t')) + { + if (width > 0) + { + break; + } + continue; + } + if ((str[idx] == '\n') || (str[idx] == '\r')) + { + /* Done with second line */ + break; + } + + /* Count the leading chars */ + if ((str[idx] == '*') || + (str[idx] == '|') || + (str[idx] == '\\') || + (str[idx] == '#') || + (str[idx] == '+')) + { + width++; + } + else + { + break; + } + } + + //LOG_FMT(LSYS, "%s: first=%d last=%d width=%d\n", __func__, first_len, last_len, width); + + /*TODO: make the first_len minimum (4) configurable? */ + if ((first_len == last_len) && ((first_len > 4) || first_len == width)) + { + return(0); + } + + return((width == 2) ? 0 : 1); +} + +/** + * Outputs the CPP comment at pc. + * CPP comment combining is done here + * + * @return the last chunk output'd + */ +chunk_t *output_comment_cpp(chunk_t *first) +{ + int col = first->column; + int col_br = 1 + (first->brace_level * cpd.settings[UO_indent_columns].n); + + /* Make sure we have at least one space past the last token */ + if (first->parent_type == CT_COMMENT_END) + { + chunk_t *prev = chunk_get_prev(first); + if (prev != NULL) + { + int col_min = prev->column + prev->len + 1; + if (col < col_min) + { + col = col_min; + } + } + } + + /* Bump out to the column */ + output_indent(col, col_br); + + if (!cpd.settings[UO_cmt_cpp_to_c].b) + { + add_text_len(first->str, first->len); + return(first); + } + + /* If we are grouping, see if there is something to group */ + bool combined = false; + if (cpd.settings[UO_cmt_cpp_group].b) + { + /* next is a newline by definition */ + chunk_t *next = chunk_get_next(first); + if ((next != NULL) && (next->nl_count == 1)) + { + next = chunk_get_next(next); + + /** + * Only combine the next comment if they are both at indent level or + * the second one is NOT at indent or less + * + * A trailing comment cannot be combined with a comment at indent + * level or less + */ + if ((next != NULL) && + (next->type == CT_COMMENT_CPP) && + (((next->column == 1) && (first->column == 1)) || + ((next->column == col_br) && (first->column == col_br)) || + ((next->column > col_br) && (first->parent_type == CT_COMMENT_END)))) + { + combined = true; + } + } + } + + if (!combined) + { + /* nothing to group: just output a single line */ + add_text_len("/*", 2); + if ((first->str[2] != ' ') && (first->str[2] != '\t')) + { + add_char(' '); + } + add_text_len(&first->str[2], first->len - 2); + add_text_len(" */", 3); + return(first); + } + + chunk_t *pc = first; + chunk_t *last = first; + + /* Output the first line */ + add_text_len("/*", 2); + if (combined && cpd.settings[UO_cmt_cpp_nl_start].b) + { + /* I suppose someone more clever could do this without a goto or + * repeating too much code... + */ + goto cpp_newline; + } + goto cpp_addline; + + /* Output combined lines */ + while ((pc = chunk_get_next(pc)) != NULL) + { + if ((pc->type == CT_NEWLINE) && (pc->nl_count == 1)) + { + continue; + } + if (pc->type != CT_COMMENT_CPP) + { + break; + } + if (((pc->column == 1) && (first->column == 1)) || + ((pc->column == col_br) && (first->column == col_br)) || + ((pc->column > col_br) && (first->parent_type == CT_COMMENT_END))) + { + last = pc; +cpp_newline: + add_char('\n'); + output_indent(col, col_br); + add_char(' '); + add_char(cpd.settings[UO_cmt_star_cont].b ? '*' : ' '); +cpp_addline: + if ((pc->str[2] != ' ') && (pc->str[2] != '\t')) + { + add_char(' '); + } + add_text_len(&pc->str[2], pc->len - 2); + } + } + + if (cpd.settings[UO_cmt_cpp_nl_end].b) + { + add_char('\n'); + output_indent(col, col_br); + } + add_text_len(" */", 3); + return(last); +} + +void output_comment_multi(chunk_t *pc) +{ + int cmt_col = pc->column; + const char *cmt_str; + int remaining; + char ch; + chunk_t *prev; + char line[1024]; + int line_len; + int line_count = 0; + int ccol; + int col_diff = 0; + int xtra = 1; + + prev = chunk_get_prev(pc); + if ((prev != NULL) && (prev->type != CT_NEWLINE)) + { + cmt_col = pc->orig_col; + } + else + { + col_diff = pc->orig_col - pc->column; + } + + // fprintf(stderr, "Indenting1 line %d to col %d (orig=%d) col_diff=%d\n", + // pc->orig_line, cmt_col, pc->orig_col, col_diff); + + xtra = calculate_comment_body_indent(pc->str, pc->len, pc->column); + + ccol = 1; + remaining = pc->len; + cmt_str = pc->str; + line_len = 0; + while (remaining > 0) + { + ch = *cmt_str; + cmt_str++; + remaining--; + + /* handle the CRLF and CR endings. convert both to LF */ + if (ch == '\r') + { + ch = '\n'; + if (*cmt_str == '\n') + { + cmt_str++; + remaining--; + } + } + + /* Find the start column */ + if (line_len == 0) + { + if (ch == ' ') + { + ccol++; + continue; + } + else if (ch == '\t') + { + ccol = calc_next_tab_column(ccol, cpd.settings[UO_input_tab_size].n); + continue; + } + else + { + //fprintf(stderr, "%d] Text starts in col %d\n", line_count, ccol); + } + } + + line[line_len++] = ch; + + /* If we just hit an end of line OR we just hit end-of-comment... */ + if ((ch == '\n') || (remaining == 0)) + { + line_count++; + + /* strip trailing tabs and spaces before the newline */ + if (ch == '\n') + { + line_len--; + while ((line_len > 0) && + ((line[line_len - 1] == ' ') || + (line[line_len - 1] == '\t'))) + { + line_len--; + } + line[line_len++] = ch; + } + line[line_len] = 0; + + if (line_count == 1) + { + /* this is the first line - add unchanged */ + + /*TODO: need to support indent_with_tabs mode 1 */ + output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b); + add_text_len(line, line_len); + } + else + { + /* This is not the first line, so we need to indent to the + * correct column. + */ + ccol -= col_diff; + if (ccol < cmt_col) + { + ccol = cmt_col; + } + + if (line[0] == '\n') + { + /* Emtpy line - just a '\n' */ + if (cpd.settings[UO_cmt_star_cont].b) + { + output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b); + add_text((xtra == 1) ? " *" : "*"); + } + add_char('\n'); + } + else + { + /* If this doesn't start with a '*' or '|' */ + if ((line[0] != '*') && (line[0] != '|') && (line[0] != '#') && + (line[0] != '\\') && (line[0] != '+')) + { + output_to_column(cmt_col, cpd.settings[UO_indent_with_tabs].b); + if (cpd.settings[UO_cmt_star_cont].b) + { + add_text((xtra == 1) ? " * " : "* "); + } + else + { + add_text(" "); + } + output_to_column(ccol, cpd.settings[UO_indent_with_tabs].b); + } + else + { + output_to_column(cmt_col + xtra, cpd.settings[UO_indent_with_tabs].b); + } + add_text_len(line, line_len); + } + } + line_len = 0; + ccol = 1; + } + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp new file mode 100644 index 00000000..537454b1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/override_virtual.cpp @@ -0,0 +1,16 @@ +struct A +{ + virtual void foo(); + virtual void bar() = 0; + virtual void baz() const { + } +}; + +struct B : public A +{ + virtual void foo() override; + void bar() override { + } + void baz() const override { + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp new file mode 100644 index 00000000..6d734b1f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/parameter-packs.cpp @@ -0,0 +1,77 @@ +template<typename...A, int...B> +struct foo1:foo1<A..., (sizeof...(A)+B)...> +{ + foo1() { + int x = sizeof...(A); + } +}; + +template<int...X> int bar1() +{ + auto s = sizeof...(X); + chomp(X)...; + return X+...; +} + +template<class R, typename...Args> +void call1v(R(*fp)(Args...)); + +template<class R, typename...Args> +void call1p(R(*fp)(Args*...)); + +template<class R, typename...Args> +void call1r(R(*fp)(Args&&...)); + +template<class R, typename...Args> +struct invoke1v : invoke<R(*)(Args...)> +{ +}; + +template<class R, typename...Args> +struct invoke1p : invoke<R(*)(Args*...)> +{ +}; + +template<class R, typename...Args> +struct invoke1r : invoke<R(*)(Args&&...)> +{ +}; + +template < typename ... A , int ... B > +struct foo2 : foo2 < A ... , ( sizeof ... ( A ) + B ) ... > +{ + foo2() { + int x = sizeof ... ( A ); + } +}; + +template < int ... X > int bar2() +{ + auto s = sizeof ... ( X ); + chomp( X ) ...; + return X + ...; +} + +template < class R , typename ... Args > +void call2v( R ( *fp ) ( Args ... ) ); + +template < class R , typename ... Args > +void call2p( R ( *fp ) ( Args * ... ) ); + +template < class R , typename ... Args > +void call2r( R ( *fp ) ( Args && ... ) ); + +template < class R , typename ... Args > +struct invoke2v : invoke < R ( * ) ( Args ... ) > +{ +}; + +template < class R , typename ... Args > +struct invoke2p : invoke < R ( * ) ( Args * ... ) > +{ +}; + +template < class R , typename ... Args > +struct invoke2r : invoke < R ( * ) ( Args && ... ) > +{ +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp new file mode 100644 index 00000000..8d9e222e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/patch_32.cpp @@ -0,0 +1 @@ +//! test diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h new file mode 100644 index 00000000..ef01470e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_bool_in_template.h @@ -0,0 +1,7 @@ +#include <type_traits>
+
+template<typename U, typename V, typename = std::enable_if_t<!std::is_convertible<U, V>::value && !std::is_same<U, V>::value>>
+void foo(U &&u, V &&v)
+{
+
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp new file mode 100644 index 00000000..4d55a541 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pos_shift.cpp @@ -0,0 +1,16 @@ +void foo() +{ + // Ensure non-shift operators aren't changed + x = 1 + + 2; + x = 1 + + 2; + x = 1 + 2; + + // Test position of shift operator + cout << x + << y; + cout << x << + y; + cout << x << y; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp new file mode 100644 index 00000000..8ec5657f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-define-indent.cpp @@ -0,0 +1,35 @@ + +#define outpsize +#define some(f)\ +foo(f) + +class CRC +{ +public: +int foo; +// Initial CRC Start Value + #define 24BITCRC ((ULONG) 0x00864CFB) // This line is not aligned with the other lines +char ch; +#define MULTI LINE DEFINE \ + in column 0 \ +that spans +//// Operations //// +public: +... +} + +{ +#if defined(WIN32) + SYSTEMTIME st; + DWORD ThreadId; +#else + struct timeval mytv; + struct tm *mytm; + pid_t ProcessId; +#endif + +#if SOME COND + (void)loop; +#endif +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp new file mode 100644 index 00000000..75b3c46d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp-pragma.cpp @@ -0,0 +1,21 @@ +#include <stdio.h> +int main(int argc, char** argv) +{ +#ifdef DEBUG +#define FORMAT "argc=%d\n" +std::printf(FORMAT,argc); +#undef FORMAT +#endif DEBUG +#ifdef _OPENMP +#pragma omp parallel +{ +printf("Hello from thread!\n"); +} +#endif + +#pragma CoverageScanner(cov-off) +__pragma ( CoverageScanner(cov-off) ) +_Pragma ( CoverageScanner(cov-off) ) + +return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp new file mode 100644 index 00000000..86ed0a8f --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_brace.cpp @@ -0,0 +1,24 @@ +// Example for preprocessor statement in a function definition
+// Config uses more than tested option, uses:
+// pp_if_indent_code = true to enable preprocesser indent
+// pp_indent_brace = false to override preprocessor indent for braces
+MyClass::MyClass()
+{
+ if(isSomething)
+ {
+ DoSomething();
+ }
+
+#if (USE_FIVE)
+ {
+ DoSomethingAlso();
+ }
+#endif
+
+#if (USE_SIX)
+ {
+ Six mySix;
+ DoSomethingWithSix(mySix);
+ }
+#endif
+}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp new file mode 100644 index 00000000..da61641a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_case.cpp @@ -0,0 +1,23 @@ +// Example for case in a preprocesser statement
+// Config uses more than tested option, uses:
+// pp_if_indent_code = true to enable preprocesser indent
+// pp_indent_case = false to override preprocessor indent for case blocks
+switch(...)
+{
+case 1:
+case 2:
+{
+ int v;
+ ...
+}
+break;
+
+#if (USE_FIVE)
+ case 3:
+ doFive();
+ break;
+#endif
+
+default:
+ break;
+}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp new file mode 100644 index 00000000..76cfc4bf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_extern.cpp @@ -0,0 +1,14 @@ +// Example for extern "C" blocks inside preprocessor statements
+// Config uses more than tested option, uses:
+// pp_if_indent_code = true to enable preprocesser indent
+// pp_indent_extern = false to override preprocessor indent for braces
+int x = 1;
+#ifdef __cplusplus
+ extern "C" {
+
+ void some_c_function
+ (
+ void
+ );
+ }
+#endif
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp new file mode 100644 index 00000000..7a0bcecf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_indent_func_def.cpp @@ -0,0 +1,11 @@ +// Example of function definitions inside of preprocessor statements
+// Config uses more than tested option, uses:
+// pp_if_indent_code = true to enable preprocesser indent
+// pp_indent_func_def = false to override preprocessor indent for function definitions
+int x = 1;
+#if (USE_AWESOME_FUNCTIONS)
+ void MyClass::SomeAwesomeFunction()
+ {
+ DoSomethingInAFunction();
+ }
+#endif
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp new file mode 100644 index 00000000..98418c46 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/pp_multi_comment.cpp @@ -0,0 +1,11 @@ +#define CTOR(i, _) : \ + T(X()), \ +/* + * multi + */ \ +\ + y() \ +{ } +main() +{ } + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp new file mode 100644 index 00000000..35e8bea3 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/proto-wrap.cpp @@ -0,0 +1,4 @@ +WRAP_FUNCTION(Foo, Bar& (void)); +WRAP_FUNCTION(Foo, Bar* (void)); +WRAP_FUNCTION(Foo, (Bar& (void))); +WRAP_FUNCTION(Foo, (Bar* (void))); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp new file mode 100644 index 00000000..ff0ab369 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/ptr-star.cpp @@ -0,0 +1,70 @@ +int dx = m_ClipBox.GetWidth() * GetZoom(); + +m_ClipBox.m_Pos.y = PaintClipBox.y * GetZoom(); + +int* i; +char*i; + +int MyFunc(std::string& s, char*) { +char *c = const_cast<char*>(s.c_str()); +} + +int YerFunc(std::string& s, char**) { +char **c; +int a = b[0] * c; +} + +int*X(int *i, int*); + +int *i = &a; +int *i = *b; +int *i = &*c; + +int *Aclass::X(int* i, int *); + +class Aclass { +int *X(int* i, int *); +} +extern "C" { +int foo1(int *a); +int foo2(sometype *a); +} +int bar1(int *a); +int bar2(sometype *a); + +struct X +{ +int * a; // 3:5 + +int f() +{ +return * b ; // 7:8 +} +int g() +{ +return * c ; // 11:8 +} +}; + +int *const i; +int *static i; + +static auto Func1(Model *model) -> Color*; +static auto Func1(Model *model) -> Color* { + return nullptr; +} + +auto Func2(Model *model) -> Color* const; +auto Func2(Model *model) -> Color* const { + return nullptr; +} + +auto Func3(Model *model) -> Color**; +auto Func3(Model *model) -> Color** { + return nullptr; +} + +auto Func4(Model *model) -> Color** const; +auto Func4(Model *model) -> Color** const { + return nullptr; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp new file mode 100644 index 00000000..e318c1aa --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qt-1.cpp @@ -0,0 +1,35 @@ +class Foo: public QObject +{ +Q_OBJECT + +private slots: +void mySlot() {} + +public slots: +void publicSlot(); + +signals: +void somesignal(); + +}; + +class foo{bool b;public:int i;};class bar:public +foo{void*p;protected:double d;enum e{A,B};private:}; + +class Foo1: public QObject +{ +Q_OBJECT + +private Q_SLOTS: +void mySlot(); + +public Q_SLOTS: +void publicSlot(); + +Q_SIGNALS: +void somesignal(); +}; + +class foo1{bool b;public:int i;};class bar:public +foo1{void*p;protected:double d;}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp new file mode 100644 index 00000000..5037d792 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/qtargs.cpp @@ -0,0 +1,13 @@ +void foo()
+{
+ QObject::connect (m_NetworkReply,
+ SIGNAL (error(QNetworkReply::NetworkError)),
+ this,
+ SLOT (NetworkReplyError(QNetworkReply::NetworkError)));
+ QObject::connect (m_NetworkReply,
+ SIGNAL (uploadProgress(qint64, qint64)),
+ this,
+ SLOT (NetworkReplyUploadProgress(qint64, qint64)));
+ connect(&m_SendReportThread, SIGNAL(ProgressChanged(size_t, size_t)),
+ SLOT(OnReportProgressChanged(size_t, size_t)));
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp new file mode 100644 index 00000000..28447084 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/region.cpp @@ -0,0 +1,20 @@ +class X : Y { + int foo1; + #pragma region something + int foo2 = 2; + #pragma endregion + int foo() + { + + #pragma region something else + int foo3 = 3; + #pragma region nested + int foo4 = 0; + #pragma endregion + int foo5 = 0; + #pragma endregion + } + +} + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp new file mode 100644 index 00000000..cf86baeb --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_braced_init.cpp @@ -0,0 +1,18 @@ +int foo1() +{ + // should not have newline before '.' + return std::pair<int, int>{1, 2}.first; +} + +int foo2() +{ + // should be ARITH, not ADDR + return int{3} & 2; +} + +int foo3() +{ + // should be ARITH, not ADDR + constexpr static int x = 3; + return decltype(x){x} & 2; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp new file mode 100644 index 00000000..f58dfee5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/return_init_list.cpp @@ -0,0 +1,30 @@ +inline static std::tuple<bool, std::string> foo(void) { +// should remain a one liner +return{true, ""s}; +} +inline static std::tuple<bool, std::string, std::string> foo(void) { +if (condition) { +// should remain a one liner +return{true, ""s, ""s}; +} +// should remain a one liner +return{false, ""s, ""s}; +} +inline static std::tuple<bool, std::string> foo(void) { +// should indent one level +return{ +true, ""s +}; +} +inline static std::tuple<bool, std::string> foo(void) { +// should indent one level on new line +return +{ true, ""s }; +} +inline static std::tuple<bool, std::string> foo(void) { +// should indent one level for braces and another level for values +return +{ +true, ""s +}; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp new file mode 100644 index 00000000..85ab1a70 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/returns.cpp @@ -0,0 +1,30 @@ +#define foo1(x) { return x; } +#define foo2(x) { return(x); } +#define foo3(x) { return (x); } +#define foo4(x) { return{x}; } +#define foo5(x) { return {x}; } + +#define case1(x) return x +#define case2(x) return(x) +#define case3(x) return (x) +#define case4(x) return{x} +#define case5(x) return {x} + +void foo(int x) +{ + switch (x) + { + case 1: + return 1; + case 2: + return(2); + case 3: + return (3); + case 4: + return{4}; + case 5: + return {5}; + default: + return; + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp new file mode 100644 index 00000000..add2fc4a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sef.cpp @@ -0,0 +1,6 @@ +CFoo::CFoo(const DWORD something, const RECT& positionRect, const UINT aNumber, bool thisIsReadOnly, const CString& windowTitle, CInfo *pStructInfo, int widthOfSomething) : CSuperFoo(something, positionRect, aNumber, +thisIsReadOnly, windowTitle), m_pInfo(pInfo), m_width(widthOfSomething) +{ +} + +// this_comment_has_a_first_word_that_is_too_long_to_fit_into_a_line_without_wrapping and should not start with a blank comment line. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp new file mode 100644 index 00000000..a344480b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolon-removal-after-ternary-operator.cpp @@ -0,0 +1,9 @@ +std::string StrGet() +{ + return IsConnected() ? "Connected" : {}; +} + +std::string StrGet2() +{ + return !IsConnected() ? {} : "Connected"; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp new file mode 100644 index 00000000..52796f75 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/semicolons.cpp @@ -0,0 +1,106 @@ +static int foo(int bar); + +static int foo(int bar) +{ + for (;;) + { + break; + };; + if (a) + { + foo();; + }; + + if (b) + if (c) + bar(); + else + ; + + else + { + foo();;;;; + }; + switch (a) + { + case 1: break; + case 2: break; + default: break;; + };; + while (b-->0) + { + bar();; + }; + do + { + bar(); + } while (b-->0 ); +}; + +enum FPP { + FPP_ONE = 1, + FPP_TWO = 2, +};; + +struct narg { + int abc; ; ; + char def; ; ; + ; + ;const char *ghi; +}; + +class CFooRun { + long stick(); + int bar() { m_ick++; }; + + CFooRun();; + ~CFooRun() {}; +}; + +void f() +{ + if (tmp[0] == "disk") + { + tmp = split (tmp[1], ","); + DiskEntry entry = { tmp[0], tmp[2], + stxxl::int64 (str2int (tmp[1])) * + stxxl::int64 (1024 * 1024) }; + disks_props.push_back (entry); + } +} + +template < class > struct type; + +template < class T > +class X { + typedef type < T > base ; + void f () { + ( base :: operator * () ) ;; + }; +}; + +namespace N +{ +class C +{ +#define NOP(x) { } +}; +} + +namespace N +{ + class C + { + }; +} + +void deallocate2(S **s_ptr) +{ + { + void *stopper_for_apply = (int[]){0}; + void **list_for_apply = (void *[]){(*s_ptr)->arr, *s_ptr, stopper_for_apply}; + for (int i = 0; list_for_apply[i] != stopper_for_apply; i++) { + saferFree((void *) & (list_for_apply[i])); + } + }; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp new file mode 100644 index 00000000..97dfe0cf --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.2886991.cpp @@ -0,0 +1,12 @@ + +void log_fmt( log_sev_t sev, const char *fmt,... ) __attribute__((format(printf, 2, 3))); + +#define LOG_FMT(sev, args...) \ + do { if (log_sev_on(sev)) { log_fmt(sev, ## args); } } while (0) + +void foo() +{ +try {} +catch (...) // <== HERE +{} +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp new file mode 100644 index 00000000..69f877ed --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3266678.cpp @@ -0,0 +1,5 @@ +void CMyClass::myFunction() +{ +CMyReferencePointer & tmpPointer = (CMyReferencePointer & )getMyValue(); +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h new file mode 100644 index 00000000..58921bc5 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf.3315874.h @@ -0,0 +1,47 @@ +#undef dot +#undef cross + +extern "C" { +#include "data_types.h" +} + vec_ operator+(const vec_&, const vec_&); /* v = v1 + v2 */ + vec_ operator-(const vec_&, const vec_&); /* v = v1 - v2 */ + mat_ operator+(const mat_&, const mat_&); /* m = m1 + m2 */ + mat_ operator-(const mat_&, const mat_&); /* m = m1 - m2 */ + vec_& operator+=(vec_&, const vec_&); /* v += v2 */ + mat_& operator+=(mat_&, const mat_&); /* m += m2 */ + vec_& operator-=(vec_&, const vec_&); /* v -= v2 */ + mat_& operator-=(mat_&, const mat_&); /* m -= m2 */ + vec_ operator*(double, const vec_&); /* v = a * v1 */ + mat_ operator*(double, const mat_&); /* m = a * m1 */ + vec_ operator*(const vec_&, double); /* v = v1 * a */ + mat_ operator*(const mat_&, double); /* m = m1 * a */ + vec_ operator/(const vec_&, double); /* v = v1 / a */ + mat_ operator/(const mat_&, double); /* m = m1 / a */ + vec_ operator*=(vec_&, const double a); /* v *= a */ + vec_ operator/=(vec_&, const double a); /* v /= a */ + vec_ operator*(const mat_&, const vec_&); /* v = m1 * v1 */ + mat_ operator*(const mat_&, const mat_&); /* m = m1 * m2 */ + quat_ operator*(const quat_&, const quat_&); /* q = q1 * q2 */ + quat_ operator*(double, const quat_&); /* q = a * q1 */ + quat_ operator*(const quat_&, double); /* q = q1 * a */ + quat_ operator/(const quat_&, double); /* q = q1 / a */ + vec_ operator-(const vec_&); /* v = - v1 */ + vec_ operator+(const vec_&); /* v = + v1 */ + mat_ operator-(const mat_&); /* m = - m1 */ + mat_ operator+(const mat_&); /* m = + m1 */ + quat_ operator+(const quat_&); /* q = + q */ + quat_ operator-(const quat_&); /* q = - q */ + quat_& operator*=(quat_&, const quat_&); /* q1 *= q2; */ + quat_& operator+=(quat_&, const quat_&); /* q1 += q2; */ + quat_& operator*=(quat_&, const double a); /* q1 *= a; */ + quat_ operator+(const quat_& q1, const quat_& q2); /* q3 = q1 + q2 */ + vec_ unit(const vec_&); /* unitize vec */ + quat_ unit(const quat_&); /* unitize quat */ + mat_ trans(const mat_&); /* transpose matrix */ + quat_ trans(const quat_&); /* transpose quat */ + double dot(const vec_, const vec_); /* vector dot product */ + vec_ cross(const vec_, const vec_); /* vector cross product */ + + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp new file mode 100644 index 00000000..c7ba93cc --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf557.cpp @@ -0,0 +1,4 @@ +//test.cpp +void test_fun(std::size_t a, + std :: size_t /* b */); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp new file mode 100644 index 00000000..15ee8e79 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf562.cpp @@ -0,0 +1,9 @@ +#include "bar.h" + +class Foo : public Bar { + int foo(int bar) const { + while (true) { + baz(&operator[](bar)); + } + } +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp new file mode 100644 index 00000000..0c1d5fc9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf567.cpp @@ -0,0 +1,16 @@ +package com.temp.test; + +public class Database +{ + private Database(String fileName) + { + readConfig(fileName, "asdfasdf", 1); + readConfig(ame, "aasdf", 1); + + Database::readConfig(fileName, "asdfasdf", 1); + Database::readConfig(ame, "aasdf", 1); + + ::readConfig(fileName, "asdfasdf", 1); + ::readConfig(ame, "aasdf", 1); + } +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp new file mode 100644 index 00000000..3f5a98d4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf574.cpp @@ -0,0 +1,13 @@ + +class A : public B +{ +A& operator=(const A& other){ +if (this == &other)return *this; +B::operator=(other); +if (this == &other)return *this; +B::opera(other); +copy(other); +return *this; +} + +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp new file mode 100644 index 00000000..8eba4d1e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf583.cpp @@ -0,0 +1,6 @@ +#include <utility> + +std::pair<int, int> make_pair(int first, int second) +{ + return {first, second}; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp new file mode 100644 index 00000000..1fc0ded8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sf593.cpp @@ -0,0 +1,11 @@ +typedef boost::shared_ptr < RatherLongClassName > sp_RatherLongClassName_t; +int main() +{ + int argument = 1; + sp_RatherLongClassName_t ratherLongVariableName1(new RatherLongClassName(argument, + argument, argument)); + + int the_result = a_very_long_function_name_taking_most_of_the_line(argument, + argument, argument); + return 0; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h new file mode 100644 index 00000000..29c52879 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sim.h @@ -0,0 +1,50 @@ +namespace ns { + +template<typename T, template<typename> class TOtherClass> class Example +{ + int foo; +} + +} + +template<class T> class Example +{ + + T getValue() const; + + /** A pointer to a T returning function in the software environment */ + T (FunctionProvider::*pF)(); + +}; + + +#if !defined(EVERYTHING_OK) +#error Define EVERYTHING_OK if you would like to compile your code \ +or not if you would like to stop! +#endif + + +template <class V> +class Example +{ + + Vector2<V>() + : x(1), + y(1) + {} + + Vector2<double>() + : x(1.0), + y(1.0) + {} + + Vector2<float>() + : x(1.0f), + y(1.0f) + {} + + V x; + V y; + +}; + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp new file mode 100644 index 00000000..7710171e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_angle.cpp @@ -0,0 +1,6 @@ +template <typename T> +struct foo {}; + +Q_DECLARE_METATYPE(foo<int> ) + +int bar(foo<int> ); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp new file mode 100644 index 00000000..caea467a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_constr_colon.cpp @@ -0,0 +1,6 @@ +struct MyClass : public Foo { + MyClass(int a, + int b, + int c) + : m_a(a), m_b(b), m_c(c) {} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp new file mode 100644 index 00000000..18448555 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_decltype.cpp @@ -0,0 +1,8 @@ +int x; +char y; +auto x1 = decltype(x) {0}; +auto y1 = decltype(y) {'a'}; + +unsigned rows; +for (auto row = decltype(rows){0}; row < rows; ++row) { +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp new file mode 100644 index 00000000..6f235d22 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_after_type.cpp @@ -0,0 +1,13 @@ +static int x1; +unsigned long int y1 = (unsigned short)0; +const int foo1(int x); + +foo((const int*)0); +static_cast<long long>(0); + +static int x2; +unsigned long int y2 = ( unsigned short ) 0 ; +const int foo2 ( int x ); + +foo ( ( const int * ) 0 ); +static_cast < long long > ( 0 ) ; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp new file mode 100644 index 00000000..911aa53b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_angle_paren.cpp @@ -0,0 +1,5 @@ +void foo() +{ + bar<T> (); + bar<T>(a); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp new file mode 100644 index 00000000..ab2096c8 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_arith_additive.cpp @@ -0,0 +1,2 @@ +int i = 0 + 3 - 4 * 3 % 3; +int ii = 0+3-4*3%3;
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp new file mode 100644 index 00000000..dc5f5e8e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_balance_nested_parens.cpp @@ -0,0 +1,6 @@ +void MainWindow::createView() +{ + a = B((c) + (d)); + a = B( (c) + (d)); + a = B( (c) + (d) ); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp new file mode 100644 index 00000000..7dd9c14a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_byref_func.cpp @@ -0,0 +1,8 @@ +const Foo & Foo::operator ==(Foo& me){ + ::sockaddr* ptr = (::sockaddr*)&host; + return me; +} + +MyType& MyClass::myMethode() { + const MyType& t = getSomewhere(); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp new file mode 100644 index 00000000..796522c7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_constr_colon.cpp @@ -0,0 +1,4 @@ +struct MyClass : public Foo { + MyClass(int a, int b, int c) : + m_a(a), m_b(b), m_c(c) {} +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp new file mode 100644 index 00000000..45ffb335 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_before_tr_emb_cmt_input.cpp @@ -0,0 +1,13 @@ +/* leading cmt */ int w; +int y;/* embedded cmt */int z; +// whole cpp cmt +int x; // trailing cpp cmt +/* whole c cmt */ +int x; /* trailing c cmt */ +struct foo { // trailing cmt + int x; // trailing cmt + // whole cmt + int a; /* emb cmt */ int b; // trailing cmt +}; // trailing cmt +int a;/* emb cmt */ int b;// trailing cmt + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp new file mode 100644 index 00000000..bb730d61 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_brace.cpp @@ -0,0 +1,14 @@ +template<std::size_t _N, typename _Type, _Type... _Nums> +std::array<uint8_t, _N - 1> constexpr crypt_helper(uint8_t const inSeed, char const(&inString)[_N], std::integer_sequence<_Type, _Nums...>) { +return { {crypt(_Nums, inSeed, static_cast<uint8_t>(inString[_Nums]))...} }; +} +static std::array<double_t, Homology::kNumberOfStats> const m{ { +0.3, +0.6, +1.0 +} }; +static std::array<double_t, Homology::kNumberOfStats> const m = { +0.3, +0.6, +1.0 +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp new file mode 100644 index 00000000..7b4bdc5e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_brace_catch.cpp @@ -0,0 +1,8 @@ +int foo() +{ +try { foo(bar); } catch (int *e) { return 0; } + +if (false) try { throw int(); } catch(...){} + +return 1; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp new file mode 100644 index 00000000..b70ef6b1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_region.cpp @@ -0,0 +1,9 @@ +//BEGIN real region + +int foo() +{ + int x = 0; // BEGIN not-region + return x; //END not-region +} + +// END real region diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc new file mode 100644 index 00000000..6a9b203b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cmt_cpp_start.cc @@ -0,0 +1,3 @@ +int main() { + return 0; //Just return from the function. +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp new file mode 100644 index 00000000..83c60dd4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cparen_oparen.cpp @@ -0,0 +1,5 @@ +class STDMETHOD +{ + STDMETHOD(GetValues)(BSTR bsName, REFDATA** pData); + STDMETHOD(GetValues) (BSTR bsName, REFDATA** pData); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp new file mode 100644 index 00000000..e25d0496 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_cpp_lambda_fparen.cpp @@ -0,0 +1,24 @@ +void test() +{ + []{}(); + []{ foo(); }(); + [x]{ foo(x); }(); + [](int x){ foo(x); }(42); + [y](int x){ foo(x, y); }(42); + bar([]{ return 1; }()); + bar([]{ return foo(); }()); + bar([x]{ return foo(x); }(42)); + bar([](int x){ return foo(x); }(42)); + bar([y](int x){ return foo(x, y); }(42)); + + [] {} (); + [] { foo(); } (); + [x] { foo(x); } (); + [] (int x){ foo(x); } (42); + [y] (int x){ foo(x, y); } (42); + bar([] { return 1; } ()); + bar([] { return foo(); } ()); + bar([x] { return foo(x); } (42)); + bar([] (int x){ return foo(x); } (42)); + bar([y] (int x){ return foo(x, y); } (42)); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp new file mode 100644 index 00000000..3e2f7e47 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_decltype.cpp @@ -0,0 +1,2 @@ +#define foo(expr) (expr) +using x = decltype foo(int); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp new file mode 100644 index 00000000..20dac444 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_enum_colon.cpp @@ -0,0 +1,10 @@ +enum Enum1:int { + E31=0, + E32=1, + E33=2 +}; +enum Enum2 : int { + E31=0, + E32=1, + E33=2 +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp new file mode 100644 index 00000000..90798ef9 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_func_call_paren.cpp @@ -0,0 +1,11 @@ +BEGIN_MESSAGE_MAP(CUSB2_camera_developementDlg, CDialog) +ON_COMMAND(IDC_ESCAPE, On_Escape) +ON_COMMAND(IDC_8_BIT, On_8_Bit) +ON_COMMAND(IDC_14_BIT, On_14_Bit) +ON_COMMAND(IDC_ACQUIRE, On_Acquire) +ON_COMMAND(IDC_SAVE_COLUMN_AVERAGES, On_Save_Column_Averages) +ON_COMMAND(IDC_SAVE_ROW_AVERAGES, On_Save_Row_Averages) +ON_WM_PAINT() +ON_WM_QUERYDRAGICON() +ON_WM_CTLCOLOR() +END_MESSAGE_MAP() diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp new file mode 100644 index 00000000..e9b0c428 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_paren_comma.cpp @@ -0,0 +1,2 @@ +a( , 1); +typedef SLIST_HEAD( , foo) foo_list_t; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp new file mode 100644 index 00000000..fff4aff4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_skip_vbrace_tokens.cpp @@ -0,0 +1,10 @@ +void foo()
+{
+ if (data) go = new ClassA();
+ else go = new ClassB();
+
+ if (evt.alt) modifiers += "Alt+";
+ if (evt.command) modifiers += "Cmd+";
+ if (evt.control) modifiers += "Ctrl+";
+ if (evt.shift) modifiers += "Shift+";
+}
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp new file mode 100644 index 00000000..f45f1a9a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_throw_paren.cpp @@ -0,0 +1,7 @@ + +void foo() +{ + throw(x); + throw (y); + throw (z); +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp new file mode 100644 index 00000000..30e058e7 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/sp_type_func.cpp @@ -0,0 +1,11 @@ +int foo1() +{ +} + +int* foo2() +{ +} + +int& foo3() +{ +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp new file mode 100644 index 00000000..42699d1d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/squeeze_ifdef.cpp @@ -0,0 +1,44 @@ + +#if defined(A) + +// Comment +extern int ax; +void fa(); + +#elif defined(B) + +extern int bx; +void fb(); + +#else + +extern int cx; +void fc(); + +#endif + +int foo() +{ +#if defined(A) + + int a = ax; + +#elif defined(B) + + // Comment + int b = bx; + +#else + + int c = cx; + +#endif +#if defined(A) + return a; +#elif defined(B) + return b; +#else + // Comment + return c; +#endif +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h new file mode 100644 index 00000000..8121fef1 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/static.h @@ -0,0 +1,25 @@ +#ifndef AKONADISERVER_H +#define AKONADISERVER_H + +#include <QtCore/QPointer> +#include <QtCore/QVector> + +#include <QtNetwork/QLocalServer> + +class QProcess; + +namespace Akonadi { +namespace Server { + +class AkonadiServer : public QLocalServer +{ + Q_OBJECT + +public: + ~AkonadiServer(); + static AkonadiServer *instance(); +}; + +} // namespace Server +} // namespace Akonadi +#endif diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp new file mode 100644 index 00000000..a2353599 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/stdcall.cpp @@ -0,0 +1,3 @@ +// test for bug # 633 +typedef void (*func)(); +typedef void (__stdcall *func)(); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp new file mode 100644 index 00000000..3534461b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/string_replace_tab_chars.cpp @@ -0,0 +1,3 @@ +void f() { + auto x = " test\t ... ???"; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp new file mode 100644 index 00000000..1cfea449 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/strings.cpp @@ -0,0 +1,58 @@ +void foo() +{ + BSTR test = L"SID"; + CHAR s[] = "This is a \"test\""; + CHAR ch = 'a'; +} + + +/* The 'u8', 'u', and 'U' prefixes */ +const char *s1 = u8"I'm a UTF-8 string."; +const char16_t *s2 = u"This is a UTF-16 string."; +const char32_t *s3 = U"This is a UTF-32 string."; + +const char c1 = u8'1'; +const char16_t c2 = u'2'; +const char32_t c3 = U'4'; +const wchar_t c4 = L'w'; +const char16_t u = u'\u007f'; + +/* The 'R' and 'R"delim(' prefixes */ +const char *r1 = R"(Xhe String Data \ Stuff " )"; +const char *r2 = R"delimiter(The String Data \ Stuff ")delimiter"; + +/* Multiline string */ +auto foo = R"FOO"( + some + text + and + more + text +)FOO""; + +/* Combo */ +const char *c1 = u8R"XXX(I'm a "raw UTF-8" string.)XXX"; +const char16_t *c2 = uR"*(This is a "raw UTF-16" string.)*"; +const char32_t *c3 = UR"(This is a "raw UTF-32" string.)"; + +/* user-defined */ +OutputType operator "" _Suffix(unsigned long long); +OutputType operator "" _Suffix(long double); + +OutputType some_variable = 1234_Suffix; // uses the first function +OutputType another_variable = 3.1416_Suffix; // uses the second function + +OutputType operator "" _Suffix(const char * string_values, size_t num_chars); +OutputType operator "" _Suffix(const wchar_t * string_values, size_t num_chars); +OutputType operator "" _Suffix(const char16_t * string_values, size_t num_chars); +OutputType operator "" _Suffix(const char32_t * string_values, size_t num_chars); + +OutputType some_variable = "1234"_Suffix; //Calls the const char * version +OutputType some_variable = u8"1234"_Suffix; //Calls the const char * version +OutputType some_variable = L"1234"_Suffix; //Calls the const wchar_t * version +OutputType some_variable = u"1234"_Suffix; //Calls the const char16_t * version +OutputType some_variable = U"1234"_Suffix; //Calls the const char32_t * version + +/* Some stuff that should NOT be detected as a C++0x user-defined literal */ +sscanf(text, "%"SCNx64, &val); +printf("Val=%"PRIx64"\n", val); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp new file mode 100644 index 00000000..474aba08 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-0.cpp @@ -0,0 +1,9 @@ +/* test of + * indent_with_tabs = 0 + * indent_columns = 11 + * the source has many <TAB> + */ +{ + int a; + int b; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp new file mode 100644 index 00000000..dc7a65c4 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/tab-1.cpp @@ -0,0 +1,9 @@ +/* test of + * indent_with_tabs = 1 + * indent_columns = 11 + * the source has NO <TAB> + */ +{ + int x; + int y; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h new file mode 100644 index 00000000..0f102244 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templ_class.h @@ -0,0 +1,16 @@ +template<typename T, template<typename> class SpecialClass> +class Example +{ + // Copy constructor with other variants of Example + template<template<typename> class OtherSpecialClass> + Example(const Example<T, OtherSpecialClass>& other) + { + // do something useful here + } + + /** The normal member var based on the template arguments */ + SpecialClass<T> memberVar; + +}; + + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp new file mode 100644 index 00000000..137205d0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates.cpp @@ -0,0 +1,185 @@ +#include <list> +#include <map> +#include <vector> + +#define MACRO(T) f<T>() + +class MyClass +{ +public: + std::map < int, bool > someData; + std::map < int, std::list < bool > > otherData; +}; + +void foo() +{ + List < byte >bob = new List<byte> (); + +} + +A<B> foo; +A<B,C> bar; +A<B*> baz; +A<B<C> > bay; + +void asd(void) +{ +A<B> foo; +A<B,C> bar; +A<B*> baz; +A<B<C> > bay; + if (a < b && b > c) + { + a = b < c > 0; + } + if (a < bar() > c) + { + } + a < up_lim() ? do_hi() : do_low; + a[ a<b>c] = d; +} + +template<typename T> class MyClass +{ + +} + + template<typename T> + class MyClass + { + } + + template<typename A, typename B, typename C> class MyClass : myvar(0), + myvar2(0) + { + + } + + template<typename A, typename B, typename C> class MyClass + : myvar(0), + myvar2(0) + { + + } + + +static int max_value() + { + return (std :: numeric_limits <int >:: max ) (); + } + +template < class Config_ > +priority_queue < Config_ > :: ~ priority_queue () { + + } + +template<class T> +T test(T a) { +return a; +} + +int main() { +int k,j; +h g<int>; +k=test<int>(j); +return 0; +} + +template<typename T, template<typename, unsigned int, unsigned int> class ConcreteStorageClass> +class RotationMatrix + : public StaticBaseMatrix<T, 3, 3, ConcreteStorageClass> +{ + +public: + + RotationMatrix() + : StaticBaseMatrix<T, 3, 3, ConcreteStorageClass>() + { + // do some initialization + } + + void assign(const OtherClass<T, 3, 3 >& other) + { + // do something + } + +}; + +int main() +{ + MyClass<double, 3, 3, MyStorage> foo; +} + +template< typename CharT, int N, typename Traits > +inline std::basic_ostream<CharT,Traits>& FWStreamOut(std::basic_ostream<CharT,Traits> &os, + const W::S<CharT,N,Traits> &s) + { + return operator<< <CharT, N, Traits, char, std::char_traits<char> >( os, s ); + } + +struct foo { +type1 < int & > bar; +}; +struct foo { +type1 < int const > bar; +}; + + +template <int i> void f(); +template <int i> void g() { +f<i-1>(); +f< i >(); +f<i+1>(); +f<bar()>(); +} +void h() { g<42>(); } + +#include <vector> +std::vector<int> A(2); +std::vector<int> B; +std::vector<int>C(2); +std::vector<int>D; + +template<class T>struct X{template<class U>void operator()(U);}; + +template<class T>class Y{template<class V>void f(V);}; + +void (* foobar)(void) = NULL; +std::vector<void (*)(void)> functions; + +#define MACRO( a ) a +template < typename = int > class X ; +MACRO ( void f ( X < > & x ) ) ; +void g ( X < > & x ) ; + +#include <vector> +typedef std::vector<std::vector<int> > Table; // OK +typedef std::vector<std::vector<bool>> Flags; // Error + +void func(List<B>= default_val1); +void func(List<List<B>>= default_val2); + +BLAH<(3.14 >= 42)> blah; +bool X = j<3>>1; + +void foo() +{ + A<(X>Y)> a; + a = static_cast<List<B>>(ld); +} + +template<int i> class X { /* ... */ }; +X< 1>2 > x1; // Syntax error. +X<(1>2)> x2; // Okay. + +template<class T> class Y { /* ... */ }; +Y<X<1>> x3; // Okay, same as "Y<X<1> > x3;". +Y<X<(6>>1)>> x4; + + +template <typename T> +int +myFunc1(typename T::Subtype val); + +int +myFunc2(T::Subtype val); diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp new file mode 100644 index 00000000..46d41560 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates2.cpp @@ -0,0 +1,54 @@ +void f() +{ +call_a_function(42, +double(-1), +"charray"); +call_a_function(42, +double(-1), +"charray" +); +call_a_function( +42, +double(-1), +"charray" +); +call_a_template_function<int, +int, +int> +(42); +call_a_template_function<int, +int, +int +> +(42); +call_a_template_function<int, +int, +int>(42); +call_a_template_function<int, +int, +int>( +42 +); +call_a_template_function< +int, +int, +int +> +(42); +} +template<class T, +class U> +class W; +template<class T, +class U +> +class X; +template< +class T, +class U> +class Y; +template< +class T, +class U +> +class Z; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp new file mode 100644 index 00000000..55b11d26 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates3.cpp @@ -0,0 +1,26 @@ +template <bool a> +struct T { + typedef int result; +}; +template <bool a, bool b> +struct X { + typedef typename T<a || b>::result result; +}; + +template <class T> +class new_alloc { +public: + void deallocate (int* p, int /*num*/) + { + T::operator delete((void *)p); + } +}; + +void test(void) +{ +return x != 0 +&& x >= 1 +&& x < 2 +&& y >= 3 +&& y < 4; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp new file mode 100644 index 00000000..10b96e4a --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/templates4.cpp @@ -0,0 +1,17 @@ +#define FOO(X) \ +template <unsigned _blk_sz, typename _run_type, class __pos_type> \ +inline X<_blk_sz, _run_type, __pos_type> operator - ( \ +const X<_blk_sz, _run_type, __pos_type> & a, \ +typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \ +{ \ +return X<_blk_sz, _run_type, __pos_type>(a.array, a.pos - off); \ +} \ +template <unsigned _blk_sz, typename _run_type, class __pos_type> \ +inline X<_blk_sz, _run_type, __pos_type> & operator -= ( \ +X < _blk_sz, _run_type, __pos_type > & a, \ +typename X<_blk_sz, _run_type, __pos_type>::_pos_type off) \ +{ \ +a.pos -= off; \ +return a; \ +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp new file mode 100644 index 00000000..6f49594d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt.cpp @@ -0,0 +1,61 @@ +void func() { } + +// **ABC** +void func() { } +// *INDENT-ON* + +void func() { } + +/** + * Function to solve for roots of a generic quartic polynomial of the following form: + * \verbatim + + p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e, + + where a, b, c, d, and e are real coefficients + + * \endverbatim + * + * This object's tolerance defines a threshold for root solutions above which iterative methods will be employed to achieve the desired accuracy + * + * \verbatim - this should cause the following line to not wrap due to cmt_width + * Upon success, the roots array contains the solution to the polynomial p(x) = 0 + * \endverbatim + * + Return value on output: + * - 0, if an error occurs (invalid coefficients) + * - 1, if all roots are real + * - 2, if two roots are real and two roots are complex conjugates + * - 3, if the roots are two pairs of complex conjugates + */ +int solve(double a, + double b, + double c, + double d, + double e, + std::complex<double> roots[4]); + +/** + * Function to solve for roots of a generic quartic polynomial of the following form: + * + + p(x) = a * x^4 + b * x^3 + c * x^2 + d * x + e, + where a, b, c, d, and e are real coefficients + * + * Upon success, root1, root2, root3, and root4 contain the solution to the polynomial p(x) = 0 + * + Return value on output: + * - 0, if an error occurs (invalid coefficients) + * - 1, if all roots are real + * - 2, if two roots are real and two roots are complex conjugates + * - 3, if the roots are two pairs of complex conjugates + */ +/* **ABC** */ + int solve(double a, + double b, + double c, + double d, + double e, + std::complex<double> &root1, + std::complex<double> &root2, + std::complex<double> &root3, + std::complex<double> &root4); +/* ??DEF?? */ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp new file mode 100644 index 00000000..6b4a0a39 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/toggle_processing_cmt2.cpp @@ -0,0 +1,7 @@ +void func() { } + +// *INDENT-OFF* +void func() { } +// ??DEF?? + +void func() { } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp new file mode 100644 index 00000000..de061955 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/trailing_return.cpp @@ -0,0 +1,44 @@ +auto f0(int a, int b) -> int; + +struct Foo +{ + auto f01() -> bool; + auto f02() noexcept -> bool; + auto f03() noexcept(true) -> bool; + auto f04() noexcept(false) -> bool; + auto f05() noexcept -> bool = delete; + auto f06() noexcept(true) -> bool = delete; + auto f07() noexcept(false) -> bool = delete; + + auto f11() const -> bool; + auto f12() const noexcept -> bool; + auto f13() const noexcept(true) -> bool; + auto f14() const noexcept(false) -> bool; + auto f15() const noexcept -> bool = delete; + auto f16() const noexcept(true) -> bool = delete; + auto f17() const noexcept(false) -> bool = delete; + + auto f21() throw() -> bool; + auto f22() throw() -> bool = delete; + auto f23() const throw() -> bool; + auto f24() const throw() -> bool = delete; +}; + +struct Bar +{ + Bar() : m_func([](void*) -> result_t{ return magic; }) {} +}; + +void foo() +{ + auto l = [](int n) -> x_t{ return n + 5; }; + x([](int n) -> x_t{ return n + 5; }); +} + +static auto f25() -> bool { + return true; +} + +static auto f26() const noexcept(true) -> bool { + return true; +} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp new file mode 100644 index 00000000..447f3cbd --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/try-catch-nl.cpp @@ -0,0 +1,10 @@ +int foo() +{ +try { foo(bar); } catch (int *e) { return 0; } + +if (false) try { throw int(); } catch(...){} + +if (a) { return 1; } else { return 0; } +return 1; +} + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp new file mode 100644 index 00000000..53e74de2 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/type_brace_init_lst.cpp @@ -0,0 +1,87 @@ +// Uncrustify does not process the intention of an using alias, +// unknown_kw will therefore no be parsed as known keyword +using unknown_kw = int; + +int main() +{ + // 'int' is a known c++ keyword + auto a0 = int { 1 }; + auto b0 = unknown_kw { 2 }; + auto c0 = ::unknown_kw { 3 }; + auto d0 = (int) unknown_kw { 4 }; + auto e0 = (int) ::unknown_kw { 5 }; + auto f0 = static_cast<int>(unknown_kw { 6 }); + auto g0 = static_cast<int>(::unknown_kw { 7 }); + + auto a1 = int{1}; + auto b1 = unknown_kw{2}; + auto c1 = ::unknown_kw{3}; + auto d1 = (int) unknown_kw{4}; + auto e1 = (int) ::unknown_kw{5}; + auto f1 = static_cast<int>(unknown_kw{6}); + auto g1 = static_cast<int>(::unknown_kw{7}); + + + + auto a2 = int + + {1}; + auto b2 = unknown_kw + + {2}; + auto c2 = ::unknown_kw + + {3}; + auto d2 = (int) unknown_kw + + {4}; + auto e2 = (int) ::unknown_kw + + {5}; + auto f2 = static_cast<int>(unknown_kw + + {6}); + auto g2 = static_cast<int>(::unknown_kw + + {7}); + + + + auto a1 = int{ + + 1 + + }; + auto b1 = unknown_kw{ + + 2 + + }; + auto c1 = ::unknown_kw { + + 3 + + }; + auto d1 = (int) unknown_kw { + + 4 + + }; + auto e1 = (int) ::unknown_kw { + + 5 + + }; + auto f1 = static_cast<int>(unknown_kw { + + 6 + + }); + auto g1 = static_cast<int>(::unknown_kw { + + 7 + + }); + + return 1; +}
\ No newline at end of file diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp new file mode 100644 index 00000000..37a131e0 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/uniform_initialization.cpp @@ -0,0 +1,9 @@ +void whatever() { + SomeStruct a = SomeStruct{1, 2, 3}; + + someFuncCall(SomeStruct{4, 5, 6}); + } + +namespace foo { + int bar(); +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp new file mode 100644 index 00000000..82854287 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/using-alias-in-define.cpp @@ -0,0 +1,6 @@ +#define UNC_DECLARE_FLAGS(flag_type, enum_type) \ + using flag_type = flags<enum_type> + +#define UNC_DECLARE_OPERATORS_FOR_FLAGS(flag_type) \ + inline flag_type operator&(flag_type::enum_t f1, flag_type::enum_t f2) \ + { return(flag_type { f1 } & f2); } diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp new file mode 100644 index 00000000..0cca962b --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/var_def_gap.cpp @@ -0,0 +1,27 @@ +#define A -3 +#define B 163 +#define C 2 + +void foo() +{ + const std::string &targetName1 = pEntry->getTargetName();
+ const Point3d_t currentPosition1 = pSatOrbit->GetPositionAtTime(jdNow);
+} + +void foo2() +{ + const std::string ** targetName2 = pEntry->getTargetName();
+ const Point3d_t currentPosition2 = pSatOrbit->GetPositionAtTime(jdNow);
+} + +void foo2() +{ + const std::string** targetName3 = pEntry->getTargetName();
+ const Point3d_t currentPosition3 = pSatOrbit->GetPositionAtTime(jdNow);
+} + +typedef int MY_INT; +typedef int *MY_INTP; +typedef int (*foo_t)(void *bar); +typedef int (*somefunc_t)(void *barstool); + diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h new file mode 100644 index 00000000..f522097c --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/variadic-template.h @@ -0,0 +1,10 @@ +template<int __i, int... _Indexes, typename _IdxHolder, typename... +_Elements> +struct __index_holder_impl<__i, __index_holder<_Indexes...>, +_IdxHolder, _Elements...> +{ +typedef typename __index_holder_impl<__i + 1, +__index_holder<_Indexes..., +__i>, +_Elements...>::type type; +}; diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp new file mode 100644 index 00000000..99e01b6e --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/tests/input/cpp/wacky-template.cpp @@ -0,0 +1,12 @@ +template<typename flt_t> +template<typename gamma_t, typename gamma2_t, typename alpha_t, typename +beta_t, typename tail_extrinsic_t, typename rec_tail_t> + +void turbo_dec_1_15<flt_t>::compute_tail(gamma_t const & gamma, +gamma2_t const & gamma2, +alpha_t const & alpha, +beta_t const & beta, +tail_extrinsic_t & tail_extrinsic, +rec_tail_t const & rec_tail) +{ +} |