diff options
author | Justyna Ilczuk <justyna.ilczuk@gmail.com> | 2013-01-01 18:15:54 +0100 |
---|---|---|
committer | Justyna Ilczuk <justyna.ilczuk@gmail.com> | 2013-01-01 18:15:54 +0100 |
commit | 7e4ac66f3446f4dc5b871a047400265f0c046952 (patch) | |
tree | bcbcc5786af4641a5831454294425a23b042afac | |
parent | d65e408e5545963852df43cea93d9c82cd6b8f68 (diff) | |
download | sencha-lang-7e4ac66f3446f4dc5b871a047400265f0c046952.tar.gz sencha-lang-7e4ac66f3446f4dc5b871a047400265f0c046952.tar.bz2 sencha-lang-7e4ac66f3446f4dc5b871a047400265f0c046952.tar.xz sencha-lang-7e4ac66f3446f4dc5b871a047400265f0c046952.zip |
Some changes in formatting.
-rw-r--r-- | Sencha-lang/Lexer.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Sencha-lang/Lexer.cpp b/Sencha-lang/Lexer.cpp index 02caa44..7d41a75 100644 --- a/Sencha-lang/Lexer.cpp +++ b/Sencha-lang/Lexer.cpp @@ -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])) |