treewide: ISO C / pedantic compliance

 - Shuffle typedefs to avoid need for non-compliant forward declarations
 - Fix non-compliant empty struct initializers
 - Remove use of braced expressions
 - Remove use of anonymous unions
 - Avoid `void *` pointer arithmetic
 - Fix several warnings reported by gcc -pedantic mode and clang 11 compilation

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

1 files changed, 1 insertions, 27 deletions

diff --git a/chunk.h b/chunk.h
index cad00f7..2a8fa3a 100644
--- a/chunk.h
+++ b/chunk.h
@@ -22,38 +22,12 @@
 
 #include "value.h"
 #include "util.h"
-
-
-typedef struct {
-	size_t from, to, target, slot;
-} uc_ehrange;
-
-typedef struct {
-	size_t from, to, slot, nameidx;
-} uc_varrange;
-
-uc_declare_vector(uc_ehranges, uc_ehrange);
-uc_declare_vector(uc_variables, uc_varrange);
-uc_declare_vector(uc_offsetinfo, uint8_t);
-
-typedef struct {
-	size_t count;
-	uint8_t *entries;
-	uc_value_list constants;
-	uc_ehranges ehranges;
-	struct {
-		uc_variables variables;
-		uc_value_list varnames;
-		uc_offsetinfo offsets;
-	} debuginfo;
-} uc_chunk;
+#include "types.h"
 
 void uc_chunk_init(uc_chunk *chunk);
 void uc_chunk_free(uc_chunk *chunk);
 size_t uc_chunk_add(uc_chunk *chunk, uint8_t byte, size_t line);
 
-typedef struct uc_value_t uc_value_t;
-
 ssize_t uc_chunk_add_constant(uc_chunk *chunk, uc_value_t *value);
 uc_value_t *uc_chunk_get_constant(uc_chunk *chunk, size_t idx);
 void uc_chunk_pop(uc_chunk *chunk);