Mailman 3 August 2004 - Python-checkins

[Python-checkins] python/dist/src/Lib/compiler transformer.py, 1.43, 1.44
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Lib/compiler Modified Files: transformer.py Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: transformer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compiler/transformer.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- transformer.py 17 Aug 2004 17:29:14 -0000 1.43 +++ transformer.py 31 Aug 2004 10:07:01 -0000 1.44 @@ -438,28 +438,28 @@ return n def import_stmt(self, nodelist): - # import_stmt: 'import' dotted_as_name (',' dotted_as_name)* | - # from: 'from' dotted_name 'import' - # ('*' | import_as_name (',' import_as_name)*) - if nodelist[0][1] == 'from': - names = [] - if nodelist[3][0] == token.NAME: - for i in range(3, len(nodelist), 2): - names.append((nodelist[i][1], None)) - else: - for i in range(3, len(nodelist), 2): - names.append(self.com_import_as_name(nodelist[i])) - n = From(self.com_dotted_name(nodelist[1]), names) - n.lineno = nodelist[0][2] - return n + # import_stmt: import_name | import_from + assert len(nodelist) == 1 + return self.com_node(nodelist[0]) - if nodelist[1][0] == symbol.dotted_name: - names = [(self.com_dotted_name(nodelist[1][1:]), None)] + def import_name(self, nodelist): + # import_name: 'import' dotted_as_names + n = Import(self.com_dotted_as_names(nodelist[1])) + n.lineno = nodelist[0][2] + return n + + def import_from(self, nodelist): + # import_from: 'from' dotted_name 'import' ('*' | + # '(' import_as_names ')' | import_as_names) + assert nodelist[0][1] == 'from' + assert nodelist[1][0] == symbol.dotted_name + assert nodelist[2][1] == 'import' + fromname = self.com_dotted_name(nodelist[1]) + if nodelist[3][0] == token.STAR: + n = From(fromname, [('*', None)]) else: - names = [] - for i in range(1, len(nodelist), 2): - names.append(self.com_dotted_as_name(nodelist[i])) - n = Import(names) + node = nodelist[3 + (nodelist[3][0] == token.LPAR)] + n = From(fromname, self.com_import_as_names(node)) n.lineno = nodelist[0][2] return n @@ -895,29 +895,41 @@ return name[:-1] def com_dotted_as_name(self, node): - dot = self.com_dotted_name(node[1]) - if len(node) <= 2: + assert node[0] == symbol.dotted_as_name + node = node[1:] + dot = self.com_dotted_name(node[0][1:]) + if len(node) == 1: return dot, None - if node[0] == symbol.dotted_name: - pass - else: - assert node[2][1] == 'as' - assert node[3][0] == token.NAME - return dot, node[3][1] + assert node[1][1] == 'as' + assert node[2][0] == token.NAME + return dot, node[2][1] + + def com_dotted_as_names(self, node): + assert node[0] == symbol.dotted_as_names + node = node[1:] + names = [self.com_dotted_as_name(node[0])] + for i in range(2, len(node), 2): + names.append(self.com_dotted_as_name(node[i])) + return names def com_import_as_name(self, node): - if node[0] == token.STAR: - return '*', None assert node[0] == symbol.import_as_name node = node[1:] + assert node[0][0] == token.NAME if len(node) == 1: - assert node[0][0] == token.NAME return node[0][1], None - assert node[1][1] == 'as', node assert node[2][0] == token.NAME return node[0][1], node[2][1] + def com_import_as_names(self, node): + assert node[0] == symbol.import_as_names + node = node[1:] + names = [self.com_import_as_name(node[0])] + for i in range(2, len(node), 2): + names.append(self.com_import_as_name(node[i])) + return names + def com_bases(self, node): bases = [] for i in range(1, len(node), 2):

1 0

python/dist/src/Doc/ref ref6.tex,1.71,1.72
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/ref In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Doc/ref Modified Files: ref6.tex Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: ref6.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/ref/ref6.tex,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- ref6.tex 3 Aug 2004 05:17:57 -0000 1.71 +++ ref6.tex 31 Aug 2004 10:06:59 -0000 1.72 @@ -623,6 +623,9 @@ \productioncont{| "from" \token{module} "import" \token{identifier} ["as" \token{name}]} \productioncont{ ( "," \token{identifier} ["as" \token{name}] )*} + \productioncont{| "from" \token{module} "import" "(" \token{identifier} + ["as" \token{name}]} + \productioncont{ ( "," \token{identifier} ["as" \token{name}] )* [","] ")"} \productioncont{| "from" \token{module} "import" "*"} \production{module} {(\token{identifier} ".")* \token{identifier}} @@ -744,8 +747,8 @@ \begin{productionlist}[*] \production{future_statement} - {"from" "__future__" "import" feature ["as" name]} - \productioncont{("," feature ["as" name])*} + {"from" "__future__" "import" feature ["as" name] ("," feature ["as" name])*} + \productioncont{| "from" "__future__" "import" "(" feature ["as" name] ("," feature ["as" name])* [","] ")"} \production{feature}{identifier} \production{name}{identifier} \end{productionlist}

1 0

python/dist/src/Include graminit.h,2.22,2.23
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Include Modified Files: graminit.h Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: graminit.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/graminit.h,v retrieving revision 2.22 retrieving revision 2.23 diff -u -d -r2.22 -r2.23 --- graminit.h 2 Aug 2004 06:09:53 -0000 2.22 +++ graminit.h 31 Aug 2004 10:07:00 -0000 2.23 @@ -23,52 +23,56 @@ #define yield_stmt 278 #define raise_stmt 279 #define import_stmt 280 -#define import_as_name 281 -#define dotted_as_name 282 -#define dotted_name 283 -#define global_stmt 284 -#define exec_stmt 285 -#define assert_stmt 286 -#define compound_stmt 287 -#define if_stmt 288 -#define while_stmt 289 -#define for_stmt 290 -#define try_stmt 291 -#define except_clause 292 -#define suite 293 -#define test 294 -#define and_test 295 -#define not_test 296 -#define comparison 297 -#define comp_op 298 -#define expr 299 -#define xor_expr 300 -#define and_expr 301 -#define shift_expr 302 -#define arith_expr 303 -#define term 304 -#define factor 305 -#define power 306 -#define atom 307 -#define listmaker 308 -#define testlist_gexp 309 -#define lambdef 310 -#define trailer 311 -#define subscriptlist 312 -#define subscript 313 -#define sliceop 314 -#define exprlist 315 -#define testlist 316 -#define testlist_safe 317 -#define dictmaker 318 -#define classdef 319 -#define arglist 320 -#define argument 321 -#define list_iter 322 -#define list_for 323 -#define list_if 324 -#define gen_iter 325 -#define gen_for 326 -#define gen_if 327 -#define testlist1 328 -#define encoding_decl 329 +#define import_name 281 +#define import_from 282 +#define import_as_name 283 +#define dotted_as_name 284 +#define import_as_names 285 +#define dotted_as_names 286 +#define dotted_name 287 +#define global_stmt 288 +#define exec_stmt 289 +#define assert_stmt 290 +#define compound_stmt 291 +#define if_stmt 292 +#define while_stmt 293 +#define for_stmt 294 +#define try_stmt 295 +#define except_clause 296 +#define suite 297 +#define test 298 +#define and_test 299 +#define not_test 300 +#define comparison 301 +#define comp_op 302 +#define expr 303 +#define xor_expr 304 +#define and_expr 305 +#define shift_expr 306 +#define arith_expr 307 +#define term 308 +#define factor 309 +#define power 310 +#define atom 311 +#define listmaker 312 +#define testlist_gexp 313 +#define lambdef 314 +#define trailer 315 +#define subscriptlist 316 +#define subscript 317 +#define sliceop 318 +#define exprlist 319 +#define testlist 320 +#define testlist_safe 321 +#define dictmaker 322 +#define classdef 323 +#define arglist 324 +#define argument 325 +#define list_iter 326 +#define list_for 327 +#define list_if 328 +#define gen_iter 329 +#define gen_for 330 +#define gen_if 331 +#define testlist1 332 +#define encoding_decl 333

1 0

python/dist/src/Lib symbol.py,1.17,1.18
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Lib Modified Files: symbol.py Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: symbol.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/symbol.py,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- symbol.py 2 Aug 2004 06:09:53 -0000 1.17 +++ symbol.py 31 Aug 2004 10:07:00 -0000 1.18 @@ -35,55 +35,59 @@ yield_stmt = 278 raise_stmt = 279 import_stmt = 280 -import_as_name = 281 -dotted_as_name = 282 -dotted_name = 283 -global_stmt = 284 -exec_stmt = 285 -assert_stmt = 286 -compound_stmt = 287 -if_stmt = 288 -while_stmt = 289 -for_stmt = 290 -try_stmt = 291 -except_clause = 292 -suite = 293 -test = 294 -and_test = 295 -not_test = 296 -comparison = 297 -comp_op = 298 -expr = 299 -xor_expr = 300 -and_expr = 301 -shift_expr = 302 -arith_expr = 303 -term = 304 -factor = 305 -power = 306 -atom = 307 -listmaker = 308 -testlist_gexp = 309 -lambdef = 310 -trailer = 311 -subscriptlist = 312 -subscript = 313 -sliceop = 314 -exprlist = 315 -testlist = 316 -testlist_safe = 317 -dictmaker = 318 -classdef = 319 -arglist = 320 -argument = 321 -list_iter = 322 -list_for = 323 -list_if = 324 -gen_iter = 325 -gen_for = 326 -gen_if = 327 -testlist1 = 328 -encoding_decl = 329 +import_name = 281 +import_from = 282 +import_as_name = 283 +dotted_as_name = 284 +import_as_names = 285 +dotted_as_names = 286 +dotted_name = 287 +global_stmt = 288 +exec_stmt = 289 +assert_stmt = 290 +compound_stmt = 291 +if_stmt = 292 +while_stmt = 293 +for_stmt = 294 +try_stmt = 295 +except_clause = 296 +suite = 297 +test = 298 +and_test = 299 +not_test = 300 +comparison = 301 +comp_op = 302 +expr = 303 +xor_expr = 304 +and_expr = 305 +shift_expr = 306 +arith_expr = 307 +term = 308 +factor = 309 +power = 310 +atom = 311 +listmaker = 312 +testlist_gexp = 313 +lambdef = 314 +trailer = 315 +subscriptlist = 316 +subscript = 317 +sliceop = 318 +exprlist = 319 +testlist = 320 +testlist_safe = 321 +dictmaker = 322 +classdef = 323 +arglist = 324 +argument = 325 +list_iter = 326 +list_for = 327 +list_if = 328 +gen_iter = 329 +gen_for = 330 +gen_if = 331 +testlist1 = 332 +encoding_decl = 333 #--end constants-- sym_name = {}

1 0

python/dist/src/Grammar Grammar,1.51,1.52
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Grammar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Grammar Modified Files: Grammar Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: Grammar =================================================================== RCS file: /cvsroot/python/python/dist/src/Grammar/Grammar,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- Grammar 17 Aug 2004 17:29:14 -0000 1.51 +++ Grammar 31 Aug 2004 10:07:00 -0000 1.52 @@ -51,9 +51,13 @@ return_stmt: 'return' [testlist] yield_stmt: 'yield' testlist raise_stmt: 'raise' [test [',' test [',' test]]] -import_stmt: 'import' dotted_as_name (',' dotted_as_name)* | 'from' dotted_name 'import' ('*' | import_as_name (',' import_as_name)*) +import_stmt: import_name | import_from +import_name: 'import' dotted_as_names +import_from: 'from' dotted_name 'import' ('*' | '(' import_as_names ')' | import_as_names) import_as_name: NAME [NAME NAME] dotted_as_name: dotted_name [NAME NAME] +import_as_names: import_as_name (',' import_as_name)* [','] +dotted_as_names: dotted_as_name (',' dotted_as_name)* dotted_name: NAME ('.' NAME)* global_stmt: 'global' NAME (',' NAME)* exec_stmt: 'exec' expr ['in' test [',' test]]

1 0

python/dist/src/Python compile.c, 2.325, 2.326 future.c, 2.13, 2.14 graminit.c, 2.37, 2.38
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Python Modified Files: compile.c future.c graminit.c Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: compile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v retrieving revision 2.325 retrieving revision 2.326 diff -u -d -r2.325 -r2.326 --- compile.c 25 Aug 2004 17:19:38 -0000 2.325 +++ compile.c 31 Aug 2004 10:07:13 -0000 2.326 @@ -3490,42 +3490,53 @@ static void com_import_stmt(struct compiling *c, node *n) { + node *nn; int i; REQ(n, import_stmt); - /* 'import' dotted_name (',' dotted_name)* | - 'from' dotted_name 'import' ('*' | NAME (',' NAME)*) */ - if (STR(CHILD(n, 0))[0] == 'f') { + n = CHILD(n, 0); + /* import_stmt: import_name | import_from */ + if (TYPE(n) == import_from) { + /* 'from' dotted_name 'import' ('*' | + '(' import_as_names ')' | import_as_names) */ PyObject *tup; - /* 'from' dotted_name 'import' ... */ REQ(CHILD(n, 1), dotted_name); - - if (TYPE(CHILD(n, 3)) == STAR) { + nn = CHILD(n, 3 + (TYPE(CHILD(n, 3)) == LPAR)); + if (TYPE(nn) == STAR) tup = Py_BuildValue("(s)", "*"); - } else { - tup = PyTuple_New((NCH(n) - 2)/2); - for (i = 3; i < NCH(n); i += 2) { - PyTuple_SET_ITEM(tup, (i-3)/2, - PyString_FromString(STR( - CHILD(CHILD(n, i), 0)))); + else { + if (TYPE(CHILD(nn, NCH(nn) - 1)) == COMMA && + TYPE(CHILD(n, 3)) != LPAR) { + com_error(c, PyExc_SyntaxError, + "trailing comma not allowed " + "without surrounding parentheses"); + return; } + REQ(nn, import_as_names); + tup = PyTuple_New((NCH(nn) + 1) / 2); + for (i = 0; i < NCH(nn); i += 2) + PyTuple_SET_ITEM(tup, i / 2, + PyString_FromString(STR( + CHILD(CHILD(nn, i), 0)))); } com_addoparg(c, LOAD_CONST, com_addconst(c, tup)); Py_DECREF(tup); com_push(c, 1); com_addopname(c, IMPORT_NAME, CHILD(n, 1)); - if (TYPE(CHILD(n, 3)) == STAR) + if (TYPE(nn) == STAR) com_addbyte(c, IMPORT_STAR); else { - for (i = 3; i < NCH(n); i += 2) - com_from_import(c, CHILD(n, i)); + for (i = 0; i < NCH(nn); i += 2) + com_from_import(c, CHILD(nn, i)); com_addbyte(c, POP_TOP); } com_pop(c, 1); } else { - /* 'import' ... */ - for (i = 1; i < NCH(n); i += 2) { - node *subn = CHILD(n, i); + /* 'import' dotted_as_names */ + nn = CHILD(n, 1); + REQ(nn, dotted_as_names); + for (i = 0; i < NCH(nn); i += 2) { + node *subn = CHILD(nn, i); REQ(subn, dotted_as_name); com_addoparg(c, LOAD_CONST, com_addconst(c, Py_None)); com_push(c, 1); @@ -6291,14 +6302,15 @@ static void symtable_import(struct symtable *st, node *n) { + node *nn; int i; - /* import_stmt: 'import' dotted_as_name (',' dotted_as_name)* - | 'from' dotted_name 'import' - ('*' | import_as_name (',' import_as_name)*) - import_as_name: NAME [NAME NAME] - */ - if (STR(CHILD(n, 0))[0] == 'f') { /* from */ + /* import_stmt: import_name | import_from */ + n = CHILD(n, 0); + if (TYPE(n) == import_from) { + /* import_from: 'from' dotted_name 'import' ('*' | + | '(' import_as_names ')' | import_as_names) */ node *dotname = CHILD(n, 1); + REQ(dotname, dotted_name); if (strcmp(STR(CHILD(dotname, 0)), "__future__") == 0) { /* check for bogus imports */ if (n->n_lineno >= st->st_future->ff_last_lineno) { @@ -6308,7 +6320,8 @@ return; } } - if (TYPE(CHILD(n, 3)) == STAR) { + nn = CHILD(n, 3 + (TYPE(CHILD(n, 3)) == LPAR)); + if (TYPE(nn) == STAR) { if (st->st_cur->ste_type != TYPE_MODULE) { if (symtable_warn(st, "import * only allowed at module level") < 0) @@ -6317,8 +6330,9 @@ st->st_cur->ste_optimized |= OPT_IMPORT_STAR; st->st_cur->ste_opt_lineno = n->n_lineno; } else { - for (i = 3; i < NCH(n); i += 2) { - node *c = CHILD(n, i); + REQ(nn, import_as_names); + for (i = 0; i < NCH(nn); i += 2) { + node *c = CHILD(nn, i); if (NCH(c) > 1) /* import as */ symtable_assign(st, CHILD(c, 2), DEF_IMPORT); @@ -6327,10 +6341,12 @@ DEF_IMPORT); } } - } else { - for (i = 1; i < NCH(n); i += 2) { - symtable_assign(st, CHILD(n, i), DEF_IMPORT); - } + } else { + /* 'import' dotted_as_names */ + nn = CHILD(n, 1); + REQ(nn, dotted_as_names); + for (i = 0; i < NCH(nn); i += 2) + symtable_assign(st, CHILD(nn, i), DEF_IMPORT); } } Index: future.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/future.c,v retrieving revision 2.13 retrieving revision 2.14 diff -u -d -r2.13 -r2.14 --- future.c 11 Dec 2002 14:04:59 -0000 2.13 +++ future.c 31 Aug 2004 10:07:13 -0000 2.14 @@ -18,18 +18,18 @@ { int i; char *feature; - node *ch; - - REQ(n, import_stmt); /* must by from __future__ import ... */ + node *ch, *nn; - for (i = 3; i < NCH(n); i += 2) { - ch = CHILD(n, i); - if (TYPE(ch) == STAR) { - PyErr_SetString(PyExc_SyntaxError, - FUTURE_IMPORT_STAR); - PyErr_SyntaxLocation(filename, ch->n_lineno); - return -1; - } + REQ(n, import_from); + nn = CHILD(n, 3 + (TYPE(CHILD(n, 3)) == LPAR)); + if (TYPE(nn) == STAR) { + PyErr_SetString(PyExc_SyntaxError, FUTURE_IMPORT_STAR); + PyErr_SyntaxLocation(filename, nn->n_lineno); + return -1; + } + REQ(nn, import_as_names); + for (i = 0; i < NCH(nn); i += 2) { + ch = CHILD(nn, i); REQ(ch, import_as_name); feature = STR(CHILD(ch, 0)); if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) { @@ -188,7 +188,8 @@ case import_stmt: { node *name; - if (STR(CHILD(n, 0))[0] != 'f') { /* from */ + n = CHILD(n, 0); + if (TYPE(n) != import_from) { ff->ff_last_lineno = n->n_lineno; return 0; } Index: graminit.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/graminit.c,v retrieving revision 2.37 retrieving revision 2.38 diff -u -d -r2.37 -r2.38 --- graminit.c 17 Aug 2004 17:29:16 -0000 2.37 +++ graminit.c 31 Aug 2004 10:07:13 -0000 2.38 @@ -488,1135 +488,1177 @@ }; static arc arcs_24_0[2] = { {70, 1}, - {72, 2}, + {71, 1}, }; static arc arcs_24_1[1] = { - {71, 3}, + {0, 1}, }; -static arc arcs_24_2[1] = { [...2203 lines suppressed...] {321, 0}, - {322, 0}, - {324, 0}, + {1, "class"}, {325, 0}, - {327, 0}, + {326, 0}, + {328, 0}, {329, 0}, + {331, 0}, + {333, 0}, }; grammar _PyParser_Grammar = { - 74, + 78, dfas, - {156, labels}, + {160, labels}, 256 };

1 0

python/dist/src/Modules parsermodule.c,2.84,2.85
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21410/Modules Modified Files: parsermodule.c Log Message: SF patch #1007189, multi-line imports, for instance: "from blah import (foo, bar baz, bongo)" Index: parsermodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/parsermodule.c,v retrieving revision 2.84 retrieving revision 2.85 diff -u -d -r2.84 -r2.85 --- parsermodule.c 17 Aug 2004 17:29:15 -0000 2.84 +++ parsermodule.c 31 Aug 2004 10:07:12 -0000 2.85 @@ -839,6 +839,7 @@ VALIDATER(print_stmt); VALIDATER(del_stmt); VALIDATER(return_stmt); VALIDATER(list_iter); VALIDATER(raise_stmt); VALIDATER(import_stmt); +VALIDATER(import_name); VALIDATER(import_from); VALIDATER(global_stmt); VALIDATER(list_if); VALIDATER(assert_stmt); VALIDATER(list_for); VALIDATER(exec_stmt); VALIDATER(compound_stmt); @@ -1714,55 +1715,100 @@ } -/* import_stmt: - * - * 'import' dotted_as_name (',' dotted_as_name)* - * | 'from' dotted_name 'import' ('*' | import_as_name (',' import_as_name)*) +/* dotted_as_name (',' dotted_as_name)* */ +static int +validate_dotted_as_names(node *tree) +{ + int nch = NCH(tree); + int res = is_odd(nch) && validate_dotted_as_name(CHILD(tree, 0)); + int i; + + for (i = 1; res && (i < nch); i += 2) + res = (validate_comma(CHILD(tree, i)) + && validate_dotted_as_name(CHILD(tree, i + 1))); + return (res); +} + + +/* import_as_name (',' import_as_name)* [','] */ +static int +validate_import_as_names(node *tree) +{ + int nch = NCH(tree); + int res = validate_import_as_name(CHILD(tree, 0)); + int i; + + for (i = 1; res && (i + 1 < nch); i += 2) + res = (validate_comma(CHILD(tree, i)) + && validate_import_as_name(CHILD(tree, i + 1))); + return (res); +} + + +/* 'import' dotted_as_names */ +static int +validate_import_name(node *tree) +{ + return (validate_ntype(tree, import_name) + && validate_numnodes(tree, 2, "import_name") + && validate_name(CHILD(tree, 0), "import") + && validate_dotted_as_names(CHILD(tree, 1))); +} + + +/* 'from' dotted_name 'import' ('*' | '(' import_as_names ')' | + * import_as_names */ static int +validate_import_from(node *tree) +{ + int nch = NCH(tree); + int res = validate_ntype(tree, import_from) + && (nch >= 4) + && validate_name(CHILD(tree, 0), "from") + && validate_dotted_name(CHILD(tree, 1)) + && validate_name(CHILD(tree, 2), "import"); + + if (res && TYPE(CHILD(tree, 3)) == LPAR) + res = ((nch == 6) + && validate_lparen(CHILD(tree, 3)) + && validate_import_as_names(CHILD(tree, 4)) + && validate_rparen(CHILD(tree, 5))); + else if (res && TYPE(CHILD(tree, 3)) != STAR) + res = validate_import_as_names(CHILD(tree, 3)); + return (res); +} + + +/* import_stmt: import_name | import_from */ +static int validate_import_stmt(node *tree) { int nch = NCH(tree); - int res = (validate_ntype(tree, import_stmt) - && (nch >= 2) && is_even(nch) - && validate_ntype(CHILD(tree, 0), NAME)); + int res = validate_numnodes(tree, 1, "import_stmt"); - if (res && (strcmp(STR(CHILD(tree, 0)), "import") == 0)) { - int j; + if (res) { + int ntype = TYPE(CHILD(tree, 0)); - res = validate_dotted_as_name(CHILD(tree, 1)); - for (j = 2; res && (j < nch); j += 2) - res = (validate_comma(CHILD(tree, j)) - && validate_dotted_as_name(CHILD(tree, j + 1))); - } - else if (res && (res = validate_name(CHILD(tree, 0), "from"))) { - res = ((nch >= 4) && is_even(nch) - && validate_dotted_name(CHILD(tree, 1)) - && validate_name(CHILD(tree, 2), "import")); - if (nch == 4) { - if (TYPE(CHILD(tree, 3)) == import_as_name) - res = validate_import_as_name(CHILD(tree, 3)); - else - res = validate_star(CHILD(tree, 3)); - } + if (ntype == import_name || ntype == import_from) + res = validate_node(CHILD(tree, 0)); else { - /* 'from' dotted_name 'import' import_as_name - * (',' import_as_name)+ - */ - int j; - res = validate_import_as_name(CHILD(tree, 3)); - for (j = 4; res && (j < nch); j += 2) - res = (validate_comma(CHILD(tree, j)) - && validate_import_as_name(CHILD(tree, j + 1))); + res = 0; + err_string("illegal import_stmt child type"); } } - else + else if (nch == 1) { res = 0; - + PyErr_Format(parser_error, + "Unrecognized child node of import_stmt: %d.", + TYPE(CHILD(tree, 0))); + } return (res); } + + static int validate_global_stmt(node *tree) { @@ -2823,6 +2869,12 @@ case import_stmt: res = validate_import_stmt(tree); break; + case import_name: + res = validate_import_name(tree); + break; + case import_from: + res = validate_import_from(tree); + break; case global_stmt: res = validate_global_stmt(tree); break;

1 0

python/dist/src/Include patchlevel.h,2.78,2.79
by anthonybaxter＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19487/Include Modified Files: patchlevel.h Log Message: onward and upward Index: patchlevel.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/patchlevel.h,v retrieving revision 2.78 retrieving revision 2.79 diff -u -d -r2.78 -r2.79 --- patchlevel.h 3 Aug 2004 15:57:39 -0000 2.78 +++ patchlevel.h 31 Aug 2004 09:53:05 -0000 2.79 @@ -23,10 +23,10 @@ #define PY_MINOR_VERSION 4 #define PY_MICRO_VERSION 0 #define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA -#define PY_RELEASE_SERIAL 2 +#define PY_RELEASE_SERIAL 3 /* Version as a string */ -#define PY_VERSION "2.4a2" +#define PY_VERSION "2.4a3" /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */

1 0

python/dist/src/PC tix.diff,NONE,1.1
by loewis＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21163 Added Files: tix.diff Log Message: Add patch for Tix 8.1.4. --- NEW FILE: tix.diff --- diff -ur tix-8.1.4/win/common.mak tix-8.1.4.new/win/common.mak --- tix-8.1.4/win/common.mak 2002-12-11 07:19:42.000000000 +0100 +++ tix-8.1.4.new/win/common.mak 2004-08-03 21:45:09.859375000 +0200 @@ -18,10 +18,10 @@ # support files # #---------------------------------------------------------------------- -TCL_VER = 8.3 +TCL_VER = 8.4 ITCL_VER = -INSTALLDIR = C:\progra~1\tcl +INSTALLDIR = ..\..\tcl84 !IFNDEF TIX_DEBUG NODEBUG = 1 @@ -61,7 +61,7 @@ !IF "$(TCL_VER)" == "8.4" TCLMAJOR=8 TCLMINOR=4 -TCLPATCH=1 +TCLPATCH=7 TMPDIR = tk$(TCL_VER) !ENDIF @@ -176,14 +176,14 @@ $(TMPDIR)\tixWinWm.obj RMDIR = $(TCLDIR)\win\rmd.bat -MKDIR = $(TCLDIR)\win\mkd.bat +MKDIR = mkdir RM = del install: install-binaries install-libraries install-binaries: $(TCLSH) - $(MKDIR) "$(BIN_INSTALL_DIR)" - $(MKDIR) "$(LIB_INSTALL_DIR)" + -$(MKDIR) "$(BIN_INSTALL_DIR)" + -$(MKDIR) "$(LIB_INSTALL_DIR)" @echo installing $(TIXDLL) @copy "$(TIXDLL)" "$(BIN_INSTALL_DIR)" @copy "$(TIXLIB)" "$(LIB_INSTALL_DIR)" diff -ur tix-8.1.4/win/makefile.vc tix-8.1.4.new/win/makefile.vc --- tix-8.1.4/win/makefile.vc 2002-12-02 04:02:54.000000000 +0100 +++ tix-8.1.4.new/win/makefile.vc 2004-08-03 21:42:07.953125000 +0200 @@ -54,12 +54,11 @@ DBGX = d !ENDIF -cc32 = "$(TOOLS32)\bin\cl.exe" -rc32 = "$(TOOLS32_rc)\bin\rc.exe" -link32 = "$(TOOLS32)\bin\link.exe" -include32 = -I"$(TOOLS32)\include" +cc32 = "cl.exe" +rc32 = "rc.exe" +link32 = "link.exe" -TIX_INCLUDES = $(include32) \ +TIX_INCLUDES = \ -I$(ROOT)\win -I$(ROOT)\generic \ -I$(TKDIR)\generic -I$(TKDIR)\win -I$(TKDIR)\xlib \ -I$(TCLDIR)\generic $(ITCL_CFLAGS) @@ -171,7 +170,7 @@ # cvarsdll = -D_X86_=1 -DWIN32 -D_WIN32 -D_MT -D_DLL cflagsdll = $(cvarsdll) -c -W3 -nologo -Fp$(TMPDIR)\ -YX -MD \ - -Oti -Gs -GD + -Oti -Gs -Gd ###################################################################### # Project specific targets @@ -181,7 +180,6 @@ $(DUMPEXTS): $(WINDIR)\winDumpExts.c $(cc32) $(CON_CFLAGS) -Fo$(TMPDIR)\ /c $? - set LIB="$(TOOLS32)\lib" $(link32) $(ldebug) $(conlflags) $(guilibs) -out:$@ \ $(TMPDIR)\winDumpExts.obj @@ -193,7 +191,6 @@ # (ToDo) $(TIXDLL) doesn't have resources to define its icon, etc. # $(TIXDLL): $(TIXOBJS) $(TMPDIR)\tixvc.def - set LIB="$(TOOLS32)\lib" $(link32) $(ldebug) $(dlllflags) -def:$(TMPDIR)\tixvc.def \ $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) $(guilibsdll) \ $(ITCL_LIBS) -out:$@ @<< @@ -202,7 +199,6 @@ $(TIXWISH): $(WISHOBJS) $(TIXOBJS) $(TIXLIB) $(TMPDIR)\tixwish.res - set LIB="$(TOOLS32)\lib" $(link32) $(ldebug) $(guilflags) \ $(WISHOBJS) $(TMPDIR)\tixwish.res $(TIXLIB) \ $(TKLIBDIR)\$(TKLIB) $(TCLLIBDIR)\$(TCLLIB) $(guilibsdll) \ diff -ur tix-8.1.4/win/tk8.4/pkgIndex.tcl tix-8.1.4.new/win/tk8.4/pkgIndex.tcl --- tix-8.1.4/win/tk8.4/pkgIndex.tcl 2002-12-15 04:21:54.000000000 +0100 +++ tix-8.1.4.new/win/tk8.4/pkgIndex.tcl 2004-08-31 08:38:43.921875000 +0200 @@ -15,7 +15,7 @@ # We look in the ../../bin directory (an installed Tcl) lappend dirs ../../bin # We look in the ../../DLLs directory (an installed Python) -lappend dirs ../../Dlls +lappend dirs [file join [file dirname [info nameofexe]] DLLs] # If not, this pkgIndex.tcl will probably fail.

1 0

python/dist/src/Lib random.py,1.64,1.65
by tim_one＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13420/Lib Modified Files: random.py Log Message: HardwareRandom: Go back to multiplying by 2**-BPF instead of using ldexp. Both methods are exact, and return the same results. Turns out multiplication is a few (but just a few) percent faster on my box. They're both significantly faster than using struct with a Q format to convert bytes to a 64-bit long (struct.unpack() appears to lose due to the tuple creation/teardown overhead), and calling _hexlify is significantly faster than doing bytes.encode('hex'). So we appear to have hit a local minimum (wrt speed) here. Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- random.py 31 Aug 2004 01:05:15 -0000 1.64 +++ random.py 31 Aug 2004 02:19:55 -0000 1.65 @@ -43,7 +43,7 @@ from types import MethodType as _MethodType, BuiltinMethodType as _BuiltinMethodType from math import log as _log, exp as _exp, pi as _pi, e as _e from math import sqrt as _sqrt, acos as _acos, cos as _cos, sin as _sin -from math import floor as _floor, ldexp as _ldexp +from math import floor as _floor __all__ = ["Random","seed","random","uniform","randint","choice","sample", "randrange","shuffle","normalvariate","lognormvariate", @@ -57,6 +57,7 @@ LOG4 = _log(4.0) SG_MAGICCONST = 1.0 + _log(4.5) BPF = 53 # Number of bits in a float +RECIP_BPF = 2**-BPF try: from os import urandom as _urandom @@ -759,7 +760,7 @@ """Get the next random number in the range [0.0, 1.0).""" if _urandom is None: raise NotImplementedError('Cannot find hardware entropy source') - return _ldexp(long(_hexlify(_urandom(7)), 16) >> 3, -BPF) + return (long(_hexlify(_urandom(7)), 16) >> 3) * RECIP_BPF def getrandbits(self, k): """getrandbits(k) -> x. Generates a long int with k random bits."""

1 0