wes
/
schream
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

reorder conditions in tokenize function

pull/1/head
nisstyre56 10 years ago
parent
215445c08c
commit
8275714a6e
1 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      tokenize.c

42
tokenize.c
View File

@ -311,7 +311,27 @@ tokenize(source_t source, uint32_t begin, const uint32_t length) {
while (begin <= length && source[begin]) {
if ((position = match_float(source, begin, length))) {
if (source[begin] == '(') {
/*Matched a left paren */
position = begin + 1;
push_token(&token_stack, left_paren);
}
else if (source[begin] == ')') {
/*Matched a left paren */
position = begin + 1;
push_token(&token_stack, right_paren);
}
else if (source[begin] == '\'') {
/* Matched a quote (apostrophe) */
position = begin + 1;
push_token(&token_stack, quote_tok);
}
else if (isspace(source[begin])) {
position = begin + 1;
push_token(&token_stack, whitespace_tok);
/* Matched a whitespace character */
}
else if ((position = match_float(source, begin, length))) {
/* Matched a float */
assert(position > begin);
@ -359,26 +379,6 @@ tokenize(source_t source, uint32_t begin, const uint32_t length) {
push_token(&token_stack, make_token(current_token, IDENTIFIER));
/* Matched an identifier */
}
else if (source[begin] == '(') {
/*Matched a left paren */
position = begin + 1;
push_token(&token_stack, left_paren);
}
else if (source[begin] == ')') {
/*Matched a left paren */
position = begin + 1;
push_token(&token_stack, right_paren);
}
else if (source[begin] == '\'') {
/* Matched a quote (apostrophe) */
position = begin + 1;
push_token(&token_stack, quote_tok);
}
else if (isspace(source[begin])) {
position = begin + 1;
push_token(&token_stack, whitespace_tok);
/* Matched a whitespace character */
}
else {
printf("Unmatched token\n");
exit(EXIT_FAILURE);