From eb41bede5e5e0a1f351636ca075c664fb51a5b69 Mon Sep 17 00:00:00 2001 From: Imbus <> Date: Sat, 11 Jan 2025 17:54:29 +0100 Subject: [PATCH] Mass reformat --- junk/1.5.cc | 30 +++++++++--------- junk/1.cc | 82 ++++++++++++++++++++++++------------------------ junk/2.cc | 14 ++++----- junk/3.cc | 48 ++++++++++++++-------------- junk/4.cc | 30 +++++++++--------- junk/class.cc | 10 +++--- template/main.cc | 4 +-- 7 files changed, 107 insertions(+), 111 deletions(-) diff --git a/junk/1.5.cc b/junk/1.5.cc index 6321ecd..256ba97 100644 --- a/junk/1.5.cc +++ b/junk/1.5.cc @@ -3,25 +3,25 @@ using std::cout; struct A { - A() = default; - A(int x) { val = x; } - void print() { cout << "A(" << val << ")"; } - int val; + A() = default; + A(int x) { val = x; } + void print() { cout << "A(" << val << ")"; } + int val; }; struct B { - // B(int x) { a = A(x); } - B(int x) : a(x) {} - void print() { - cout << "B("; - a.print(); - cout << ")"; - } - A a; + // B(int x) { a = A(x); } + B(int x) : a(x) {} + void print() { + cout << "B("; + a.print(); + cout << ")"; + } + A a; }; int main() { - B b(10); - b.print(); - cout << "\n"; + B b(10); + b.print(); + cout << "\n"; } diff --git a/junk/1.cc b/junk/1.cc index 6e3f30b..5eaa623 100644 --- a/junk/1.cc +++ b/junk/1.cc @@ -4,60 +4,60 @@ using std::cout; // Rule of three: // If a class requires a user-defined destructor, a user-defined copy -// constructor, or a user-defined copy assignment operator, it almost certainly -// requires all three. +// constructor, or a user-defined copy assignment operator, it almost +// certainly requires all three. // // Rule of five: // Because the presence of a user-defined (include = default or = delete -// declared) destructor, copy-constructor, or copy-assignment operator prevents -// implicit definition of the move constructor and the move assignment operator, -// any class for which move semantics are desirable, has to declare all five -// special member functions: +// declared) destructor, copy-constructor, or copy-assignment operator +// prevents implicit definition of the move constructor and the move +// assignment operator, any class for which move semantics are desirable, has +// to declare all five special member functions: struct A { - A() = default; - /* Constructor */ - A(const int &x) { val = x; } - /* Copy constructor */ - A(A &other) { other.val = this->val; } - /* Move constructor */ - A(A &&other) { other.val = this->val; } - /* Copy assignment operator */ - A &operator=(const A &other) { return *this; } - ~A() {} - void print() { cout << "A(" << val << ")"; } - int val; + A() = default; + /* Constructor */ + A(const int &x) { val = x; } + /* Copy constructor */ + A(A &other) { other.val = this->val; } + /* Move constructor */ + A(A &&other) { other.val = this->val; } + /* Copy assignment operator */ + A &operator=(const A &other) { return *this; } + ~A() {} + void print() { cout << "A(" << val << ")"; } + int val; }; struct B { - B(int x) { a = A(x); } - // B(int x) : a(x) {}; - void print() { - cout << "B("; - a.print(); - cout << ")"; - } - A a; + B(int x) { a = A(x); } + // B(int x) : a(x) {}; + void print() { + cout << "B("; + a.print(); + cout << ")"; + } + A a; }; int main() { - B b(10); - b.print(); - cout << "\n"; + B b(10); + b.print(); + cout << "\n"; } struct K { - K() = default; - /* Constructor */ - K(const int &x) { val = x; } - /* Copy constructor */ - K(K &other) : K(other.val) {} - /* Move constructor */ - K(K &&other) : K(other.val) {} - /* Copy assignment operator */ - K &operator=(const K &other) { return *this; } - ~K() {} - void print() { cout << "K(" << val << ")"; } - int val; + K() = default; + /* Constructor */ + K(const int &x) { val = x; } + /* Copy constructor */ + K(K &other) : K(other.val) {} + /* Move constructor */ + K(K &&other) : K(other.val) {} + /* Copy assignment operator */ + K &operator=(const K &other) { return *this; } + ~K() {} + void print() { cout << "K(" << val << ")"; } + int val; }; diff --git a/junk/2.cc b/junk/2.cc index d542b69..bcab3a3 100644 --- a/junk/2.cc +++ b/junk/2.cc @@ -2,18 +2,16 @@ #include void consume_number(int *p) { - std::cout << "Consuming: " << *p << std::endl; - delete p; + std::cout << "Consuming: " << *p << std::endl; + delete p; } void random_int(int &out) { out = rand(); } void use2() { - int i; - random_int(i); - consume_number(&i); + int i; + random_int(i); + consume_number(&i); } -int main(int argc, char *argv[]) { - use2(); -} +int main(int argc, char *argv[]) { use2(); } diff --git a/junk/3.cc b/junk/3.cc index e9adfbe..54508a2 100644 --- a/junk/3.cc +++ b/junk/3.cc @@ -3,43 +3,43 @@ // In C we need a length in bytes to check for equality void compareObject(void *a, void *b, size_t len) { - if (a == b) - std::cout << "Same address" << std::endl; + if (a == b) + std::cout << "Same address" << std::endl; - // Being explicit about pointer type allows pointer arithmetic - unsigned char *i1 = (unsigned char *)a; - unsigned char *i2 = (unsigned char *)b; + // Being explicit about pointer type allows pointer arithmetic + unsigned char *i1 = (unsigned char *)a; + unsigned char *i2 = (unsigned char *)b; - for (size_t i = 0; i < len; i++) { - if (i1[i] != i2[i]) { - std::cout << "Different value" << std::endl; - return; + for (size_t i = 0; i < len; i++) { + if (i1[i] != i2[i]) { + std::cout << "Different value" << std::endl; + return; + } } - } - std::cout << "Same value" << std::endl; + std::cout << "Same value" << std::endl; } template void cmp(T &a, T &b) { - if (&a == &b) - std::cout << "Same object" << std::endl; + if (&a == &b) + std::cout << "Same object" << std::endl; - if (a == b) - std::cout << "Same value" << std::endl; - else - std::cout << "Different value" << std::endl; + if (a == b) + std::cout << "Same value" << std::endl; + else + std::cout << "Different value" << std::endl; } int main() { - int a = 10, b = 10, c = 12; + int a = 10, b = 10, c = 12; - std::cout << "Checking template version" << std::endl; + std::cout << "Checking template version" << std::endl; - cmp(a, b); - cmp(a, c); + cmp(a, b); + cmp(a, c); - std::cout << "Checking C version" << std::endl; + std::cout << "Checking C version" << std::endl; - compareObject(&a, &b, sizeof(int)); - compareObject(&a, &c, sizeof(int)); + compareObject(&a, &b, sizeof(int)); + compareObject(&a, &c, sizeof(int)); } diff --git a/junk/4.cc b/junk/4.cc index f99c9f8..632c7d7 100644 --- a/junk/4.cc +++ b/junk/4.cc @@ -1,21 +1,21 @@ #include -#include #include +#include template std::pair copy_while(InputIt first, InputIt last, OutputIt out, Pred p); std::vector take_while_sum_less_than(std::vector &v, int n) { - std::vector out; - int acc = 0; - while (true) { - if (v.back() + acc > n) { - int next = v.back(); - out.push_back(n); - v.pop_back(); + std::vector out; + int acc = 0; + while (true) { + if (v.back() + acc > n) { + int next = v.back(); + out.push_back(n); + v.pop_back(); + } } - } } #if __cplusplus > 202002L @@ -26,12 +26,12 @@ std::vector take_while_sum_less_than(const std::vector &v, int n) { int sum = 0; auto result = v | std::ranges::views::take_while([&sum, n](int x) { - if (sum + x < n) { - sum += x; - return true; - } - return false; - }); + if (sum + x < n) { + sum += x; + return true; + } + return false; + }); return std::vector(result.begin(), result.end()); } diff --git a/junk/class.cc b/junk/class.cc index 75817d7..24b52f9 100644 --- a/junk/class.cc +++ b/junk/class.cc @@ -1,12 +1,12 @@ #include template class User { - T id; + T id; -public: - explicit User(T n) : id(n) {} + public: + explicit User(T n) : id(n) {} }; int main() { - User user1{1}; - User user2(0xFF); + User user1{1}; + User user2(0xFF); } diff --git a/template/main.cc b/template/main.cc index 5ddd678..db9cfff 100644 --- a/template/main.cc +++ b/template/main.cc @@ -1,5 +1,3 @@ #include -int main() { - std::cout << "Template" << std::endl; -} +int main() { std::cout << "Template" << std::endl; }