Skip to content

Commit 4735c45

Browse files
dpgeorgedpgeorge
committed
py: Clean up some bits and pieces in parser, grammar.
1 parent fa90ab1 commit 4735c45

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

‎py/grammar.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ DEF_RULE(eval_input_2, nc, and(1), tok(NEWLINE))
5555
// vfpdef: NAME
5656

5757
DEF_RULE(decorator, nc, and(4), tok(DEL_AT), rule(dotted_name), opt_rule(trailer_paren), tok(NEWLINE))
58-
//DEF_RULE(decorator_2, nc, and(3), tok(DEL_PAREN_OPEN), opt_rule(arglist), tok(DEL_PAREN_CLOSE))
5958
DEF_RULE(decorators, nc, one_or_more, rule(decorator))
6059
DEF_RULE(decorated, c(decorated), and(2), rule(decorators), rule(decorated_body))
6160
DEF_RULE(decorated_body, nc, or(2), rule(classdef), rule(funcdef))

‎py/parse.c‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2013, 2014 Damien P. George
6+
* Copyright (c) 2013-2015 Damien P. George
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal
@@ -48,8 +48,7 @@
4848
#define RULE_ARG_ARG_MASK (0x0fff)
4949
#define RULE_ARG_TOK (0x1000)
5050
#define RULE_ARG_RULE (0x2000)
51-
#define RULE_ARG_OPT_TOK (0x3000)
52-
#define RULE_ARG_OPT_RULE (0x4000)
51+
#define RULE_ARG_OPT_RULE (0x3000)
5352

5453
#define ADD_BLANK_NODE(rule) ((rule->act & RULE_ACT_ADD_BLANK) != 0)
5554

@@ -84,7 +83,6 @@ enum {
8483
#define list_with_end (RULE_ACT_LIST | 3)
8584
#define tok(t) (RULE_ARG_TOK | MP_TOKEN_##t)
8685
#define rule(r) (RULE_ARG_RULE | RULE_##r)
87-
#define opt_tok(t) (RULE_ARG_OPT_TOK | MP_TOKEN_##t)
8886
#define opt_rule(r) (RULE_ARG_OPT_RULE | RULE_##r)
8987
#ifdef USE_RULE_NAME
9088
#define DEF_RULE(rule, comp, kind, ...) static const rule_t rule_##rule = { RULE_##rule, kind, #rule, { __VA_ARGS__ } };
@@ -98,7 +96,6 @@ enum {
9896
#undef list_with_end
9997
#undef tok
10098
#undef rule
101-
#undef opt_tok
10299
#undef opt_rule
103100
#undef one_or_more
104101
#undef DEF_RULE
@@ -603,13 +600,10 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
603600
num_not_nil += 1;
604601
}
605602
}
606-
//printf("done and %s n=%d i=%d notnil=%d\n", rule->rule_name, n, i, num_not_nil);
607603
if (emit_rule) {
608604
push_result_rule(&parser, rule_src_line, rule, i);
609605
} else if (num_not_nil == 0) {
610606
push_result_rule(&parser, rule_src_line, rule, i); // needed for, eg, atom_paren, testlist_comp_3b
611-
//result_stack_show(parser);
612-
//assert(0);
613607
} else if (num_not_nil == 1) {
614608
// single result, leave it on stack
615609
mp_parse_node_t pn = MP_PARSE_NODE_NULL;
@@ -711,7 +705,6 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
711705
// just leave single item on stack (ie don't wrap in a list)
712706
}
713707
} else {
714-
//printf("done list %s %d %d\n", rule->rule_name, n, i);
715708
push_result_rule(&parser, rule_src_line, rule, i);
716709
}
717710
break;
@@ -739,7 +732,6 @@ mp_parse_node_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
739732
goto syntax_error;
740733
}
741734

742-
//printf("--------------\n");
743735
//result_stack_show(parser);
744736
//printf("rule stack alloc: %d\n", parser.rule_stack_alloc);
745737
//printf("result stack alloc: %d\n", parser.result_stack_alloc);

0 commit comments

Comments
 (0)