Merge pull request scala#8066 from retronym/topic/scalap-constant

Fix scalap parsing/printing of enum and class constant types

Author: lrytz

src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSig.scala

@@ -246,7 +246,9 @@ object ScalaSigEntryParsers extends RulesWithState with MemoisableRules {
       32 -~ longValue ^^ (java.lang.Double.longBitsToDouble),
       33 -~ nameRef,
       34 -^ null,
-      35 -~ typeRef)
+      35 -~ typeRef,
+      36 -~ symbolRef
+    )
 
   lazy val attributeInfo = 40 -~ symbolRef ~ typeRef ~ (constantRef?) ~ (nameRef ~ constantRef *) ^~~~^ AttributeInfo // sym_Ref info_Ref {constant_Ref} {nameRef constantRef}
   lazy val children = 41 -~ (nat*) ^^ Children //sym_Ref {sym_Ref}

src/scalap/scala/tools/scalap/scalax/rules/scalasig/ScalaSigPrinter.scala

@@ -342,6 +342,8 @@ class ScalaSigPrinter(stream: PrintStream, printPrivates: Boolean) {
         case _: Double => "scala.Double"
         case _: String => "java.lang.String"
         case c: Class[_] => "java.lang.Class[" + c.getComponentType.getCanonicalName.replace("$", ".") + "]"
+        case e: ExternalSymbol => e.parent.get.path
+        case tp: Type => "java.lang.Class[" + toString(tp, sep) + "]"
       })
       case TypeRefType(prefix, symbol, typeArgs) => sep + (symbol.path match {
         case "scala.<repeated>" => flags match {

test/files/scalap/constants.check

@@ -0,0 +1,16 @@
+class Constants extends scala.AnyRef {
+  def this() = { /* compiled code */ }
+  final val UnitConstant: scala.Unit = { /* compiled code */ }
+  final val ByteConstant: scala.Boolean = { /* compiled code */ }
+  final val CharConstant: scala.Char = { /* compiled code */ }
+  final val ShortConstant: scala.Short = { /* compiled code */ }
+  final val IntConstant: scala.Int = { /* compiled code */ }
+  final val LongConstant: scala.Long = { /* compiled code */ }
+  final val FloatConstant: scala.Float = { /* compiled code */ }
+  final val DoubleConstant: scala.Double = { /* compiled code */ }
+  final val NullConstant: scala.Null = { /* compiled code */ }
+  final val ClassConstant: java.lang.Class[scala.Predef.String] = { /* compiled code */ }
+  final val ClassConstant2: java.lang.Class[scala.Some[_]] = { /* compiled code */ }
+  final val EnumConstant: java.util.concurrent.TimeUnit = { /* compiled code */ }
+  final val StringConstant: java.lang.Class[scala.Predef.String] = { /* compiled code */ }
+}

test/files/scalap/constants.scala

@@ -0,0 +1,17 @@
+class Constants {
+  final val UnitConstant = ()
+  final val ByteConstant = false
+  final val CharConstant = 'a'
+  final val ShortConstant = 1.toShort
+  final val IntConstant = 1
+  final val LongConstant = 1L
+  final val FloatConstant = 1f
+  final val DoubleConstant = 1d
+
+  final val NullConstant = null
+
+  final val ClassConstant = classOf[String]
+  final val ClassConstant2 = classOf[Some[_]]
+  final val EnumConstant = java.util.concurrent.TimeUnit.DAYS
+  final val StringConstant = classOf[String]
+}