summaryrefslogtreecommitdiff
path: root/test/files/scalacheck/quasiquotes
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2014-02-01 00:46:07 +0100
committerEugene Burmako <xeno.by@gmail.com>2014-02-15 09:23:51 +0100
commitfa8f4022754356859f3af1c4ffbac02ab3dc3e7c (patch)
tree967f7ba7625c63c7d87b0ef659afb8516c589def /test/files/scalacheck/quasiquotes
parent462d0b8b1c9de95baad773856a7e1f658ebd0956 (diff)
downloadscala-fa8f4022754356859f3af1c4ffbac02ab3dc3e7c.tar.gz
scala-fa8f4022754356859f3af1c4ffbac02ab3dc3e7c.tar.bz2
scala-fa8f4022754356859f3af1c4ffbac02ab3dc3e7c.zip
some renamings
It’s almost 1am, so I’m only scratching the surface, mechanistically applying the renames that I’ve written down in my notebook: * typeSignature => info * declarations => decls * nme/tpnme => termNames/typeNames * paramss => paramLists * allOverriddenSymbols => overrides Some explanation is in order so that I don’t get crucified :) 1) No information loss happens when abbreviating `typeSignature` and `declarations`. We already have contractions in a number of our public APIs (e.g. `typeParams`), and I think it’s fine to shorten words as long as people can understand the shortened versions without a background in scalac. 2) I agree with Simon that `nme` and `tpnme` are cryptic. I think it would be thoughtful of us to provide newcomers with better names. To offset the increase in mouthfulness, I’ve moved `MethodSymbol.isConstructor` to `Symbol.isConstructor`, which covers the most popular use case for nme’s. 3) I also agree that putting `paramss` is a lot to ask of our users. The double-“s” convention is very neat, but let’s admit that it’s just weird for the newcomers. I think `paramLists` is a good compromise here. 4) `allOverriddenSymbols` is my personal complaint. I think it’s a mouthful and a shorter name would be a much better fit for the public API.
Diffstat (limited to 'test/files/scalacheck/quasiquotes')
-rw-r--r--test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala6
-rw-r--r--test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala6
-rw-r--r--test/files/scalacheck/quasiquotes/PatternConstructionProps.scala6
-rw-r--r--test/files/scalacheck/quasiquotes/TermConstructionProps.scala2
4 files changed, 10 insertions, 10 deletions
diff --git a/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala b/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala
index 618ea5be11..0e0e70fd62 100644
--- a/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/DefinitionConstructionProps.scala
@@ -27,7 +27,7 @@ object DefinitionConstructionProps
trait ClassConstruction { self: QuasiquoteProperties =>
val anyRef = ScalaDot(TypeName("AnyRef"))
val emtpyConstructor =
- DefDef(Modifiers(), nme.CONSTRUCTOR, List(),
+ DefDef(Modifiers(), termNames.CONSTRUCTOR, List(),
List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(()))))
def classWith(name: TypeName, parents: List[Tree] = List(anyRef), body: List[DefDef] = Nil) =
ClassDef(
@@ -173,7 +173,7 @@ trait TypeDefConstruction { self: QuasiquoteProperties =>
TypeDef(
Modifiers(), T, List(),
CompoundTypeTree(
- Template(List(Ident(A), Ident(B)), ValDef(Modifiers(PRIVATE), nme.WILDCARD, TypeTree(), EmptyTree), List())))
+ Template(List(Ident(A), Ident(B)), ValDef(Modifiers(PRIVATE), termNames.WILDCARD, TypeTree(), EmptyTree), List())))
}
property("splice trees into existential type tree") = forAll {
@@ -242,7 +242,7 @@ trait MethodConstruction { self: QuasiquoteProperties =>
property("splice idents into annotation") = test {
val idents = List(Ident(TypeName("annot1")), Ident(TypeName("annot2")))
assertSameAnnots(q"@..$idents def foo",
- idents.map { ident => Apply(Select(New(ident), nme.CONSTRUCTOR), List()) })
+ idents.map { ident => Apply(Select(New(ident), termNames.CONSTRUCTOR), List()) })
}
property("splice constructor calls into annotation") = test {
diff --git a/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala b/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala
index e9337bc584..512b81c0e6 100644
--- a/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/DefinitionDeconstructionProps.scala
@@ -102,7 +102,7 @@ trait ClassDeconstruction { self: QuasiquoteProperties =>
noSelfType,
List(
//ValDef(Modifiers(PRIVATE | LOCAL | PARAMACCESSOR), TermName("x"), Ident(TypeName("Int")), EmptyTree),
- DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List(ValDef(Modifiers(PARAM | PARAMACCESSOR), TermName("x"),
+ DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List(ValDef(Modifiers(PARAM | PARAMACCESSOR), TermName("x"),
Ident(TypeName("Int")), EmptyTree))), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))))))
}
}
@@ -117,7 +117,7 @@ trait ModsDeconstruction { self: QuasiquoteProperties =>
property("@$annot def foo") = forAll { (annotName: TypeName) =>
val q"@$annot def foo" = q"@$annotName def foo"
- annot ≈ Apply(Select(New(Ident(annotName)), nme.CONSTRUCTOR), List())
+ annot ≈ Apply(Select(New(Ident(annotName)), termNames.CONSTRUCTOR), List())
}
property("@$annot(..$args) def foo") = forAll { (annotName: TypeName, tree: Tree) =>
@@ -269,6 +269,6 @@ trait ImportDeconstruction { self: QuasiquoteProperties =>
q"import $expr.{$plain, $oldname => $newname, $discard => _}"
expr1 ≈ expr && plain11 == plain12 && plain12 == plain &&
- oldname1 == oldname && newname1 == newname && discard1 == discard && wildcard == nme.WILDCARD
+ oldname1 == oldname && newname1 == newname && discard1 == discard && wildcard == termNames.WILDCARD
}
}
diff --git a/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala b/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala
index ca4c8609ac..fffaf1b363 100644
--- a/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/PatternConstructionProps.scala
@@ -7,7 +7,7 @@ object PatternConstructionProps extends QuasiquoteProperties("pattern constructi
}
property("splice name into bind") = forAll { (name: TermName) =>
- pq"$name" ≈ Bind(name, Ident(nme.WILDCARD))
+ pq"$name" ≈ Bind(name, Ident(termNames.WILDCARD))
}
property("splice name and tree into bind") = forAll { (name: TermName, tree: Tree) =>
@@ -15,11 +15,11 @@ object PatternConstructionProps extends QuasiquoteProperties("pattern constructi
}
property("splice type name into typed") = forAll { (name: TypeName) =>
- pq"_ : $name" ≈ Typed(Ident(nme.WILDCARD), Ident(name))
+ pq"_ : $name" ≈ Typed(Ident(termNames.WILDCARD), Ident(name))
}
property("splice tree into typed") = forAll { (typ: Tree) =>
- pq"_ : $typ" ≈ Typed(Ident(nme.WILDCARD), typ)
+ pq"_ : $typ" ≈ Typed(Ident(termNames.WILDCARD), typ)
}
property("splice into apply") = forAll { (pat: Tree, subpat: Tree) =>
diff --git a/test/files/scalacheck/quasiquotes/TermConstructionProps.scala b/test/files/scalacheck/quasiquotes/TermConstructionProps.scala
index 058880a25c..400e1ac9fd 100644
--- a/test/files/scalacheck/quasiquotes/TermConstructionProps.scala
+++ b/test/files/scalacheck/quasiquotes/TermConstructionProps.scala
@@ -46,7 +46,7 @@ object TermConstructionProps extends QuasiquoteProperties("term construction") {
property("splice tree into new") = forAll { (tree: Tree) =>
- q"new $tree" ≈ Apply(Select(New(tree), nme.CONSTRUCTOR), List())
+ q"new $tree" ≈ Apply(Select(New(tree), termNames.CONSTRUCTOR), List())
}
property("splice tree into return") = forAll { (tree: Tree) =>