Merge pull request #5 from jow-/new-type-system

New type system

1 files changed, 3 insertions, 8 deletions

diff --git a/lexer.h b/lexer.h
index 820a986..069e9e0 100644
--- a/lexer.h
+++ b/lexer.h
@@ -18,6 +18,7 @@
 #define __LEXER_H_
 
 #include "source.h"
+#include "types.h"
 
 
 typedef enum {
@@ -121,17 +122,11 @@ typedef enum {
 
 typedef struct {
 	uc_tokentype_t type;
-	json_object *val;
+	uc_value_t *uv;
 	size_t pos;
 } uc_token;
 
 typedef struct {
-	bool lstrip_blocks;
-	bool trim_blocks;
-	bool strict_declarations;
-} uc_parse_config;
-
-typedef struct {
 	uc_lex_state_t state;
 	uc_parse_config *config;
 	uc_source *source;
@@ -170,6 +165,6 @@ uc_token *uc_lexer_next_token(uc_lexer *lex, bool no_regexp);
 bool utf8enc(char **out, int *rem, int code);
 
 const char *
-uc_get_tokenname(int type);
+uc_get_tokenname(unsigned type);
 
 #endif /* __LEXER_H_ */