API Cleanup - Module

trait Module -> abstract class DefModule
InModule -> Module (match concrete syntax)
ExModule -> ExtModule (match concrete syntax)
Add simple scaladoc for each one

1 files changed, 10 insertions, 10 deletions

diff --git a/src/main/scala/firrtl/passes/Inline.scala b/src/main/scala/firrtl/passes/Inline.scala
index 5e523a37..f1b71149 100644
--- a/src/main/scala/firrtl/passes/Inline.scala
+++ b/src/main/scala/firrtl/passes/Inline.scala
@@ -47,7 +47,7 @@ object InlineInstances extends Transform {
          if (!moduleMap.contains(name))
             errors += new PassException(s"Annotated module does not exist: ${name}")
       def checkExternal(name: String): Unit = moduleMap(name) match {
-            case m: ExModule => errors += new PassException(s"Annotated module cannot be an external module: ${name}")
+            case m: ExtModule => errors += new PassException(s"Annotated module cannot be an external module: ${name}")
             case _ => {}
          }
       def checkInstance(cn: ComponentName): Unit = {
@@ -63,7 +63,7 @@ object InlineInstances extends Transform {
             }
             s map onStmt(name)
          }
-         onStmt(cn.name)(moduleMap(cn.module.name).asInstanceOf[InModule].body)
+         onStmt(cn.name)(moduleMap(cn.module.name).asInstanceOf[Module].body)
          if (!containsCN) errors += new PassException(s"Annotated instance does not exist: ${cn.module.name}.${cn.name}")
       }
       annModuleNames.foreach{n => checkExists(n)}
@@ -85,12 +85,12 @@ object InlineInstances extends Transform {
 
       // ---- Pass functions/data ----
       // Contains all unaltered modules
-      val originalModules = mutable.HashMap[String,Module]()
+      val originalModules = mutable.HashMap[String,DefModule]()
       // Contains modules whose direct/indirect children modules have been inlined, and whose tagged instances have been inlined.
-      val inlinedModules = mutable.HashMap[String,Module]()
+      val inlinedModules = mutable.HashMap[String,DefModule]()
 
       // Recursive.
-      def onModule(m: Module): Module = {
+      def onModule(m: DefModule): DefModule = {
          val inlinedInstances = mutable.ArrayBuffer[String]()
          // Recursive. Replaces inst.port with inst$port
          def onExp(e: Expression): Expression = e match {
@@ -136,8 +136,8 @@ object InlineInstances extends Transform {
                   if (shouldInline) {
                      inlinedInstances += instName
                      val instInModule = instModule match {
-                        case m: ExModule => throw new PassException("Cannot inline external module")
-                        case m: InModule => m
+                        case m: ExtModule => throw new PassException("Cannot inline external module")
+                        case m: Module => m
                      }
                      val stmts = mutable.ArrayBuffer[Stmt]()
                      for (p <- instInModule.ports) {
@@ -150,12 +150,12 @@ object InlineInstances extends Transform {
                case s => s map onExp map onStmt
             }
          m match {
-            case InModule(info, name, ports, body) => {
-               val mx = InModule(info, name, ports, onStmt(body))
+            case Module(info, name, ports, body) => {
+               val mx = Module(info, name, ports, onStmt(body))
                inlinedModules(name) = mx
                mx
             }
-            case m: ExModule => {
+            case m: ExtModule => {
                inlinedModules(m.name) = m
                m
             }