From 75394aa5bb0ca3fbf3a8cbff2fa40252b87b4c56 Mon Sep 17 00:00:00 2001 From: Serge Guelton Date: Mon, 3 Dec 2018 12:41:35 +0000 Subject: Portable Python script across Python version Python3 does not support type destructuring in function parameters. Differential Revision: https://reviews.llvm.org/D55198 llvm-svn: 348129 --- clang/utils/ABITest/Enumeration.py | 3 ++- clang/utils/ABITest/TypeGen.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/utils/ABITest/Enumeration.py b/clang/utils/ABITest/Enumeration.py index eb53e1784ef..01830a38cdf 100644 --- a/clang/utils/ABITest/Enumeration.py +++ b/clang/utils/ABITest/Enumeration.py @@ -46,7 +46,8 @@ aleph0 = Aleph0() def base(line): return line*(line+1)//2 -def pairToN((x,y)): +def pairToN(pair): + x,y = pair line,index = x+y,y return base(line)+index diff --git a/clang/utils/ABITest/TypeGen.py b/clang/utils/ABITest/TypeGen.py index 0768bb77ee3..8330340cd3d 100644 --- a/clang/utils/ABITest/TypeGen.py +++ b/clang/utils/ABITest/TypeGen.py @@ -99,7 +99,8 @@ class RecordType(Type): ' '.join(map(getField, self.fields))) def getTypedefDef(self, name, printer): - def getField((i, t)): + def getField(it): + i, t = it if t.isBitField(): if t.isPaddingBitField(): return '%s : 0;'%(printer.getTypeName(t),) -- cgit v1.2.3