From cf57f778b731492e61d5e1ebd59a68dff3976b5f Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 23 Dec 2011 10:43:50 +0100
Subject: [PATCH] Add support for lists/frozensets in convert-constants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Unfortunately, we only support lists of simple types, and not even
lists of tuples. If we actually needed those, it would be possible to
implement them, with a bit more complexity in the converter.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
autotools/convert-constants | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/autotools/convert-constants b/autotools/convert-constants
index 0bb1c64bd..89f9f007f 100755
--- a/autotools/convert-constants
+++ b/autotools/convert-constants
@@ -109,6 +109,26 @@ def ConvertVariable(name, value):
lines.append("%s = (%s)" % (hs_name, tvals))
else:
lines.append("-- Skipped tuple %s, cannot convert all elements" % name)
+ elif isinstance(value, (list, set, frozenset)):
+ # Lists and frozensets are handled the same in Haskell: as lists,
+ # since lists are immutable and we don't need for constants the
+ # high-speed of an actual Set type. However, we can only convert
+ # them if they have the same type for all elements (which is a
+ # normal expectation for constants, our code should be well
+ # behaved); note that this is different from the tuples case,
+ # where we always (for some values of always) can convert
+ tvs = [HaskellTypeVal(elem) for elem in value]
+ if compat.all(e is not None for e in tvs):
+ ttypes, tvals = zip(*tvs)
+ uniq_types = set(ttypes)
+ if len(uniq_types) == 1:
+ lines.append("-- | Converted from Python list or set %s" % name)
+ lines.append("%s :: [%s]" % (hs_name, uniq_types.pop()))
+ lines.append("%s = [%s]" % (hs_name, ", ".join(tvals)))
+ else:
+ lines.append("-- | Skipped list/set %s, is not homogeneous" % name)
+ else:
+ lines.append("-- | Skipped list/set %s, cannot convert all elems" % name)
else:
lines.append("-- Skipped %s, %s not handled" % (name, type(value)))
return lines
--
GitLab