*** empty log message ***

2 files changed, 39 insertions, 2 deletions

diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java
index 608db61eae..48f1edf66a 100644
--- a/sources/scalac/transformer/LambdaLift.java
+++ b/sources/scalac/transformer/LambdaLift.java
@@ -380,6 +380,11 @@ public class LambdaLift extends OwnerTransformer
 	    }
 	    return copy.ValDef(tree, mods, name1, tpe1, rhs1);
 
+	case Tuple(Tree[] args):
+	    Tree tree1 = mkList(tree.pos, tree.type, transform(args));
+	    //new scalac.ast.printer.TextTreePrinter().print("TUPLE: ").print(tree).print("\n ==> \n").print(tree1).println().end();//DEBUG
+	    return tree1;
+
 	case Apply(Tree fn, Tree[] args):
 	    Symbol fsym = TreeInfo.methSymbol(fn);
 	    Tree fn1 = transform(fn);
@@ -535,4 +540,36 @@ public class LambdaLift extends OwnerTransformer
 	    return args;
 	}
     }
+
+    Tree mkList(int pos, Type tpe, Tree[] args) {
+	return mkList(pos, tpe.typeArgs()[0], args, 0);
+    }
+
+    Tree mkList(int pos, Type elemtpe, Tree[] args, int start) {
+	if (start == args.length) return mkNil(pos, elemtpe);
+	else return mkCons(pos, elemtpe, args[start],
+			   mkList(pos, elemtpe, args, start + 1));
+    }
+
+    Tree mkNil(int pos, Type elemtpe) {
+	return gen.New(
+	    gen.Apply(
+		gen.TypeApply(
+		    gen.mkRef(
+			pos,
+			global.definitions.getClass(Names.scala_Nil).constructor()),
+		    new Tree[]{gen.mkType(pos, elemtpe)}),
+		new Tree[]{}));
+    }
+
+    Tree mkCons(int pos, Type elemtpe, Tree hd, Tree tl) {
+	return gen.New(
+	    gen.Apply(
+		gen.TypeApply(
+		    gen.mkRef(
+			pos,
+			global.definitions.getClass(Names.scala_COLONCOLON).constructor()),
+		    new Tree[]{gen.mkType(pos, elemtpe)}),
+		new Tree[]{hd, tl}));
+    }
 }
diff --git a/sources/scalac/transformer/UnCurry.java b/sources/scalac/transformer/UnCurry.java
index 9647b43852..427c7a0efd 100644
--- a/sources/scalac/transformer/UnCurry.java
+++ b/sources/scalac/transformer/UnCurry.java
@@ -146,10 +146,10 @@ public class UnCurry extends OwnerTransformer
     private Tree[] transformArgs(int pos, Tree[] args, Type methtype) {
 	switch (methtype) {
 	case MethodType(Symbol[] params, _):
+	    Tree[] args0 = args;//debug
 	    if (params.length == 1 && (params[0].flags & REPEATED) != 0) {
 		assert (args.length != 1 || !(args[0] instanceof Tree.Tuple));
-		args = new Tree[]{
-		    make.Tuple(pos, args).setType(params[0].type())};
+		args = new Tree[]{make.Tuple(pos, args).setType(params[0].type())};
 	    }
 	    Tree[] args1 = args;
 	    for (int i = 0; i < args.length; i++) {