1 files changed, 6 insertions, 9 deletions
diff --git a/src/as_tokenizer.h b/src/as_tokenizer.h
index 72a5d8b..d22ab55 100644
--- a/src/as_tokenizer.h
+++ b/src/as_tokenizer.h
@@ -18,7 +18,6 @@ struct token {
     int64_t ival;
     double fval;
 };
-typedef struct token * token_t;
 
 #define INPUT_STREAM_BUF_SIZE 1024
 
@@ -30,17 +29,15 @@ struct input_stream{
     int line;
     int col;
 }; 
-typedef struct input_stream *input_stream_t;
 
 struct token_stream {
-    token_t buf;
-    input_stream_t s;
+    struct token *buf;
+    struct input_stream *s;
 };
-typedef struct token_stream *token_stream_t;
 
-token_t next_token(allocator_t alct, token_stream_t ts);
-token_t peek_token(allocator_t alct, token_stream_t ts);
-void print_token(token_t t);
-token_stream_t new_token_stream(allocator_t alct, FILE* fp);
+struct token* next_token(struct allocator * alct, struct token_stream * ts);
+struct token* peek_token(struct allocator * alct, struct token_stream * ts);
+void print_token(struct token *t);
+struct token_stream * new_token_stream(struct allocator * alct, FILE* fp);
 
 #endif // FMV_AS_TOKENIZER_H_