python-library-ralf-model 0.1.1__tar.gz → 0.1.2__tar.gz

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-library-ralf-model
-Version: 0.1.1
+Version: 0.1.2
 Requires-Python: >=3.10
 Requires-Dist: pydantic<3,>=2.0
 Description-Content-Type: text/markdown
@@ -41,6 +41,8 @@ doc = load_ralf_file(
 ## 能力范围
 
 - **block**：定义 ``block 名 { ... }``；简单映射 ``block 名 @地址;``；赋值与可选路径、地址 ``block 左名 = 右名``、``block 左名 = 右名 (hdl路径)``、``... @地址``，可与 ``{ ... }`` 组合。
+- **register**：``register 名 [ (hdl路径) ] [ @字节偏移 ] { ... }`` 或 ``register 名;`` 前向引用。
+- **field**：``field 名 [(hdl路径)] [ @位偏移 ] { ... }``（括号路径可紧贴字段名，如 ``field f(hdl.f)``）。
 - `field` 花括号内按**源顺序**保留各条语句（含 `enum { ... };` 等），便于往返。
 - `@` 后的偏移在写出时统一为 Verilog 风格十六进制字面量（如 `'h5`）；`bytes` 等为十进制。
 

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/README.md

@@ -34,6 +34,8 @@ doc = load_ralf_file(
 ## 能力范围
 
 - **block**：定义 ``block 名 { ... }``；简单映射 ``block 名 @地址;``；赋值与可选路径、地址 ``block 左名 = 右名``、``block 左名 = 右名 (hdl路径)``、``... @地址``，可与 ``{ ... }`` 组合。
+- **register**：``register 名 [ (hdl路径) ] [ @字节偏移 ] { ... }`` 或 ``register 名;`` 前向引用。
+- **field**：``field 名 [(hdl路径)] [ @位偏移 ] { ... }``（括号路径可紧贴字段名，如 ``field f(hdl.f)``）。
 - `field` 花括号内按**源顺序**保留各条语句（含 `enum { ... };` 等），便于往返。
 - `@` 后的偏移在写出时统一为 Verilog 风格十六进制字面量（如 `'h5`）；`bytes` 等为十进制。
 

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-library-ralf-model"
-version = "0.1.1"
+version = "0.1.2"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/ralf_model/emit.py

@@ -12,6 +12,8 @@ def _fmt_at_int(v: int) -> str:
 
 def _emit_field(f: FieldNode, indent: str) -> list[str]:
     head = f"{indent}field {f.name}"
+    if f.paren_path is not None:
+        head += f"({f.paren_path})"
     if f.offset_bits is not None:
         head += f" @{_fmt_at_int(f.offset_bits)}"
     head += " {"
@@ -26,6 +28,8 @@ def _emit_field(f: FieldNode, indent: str) -> list[str]:
 
 def _emit_register(r: RegisterNode, indent: str) -> list[str]:
     head = f"{indent}register {r.name}"
+    if r.paren_path is not None:
+        head += f" ({r.paren_path})"
     if r.offset_bytes is not None:
         head += f" @{_fmt_at_int(r.offset_bytes)}"
     if r.declaration_only:

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/ralf_model/nodes.py

@@ -9,6 +9,10 @@ class FieldNode(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: str
+    paren_path: str | None = Field(
+        default=None,
+        description="紧跟在 field 名后的圆括号路径内容（不含括号），如 ``field f(hdl.sig)``",
+    )
     offset_bits: int | None = Field(default=None, description="field 内 `@` 后的位偏移")
     inner_statements: list[str] = Field(
         default_factory=list,
@@ -22,6 +26,10 @@ class RegisterNode(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: str
+    paren_path: str | None = Field(
+        default=None,
+        description="紧跟在 register 名后的圆括号路径内容（不含括号），如 ``register r (dut.reg)``",
+    )
     offset_bytes: int | None = Field(default=None, description="register 后的 `@` 字节偏移")
     bytes_width: int | None = None
     fields: list[FieldNode] = Field(default_factory=list)

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/ralf_model/parse.py

@@ -349,6 +349,10 @@ class _Parser:
         self.expect_keyword("register")
         name = self.read_ident()
         self.skip_ws_and_comments()
+        paren_path: str | None = None
+        if self._peek() == "(":
+            paren_path = self.read_round_paren_inner()
+            self.skip_ws_and_comments()
         offset: int | None = None
         if self._peek() == "@":
             self._advance()
@@ -358,6 +362,7 @@ class _Parser:
             self._advance()
             return RegisterNode(
                 name=name,
+                paren_path=paren_path,
                 offset_bytes=offset,
                 declaration_only=True,
             )
@@ -367,6 +372,7 @@ class _Parser:
             self.expect_char("}")
             return RegisterNode(
                 name=name,
+                paren_path=paren_path,
                 offset_bytes=offset,
                 bytes_width=rbw,
                 fields=fields,
@@ -396,6 +402,10 @@ class _Parser:
         self.expect_keyword("field")
         name = self.read_ident()
         self.skip_ws_and_comments()
+        paren_path: str | None = None
+        if self._peek() == "(":
+            paren_path = self.read_round_paren_inner()
+            self.skip_ws_and_comments()
         off_bits: int | None = None
         if self._peek() == "@":
             self._advance()
@@ -403,7 +413,9 @@ class _Parser:
         self.expect_char("{")
         fn = self._parse_field_body()
         self.expect_char("}")
-        return fn.model_copy(update={"name": name, "offset_bits": off_bits})
+        return fn.model_copy(
+            update={"name": name, "paren_path": paren_path, "offset_bits": off_bits}
+        )
 
     def _parse_field_body(self) -> FieldNode:
         inner: list[str] = []

{python_library_ralf_model-0.1.1 → python_library_ralf_model-0.1.2}/tests/test_ralf_model.py

@@ -148,6 +148,69 @@ block top {
         out = dump_ralf(doc)
         self.assertIn("register R0;", out)
 
+    def test_register_paren_path_at_offset(self) -> None:
+        src = """
+block top {
+  bytes 4;
+  register CTRL (dut.ctrl_reg) @'h0 {
+    bytes 4;
+    field ena(dut.ctrl_reg.en) @1 {
+      bits 1;
+      access rw;
+    }
+  }
+}
+"""
+        doc = parse_ralf(src)
+        reg = doc.blocks[0].registers[0]
+        self.assertEqual(reg.name, "CTRL")
+        self.assertEqual(reg.paren_path, "dut.ctrl_reg")
+        self.assertEqual(reg.offset_bytes, 0)
+        fld = reg.fields[0]
+        self.assertEqual(fld.name, "ena")
+        self.assertEqual(fld.paren_path, "dut.ctrl_reg.en")
+        self.assertEqual(fld.offset_bits, 1)
+        out = dump_ralf(doc)
+        self.assertIn("register CTRL (dut.ctrl_reg) @'h0", out)
+        self.assertIn("field ena(dut.ctrl_reg.en) @'h1", out)
+        doc2 = parse_ralf(out)
+        self.assertEqual(doc.model_dump(), doc2.model_dump())
+
+    def test_register_paren_path_forward_decl(self) -> None:
+        src = """
+block top {
+  register R0 (hdl.r0) @'h10;
+}
+"""
+        doc = parse_ralf(src)
+        r = doc.blocks[0].registers[0]
+        self.assertTrue(r.declaration_only)
+        self.assertEqual(r.paren_path, "hdl.r0")
+        self.assertEqual(r.offset_bytes, 0x10)
+        out = dump_ralf(doc)
+        self.assertIn("register R0 (hdl.r0) @'h10;", out)
+        doc2 = parse_ralf(out)
+        self.assertEqual(doc.model_dump(), doc2.model_dump())
+
+    def test_field_paren_path_no_space(self) -> None:
+        src = """
+block top {
+  register r {
+    bytes 4;
+    field sig(hdl.sig) @0 {
+      bits 4;
+    }
+  }
+}
+"""
+        doc = parse_ralf(src)
+        fld = doc.blocks[0].registers[0].fields[0]
+        self.assertEqual(fld.paren_path, "hdl.sig")
+        out = dump_ralf(doc)
+        self.assertIn("field sig(hdl.sig)", out)
+        doc2 = parse_ralf(out)
+        self.assertEqual(doc.model_dump(), doc2.model_dump())
+
     def test_block_ref_rhs_with_parentheses(self) -> None:
         src = """
 block top {