A Whole New World (clang-format edition)

I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde 2017-03-05 16:44:50 +01:00
parent 45438e9918
commit 5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions

View file

@ -30,9 +30,9 @@
#define STRING_DB_H
#include "hash_map.h"
#include "ustring.h"
#include "safe_refcount.h"
#include "os/mutex.h"
#include "safe_refcount.h"
#include "ustring.h"
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
@ -43,32 +43,32 @@ struct StaticCString {
static StaticCString create(const char *p_ptr);
};
class StringName {
enum {
STRING_TABLE_BITS=12,
STRING_TABLE_LEN=1<<STRING_TABLE_BITS,
STRING_TABLE_MASK=STRING_TABLE_LEN-1
STRING_TABLE_BITS = 12,
STRING_TABLE_LEN = 1 << STRING_TABLE_BITS,
STRING_TABLE_MASK = STRING_TABLE_LEN - 1
};
struct _Data {
SafeRefCount refcount;
const char* cname;
const char *cname;
String name;
String get_name() const { return cname?String(cname):name; }
String get_name() const { return cname ? String(cname) : name; }
int idx;
uint32_t hash;
_Data *prev;
_Data *next;
_Data() { cname=NULL; next=prev=NULL; hash=0; }
_Data() {
cname = NULL;
next = prev = NULL;
hash = 0;
}
};
static _Data *_table[STRING_TABLE_LEN];
_Data *_data;
@ -80,31 +80,30 @@ class StringName {
};
void unref();
friend void register_core_types();
friend void unregister_core_types();
friend void register_core_types();
friend void unregister_core_types();
static Mutex *lock;
static void setup();
static void cleanup();
static bool configured;
StringName(_Data *p_data) { _data=p_data; }
StringName(_Data *p_data) { _data = p_data; }
public:
operator const void *() const { return (_data && (_data->cname || !_data->name.empty())) ? (void *)1 : 0; }
bool operator==(const String &p_name) const;
bool operator==(const char *p_name) const;
bool operator!=(const String &p_name) const;
_FORCE_INLINE_ bool operator<(const StringName &p_name) const {
operator const void*() const { return (_data && (_data->cname || !_data->name.empty()))?(void*)1:0; }
bool operator==(const String& p_name) const;
bool operator==(const char* p_name) const;
bool operator!=(const String& p_name) const;
_FORCE_INLINE_ bool operator<(const StringName& p_name) const {
return _data<p_name._data;
return _data < p_name._data;
}
_FORCE_INLINE_ bool operator==(const StringName& p_name) const {
_FORCE_INLINE_ bool operator==(const StringName &p_name) const {
// the real magic of all this mess happens here.
// this is why path comparisons are very fast
return _data==p_name._data;
return _data == p_name._data;
}
_FORCE_INLINE_ uint32_t hash() const {
@ -113,12 +112,12 @@ public:
else
return 0;
}
bool operator!=(const StringName& p_name) const;
bool operator!=(const StringName &p_name) const;
_FORCE_INLINE_ operator String() const {
if (_data) {
if (_data->cname )
if (_data->cname)
return String(_data->cname);
else
return _data->name;
@ -133,17 +132,17 @@ public:
struct AlphCompare {
_FORCE_INLINE_ bool operator()(const StringName& l,const StringName& r) const {
_FORCE_INLINE_ bool operator()(const StringName &l, const StringName &r) const {
return l.operator String() < r.operator String();
}
};
void operator=(const StringName& p_name);
void operator=(const StringName &p_name);
StringName(const char *p_name);
StringName(const StringName& p_name);
StringName(const String& p_name);
StringName(const StaticCString& p_static_string);
StringName(const StringName &p_name);
StringName(const String &p_name);
StringName(const StaticCString &p_static_string);
StringName();
~StringName();
};