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 compiler/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name := "edg-compiler"

version := "0.1-SNAPSHOT"

scalaVersion := "2.13.14"
scalaVersion := "2.13.18"

scalacOptions += "-deprecation"

Expand Down
12 changes: 1 addition & 11 deletions edg/core/Core.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,17 +245,7 @@ def _name_from(self, base: LibraryElement, allow_unknown: bool = False) -> str:
def _static_def_name(cls) -> str:
"""If this library element is defined by class (all instances have an equivalent library definition),
returns the definition name. Otherwise, should crash."""
if cls.__module__ == "__main__":
# when the top-level design is run as main, the module name is __main__ which is meaningless
# and breaks when the HDL server tries to resolve the __main__ reference (to itself),
# so this needs to resolve the correct name
import inspect
import os

module = os.path.splitext(os.path.basename(inspect.getfile(cls)))[0]
else:
module = cls.__module__
return module + "." + cls.__name__
return cls.__module__ + "." + cls.__name__

def _get_def_name(self) -> str:
"""Returns the definition name"""
Expand Down
5 changes: 2 additions & 3 deletions edg/core/HierarchyBlock.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,9 +505,8 @@ def _def_to_proto(self) -> edgir.HierarchyBlock:
ref_map = self._create_ref_map()

pb = edgir.HierarchyBlock()
pb.prerefine_class.target.name = (
self._get_def_name()
) # TODO integrate with a non-link populate_def_proto_block...
# TODO integrate with a non-link populate_def_proto_block...
pb.prerefine_class.target.name = self._get_def_name()
self._populate_def_proto_block_base(pb)
self._populate_def_proto_port_init(pb, ref_map)

Expand Down
Binary file modified edg/core/resources/edg-compiler-precompiled.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ classifiers = [
keywords = ["PCB", "hardware description language"]
dependencies = [
"protobuf >= 3.20.0",
"sexpdata==0.0.3",
"Deprecated==1.2.14",
"sexpdata ~= 1.0",
"Deprecated ~= 1.0",
"typing_extensions >= 4.4.0",
"pydantic == 2.8.2",
"install-jdk == 1.1.0",
"pydantic ~= 2.0",
"install-jdk ~= 1.0",
]
requires-python = ">=3.9"

Expand Down
Loading