unmessify token_print

1 files changed, 6 insertions, 21 deletions

diff --git a/Token.c b/Token.c
index d23e885..7f7fc27 100644
--- a/Token.c
+++ b/Token.c
@@ -10,29 +10,14 @@ void token_free(Token *tok)
 
 void token_print(const Token *tok)
 {
-	printf("%u:%u\t", tok->line, tok->column);
+	printf("%u:%u\t%s ", tok->line, tok->column, token_type_str(tok->type));
 	switch (tok->type) {
-	case TOK_WORD: printf("TOK_WORD        %s\n", tok->s); break;
-	case TOK_STRING: printf("TOK_STRING      \"%s\"\n", tok->s); break;
-	case TOK_INTEGER: printf("TOK_INTEGER     %d\n", tok->v.i); break;
-	case TOK_PAREN_OPEN: printf("TOK_PAREN_OPEN\n"); break;
-	case TOK_PAREN_CLOS: printf("TOK_PAREN_CLOS\n"); break;
-	case TOK_CURL_OPEN: printf("TOK_CURL_OPEN\n"); break;
-	case TOK_CURL_CLOS: printf("TOK_CURL_CLOS\n"); break;
-	case TOK_SQUAR_OPEN: printf("TOK_SQUAR_OPEN\n"); break;
-	case TOK_SQUAR_CLOS: printf("TOK_SQUAR_CLOS\n"); break;
-	case TOK_COLON: printf("TOK_COLON\n"); break;
-	case TOK_SEMICOLON: printf("TOK_SEMICOLON\n"); break;
-	case TOK_ASSIGN: printf("TOK_ASSIGN\n"); break;
-	case TOK_COMMA: printf("TOK_COMMA\n"); break;
-	case TOK_COMP_LESS: printf("TOK_COMP_LESS\n"); break;
-	case TOK_MODULO: printf("TOK_MODULO\n"); break;
-	case TOK_STAR: printf("TOK_STAR\n"); break;
-	case TOK_INCREMENT: printf("TOK_INCREMENT\n"); break;
-	case TOK_COMP_EQ: printf("TOK_COMP_EQ\n"); break;
-	case TOK_COMP_NEQ: printf("TOK_COMP_NEQ\n"); break;
-	default: printf("token_print TODO: type %d\n", tok->type); break;
+	case TOK_WORD: printf("%s", tok->s); break;
+	case TOK_STRING: printf("\"%s\"", tok->s); break;
+	case TOK_INTEGER: printf("%d", tok->v.i); break;
+	default: break;
 	}
+	putchar('\n');
 }
 
 const char *token_type_str(unsigned int type)