py/parse: Factor logic when creating parse node from and-rule.

dpgeorge · dpgeorge · commit 366239b8b9a2 · 2015-10-08T23:13:18.000+01:00
diff --git a/py/parse.c b/py/parse.c
@@ -625,11 +625,10 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
                         num_not_nil += 1;
                     }
                 }
-                if (emit_rule) {
+                if (emit_rule || num_not_nil != 1) {
+                    // need to add rule when num_not_nil==0 for, eg, atom_paren, testlist_comp_3b
                     push_result_rule(&parser, rule_src_line, rule, i);
-                } else if (num_not_nil == 0) {
-                    push_result_rule(&parser, rule_src_line, rule, i); // needed for, eg, atom_paren, testlist_comp_3b
-                } else if (num_not_nil == 1) {
+                } else {
                     // single result, leave it on stack
                     mp_parse_node_t pn = MP_PARSE_NODE_NULL;
                     for (mp_uint_t x = 0; x < i; ++x) {
@@ -639,8 +638,6 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
                         }
                     }
                     push_result_node(&parser, pn);
-                } else {
-                    push_result_rule(&parser, rule_src_line, rule, i);
                 }
                 break;
             }

Original file line number	Diff line number	Diff line change
`@@ -625,11 +625,10 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {`
`625`	`625`	`num_not_nil += 1;`
`626`	`626`	`}`
`627`	`627`	`}`
`628`		`- if (emit_rule) {`
	`628`	`+ if (emit_rule \|\| num_not_nil != 1) {`
	`629`	`+ // need to add rule when num_not_nil==0 for, eg, atom_paren, testlist_comp_3b`
`629`	`630`	`push_result_rule(&parser, rule_src_line, rule, i);`
`630`		`- } else if (num_not_nil == 0) {`
`631`		`- push_result_rule(&parser, rule_src_line, rule, i); // needed for, eg, atom_paren, testlist_comp_3b`
`632`		`- } else if (num_not_nil == 1) {`
	`631`	`+ } else {`
`633`	`632`	`// single result, leave it on stack`
`634`	`633`	`mp_parse_node_t pn = MP_PARSE_NODE_NULL;`
`635`	`634`	`for (mp_uint_t x = 0; x < i; ++x) {`
`@@ -639,8 +638,6 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {`
`639`	`638`	`}`
`640`	`639`	`}`
`641`	`640`	`push_result_node(&parser, pn);`
`642`		`- } else {`
`643`		`- push_result_rule(&parser, rule_src_line, rule, i);`
`644`	`641`	`}`
`645`	`642`	`break;`
`646`	`643`	`}`