Merge pull request #188 from scala/issue-187

Adds support for classes nested in objects, fixes #187

Author: heathermiller

core/src/main/scala/pickling/FastTags.scala

@@ -164,7 +164,12 @@ object FastTypeTag {
         // debug(s"!!! could not find primitive tag for class ${clazz.getName} !!!")
         // handle arrays of non-primitive element type
         if (clazz.isArray) mkRawArray(clazz, mirror)
-        else apply(mirror, clazz.getName())
+        else {
+          val clazzName =
+            if (clazz.getName().contains("anonfun$")) clazz.getName()
+            else clazz.getName().replace('$', '.')
+          apply(mirror, clazzName)
+        }
       })
     } catch {
       case t: Throwable =>

core/src/main/scala/pickling/Tools.scala

@@ -75,10 +75,10 @@ class Tools[C <: Context](val c: C) {
       val subclasses = MutableList[Symbol]()
       def analyze(sym: Symbol) = if (isRelevantSubclass(baseSym, sym)) subclasses += sym
       def loop(tree: Tree): Unit = tree match {
-        // NOTE: only looking for top-level classes!
+        // NOTE: only looking for classes defined in objects or top-level classes!
         case PackageDef(_, stats) => stats.foreach(loop)
         case cdef: ClassDef => analyze(cdef.symbol)
-        case mdef: ModuleDef => analyze(mdef.symbol.asModule.moduleClass)
+        case mdef: ModuleDef => mdef.impl.body.foreach(loop)
         case _ => // do nothing
       }
       c.enclosingRun.units.map(_.body).foreach(loop)

core/src/test/scala/pickling/run/nested-class-in-object.scala

@@ -0,0 +1,53 @@
+package scala.pickling.privatepublicctorstest
+
+import org.scalatest.FunSuite
+import scala.pickling._
+
+trait Command
+
+object Commands {
+   case class SomeCommand(x: String) extends Command
+}
+
+case class CommandMessage(cmd: Command)
+case class CommandMessage2(cmd: AnyRef)
+
+class NestedObjectTest extends FunSuite {
+  test("json") {
+    import json._
+    val cmd = Commands.SomeCommand("hey, this is a command!")
+    val c = CommandMessage(cmd)
+    val p: JSONPickle = c.pickle
+    val up = p.unpickle[CommandMessage]
+    assert(c.cmd == up.cmd)
+  }
+
+  test("binary") {
+    import binary._
+    val cmd = Commands.SomeCommand("hey, this is a command!")
+    val c = CommandMessage(cmd)
+    val p: BinaryPickle = c.pickle
+    val up = p.unpickle[CommandMessage]
+    assert(c.cmd == up.cmd)
+  }
+}
+
+class NestedObjectRuntimeTest extends FunSuite {
+  test("json") {
+    import json._
+    val cmd = Commands.SomeCommand("hey, this is a command!")
+    val c = CommandMessage2(cmd)
+    val p: JSONPickle = c.pickle
+    val up = p.unpickle[CommandMessage2]
+    assert(c.cmd == up.cmd)
+  }
+
+  test("binary") {
+    import binary._
+    val cmd = Commands.SomeCommand("hey, this is a command!")
+    val c = CommandMessage2(cmd)
+    val p: BinaryPickle = c.pickle
+    val up = p.unpickle[CommandMessage2]
+    assert(c.cmd == up.cmd)
+  }
+}