Fix quasiquote terminology to be consistent with Scheme

1. Rename cardinality into rank. Shorter word, easier to
   understand, more appropriate in our context.

2. Previously we called any dollar substitution splicing
   but this is not consistent with Scheme where splicing
   is substitution with non-zero rank.

   So now $foo is unquoting and ..$foo and ...$foo is
   unquote splicing or just splicing. Correspondingly
   splicee becomes unquotee.

3. Rename si7980 test into t7980

1 files changed, 8 insertions, 8 deletions

diff --git a/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala b/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala
index fffaf1b363..7ed95fa984 100644
--- a/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala
@@ -2,35 +2,35 @@ import org.scalacheck._, Prop._, Gen._, Arbitrary._
 import scala.reflect.runtime.universe._, Flag._
 
 object PatternConstructionProps extends QuasiquoteProperties("pattern construction") {
-  property("splice bind") = forAll { (bind: Bind) =>
+  property("unquote bind") = forAll { (bind: Bind) =>
     pq"$bind" ≈ bind
   }
 
-  property("splice name into bind") = forAll { (name: TermName) =>
+  property("unquote name into bind") = forAll { (name: TermName) =>
     pq"$name" ≈ Bind(name, Ident(termNames.WILDCARD))
   }
 
-  property("splice name and tree into bind") = forAll { (name: TermName, tree: Tree) =>
+  property("unquote name and tree into bind") = forAll { (name: TermName, tree: Tree) =>
     pq"$name @ $tree" ≈ Bind(name, tree)
   }
 
-  property("splice type name into typed") = forAll { (name: TypeName) =>
+  property("unquote type name into typed") = forAll { (name: TypeName) =>
     pq"_ : $name" ≈ Typed(Ident(termNames.WILDCARD), Ident(name))
   }
 
-  property("splice tree into typed") = forAll { (typ: Tree) =>
+  property("unquote tree into typed") = forAll { (typ: Tree) =>
     pq"_ : $typ" ≈ Typed(Ident(termNames.WILDCARD), typ)
   }
 
-  property("splice into apply") = forAll { (pat: Tree, subpat: Tree) =>
+  property("unquote into apply") = forAll { (pat: Tree, subpat: Tree) =>
     pq"$pat($subpat)" ≈ Apply(pat, List(subpat))
   }
 
-  property("splice into casedef") = forAll { (pat: Tree, cond: Tree, body: Tree) =>
+  property("unquote into casedef") = forAll { (pat: Tree, cond: Tree, body: Tree) =>
     cq"$pat if $cond => $body" ≈ CaseDef(pat, cond, body)
   }
 
-  property("splice into alternative") = forAll { (first: Tree, rest: List[Tree]) =>
+  property("unquote into alternative") = forAll { (first: Tree, rest: List[Tree]) =>
     pq"$first | ..$rest" ≈ Alternative(first :: rest)
   }
 }