Skip to content

Commit b47ea4e

Browse files
dpgeorgedpgeorge
committed
py: Add blank and ident flags to grammar rules to simplify parser.
This saves around 100 bytes code space on stmhal, more on unix.
1 parent 4fd7c1a commit b47ea4e

2 files changed

Lines changed: 33 additions & 28 deletions

File tree

‎py/grammar.h‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ DEF_RULE(decorator, nc, and(4), tok(DEL_AT), rule(dotted_name), opt_rule(trailer
5959
DEF_RULE(decorators, nc, one_or_more, rule(decorator))
6060
DEF_RULE(decorated, c(decorated), and(2), rule(decorators), rule(decorated_body))
6161
DEF_RULE(decorated_body, nc, or(2), rule(classdef), rule(funcdef))
62-
DEF_RULE(funcdef, c(funcdef), and(8), tok(KW_DEF), tok(NAME), tok(DEL_PAREN_OPEN), opt_rule(typedargslist), tok(DEL_PAREN_CLOSE), opt_rule(funcdefrettype), tok(DEL_COLON), rule(suite))
63-
DEF_RULE(funcdefrettype, nc, and(2), tok(DEL_MINUS_MORE), rule(test))
62+
DEF_RULE(funcdef, c(funcdef), blank | and(8), tok(KW_DEF), tok(NAME), tok(DEL_PAREN_OPEN), opt_rule(typedargslist), tok(DEL_PAREN_CLOSE), opt_rule(funcdefrettype), tok(DEL_COLON), rule(suite))
63+
DEF_RULE(funcdefrettype, nc, ident | and(2), tok(DEL_MINUS_MORE), rule(test))
6464
// TODO typedargslist lets through more than is allowed
6565
DEF_RULE(typedargslist, nc, list_with_end, rule(typedargslist_item), tok(DEL_COMMA))
6666
DEF_RULE(typedargslist_item, nc, or(3), rule(typedargslist_name), rule(typedargslist_star), rule(typedargslist_dbl_star))
67-
DEF_RULE(typedargslist_name, nc, and(3), tok(NAME), opt_rule(typedargslist_colon), opt_rule(typedargslist_equal))
67+
DEF_RULE(typedargslist_name, nc, ident | and(3), tok(NAME), opt_rule(typedargslist_colon), opt_rule(typedargslist_equal))
6868
DEF_RULE(typedargslist_star, nc, and(2), tok(OP_STAR), opt_rule(tfpdef))
6969
DEF_RULE(typedargslist_dbl_star, nc, and(3), tok(OP_DBL_STAR), tok(NAME), opt_rule(typedargslist_colon))
70-
DEF_RULE(typedargslist_colon, nc, and(2), tok(DEL_COLON), rule(test))
71-
DEF_RULE(typedargslist_equal, nc, and(2), tok(DEL_EQUAL), rule(test))
70+
DEF_RULE(typedargslist_colon, nc, ident | and(2), tok(DEL_COLON), rule(test))
71+
DEF_RULE(typedargslist_equal, nc, ident | and(2), tok(DEL_EQUAL), rule(test))
7272
DEF_RULE(tfpdef, nc, and(2), tok(NAME), opt_rule(typedargslist_colon))
7373
// TODO varargslist lets through more than is allowed
7474
DEF_RULE(varargslist, nc, list_with_end, rule(varargslist_item), tok(DEL_COMMA))
@@ -77,7 +77,7 @@ DEF_RULE(varargslist_name, nc, and(2), tok(NAME), opt_rule(varargslist_equal))
7777
DEF_RULE(varargslist_star, nc, and(2), tok(OP_STAR), opt_rule(vfpdef))
7878
DEF_RULE(varargslist_dbl_star, nc, and(2), tok(OP_DBL_STAR), tok(NAME))
7979
DEF_RULE(varargslist_equal, nc, and(2), tok(DEL_EQUAL), rule(test))
80-
DEF_RULE(vfpdef, nc, and(1), tok(NAME))
80+
DEF_RULE(vfpdef, nc, ident | and(1), tok(NAME))
8181

8282
// stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | simple_stmt
8383

@@ -123,7 +123,7 @@ DEF_RULE(return_stmt, c(return_stmt), and(2), tok(KW_RETURN), opt_rule(testlist)
123123
DEF_RULE(yield_stmt, c(yield_stmt), and(1), rule(yield_expr))
124124
DEF_RULE(raise_stmt, c(raise_stmt), and(2), tok(KW_RAISE), opt_rule(raise_stmt_arg))
125125
DEF_RULE(raise_stmt_arg, nc, and(2), rule(test), opt_rule(raise_stmt_from))
126-
DEF_RULE(raise_stmt_from, nc, and(2), tok(KW_FROM), rule(test))
126+
DEF_RULE(raise_stmt_from, nc, ident | and(2), tok(KW_FROM), rule(test))
127127

128128
// import_stmt: import_name | import_from
129129
// import_name: 'import' dotted_as_names
@@ -143,20 +143,20 @@ DEF_RULE(import_from, c(import_from), and(4), tok(KW_FROM), rule(import_from_2),
143143
DEF_RULE(import_from_2, nc, or(2), rule(dotted_name), rule(import_from_2b))
144144
DEF_RULE(import_from_2b, nc, and(2), rule(one_or_more_period_or_ellipsis), opt_rule(dotted_name))
145145
DEF_RULE(import_from_3, nc, or(3), tok(OP_STAR), rule(import_as_names_paren), rule(import_as_names))
146-
DEF_RULE(import_as_names_paren, nc, and(3), tok(DEL_PAREN_OPEN), rule(import_as_names), tok(DEL_PAREN_CLOSE))
146+
DEF_RULE(import_as_names_paren, nc, ident | and(3), tok(DEL_PAREN_OPEN), rule(import_as_names), tok(DEL_PAREN_CLOSE))
147147
DEF_RULE(one_or_more_period_or_ellipsis, nc, one_or_more, rule(period_or_ellipsis))
148148
DEF_RULE(period_or_ellipsis, nc, or(2), tok(DEL_PERIOD), tok(ELLIPSIS))
149149
DEF_RULE(import_as_name, nc, and(2), tok(NAME), opt_rule(as_name))
150150
DEF_RULE(dotted_as_name, nc, and(2), rule(dotted_name), opt_rule(as_name))
151-
DEF_RULE(as_name, nc, and(2), tok(KW_AS), tok(NAME))
151+
DEF_RULE(as_name, nc, ident | and(2), tok(KW_AS), tok(NAME))
152152
DEF_RULE(import_as_names, nc, list_with_end, rule(import_as_name), tok(DEL_COMMA))
153153
DEF_RULE(dotted_as_names, nc, list, rule(dotted_as_name), tok(DEL_COMMA))
154154
DEF_RULE(dotted_name, nc, list, tok(NAME), tok(DEL_PERIOD))
155155
DEF_RULE(global_stmt, c(global_stmt), and(2), tok(KW_GLOBAL), rule(name_list))
156156
DEF_RULE(nonlocal_stmt, c(nonlocal_stmt), and(2), tok(KW_NONLOCAL), rule(name_list))
157157
DEF_RULE(name_list, nc, list, tok(NAME), tok(DEL_COMMA))
158158
DEF_RULE(assert_stmt, c(assert_stmt), and(3), tok(KW_ASSERT), rule(test), opt_rule(assert_stmt_extra))
159-
DEF_RULE(assert_stmt_extra, nc, and(2), tok(DEL_COMMA), rule(test))
159+
DEF_RULE(assert_stmt_extra, nc, ident | and(2), tok(DEL_COMMA), rule(test))
160160

161161
// compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated
162162
// if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
@@ -182,11 +182,11 @@ DEF_RULE(try_stmt_except, nc, and(4), tok(KW_EXCEPT), opt_rule(try_stmt_as_name)
182182
DEF_RULE(try_stmt_as_name, nc, and(2), rule(test), opt_rule(as_name))
183183
DEF_RULE(try_stmt_except_list, nc, one_or_more, rule(try_stmt_except))
184184
DEF_RULE(try_stmt_finally, nc, and(3), tok(KW_FINALLY), tok(DEL_COLON), rule(suite))
185-
DEF_RULE(else_stmt, nc, and(3), tok(KW_ELSE), tok(DEL_COLON), rule(suite))
185+
DEF_RULE(else_stmt, nc, ident | and(3), tok(KW_ELSE), tok(DEL_COLON), rule(suite))
186186
DEF_RULE(with_stmt, c(with_stmt), and(4), tok(KW_WITH), rule(with_stmt_list), tok(DEL_COLON), rule(suite))
187187
DEF_RULE(with_stmt_list, nc, list, rule(with_item), tok(DEL_COMMA))
188188
DEF_RULE(with_item, nc, and(2), rule(test), opt_rule(with_item_as))
189-
DEF_RULE(with_item_as, nc, and(2), tok(KW_AS), rule(expr))
189+
DEF_RULE(with_item_as, nc, ident | and(2), tok(KW_AS), rule(expr))
190190
DEF_RULE(suite, nc, or(2), rule(suite_block), rule(simple_stmt))
191191
DEF_RULE(suite_block, nc, and(4), tok(NEWLINE), tok(INDENT), rule(suite_block_stmts), tok(DEDENT))
192192
DEF_RULE(suite_block_stmts, c(generic_all_nodes), one_or_more, rule(stmt))
@@ -200,8 +200,8 @@ DEF_RULE(test, nc, or(2), rule(lambdef), rule(test_if_expr))
200200
DEF_RULE(test_if_expr, c(test_if_expr), and(2), rule(or_test), opt_rule(test_if_else))
201201
DEF_RULE(test_if_else, nc, and(4), tok(KW_IF), rule(or_test), tok(KW_ELSE), rule(test))
202202
DEF_RULE(test_nocond, nc, or(2), rule(lambdef_nocond), rule(or_test))
203-
DEF_RULE(lambdef, c(lambdef), and(4), tok(KW_LAMBDA), opt_rule(varargslist), tok(DEL_COLON), rule(test))
204-
DEF_RULE(lambdef_nocond, c(lambdef), and(4), tok(KW_LAMBDA), opt_rule(varargslist), tok(DEL_COLON), rule(test_nocond))
203+
DEF_RULE(lambdef, c(lambdef), blank | and(4), tok(KW_LAMBDA), opt_rule(varargslist), tok(DEL_COLON), rule(test))
204+
DEF_RULE(lambdef_nocond, c(lambdef), blank | and(4), tok(KW_LAMBDA), opt_rule(varargslist), tok(DEL_COLON), rule(test_nocond))
205205

206206
// or_test: and_test ('or' and_test)*
207207
// and_test: not_test ('and' not_test)*
@@ -258,7 +258,7 @@ DEF_RULE(atom_brace, c(atom_brace), and(3), tok(DEL_BRACE_OPEN), opt_rule(dictor
258258
DEF_RULE(testlist_comp, nc, and(2), rule(testlist_comp_2), opt_rule(testlist_comp_3))
259259
DEF_RULE(testlist_comp_2, nc, or(2), rule(star_expr), rule(test))
260260
DEF_RULE(testlist_comp_3, nc, or(2), rule(comp_for), rule(testlist_comp_3b))
261-
DEF_RULE(testlist_comp_3b, nc, and(2), tok(DEL_COMMA), opt_rule(testlist_comp_3c))
261+
DEF_RULE(testlist_comp_3b, nc, ident | and(2), tok(DEL_COMMA), opt_rule(testlist_comp_3c))
262262
DEF_RULE(testlist_comp_3c, nc, list_with_end, rule(testlist_comp_2), tok(DEL_COMMA))
263263
DEF_RULE(trailer, nc, or(3), rule(trailer_paren), rule(trailer_bracket), rule(trailer_period))
264264
DEF_RULE(trailer_paren, c(trailer_paren), and(3), tok(DEL_PAREN_OPEN), opt_rule(arglist), tok(DEL_PAREN_CLOSE))
@@ -288,15 +288,15 @@ DEF_RULE(testlist, c(generic_tuple), list_with_end, rule(test), tok(DEL_COMMA))
288288
// TODO dictorsetmaker lets through more than is allowed
289289
DEF_RULE(dictorsetmaker, nc, and(2), rule(dictorsetmaker_item), opt_rule(dictorsetmaker_tail))
290290
DEF_RULE(dictorsetmaker_item, c(dictorsetmaker_item), and(2), rule(test), opt_rule(dictorsetmaker_colon))
291-
DEF_RULE(dictorsetmaker_colon, nc, and(2), tok(DEL_COLON), rule(test))
291+
DEF_RULE(dictorsetmaker_colon, nc, ident | and(2), tok(DEL_COLON), rule(test))
292292
DEF_RULE(dictorsetmaker_tail, nc, or(2), rule(comp_for), rule(dictorsetmaker_list))
293293
DEF_RULE(dictorsetmaker_list, nc, and(2), tok(DEL_COMMA), opt_rule(dictorsetmaker_list2))
294294
DEF_RULE(dictorsetmaker_list2, nc, list_with_end, rule(dictorsetmaker_item), tok(DEL_COMMA))
295295

296296
// classdef: 'class' NAME ['(' [arglist] ')'] ':' suite
297297

298-
DEF_RULE(classdef, c(classdef), and(5), tok(KW_CLASS), tok(NAME), opt_rule(classdef_2), tok(DEL_COLON), rule(suite))
299-
DEF_RULE(classdef_2, nc, and(3), tok(DEL_PAREN_OPEN), opt_rule(arglist), tok(DEL_PAREN_CLOSE))
298+
DEF_RULE(classdef, c(classdef), blank | and(5), tok(KW_CLASS), tok(NAME), opt_rule(classdef_2), tok(DEL_COLON), rule(suite))
299+
DEF_RULE(classdef_2, nc, ident | and(3), tok(DEL_PAREN_OPEN), opt_rule(arglist), tok(DEL_PAREN_CLOSE))
300300

301301
// arglist: (argument ',')* (argument [','] | '*' test (',' argument)* [',' '**' test] | '**' test)
302302

@@ -317,7 +317,7 @@ DEF_RULE(argument, nc, and(2), rule(test), opt_rule(argument_2))
317317
DEF_RULE(argument_2, nc, or(2), rule(comp_for), rule(argument_3))
318318
DEF_RULE(argument_3, nc, and(2), tok(DEL_EQUAL), rule(test))
319319
DEF_RULE(comp_iter, nc, or(2), rule(comp_for), rule(comp_if))
320-
DEF_RULE(comp_for, nc, and(5), tok(KW_FOR), rule(exprlist), tok(KW_IN), rule(or_test), opt_rule(comp_iter))
320+
DEF_RULE(comp_for, nc, blank | and(5), tok(KW_FOR), rule(exprlist), tok(KW_IN), rule(or_test), opt_rule(comp_iter))
321321
DEF_RULE(comp_if, nc, and(3), tok(KW_IF), rule(test_nocond), opt_rule(comp_iter))
322322

323323
// # not used in grammar, but may appear in "node" passed from Parser to Compiler

‎py/parse.c‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,22 @@
3838
#include "parse.h"
3939
#include "smallint.h"
4040

41-
#define RULE_ACT_KIND_MASK (0xf0)
4241
#define RULE_ACT_ARG_MASK (0x0f)
42+
#define RULE_ACT_KIND_MASK (0x30)
43+
#define RULE_ACT_ALLOW_IDENT (0x40)
44+
#define RULE_ACT_ADD_BLANK (0x80)
4345
#define RULE_ACT_OR (0x10)
4446
#define RULE_ACT_AND (0x20)
4547
#define RULE_ACT_LIST (0x30)
4648

47-
#define RULE_ARG_BLANK (0x0000)
4849
#define RULE_ARG_KIND_MASK (0xf000)
4950
#define RULE_ARG_ARG_MASK (0x0fff)
5051
#define RULE_ARG_TOK (0x1000)
5152
#define RULE_ARG_RULE (0x2000)
5253
#define RULE_ARG_OPT_TOK (0x3000)
5354
#define RULE_ARG_OPT_RULE (0x4000)
5455

55-
#define ADD_BLANK_NODE(rule_id) ((rule_id) == RULE_funcdef || (rule_id) == RULE_classdef || (rule_id) == RULE_comp_for || (rule_id) == RULE_lambdef || (rule_id) == RULE_lambdef_nocond)
56+
#define ADD_BLANK_NODE(rule) ((rule->act & RULE_ACT_ADD_BLANK) != 0)
5657

5758
// (un)comment to use rule names; for debugging
5859
//#define USE_RULE_NAME (1)
@@ -75,6 +76,8 @@ enum {
7576
RULE_string, // special node for non-interned string
7677
};
7778

79+
#define ident (RULE_ACT_ALLOW_IDENT)
80+
#define blank (RULE_ACT_ADD_BLANK)
7881
#define or(n) (RULE_ACT_OR | n)
7982
#define and(n) (RULE_ACT_AND | n)
8083
#define one_or_more (RULE_ACT_LIST | 2)
@@ -181,7 +184,7 @@ void mp_parse_node_free(mp_parse_node_t pn) {
181184
if (rule_id == RULE_string) {
182185
m_del(char, (char*)pns->nodes[0], (mp_uint_t)pns->nodes[1]);
183186
} else {
184-
bool adjust = ADD_BLANK_NODE(rule_id);
187+
bool adjust = ADD_BLANK_NODE(rules[rule_id]);
185188
if (adjust) {
186189
n--;
187190
}
@@ -573,15 +576,17 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, mp_p
573576
emit_rule = true;
574577
}
575578

576-
// never emit these rules if they have only 1 argument
577-
// NOTE: can't put atom_paren here because we need it to distinguisg, for example, [a,b] from [(a,b)]
578-
// TODO possibly put varargslist_name, varargslist_equal here as well
579-
if (rule->rule_id == RULE_else_stmt || rule->rule_id == RULE_testlist_comp_3b || rule->rule_id == RULE_import_as_names_paren || rule->rule_id == RULE_typedargslist_name || rule->rule_id == RULE_typedargslist_colon || rule->rule_id == RULE_typedargslist_equal || rule->rule_id == RULE_dictorsetmaker_colon || rule->rule_id == RULE_classdef_2 || rule->rule_id == RULE_with_item_as || rule->rule_id == RULE_assert_stmt_extra || rule->rule_id == RULE_as_name || rule->rule_id == RULE_raise_stmt_from || rule->rule_id == RULE_vfpdef || rule->rule_id == RULE_funcdefrettype) {
579+
// if a rule has the RULE_ACT_ALLOW_IDENT bit set then this
580+
// rule should not be emitted if it has only 1 argument
581+
// NOTE: can't set this flag for atom_paren because we need it
582+
// to distinguish, for example, [a,b] from [(a,b)]
583+
// TODO possibly set for: varargslist_name, varargslist_equal
584+
if (rule->act & RULE_ACT_ALLOW_IDENT) {
580585
emit_rule = false;
581586
}
582587

583588
// always emit these rules, and add an extra blank node at the end (to be used by the compiler to store data)
584-
if (ADD_BLANK_NODE(rule->rule_id)) {
589+
if (ADD_BLANK_NODE(rule)) {
585590
emit_rule = true;
586591
push_result_node(&parser, MP_PARSE_NODE_NULL);
587592
i += 1;

0 commit comments

Comments
 (0)