Re: [PATCH master 12/52] Add support for tuples in convert-constants

2012-01-11 Thread René Nussbaumer 
On Mon, Jan 9, 2012 at 11:58, Iustin Pop ius...@google.com wrote:
 ---
  autotools/convert-constants |   11 +++
  1 files changed, 11 insertions(+), 0 deletions(-)

LGTM.

René

[PATCH master 12/52] Add support for tuples in convert-constants

2012-01-09 Thread Iustin Pop 
---
 autotools/convert-constants |   11 +++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/autotools/convert-constants b/autotools/convert-constants
index d1744ea..0bb1c64 100755
--- a/autotools/convert-constants
+++ b/autotools/convert-constants
@@ -25,6 +25,7 @@
 import re
 
 from ganeti import constants
+from ganeti import compat
 
 CONSTANT_RE = re.compile(^[A-Z][A-Z0-9_-]+$)
 
@@ -98,6 +99,16 @@ def ConvertVariable(name, value):
   lines.append(-- Following lines come from dictionary %s % name)
   for k in sorted(value.keys()):
 lines.extend(ConvertVariable(DictKeyName(name, k), value[k]))
+  elif isinstance(value, tuple):
+tvs = [HaskellTypeVal(elem) for elem in value]
+if compat.all(e is not None for e in tvs):
+  ttypes = , .join(e[0] for e in tvs)
+  tvals = , .join(e[1] for e in tvs)
+  lines.append(-- | Converted from Python tuple %s % name)
+  lines.append(%s :: (%s) % (hs_name, ttypes))
+  lines.append(%s = (%s) % (hs_name, tvals))
+else:
+  lines.append(-- Skipped tuple %s, cannot convert all elements % name)
   else:
 lines.append(-- Skipped %s, %s not handled % (name, type(value)))
   return lines
-- 
1.7.3.1