Skip to content

Commit

Permalink
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Browse files Browse the repository at this point in the history 
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.

This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.

There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).

Part of godotengine#33027.
  • Loading branch information
@akien-mga
akien-mga committed May 14, 2020
1 parent 710b34b commit 0be6d92
Show file tree
Hide file tree
Showing 1,552 changed files with 1 addition and 33,876 deletions.
2 changes: 1 addition & 1 deletion .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ IndentWidth: 4
# IndentWrappedFunctionNames: false
# JavaScriptQuotes: Leave
# JavaScriptWrapImports: true
# KeepEmptyLinesAtTheStartOfBlocks: true
KeepEmptyLinesAtTheStartOfBlocks: false
# MacroBlockBegin: ''
# MacroBlockEnd: ''
# MaxEmptyLinesToKeep: 1
Expand Down
44 changes: 0 additions & 44 deletions core/array.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class ArrayPrivate {
};

void Array::_ref(const Array &p_from) const {

ArrayPrivate *_fp = p_from._p;

ERR_FAIL_COND(!_fp); // should NOT happen.
Expand All @@ -64,7 +63,6 @@ void Array::_ref(const Array &p_from) const {
}

void Array::_unref() const {

if (!_p)
return;

Expand All @@ -75,46 +73,37 @@ void Array::_unref() const {
}

Variant &Array::operator[](int p_idx) {

return _p->array.write[p_idx];
}

const Variant &Array::operator[](int p_idx) const {

return _p->array[p_idx];
}

int Array::size() const {

return _p->array.size();
}
bool Array::empty() const {

return _p->array.empty();
}
void Array::clear() {

_p->array.clear();
}

bool Array::operator==(const Array &p_array) const {

return _p == p_array._p;
}

uint32_t Array::hash() const {

uint32_t h = hash_djb2_one_32(0);

for (int i = 0; i < _p->array.size(); i++) {

h = hash_djb2_one_32(_p->array[i].hash(), h);
}
return h;
}

void Array::_assign(const Array &p_array) {

if (_p->typed.type != Variant::OBJECT && _p->typed.type == p_array._p->typed.type) {
//same type or untyped, just reference, shuold be fine
_ref(p_array);
Expand Down Expand Up @@ -163,24 +152,20 @@ void Array::operator=(const Array &p_array) {
_assign(p_array);
}
void Array::push_back(const Variant &p_value) {

ERR_FAIL_COND(!_p->typed.validate(p_value, "push_back"));
_p->array.push_back(p_value);
}

Error Array::resize(int p_new_size) {

return _p->array.resize(p_new_size);
}

void Array::insert(int p_pos, const Variant &p_value) {

ERR_FAIL_COND(!_p->typed.validate(p_value, "insert"));
_p->array.insert(p_pos, p_value);
}

void Array::erase(const Variant &p_value) {

ERR_FAIL_COND(!_p->typed.validate(p_value, "erase"));
_p->array.erase(p_value);
}
Expand All @@ -196,13 +181,11 @@ Variant Array::back() const {
}

int Array::find(const Variant &p_value, int p_from) const {

ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find"), -1);
return _p->array.find(p_value, p_from);
}

int Array::rfind(const Variant &p_value, int p_from) const {

if (_p->array.size() == 0)
return -1;
ERR_FAIL_COND_V(!_p->typed.validate(p_value, "rfind"), -1);
Expand All @@ -217,7 +200,6 @@ int Array::rfind(const Variant &p_value, int p_from) const {
}

for (int i = p_from; i >= 0; i--) {

if (_p->array[i] == p_value) {
return i;
}
Expand All @@ -227,20 +209,17 @@ int Array::rfind(const Variant &p_value, int p_from) const {
}

int Array::find_last(const Variant &p_value) const {

ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find_last"), -1);
return rfind(p_value);
}

int Array::count(const Variant &p_value) const {

ERR_FAIL_COND_V(!_p->typed.validate(p_value, "count"), 0);
if (_p->array.size() == 0)
return 0;

int amount = 0;
for (int i = 0; i < _p->array.size(); i++) {

if (_p->array[i] == p_value) {
amount++;
}
Expand All @@ -256,24 +235,20 @@ bool Array::has(const Variant &p_value) const {
}

void Array::remove(int p_pos) {

_p->array.remove(p_pos);
}

void Array::set(int p_idx, const Variant &p_value) {

ERR_FAIL_COND(!_p->typed.validate(p_value, "set"));

operator[](p_idx) = p_value;
}

const Variant &Array::get(int p_idx) const {

return operator[](p_idx);
}

Array Array::duplicate(bool p_deep) const {

Array new_arr;
int element_count = size();
new_arr.resize(element_count);
Expand All @@ -286,7 +261,6 @@ Array Array::duplicate(bool p_deep) const {
}

int Array::_clamp_slice_index(int p_index) const {

int arr_size = size();
int fixed_index = CLAMP(p_index, -arr_size, arr_size - 1);
if (fixed_index < 0) {
Expand Down Expand Up @@ -335,7 +309,6 @@ Array Array::slice(int p_begin, int p_end, int p_step, bool p_deep) const { // l
}

struct _ArrayVariantSort {

_FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const {
bool valid = false;
Variant res;
Expand All @@ -347,18 +320,15 @@ struct _ArrayVariantSort {
};

Array &Array::sort() {

_p->array.sort_custom<_ArrayVariantSort>();
return *this;
}

struct _ArrayVariantSortCustom {

Object *obj;
StringName func;

_FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const {

const Variant *args[2] = { &p_l, &p_r };
Callable::CallError err;
bool res = obj->call(func, args, 2, err);
Expand All @@ -368,7 +338,6 @@ struct _ArrayVariantSortCustom {
}
};
Array &Array::sort_custom(Object *p_obj, const StringName &p_function) {

ERR_FAIL_NULL_V(p_obj, *this);

SortArray<Variant, _ArrayVariantSortCustom, true> avs;
Expand All @@ -379,7 +348,6 @@ Array &Array::sort_custom(Object *p_obj, const StringName &p_function) {
}

void Array::shuffle() {

const int n = _p->array.size();
if (n < 2)
return;
Expand All @@ -394,7 +362,6 @@ void Array::shuffle() {

template <typename Less>
_FORCE_INLINE_ int bisect(const Vector<Variant> &p_array, const Variant &p_value, bool p_before, const Less &p_less) {

int lo = 0;
int hi = p_array.size();
if (p_before) {
Expand All @@ -420,13 +387,11 @@ _FORCE_INLINE_ int bisect(const Vector<Variant> &p_array, const Variant &p_value
}

int Array::bsearch(const Variant &p_value, bool p_before) {

ERR_FAIL_COND_V(!_p->typed.validate(p_value, "binary search"), -1);
return bisect(_p->array, p_value, p_before, _ArrayVariantSort());
}

int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringName &p_function, bool p_before) {

ERR_FAIL_COND_V(!_p->typed.validate(p_value, "custom binary search"), -1);
ERR_FAIL_NULL_V(p_obj, 0);

Expand All @@ -438,19 +403,16 @@ int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringNam
}

Array &Array::invert() {

_p->array.invert();
return *this;
}

void Array::push_front(const Variant &p_value) {

ERR_FAIL_COND(!_p->typed.validate(p_value, "push_front"));
_p->array.insert(0, p_value);
}

Variant Array::pop_back() {

if (!_p->array.empty()) {
int n = _p->array.size() - 1;
Variant ret = _p->array.get(n);
Expand All @@ -461,7 +423,6 @@ Variant Array::pop_back() {
}

Variant Array::pop_front() {

if (!_p->array.empty()) {
Variant ret = _p->array.get(0);
_p->array.remove(0);
Expand All @@ -471,7 +432,6 @@ Variant Array::pop_front() {
}

Variant Array::min() const {

Variant minval;
for (int i = 0; i < size(); i++) {
if (i == 0) {
Expand All @@ -494,7 +454,6 @@ Variant Array::min() const {
}

Variant Array::max() const {

Variant maxval;
for (int i = 0; i < size(); i++) {
if (i == 0) {
Expand Down Expand Up @@ -542,17 +501,14 @@ void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Var
}

Array::Array(const Array &p_from) {

_p = nullptr;
_ref(p_from);
}

Array::Array() {

_p = memnew(ArrayPrivate);
_p->refcount.init();
}
Array::~Array() {

_unref();
}
1 change: 0 additions & 1 deletion core/array.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class Object;
class StringName;

class Array {

mutable ArrayPrivate *_p;
void _ref(const Array &p_from) const;
void _unref() const;
Expand Down
Loading

0 comments on commit 0be6d92

Please sign in to comment.