djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: Save a few code bytes in parser; make vars local where possible.

This commit is contained in:
Damien George 2014-12-20 18:06:08 +00:00
parent 978f4ca2e1
commit 2870d85a11
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
py/parse.c
View File

@ -314,13 +314,12 @@ STATIC void push_result_token(parser_t *parser) {
bool overflow = false; bool overflow = false;
for (; i < len; i++) { for (; i < len; i++) {
mp_uint_t dig; mp_uint_t dig;
int clower = str[i] | 0x20;
if (unichar_isdigit(str[i]) && str[i] - '0' < base) { if (unichar_isdigit(str[i]) && str[i] - '0' < base) {
dig = str[i] - '0'; dig = str[i] - '0';
} else if (base == 16 && 'a' <= str[i] && str[i] <= 'f') { } else if (base == 16 && 'a' <= clower && clower <= 'f') {
dig = str[i] - 'a' + 10; dig = clower - 'a' + 10;
} else if (base == 16 && 'A' <= str[i] && str[i] <= 'F') { } else if (str[i] == '.' || clower == 'e' || clower == 'j') {
dig = str[i] - 'A' + 10;
} else if (str[i] == '.' || str[i] == 'e' || str[i] == 'E' || str[i] == 'j' || str[i] == 'J') {
dec = true; dec = true;
break; break;
} else { } else {
@ -422,9 +421,6 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
mp_uint_t rule_src_line; // source line for the first token matched by the current rule mp_uint_t rule_src_line; // source line for the first token matched by the current rule
bool backtrack = false; bool backtrack = false;
const rule_t *rule = NULL; const rule_t *rule = NULL;
mp_token_kind_t tok_kind;
bool emit_rule;
bool had_trailing_sep;
for (;;) { for (;;) {
next_rule: next_rule:
@ -481,7 +477,7 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
} }
break; break;
case RULE_ACT_AND: case RULE_ACT_AND: {
// failed, backtrack if we can, else syntax error // failed, backtrack if we can, else syntax error
if (backtrack) { if (backtrack) {
@ -504,9 +500,9 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
// progress through the rule // progress through the rule
for (; i < n; ++i) { for (; i < n; ++i) {
switch (rule->arg[i] & RULE_ARG_KIND_MASK) { switch (rule->arg[i] & RULE_ARG_KIND_MASK) {
case RULE_ARG_TOK: case RULE_ARG_TOK: {
// need to match a token // need to match a token
tok_kind = rule->arg[i] & RULE_ARG_ARG_MASK; mp_token_kind_t tok_kind = rule->arg[i] & RULE_ARG_ARG_MASK;
if (lex->tok_kind == tok_kind) { if (lex->tok_kind == tok_kind) {
// matched token // matched token
if (tok_kind == MP_TOKEN_NAME) { if (tok_kind == MP_TOKEN_NAME) {
@ -525,6 +521,7 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
} }
} }
break; break;
}
case RULE_ARG_RULE: case RULE_ARG_RULE:
case RULE_ARG_OPT_RULE: case RULE_ARG_OPT_RULE:
push_rule(&parser, rule_src_line, rule, i + 1); // save this and-rule push_rule(&parser, rule_src_line, rule, i + 1); // save this and-rule
@ -541,10 +538,10 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
// count number of arguments for the parse_node // count number of arguments for the parse_node
i = 0; i = 0;
emit_rule = false; bool emit_rule = false;
for (mp_uint_t x = 0; x < n; ++x) { for (mp_uint_t x = 0; x < n; ++x) {
if ((rule->arg[x] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) { if ((rule->arg[x] & RULE_ARG_KIND_MASK) == RULE_ARG_TOK) {
tok_kind = rule->arg[x] & RULE_ARG_ARG_MASK; mp_token_kind_t tok_kind = rule->arg[x] & RULE_ARG_ARG_MASK;
if (tok_kind >= MP_TOKEN_NAME) { if (tok_kind >= MP_TOKEN_NAME) {
emit_rule = true; emit_rule = true;
} }
@ -617,11 +614,13 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
push_result_rule(&parser, rule_src_line, rule, i); push_result_rule(&parser, rule_src_line, rule, i);
} }
break; break;
}
case RULE_ACT_LIST: case RULE_ACT_LIST: {
// n=2 is: item item* // n=2 is: item item*
// n=1 is: item (sep item)* // n=1 is: item (sep item)*
// n=3 is: item (sep item)* [sep] // n=3 is: item (sep item)* [sep]
bool had_trailing_sep;
if (backtrack) { if (backtrack) {
list_backtrack: list_backtrack:
had_trailing_sep = false; had_trailing_sep = false;
@ -704,6 +703,7 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
push_result_rule(&parser, rule_src_line, rule, i); push_result_rule(&parser, rule_src_line, rule, i);
} }
break; break;
}
default: default:
assert(0); assert(0);