libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #607 from hezlog/master

Browse Source 
Update finsh_token.c
This commit is contained in:
Bernard Xiong 2016-01-24 14:19:32 +08:00
commit 2f9038f9e9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/finsh/finsh_token.c
View File

@ -35,6 +35,7 @@
#define is_alpha(ch) ((ch | 0x20) - 'a') < 26u #define is_alpha(ch) ((ch | 0x20) - 'a') < 26u
#define is_digit(ch) ((ch) >= '0' && (ch) <= '9') #define is_digit(ch) ((ch) >= '0' && (ch) <= '9')
#define is_xdigit(ch) (((ch) >= '0' && (ch) <= '9') || (((ch | 0x20) - 'a') < 6u))
#define is_separator(ch) !(((ch) >= 'a' && (ch) <= 'z') \ #define is_separator(ch) !(((ch) >= 'a' && (ch) <= 'z') \
|| ((ch) >= 'A' && (ch) <= 'Z') || ((ch) >= '0' && (ch) <= '9') || ((ch) == '_')) || ((ch) >= 'A' && (ch) <= 'Z') || ((ch) >= '0' && (ch) <= '9') || ((ch) == '_'))
#define is_eof(self) (self)->eof #define is_eof(self) (self)->eof
@ -439,12 +440,16 @@ static int token_proc_escape(struct finsh_token* self)
case 'a': case 'a':
result = '\007'; result = '\007';
break; break;
case '"':
result = '"';
break;
case 'x': case 'x':
case 'X':
result = 0; result = 0;
ch = token_next_char(self); ch = token_next_char(self);
while ( (ch - '0')<16u ) while (is_xdigit(ch))
{ {
result = result*16 + ch - '0'; result = result * 16 + ((ch < 'A') ? (ch - '0') : (ch | 0x20) - 'a' + 10);
ch = token_next_char(self); ch = token_next_char(self);
} }
token_prev_char(self); token_prev_char(self);