Skip to content

Commit 51a0d49

Browse files
sethhorsleysethhorsley
committed
set width on formater
1 parent b110e08 commit 51a0d49

File tree

10 files changed

+41
-58
lines changed

10 files changed

+41
-58
lines changed

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ColumnLimit: 90

‎ext/erbx/extension.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ static const char *check_string(VALUE value) {
1010
}
1111

1212
if (!RB_TYPE_P(value, T_STRING)) {
13-
rb_raise(rb_eTypeError,
14-
"wrong argument type %" PRIsVALUE " (expected String)",
13+
rb_raise(rb_eTypeError, "wrong argument type %" PRIsVALUE " (expected String)",
1514
rb_obj_class(value));
1615
}
1716

‎src/array.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ array_T *array_init(int capacity) {
1515
void array_append(array_T *array, void *item) {
1616
if (array->size >= array->capacity) {
1717
array->capacity *= 2;
18-
array->items =
19-
(void **)realloc(array->items, sizeof(void *) * array->capacity);
18+
array->items = (void **)realloc(array->items, sizeof(void *) * array->capacity);
2019
}
2120

2221
array->items[array->size] = item;

‎src/io.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ char *erbx_read_file(const char *filename) {
2020
buffer[0] = '\0';
2121

2222
while ((read = getline(&line, &len, fp)) != -1) {
23-
buffer = (char *)realloc(buffer, (strlen(buffer) + strlen(line) + 1) *
24-
sizeof(char));
23+
buffer = (char *)realloc(buffer, (strlen(buffer) + strlen(line) + 1) * sizeof(char));
2524
strcat(buffer, line);
2625
}
2726

‎src/lexer.c‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ lexer_T *lexer_init(char *source) {
2424
}
2525

2626
char lexer_peek(lexer_T *lexer, int offset) {
27-
return lexer
28-
->source[MIN(lexer->current_position + offset, lexer->source_length)];
27+
return lexer->source[MIN(lexer->current_position + offset, lexer->source_length)];
2928
}
3029

3130
char lexer_backtrack(lexer_T *lexer, int offset) {
@@ -79,8 +78,7 @@ token_T *lexer_parse_newline(lexer_T *lexer) {
7978
token_T *lexer_parse_whitespace(lexer_T *lexer) {
8079
char *value = calloc(1, sizeof(char));
8180

82-
while (iswhitespace(lexer->current_character) &&
83-
lexer->current_character != '\0') {
81+
while (iswhitespace(lexer->current_character) && lexer->current_character != '\0') {
8482
value = realloc(value, (strlen(value) + 2) * sizeof(char));
8583
strcat(value, (char[]){lexer->current_character, 0});
8684
lexer_advance(lexer);
@@ -155,8 +153,7 @@ token_T *lexer_next_token(lexer_T *lexer) {
155153

156154
switch (lexer->state) {
157155
case STATE_NONE: {
158-
if (iswhitespace(lexer->current_character) ||
159-
isnewline(lexer->current_character)) {
156+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
160157
lexer_skip_whitespace(lexer);
161158
}
162159

@@ -223,8 +220,7 @@ token_T *lexer_next_token(lexer_T *lexer) {
223220
} break;
224221

225222
case STATE_TAG_ATTRIBUTES: {
226-
if (iswhitespace(lexer->current_character) ||
227-
isnewline(lexer->current_character)) {
223+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
228224
lexer_skip_whitespace(lexer);
229225
}
230226

@@ -253,8 +249,7 @@ token_T *lexer_next_token(lexer_T *lexer) {
253249
} break;
254250

255251
case STATE_ELEMENT_CHILDREN: {
256-
if (iswhitespace(lexer->current_character) ||
257-
isnewline(lexer->current_character)) {
252+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
258253
lexer_skip_whitespace(lexer);
259254
}
260255

@@ -297,8 +292,7 @@ token_T *lexer_next_token(lexer_T *lexer) {
297292
return token_init("\0", TOKEN_ATTRIBUTE_VALUE, lexer);
298293
}
299294

300-
if (isalpha(lexer->current_character) ||
301-
iswhitespace(lexer->current_character)) {
295+
if (isalpha(lexer->current_character) || iswhitespace(lexer->current_character)) {
302296
lexer->state = STATE_ATTRIBUTE_VALUE_END;
303297
return lexer_parse_attribute_value(lexer);
304298
}
@@ -317,9 +311,8 @@ token_T *lexer_next_token(lexer_T *lexer) {
317311
} break;
318312

319313
default: {
320-
printf(
321-
"[Lexer] Unexpected character in STATE_ATTRIBUTE_VALUE_END `%c`\n",
322-
lexer->current_character);
314+
printf("[Lexer] Unexpected character in STATE_ATTRIBUTE_VALUE_END `%c`\n",
315+
lexer->current_character);
323316
exit(1);
324317
break;
325318
}
@@ -328,8 +321,7 @@ token_T *lexer_next_token(lexer_T *lexer) {
328321
return token_init(0, TOKEN_ATTRIBUTE_VALUE, lexer);
329322
} break;
330323
default: {
331-
if (iswhitespace(lexer->current_character) ||
332-
isnewline(lexer->current_character)) {
324+
if (iswhitespace(lexer->current_character) || isnewline(lexer->current_character)) {
333325
lexer_skip_whitespace(lexer);
334326
}
335327
}

‎src/token.c‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ token_T *token_init(char *value, int type, lexer_T *lexer) {
1616
token->value = value;
1717
token->type = type;
1818

19-
token->range = range_init(lexer->current_position - strlen(value),
20-
lexer->current_position);
19+
token->range =
20+
range_init(lexer->current_position - strlen(value), lexer->current_position);
2121

2222
int start_line = lexer->current_line - count_newlines(value);
23-
int start_column = lexer->current_column -
24-
strlen(value); // TODO: fix start_column calculation if
25-
// value contains newlines
23+
int start_column =
24+
lexer->current_column - strlen(value); // TODO: fix start_column calculation if
25+
// value contains newlines
2626
int end_line = lexer->current_line;
2727
int end_column = lexer->current_column;
2828

@@ -85,14 +85,12 @@ char *token_to_string(token_T *token) {
8585
const char *template =
8686
"#<Token type=%s value='%s' range=[%d, %d] start=%d:%d end=%d:%d>";
8787

88-
char *string =
89-
calloc(strlen(type_string) + strlen(template) + 8, sizeof(char));
88+
char *string = calloc(strlen(type_string) + strlen(template) + 8, sizeof(char));
9089

9190
char *escaped = escape_newlines(token->value);
9291

93-
sprintf(string, template, type_string, escaped, token->range->start,
94-
token->range->end, token->start->line, token->start->column,
95-
token->end->line, token->end->column);
92+
sprintf(string, template, type_string, escaped, token->range->start, token->range->end,
93+
token->start->line, token->start->column, token->end->line, token->end->column);
9694

9795
free(escaped);
9896

‎src/util.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33

44
#include "include/util.h"
55

6-
int iswhitespace(int character) {
7-
return character == ' ' || character == '\t';
8-
}
6+
int iswhitespace(int character) { return character == ' ' || character == '\t'; }
97

108
int isnewline(int character) { return character == 13 || character == 10; }
119

‎test/include/test.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include <check.h>
55

66
#define TEST(name) START_TEST(name) {
7-
#define END \
8-
} \
7+
#define END \
8+
} \
99
END_TEST
1010

1111
#endif

‎test/test_tags.c‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ buffer_init(&output);
99

1010
erbx_lex_to_buffer(html, &output);
1111

12-
ck_assert_str_eq(
13-
output.value,
14-
"#<Token type=TOKEN_EOF value='' range=[0, 0] start=1:0 end=1:0>\n");
12+
ck_assert_str_eq(output.value,
13+
"#<Token type=TOKEN_EOF value='' range=[0, 0] start=1:0 end=1:0>\n");
1514

1615
buffer_free(&output);
1716
END
@@ -70,21 +69,20 @@ buffer_init(&output);
7069

7170
erbx_lex_to_buffer(html, &output);
7271

73-
ck_assert_str_eq(
74-
output.value,
75-
"#<Token type=TOKEN_START_TAG_START value='<' range=[0, 1] start=1:0 "
76-
"end=1:1>\n"
77-
"#<Token type=TOKEN_TAG_NAME value='ns:table' range=[1, 9] start=1:1 "
78-
"end=1:9>\n"
79-
"#<Token type=TOKEN_START_TAG_END value='>' range=[9, 10] start=1:9 "
80-
"end=1:10>\n"
81-
"#<Token type=TOKEN_END_TAG_START value='</' range=[10, 12] start=1:10 "
82-
"end=1:12>\n"
83-
"#<Token type=TOKEN_TAG_NAME value='ns:table' range=[12, 20] start=1:12 "
84-
"end=1:20>\n"
85-
"#<Token type=TOKEN_END_TAG_END value='>' range=[20, 21] start=1:20 "
86-
"end=1:21>\n"
87-
"#<Token type=TOKEN_EOF value='' range=[21, 21] start=1:21 end=1:21>\n");
72+
ck_assert_str_eq(output.value,
73+
"#<Token type=TOKEN_START_TAG_START value='<' range=[0, 1] start=1:0 "
74+
"end=1:1>\n"
75+
"#<Token type=TOKEN_TAG_NAME value='ns:table' range=[1, 9] start=1:1 "
76+
"end=1:9>\n"
77+
"#<Token type=TOKEN_START_TAG_END value='>' range=[9, 10] start=1:9 "
78+
"end=1:10>\n"
79+
"#<Token type=TOKEN_END_TAG_START value='</' range=[10, 12] start=1:10 "
80+
"end=1:12>\n"
81+
"#<Token type=TOKEN_TAG_NAME value='ns:table' range=[12, 20] start=1:12 "
82+
"end=1:20>\n"
83+
"#<Token type=TOKEN_END_TAG_END value='>' range=[20, 21] start=1:20 "
84+
"end=1:21>\n"
85+
"#<Token type=TOKEN_EOF value='' range=[21, 21] start=1:21 end=1:21>\n");
8886

8987
buffer_free(&output);
9088
END

‎test/test_token.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
#include "include/test.h"
33

44
TEST(test_token)
5-
ck_assert_str_eq(token_type_string(TOKEN_ATTRIBUTE_NAME),
6-
"TOKEN_ATTRIBUTE_NAME");
5+
ck_assert_str_eq(token_type_string(TOKEN_ATTRIBUTE_NAME), "TOKEN_ATTRIBUTE_NAME");
76
END
87

98
TCase *

0 commit comments

Comments
 (0)