From 427c2d4bbade10090aa0f8ae41848b16ea7deb20 Mon Sep 17 00:00:00 2001 From: anuejn Date: Mon, 25 Mar 2019 15:26:00 +0100 Subject: [PATCH] hdl.rec: separate record and signal name with __, not _. This makes names of signals within records less ambiguous, in case they themselves have underscores within them. --- nmigen/hdl/rec.py | 2 +- nmigen/test/test_hdl_rec.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nmigen/hdl/rec.py b/nmigen/hdl/rec.py index 999c85b..f1ddbd2 100644 --- a/nmigen/hdl/rec.py +++ b/nmigen/hdl/rec.py @@ -72,7 +72,7 @@ class Record(Value): def concat(a, b): if a is None: return b - return "{}_{}".format(a, b) + return "{}__{}".format(a, b) self.layout = Layout.wrap(layout) self.fields = OrderedDict() diff --git a/nmigen/test/test_hdl_rec.py b/nmigen/test/test_hdl_rec.py index 3f68247..65e8bf6 100644 --- a/nmigen/test/test_hdl_rec.py +++ b/nmigen/test/test_hdl_rec.py @@ -65,11 +65,11 @@ class RecordTestCase(FHDLTestCase): ]) ]) - self.assertEqual(repr(r), "(rec r stb data (rec r_info a b))") + self.assertEqual(repr(r), "(rec r stb data (rec r__info a b))") self.assertEqual(len(r), 35) self.assertIsInstance(r.stb, Signal) - self.assertEqual(r.stb.name, "r_stb") - self.assertEqual(r["stb"].name, "r_stb") + self.assertEqual(r.stb.name, "r__stb") + self.assertEqual(r["stb"].name, "r__stb") def test_unnamed(self): r = [Record([ -- 2.30.2