cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better code style in some of the acc source files

Browse Source
This commit is contained in:
jpekkila
2019-09-24 15:50:20 +03:00
parent 88c3cdf0a5
commit a91da8388c
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acc/src/acc.y
View File

@@ -235,4 +235,5 @@ int
yyerror(const char* str) yyerror(const char* str)
{ {
fprintf(stderr, "%s on line %d when processing char %d: [%s]\n", str, yyget_lineno(), *yytext, yytext); fprintf(stderr, "%s on line %d when processing char %d: [%s]\n", str, yyget_lineno(), *yytext, yytext);
return EXIT_FAILURE;
} }

15
acc/src/code_generator.c
View File

@@ -163,6 +163,7 @@ static void
rm_symbol(const int handle) rm_symbol(const int handle)
{ {
assert(handle >= 0 && handle < num_symbols); assert(handle >= 0 && handle < num_symbols);
assert(num_symbols > 0);
if (&symbol_table[handle] != &symbol_table[num_symbols - 1]) if (&symbol_table[handle] != &symbol_table[num_symbols - 1])
memcpy(&symbol_table[handle], &symbol_table[num_symbols - 1], sizeof(Symbol)); memcpy(&symbol_table[handle], &symbol_table[num_symbols - 1], sizeof(Symbol));
@@ -179,7 +180,7 @@ print_symbol(const int handle)
symbol_table[handle].identifier}; symbol_table[handle].identifier};
const size_t num_fields = sizeof(fields) / sizeof(fields[0]); const size_t num_fields = sizeof(fields) / sizeof(fields[0]);
for (int i = 0; i < num_fields; ++i) for (size_t i = 0; i < num_fields; ++i)
if (fields[i]) if (fields[i])
printf("%s ", fields[i]); printf("%s ", fields[i]);
} }
@@ -252,19 +253,19 @@ translate_latest_symbol(void)
} }
} }
static void static inline void
print_symbol_table(void) print_symbol_table(void)
{ {
for (int i = 0; i < num_symbols; ++i) { for (int i = 0; i < num_symbols; ++i) {
printf("%d: ", i); printf("%d: ", i);
const char* fields[] = {translate(symbol_table[i].type_qualifier), const char* fields[] = {translate(symbol_table[i].type_qualifier),
translate(symbol_table[i].type_specifier), translate(symbol_table[i].type_specifier),
symbol_table[i].identifier}; symbol_table[i].identifier};
const size_t num_fields = sizeof(fields) / sizeof(fields[0]);
for (int i = 0; i < num_fields; ++i) const size_t num_fields = sizeof(fields) / sizeof(fields[0]);
if (fields[i]) for (size_t j = 0; j < num_fields; ++j)
printf("%s ", fields[i]); if (fields[j])
printf("%s ", fields[j]);
if (symbol_table[i].type == SYMBOLTYPE_FUNCTION) if (symbol_table[i].type == SYMBOLTYPE_FUNCTION)
printf("(function)"); printf("(function)");