summaryrefslogtreecommitdiff
path: root/test/files/run/t6992
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/run/t6992
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/run/t6992')
-rw-r--r--test/files/run/t6992/Macros_1.scala14
-rw-r--r--test/files/run/t6992/Test_2.scala2
2 files changed, 8 insertions, 8 deletions
diff --git a/test/files/run/t6992/Macros_1.scala b/test/files/run/t6992/Macros_1.scala
index d101efdda3..f578f2b3c0 100644
--- a/test/files/run/t6992/Macros_1.scala
+++ b/test/files/run/t6992/Macros_1.scala
@@ -13,12 +13,12 @@ object Macros {
ClassDef(
Modifiers(Flag.FINAL), anon, Nil, Template(
Nil, noSelfType, List(
- DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))),
+ DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))),
TypeDef(Modifiers(), TypeName(lit), Nil, TypeTree(typeOf[Int]))
)
)
),
- Apply(Select(New(Ident(anon)), nme.CONSTRUCTOR), Nil)
+ Apply(Select(New(Ident(anon)), termNames.CONSTRUCTOR), Nil)
))
}
@@ -33,7 +33,7 @@ object Macros {
ClassDef(
Modifiers(Flag.FINAL), anon, Nil, Template(
Nil, noSelfType, List(
- DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))),
+ DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))),
DefDef(
Modifiers(), TermName(lit), Nil, Nil, TypeTree(),
c.literal(42).tree
@@ -41,7 +41,7 @@ object Macros {
)
)
),
- Apply(Select(New(Ident(anon)), nme.CONSTRUCTOR), Nil)
+ Apply(Select(New(Ident(anon)), termNames.CONSTRUCTOR), Nil)
))
}
@@ -57,7 +57,7 @@ object Macros {
ClassDef(
Modifiers(), anon, Nil, Template(
Nil, emptyValDef, List(
- DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))),
+ DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))),
DefDef(
Modifiers(), TermName(lit), Nil, Nil, TypeTree(),
c.literal(42).tree
@@ -67,9 +67,9 @@ object Macros {
),
ClassDef(
Modifiers(Flag.FINAL), wrapper, Nil,
- Template(Ident(anon) :: Nil, noSelfType, DefDef(Modifiers(), nme.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))) :: Nil)
+ Template(Ident(anon) :: Nil, noSelfType, DefDef(Modifiers(), termNames.CONSTRUCTOR, List(), List(List()), TypeTree(), Block(List(pendingSuperCall), Literal(Constant(())))) :: Nil)
),
- Apply(Select(New(Ident(wrapper)), nme.CONSTRUCTOR), Nil)
+ Apply(Select(New(Ident(wrapper)), termNames.CONSTRUCTOR), Nil)
))
}
} \ No newline at end of file
diff --git a/test/files/run/t6992/Test_2.scala b/test/files/run/t6992/Test_2.scala
index 1ed8958d38..2399bf81df 100644
--- a/test/files/run/t6992/Test_2.scala
+++ b/test/files/run/t6992/Test_2.scala
@@ -4,7 +4,7 @@ object Test extends App {
val foo = Macros.foo("T")
val ttpe = scala.reflect.runtime.universe.weakTypeOf[foo.T]
println(ttpe)
- println(ttpe.typeSymbol.typeSignature)
+ println(ttpe.typeSymbol.info)
val bar = Macros.bar("test")
println(bar.test)