jan/masque
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

flatten indentation where it makes sense

Browse source
This commit is contained in:
Jan Petykiewicz 2024-07-28 19:56:57 -07:00
commit 39d9b88fa4
10 changed files with 22 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
masque/builder/pather.py
View file

@ -658,7 +658,7 @@ class Pather(Builder):
if not bound_types:
raise BuildError('No bound type specified for mpath')
elif len(bound_types) > 1:
if len(bound_types) > 1:
raise BuildError(f'Too many bound types specified for mpath: {bound_types}')
bound_type = tuple(bound_types)[0]
@ -672,13 +672,13 @@ class Pather(Builder):
# Not a bus, so having a container just adds noise to the layout
port_name = tuple(portspec)[0]
return self.path(port_name, ccw, extensions[port_name], tool_port_names=tool_port_names, **kwargs)
else:
bld = Pather.interface(source=ports, library=self.library, tools=self.tools)
for port_name, length in extensions.items():
bld.path(port_name, ccw, length, tool_port_names=tool_port_names, **kwargs)
name = self.library.get_name(base_name)
self.library[name] = bld.pattern
return self.plug(Abstract(name, bld.pattern.ports), {sp: 'in_' + sp for sp in ports.keys()}) # TODO safe to use 'in_'?
bld = Pather.interface(source=ports, library=self.library, tools=self.tools)
for port_name, length in extensions.items():
bld.path(port_name, ccw, length, tool_port_names=tool_port_names, **kwargs)
name = self.library.get_name(base_name)
self.library[name] = bld.pattern
return self.plug(Abstract(name, bld.pattern.ports), {sp: 'in_' + sp for sp in ports}) # TODO safe to use 'in_'?
# TODO def bus_join()?

2
masque/builder/renderpather.py
View file

@ -561,7 +561,7 @@ class RenderPather(PortList):
if not bound_types:
raise BuildError('No bound type specified for mpath')
elif len(bound_types) > 1:
if len(bound_types) > 1:
raise BuildError(f'Too many bound types specified for mpath: {bound_types}')
bound_type = tuple(bound_types)[0]

2
masque/builder/utils.py
View file

@ -113,7 +113,7 @@ def ell(
is_horizontal = numpy.isclose(rotations[0] % pi, 0)
if bound_type in ('ymin', 'ymax') and is_horizontal:
raise BuildError(f'Asked for {bound_type} position but ports are pointing along the x-axis!')
elif bound_type in ('xmin', 'xmax') and not is_horizontal:
if bound_type in ('xmin', 'xmax') and not is_horizontal:
raise BuildError(f'Asked for {bound_type} position but ports are pointing along the y-axis!')
direction = rotations[0] + pi # direction we want to travel in (+pi relative to port)