Replace hand-written parser by one generated by solar itself :D

1 files changed, 12 insertions, 12 deletions

diff --git a/src/lex.hpp b/src/lex.hpp
index 7405279..e240e12 100644
--- a/src/lex.hpp
+++ b/src/lex.hpp
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "parser.hpp"
+#include "parse.hpp"
 
 #include <cstdio>
 #include <cstring>
@@ -62,17 +62,17 @@ private:
 	bool next(bool move);
 	void consume(bool needspace);
 
-	int io_error(parser_value_t *value);
-	int syntax_error(parser_value_t *value);
-	int consume_comment(parser_value_t *value);
-	int unterminated_block(parser_value_t *value);
-	//int unterminated_string(parser_value_t *value);
+	int io_error(parse_token_value_t *value);
+	int syntax_error(parse_token_value_t *value);
+	int consume_comment(parse_token_value_t *value);
+	int unterminated_block(parse_token_value_t *value);
+	//int unterminated_string(parse_token_value_t *value);
 
-	//int lex_string(parser_value_t *value);
-	//int lex_number(parser_value_t *value);
-	int lex_keyword(parser_value_t *value);
-	int lex_block(parser_value_t *value);
-	int lex_symbol(parser_value_t *value);
+	//int lex_string(parse_token_value_t *value);
+	//int lex_number(parse_token_value_t *value);
+	int lex_keyword(parse_token_value_t *value);
+	int lex_block(parse_token_value_t *value);
+	int lex_symbol(parse_token_value_t *value);
 
 	char current() {
 		return buffer[start + tok_len];
@@ -92,7 +92,7 @@ public:
 		fclose(file);
 	}
 
-	int lex(parser_value_t *value);
+	int lex(parse_token_value_t *value);
 
 	const location_t & get_location() const {
 		return loc;