Scala style cleanup take 5 (#324)

* working through variable shrouding

* working through variable shrouding

* working through variable shadowing

* working through variable shadowing
hmm there are some very fragile match {} in Passes

* working through variable shadowing
hmm there are some very fragile match {} in Passes

* working through variable shadowing

* working through variable shadowing

* working through variable shadowing

* working through variable shadowing

* working through variable shadowing

* working through variable shadowing

* working through variable shadowing

* working through variable shadowing

* Fixes suggested by Adam

1 files changed, 25 insertions, 25 deletions

diff --git a/src/main/scala/firrtl/passes/Resolves.scala b/src/main/scala/firrtl/passes/Resolves.scala
index 789b9a4d..fb46fa07 100644
--- a/src/main/scala/firrtl/passes/Resolves.scala
+++ b/src/main/scala/firrtl/passes/Resolves.scala
@@ -41,19 +41,19 @@ object ResolveKinds extends Pass {
 
   def find_stmt(kinds: KindMap)(s: Statement):Statement = {
     s match {
-      case s: DefWire => kinds(s.name) = WireKind
-      case s: DefNode => kinds(s.name) = NodeKind
-      case s: DefRegister => kinds(s.name) = RegKind
-      case s: WDefInstance => kinds(s.name) = InstanceKind
-      case s: DefMemory => kinds(s.name) = MemKind
-      case s =>
+      case sx: DefWire => kinds(sx.name) = WireKind
+      case sx: DefNode => kinds(sx.name) = NodeKind
+      case sx: DefRegister => kinds(sx.name) = RegKind
+      case sx: WDefInstance => kinds(sx.name) = InstanceKind
+      case sx: DefMemory => kinds(sx.name) = MemKind
+      case _ =>
     } 
     s map find_stmt(kinds)
   }
 
   def resolve_expr(kinds: KindMap)(e: Expression): Expression = e match {
-    case e: WRef => e copy (kind = kinds(e.name))
-    case e => e map resolve_expr(kinds)
+    case ex: WRef => ex copy (kind = kinds(ex.name))
+    case _ => e map resolve_expr(kinds)
   }
 
   def resolve_stmt(kinds: KindMap)(s: Statement): Statement =
@@ -73,7 +73,7 @@ object ResolveKinds extends Pass {
 object ResolveGenders extends Pass {
   def name = "Resolve Genders"
   def resolve_e(g: Gender)(e: Expression): Expression = e match {
-    case e: WRef => e copy (gender = g)
+    case ex: WRef => ex copy (gender = g)
     case WSubField(exp, name, tpe, _) => WSubField(
       Utils.field_flip(exp.tpe, name) match {
         case Default => resolve_e(g)(exp)
@@ -83,7 +83,7 @@ object ResolveGenders extends Pass {
       WSubIndex(resolve_e(g)(exp), value, tpe, g)
     case WSubAccess(exp, index, tpe, _) =>
       WSubAccess(resolve_e(g)(exp), resolve_e(MALE)(index), tpe, g)
-    case e => e map resolve_e(g)
+    case _ => e map resolve_e(g)
   }
         
   def resolve_s(s: Statement): Statement = s match {
@@ -94,7 +94,7 @@ object ResolveGenders extends Pass {
       Connect(info, resolve_e(FEMALE)(loc), resolve_e(MALE)(expr))
     case PartialConnect(info, loc, expr) =>
       PartialConnect(info, resolve_e(FEMALE)(loc), resolve_e(MALE)(expr))
-    case s => s map resolve_e(MALE) map resolve_s
+    case sx => sx map resolve_e(MALE) map resolve_s
   }
 
   def resolve_gender(m: DefModule): DefModule = m map resolve_s
@@ -139,23 +139,23 @@ object CInferMDir extends Pass {
   }
 
   def infer_mdir_s(mports: MPortDirMap)(s: Statement): Statement = s match { 
-    case s: CDefMPort =>
-       mports(s.name) = s.direction
-       s map infer_mdir_e(mports, MRead)
-    case s: Connect =>
-       infer_mdir_e(mports, MRead)(s.expr)
-       infer_mdir_e(mports, MWrite)(s.loc)
-       s
-    case s: PartialConnect =>
-       infer_mdir_e(mports, MRead)(s.expr)
-       infer_mdir_e(mports, MWrite)(s.loc)
-       s
-    case s => s map infer_mdir_s(mports) map infer_mdir_e(mports, MRead)
+    case sx: CDefMPort =>
+       mports(sx.name) = sx.direction
+       sx map infer_mdir_e(mports, MRead)
+    case sx: Connect =>
+       infer_mdir_e(mports, MRead)(sx.expr)
+       infer_mdir_e(mports, MWrite)(sx.loc)
+       sx
+    case sx: PartialConnect =>
+       infer_mdir_e(mports, MRead)(sx.expr)
+       infer_mdir_e(mports, MWrite)(sx.loc)
+       sx
+    case sx => sx map infer_mdir_s(mports) map infer_mdir_e(mports, MRead)
   }
         
   def set_mdir_s(mports: MPortDirMap)(s: Statement): Statement = s match { 
-    case s: CDefMPort => s copy (direction = mports(s.name))
-    case s => s map set_mdir_s(mports)
+    case sx: CDefMPort => sx copy (direction = mports(sx.name))
+    case sx => sx map set_mdir_s(mports)
   }
   
   def infer_mdir(m: DefModule): DefModule = {