Skip to content

Commit 8d73798

Browse files
starseekerstarseeker
committed
Run Astyle to sync file layouts
1 parent 96e808c commit 8d73798

89 files changed

Lines changed: 1196 additions & 1199 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/exppp/exppp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ SCL_EXPPP_EXPORT int TYPEbody_to_buffer( Type t, char * buffer, int length );
6161
SCL_EXPPP_EXPORT int WHEREto_buffer( Linked_List w, char * buffer, int length );
6262

6363
SCL_EXPPP_EXPORT int EXPRlength( Expression e );
64-
SCL_EXPPP_EXPORT int count_newlines( char *s );
64+
SCL_EXPPP_EXPORT int count_newlines( char * s );
6565

6666
#endif

‎include/express/expbasic.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ typedef char * Binary;
126126
#define OBJ_EXPRESSION 'x' /**< so far only enums get looked up by name & */
127127
#define OBJ_ENUM 'x' /**< appear this way, perhaps they should be variables? */
128128
#define OBJ_AMBIG_ENUM 'z' /**< enumerations of the same name which are
129-
* visible in the same scope when qualified
130-
* z is of no mnemonic significance (so far) */
129+
* visible in the same scope when qualified
130+
* z is of no mnemonic significance (so far) */
131131
#define IS_ENUM(x) (((x) == OBJ_ENUM) || ((x) == OBJ_AMBIG_ENUM))
132132

133133
/** these represent a different way of selecting classes of objects

‎include/express/schema.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ struct Schema_ {
8888
Linked_List reflist;
8989
Linked_List uselist;
9090
/** \var refdict, usedict
91-
* dictionarys into which are entered renames for each specific
91+
* dictionarys into which are entered renames for each specific
9292
* object specified in a rename clause (even if it uses the same
9393
* name */
9494
Dictionary refdict;
9595
Dictionary usedict;
9696

9797
Linked_List use_schemas; /**< lists of schemas that are fully use'd
9898
* entries can be 0 if schemas weren't found during RENAMEresolve */
99-
Linked_List ref_schemas; /**< lists of schemas that are fully ref'd
99+
Linked_List ref_schemas; /**< lists of schemas that are fully ref'd
100100
* entries can be 0 if schemas weren't found during RENAMEresolve */
101101
};
102102

‎include/express/scope.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct Scope_ {
8282
char type; /* see above */
8383
ClientData clientData; /**< user may use this for any purpose */
8484
int search_id; /**< key to avoid searching this scope twice */
85-
Dictionary symbol_table,enum_table;
85+
Dictionary symbol_table, enum_table;
8686
struct Scope_ * superscope;
8787
union {
8888
struct Procedure_ * proc;

‎src/base/judy/src/judy.h‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,30 @@
4242
defined(__arch64__) || \
4343
defined(__powerpc64__) || \
4444
defined (__s390x__)
45-
// defines for 64 bit
46-
typedef unsigned long long judyvalue;
47-
typedef unsigned long long JudySlot;
48-
#define JUDY_key_mask (0x07)
49-
#define JUDY_key_size 8
50-
#define JUDY_slot_size 8
51-
#define JUDY_span_bytes (3 * JUDY_key_size)
52-
#define JUDY_span_equiv JUDY_2
53-
#define JUDY_radix_equiv JUDY_8
54-
55-
#define PRIjudyvalue "llu"
45+
// defines for 64 bit
46+
typedef unsigned long long judyvalue;
47+
typedef unsigned long long JudySlot;
48+
#define JUDY_key_mask (0x07)
49+
#define JUDY_key_size 8
50+
#define JUDY_slot_size 8
51+
#define JUDY_span_bytes (3 * JUDY_key_size)
52+
#define JUDY_span_equiv JUDY_2
53+
#define JUDY_radix_equiv JUDY_8
54+
55+
#define PRIjudyvalue "llu"
5656

5757
#else
58-
// defines for 32 bit
59-
typedef unsigned int judyvalue;
60-
typedef unsigned int JudySlot;
61-
#define JUDY_key_mask (0x03)
62-
#define JUDY_key_size 4
63-
#define JUDY_slot_size 4
64-
#define JUDY_span_bytes (7 * JUDY_key_size)
65-
#define JUDY_span_equiv JUDY_4
66-
#define JUDY_radix_equiv JUDY_8
67-
68-
#define PRIjudyvalue "u"
58+
// defines for 32 bit
59+
typedef unsigned int judyvalue;
60+
typedef unsigned int JudySlot;
61+
#define JUDY_key_mask (0x03)
62+
#define JUDY_key_size 4
63+
#define JUDY_slot_size 4
64+
#define JUDY_span_bytes (7 * JUDY_key_size)
65+
#define JUDY_span_equiv JUDY_4
66+
#define JUDY_radix_equiv JUDY_8
67+
68+
#define PRIjudyvalue "u"
6969

7070
#endif
7171

@@ -75,8 +75,8 @@
7575
// to enable this feature, set to 64
7676

7777
#define JUDY_cache_line 64 // minimum size is 8 bytes
78-
// can be calculated using http://stackoverflow.com/a/4049562/382458 - but that would limit optimization!
79-
// 10x 1M key hexsort, line size 64: 9.949s; size 8: 10.018s --> 1% improvement for 64; however, this may be dwarfed by the sort code
78+
// can be calculated using http://stackoverflow.com/a/4049562/382458 - but that would limit optimization!
79+
// 10x 1M key hexsort, line size 64: 9.949s; size 8: 10.018s --> 1% improvement for 64; however, this may be dwarfed by the sort code
8080

8181
#define JUDY_seg 65536
8282

@@ -117,9 +117,9 @@ typedef struct {
117117
} Judy;
118118

119119
#ifdef ASKITIS
120-
int Words = 0;
121-
int Inserts = 0;
122-
int Found = 0;
120+
int Words = 0;
121+
int Inserts = 0;
122+
int Found = 0;
123123
# if JUDY_key_size < 8
124124
# define JUDY_max JUDY_16
125125
# else

‎src/base/judy/src/judyL2Array.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class judyL2Array {
9797
bool insert( JudyKey key, JudyValue value ) {
9898
_lastSlot = ( vector ** ) judy_cell( _judyarray, ( const unsigned char * ) &key, _depth * JUDY_key_size );
9999
if( _lastSlot ) {
100-
if( ! ( * _lastSlot ) ) {
100+
if( !( * _lastSlot ) ) {
101101
* _lastSlot = new vector;
102102
/* TODO store vectors inside judy with placement new
103103
* vector * n = judy_data( _judyarray, sizeof( std::vector < JudyValue > ) );
@@ -122,7 +122,7 @@ class judyL2Array {
122122
bool insert( JudyKey key, const vector & values, bool overwrite = false ) {
123123
_lastSlot = ( vector ** ) judy_cell( _judyarray, ( const unsigned char * ) &key, _depth * JUDY_key_size );
124124
if( _lastSlot ) {
125-
if( ! ( * _lastSlot ) ) {
125+
if( !( * _lastSlot ) ) {
126126
* _lastSlot = new vector;
127127
/* TODO store vectors inside judy with placement new
128128
* (see other insert(), above)
@@ -160,7 +160,7 @@ class judyL2Array {
160160
/// retrieve the key-value pair for the most recent judy query.
161161
inline const cpair mostRecentPair() {
162162
cpair kv;
163-
judy_key( _judyarray, (unsigned char *) _buff, _depth * JUDY_key_size );
163+
judy_key( _judyarray, ( unsigned char * ) _buff, _depth * JUDY_key_size );
164164
if( _lastSlot ) {
165165
kv.value = *_lastSlot;
166166
_success = true;

‎src/base/judy/src/judyLArray.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class judyLArray {
114114
/// retrieve the key-value pair for the most recent judy query.
115115
inline const pair mostRecentPair() {
116116
pair kv;
117-
judy_key( _judyarray, (unsigned char *) _buff, _depth * JUDY_key_size );
117+
judy_key( _judyarray, ( unsigned char * ) _buff, _depth * JUDY_key_size );
118118
if( _lastSlot ) {
119119
kv.value = *_lastSlot;
120120
_success = true;

‎src/base/judy/src/judyS2Array.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class judyS2Array {
4040
unsigned char * _buff;
4141
bool _success;
4242
public:
43-
judyS2Array( unsigned int maxKeyLen ): _maxKeyLen( maxKeyLen ), _lastSlot(0), _success( true ) {
43+
judyS2Array( unsigned int maxKeyLen ): _maxKeyLen( maxKeyLen ), _lastSlot( 0 ), _success( true ) {
4444
_judyarray = judy_open( _maxKeyLen, 0 );
4545
_buff = new unsigned char[_maxKeyLen];
4646
assert( sizeof( JudyValue ) == sizeof( this ) && "JudyValue *must* be the same size as a pointer!" );
@@ -104,7 +104,7 @@ class judyS2Array {
104104
assert( keyLen <= _maxKeyLen );
105105
_lastSlot = ( vector ** ) judy_cell( _judyarray, ( const unsigned char * )key, keyLen );
106106
if( _lastSlot ) {
107-
if( ! ( * _lastSlot ) ) {
107+
if( !( * _lastSlot ) ) {
108108
* _lastSlot = new vector;
109109
/* TODO store vectors inside judy with placement new
110110
* vector * n = judy_data( _judyarray, sizeof( std::vector < JudyValue > ) );
@@ -135,7 +135,7 @@ class judyS2Array {
135135
assert( keyLen <= _maxKeyLen );
136136
_lastSlot = ( vector ** ) judy_cell( _judyarray, ( const unsigned char * )key, keyLen );
137137
if( _lastSlot ) {
138-
if( ! ( * _lastSlot ) ) {
138+
if( !( * _lastSlot ) ) {
139139
* _lastSlot = new vector;
140140
/* TODO store vectors inside judy with placement new
141141
* (see other insert(), above)
@@ -199,7 +199,7 @@ class judyS2Array {
199199

200200
/// retrieve the first key-value pair in the array
201201
const cpair & begin() {
202-
_buff[0]='\0';
202+
_buff[0] = '\0';
203203
_lastSlot = ( vector ** ) judy_strt( _judyarray, ( const unsigned char * ) _buff, 0 );
204204
return mostRecentPair();
205205
}

‎src/base/judy/src/judySArray.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class judySArray {
140140

141141
/// retrieve the first key-value pair in the array
142142
const pair & begin() {
143-
_buff[0]='\0';
143+
_buff[0] = '\0';
144144
_lastSlot = ( JudyValue * ) judy_strt( _judyarray, ( const unsigned char * ) _buff, 0 );
145145
return mostRecentPair();
146146
}

‎src/base/judy/test/judyL2test.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "judyL2Array.h"
66
typedef judyL2Array< uint64_t, uint64_t > jl2a;
77

8-
bool testFind( jl2a & j, uint64_t key, unsigned int count ){
8+
bool testFind( jl2a & j, uint64_t key, unsigned int count ) {
99
jl2a::cvector * v = j.find( key );
1010
std::cout << "find: key " << key << " ..." << std::endl;
1111
if( count > 0 ) {
@@ -20,7 +20,7 @@ bool testFind( jl2a & j, uint64_t key, unsigned int count ){
2020
// note - this doesn't verify that the right keys are returned, just the right number!
2121
jl2a::vector::const_iterator it = v->begin();
2222
std::cout << " correct number of values -";
23-
for(; it != v->end(); it++ ) {
23+
for( ; it != v->end(); it++ ) {
2424
std::cout << " " << *it;
2525
}
2626
std::cout << std::endl;
@@ -39,14 +39,14 @@ bool testFind( jl2a & j, uint64_t key, unsigned int count ){
3939
int main() {
4040
bool pass = true;
4141
jl2a jl;
42-
std::cout.setf(std::ios::boolalpha);
42+
std::cout.setf( std::ios::boolalpha );
4343
// std::cout << "size of judyL2Array: " << sizeof( jl ) << std::endl;
44-
jl.insert( 5, 12 );
45-
jl.insert( 6, 2 );
44+
jl.insert( 5, 12 );
45+
jl.insert( 6, 2 );
4646
jl.insert( 7, 312 );
4747
jl.insert( 11, 412 );
4848
jl.insert( 7, 313 );
49-
jl2a::cpair kv = jl.atOrAfter(4);
49+
jl2a::cpair kv = jl.atOrAfter( 4 );
5050
std::cout << "atOrAfter test ..." << std::endl;
5151
if( kv.value != 0 && jl.success() ) {
5252
std::cout << " key " << kv.key << " value " << kv.value->at( 0 ) << std::endl;

0 commit comments

Comments
 (0)