From 1bc535dc7854b6be009a6bf3413a3a470e3fe749 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 15 May 2007 18:46:22 +0000 Subject: Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........ --- Parser/spark.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Parser/spark.py') diff --git a/Parser/spark.py b/Parser/spark.py index 7035077d53..0fc6945b5c 100644 --- a/Parser/spark.py +++ b/Parser/spark.py @@ -353,10 +353,10 @@ class GenericParser: # return self._NULLABLE == sym[0:len(self._NULLABLE)] - def skip(self, (lhs, rhs), pos=0): - n = len(rhs) + def skip(self, hs, pos=0): + n = len(hs[1]) while pos < n: - if not self.isnullable(rhs[pos]): + if not self.isnullable(hs[1][pos]): break pos = pos + 1 return pos @@ -671,7 +671,7 @@ class GenericParser: sortlist.append((len(rhs), name)) name2index[name] = i sortlist.sort() - list = map(lambda (a,b): b, sortlist) + list = [b for a, b in sortlist] return rules[name2index[self.resolve(list)]] def resolve(self, list): -- cgit v1.2.1