Skip to content

Commit a0e7e79

Browse files
author
Noam Preil
committed
remove include-within-includes
1 parent ff95559 commit a0e7e79

50 files changed

Lines changed: 151 additions & 279 deletions

Some content is hidden

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

‎assembler/assembler.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
1-
#include "assembler.h"
21
#include <stdlib.h>
2+
#include <stdint.h>
3+
#include <stdbool.h>
34
#include <stdio.h>
45
#include <string.h>
56
#include <ctype.h>
6-
#include "privatize.h"
77
#include "list.h"
8+
#include "stack.h"
9+
#include "instructions.h"
10+
#include "linker.h"
11+
#include "enums.h"
12+
#include "expression.h"
13+
#include "objects.h"
14+
#include "assembler.h"
15+
#include "privatize.h"
816
#include "log.h"
917
#include "runtime.h"
10-
#include "objects.h"
1118
#include "readline.h"
1219
#include "stringop.h"
13-
#include "instructions.h"
1420
#include "match.h"
1521
#include "errors.h"
16-
#include "expression.h"
1722
#include "directives.h"
1823

1924
#define ERROR(ERROR_CODE, COLUMN, ...) add_error(state->errors, ERROR_CODE, \

‎assembler/directives.c‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
1-
#include "directives.h"
2-
#include "assembler.h"
1+
#include <stdio.h>
2+
#include <limits.h>
3+
#include <string.h>
4+
#include <ctype.h>
5+
#include <stdint.h>
6+
#include <stdlib.h>
7+
#include <stdarg.h>
8+
#include <stdbool.h>
9+
#include "list.h"
10+
#include "stack.h"
11+
#include "instructions.h"
12+
#include "linker.h"
13+
#include "enums.h"
314
#include "errors.h"
4-
#include "functions.h"
515
#include "expression.h"
616
#include "stringop.h"
717
#include "objects.h"
18+
#include "functions.h"
19+
#include "assembler.h"
20+
#include "directives.h"
821
#include "runtime.h"
9-
#include "list.h"
1022
#include "log.h"
1123
#include "format.h"
12-
#include <limits.h>
13-
#include <string.h>
14-
#include <ctype.h>
15-
#include <stdint.h>
16-
#include <stdlib.h>
17-
#include <stdarg.h>
1824

1925
#define ERROR(ERROR_CODE, COLUMN, ...) add_error(state->errors, ERROR_CODE, \
2026
*(int*)stack_peek(state->line_number_stack), \

‎assembler/privatize.c‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
#include "privatize.h"
21
#include <string.h>
2+
#include <stdbool.h>
3+
#include <stdint.h>
34
#include <stdlib.h>
45
#include <stdio.h>
56
#include "log.h"
6-
#include "functions.h"
7+
#include "list.h"
8+
#include "stack.h"
79
#include "expression.h"
810
#include "objects.h"
11+
#include "functions.h"
912
#include "md5.h"
13+
#include "enums.h"
14+
#include "linker.h"
1015
#include "runtime.h"
16+
#include "privatize.h"
1117

1218
void rename_symbol(area_t *a, const char *original, const char *new) {
1319
for (unsigned int i = 0; i < a->late_immediates->length; ++i) {

‎common/errors.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
#include "errors.h"
2-
#include "list.h"
3-
#include "log.h"
4-
#include "objects.h"
51
#include <stdbool.h>
62
#include <stdlib.h>
73
#include <stdint.h>
84
#include <string.h>
5+
#include <stdio.h>
96
#include <stdarg.h>
107

8+
#include "list.h"
9+
#include "stack.h"
10+
#include "errors.h"
11+
#include "log.h"
12+
#include "expression.h"
13+
#include "objects.h"
14+
1115
const char *get_error_string(error_t *error) {
1216
switch (error->code) {
1317
case ERROR_INVALID_INSTRUCTION:

‎common/expression.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
#include <ctype.h>
2+
#include <stdbool.h>
3+
#include <stdio.h>
4+
#include <stdint.h>
5+
#include <stdlib.h>
6+
#include <string.h>
17

28
#include "list.h"
39
#include "io.h"
10+
#include "stack.h"
411
#include "expression.h"
512
#include "log.h"
613
#include "readline.h"
7-
#include "stack.h"
814
#include "stringop.h"
915
#include "operators.h"
1016
#include "objects.h"
1117

12-
#include <ctype.h>
13-
#include <stdlib.h>
14-
#include <string.h>
15-
#include <stdio.h>
16-
1718
static operator_t operators[] = {
1819
{ "+", OP_UNARY_PLUS, 1, 3, 1, operator_unary_plus },
1920
{ "-", OP_UNARY_MINUS, 1, 3, 1, operator_unary_minus },

‎common/functions.c‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
#include "functions.h"
2-
#include "objects.h"
1+
#include <stdbool.h>
2+
#include <stdio.h>
3+
#include <stdint.h>
4+
#include <stdlib.h>
5+
#include <string.h>
6+
37
#include "list.h"
4-
#include "hashtable.h"
8+
#include "stack.h"
59
#include "expression.h"
10+
#include "objects.h"
11+
#include "functions.h"
12+
#include "hashtable.h"
613
#include "log.h"
7-
#include <stdlib.h>
8-
#include <stdint.h>
9-
#include <string.h>
1014

1115
unsigned int hash(void *data) {
1216
unsigned int hash = 5381;

‎common/instructions.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
#include "instructions.h"
21
#include <stdbool.h>
32
#include <stdio.h>
3+
#include <stdint.h>
44
#include <stdlib.h>
55
#include <string.h>
66
#include "log.h"
77
#include "list.h"
8+
#include "instructions.h"
89
#include "readline.h"
910
#include "stringop.h"
1011

‎common/io.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#include <stdbool.h>
2+
#include <stddef.h>
3+
#include <stdio.h>
14
#include "io.h"
25
#include "log.h"
36

‎common/match.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
#include <stdbool.h>
2+
#include <stdint.h>
3+
#include <stdio.h>
14
#include <stdlib.h>
25
#include <ctype.h>
36
#include <string.h>
7+
#include "list.h"
48
#include "stringop.h"
9+
#include "instructions.h"
510
#include "match.h"
611
#include "log.h"
7-
#include "instructions.h"
812

913
/*
1014
* Used to get the value provided in code for an operand or immediate value

‎common/objects.c‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
#include "io.h"
2-
#include "objects.h"
3-
#include "log.h"
4-
#include "functions.h"
5-
#include "readline.h"
1+
#include <stdbool.h>
62
#include <stdio.h>
73
#include <stdlib.h>
84
#include <stdint.h>
95
#include <string.h>
106
#include <errno.h>
7+
#include "io.h"
8+
#include "list.h"
9+
#include "stack.h"
10+
#include "expression.h"
11+
#include "objects.h"
12+
#include "log.h"
13+
#include "functions.h"
14+
#include "readline.h"
1115

1216
#define SCASOBJ_VERSION 2
1317

0 commit comments

Comments
 (0)