update versions

BerkeleyHCI · Apr 24, 2024 · 9913adc · 9913adc
1 parent 91f7496
commit 9913adc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/compiler/src/main/scala/edg/compiler/Compiler.scala b/compiler/src/main/scala/edg/compiler/Compiler.scala
@@ -116,7 +116,7 @@ class AssignNamer() {
 }
 
 object Compiler {
-  final val kExpectedProtoVersion = 3
+  final val kExpectedProtoVersion = 4
 }
 
 /** Compiler for a particular design, with an associated library to elaborate references from.

diff --git a/compiler/src/main/scala/edg/compiler/CompilerError.scala b/compiler/src/main/scala/edg/compiler/CompilerError.scala
@@ -19,14 +19,17 @@ object CompilerError {
       s"${missing.map(x => s"- $x").mkString("\n")}"
 
     override def toIr: edgcompiler.ErrorRecord = {
+      val missingStr = "missing " + missing.map(_.toString).mkString(", ")
       val (kind, path) = record match {
-        case ElaborateRecord.ExpandBlock(path, _) => ("Uncompiled block", Some(path.asIndirect.toLocalPath))
-        case ElaborateRecord.Block(path) => ("Uncompiled block", Some(path.asIndirect.toLocalPath))
-        case ElaborateRecord.Link(path) => ("Uncompiled link", Some(path.asIndirect.toLocalPath))
-        case ElaborateRecord.LinkArray(path) => ("Uncompiled link array", Some(path.asIndirect.toLocalPath))
+        case ElaborateRecord.ExpandBlock(path, _) =>
+          (f"Uncompiled block, $missingStr", Some(path.asIndirect.toLocalPath))
+        case ElaborateRecord.Block(path) => (f"Uncompiled block, $missingStr", Some(path.asIndirect.toLocalPath))
+        case ElaborateRecord.Link(path) => (f"Uncompiled link, $missingStr", Some(path.asIndirect.toLocalPath))
+        case ElaborateRecord.LinkArray(path) =>
+          (f"Uncompiled link array, $missingStr", Some(path.asIndirect.toLocalPath))
         case ElaborateRecord.Parameter(containerPath, _, postfix, _) =>
-          ("Uncompiled parameter", Some((containerPath.asIndirect ++ postfix).toLocalPath))
-        case _ => ("Uncompiled internal element", None)
+          (f"Uncompiled parameter, $missingStr", Some((containerPath.asIndirect ++ postfix).toLocalPath))
+        case _ => (f"Uncompiled internal element, $missingStr", None)
       }
       edgcompiler.ErrorRecord(
         path = path,

diff --git a/edg_core/resources/edg-compiler-precompiled.jar b/edg_core/resources/edg-compiler-precompiled.jar
diff --git a/edg_hdl_server/__main__.py b/edg_hdl_server/__main__.py
@@ -10,7 +10,7 @@
 from edg_core.Core import NonLibraryProperty
 
 
-EDG_PROTO_VERSION = 3
+EDG_PROTO_VERSION = 4
 
 
 class LibraryElementIndexer: