parser: rename token_t and value_t to parser_token_t and parser_value_t

1 files changed, 9 insertions, 9 deletions

diff --git a/src/lex.cpp b/src/lex.cpp
index 0587689..a4c64c4 100644
--- a/src/lex.cpp
+++ b/src/lex.cpp
@@ -97,12 +97,12 @@ void lex_t::consume(bool consume_needspace) {
 	needspace = consume_needspace;
 }
 
-int lex_t::io_error(value_t *value) {
+int lex_t::io_error(parser_value_t *value) {
 	value->error = "I/O error";
 	return -1;
 }
 
-int lex_t::syntax_error(value_t *value) {
+int lex_t::syntax_error(parser_value_t *value) {
 	if (std::ferror(file))
 		return io_error(value);
 
@@ -110,7 +110,7 @@ int lex_t::syntax_error(value_t *value) {
 	return -1;
 }
 
-int lex_t::consume_comment(value_t *value) {
+int lex_t::consume_comment(parser_value_t *value) {
 	char prev = 0;
 
 	while (next(true)) {
@@ -131,7 +131,7 @@ int lex_t::consume_comment(value_t *value) {
 }
 
 /*
-int lex_t::unterminated_string(value_t *value) {
+int lex_t::unterminated_string(parser_value_t *value) {
 	if (ferror(file))
 		return io_error(value);
 
@@ -139,7 +139,7 @@ int lex_t::unterminated_string(value_t *value) {
 	return -1;
 }
 
-int lex_t::lex_string(value_t *value) {
+int lex_t::lex_string(parser_value_t *value) {
 	char *buf = NULL;
 	size_t len = 1024;
 	size_t pos = 0;
@@ -189,7 +189,7 @@ int lex_t::lex_string(value_t *value) {
 	return TOK_STRING;
 	}*/
 
-int lex_t::lex_number(value_t *value) {
+int lex_t::lex_number(parser_value_t *value) {
 	if (needspace)
 		return syntax_error(value);
 
@@ -219,7 +219,7 @@ int lex_t::lex_number(value_t *value) {
 	return TOK_UINT;
 }
 
-int lex_t::lex_keyword(value_t *value) {
+int lex_t::lex_keyword(parser_value_t *value) {
 	if (needspace)
 		return syntax_error(value);
 
@@ -243,7 +243,7 @@ int lex_t::lex_keyword(value_t *value) {
 	return ret->token;
 }
 
-int lex_t::lex_symbol(value_t *value, bool terminal) {
+int lex_t::lex_symbol(parser_value_t *value, bool terminal) {
 	if (needspace)
 		return syntax_error(value);
 
@@ -275,7 +275,7 @@ int lex_t::lex_symbol(value_t *value, bool terminal) {
 	return terminal ? TOK_TERM : TOK_NONTERM;
 }
 
-int lex_t::lex(value_t *value) {
+int lex_t::lex(parser_value_t *value) {
 	int token;
 
 	while (end > start) {