1 files changed, 33 insertions, 45 deletions
diff --git a/src/include/token.h b/src/include/token.h
index 1a307cd..802f13d 100644
--- a/src/include/token.h
+++ b/src/include/token.h
@@ -1,56 +1,44 @@
 #ifndef TOKEN_H
 #define TOKEN_H
 
-#define TOKEN_DEFNAME_FIRST_CHAR_ALLOWED_CHARS        "+-/*abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_"
-#define TOKEN_DEFNAME_FIRST_CHAR_ALLOWED_CHARS_LEN    57
-#define TOKEN_DEFNAME_SPLIT_CHAR_ALLOWED_CHARS        "1234567890_-"
-#define TOKEN_DEFNAME_SPLIT_CHAR_ALLOWED_CHARS_LEN    12
-#define TOKEN_CHAR_IGNORE                             " \t\n\r"
-#define TOKEN_CHAR_IGNORE_LEN                         4
-#define TOKEN_CHAR_FIRST_CHAR_INT                     "0123456789"
-
+#include "util.h"
 
+/* token struct */
 typedef struct TOKEN_STRUC {
-   enum TOKEN_ENUM {
-      TOKEN_KEYWORD,             // keyword
-      TOKEN_PRIM_STR,            // "string"
-      TOKEN_PRIM_INT,            // 42
-      TOKEN_COMM,                // `comment`
-      TOKEN_STMNT_END,           // ;
-      TOKEN_LGROUP,              // (
-      TOKEN_RGROUP,              // )
-      TOKEN_DIRECTIVE,           // #DIRECTIVE#
-      TOKEN_FN_APPLY,            // .
-      TOKEN_LIST_DELIM,          // ,
-      TOKEN_DEF_TAG,             // def:def
-      TOKEN_BLOCK_START,         // {
-      TOKEN_BLOCK_END,           // }
-      TOKEN_NAMESPACE_DELIM,     // /
-      TOKEN_ARRAY_START,         // [
-      TOKEN_ARRAY_END,           // ]
-      TOKEN_DEF_SET,             // =
-      TOKEN_UNKNOWN,             // ???
-      TOKEN_EOF,                 // \0
-    } type;
-
-    char* value;
+   /* token type */
+   enum TOKEN_TYPE {
+      TOKEN_UNKNOWN,
+      TOKEN_CHAR_DELIM,
+      TOKEN_STR_DELIM,
+      TOKEN_COMMENT_DELIM,
+      TOKEN_EXPR_END,
+      TOKEN_SET,
+      TOKEN_LGROUP,
+      TOKEN_RGROUP,
+      TOKEN_APPLY,
+      TOKEN_LIST_DELIM,
+      TOKEN_TAG_DELIM,
+      TOKEN_NAMESPACE_DELIM,
+      TOKEN_LBLOCK,
+      TOKEN_RBLOCK,
+      TOKEN_RLIST,
+      TOKEN_LLIST,
+      TOKEN_ESC
+   } type;
+
+   /* token value */
+   char* val;
+
+   /* next token */
+   struct TOKEN_STRUC* nxt;
 } token_t;
 
+/* creates a token */
 token_t* token_init(int type, char* val);
-
-char* token_get_type(int type);
-
-int char_could_start_keyword(char* character);
-int char_could_split_keyword(char* character);
-int char_could_start_int(char* character);
-int char_can_ignore(char* character);
-
-int token_char_quote(char c);
-int token_char_grave(char c);
-int token_char_pound(char c);
-int token_char_colon(char c);
-int token_char_kywrd(char c);
-
+/* destroys a token **and all tokens contained in nxt** */
 void token_destroy(token_t* token);
 
+/* return pointer to the last token */
+token_t* token_last(token_t* token);
+
 #endif