More Parameters cleanup

ucb-bar · Aug 23, 2014 · 00d2469 · 00d2469
1 parent e1860e4
commit 00d2469
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/main/scala/Module.scala b/src/main/scala/Module.scala
@@ -42,15 +42,15 @@ import ChiselError._
 import Module._
 
 object Module {
-  def apply[T<:Module](c: =>T,fun:PartialFunction[Any,Any])(implicit _p:Option[Parameters] = None):T = {
-    val q = _p.getOrElse(params).alterPartial(fun)
+  def apply[T<:Module](c: =>T, f: PartialFunction[Any,Any]): T = {
+    val q = params.alterPartial(f)
     Driver.modStackPushed = true
     Driver.parStack.push(q)
     val res = init(c)
     Driver.parStack.pop
     res
   }
-  def apply[T<:Module](c: =>T)(implicit _p:Option[Parameters] = None):T = {
+  def apply[T<:Module](c: =>T)(implicit _p:Option[Parameters] = None): T = {
     Driver.modStackPushed = true
     _p match {
       case Some(q: Parameters) => {

diff --git a/src/main/scala/Parameters.scala b/src/main/scala/Parameters.scala
@@ -329,11 +329,6 @@ object Parameters {
 
 class Field[T]
 
-trait PF extends PartialFunction[Any,Any]
-object Alter {
-  def apply(p:PartialFunction[Any,Any]) = p
-}
-
 final class Parameters(
     private val _world: World,
     private val _look: _Lookup