gherkin: (C) Avoid using repeated typedefs (support gcc <v4.6)

Technically C does not support repeated typedefs until C11, however modern compilers do allow it (gcc also using -std=c90). But since gcc <v4.6 does not support that, remove the usage of them.
cucumber · May 1, 2017 · 8f31c2f · 8f31c2f
1 parent 00ee9b1
commit 8f31c2f
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 50 deletions.
diff --git a/gherkin-c-parser.razor b/gherkin-c-parser.razor
@@ -32,7 +32,6 @@
 #include "token_scanner.h"
 #include "token_matcher.h"
 #include "token_queue.h"
-#include "builder.h"
 #include "error_list.h"
 #include <stdlib.h>
 #include <setjmp.h>
@@ -46,11 +45,11 @@ typedef struct ParserContext {
     ErrorList* errors;
 } ParserContext;
 
-typedef struct @Model.ParserClassName {
+struct @Model.ParserClassName {
     ParserContext* parser_context;
     Builder* builder;
     ErrorList* errors;
-} @Model.ParserClassName;
+};
 
 static Token* read_token(ParserContext* context);
 

diff --git a/include/builder.h b/include/builder.h
@@ -1,11 +1,10 @@
 #ifndef GHERKIN_BUILDER_H_
 #define GHERKIN_BUILDER_H_
 
+#include "error_list.h"
 #include "rule_type.h"
 #include "token.h"
 
-typedef struct ErrorList ErrorList;
-
 typedef struct Builder Builder;
 
 typedef void (*builder_reset_function) (Builder*);
@@ -16,14 +15,12 @@ typedef void (*build_function) (Builder*, Token*);
 
 typedef void (*rule_function) (Builder*, RuleType);
 
-typedef void (*rule_function) (Builder*, RuleType);
-
-typedef struct Builder {
+struct Builder {
     builder_reset_function reset;
     builder_error_context_function set_error_context;
     build_function build;
     rule_function start_rule;
     rule_function end_rule;
-} Builder;
+};
 
 #endif /* GHERKIN_BUILDER_H_ */
diff --git a/include/compiler.h b/include/compiler.h
@@ -3,17 +3,15 @@
 
 #include <stdbool.h>
 #include <wchar.h>
+#include "gherkin_document.h"
+#include "pickle.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct Compiler Compiler;
 
-typedef struct GherkinDocument GherkinDocument;
-
-typedef struct Pickle Pickle;
-
 Compiler* Compiler_new();
 
 void Compiler_delete(Compiler* compiler);

diff --git a/include/event.h b/include/event.h
@@ -20,11 +20,11 @@ typedef enum EventType {
     Gherkin_PickleEvent
 } EventType;
 
-typedef struct Event {
+struct Event {
     event_delete_function event_delete;
     event_print_function event_print;
     EventType event_type;
-} Event;
+};
 
 void Event_delete(const Event* event);
 

diff --git a/include/item.h b/include/item.h
@@ -5,8 +5,8 @@ typedef struct Item Item;
 
 typedef void (*item_delete_function) (Item*);
 
-typedef struct Item {
+struct Item {
     item_delete_function item_delete;
-} Item;
+};
 
 #endif /* GHERKIN_ITEM_H_ */
diff --git a/include/parser.h b/include/parser.h
@@ -1,7 +1,10 @@
 #ifndef GHERKIN_PARSER_H_
 #define GHERKIN_PARSER_H_
 
+#include "builder.h"
 #include "error.h"
+#include "token_matcher.h"
+#include "token_scanner.h"
 #include <stdbool.h>
 #include <wchar.h>
 
@@ -11,14 +14,6 @@ extern "C" {
 
 typedef struct Parser Parser;
 
-typedef struct Builder Builder;
-
-typedef struct TokenMatcher TokenMatcher;
-
-typedef struct TokenScanner TokenScanner;
-
-typedef struct Feature Feature;
-
 Parser* Parser_new(Builder* builder);
 
 void Parser_delete(Parser* parser);

diff --git a/include/token_matcher.h b/include/token_matcher.h
@@ -2,23 +2,21 @@
 #define GHERKIN_TOKEN_MATCHER_H_
 
 #include <stdbool.h>
+#include "dialect.h"
+#include "error_list.h"
 #include "token.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct Dialect Dialect;
-
-typedef struct ErrorList ErrorList;
-
 typedef struct TokenMatcher TokenMatcher;
 
 typedef void (*matcher_reset_function) (TokenMatcher*);
 
 typedef bool (*match_function) (TokenMatcher*, Token*);
 
-typedef struct TokenMatcher {
+struct TokenMatcher {
     const wchar_t* default_language;
     const wchar_t* language;
     const Dialect* dialect;
@@ -40,7 +38,7 @@ typedef struct TokenMatcher {
     match_function match_Language;
     match_function match_Other;
     match_function match_EOF;
-} TokenMatcher;
+};
 
 TokenMatcher* TokenMatcher_new(const wchar_t* default_language);
 

diff --git a/include/token_scanner.h b/include/token_scanner.h
@@ -15,10 +15,10 @@ typedef Token* (*read_function) (TokenScanner*);
 
 typedef void (*delete_function) (TokenScanner*);
 
-typedef struct TokenScanner {
+struct TokenScanner {
     read_function read;
     delete_function delete;
-} TokenScanner;
+};
 
 void TokenScanner_delete(TokenScanner* token_scanner);
 

diff --git a/src/Makefile b/src/Makefile
@@ -1,5 +1,5 @@
 GCC_FLAGS=-c -Wall -Werror -g
-CLANG_FLAGS=-c -Wall -Wno-typedef-redefinition -Werror -g
+CLANG_FLAGS=-c -Wall -Werror -g
 
 ifeq ($(CC),i686-w64-mingw32-gcc)
 	CC=i686-w64-mingw32-gcc

diff --git a/src/ast_builder.c b/src/ast_builder.c
@@ -6,7 +6,6 @@
 #include "scenario_outline.h"
 #include "data_table.h"
 #include "doc_string.h"
-#include "error_list.h"
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/src/compiler.c b/src/compiler.c
@@ -12,9 +12,9 @@
 #include "string_utilities.h"
 #include <stdlib.h>
 
-typedef struct Compiler {
+struct Compiler {
     ItemQueue* pickle_list;
-} Compiler;
+};
 
 typedef struct ReplacementItem {
     item_delete_function item_delete;

diff --git a/src/error_list.c b/src/error_list.c
@@ -6,12 +6,12 @@
 #include <stdlib.h>
 #include <setjmp.h>
 
-typedef struct ErrorList {
+struct ErrorList {
     ItemQueue* errors;
     QueueItem* current_error;
     jmp_buf* global_env;
     jmp_buf* local_env;
-} ErrorList;
+};
 
 static int calculate_string_length_for_location(int line_width, int column_width);
 

diff --git a/src/file_reader.c b/src/file_reader.c
@@ -3,9 +3,9 @@
 #include "unicode_utilities.h"
 #include <stdlib.h>
 
-typedef struct FileReader {
+struct FileReader {
     const char* file_name;
-} FileReader;
+};
 
 static void extend_buffer_if_needed(wchar_t** buffer, int* buffer_size, int pos);
 

diff --git a/src/item_queue.h b/src/item_queue.h
@@ -10,10 +10,10 @@ extern "C" {
 
 typedef struct QueueItem QueueItem;
 
-typedef struct QueueItem {
+struct QueueItem {
     Item* item;
     QueueItem* next;
-} QueueItem;
+};
 
 typedef struct ItemQueue {
     QueueItem* first;

diff --git a/src/parser.c b/src/parser.c
@@ -4,7 +4,6 @@
 #include "token_scanner.h"
 #include "token_matcher.h"
 #include "token_queue.h"
-#include "builder.h"
 #include "error_list.h"
 #include <stdlib.h>
 #include <setjmp.h>
@@ -18,11 +17,11 @@ typedef struct ParserContext {
     ErrorList* errors;
 } ParserContext;
 
-typedef struct Parser {
+struct Parser {
     ParserContext* parser_context;
     Builder* builder;
     ErrorList* errors;
-} Parser;
+};
 
 static Token* read_token(ParserContext* context);
 

diff --git a/src/token_queue.c b/src/token_queue.c
@@ -2,8 +2,6 @@
 #include "item_queue.h"
 #include <stdlib.h>
 
-typedef struct QueueItem QueueItem;
-
 TokenQueue* TokenQueue_new() {
     return (TokenQueue*)ItemQueue_new();
 }

diff --git a/src/utf8_source.h b/src/utf8_source.h
@@ -15,10 +15,10 @@ typedef unsigned char (*utf8_source_read_function) (Utf8Source*);
 
 typedef void (*utf8_source_delete_function) (Utf8Source*);
 
-typedef struct Utf8Source {
+struct Utf8Source {
     utf8_source_read_function read;
     utf8_source_delete_function delete;
-} Utf8Source;
+};
 
 unsigned char Utf8Source_read(Utf8Source* utf8_source);