aboutsummaryrefslogtreecommitdiff
path: root/src/tokenizer.cpp
diff options
context:
space:
mode:
authorGinger Bill <bill@gingerbill.org>2017-06-08 13:08:39 +0100
committerGinger Bill <bill@gingerbill.org>2017-06-08 13:08:39 +0100
commit2b96be0ae8b74e6081a00d740dfcbe205f76fb22 (patch)
tree780289c3b3e5e72b3f96409c290007498bcec84e /src/tokenizer.cpp
parent2a89d8021cf95f4a4d7dab269a262a1d2237f71b (diff)
Remove unnecessary `typedef` usage
Diffstat (limited to 'src/tokenizer.cpp')
-rw-r--r--src/tokenizer.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/tokenizer.cpp b/src/tokenizer.cpp
index 9e4151c50..38026deeb 100644
--- a/src/tokenizer.cpp
+++ b/src/tokenizer.cpp
@@ -117,11 +117,11 @@ TOKEN_KIND(Token__KeywordBegin, "_KeywordBegin"), \
TOKEN_KIND(Token__KeywordEnd, "_KeywordEnd"), \
TOKEN_KIND(Token_Count, "")
-typedef enum TokenKind {
+enum TokenKind {
#define TOKEN_KIND(e, s) e
TOKEN_KINDS
#undef TOKEN_KIND
-} TokenKind;
+};
String const token_strings[] = {
#define TOKEN_KIND(e, s) {cast(u8 *)s, gb_size_of(s)-1}
@@ -130,11 +130,11 @@ String const token_strings[] = {
};
-typedef struct TokenPos {
+struct TokenPos {
String file;
isize line;
isize column;
-} TokenPos;
+};
i32 token_pos_cmp(TokenPos a, TokenPos b) {
if (a.line == b.line) {
@@ -152,11 +152,11 @@ bool token_pos_eq(TokenPos a, TokenPos b) {
return token_pos_cmp(a, b) == 0;
}
-typedef struct Token {
+struct Token {
TokenKind kind;
String string;
TokenPos pos;
-} Token;
+};
Token empty_token = {Token_Invalid};
Token blank_token = {Token_Ident, {cast(u8 *)"_", 1}};
@@ -167,12 +167,12 @@ Token make_token_ident(String s) {
}
-typedef struct ErrorCollector {
+struct ErrorCollector {
TokenPos prev;
i64 count;
i64 warning_count;
gbMutex mutex;
-} ErrorCollector;
+};
gb_global ErrorCollector global_error_collector;
@@ -306,7 +306,7 @@ gb_inline bool token_is_shift(TokenKind t) {
gb_inline void print_token(Token t) { gb_printf("%.*s\n", LIT(t.string)); }
-typedef enum TokenizerInitError {
+enum TokenizerInitError {
TokenizerInit_None,
TokenizerInit_Invalid,
@@ -315,18 +315,18 @@ typedef enum TokenizerInitError {
TokenizerInit_Empty,
TokenizerInit_Count,
-} TokenizerInitError;
+};
-typedef struct TokenizerState {
+struct TokenizerState {
Rune curr_rune; // current character
u8 * curr; // character pos
u8 * read_curr; // pos from start
u8 * line; // current line pos
isize line_count;
-} TokenizerState;
+};
-typedef struct Tokenizer {
+struct Tokenizer {
String fullpath;
u8 *start;
u8 *end;
@@ -339,7 +339,7 @@ typedef struct Tokenizer {
isize error_count;
Array<String> allocated_strings;
-} Tokenizer;
+};
TokenizerState save_tokenizer_state(Tokenizer *t) {