Commit 52d3b2f3 authored by Martin Jeřábek's avatar Martin Jeřábek

testfw: ghw_parse: case insensitive (lowercase) lookup

parent 5808ea4b
......@@ -74,8 +74,8 @@ def inject_types(h, ts):
inject_types(c, ts)
def find(h, fqn):
names = fqn.split('.')
def find_raw(h, fqn):
names = fqn.lower().split('.')
curr = h
def children(o):
return o.items if isinstance(o, types.t_record) else o.children
......@@ -93,7 +93,7 @@ def find(h, fqn):
m = re.match(r'^([^(]+)\(([0-9]+)\)$', name)
if not m:
raise KeyError('{} (from {}) not found in {}'
.format(name, fqn, sorted(curr.children.keys())),
.format(name, fqn, list(curr.children.keys())),
name, fqn, list(curr.children.keys()))
#print(name, m.groups())
name, index = m.groups()
......@@ -112,7 +112,11 @@ def find(h, fqn):
raise KeyError('{} (from {}) not found in {}'
.format(name, fqn, list(curr.children.keys())))
return curr
def find(h, fqn):
curr = find_raw(h, fqn)
if not isinstance(curr, types.t_base):
curr = curr.type
return curr
......@@ -63,7 +63,7 @@ class TclFuncs:
l, r = ranges[0].left, ranges[0].right
fqn += '({}:{})'.format(l, r)
fqn = 'top.' + fqn
return fqn.replace('(', '[').replace(')', ']')
return fqn.replace('(', '[').replace(')', ']').lower()
def _add_trace(self, signal, type, *, label: str, datafmt: str, expand: bool, **kwds):
if ghw_parse.is_record(type):
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment