From: Mikko Rasa Date: Fri, 2 Sep 2016 11:44:08 +0000 (+0300) Subject: Some refactoring of TextParser logic X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4edbe0eb078c4e480682862ccb68ebc8cb284045;p=libs%2Fdatafile.git Some refactoring of TextParser logic --- diff --git a/source/textparser.cpp b/source/textparser.cpp index c87a32d..a7e8ee9 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,27 +46,24 @@ 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) @@ -129,6 +125,7 @@ Token TextParser::parse_token() FLOATEXPINIT, FLOATEXPSIGN, STRING, + STRING_ESCAPE, ACCEPT, ZERO, DECIMAL, @@ -148,6 +145,7 @@ Token TextParser::parse_token() Token::SPECIAL, Token::SPECIAL, Token::SPECIAL, + Token::SPECIAL, Token::INTEGER, Token::INTEGER, Token::INTEGER, @@ -160,7 +158,6 @@ Token TextParser::parse_token() ParseState state = INIT; string buf; - bool escape = false; while(in || state==INIT) { @@ -262,11 +259,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: