Some changes in formatting.

imports
Justyna Ilczuk 2013-01-01 18:15:54 +01:00
parent d65e408e55
commit 7e4ac66f34
1 changed files with 8 additions and 5 deletions

View File

@ -132,7 +132,10 @@ pair<string, Token> Lexer::parse_token(string line)
}
}
}
if(isalnum(line[i]) || line[i]== '_') token_value += line[i];
if(isalnum(line[i]) || line[i]== '_')
{
token_value += line[i];
}
else if(ispunct(line[i]))
{
if(token_value=="")
@ -153,9 +156,11 @@ pair<string, Token> Lexer::parse_token(string line)
else break;
}
auto type = guess_type(token_value);
if(type == t_literal) token_value = unescape_string(token_value);
if(type == t_literal) token_value = unescape_string(token_value);
Token token = Token(type, token_value);
string truncated_line = line.substr(i);
return pair<string, Token>(truncated_line, token);
}
@ -220,7 +225,6 @@ type_of_token Lexer::guess_type(string value)
}
if(!isdigit(value[i])) is_number = false;
}
if(is_number)
{
if(dot_used)
@ -228,8 +232,7 @@ type_of_token Lexer::guess_type(string value)
return t_float;
}
else return t_integer;
}
}
else return t_invalid_token;
}
if(isalpha(value[0]))