tracer: factor out get_var_name(default=).

This commit is contained in:
whitequark 2019-02-15 14:15:02 +00:00
parent cac4b10b82
commit e93bf4bf4b
4 changed files with 15 additions and 28 deletions

View file

@ -581,12 +581,7 @@ class Signal(Value, DUID):
attrs=None, decoder=None, src_loc_at=0):
super().__init__(src_loc_at=src_loc_at)
if name is None:
try:
name = tracer.get_var_name(depth=2 + src_loc_at)
except tracer.NameNotFound:
name = "$signal"
self.name = name
self.name = name or tracer.get_var_name(depth=2 + src_loc_at, default="$signal")
if shape is None:
if min is None:
@ -625,12 +620,8 @@ class Signal(Value, DUID):
other : Value
Object to base this Signal on.
"""
if name is None:
try:
name = tracer.get_var_name(depth=2 + src_loc_at)
except tracer.NameNotFound:
name = "$like"
kw = dict(shape=cls.wrap(other).shape(), name=name)
name = name or tracer.get_var_name(depth=2 + src_loc_at, default="$like")
kw = dict(shape=cls.wrap(other).shape(), name=name)
if isinstance(other, cls):
kw.update(reset=other.reset, reset_less=other.reset_less,
attrs=other.attrs, decoder=other.decoder)

View file

@ -15,12 +15,7 @@ class Memory:
raise TypeError("Memory depth must be a non-negative integer, not '{!r}'"
.format(depth))
if name is None:
try:
name = tracer.get_var_name(depth=2)
except tracer.NameNotFound:
name = "$memory"
self.name = name
self.name = name or tracer.get_var_name(depth=2, default="$memory")
self.src_loc = tracer.get_src_loc()
self.width = width
@ -194,10 +189,7 @@ class DummyPort:
if granularity is None:
granularity = width
if name is None:
try:
name = tracer.get_var_name(depth=2)
except tracer.NameNotFound:
name = "dummy"
name = tracer.get_var_name(depth=2, default="dummy")
self.addr = Signal(addr_bits,
name="{}_addr".format(name))

View file

@ -64,10 +64,8 @@ class Layout:
class Record(Value):
def __init__(self, layout, name=None):
if name is None:
try:
name = tracer.get_var_name()
except tracer.NameNotFound:
pass
name = tracer.get_var_name(default=None)
self.name = name
self.src_loc = tracer.get_src_loc()