X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Ftextparser.cpp;h=7dc4bde7e46ed659368498798bf0b6b3b62fa246;hp=c87a32df666924e163ee83e8d53f06d7d181b2e3;hb=cd3de49e76305a50ae61696210ce10804a59cef1;hpb=ed78b585cfc4ecb44972e346857e887b183fd7a7

diff --git a/source/textparser.cpp b/source/textparser.cpp
index c87a32d..7dc4bde 100644
--- a/source/textparser.cpp
+++ b/source/textparser.cpp
@@ -22,8 +22,7 @@ Statement TextParser::parse()
 Statement TextParser::parse_statement(const Token *t)
 {
 	Statement result;
-	bool sub = false;
-	bool finish = false;
+	unsigned sub = 0;
 
 	while(in)
 	{
@@ -47,44 +46,28 @@ Statement TextParser::parse_statement(const Token *t)
 			result.source = src;
 			result.line = in.get_line_number();
 		}
-		else if(sub)
+		else if(sub==1)
 		{
 			if(token.str=="}")
-			{
-				sub = false;
-				finish = true;
-			}
+				sub = 2;
 			else
 			{
 				Statement ss = parse_statement(&token);
 				result.sub.push_back(ss);
 			}
 		}
-		else if(finish)
+		else if(sub==2)
 		{
 			if(token.str!=";")
 				throw syntax_error(token.str);
 			break;
 		}
 		else if(token.str=="{")
-			sub = true;
+			sub = 1;
 		else if(token.str==";")
 			break;
-		else if(token.type==Token::INTEGER)
-			result.append(lexical_cast<IntType::Store>(token.str));
-		else if(token.type==Token::FLOAT)
-			result.append(lexical_cast<FloatType::Store>(token.str));
-		else if(token.type==Token::STRING)
-			result.append(token.str);
-		else if(token.type==Token::IDENTIFIER)
-		{
-			if(token.str=="true")
-				result.append(true);
-			else if(token.str=="false")
-				result.append(false);
-			else
-				result.append(Symbol(token.str));
-		}
+		else if(token.type!=Token::SPECIAL)
+			result.append_from_token(token);
 		else
 			throw syntax_error(token.str);
 	}
@@ -129,6 +112,7 @@ Token TextParser::parse_token()
 		FLOATEXPINIT,
 		FLOATEXPSIGN,
 		STRING,
+		STRING_ESCAPE,
 		ACCEPT,
 		ZERO,
 		DECIMAL,
@@ -148,6 +132,7 @@ Token TextParser::parse_token()
 		Token::SPECIAL,
 		Token::SPECIAL,
 		Token::SPECIAL,
+		Token::SPECIAL,
 		Token::INTEGER,
 		Token::INTEGER,
 		Token::INTEGER,
@@ -160,7 +145,6 @@ Token TextParser::parse_token()
 
 	ParseState state = INIT;
 	string buf;
-	bool escape = false;
 
 	while(in || state==INIT)
 	{
@@ -262,11 +246,13 @@ Token TextParser::parse_token()
 
 		case STRING:
 			if(c=='\\')
-				escape = !escape;
-			else if(c=='"' && !escape)
+				state = STRING_ESCAPE;
+			else if(c=='"')
 				state = STRING_END;
-			else
-				escape = false;
+			break;
+
+		case STRING_ESCAPE:
+			state = STRING;
 			break;
 
 		case IDENTIFIER: