Refactor CheckUses

Author: bocchino

compiler/lib/src/main/scala/analysis/Analyzers/BasicUseAnalyzer.scala

@@ -35,15 +35,28 @@ trait BasicUseAnalyzer extends TypeExpressionAnalyzer {
 
   /** An implied constant use */
   def impliedConstantUse(a: Analysis, iu: ImpliedUse) =
-    iu.annotateResult(exprNode(a, iu.asExprNode))
+    for {
+      a <- iu.annotateResult(exprNode(a, iu.asExprNode))
+      _ <- impliedUse(a, iu, ImpliedUse.Kind.Constant)
+    } yield a
 
   /** An implied port use */
   def impliedPortUse(a: Analysis, iu: ImpliedUse) =
-    iu.annotateResult(portUse(a, iu.asQualIdentNode, iu.name))
+    for {
+      a <- iu.annotateResult(portUse(a, iu.asQualIdentNode, iu.name))
+      _ <- impliedUse(a, iu, ImpliedUse.Kind.Port)
+    } yield a
 
   /** An implied type use */
   def impliedTypeUse(a: Analysis, iu: ImpliedUse) =
-    iu.annotateResult(typeUse(a, iu.asTypeNameNode, iu.name))
+    for {
+      a <- iu.annotateResult(typeUse(a, iu.asTypeNameNode, iu.name))
+      _ <- impliedUse(a, iu, ImpliedUse.Kind.Type)
+    } yield a
+
+  /** An implied use */
+  def impliedUse(a: Analysis, iu: ImpliedUse, kind: ImpliedUse.Kind): Result =
+    Right(a)
 
   override def defComponentInstanceAnnotatedNode(a: Analysis, node: Ast.Annotated[AstNode[Ast.DefComponentInstance]]) = {
     val (_, node1, _) = node

compiler/lib/src/main/scala/analysis/CheckSemantics/CheckUses.scala

@@ -81,23 +81,33 @@ object CheckUses extends BasicUseAnalyzer {
     visitExprNode(a, node)
   }
 
-  override def impliedConstantUse(a: Analysis, iu: ImpliedUse) =
-    for {
-      a <- super.impliedConstantUse(a, iu)
-      _ <- checkImpliedUse(a, iu, "constant")
-    } yield a
-
-  override def impliedPortUse(a: Analysis, iu: ImpliedUse) =
-    for {
-      a <- super.impliedPortUse(a, iu)
-      _ <- checkImpliedUse(a, iu, "port")
-    } yield a
-
-  override def impliedTypeUse(a: Analysis, iu: ImpliedUse) =
-    for {
-      a <- super.impliedTypeUse(a, iu)
-      _ <- checkImpliedUse(a, iu, "type")
-    } yield a
+  // Check that an implied use (a) is not a member
+  // of a def and (b) does not shadow the required def
+  override def impliedUse(a: Analysis, iu: ImpliedUse, kind: ImpliedUse.Kind) = {
+    val sym = a.useDefMap(iu.id)
+    val symQualifiedName = a.getQualifiedName(sym).toString
+    val iuName = iu.name.toString
+    // Check that the name of the def matches the name of the use
+    val result = if symQualifiedName == iuName
+      // OK, they match
+      then Right(a)
+      else {
+        val msg = if symQualifiedName.length < iuName.length
+        // Definition has a shorter name: the use is a member of the definition
+        then s"it has $iuName as a member"
+        // Definition has a longer name: it shadows the required definition
+        else s"it shadows $iuName here"
+        Left(
+          SemanticError.InvalidSymbol(
+            symQualifiedName,
+            Locations.get(iu.id),
+            msg,
+            sym.getLoc
+          )
+        )
+      }
+    iu.annotateResult(result)
+  }
 
   override def defComponentAnnotatedNode(a: Analysis, aNode: Ast.Annotated[AstNode[Ast.DefComponent]]) = {
     val (_, node, _) = aNode
@@ -186,36 +196,4 @@ object CheckUses extends BasicUseAnalyzer {
     }
   }
 
-  // Check that an implied use (a) is not a member
-  // of a def and (b) does not shadow the required def
-  private def checkImpliedUse(
-    a: Analysis,
-    iu: ImpliedUse,
-    kind: String
-  ) = {
-    val sym = a.useDefMap(iu.id)
-    val symQualifiedName = a.getQualifiedName(sym).toString
-    val iuName = iu.name.toString
-    // Check that the name of the def matches the name of the use
-    val result = if symQualifiedName == iuName
-      // OK, they match
-      then Right(())
-      else {
-        val msg = if symQualifiedName.length < iuName.length
-        // Definition has a shorter name: the use is a member of the definition
-        then s"it has $iuName as a member"
-        // Definition has a longer name: it shadows the required definition
-        else s"it shadows $iuName here"
-        Left(
-          SemanticError.InvalidSymbol(
-            symQualifiedName,
-            Locations.get(iu.id),
-            msg,
-            sym.getLoc
-          )
-        )
-      }
-    iu.annotateResult(result)
-  }
-
 }