Refactor C++ code gen for components

Author: bocchino

compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCppWriterUtils.scala

@@ -616,6 +616,27 @@ abstract class ComponentCppWriterUtils(
       case Command.Param.Set => "set"
     }
 
+  /** Whether an invoker is required for a port instance */
+  def invokerRequired(portInstance: PortInstance) =
+    portInstance.getSpecialKind match {
+      case Some(Ast.SpecPortInstance.CommandReg) |
+           Some(Ast.SpecPortInstance.CommandResp) =>
+        hasCommands || hasParameters
+      case Some(Ast.SpecPortInstance.Event) |
+           Some(Ast.SpecPortInstance.TextEvent) =>
+        hasEvents
+      case Some(Ast.SpecPortInstance.ParamGet) |
+           Some(Ast.SpecPortInstance.ParamSet) =>
+        hasParameters
+      case Some(Ast.SpecPortInstance.ProductGet) |
+           Some(Ast.SpecPortInstance.ProductRequest) |
+           Some(Ast.SpecPortInstance.ProductSend) =>
+        hasDataProducts
+      case Some(Ast.SpecPortInstance.Telemetry) =>
+        hasTelemetry
+      case _ => true
+    }
+
   /** Write a state machine identifier name */
   def writeSmIdName(name: String) = s"SmId::${name}"
 

compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentPorts.scala

@@ -64,19 +64,8 @@ case class ComponentPorts(
     inputPortWriter.getCallbacks(typedInputPorts),
     inputPortWriter.getCallbacks(serialInputPorts),
     {
-      val ports = List.concat(
-        guardedList (hasDataProducts) (dataProductOutputPorts),
-        List(
-          guardedOption (hasCommands || hasParameters) (cmdRegPort),
-          guardedOption (hasCommands || hasParameters) (cmdRespPort),
-          guardedOption (hasEvents) (eventPort),
-          guardedOption (hasEvents) (textEventPort),
-          guardedOption (hasParameters) (prmGetPort),
-          guardedOption (hasParameters) (prmSetPort),
-          timeGetPort,
-          guardedOption (hasTelemetry) (tlmPort),
-        ).filter(_.isDefined).map(_.get)
-      ).sortBy(_.getUnqualifiedName)
+      val ports = specialOutputPorts.filter(invokerRequired).
+        sortBy(_.getUnqualifiedName)
       outputPortWriter.getInvokers(ports, "private", Some("special"))
     }
   )