From 2ce27b223bfa121351dd885acae0e54292926041 Mon Sep 17 00:00:00 2001 From: Jeremy Hylton Date: Wed, 16 Feb 2000 00:50:29 +0000 Subject: fix argcount generation for arg lists containing tuple unpacks this is sort of a hack --- Lib/compiler/pyassem.py | 15 +++++++++++++-- Tools/compiler/compiler/pyassem.py | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Lib/compiler/pyassem.py b/Lib/compiler/pyassem.py index 2200dec..5ae7294 100644 --- a/Lib/compiler/pyassem.py +++ b/Lib/compiler/pyassem.py @@ -53,7 +53,7 @@ class PyAssembler: # XXX why is the default value for flags 3? self.insts = [] # used by makeCodeObject - self.argcount = len(args) + self._getArgCount(args) self.code = '' self.consts = [docstring] self.filename = filename @@ -67,6 +67,16 @@ class PyAssembler: self.last_addr = 0 self.lnotab = '' + def _getArgCount(self, args): + if args and args[0][0] == '.': + for i in range(len(args)): + if args[i][0] == '.': + num = i + self.argcount = num + 1 + else: + self.argcount = len(args) + + def __repr__(self): return "" % len(self.insts) @@ -231,7 +241,8 @@ class PyAssembler: return arg nameOps = ('STORE_NAME', 'IMPORT_NAME', 'IMPORT_FROM', - 'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME') + 'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME', + 'DELETE_ATTR') localOps = ('LOAD_FAST', 'STORE_FAST', 'DELETE_FAST') globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL') diff --git a/Tools/compiler/compiler/pyassem.py b/Tools/compiler/compiler/pyassem.py index 2200dec..5ae7294 100644 --- a/Tools/compiler/compiler/pyassem.py +++ b/Tools/compiler/compiler/pyassem.py @@ -53,7 +53,7 @@ class PyAssembler: # XXX why is the default value for flags 3? self.insts = [] # used by makeCodeObject - self.argcount = len(args) + self._getArgCount(args) self.code = '' self.consts = [docstring] self.filename = filename @@ -67,6 +67,16 @@ class PyAssembler: self.last_addr = 0 self.lnotab = '' + def _getArgCount(self, args): + if args and args[0][0] == '.': + for i in range(len(args)): + if args[i][0] == '.': + num = i + self.argcount = num + 1 + else: + self.argcount = len(args) + + def __repr__(self): return "" % len(self.insts) @@ -231,7 +241,8 @@ class PyAssembler: return arg nameOps = ('STORE_NAME', 'IMPORT_NAME', 'IMPORT_FROM', - 'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME') + 'STORE_ATTR', 'LOAD_ATTR', 'LOAD_NAME', 'DELETE_NAME', + 'DELETE_ATTR') localOps = ('LOAD_FAST', 'STORE_FAST', 'DELETE_FAST') globalOps = ('LOAD_GLOBAL', 'STORE_GLOBAL', 'DELETE_GLOBAL') -- cgit v0.12