Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PolymorphicBlocks
Submodule PolymorphicBlocks updated 384 files
6 changes: 4 additions & 2 deletions src/main/scala/edg_ide/edgir_graph/ElkEdgirGraphUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import com.intellij.openapi.diagnostic.Logger
import com.intellij.ui.JBColor
import edg.EdgirUtils.SimpleLibraryPath
import edg.compiler.{Compiler, RangeValue, TextValue}
import edg.wir.{BlockConnectivityAnalysis, DesignPath}
import edg.wir.DesignPath
import edg_ide.EdgirUtils.typeOfPortLike
import edg_ide.util.EdgirAnalysisUtils
import org.eclipse.elk.graph.{ElkGraphElement, ElkNode}
import edgir.elem.elem
import edgir.ref.ref

import java.awt.Color
import scala.collection.mutable
Expand Down Expand Up @@ -91,7 +93,7 @@ object ElkEdgirGraphUtils {
override val property: IProperty[PortSide] = PORT_SIDE

def getSimplePortSide(port: PortWrapper): Option[PortSide] = {
val portType = BlockConnectivityAnalysis.typeOfPortLike(port.portLike)
val portType = typeOfPortLike(port.portLike).get

portType.toSimpleString match {
case "Ground" => Some(PortSide.SOUTH)
Expand Down
21 changes: 16 additions & 5 deletions src/main/scala/edg_ide/runner/CompileProcessHandler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -430,13 +430,24 @@ class CompileProcessHandler(
Map()
).mapErr(msg => s"while netlisting: $msg")
.get
require(netlist.size == 1)

Files.createDirectories(Paths.get(options.netlistFile).getParent)
val writer = new FileWriter(options.netlistFile, StandardCharsets.UTF_8)
writer.write(netlist.head._2)
writer.close()
f"wrote ${options.netlistFile}"
val writtenFiles = netlist.map { case (path, netlistData) =>
val filename = if (path == DesignPath()) {
options.netlistFile
} else {
if (options.netlistFile.endsWith(".net")) {
options.netlistFile.stripSuffix(".net") + "_" + path.toString.replace(',', '_') + ".net"
} else {
options.netlistFile + "_" + path.toString.replace(',', '_')
}
}
val writer = new FileWriter(filename, StandardCharsets.UTF_8)
writer.write(netlistData)
writer.close()
Comment on lines +445 to +447
filename
}
f"wrote ${writtenFiles.mkString(", ")}"
}
} else {
console.print(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object CompilerErrorNodeBase {
case CompilerError.Unelaborated(ElaborateRecord.ParamValue(path), deps) =>
("Unelaborated Param", path.toString, deps.toSeq.map(elaborateRecordToDetailNode))
case CompilerError.Unelaborated(
ElaborateRecord.Connect(toLinkPortPath, fromLinkPortPath, root),
ElaborateRecord.Connect(toLinkPortPath, fromLinkPortPath, root, tap),
deps
) =>
(
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/edg_ide/util/DesignFindDisconnected.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ object DesignFindDisconnected extends DesignBlockMap[(Seq[DesignPath], Seq[Strin
.collect { // extract block side expr
case expr.ValueExpr.Expr.Connected(expr.ConnectedExpr(Some(blockExpr), Some(linkExpr), _, _)) =>
blockExpr.expr
case expr.ValueExpr.Expr.Exported(expr.ExportedExpr(Some(exteriorExpr), Some(interiorExpr), _, _)) =>
case expr.ValueExpr.Expr.Exported(expr.ExportedExpr(Some(exteriorExpr), Some(interiorExpr), false, _, _)) =>
interiorExpr.expr
}
.collect { // extract steps
Expand Down
Loading