From 5940828912aaee614f40c258e88dc58941971317 Mon Sep 17 00:00:00 2001 From: David Phillips Date: Sat, 3 Aug 2019 13:45:06 +1200 Subject: Enable -Wpedantic I'm going to regret this --- Makefile | 2 +- util.c | 22 +++++++++++----------- util.h | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 752b867..54f76f7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -CFLAGS = -Wall -Wextra +CFLAGS = -Wall -Wextra -Wpedantic EXECUTABLES = assembler disassembler diff --git a/util.c b/util.c index ebd1513..a4b6949 100644 --- a/util.c +++ b/util.c @@ -143,17 +143,17 @@ int name(const char *x, type *res) { \ return 1; \ } -GENERATE_STR_LOOKUP_FUNC(get_asm_from_oper, oper_to_asm, enum OPER); -GENERATE_STR_LOOKUP_FUNC(get_asm_from_j, j_to_asm, enum JCOND); -GENERATE_STR_LOOKUP_FUNC(get_asm_from_b, b_to_asm, enum JCOND); -GENERATE_STR_LOOKUP_FUNC(get_asm_from_reg, reg_to_asm, enum REG); -GENERATE_STR_LOOKUP_FUNC(get_token_description, token_to_desc, enum TOKEN_TYPE); - -GENERATE_NUM_LOOKUP_FUNC(get_keyword, keywords, int); -GENERATE_NUM_LOOKUP_FUNC(get_oper_from_asm, oper_to_asm, enum OPER); -GENERATE_NUM_LOOKUP_FUNC(get_j_from_asm, j_to_asm, enum JCOND); -GENERATE_NUM_LOOKUP_FUNC(get_b_from_asm, b_to_asm, enum JCOND); -GENERATE_NUM_LOOKUP_FUNC(get_reg_from_asm, reg_to_asm, enum REG); +GENERATE_STR_LOOKUP_FUNC(get_asm_from_oper, oper_to_asm, enum OPER) +GENERATE_STR_LOOKUP_FUNC(get_asm_from_j, j_to_asm, enum JCOND) +GENERATE_STR_LOOKUP_FUNC(get_asm_from_b, b_to_asm, enum JCOND) +GENERATE_STR_LOOKUP_FUNC(get_asm_from_reg, reg_to_asm, enum REG) +GENERATE_STR_LOOKUP_FUNC(get_token_description, token_to_desc, enum TOKEN_TYPE) + +GENERATE_NUM_LOOKUP_FUNC(get_keyword, keywords, int) +GENERATE_NUM_LOOKUP_FUNC(get_oper_from_asm, oper_to_asm, enum OPER) +GENERATE_NUM_LOOKUP_FUNC(get_j_from_asm, j_to_asm, enum JCOND) +GENERATE_NUM_LOOKUP_FUNC(get_b_from_asm, b_to_asm, enum JCOND) +GENERATE_NUM_LOOKUP_FUNC(get_reg_from_asm, reg_to_asm, enum REG) void indicate_file_area(FILE* fd, size_t line, size_t column, size_t span) diff --git a/util.h b/util.h index 25128d8..7ba2d9f 100644 --- a/util.h +++ b/util.h @@ -10,17 +10,17 @@ const char* name(type); #define GENERATE_PROTO_NUM_LOOKUP_FUNC(name, type) \ int name(const char *x, type *res); -GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_oper, enum OPER); -GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_j, enum JCOND); -GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_b, enum JCOND); -GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_reg, enum REG); -GENERATE_PROTO_STR_LOOKUP_FUNC(get_token_description, enum TOKEN_TYPE); +GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_oper, enum OPER) +GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_j, enum JCOND) +GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_b, enum JCOND) +GENERATE_PROTO_STR_LOOKUP_FUNC(get_asm_from_reg, enum REG) +GENERATE_PROTO_STR_LOOKUP_FUNC(get_token_description, enum TOKEN_TYPE) -GENERATE_PROTO_NUM_LOOKUP_FUNC(get_keyword, int); -GENERATE_PROTO_NUM_LOOKUP_FUNC(get_oper_from_asm, enum OPER); -GENERATE_PROTO_NUM_LOOKUP_FUNC(get_j_from_asm, enum JCOND); -GENERATE_PROTO_NUM_LOOKUP_FUNC(get_b_from_asm, enum JCOND); -GENERATE_PROTO_NUM_LOOKUP_FUNC(get_reg_from_asm, enum REG); +GENERATE_PROTO_NUM_LOOKUP_FUNC(get_keyword, int) +GENERATE_PROTO_NUM_LOOKUP_FUNC(get_oper_from_asm, enum OPER) +GENERATE_PROTO_NUM_LOOKUP_FUNC(get_j_from_asm, enum JCOND) +GENERATE_PROTO_NUM_LOOKUP_FUNC(get_b_from_asm, enum JCOND) +GENERATE_PROTO_NUM_LOOKUP_FUNC(get_reg_from_asm, enum REG) const char * get_token_description(enum TOKEN_TYPE t); void indicate_file_area(FILE* fd, size_t line, size_t column, size_t span); -- cgit v1.1