Merge pull request #73 from izgzhen/separate

support code-gen for TTuple construction

cozy/codegen/cxx.py

@@ -274,6 +274,14 @@ def construct_concrete(self, t : Type, e : Exp, out : Exp):
             return SEscape("{indent}{lhs} = {rhs};\n", ["lhs", "rhs"], [out, e])
         elif is_scalar(t):
             return SEscape("{indent}{lhs} = {rhs};\n", ["lhs", "rhs"], [out, e])
+        elif isinstance(t, TTuple):
+            x = self.fv(t, "x")
+            indices = range(len(t.ts))
+            return SSeq(
+                SEscape("{indent}{rv} = {rhs};\n", ["rv", "rhs"], [x, e]),
+                SEscape("{indent}{lhs} = {rv};\n", ["lhs", "rv"],
+                        [out, ETuple([ETupleGet(x, i).with_type(t.ts[i]) for i in indices]).with_type(t)]),
+            )
         else:
             h = extension_handler(type(t))
             if h is not None:

cozy/synthesis/core.py

@@ -603,7 +603,7 @@ def possibly_useful_nonrecursive(solver, e : Exp, context : Context, pool = RUNT
     if not allow_int_arithmetic_state.value and not at_runtime and isinstance(e, EBinOp) and e.type == INT:
         return No("integer arithmetic in state position")
     if is_collection(e.type) and not is_scalar(e.type.elem_type):
-        return No("collection of nonscalar")
+        return No("collection of nonscalar: e {}\n elem_type: {}\n".format(e, e.type.elem_type))
     if isinstance(e.type, TMap) and not is_scalar(e.type.k):
         return No("bad key type {}".format(pprint(e.type.k)))
     if isinstance(e.type, TMap) and isinstance(e.type.v, TMap):

examples/nonscalar-tuple.ds

@@ -0,0 +1,12 @@
+Example:
+  type Member = {
+    id : Int,
+    name: String
+  }
+  handletype Clz = {
+    id : Int,
+    members : Bag<Member>
+  }
+  state classes : Bag<Clz>
+  query selectClzMembers()
+    [ (c, [ m.id | m <- c.val.members, m.id > 10 ]) | c <- classes ]