Starting the mopping up now that names have som...

Starting the mopping up now that names have some more sense of their
place in the universe. Cleaned up some heavy multi-boolean logic. Added
more documentation on the relationships between entities in Symbols and
some other compiler things which often blur together.

Fun fact: the incorrect usage of nme.ScalaObject in Contexts which I
reported when first broaching the namespace subject became a compile
time error during the writing of this patch, because there is no longer
any such thing as nme.ScalaObject. It's a little bit like magic. No
review.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/library/scala/Math.scala b/src/library/scala/Math.scala
index 69a3985871..a4189fea8a 100644
--- a/src/library/scala/Math.scala
+++ b/src/library/scala/Math.scala
@@ -13,7 +13,7 @@ package scala
  *  operations such as the elementary exponential, logarithm, square root, and
  *  trigonometric functions.
  */
-@deprecated("use scala.math package instead")
+@deprecated("use scala.math package object instead.\n(Example package object usage: scala.math.Pi )")
 object Math extends MathCommon {
   @deprecated("Use scala.Byte.MinValue instead")
   val MIN_BYTE = java.lang.Byte.MIN_VALUE
diff --git a/src/library/scala/reflect/generic/StdNames.scala b/src/library/scala/reflect/generic/StdNames.scala
index f0fb790a5e..70e24e4dc5 100755
--- a/src/library/scala/reflect/generic/StdNames.scala
+++ b/src/library/scala/reflect/generic/StdNames.scala
@@ -29,12 +29,12 @@ trait StdNames extends LowPriorityStdNames {
     val IMPORT: NameType             = "<import>"
     val MODULE_SUFFIX: NameType      = "$module"
     val ROOT: NameType               = "<root>"
-    val ROOTPKG: NameType            = "_root_"
   }
 
   trait LibraryTermNames extends LibraryCommonNames {
     val EXPAND_SEPARATOR_STRING = "$$"
-    val LOCAL_SUFFIX_STRING = " "
+    val LOCAL_SUFFIX_STRING     = " "
+    val ROOTPKG: NameType       = "_root_"
 
     /** The expanded name of `name' relative to this class `base` with given `separator`
      */