Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Clean up from-import handling.

This commit is contained in:
Thomas Wouters 2006-02-27 17:05:19 +00:00
parent b79afb6e3a
commit 106203c6e0
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Python/ast.c
View File

@ -2170,44 +2170,43 @@ ast_for_import_stmt(struct compiling *c, const node *n)
} }
else if (STR(CHILD(n, 0))[0] == 'f') { /* from */ else if (STR(CHILD(n, 0))[0] == 'f') { /* from */
int n_children; int n_children;
const char *from_modules;
int lineno = LINENO(n); int lineno = LINENO(n);
alias_ty mod = alias_for_import_name(c, CHILD(n, 1)); alias_ty mod = alias_for_import_name(c, CHILD(n, 1));
if (!mod) if (!mod)
return NULL; return NULL;
/* XXX this needs to be cleaned up */ switch (TYPE(CHILD(n, 3))) {
case STAR:
from_modules = STR(CHILD(n, 3)); /* from ... import * */
if (!from_modules) { n = CHILD(n, 3);
n = CHILD(n, 3); /* from ... import x, y, z */ n_children = 1;
if (NCH(n) % 2 == 0) { break;
/* it ends with a comma, not valid but the parser allows it */ case LPAR:
/* from ... import (x, y, z) */
n = CHILD(n, 4);
n_children = NCH(n);
break;
case import_as_names:
/* from ... import x, y, z */
n = CHILD(n, 3);
n_children = NCH(n);
if (n_children % 2 == 0) {
ast_error(n, "trailing comma not allowed without" ast_error(n, "trailing comma not allowed without"
" surrounding parentheses"); " surrounding parentheses");
return NULL; return NULL;
} }
} break;
else if (from_modules[0] == '*') { default:
n = CHILD(n, 3); /* from ... import * */ ast_error(n, "Unexpected node-type in from-import");
} return NULL;
else if (from_modules[0] == '(')
n = CHILD(n, 4); /* from ... import (x, y, z) */
else {
/* XXX: don't we need to call ast_error(n, "..."); */
return NULL;
} }
n_children = NCH(n);
if (from_modules && from_modules[0] == '*')
n_children = 1;
aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena); aliases = asdl_seq_new((n_children + 1) / 2, c->c_arena);
if (!aliases) if (!aliases)
return NULL; return NULL;
/* handle "from ... import *" special b/c there's no children */ /* handle "from ... import *" special b/c there's no children */
if (from_modules && from_modules[0] == '*') { if (TYPE(n) == STAR) {
alias_ty import_alias = alias_for_import_name(c, n); alias_ty import_alias = alias_for_import_name(c, n);
if (!import_alias) if (!import_alias)
return NULL; return NULL;