diff options
Diffstat (limited to 'sources/scalac/transformer')
-rw-r--r-- | sources/scalac/transformer/Erasure.java | 2 | ||||
-rw-r--r-- | sources/scalac/transformer/LambdaLift.java | 2 | ||||
-rw-r--r-- | sources/scalac/transformer/PatternMatcher.java | 4 | ||||
-rw-r--r-- | sources/scalac/transformer/UnCurry.java | 6 | ||||
-rw-r--r-- | sources/scalac/transformer/matching/PatternMatcher.java | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sources/scalac/transformer/Erasure.java b/sources/scalac/transformer/Erasure.java index 413dae1609..40e56a1580 100644 --- a/sources/scalac/transformer/Erasure.java +++ b/sources/scalac/transformer/Erasure.java @@ -465,7 +465,7 @@ public class Erasure extends Transformer implements Modifiers { case Empty: case PackageDef(_,_): case Template(_,_): - case Tuple(_): // !!! ? + case Sequence(_): // !!! ? [BE:was Tuple before] case Super(_): case This(_): case Literal(_): diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java index b7a9699e51..e6d2fc902b 100644 --- a/sources/scalac/transformer/LambdaLift.java +++ b/sources/scalac/transformer/LambdaLift.java @@ -381,7 +381,7 @@ public class LambdaLift extends OwnerTransformer } return copy.ValDef(tree, sym, tpe1, rhs1); - case Tuple(Tree[] args): + case Sequence(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; diff --git a/sources/scalac/transformer/PatternMatcher.java b/sources/scalac/transformer/PatternMatcher.java index 8d8a5922fa..d15a6d22a1 100644 --- a/sources/scalac/transformer/PatternMatcher.java +++ b/sources/scalac/transformer/PatternMatcher.java @@ -347,7 +347,7 @@ public class PatternMatcher { case Apply(_, Tree[] args): if (args.length == 1) switch (args[0]) { - case Tuple(Tree[] ts): + case Sequence(Tree[] ts): return ts; } return args; @@ -381,7 +381,7 @@ public class PatternMatcher { case Apply(Tree fn, Tree[] args): // pattern with args if (args.length == 1) switch (args[0]) { - case Tuple(Tree[] ts): + case Sequence(Tree[] ts): return makeSequencePat(tree.pos, tree.type, ts.length); } return makeConstrPat(tree.pos, getConstrType(tree.type)); diff --git a/sources/scalac/transformer/UnCurry.java b/sources/scalac/transformer/UnCurry.java index 6ac4165914..fdefeb0032 100644 --- a/sources/scalac/transformer/UnCurry.java +++ b/sources/scalac/transformer/UnCurry.java @@ -65,7 +65,7 @@ public class UnCurry extends OwnerTransformer * if argument is not a reference to a def parameter: * convert argument `e' to (expansion of) `() => e' * - for every argument list that corresponds to a repeated parameter - * (a_1, ..., a_n) => (Tuple(a_1, ..., a_n)) + * (a_1, ..., a_n) => (Sequence(a_1, ..., a_n)) */ public Tree transform(Tree tree) { //new scalac.ast.printer.TextTreePrinter().print("uncurry: ").print(tree).println().end();//DEBUG @@ -154,8 +154,8 @@ public class UnCurry extends OwnerTransformer switch (methtype) { case MethodType(Symbol[] params, _): 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())}; + assert (args.length != 1 || !(args[0] instanceof Tree.Sequence)); + args = new Tree[]{make.Sequence(pos, args).setType(params[0].type())}; } Tree[] args1 = args; for (int i = 0; i < args.length; i++) { diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java index 8d8a5922fa..d15a6d22a1 100644 --- a/sources/scalac/transformer/matching/PatternMatcher.java +++ b/sources/scalac/transformer/matching/PatternMatcher.java @@ -347,7 +347,7 @@ public class PatternMatcher { case Apply(_, Tree[] args): if (args.length == 1) switch (args[0]) { - case Tuple(Tree[] ts): + case Sequence(Tree[] ts): return ts; } return args; @@ -381,7 +381,7 @@ public class PatternMatcher { case Apply(Tree fn, Tree[] args): // pattern with args if (args.length == 1) switch (args[0]) { - case Tuple(Tree[] ts): + case Sequence(Tree[] ts): return makeSequencePat(tree.pos, tree.type, ts.length); } return makeConstrPat(tree.pos, getConstrType(tree.type)); |