Mailman 3 February 2006 - Python-checkins

r42702 - python/branches/tim-obmalloc/Objects/obmalloc.c
by tim.peters Feb. 28, 2006

Feb. 28, 2006

Author: tim.peters Date: Wed Mar 1 00:41:18 2006 New Revision: 42702 Modified: python/branches/tim-obmalloc/Objects/obmalloc.c Log: The code nesting here has gotten impossibly deep. Will probably need to refactor, but until then renaming "partially_allocated_arenas" to "usable_arenas" seems to help readability a lot. Modified: python/branches/tim-obmalloc/Objects/obmalloc.c ============================================================================== --- python/branches/tim-obmalloc/Objects/obmalloc.c (original) +++ python/branches/tim-obmalloc/Objects/obmalloc.c Wed Mar 1 00:41:18 2006 @@ -276,8 +276,8 @@ * * When this arena_object is associated with an allocated arena * with at least one available pool, both members are used in the - * doubly-linked `partially_allocated_arenas` list, which is - * maintained in increasing order of `nfreepools` values. + * doubly-linked `usable_arenas` list, which is maintained in + * increasing order of `nfreepools` values. * * Else this arena_object is associated with an allocated arena * all of whose pools are in use. `nextarena` and `prevarena` @@ -452,7 +452,7 @@ head of the list in new_arena(), and are pushed on the head of the list in PyObject_Free() when the arena is empty. -partially_allocated_arenas +usable_arenas This is a doubly-linked list of the arena_objects associated with arenas that have pools available. These pools are either waiting to be reused, @@ -473,7 +473,7 @@ static struct arena_object* available_arenas = NULL; /* The head of the doubly-linked list of arenas with pools available. */ -static struct arena_object* partially_allocated_arenas = NULL; +static struct arena_object* usable_arenas = NULL; /* How many arena_objects do we initially allocate? * 16 = can allocate 16 arenas = 16 * ARENA_SIZE = 4MB before growing the @@ -533,7 +533,7 @@ * into the old array. Thus, we don't have to worry about * invalid pointers. Just to be sure, some asserts: */ - assert(partially_allocated_arenas == NULL); + assert(usable_arenas == NULL); assert(available_arenas == NULL); /* Zero fill the new section of the array. */ @@ -729,61 +729,53 @@ UNLOCK(); return (void *)bp; } - if (partially_allocated_arenas == NULL) { - /* - * Allocate new arena - */ + + /* There isn't a pool of the right size class immediately + * available: use a free pool from an arena. + */ + if (usable_arenas == NULL) { + /* No arena has a free pool: allocate a new arena. */ #ifdef WITH_MEMORY_LIMITS if (narenas_currently_allocated >= MAX_ARENAS) { UNLOCK(); goto redirect; } #endif - partially_allocated_arenas = new_arena(); - if (partially_allocated_arenas == NULL) { + usable_arenas = new_arena(); + if (usable_arenas == NULL) { UNLOCK(); goto redirect; } - assert(partially_allocated_arenas->address != - (uptr)NULL); - /* This is the beginning of a new list, and is - * initialized in new_arena. - */ - assert(partially_allocated_arenas->nextarena == NULL - && partially_allocated_arenas->prevarena == NULL); } + assert(usable_arenas->address != 0); - /* - * Try to get a cached free pool - */ - pool = partially_allocated_arenas->freepools; + /* Try to get a cached free pool. */ + pool = usable_arenas->freepools; if (pool != NULL) { - /* - * Unlink from cached pools - */ - partially_allocated_arenas->freepools = pool->nextpool; + /* Unlink from cached pools. */ + usable_arenas->freepools = pool->nextpool; /* This moves the arena *towards* the head of the list but it is already at the head of the list: do nothing */ /* XXX what did that mean? */ /* XXX reformat very long lines below */ - partially_allocated_arenas->nfreepools --; - if (partially_allocated_arenas->nfreepools == 0) { - assert(partially_allocated_arenas->freepools == NULL); - assert(partially_allocated_arenas->nextarena == NULL - || partially_allocated_arenas->nextarena->prevarena == partially_allocated_arenas); + usable_arenas->nfreepools --; + if (usable_arenas->nfreepools == 0) { + assert(usable_arenas->freepools == NULL); + assert(usable_arenas->nextarena == NULL + || usable_arenas->nextarena->prevarena == usable_arenas); /* Unlink the arena: it is completely allocated. This is a dequeue from the head operation. */ - partially_allocated_arenas = partially_allocated_arenas->nextarena; - if (partially_allocated_arenas != NULL) - partially_allocated_arenas->prevarena = NULL; - assert(partially_allocated_arenas == NULL || partially_allocated_arenas->address != (uptr) NULL); + usable_arenas = usable_arenas->nextarena; + if (usable_arenas != NULL) + usable_arenas->prevarena = NULL; + assert(usable_arenas == NULL || usable_arenas->address != (uptr) NULL); } else { - assert(partially_allocated_arenas->freepools != NULL - || partially_allocated_arenas->base_address <= ((block*) partially_allocated_arenas->address) + ARENA_SIZE - POOL_SIZE); + assert(usable_arenas->freepools != NULL + || usable_arenas->base_address <= ((block*) usable_arenas->address) + ARENA_SIZE - POOL_SIZE); } init_pool: /* @@ -824,42 +816,39 @@ /* * Allocate new pool */ - assert(partially_allocated_arenas->nfreepools > 0); - if (partially_allocated_arenas->nfreepools) { + assert(usable_arenas->nfreepools > 0); + if (usable_arenas->nfreepools) { /* Verify that the arenabase address is in range. */ /* XXX This assert appears to be equivalent to assert(POOL_SIZE <= ARENA_SIZE); what's it _trying_ to check? */ - assert(partially_allocated_arenas->base_address <= - partially_allocated_arenas->base_address + + assert(usable_arenas->base_address <= + usable_arenas->base_address + ARENA_SIZE - POOL_SIZE); - pool = (poolp)partially_allocated_arenas->base_address; - pool->arenaindex = partially_allocated_arenas - arenas; + pool = (poolp)usable_arenas->base_address; + pool->arenaindex = usable_arenas - arenas; assert(&arenas[pool->arenaindex] == - partially_allocated_arenas); + usable_arenas); pool->szidx = DUMMY_SIZE_IDX; - --partially_allocated_arenas->nfreepools; - partially_allocated_arenas->base_address += POOL_SIZE; + --usable_arenas->nfreepools; + usable_arenas->base_address += POOL_SIZE; - if (partially_allocated_arenas->nfreepools == 0) { - assert(partially_allocated_arenas->nextarena == + if (usable_arenas->nfreepools == 0) { + assert(usable_arenas->nextarena == NULL || - partially_allocated_arenas->nextarena->prevarena == - partially_allocated_arenas); + usable_arenas->nextarena->prevarena == + usable_arenas); /* Unlink the arena: it is completely * allocated. */ - partially_allocated_arenas = - partially_allocated_arenas->nextarena; - if (partially_allocated_arenas != NULL) - partially_allocated_arenas->prevarena = - NULL; - assert(partially_allocated_arenas == NULL || - partially_allocated_arenas->address != - (uptr) NULL); + usable_arenas = usable_arenas->nextarena; + if (usable_arenas != NULL) + usable_arenas->prevarena = NULL; + assert(usable_arenas == NULL || + usable_arenas->address != 0); } goto init_pool; @@ -953,15 +942,12 @@ (uptr)NULL); /* Fix the pointer in the prevarena, or the - * partially_allocated_arenas pointer + * usable_arenas pointer */ if (arenaobj->prevarena == NULL) { - partially_allocated_arenas = - arenaobj->nextarena; - assert(partially_allocated_arenas == - NULL || - partially_allocated_arenas->address - != (uptr)NULL); + usable_arenas = arenaobj->nextarena; + assert(usable_arenas == NULL || + usable_arenas->address != 0); } else { assert(arenaobj->prevarena->nextarena == @@ -996,17 +982,16 @@ * go link it to the head of the partially * allocated list. */ - arenaobj->nextarena = partially_allocated_arenas; + arenaobj->nextarena = usable_arenas; arenaobj->prevarena = NULL; - partially_allocated_arenas = arenaobj; + usable_arenas = arenaobj; /* Fix the pointer in the nextarena. */ if (arenaobj->nextarena != NULL) { arenaobj->nextarena->prevarena = arenaobj; } - assert(partially_allocated_arenas->address != - (uptr)NULL); + assert(usable_arenas->address != 0); } /* If this arena is now out of order, we need to keep * the list sorted. The list is kept sorted so that @@ -1025,7 +1010,7 @@ if (arenaobj->prevarena != NULL) lastPointer = &arenaobj->prevarena->nextarena; else - lastPointer = &partially_allocated_arenas; + lastPointer = &usable_arenas; assert(*lastPointer == arenaobj); /* Step one: unlink the arena from the list. */ @@ -1065,8 +1050,7 @@ assert(arenaobj->nextarena == NULL || arenaobj->nextarena->prevarena == arenaobj); - assert((partially_allocated_arenas == - arenaobj && + assert((usable_arenas == arenaobj && arenaobj->prevarena == NULL) || arenaobj->prevarena->nextarena == arenaobj);

1 0

r42701 - peps/trunk/pep-0000.txt peps/trunk/pep-0353.txt
by neal.norwitz Feb. 28, 2006

Feb. 28, 2006

Author: neal.norwitz Date: Wed Mar 1 00:28:21 2006 New Revision: 42701 Modified: peps/trunk/pep-0000.txt peps/trunk/pep-0353.txt Log: ssize_t is final. Thanks Martin! Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Wed Mar 1 00:28:21 2006 @@ -68,7 +68,6 @@ SA 328 Imports: Multi-Line and Absolute/Relative Aahz SA 343 The "with" Statement GvR, Coghlan SA 352 Required Superclass for Exceptions GvR, Cannon - SA 353 Using ssize_t as the index type von Loewis Open PEPs (under consideration) @@ -167,6 +166,7 @@ SF 327 Decimal Data Type Batista SF 341 Unifying try-except and try-finally Brandl SF 342 Coroutines via Enhanced Generators GvR, Eby + SF 353 Using ssize_t as the index type von Loewis Empty PEPs (or containing only an abstract) Modified: peps/trunk/pep-0353.txt ============================================================================== --- peps/trunk/pep-0353.txt (original) +++ peps/trunk/pep-0353.txt Wed Mar 1 00:28:21 2006 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Martin v. L�wis <martin(a)v.loewis.de> -Status: Accepted +Status: Final Type: Standards Track Content-Type: text/x-rst Created: 18-Dec-2005

1 0

r42700 - peps/trunk/pep-0263.txt
by neal.norwitz Feb. 28, 2006

Feb. 28, 2006

Author: neal.norwitz Date: Wed Mar 1 00:10:27 2006 New Revision: 42700 Modified: peps/trunk/pep-0263.txt Log: Martin changed the encoding warning to an error Modified: peps/trunk/pep-0263.txt ============================================================================== --- peps/trunk/pep-0263.txt (original) +++ peps/trunk/pep-0263.txt Wed Mar 1 00:10:27 2006 @@ -205,6 +205,12 @@ SUZUKI Hisao is working on a patch; see [2] for details. A patch implementing only phase 1 is available at [1]. +Phases + Implemenation of steps 1 and 2 above were completed in 2.3, + except for changing the default encoding to "ascii". + + The default encoding was set to "ascii" in version 2.5. + Scope This PEP intends to provide an upgrade path from the current

1 0

r42699 - python/trunk/Include/compile.h
by thomas.wouters Feb. 28, 2006

Feb. 28, 2006

Author: thomas.wouters Date: Wed Mar 1 00:09:08 2006 New Revision: 42699 Modified: python/trunk/Include/compile.h Log: Move #include to outside "extern C {}", before Tim figures out it'll break VC++. Modified: python/trunk/Include/compile.h ============================================================================== --- python/trunk/Include/compile.h (original) +++ python/trunk/Include/compile.h Wed Mar 1 00:09:08 2006 @@ -1,12 +1,13 @@ #ifndef Py_COMPILE_H #define Py_COMPILE_H + +#include "code.h" + #ifdef __cplusplus extern "C" { #endif -#include "code.h" - /* Public interface */ struct _node; /* Declare the existence of this type */ PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *);

1 0

r42698 - python/trunk/Lib/keyword.py
by thomas.wouters Feb. 28, 2006

Feb. 28, 2006

Author: thomas.wouters Date: Tue Feb 28 23:50:17 2006 New Revision: 42698 Modified: python/trunk/Lib/keyword.py Log: Regenerate. Modified: python/trunk/Lib/keyword.py ============================================================================== --- python/trunk/Lib/keyword.py (original) +++ python/trunk/Lib/keyword.py Tue Feb 28 23:50:17 2006 @@ -15,6 +15,7 @@ kwlist = [ #--start keywords-- 'and', + 'as', 'assert', 'break', 'class', @@ -42,6 +43,7 @@ 'return', 'try', 'while', + 'with', 'yield', #--end keywords-- ]

1 0

r42697 - peps/trunk/pep-0343.txt
by guido.van.rossum Feb. 28, 2006

Feb. 28, 2006

Author: guido.van.rossum Date: Tue Feb 28 23:49:15 2006 New Revision: 42697 Modified: peps/trunk/pep-0343.txt Log: Fix two examples that were broken by the new semantics. Modified: peps/trunk/pep-0343.txt ============================================================================== --- peps/trunk/pep-0343.txt (original) +++ peps/trunk/pep-0343.txt Tue Feb 28 23:49:15 2006 @@ -576,7 +576,7 @@ The tense used in the names of the example context managers is not arbitrary. Past tense ("-ed") is used when the name refers to an action which is done in the __enter__ method and undone in the - __exit__ method. Progressive tense ("-ing") is used when the name + __exit__ method. Progressive tense ("-ing") is used when the name refers to an action which is to be done in the __exit__ method. 1. A template for ensuring that a lock, acquired at the start of a @@ -643,6 +643,8 @@ self.lock.acquire() def __exit__(self, type, value, tb): self.lock.release() + if type is not None: + raise type, value, tb (This example is easily modified to implement the other relatively stateless examples; it shows that it is easy to avoid @@ -769,34 +771,35 @@ # General Decimal Arithmetic Specification return +s # Convert result to normal context - 10. A generic "object-closing" template: + 10. A generic "object-closing" template: - @contextmanager - def closing(obj): - try: - yield obj - finally: - try: - close = obj.close - except AttributeError: - pass - else: - close() - - This can be used to deterministically close anything with a - close method, be it file, generator, or something else. It can - even be used when the object isn't guaranteed to require - closing (e.g., a function that accepts an arbitrary iterable): - - # emulate opening(): - with closing(open("argument.txt")) as contradiction: - for line in contradiction: - print line - - # deterministically finalize an iterator: - with closing(iter(data_source)) as data: - for datum in data: - process(datum) + @contextmanager + def closing(obj): + try: + yield obj + finally: + try: + close = obj.close + except AttributeError: + pass + else: + close() + + This can be used to deterministically close anything with a + close method, be it file, generator, or something else. It + can even be used when the object isn't guaranteed to require + closing (e.g., a function that accepts an arbitrary + iterable): + + # emulate opening(): + with closing(open("argument.txt")) as contradiction: + for line in contradiction: + print line + + # deterministically finalize an iterator: + with closing(iter(data_source)) as data: + for datum in data: + process(datum) 11. Native contexts for objects with acquire/release methods: @@ -807,7 +810,7 @@ def released(self): return unlocked(self) - Sample usage: + Sample usage: with my_lock: # Operations with the lock held @@ -820,54 +823,43 @@ supplied contexts from left-to-right to avoid excessive indentation: - class nested(object): - def __init__(self, *contexts): - self.contexts = contexts - self.entered = None - - def __context__(self): - return self - - def __enter__(self): - if self.entered is not None: - raise RuntimeError("Context is not reentrant") - self.entered = deque() - vars = [] + @contextmanager + def nested(*contexts): + exits = [] + vars = [] + exc = (None, None, None) + try: try: - for context in self.contexts: + for context in contexts: mgr = context.__context__() - vars.append(mgr.__enter__()) - self.entered.appendleft(mgr) + exit = mgr.__exit__ + enter = mgr.__enter__ + vars.append(enter()) + exits.append(exit) + yield vars except: - self.__exit__(*sys.exc_info()) - raise - return vars - - def __exit__(self, *exc_info): - # Behave like nested with statements - # first in, last out - # New exceptions override old ones - ex = exc_info - for mgr in self.entered: + exc = sys.exc_info() + finally: + while exits: + exit = exits.pop() try: - mgr.__exit__(*ex) + exit(*exc) except: - ex = sys.exc_info() - self.entered = None - if ex is not exc_info: - raise ex[0], ex[1], ex[2] + exc = sys.exc_info() + if exc != (None, None, None): + raise - Sample usage: + Sample usage: - with nested(a, b, c) as (x, y, z): - # Perform operation + with nested(a, b, c) as (x, y, z): + # Perform operation - Is equivalent to: + Is equivalent to: - with a as x: - with b as y: - with c as z: - # Perform operation + with a as x: + with b as y: + with c as z: + # Perform operation Reference Implementation @@ -911,6 +903,8 @@ [12] http://sourceforge.net/tracker/index.php?func=detail&aid=1223381&group_id=5… + [13] + http://mail.python.org/pipermail/python-dev/2006-February/061903.html Copyright

1 0

r42696 - in python/trunk: Parser/asdl_c.py Python/Python-ast.c
by neal.norwitz Feb. 28, 2006

Feb. 28, 2006

Author: neal.norwitz Date: Tue Feb 28 23:47:29 2006 New Revision: 42696 Modified: python/trunk/Parser/asdl_c.py python/trunk/Python/Python-ast.c Log: Don't pollute namespace as bad as before. All the types are static now. Modified: python/trunk/Parser/asdl_c.py ============================================================================== --- python/trunk/Parser/asdl_c.py (original) +++ python/trunk/Parser/asdl_c.py Tue Feb 28 23:47:29 2006 @@ -347,18 +347,18 @@ class PyTypesDeclareVisitor(PickleVisitor): def visitProduct(self, prod, name): - self.emit("PyTypeObject *%s_type;" % name, 0) + self.emit("static PyTypeObject *%s_type;" % name, 0) self.emit("static PyObject* ast2obj_%s(void*);" % name, 0) if prod.fields: - self.emit("char *%s_fields[]={" % name,0) + self.emit("static char *%s_fields[]={" % name,0) for f in prod.fields: self.emit('"%s",' % f.name, 1) self.emit("};", 0) def visitSum(self, sum, name): - self.emit("PyTypeObject *%s_type;" % name, 0) + self.emit("static PyTypeObject *%s_type;" % name, 0) if sum.attributes: - self.emit("char *%s_attributes[] = {" % name, 0) + self.emit("static char *%s_attributes[] = {" % name, 0) for a in sum.attributes: self.emit('"%s",' % a.name, 1) self.emit("};", 0) @@ -375,9 +375,9 @@ self.visitConstructor(t, name) def visitConstructor(self, cons, name): - self.emit("PyTypeObject *%s_type;" % cons.name, 0) + self.emit("static PyTypeObject *%s_type;" % cons.name, 0) if cons.fields: - self.emit("char *%s_fields[]={" % cons.name, 0) + self.emit("static char *%s_fields[]={" % cons.name, 0) for t in cons.fields: self.emit('"%s",' % t.name, 1) self.emit("};",0) @@ -736,7 +736,7 @@ print >> f, '#include "Python.h"' print >> f, '#include "%s-ast.h"' % mod.name print >> f - print >>f, "PyTypeObject* AST_type;" + print >>f, "static PyTypeObject* AST_type;" v = ChainOfVisitors( PyTypesDeclareVisitor(f), PyTypesVisitor(f), Modified: python/trunk/Python/Python-ast.c ============================================================================== --- python/trunk/Python/Python-ast.c (original) +++ python/trunk/Python/Python-ast.c Tue Feb 28 23:47:29 2006 @@ -3,350 +3,350 @@ #include "Python.h" #include "Python-ast.h" -PyTypeObject* AST_type; -PyTypeObject *mod_type; +static PyTypeObject* AST_type; +static PyTypeObject *mod_type; static PyObject* ast2obj_mod(void*); -PyTypeObject *Module_type; -char *Module_fields[]={ +static PyTypeObject *Module_type; +static char *Module_fields[]={ "body", }; -PyTypeObject *Interactive_type; -char *Interactive_fields[]={ +static PyTypeObject *Interactive_type; +static char *Interactive_fields[]={ "body", }; -PyTypeObject *Expression_type; -char *Expression_fields[]={ +static PyTypeObject *Expression_type; +static char *Expression_fields[]={ "body", }; -PyTypeObject *Suite_type; -char *Suite_fields[]={ +static PyTypeObject *Suite_type; +static char *Suite_fields[]={ "body", }; -PyTypeObject *stmt_type; -char *stmt_attributes[] = { +static PyTypeObject *stmt_type; +static char *stmt_attributes[] = { "lineno", }; static PyObject* ast2obj_stmt(void*); -PyTypeObject *FunctionDef_type; -char *FunctionDef_fields[]={ +static PyTypeObject *FunctionDef_type; +static char *FunctionDef_fields[]={ "name", "args", "body", "decorators", }; -PyTypeObject *ClassDef_type; -char *ClassDef_fields[]={ +static PyTypeObject *ClassDef_type; +static char *ClassDef_fields[]={ "name", "bases", "body", }; -PyTypeObject *Return_type; -char *Return_fields[]={ +static PyTypeObject *Return_type; +static char *Return_fields[]={ "value", }; -PyTypeObject *Delete_type; -char *Delete_fields[]={ +static PyTypeObject *Delete_type; +static char *Delete_fields[]={ "targets", }; -PyTypeObject *Assign_type; -char *Assign_fields[]={ +static PyTypeObject *Assign_type; +static char *Assign_fields[]={ "targets", "value", }; -PyTypeObject *AugAssign_type; -char *AugAssign_fields[]={ +static PyTypeObject *AugAssign_type; +static char *AugAssign_fields[]={ "target", "op", "value", }; -PyTypeObject *Print_type; -char *Print_fields[]={ +static PyTypeObject *Print_type; +static char *Print_fields[]={ "dest", "values", "nl", }; -PyTypeObject *For_type; -char *For_fields[]={ +static PyTypeObject *For_type; +static char *For_fields[]={ "target", "iter", "body", "orelse", }; -PyTypeObject *While_type; -char *While_fields[]={ +static PyTypeObject *While_type; +static char *While_fields[]={ "test", "body", "orelse", }; -PyTypeObject *If_type; -char *If_fields[]={ +static PyTypeObject *If_type; +static char *If_fields[]={ "test", "body", "orelse", }; -PyTypeObject *With_type; -char *With_fields[]={ +static PyTypeObject *With_type; +static char *With_fields[]={ "context_expr", "optional_vars", "body", }; -PyTypeObject *Raise_type; -char *Raise_fields[]={ +static PyTypeObject *Raise_type; +static char *Raise_fields[]={ "type", "inst", "tback", }; -PyTypeObject *TryExcept_type; -char *TryExcept_fields[]={ +static PyTypeObject *TryExcept_type; +static char *TryExcept_fields[]={ "body", "handlers", "orelse", }; -PyTypeObject *TryFinally_type; -char *TryFinally_fields[]={ +static PyTypeObject *TryFinally_type; +static char *TryFinally_fields[]={ "body", "finalbody", }; -PyTypeObject *Assert_type; -char *Assert_fields[]={ +static PyTypeObject *Assert_type; +static char *Assert_fields[]={ "test", "msg", }; -PyTypeObject *Import_type; -char *Import_fields[]={ +static PyTypeObject *Import_type; +static char *Import_fields[]={ "names", }; -PyTypeObject *ImportFrom_type; -char *ImportFrom_fields[]={ +static PyTypeObject *ImportFrom_type; +static char *ImportFrom_fields[]={ "module", "names", "level", }; -PyTypeObject *Exec_type; -char *Exec_fields[]={ +static PyTypeObject *Exec_type; +static char *Exec_fields[]={ "body", "globals", "locals", }; -PyTypeObject *Global_type; -char *Global_fields[]={ +static PyTypeObject *Global_type; +static char *Global_fields[]={ "names", }; -PyTypeObject *Expr_type; -char *Expr_fields[]={ +static PyTypeObject *Expr_type; +static char *Expr_fields[]={ "value", }; -PyTypeObject *Pass_type; -PyTypeObject *Break_type; -PyTypeObject *Continue_type; -PyTypeObject *expr_type; -char *expr_attributes[] = { +static PyTypeObject *Pass_type; +static PyTypeObject *Break_type; +static PyTypeObject *Continue_type; +static PyTypeObject *expr_type; +static char *expr_attributes[] = { "lineno", }; static PyObject* ast2obj_expr(void*); -PyTypeObject *BoolOp_type; -char *BoolOp_fields[]={ +static PyTypeObject *BoolOp_type; +static char *BoolOp_fields[]={ "op", "values", }; -PyTypeObject *BinOp_type; -char *BinOp_fields[]={ +static PyTypeObject *BinOp_type; +static char *BinOp_fields[]={ "left", "op", "right", }; -PyTypeObject *UnaryOp_type; -char *UnaryOp_fields[]={ +static PyTypeObject *UnaryOp_type; +static char *UnaryOp_fields[]={ "op", "operand", }; -PyTypeObject *Lambda_type; -char *Lambda_fields[]={ +static PyTypeObject *Lambda_type; +static char *Lambda_fields[]={ "args", "body", }; -PyTypeObject *IfExp_type; -char *IfExp_fields[]={ +static PyTypeObject *IfExp_type; +static char *IfExp_fields[]={ "test", "body", "orelse", }; -PyTypeObject *Dict_type; -char *Dict_fields[]={ +static PyTypeObject *Dict_type; +static char *Dict_fields[]={ "keys", "values", }; -PyTypeObject *ListComp_type; -char *ListComp_fields[]={ +static PyTypeObject *ListComp_type; +static char *ListComp_fields[]={ "elt", "generators", }; -PyTypeObject *GeneratorExp_type; -char *GeneratorExp_fields[]={ +static PyTypeObject *GeneratorExp_type; +static char *GeneratorExp_fields[]={ "elt", "generators", }; -PyTypeObject *Yield_type; -char *Yield_fields[]={ +static PyTypeObject *Yield_type; +static char *Yield_fields[]={ "value", }; -PyTypeObject *Compare_type; -char *Compare_fields[]={ +static PyTypeObject *Compare_type; +static char *Compare_fields[]={ "left", "ops", "comparators", }; -PyTypeObject *Call_type; -char *Call_fields[]={ +static PyTypeObject *Call_type; +static char *Call_fields[]={ "func", "args", "keywords", "starargs", "kwargs", }; -PyTypeObject *Repr_type; -char *Repr_fields[]={ +static PyTypeObject *Repr_type; +static char *Repr_fields[]={ "value", }; -PyTypeObject *Num_type; -char *Num_fields[]={ +static PyTypeObject *Num_type; +static char *Num_fields[]={ "n", }; -PyTypeObject *Str_type; -char *Str_fields[]={ +static PyTypeObject *Str_type; +static char *Str_fields[]={ "s", }; -PyTypeObject *Attribute_type; -char *Attribute_fields[]={ +static PyTypeObject *Attribute_type; +static char *Attribute_fields[]={ "value", "attr", "ctx", }; -PyTypeObject *Subscript_type; -char *Subscript_fields[]={ +static PyTypeObject *Subscript_type; +static char *Subscript_fields[]={ "value", "slice", "ctx", }; -PyTypeObject *Name_type; -char *Name_fields[]={ +static PyTypeObject *Name_type; +static char *Name_fields[]={ "id", "ctx", }; -PyTypeObject *List_type; -char *List_fields[]={ +static PyTypeObject *List_type; +static char *List_fields[]={ "elts", "ctx", }; -PyTypeObject *Tuple_type; -char *Tuple_fields[]={ +static PyTypeObject *Tuple_type; +static char *Tuple_fields[]={ "elts", "ctx", }; -PyTypeObject *expr_context_type; +static PyTypeObject *expr_context_type; static PyObject *Load_singleton, *Store_singleton, *Del_singleton, *AugLoad_singleton, *AugStore_singleton, *Param_singleton; static PyObject* ast2obj_expr_context(expr_context_ty); -PyTypeObject *Load_type; -PyTypeObject *Store_type; -PyTypeObject *Del_type; -PyTypeObject *AugLoad_type; -PyTypeObject *AugStore_type; -PyTypeObject *Param_type; -PyTypeObject *slice_type; +static PyTypeObject *Load_type; +static PyTypeObject *Store_type; +static PyTypeObject *Del_type; +static PyTypeObject *AugLoad_type; +static PyTypeObject *AugStore_type; +static PyTypeObject *Param_type; +static PyTypeObject *slice_type; static PyObject* ast2obj_slice(void*); -PyTypeObject *Ellipsis_type; -PyTypeObject *Slice_type; -char *Slice_fields[]={ +static PyTypeObject *Ellipsis_type; +static PyTypeObject *Slice_type; +static char *Slice_fields[]={ "lower", "upper", "step", }; -PyTypeObject *ExtSlice_type; -char *ExtSlice_fields[]={ +static PyTypeObject *ExtSlice_type; +static char *ExtSlice_fields[]={ "dims", }; -PyTypeObject *Index_type; -char *Index_fields[]={ +static PyTypeObject *Index_type; +static char *Index_fields[]={ "value", }; -PyTypeObject *boolop_type; +static PyTypeObject *boolop_type; static PyObject *And_singleton, *Or_singleton; static PyObject* ast2obj_boolop(boolop_ty); -PyTypeObject *And_type; -PyTypeObject *Or_type; -PyTypeObject *operator_type; +static PyTypeObject *And_type; +static PyTypeObject *Or_type; +static PyTypeObject *operator_type; static PyObject *Add_singleton, *Sub_singleton, *Mult_singleton, *Div_singleton, *Mod_singleton, *Pow_singleton, *LShift_singleton, *RShift_singleton, *BitOr_singleton, *BitXor_singleton, *BitAnd_singleton, *FloorDiv_singleton; static PyObject* ast2obj_operator(operator_ty); -PyTypeObject *Add_type; -PyTypeObject *Sub_type; -PyTypeObject *Mult_type; -PyTypeObject *Div_type; -PyTypeObject *Mod_type; -PyTypeObject *Pow_type; -PyTypeObject *LShift_type; -PyTypeObject *RShift_type; -PyTypeObject *BitOr_type; -PyTypeObject *BitXor_type; -PyTypeObject *BitAnd_type; -PyTypeObject *FloorDiv_type; -PyTypeObject *unaryop_type; +static PyTypeObject *Add_type; +static PyTypeObject *Sub_type; +static PyTypeObject *Mult_type; +static PyTypeObject *Div_type; +static PyTypeObject *Mod_type; +static PyTypeObject *Pow_type; +static PyTypeObject *LShift_type; +static PyTypeObject *RShift_type; +static PyTypeObject *BitOr_type; +static PyTypeObject *BitXor_type; +static PyTypeObject *BitAnd_type; +static PyTypeObject *FloorDiv_type; +static PyTypeObject *unaryop_type; static PyObject *Invert_singleton, *Not_singleton, *UAdd_singleton, *USub_singleton; static PyObject* ast2obj_unaryop(unaryop_ty); -PyTypeObject *Invert_type; -PyTypeObject *Not_type; -PyTypeObject *UAdd_type; -PyTypeObject *USub_type; -PyTypeObject *cmpop_type; +static PyTypeObject *Invert_type; +static PyTypeObject *Not_type; +static PyTypeObject *UAdd_type; +static PyTypeObject *USub_type; +static PyTypeObject *cmpop_type; static PyObject *Eq_singleton, *NotEq_singleton, *Lt_singleton, *LtE_singleton, *Gt_singleton, *GtE_singleton, *Is_singleton, *IsNot_singleton, *In_singleton, *NotIn_singleton; static PyObject* ast2obj_cmpop(cmpop_ty); -PyTypeObject *Eq_type; -PyTypeObject *NotEq_type; -PyTypeObject *Lt_type; -PyTypeObject *LtE_type; -PyTypeObject *Gt_type; -PyTypeObject *GtE_type; -PyTypeObject *Is_type; -PyTypeObject *IsNot_type; -PyTypeObject *In_type; -PyTypeObject *NotIn_type; -PyTypeObject *comprehension_type; +static PyTypeObject *Eq_type; +static PyTypeObject *NotEq_type; +static PyTypeObject *Lt_type; +static PyTypeObject *LtE_type; +static PyTypeObject *Gt_type; +static PyTypeObject *GtE_type; +static PyTypeObject *Is_type; +static PyTypeObject *IsNot_type; +static PyTypeObject *In_type; +static PyTypeObject *NotIn_type; +static PyTypeObject *comprehension_type; static PyObject* ast2obj_comprehension(void*); -char *comprehension_fields[]={ +static char *comprehension_fields[]={ "target", "iter", "ifs", }; -PyTypeObject *excepthandler_type; +static PyTypeObject *excepthandler_type; static PyObject* ast2obj_excepthandler(void*); -char *excepthandler_fields[]={ +static char *excepthandler_fields[]={ "type", "name", "body", }; -PyTypeObject *arguments_type; +static PyTypeObject *arguments_type; static PyObject* ast2obj_arguments(void*); -char *arguments_fields[]={ +static char *arguments_fields[]={ "args", "vararg", "kwarg", "defaults", }; -PyTypeObject *keyword_type; +static PyTypeObject *keyword_type; static PyObject* ast2obj_keyword(void*); -char *keyword_fields[]={ +static char *keyword_fields[]={ "arg", "value", }; -PyTypeObject *alias_type; +static PyTypeObject *alias_type; static PyObject* ast2obj_alias(void*); -char *alias_fields[]={ +static char *alias_fields[]={ "name", "asname", };

1 0

r42695 - python/branches/tim-obmalloc/Objects/obmalloc.c
by tim.peters Feb. 28, 2006

Feb. 28, 2006

Author: tim.peters Date: Tue Feb 28 23:42:28 2006 New Revision: 42695 Modified: python/branches/tim-obmalloc/Objects/obmalloc.c Log: Rehabilitate the broken WITH_MEMORY_LIMITS gimmick. I doubt anyone uses this, and would approve of removing it, but doing so without a release cycle of warning would be bad practice. In the meantime, it's easy to support, and keeping track of the # of allocated arenas is desirable for debug PYTHONMALLOCSTATS output anyway. Modified: python/branches/tim-obmalloc/Objects/obmalloc.c ============================================================================== --- python/branches/tim-obmalloc/Objects/obmalloc.c (original) +++ python/branches/tim-obmalloc/Objects/obmalloc.c Tue Feb 28 23:42:28 2006 @@ -481,6 +481,15 @@ */ #define INITIAL_ARENA_OBJECTS 16 +/* Number of arenas allocated that haven't been free()'d. */ +static ulong narenas_currently_allocated = 0; + +#ifdef PYMALLOC_DEBUG +/* Total number of times malloc() called to allocate an arena. */ +/* XXX Teach the debug malloc output about this. */ +static ulong ntimes_arena_allocated = 0; +#endif + /* Allocate a new arena. If we run out of memory, return NULL. Else * allocate a new arena, and return the address of an arena_object * descriptor describing the new arena. The `prevarena` and `freepools` @@ -564,6 +573,10 @@ return NULL; } + ++narenas_currently_allocated; +#ifdef PYMALLOC_DEBUG + ++ntimes_arena_allocated; +#endif /* base_address <- first pool-aligned address in the arena nfreepools <- number of whole pools that fit after alignment */ arenaobj->base_address = (block*)arenaobj->address; @@ -721,13 +734,10 @@ * Allocate new arena */ #ifdef WITH_MEMORY_LIMITS - /* XXX: Re-enable or remove this feature - To enable it, we will need to maintain a count of the - currently allocated arenas - if (!(narenas < MAX_ARENAS)) { + if (narenas_currently_allocated >= MAX_ARENAS) { UNLOCK(); goto redirect; - } */ + } #endif partially_allocated_arenas = new_arena(); if (partially_allocated_arenas == NULL) { @@ -978,6 +988,7 @@ address = (void *)arenaobj->address; arenaobj->address = (uptr)NULL; free(address); + --narenas_currently_allocated; } else if (arenaobj->nfreepools == 1) {

1 0

r42694 - in python/trunk: Grammar/Grammar Parser/parser.c Parser/parsetok.c Python/ast.c Python/graminit.c
by thomas.wouters Feb. 28, 2006

Feb. 28, 2006

Author: thomas.wouters Date: Tue Feb 28 23:42:15 2006 New Revision: 42694 Modified: python/trunk/Grammar/Grammar python/trunk/Parser/parser.c python/trunk/Parser/parsetok.c python/trunk/Python/ast.c python/trunk/Python/graminit.c Log: Make 'as' an actual keyword when with's future statement is used. Not actually necessary for functionality, but good for transition. Modified: python/trunk/Grammar/Grammar ============================================================================== --- python/trunk/Grammar/Grammar (original) +++ python/trunk/Grammar/Grammar Tue Feb 28 23:42:15 2006 @@ -61,8 +61,8 @@ 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_name: NAME [('as' | NAME) NAME] +dotted_as_name: dotted_name [('as' | NAME) NAME] import_as_names: import_as_name (',' import_as_name)* [','] dotted_as_names: dotted_as_name (',' dotted_as_name)* dotted_name: NAME ('.' NAME)* @@ -80,7 +80,7 @@ ['finally' ':' suite] | 'finally' ':' suite)) with_stmt: 'with' test [ with_var ] ':' suite -with_var: NAME expr +with_var: ('as' | NAME) expr # NB compile.c makes sure that the default except clause is last except_clause: 'except' [test [',' test]] suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT Modified: python/trunk/Parser/parser.c ============================================================================== --- python/trunk/Parser/parser.c (original) +++ python/trunk/Parser/parser.c Tue Feb 28 23:42:15 2006 @@ -144,18 +144,20 @@ register label *l = g->g_ll.ll_label; register int i; for (i = n; i > 0; i--, l++) { - if (l->lb_type == NAME && l->lb_str != NULL && - l->lb_str[0] == s[0] && - strcmp(l->lb_str, s) == 0) { + if (l->lb_type != NAME || l->lb_str == NULL || + l->lb_str[0] != s[0] || + strcmp(l->lb_str, s) != 0) + continue; #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD - if (!(ps->p_flags & CO_FUTURE_WITH_STATEMENT) && - s[0] == 'w' && - strcmp(s, "with") == 0) - break; /* not a keyword */ -#endif - D(printf("It's a keyword\n")); - return n - i; + if (!(ps->p_flags & CO_FUTURE_WITH_STATEMENT)) { + if (s[0] == 'w' && strcmp(s, "with") == 0) + break; /* not a keyword yet */ + else if (s[0] == 'a' && strcmp(s, "as") == 0) + break; /* not a keyword yet */ } +#endif + D(printf("It's a keyword\n")); + return n - i; } } Modified: python/trunk/Parser/parsetok.c ============================================================================== --- python/trunk/Parser/parsetok.c (original) +++ python/trunk/Parser/parsetok.c Tue Feb 28 23:42:15 2006 @@ -176,8 +176,8 @@ if (len == 4 && str[0] == 'w' && strcmp(str, "with") == 0) warn(with_msg, err_ret->filename, tok->lineno); else if (!(handling_import || handling_with) && - len == 2 && - str[0] == 'a' && strcmp(str, "as") == 0) + len == 2 && str[0] == 'a' && + strcmp(str, "as") == 0) warn(as_msg, err_ret->filename, tok->lineno); } else if (type == NAME && Modified: python/trunk/Python/ast.c ============================================================================== --- python/trunk/Python/ast.c (original) +++ python/trunk/Python/ast.c Tue Feb 28 23:42:15 2006 @@ -2088,8 +2088,8 @@ alias_for_import_name(struct compiling *c, const node *n) { /* - import_as_name: NAME [NAME NAME] - dotted_as_name: dotted_name [NAME NAME] + import_as_name: NAME ['as' NAME] + dotted_as_name: dotted_name ['as' NAME] dotted_name: NAME ('.' NAME)* */ PyObject *str; Modified: python/trunk/Python/graminit.c ============================================================================== --- python/trunk/Python/graminit.c (original) +++ python/trunk/Python/graminit.c Tue Feb 28 23:42:15 2006 @@ -556,7 +556,8 @@ static arc arcs_27_0[1] = { {19, 1}, }; -static arc arcs_27_1[2] = { +static arc arcs_27_1[3] = { + {78, 2}, {19, 2}, {0, 1}, }; @@ -568,14 +569,15 @@ }; static state states_27[4] = { {1, arcs_27_0}, - {2, arcs_27_1}, + {3, arcs_27_1}, {1, arcs_27_2}, {1, arcs_27_3}, }; static arc arcs_28_0[1] = { {12, 1}, }; -static arc arcs_28_1[2] = { +static arc arcs_28_1[3] = { + {78, 2}, {19, 2}, {0, 1}, }; @@ -587,7 +589,7 @@ }; static state states_28[4] = { {1, arcs_28_0}, - {2, arcs_28_1}, + {3, arcs_28_1}, {1, arcs_28_2}, {1, arcs_28_3}, }; @@ -608,7 +610,7 @@ {2, arcs_29_2}, }; static arc arcs_30_0[1] = { - {78, 1}, + {79, 1}, }; static arc arcs_30_1[2] = { {27, 0}, @@ -630,7 +632,7 @@ {2, arcs_31_1}, }; static arc arcs_32_0[1] = { - {79, 1}, + {80, 1}, }; static arc arcs_32_1[1] = { {19, 2}, @@ -645,13 +647,13 @@ {2, arcs_32_2}, }; static arc arcs_33_0[1] = { - {80, 1}, + {81, 1}, }; static arc arcs_33_1[1] = { - {81, 2}, + {82, 2}, }; static arc arcs_33_2[2] = { - {82, 3}, + {83, 3}, {0, 2}, }; static arc arcs_33_3[1] = { @@ -677,7 +679,7 @@ {1, arcs_33_6}, }; static arc arcs_34_0[1] = { - {83, 1}, + {84, 1}, }; static arc arcs_34_1[1] = { {26, 2}, @@ -700,13 +702,13 @@ {1, arcs_34_4}, }; static arc arcs_35_0[7] = { - {84, 1}, {85, 1}, {86, 1}, {87, 1}, {88, 1}, - {17, 1}, {89, 1}, + {17, 1}, + {90, 1}, }; static arc arcs_35_1[1] = { {0, 1}, @@ -716,7 +718,7 @@ {1, arcs_35_1}, }; static arc arcs_36_0[1] = { - {90, 1}, + {91, 1}, }; static arc arcs_36_1[1] = { {26, 2}, @@ -728,8 +730,8 @@ {22, 4}, }; static arc arcs_36_4[3] = { - {91, 1}, - {92, 5}, + {92, 1}, + {93, 5}, {0, 4}, }; static arc arcs_36_5[1] = { @@ -752,7 +754,7 @@ {1, arcs_36_7}, }; static arc arcs_37_0[1] = { - {93, 1}, + {94, 1}, }; static arc arcs_37_1[1] = { {26, 2}, @@ -764,7 +766,7 @@ {22, 4}, }; static arc arcs_37_4[2] = { - {92, 5}, + {93, 5}, {0, 4}, }; static arc arcs_37_5[1] = { @@ -787,13 +789,13 @@ {1, arcs_37_7}, }; static arc arcs_38_0[1] = { - {94, 1}, + {95, 1}, }; static arc arcs_38_1[1] = { {59, 2}, }; static arc arcs_38_2[1] = { - {82, 3}, + {83, 3}, }; static arc arcs_38_3[1] = { {9, 4}, @@ -805,7 +807,7 @@ {22, 6}, }; static arc arcs_38_6[2] = { - {92, 7}, + {93, 7}, {0, 6}, }; static arc arcs_38_7[1] = { @@ -830,7 +832,7 @@ {1, arcs_38_9}, }; static arc arcs_39_0[1] = { - {95, 1}, + {96, 1}, }; static arc arcs_39_1[1] = { {21, 2}, @@ -839,8 +841,8 @@ {22, 3}, }; static arc arcs_39_3[2] = { - {96, 4}, - {97, 5}, + {97, 4}, + {98, 5}, }; static arc arcs_39_4[1] = { {21, 6}, @@ -855,9 +857,9 @@ {22, 9}, }; static arc arcs_39_8[4] = { - {96, 4}, - {92, 10}, - {97, 5}, + {97, 4}, + {93, 10}, + {98, 5}, {0, 8}, }; static arc arcs_39_9[1] = { @@ -870,7 +872,7 @@ {22, 12}, }; static arc arcs_39_12[2] = { - {97, 5}, + {98, 5}, {0, 12}, }; static state states_39[13] = { @@ -889,13 +891,13 @@ {2, arcs_39_12}, }; static arc arcs_40_0[1] = { - {98, 1}, + {99, 1}, }; static arc arcs_40_1[1] = { {26, 2}, }; static arc arcs_40_2[2] = { - {99, 3}, + {100, 3}, {21, 4}, }; static arc arcs_40_3[1] = { @@ -915,22 +917,23 @@ {1, arcs_40_4}, {1, arcs_40_5}, }; -static arc arcs_41_0[1] = { +static arc arcs_41_0[2] = { + {78, 1}, {19, 1}, }; static arc arcs_41_1[1] = { - {81, 2}, + {82, 2}, }; static arc arcs_41_2[1] = { {0, 2}, }; static state states_41[3] = { - {1, arcs_41_0}, + {2, arcs_41_0}, {1, arcs_41_1}, {1, arcs_41_2}, }; static arc arcs_42_0[1] = { - {100, 1}, + {101, 1}, }; static arc arcs_42_1[2] = { {26, 2}, @@ -961,14 +964,14 @@ {0, 1}, }; static arc arcs_43_2[1] = { - {101, 3}, + {102, 3}, }; static arc arcs_43_3[1] = { {6, 4}, }; static arc arcs_43_4[2] = { {6, 4}, - {102, 1}, + {103, 1}, }; static state states_43[5] = { {2, arcs_43_0}, @@ -978,21 +981,21 @@ {2, arcs_43_4}, }; static arc arcs_44_0[1] = { - {104, 1}, + {105, 1}, }; static arc arcs_44_1[2] = { {27, 2}, {0, 1}, }; static arc arcs_44_2[1] = { - {104, 3}, + {105, 3}, }; static arc arcs_44_3[2] = { {27, 4}, {0, 3}, }; static arc arcs_44_4[2] = { - {104, 3}, + {105, 3}, {0, 4}, }; static state states_44[5] = { @@ -1003,8 +1006,8 @@ {2, arcs_44_4}, }; static arc arcs_45_0[2] = { - {105, 1}, {106, 1}, + {107, 1}, }; static arc arcs_45_1[1] = { {0, 1}, @@ -1014,7 +1017,7 @@ {1, arcs_45_1}, }; static arc arcs_46_0[1] = { - {107, 1}, + {108, 1}, }; static arc arcs_46_1[2] = { {23, 2}, @@ -1024,7 +1027,7 @@ {21, 3}, }; static arc arcs_46_3[1] = { - {104, 4}, + {105, 4}, }; static arc arcs_46_4[1] = { {0, 4}, @@ -1037,21 +1040,21 @@ {1, arcs_46_4}, }; static arc arcs_47_0[2] = { - {105, 1}, - {108, 2}, + {106, 1}, + {109, 2}, }; static arc arcs_47_1[2] = { - {90, 3}, + {91, 3}, {0, 1}, }; static arc arcs_47_2[1] = { {0, 2}, }; static arc arcs_47_3[1] = { - {105, 4}, + {106, 4}, }; static arc arcs_47_4[1] = { - {92, 5}, + {93, 5}, }; static arc arcs_47_5[1] = { {26, 2}, @@ -1065,10 +1068,10 @@ {1, arcs_47_5}, }; static arc arcs_48_0[1] = { - {109, 1}, + {110, 1}, }; static arc arcs_48_1[2] = { - {110, 0}, + {111, 0}, {0, 1}, }; static state states_48[2] = { @@ -1076,10 +1079,10 @@ {2, arcs_48_1}, }; static arc arcs_49_0[1] = { - {111, 1}, + {112, 1}, }; static arc arcs_49_1[2] = { - {112, 0}, + {113, 0}, {0, 1}, }; static state states_49[2] = { @@ -1087,11 +1090,11 @@ {2, arcs_49_1}, }; static arc arcs_50_0[2] = { - {113, 1}, - {114, 2}, + {114, 1}, + {115, 2}, }; static arc arcs_50_1[1] = { - {111, 2}, + {112, 2}, }; static arc arcs_50_2[1] = { {0, 2}, @@ -1102,10 +1105,10 @@ {1, arcs_50_2}, }; static arc arcs_51_0[1] = { - {81, 1}, + {82, 1}, }; static arc arcs_51_1[2] = { - {115, 0}, + {116, 0}, {0, 1}, }; static state states_51[2] = { @@ -1113,25 +1116,25 @@ {2, arcs_51_1}, }; static arc arcs_52_0[10] = { - {116, 1}, {117, 1}, {118, 1}, {119, 1}, {120, 1}, {121, 1}, {122, 1}, - {82, 1}, - {113, 2}, - {123, 3}, + {123, 1}, + {83, 1}, + {114, 2}, + {124, 3}, }; static arc arcs_52_1[1] = { {0, 1}, }; static arc arcs_52_2[1] = { - {82, 1}, + {83, 1}, }; static arc arcs_52_3[2] = { - {113, 1}, + {114, 1}, {0, 3}, }; static state states_52[4] = { @@ -1141,10 +1144,10 @@ {2, arcs_52_3}, }; static arc arcs_53_0[1] = { - {124, 1}, + {125, 1}, }; static arc arcs_53_1[2] = { - {125, 0}, + {126, 0}, {0, 1}, }; static state states_53[2] = { @@ -1152,10 +1155,10 @@ {2, arcs_53_1}, }; static arc arcs_54_0[1] = { - {126, 1}, + {127, 1}, }; static arc arcs_54_1[2] = { - {127, 0}, + {128, 0}, {0, 1}, }; static state states_54[2] = { @@ -1163,10 +1166,10 @@ {2, arcs_54_1}, }; static arc arcs_55_0[1] = { - {128, 1}, + {129, 1}, }; static arc arcs_55_1[2] = { - {129, 0}, + {130, 0}, {0, 1}, }; static state states_55[2] = { @@ -1174,10 +1177,10 @@ {2, arcs_55_1}, }; static arc arcs_56_0[1] = { - {130, 1}, + {131, 1}, }; static arc arcs_56_1[3] = { - {131, 0}, + {132, 0}, {57, 0}, {0, 1}, }; @@ -1186,11 +1189,11 @@ {3, arcs_56_1}, }; static arc arcs_57_0[1] = { - {132, 1}, + {133, 1}, }; static arc arcs_57_1[3] = { - {133, 0}, {134, 0}, + {135, 0}, {0, 1}, }; static state states_57[2] = { @@ -1198,13 +1201,13 @@ {3, arcs_57_1}, }; static arc arcs_58_0[1] = { - {135, 1}, + {136, 1}, }; static arc arcs_58_1[5] = { {28, 0}, - {136, 0}, {137, 0}, {138, 0}, + {139, 0}, {0, 1}, }; static state states_58[2] = { @@ -1212,13 +1215,13 @@ {5, arcs_58_1}, }; static arc arcs_59_0[4] = { - {133, 1}, {134, 1}, - {139, 1}, - {140, 2}, + {135, 1}, + {140, 1}, + {141, 2}, }; static arc arcs_59_1[1] = { - {135, 2}, + {136, 2}, }; static arc arcs_59_2[1] = { {0, 2}, @@ -1229,15 +1232,15 @@ {1, arcs_59_2}, }; static arc arcs_60_0[1] = { - {141, 1}, + {142, 1}, }; static arc arcs_60_1[3] = { - {142, 1}, + {143, 1}, {29, 2}, {0, 1}, }; static arc arcs_60_2[1] = { - {135, 3}, + {136, 3}, }; static arc arcs_60_3[1] = { {0, 3}, @@ -1250,47 +1253,47 @@ }; static arc arcs_61_0[7] = { {13, 1}, - {144, 2}, - {147, 3}, - {150, 4}, + {145, 2}, + {148, 3}, + {151, 4}, {19, 5}, - {152, 5}, - {153, 6}, + {153, 5}, + {154, 6}, }; static arc arcs_61_1[3] = { {43, 7}, - {143, 7}, + {144, 7}, {15, 5}, }; static arc arcs_61_2[2] = { - {145, 8}, - {146, 5}, + {146, 8}, + {147, 5}, }; static arc arcs_61_3[2] = { - {148, 9}, - {149, 5}, + {149, 9}, + {150, 5}, }; static arc arcs_61_4[1] = { - {151, 10}, + {152, 10}, }; static arc arcs_61_5[1] = { {0, 5}, }; static arc arcs_61_6[2] = { - {153, 6}, + {154, 6}, {0, 6}, }; static arc arcs_61_7[1] = { {15, 5}, }; static arc arcs_61_8[1] = { - {146, 5}, + {147, 5}, }; static arc arcs_61_9[1] = { - {149, 5}, + {150, 5}, }; static arc arcs_61_10[1] = { - {150, 5}, + {151, 5}, }; static state states_61[11] = { {7, arcs_61_0}, @@ -1309,7 +1312,7 @@ {26, 1}, }; static arc arcs_62_1[3] = { - {154, 2}, + {155, 2}, {27, 3}, {0, 1}, }; @@ -1335,7 +1338,7 @@ {26, 1}, }; static arc arcs_63_1[3] = { - {155, 2}, + {156, 2}, {27, 3}, {0, 1}, }; @@ -1358,7 +1361,7 @@ {2, arcs_63_4}, }; static arc arcs_64_0[1] = { - {107, 1}, + {108, 1}, }; static arc arcs_64_1[2] = { {23, 2}, @@ -1382,7 +1385,7 @@ }; static arc arcs_65_0[3] = { {13, 1}, - {144, 2}, + {145, 2}, {75, 3}, }; static arc arcs_65_1[2] = { @@ -1390,7 +1393,7 @@ {15, 5}, }; static arc arcs_65_2[1] = { - {156, 6}, + {157, 6}, }; static arc arcs_65_3[1] = { {19, 5}, @@ -1402,7 +1405,7 @@ {0, 5}, }; static arc arcs_65_6[1] = { - {146, 5}, + {147, 5}, }; static state states_65[7] = { {3, arcs_65_0}, @@ -1414,14 +1417,14 @@ {1, arcs_65_6}, }; static arc arcs_66_0[1] = { - {157, 1}, + {158, 1}, }; static arc arcs_66_1[2] = { {27, 2}, {0, 1}, }; static arc arcs_66_2[2] = { - {157, 1}, + {158, 1}, {0, 2}, }; static state states_66[3] = { @@ -1443,14 +1446,14 @@ }; static arc arcs_67_3[3] = { {26, 5}, - {158, 6}, + {159, 6}, {0, 3}, }; static arc arcs_67_4[1] = { {75, 6}, }; static arc arcs_67_5[2] = { - {158, 6}, + {159, 6}, {0, 5}, }; static arc arcs_67_6[1] = { @@ -1481,14 +1484,14 @@ {1, arcs_68_2}, }; static arc arcs_69_0[1] = { - {81, 1}, + {82, 1}, }; static arc arcs_69_1[2] = { {27, 2}, {0, 1}, }; static arc arcs_69_2[2] = { - {81, 1}, + {82, 1}, {0, 2}, }; static state states_69[3] = { @@ -1537,7 +1540,7 @@ {2, arcs_71_4}, }; static arc arcs_72_0[1] = { - {159, 1}, + {160, 1}, }; static arc arcs_72_1[1] = { {19, 2}, @@ -1573,7 +1576,7 @@ {1, arcs_72_7}, }; static arc arcs_73_0[3] = { - {160, 1}, + {161, 1}, {28, 2}, {29, 3}, }; @@ -1588,7 +1591,7 @@ {26, 6}, }; static arc arcs_73_4[4] = { - {160, 1}, + {161, 1}, {28, 2}, {29, 3}, {0, 4}, @@ -1617,7 +1620,7 @@ {26, 1}, }; static arc arcs_74_1[3] = { - {155, 2}, + {156, 2}, {25, 3}, {0, 1}, }; @@ -1634,8 +1637,8 @@ {1, arcs_74_3}, }; static arc arcs_75_0[2] = { - {154, 1}, - {162, 1}, + {155, 1}, + {163, 1}, }; static arc arcs_75_1[1] = { {0, 1}, @@ -1645,19 +1648,19 @@ {1, arcs_75_1}, }; static arc arcs_76_0[1] = { - {94, 1}, + {95, 1}, }; static arc arcs_76_1[1] = { {59, 2}, }; static arc arcs_76_2[1] = { - {82, 3}, + {83, 3}, }; static arc arcs_76_3[1] = { - {103, 4}, + {104, 4}, }; static arc arcs_76_4[2] = { - {161, 5}, + {162, 5}, {0, 4}, }; static arc arcs_76_5[1] = { @@ -1672,13 +1675,13 @@ {1, arcs_76_5}, }; static arc arcs_77_0[1] = { - {90, 1}, + {91, 1}, }; static arc arcs_77_1[1] = { {26, 2}, }; static arc arcs_77_2[2] = { - {161, 3}, + {162, 3}, {0, 2}, }; static arc arcs_77_3[1] = { @@ -1691,8 +1694,8 @@ {1, arcs_77_3}, }; static arc arcs_78_0[2] = { - {155, 1}, - {164, 1}, + {156, 1}, + {165, 1}, }; static arc arcs_78_1[1] = { {0, 1}, @@ -1702,19 +1705,19 @@ {1, arcs_78_1}, }; static arc arcs_79_0[1] = { - {94, 1}, + {95, 1}, }; static arc arcs_79_1[1] = { {59, 2}, }; static arc arcs_79_2[1] = { - {82, 3}, + {83, 3}, }; static arc arcs_79_3[1] = { - {105, 4}, + {106, 4}, }; static arc arcs_79_4[2] = { - {163, 5}, + {164, 5}, {0, 4}, }; static arc arcs_79_5[1] = { @@ -1729,13 +1732,13 @@ {1, arcs_79_5}, }; static arc arcs_80_0[1] = { - {90, 1}, + {91, 1}, }; static arc arcs_80_1[1] = { {26, 2}, }; static arc arcs_80_2[2] = { - {163, 3}, + {164, 3}, {0, 2}, }; static arc arcs_80_3[1] = { @@ -1769,7 +1772,7 @@ {1, arcs_82_1}, }; static arc arcs_83_0[1] = { - {166, 1}, + {167, 1}, }; static arc arcs_83_1[2] = { {9, 2}, @@ -1785,11 +1788,11 @@ }; static dfa dfas[84] = { {256, "single_input", 0, 3, states_0, - "\004\050\014\000\000\000\000\025\074\205\011\344\004\010\002\000\140\010\111\203\100"}, + "\004\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\300\020\222\006\201"}, {257, "file_input", 0, 2, states_1, - "\204\050\014\000\000\000\000\025\074\205\011\344\004\010\002\000\140\010\111\203\100"}, + "\204\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\300\020\222\006\201"}, {258, "eval_input", 0, 3, states_2, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {259, "decorator", 0, 7, states_3, "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {260, "decorators", 0, 2, states_4, @@ -1805,13 +1808,13 @@ {265, "fplist", 0, 3, states_9, "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {266, "stmt", 0, 2, states_10, - "\000\050\014\000\000\000\000\025\074\205\011\344\004\010\002\000\140\010\111\203\100"}, + "\000\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\300\020\222\006\201"}, {267, "simple_stmt", 0, 4, states_11, - "\000\040\010\000\000\000\000\025\074\205\011\000\000\010\002\000\140\010\111\003\100"}, + "\000\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\300\020\222\006\200"}, {268, "small_stmt", 0, 2, states_12, - "\000\040\010\000\000\000\000\025\074\205\011\000\000\010\002\000\140\010\111\003\100"}, + "\000\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\300\020\222\006\200"}, {269, "expr_stmt", 0, 6, states_13, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {270, "augassign", 0, 2, states_14, "\000\000\000\000\000\360\377\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {271, "print_stmt", 0, 9, states_15, @@ -1821,7 +1824,7 @@ {273, "pass_stmt", 0, 2, states_17, "\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {274, "flow_stmt", 0, 2, states_18, - "\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\100"}, + "\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\200"}, {275, "break_stmt", 0, 2, states_19, "\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"}, {276, "continue_stmt", 0, 2, states_20, @@ -1829,7 +1832,7 @@ {277, "return_stmt", 0, 3, states_21, "\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"}, {278, "yield_stmt", 0, 2, states_22, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200"}, {279, "raise_stmt", 0, 7, states_23, "\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"}, {280, "import_stmt", 0, 2, states_24, @@ -1849,111 +1852,111 @@ {287, "dotted_name", 0, 2, states_31, "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {288, "global_stmt", 0, 3, states_32, - "\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000"}, - {289, "exec_stmt", 0, 7, states_33, "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000"}, + {289, "exec_stmt", 0, 7, states_33, + "\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"}, {290, "assert_stmt", 0, 5, states_34, - "\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"}, {291, "compound_stmt", 0, 2, states_35, - "\000\010\004\000\000\000\000\000\000\000\000\344\004\000\000\000\000\000\000\200\000"}, + "\000\010\004\000\000\000\000\000\000\000\000\310\011\000\000\000\000\000\000\000\001"}, {292, "if_stmt", 0, 8, states_36, - "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"}, {293, "while_stmt", 0, 8, states_37, - "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"}, - {294, "for_stmt", 0, 10, states_38, "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"}, - {295, "try_stmt", 0, 13, states_39, + {294, "for_stmt", 0, 10, states_38, "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"}, + {295, "try_stmt", 0, 13, states_39, + "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000"}, {296, "with_stmt", 0, 6, states_40, - "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000"}, {297, "with_var", 0, 3, states_41, - "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, + "\000\000\010\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000"}, {298, "except_clause", 0, 5, states_42, - "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"}, {299, "suite", 0, 5, states_43, - "\004\040\010\000\000\000\000\025\074\205\011\000\000\010\002\000\140\010\111\003\100"}, + "\004\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\300\020\222\006\200"}, {300, "testlist_safe", 0, 5, states_44, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {301, "old_test", 0, 2, states_45, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {302, "old_lambdef", 0, 5, states_46, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"}, {303, "test", 0, 6, states_47, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {304, "or_test", 0, 2, states_48, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\004\000\300\020\222\006\000"}, {305, "and_test", 0, 2, states_49, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\004\000\300\020\222\006\000"}, {306, "not_test", 0, 3, states_50, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\004\000\300\020\222\006\000"}, {307, "comparison", 0, 2, states_51, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {308, "comp_op", 0, 4, states_52, - "\000\000\000\000\000\000\000\000\000\000\004\000\000\000\362\017\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\010\000\000\000\344\037\000\000\000\000\000"}, {309, "expr", 0, 2, states_53, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {310, "xor_expr", 0, 2, states_54, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {311, "and_expr", 0, 2, states_55, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {312, "shift_expr", 0, 2, states_56, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {313, "arith_expr", 0, 2, states_57, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {314, "term", 0, 2, states_58, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {315, "factor", 0, 3, states_59, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {316, "power", 0, 4, states_60, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\222\006\000"}, {317, "atom", 0, 11, states_61, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\222\006\000"}, {318, "listmaker", 0, 5, states_62, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {319, "testlist_gexp", 0, 5, states_63, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {320, "lambdef", 0, 5, states_64, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"}, {321, "trailer", 0, 7, states_65, - "\000\040\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\001\000\000"}, + "\000\040\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\002\000\000"}, {322, "subscriptlist", 0, 3, states_66, - "\000\040\050\000\000\000\000\000\000\010\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\050\000\000\000\000\000\000\010\000\000\000\020\004\000\300\020\222\006\000"}, {323, "subscript", 0, 7, states_67, - "\000\040\050\000\000\000\000\000\000\010\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\050\000\000\000\000\000\000\010\000\000\000\020\004\000\300\020\222\006\000"}, {324, "sliceop", 0, 3, states_68, "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {325, "exprlist", 0, 3, states_69, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\300\020\222\006\000"}, {326, "testlist", 0, 3, states_70, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {327, "dictmaker", 0, 5, states_71, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {328, "classdef", 0, 8, states_72, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"}, {329, "arglist", 0, 8, states_73, - "\000\040\010\060\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\060\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {330, "argument", 0, 4, states_74, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {331, "list_iter", 0, 2, states_75, - "\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\210\000\000\000\000\000\000\000\000\000"}, {332, "list_for", 0, 6, states_76, - "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"}, {333, "list_if", 0, 4, states_77, - "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"}, {334, "gen_iter", 0, 2, states_78, - "\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\210\000\000\000\000\000\000\000\000\000"}, {335, "gen_for", 0, 6, states_79, - "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"}, {336, "gen_if", 0, 4, states_80, - "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"}, + "\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"}, {337, "testlist1", 0, 2, states_81, - "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"}, + "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\300\020\222\006\000"}, {338, "encoding_decl", 0, 2, states_82, "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, {339, "yield_expr", 0, 3, states_83, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"}, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200"}, }; -static label labels[167] = { +static label labels[168] = { {0, "EMPTY"}, {256, 0}, {4, 0}, @@ -2032,6 +2035,7 @@ {23, 0}, {285, 0}, {283, 0}, + {1, "as"}, {284, 0}, {1, "global"}, {1, "exec"}, @@ -2125,6 +2129,6 @@ grammar _PyParser_Grammar = { 84, dfas, - {167, labels}, + {168, labels}, 256 };

1 0

r42693 - python/trunk/Parser/tokenizer.c
by martin.v.loewis Feb. 28, 2006

Feb. 28, 2006

Author: martin.v.loewis Date: Tue Feb 28 23:41:29 2006 New Revision: 42693 Modified: python/trunk/Parser/tokenizer.c Log: Change non-ASCII warning into a SyntaxError. Modified: python/trunk/Parser/tokenizer.c ============================================================================== --- python/trunk/Parser/tokenizer.c (original) +++ python/trunk/Parser/tokenizer.c Tue Feb 28 23:41:29 2006 @@ -127,7 +127,6 @@ tok->decoding_state = 0; tok->decoding_erred = 0; tok->read_coding_spec = 0; - tok->issued_encoding_warning = 0; tok->encoding = NULL; tok->cont_line = 0; #ifndef PGEN @@ -462,7 +461,7 @@ decoding_fgets(char *s, int size, struct tok_state *tok) { char *line = NULL; - int warn = 0, badchar = 0; + int badchar = 0; for (;;) { if (tok->decoding_state < 0) { /* We already have a codec associated with @@ -473,7 +472,6 @@ /* We want a 'raw' read. */ line = Py_UniversalNewlineFgets(s, size, tok->fp, NULL); - warn = 1; break; } else { /* We have not yet determined the encoding. @@ -490,7 +488,9 @@ } } #ifndef PGEN - if (warn && line && !tok->issued_encoding_warning && !tok->encoding) { + /* The default encoding is ASCII, so make sure we don't have any + non-ASCII bytes in it. */ + if (line && !tok->encoding) { unsigned char *c; for (c = (unsigned char *)line; *c; c++) if (*c > 127) { @@ -508,12 +508,8 @@ "but no encoding declared; " "see http://www.python.org/peps/pep-0263.html for details", badchar, tok->filename, tok->lineno + 1); - /* We don't use PyErr_WarnExplicit() here because - printing the line in question to e.g. a log file - could result in sensitive information being - exposed. */ - PyErr_Warn(PyExc_DeprecationWarning, buf); - tok->issued_encoding_warning = 1; + PyErr_SetString(PyExc_SyntaxError, buf); + return error_ret(tok); } #endif return line;

1 0