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

py: fix bug with doc string not recognised after first newline of file.

Browse Source
This commit is contained in:
Damien 2013-12-12 15:24:38 +00:00
parent 02f8941bf6
commit e388f1034e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
py/compile.c
View File

@ -2646,10 +2646,21 @@ void check_for_doc_string(compiler_t *comp, py_parse_node_t pn) {
// look for the first statement // look for the first statement
if (PY_PARSE_NODE_IS_STRUCT_KIND(pn, PN_expr_stmt)) { if (PY_PARSE_NODE_IS_STRUCT_KIND(pn, PN_expr_stmt)) {
// fall through // a statement; fall through
} else if (PY_PARSE_NODE_IS_STRUCT_KIND(pn, PN_file_input_2)) { } else if (PY_PARSE_NODE_IS_STRUCT_KIND(pn, PN_file_input_2)) {
pn = ((py_parse_node_struct_t*)pn)->nodes[0]; // file input; find the first non-newline node
py_parse_node_struct_t *pns = (py_parse_node_struct_t*)pn;
int num_nodes = PY_PARSE_NODE_STRUCT_NUM_NODES(pns);
for (int i = 0; i < num_nodes; i++) {
pn = pns->nodes[i];
if (!(PY_PARSE_NODE_IS_LEAF(pn) && PY_PARSE_NODE_LEAF_KIND(pn) == PY_PARSE_NODE_TOKEN && PY_PARSE_NODE_LEAF_ARG(pn) == PY_TOKEN_NEWLINE)) {
// not a newline, so this is the first statement; finish search
break;
}
}
// if we didn't find a non-newline then it's okay to fall through; pn will be a newline and so doc-string test below will fail gracefully
} else if (PY_PARSE_NODE_IS_STRUCT_KIND(pn, PN_suite_block_stmts)) { } else if (PY_PARSE_NODE_IS_STRUCT_KIND(pn, PN_suite_block_stmts)) {
// a list of statements; get the first one
pn = ((py_parse_node_struct_t*)pn)->nodes[0]; pn = ((py_parse_node_struct_t*)pn)->nodes[0];
} else { } else {
return; return;

2
py/grammar.h
View File

@ -6,7 +6,7 @@
// # single_input is a single interactive statement; // # single_input is a single interactive statement;
// # file_input is a module or sequence of commands read from an input file; // # file_input is a module or sequence of commands read from an input file;
// # eval_input is the input for the eval() functions. // # eval_input is the input for the eval() functions.
// # NB: compound_stmt in single_input is followed by extra NEWLINE! --> not in Micropython // # NB: compound_stmt in single_input is followed by extra NEWLINE! --> not in Micro Python
// single_input: NEWLINE | simple_stmt | compound_stmt // single_input: NEWLINE | simple_stmt | compound_stmt
// file_input: (NEWLINE | stmt)* ENDMARKER // file_input: (NEWLINE | stmt)* ENDMARKER
// eval_input: testlist NEWLINE* ENDMARKER // eval_input: testlist NEWLINE* ENDMARKER