Skip to content

Commit 75a5919

Browse files
marcorothmarcoroth
committed
Set SpaceBeforeParens to ControlStatements 
1 parent 1f3430d commit 75a5919

File tree

11 files changed

+58
-58
lines changed

11 files changed

+58
-58
lines changed

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ ColumnLimit: 120
77
IndentWidth: 2
88
PointerAlignment: Left
99
SpaceAfterCStyleCast: true
10-
SpaceBeforeParens: Never
10+
SpaceBeforeParens: ControlStatements
1111
SpacesInAngles: true

‎ext/erbx/extension.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#include "../../src/include/erbx.h"
66

77
static const char* check_string(VALUE value) {
8-
if(NIL_P(value)) {
8+
if (NIL_P(value)) {
99
return NULL;
1010
}
1111

12-
if(!RB_TYPE_P(value, T_STRING)) {
12+
if (!RB_TYPE_P(value, T_STRING)) {
1313
rb_raise(rb_eTypeError, "wrong argument type %" PRIsVALUE " (expected String)", rb_obj_class(value));
1414
}
1515

‎src/array.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ array_T* array_init(int capacity) {
1515
}
1616

1717
void array_append(array_T* array, void* item) {
18-
if(array->size >= array->capacity) {
18+
if (array->size >= array->capacity) {
1919
array->capacity *= 2;
2020
array->items = (void**) realloc(array->items, sizeof(void*) * array->capacity);
2121
}
@@ -25,27 +25,27 @@ void array_append(array_T* array, void* item) {
2525
}
2626

2727
void* array_get(array_T* array, int index) {
28-
if(index >= array->size || index < 0) {
28+
if (index >= array->size || index < 0) {
2929
return NULL;
3030
}
3131

3232
return array->items[index];
3333
}
3434

3535
void array_set(array_T* array, int index, void* item) {
36-
if(index >= array->size || index < 0) {
36+
if (index >= array->size || index < 0) {
3737
return;
3838
}
3939

4040
array->items[index] = item;
4141
}
4242

4343
void array_remove(array_T* array, int index) {
44-
if(index >= array->size || index < 0) {
44+
if (index >= array->size || index < 0) {
4545
return;
4646
}
4747

48-
for(int i = index; i < array->size - 1; i++) {
48+
for (int i = index; i < array->size - 1; i++) {
4949
array->items[i] = array->items[i + 1];
5050
}
5151

‎src/buffer.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bool buffer_init(buffer_T* buffer) {
99
buffer->length = 0;
1010
buffer->value = malloc(buffer->capacity * sizeof(char));
1111

12-
if(buffer->value) {
12+
if (buffer->value) {
1313
buffer->value[0] = '\0';
1414
}
1515

@@ -35,11 +35,11 @@ size_t buffer_sizeof(void) {
3535
void buffer_append(buffer_T* buffer, const char* text) {
3636
size_t text_length = strlen(text);
3737

38-
if(buffer->length + text_length >= buffer->capacity) {
38+
if (buffer->length + text_length >= buffer->capacity) {
3939
size_t new_capacity = (buffer->length + text_length) * 2;
4040
char* new_buffer = realloc(buffer->value, new_capacity);
4141

42-
if(new_buffer) {
42+
if (new_buffer) {
4343
buffer->value = new_buffer;
4444
buffer->capacity = new_capacity;
4545
} else {
@@ -53,12 +53,12 @@ void buffer_append(buffer_T* buffer, const char* text) {
5353
}
5454

5555
void buffer_prepend(buffer_T* buffer, const char* text) {
56-
if(text == NULL || text[0] == '\0') return;
56+
if (text == NULL || text[0] == '\0') return;
5757

5858
size_t text_length = strlen(text);
5959
size_t new_length = buffer->length + text_length;
6060

61-
if(new_length >= buffer->capacity) {
61+
if (new_length >= buffer->capacity) {
6262
size_t new_capacity = new_length * 2;
6363
buffer->value = realloc(buffer->value, new_capacity);
6464
buffer->capacity = new_capacity;
@@ -72,11 +72,11 @@ void buffer_prepend(buffer_T* buffer, const char* text) {
7272
}
7373

7474
void buffer_concat(buffer_T* destination, buffer_T* source) {
75-
if(source->length == 0) return;
75+
if (source->length == 0) return;
7676

7777
size_t new_length = destination->length + source->length;
7878

79-
if(new_length >= destination->capacity) {
79+
if (new_length >= destination->capacity) {
8080
size_t new_capacity = new_length * 2;
8181
destination->value = realloc(destination->value, new_capacity);
8282
destination->capacity = new_capacity;

‎src/erbx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ array_T* erbx_lex(char* source) {
1515

1616
array_T* tokens = array_init(1);
1717

18-
while((token = lexer_next_token(lexer))->type != TOKEN_EOF) {
18+
while ((token = lexer_next_token(lexer))->type != TOKEN_EOF) {
1919
array_append(tokens, token);
2020
}
2121

@@ -36,7 +36,7 @@ array_T* erbx_lex_file(const char* path) {
3636
void erbx_lex_to_buffer(char* source, buffer_T* output) {
3737
array_T* tokens = erbx_lex(source);
3838

39-
for(int i = 0; i < array_size(tokens); i++) {
39+
for (int i = 0; i < array_size(tokens); i++) {
4040
token_T* token = array_get(tokens, i);
4141
buffer_append(output, token_to_string(token));
4242
buffer_append(output, "\n");

‎src/io.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ char* erbx_read_file(const char* filename) {
1111

1212
fp = fopen(filename, "rb");
1313

14-
if(fp == NULL) {
14+
if (fp == NULL) {
1515
printf("Could not read file '%s'\n", filename);
1616
exit(1);
1717
}
1818

1919
char* buffer = (char*) calloc(1, sizeof(char));
2020
buffer[0] = '\0';
2121

22-
while((read = getline(&line, &len, fp)) != -1) {
22+
while ((read = getline(&line, &len, fp)) != -1) {
2323
buffer = (char*) realloc(buffer, (strlen(buffer) + strlen(line) + 1) * sizeof(char));
2424
strcat(buffer, line);
2525
}
2626

2727
fclose(fp);
2828

29-
if(line) {
29+
if (line) {
3030
free(line);
3131
}
3232

‎src/lexer.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ char lexer_backtrack(lexer_T* lexer, int offset) {
3434
}
3535

3636
void lexer_advance(lexer_T* lexer) {
37-
if(lexer->current_position < lexer->source_length && lexer->current_character != '\0') {
37+
if (lexer->current_position < lexer->source_length && lexer->current_character != '\0') {
3838

39-
if(isnewline(lexer->current_character)) {
39+
if (isnewline(lexer->current_character)) {
4040
lexer->current_line += 1;
4141
lexer->current_column = 1;
4242
} else {
@@ -60,8 +60,8 @@ token_T* lexer_advance_current(lexer_T* lexer, int type) {
6060
}
6161

6262
void lexer_skip_whitespace(lexer_T* lexer) {
63-
while(lexer->current_character == 13 || lexer->current_character == 10 || lexer->current_character == ' ' ||
64-
lexer->current_character == '\t') {
63+
while (lexer->current_character == 13 || lexer->current_character == 10 || lexer->current_character == ' ' ||
64+
lexer->current_character == '\t') {
6565
lexer_advance(lexer);
6666
}
6767
}
@@ -79,7 +79,7 @@ token_T* lexer_parse_newline(lexer_T* lexer) {
7979
token_T* lexer_parse_whitespace(lexer_T* lexer) {
8080
char* value = calloc(1, sizeof(char));
8181

82-
while(iswhitespace(lexer->current_character) && lexer->current_character != '\0') {
82+
while (iswhitespace(lexer->current_character) && lexer->current_character != '\0') {
8383
value = realloc(value, (strlen(value) + 2) * sizeof(char));
8484
strcat(value, (char[]) {lexer->current_character, 0});
8585
lexer_advance(lexer);
@@ -91,7 +91,7 @@ token_T* lexer_parse_whitespace(lexer_T* lexer) {
9191
token_T* lexer_parse_tag_name(lexer_T* lexer) {
9292
char* value = calloc(1, sizeof(char));
9393

94-
while(lexer->current_character != ' ' && lexer->current_character != '>') {
94+
while (lexer->current_character != ' ' && lexer->current_character != '>') {
9595
value = realloc(value, (strlen(value) + 2) * sizeof(char));
9696
strcat(value, (char[]) {lexer->current_character, 0});
9797
lexer_advance(lexer);
@@ -104,13 +104,13 @@ token_T* lexer_parse_attribute_name(lexer_T* lexer) {
104104
char* value = calloc(1, sizeof(char));
105105
char character = 0;
106106

107-
while((character = lexer->current_character) != '=' && character != ' ') {
107+
while ((character = lexer->current_character) != '=' && character != ' ') {
108108
value = realloc(value, (strlen(value) + 2) * sizeof(char));
109109
strcat(value, (char[]) {character, 0});
110110
lexer_advance(lexer);
111111
}
112112

113-
if(character == ' ') {
113+
if (character == ' ') {
114114
// boolean attribute
115115
lexer->state = STATE_TAG_ATTRIBUTES;
116116
} else {
@@ -125,7 +125,7 @@ token_T* lexer_parse_attribute_value(lexer_T* lexer) {
125125
char* value = calloc(1, sizeof(char));
126126
char quote = lexer_backtrack(lexer, 1);
127127

128-
while(lexer->current_character != quote) {
128+
while (lexer->current_character != quote) {
129129
value = realloc(value, (strlen(value) + 2) * sizeof(char));
130130
strcat(value, (char[]) {lexer->current_character, 0});
131131
lexer_advance(lexer);
@@ -137,7 +137,7 @@ token_T* lexer_parse_attribute_value(lexer_T* lexer) {
137137
token_T* lexer_parse_text_content(lexer_T* lexer) {
138138
char* value = calloc(1, sizeof(char));
139139

140-
while(lexer->current_character != '<') {
140+
while (lexer->current_character != '<') {
141141
value = realloc(value, (strlen(value) + 2) * sizeof(char));
142142
strcat(value, (char[]) {lexer->current_character, 0});
143143
lexer_advance(lexer);
@@ -147,20 +147,20 @@ token_T* lexer_parse_text_content(lexer_T* lexer) {
147147
}
148148

149149
token_T* lexer_next_token(lexer_T* lexer) {
150-
while(lexer->current_character != '\0') {
150+
while (lexer->current_character != '\0') {
151151

152152
// printf("STATE: %u\n", lexer->state);
153153
// printf("Current character: %c\n", lexer->current_character);
154154

155-
switch(lexer->state) {
155+
switch (lexer->state) {
156156
case STATE_NONE: {
157-
if(iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
157+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
158158
lexer_skip_whitespace(lexer);
159159
}
160160

161-
switch(lexer->current_character) {
161+
switch (lexer->current_character) {
162162
case '<': {
163-
if(lexer_peek(lexer, 1) == '/') {
163+
if (lexer_peek(lexer, 1) == '/') {
164164
lexer->state = STATE_START_TAG_START;
165165
lexer_advance(lexer);
166166
lexer_advance(lexer);
@@ -199,7 +199,7 @@ token_T* lexer_next_token(lexer_T* lexer) {
199199
} break;
200200

201201
case STATE_ATTRIBUTE_START: {
202-
switch(lexer->current_character) {
202+
switch (lexer->current_character) {
203203
case '=': {
204204
lexer->state = STATE_ATTRIBUTE_VALUE_START;
205205
return lexer_advance_current(lexer, TOKEN_EQUALS);
@@ -219,17 +219,17 @@ token_T* lexer_next_token(lexer_T* lexer) {
219219
} break;
220220

221221
case STATE_TAG_ATTRIBUTES: {
222-
if(iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
222+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
223223
lexer_skip_whitespace(lexer);
224224
}
225225

226-
if(isalpha(lexer->current_character)) {
226+
if (isalpha(lexer->current_character)) {
227227
return lexer_parse_attribute_name(lexer);
228228
}
229229

230-
switch(lexer->current_character) {
230+
switch (lexer->current_character) {
231231
case '/': {
232-
if(lexer_peek(lexer, 1) == '>') {
232+
if (lexer_peek(lexer, 1) == '>') {
233233
lexer->state = STATE_NONE;
234234
lexer_advance(lexer);
235235
lexer_advance(lexer);
@@ -248,12 +248,12 @@ token_T* lexer_next_token(lexer_T* lexer) {
248248
} break;
249249

250250
case STATE_ELEMENT_CHILDREN: {
251-
if(iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
251+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
252252
lexer_skip_whitespace(lexer);
253253
}
254254

255-
if(lexer->current_character == '<') {
256-
if(lexer_peek(lexer, 1) == '/') {
255+
if (lexer->current_character == '<') {
256+
if (lexer_peek(lexer, 1) == '/') {
257257
lexer->state = STATE_END_TAG_START;
258258
lexer_advance(lexer);
259259
lexer_advance(lexer);
@@ -271,7 +271,7 @@ token_T* lexer_next_token(lexer_T* lexer) {
271271
} break;
272272

273273
case STATE_ATTRIBUTE_VALUE_START: {
274-
switch(lexer->current_character) {
274+
switch (lexer->current_character) {
275275
case '"': {
276276
lexer->state = STATE_ATTRIBUTE_VALUE;
277277
return lexer_advance_current(lexer, TOKEN_DOUBLE_QUOTE);
@@ -286,19 +286,19 @@ token_T* lexer_next_token(lexer_T* lexer) {
286286
} break;
287287

288288
case STATE_ATTRIBUTE_VALUE: {
289-
if(lexer->current_character == '"' || lexer->current_character == '\'') {
289+
if (lexer->current_character == '"' || lexer->current_character == '\'') {
290290
lexer->state = STATE_ATTRIBUTE_VALUE_END;
291291
return token_init("\0", TOKEN_ATTRIBUTE_VALUE, lexer);
292292
}
293293

294-
if(isalpha(lexer->current_character) || iswhitespace(lexer->current_character)) {
294+
if (isalpha(lexer->current_character) || iswhitespace(lexer->current_character)) {
295295
lexer->state = STATE_ATTRIBUTE_VALUE_END;
296296
return lexer_parse_attribute_value(lexer);
297297
}
298298
} break;
299299

300300
case STATE_ATTRIBUTE_VALUE_END: {
301-
switch(lexer->current_character) {
301+
switch (lexer->current_character) {
302302
case '"': {
303303
lexer->state = STATE_TAG_ATTRIBUTES;
304304
return lexer_advance_current(lexer, TOKEN_DOUBLE_QUOTE);
@@ -319,7 +319,7 @@ token_T* lexer_next_token(lexer_T* lexer) {
319319
return token_init(0, TOKEN_ATTRIBUTE_VALUE, lexer);
320320
} break;
321321
default: {
322-
if(iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
322+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
323323
lexer_skip_whitespace(lexer);
324324
}
325325
}

‎src/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <stdio.h>
66

77
int main(int argc, char* argv[]) {
8-
if(argc < 2) {
8+
if (argc < 2) {
99
printf("Please specify input file.\n");
1010

1111
return 1;

‎src/parser.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parser_T* parser_init(lexer_T* lexer) {
1919
}
2020

2121
token_T* parser_consume(parser_T* parser, int type) {
22-
if(parser->token->type != type) {
22+
if (parser->token->type != type) {
2323
printf("[Parser]: Unexpected token: '%s', was expected: '%s'\n", token_to_string(parser->token),
2424
token_type_string(type));
2525
exit(1);
@@ -31,7 +31,7 @@ token_T* parser_consume(parser_T* parser, int type) {
3131
}
3232

3333
AST_T* parser_parse(parser_T* parser) {
34-
switch(parser->token->type) {
34+
switch (parser->token->type) {
3535
default: {
3636
}
3737
}

‎src/token.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ token_T* token_init(char* value, int type, lexer_T* lexer) {
3333
}
3434

3535
const char* token_type_string(int type) {
36-
switch(type) {
36+
switch (type) {
3737
case TOKEN_ATTRIBUTE_NAME: return "TOKEN_ATTRIBUTE_NAME";
3838
case TOKEN_ATTRIBUTE_VALUE: return "TOKEN_ATTRIBUTE_VALUE";
3939
case TOKEN_DOUBLE_QUOTE: return "TOKEN_DOUBLE_QUOTE";

0 commit comments

Comments
 (0)