From 7cfc924eed89307944d0cc85d54f68de2895e4a8 Mon Sep 17 00:00:00 2001
From: Riccardo Binetti <rbino@gmx.com>
Date: Sun, 3 Jul 2022 17:38:40 +0200
Subject: [PATCH] pin: omit board/chip namespace when parsing and saving the
 pin name (#55)

board: and chip: can be prefixed to the pin to force using a pin defined in the
board or in the chip. Currently though, neither chips or boards are handling
this prefix.
Since this is just used to give priority when parsing the pin, this commit
removes the namespace from the spec passed to parsePin. This isolates the
namespace handling to the Pin type creation, without having to handle it in
chips and boards.
---
 src/core/pin.zig | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/core/pin.zig b/src/core/pin.zig
index b46962e..1bd4868 100644
--- a/src/core/pin.zig
+++ b/src/core/pin.zig
@@ -13,18 +13,30 @@ const board = @import("board");
 pub fn Pin(comptime spec: []const u8) type {
     // TODO: Depened on board and chip here
 
-    // Pins can be namespaced with "Board:" for board and "Chip:" for chip
-    const pin = if (std.mem.startsWith(u8, spec, "board:"))
-        chip.parsePin(@field(board.pin_map, spec))
-    else if (std.mem.startsWith(u8, spec, "chip:"))
-        chip.parsePin(spec)
+    const board_namespace = "board:";
+    const chip_namespace = "chip:";
+
+    // Pins can be namespaced with "board:" for board and "chip:" for chip
+    // These namespaces are not passed to chip.parsePin
+    const pin = if (std.mem.startsWith(u8, spec, board_namespace))
+        chip.parsePin(@field(board.pin_map, spec[board_namespace.len..]))
+    else if (std.mem.startsWith(u8, spec, chip_namespace))
+        chip.parsePin(spec[chip_namespace.len..])
     else if (micro.config.has_board and @hasField(@TypeOf(board.pin_map), spec))
         chip.parsePin(@field(board.pin_map, spec))
     else
         chip.parsePin(spec);
 
     return struct {
-        pub const name = spec;
+        pub const name = if (std.mem.startsWith(u8, spec, board_namespace.len))
+            // Remove the board: prefix
+            spec[board_namespace.len..]
+        else if (std.mem.startsWith(u8, spec, chip_namespace))
+            // Remove the chip: prefix
+            spec[chip_namespace.len..]
+        else
+            spec;
+
         pub const source_pin = pin;
 
         pub fn route(target: pin.Targets) void {