From 66d88409d921d6990b71469ef2999f01ad066205 Mon Sep 17 00:00:00 2001 From: whitequark Date: Wed, 3 Jul 2019 13:19:15 +0000 Subject: [PATCH] compat.fhdl.structure: fix If/Elif/Else after 32446831. --- nmigen/compat/fhdl/structure.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nmigen/compat/fhdl/structure.py b/nmigen/compat/fhdl/structure.py index 26b1d34..c56a89f 100644 --- a/nmigen/compat/fhdl/structure.py +++ b/nmigen/compat/fhdl/structure.py @@ -55,21 +55,21 @@ class If(ast.Switch): cond = Value.wrap(cond) if len(cond) != 1: cond = cond.bool() - super().__init__(cond, {"1": ast.Statement.wrap(stmts)}) + super().__init__(cond, {("1",): ast.Statement.wrap(stmts)}) @deprecated("instead of `.Elif(cond, ...)`, use `with m.Elif(cond): ...`") def Elif(self, cond, *stmts): cond = Value.wrap(cond) if len(cond) != 1: cond = cond.bool() - self.cases = OrderedDict(("-" + k, v) for k, v in self.cases.items()) - self.cases["1" + "-" * len(self.test)] = ast.Statement.wrap(stmts) + self.cases = OrderedDict((("-" + k,), v) for (k,), v in self.cases.items()) + self.cases[("1" + "-" * len(self.test),)] = ast.Statement.wrap(stmts) self.test = Cat(self.test, cond) return self @deprecated("instead of `.Else(...)`, use `with m.Else(): ...`") def Else(self, *stmts): - self.cases["-" * len(self.test)] = ast.Statement.wrap(stmts) + self.cases[()] = ast.Statement.wrap(stmts) return self -- 2.30.2