Merge pull request #85 from afernandez90/develop

C codegen extended support for recursive lambda expressions

Author: TiarkRompf

src/common/Functions.scala

@@ -349,10 +349,13 @@ trait CGenFunctions extends CGenEffect with BaseGenFunctions {
   // Case for functions with a single argument (therefore, not tupled)
   override def emitNode(sym: Sym[Any], rhs: Def[Any]) = rhs match {
     case e@Lambda(fun, x, y) =>
-      stream.println("auto "+quote(sym)+" = [&]("+remap(x.tp)+" "+quote(x)+") {")
+      val retType = remap(getBlockResult(y).tp)
+      stream.println("function<"+retType+"("+
+    		  remap(x.tp)+")> "+quote(sym)+
+    		  " = [&]("+remap(x.tp)+" "+quote(x)+") {")
       emitBlock(y)
       val z = getBlockResult(y)
-      if (remap(z.tp) != "void")
+      if (retType != "void")
         stream.println("return " + quote(z) + ";")
       stream.println("};")
     case Apply(fun, arg) =>
@@ -374,10 +377,13 @@ trait CGenTupledFunctions extends CGenFunctions with GenericGenUnboxedTupleAcces
 
   override def emitNode(sym: Sym[Any], rhs: Def[Any]) = rhs match {
     case Lambda(fun, UnboxedTuple(xs), y) =>
-      stream.println("auto "+quote(sym)+" = [&]("+xs.map(s=>remap(s.tp)+" "+quote(s)).mkString(",")+") {")
+      val retType = remap(getBlockResult(y).tp)
+      stream.println("function<"+retType+"("+
+    		  xs.map(s=>remap(s.tp)).mkString(",")+")> "+quote(sym)+
+    		  " = [&]("+xs.map(s=>remap(s.tp)+" "+quote(s)).mkString(",")+") {")
       emitBlock(y)
       val z = getBlockResult(y)
-      if (remap(z.tp) != "void")
+      if (retType != "void")
         stream.println("return " + quote(z) + ";")
       stream.println("};")
     case Apply(fun, UnboxedTuple(args)) =>

test-out/epfl/test14-cgen2.check

@@ -8,7 +8,7 @@ int32_t main(int32_t);
 #include <string.h>
 #include <stdbool.h>
 int32_t main(int32_t  x0) {
-auto x1 = [&](int32_t x2,int32_t x3) {
+function<int32_t(int32_t,int32_t)> x1 = [&](int32_t x2,int32_t x3) {
 int32_t x4 = x2;
 bool x6 = x4 == 0;
 int32_t x12;