From 4ad10642e9dacfb50c6c0ac0faaf7e5839bdffb5 Mon Sep 17 00:00:00 2001
From: Den Shabalin <den.shabalin@gmail.com>
Date: Thu, 5 Sep 2013 13:40:09 +0200
Subject: rename TupleN and TupleTypeN into SyntacticTuple and
 SyntacticTupleType

---
 src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala | 8 ++++----
 src/reflect/scala/reflect/api/BuildUtils.scala              | 6 +++---
 src/reflect/scala/reflect/internal/BuildUtils.scala         | 4 ++--
 src/reflect/scala/reflect/internal/StdNames.scala           | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala b/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala
index cb84b5d8c7..2e134ddd34 100644
--- a/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala
+++ b/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala
@@ -100,20 +100,20 @@ trait Reifiers { self: Quasiquotes =>
     def reifyTuple(args: List[Tree]) = args match {
       case Nil => reify(Literal(Constant(())))
       case List(hole @ Placeholder(_, _, NoDot)) => reify(hole)
-      case List(Placeholder(_, _, _)) => reifyBuildCall(nme.TupleN, args)
+      case List(Placeholder(_, _, _)) => reifyBuildCall(nme.SyntacticTuple, args)
       // in a case we only have one element tuple without
       // any cardinality annotations this means that this is
       // just an expression wrapped in parentheses
       case List(other) => reify(other)
-      case _ => reifyBuildCall(nme.TupleN, args)
+      case _ => reifyBuildCall(nme.SyntacticTuple, args)
     }
 
     def reifyTupleType(args: List[Tree]) = args match {
       case Nil => reify(Select(Ident(nme.scala_), tpnme.Unit))
       case List(hole @ Placeholder(_, _, NoDot)) => reify(hole)
-      case List(Placeholder(_, _, _)) => reifyBuildCall(nme.TupleTypeN, args)
+      case List(Placeholder(_, _, _)) => reifyBuildCall(nme.SyntacticTupleType, args)
       case List(other) => reify(other)
-      case _ => reifyBuildCall(nme.TupleTypeN, args)
+      case _ => reifyBuildCall(nme.SyntacticTupleType, args)
     }
 
     def reifyFunctionType(argtpes: List[Tree], restpe: Tree) =
diff --git a/src/reflect/scala/reflect/api/BuildUtils.scala b/src/reflect/scala/reflect/api/BuildUtils.scala
index 7b3e287da7..b80159d051 100644
--- a/src/reflect/scala/reflect/api/BuildUtils.scala
+++ b/src/reflect/scala/reflect/api/BuildUtils.scala
@@ -139,10 +139,10 @@ private[reflect] trait BuildUtils { self: Universe =>
       def unapply(tree: Tree): Option[(Modifiers, TermName, List[Tree], List[Tree], ValDef, List[Tree])]
     }
 
-    val TupleN: TupleNExtractor
-    val TupleTypeN: TupleNExtractor
+    val SyntacticTuple: SyntacticTupleExtractor
+    val SyntacticTupleType: SyntacticTupleExtractor
 
-    trait TupleNExtractor {
+    trait SyntacticTupleExtractor {
       def apply(args: List[Tree]): Tree
       def unapply(tree: Tree): Option[List[Tree]]
     }
diff --git a/src/reflect/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala
index eaa4f7cba8..0cbad0d641 100644
--- a/src/reflect/scala/reflect/internal/BuildUtils.scala
+++ b/src/reflect/scala/reflect/internal/BuildUtils.scala
@@ -255,7 +255,7 @@ trait BuildUtils { self: SymbolTable =>
       }
     }
 
-    object TupleN extends TupleNExtractor {
+    object SyntacticTuple extends SyntacticTupleExtractor {
       def apply(args: List[Tree]): Tree = args match {
         case Nil      => Literal(Constant(()))
         case _        =>
@@ -277,7 +277,7 @@ trait BuildUtils { self: SymbolTable =>
       }
     }
 
-    object TupleTypeN extends TupleNExtractor {
+    object SyntacticTupleType extends SyntacticTupleExtractor {
       def apply(args: List[Tree]): Tree = args match {
         case Nil => self.Select(self.Ident(nme.scala_), tpnme.Unit)
         case _   =>
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala
index 9ae86059f1..e52f3140c3 100644
--- a/src/reflect/scala/reflect/internal/StdNames.scala
+++ b/src/reflect/scala/reflect/internal/StdNames.scala
@@ -597,13 +597,13 @@ trait StdNames {
     val SyntacticModuleDef: NameType   = "SyntacticModuleDef"
     val SyntacticNew: NameType         = "SyntacticNew"
     val SyntacticTraitDef: NameType    = "SyntacticTraitDef"
+    val SyntacticTuple: NameType       = "SyntacticTuple"
+    val SyntacticTupleType: NameType   = "SyntacticTupleType"
     val SyntacticTypeApplied: NameType = "SyntacticTypeApplied"
     val This: NameType                 = "This"
     val ThisType: NameType             = "ThisType"
     val True : NameType                = "True"
     val Tuple2: NameType               = "Tuple2"
-    val TupleN: NameType               = "TupleN"
-    val TupleTypeN: NameType           = "TupleTypeN"
     val TYPE_ : NameType               = "TYPE"
     val TypeRef: NameType              = "TypeRef"
     val TypeTree: NameType             = "TypeTree"
-- 
cgit v1.2.3