jan/snarled
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve error handling

Browse Source
This commit is contained in:
Jan Petykiewicz 2024-08-01 00:34:31 -07:00
parent 012a242379
commit a3978b5f5e
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
snarled/trace.py
View File

@ -5,6 +5,7 @@ from itertools import chain
from klayout import db from klayout import db
from .types import lnum_t, layer_t from .types import lnum_t, layer_t
from .utils import SnarledError
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -165,8 +166,8 @@ def trace_layout(
# Merge labels from a separate layout if asked # Merge labels from a separate layout if asked
if lfile_path: if lfile_path:
if not lfile_map: if not lfile_map:
raise Exception('Asked to load labels from a separate file, but no ' raise SnarledError('Asked to load labels from a separate file, but no '
'label layers were specified in lfile_map') + 'label layers were specified in lfile_map')
if lfile_layer_map is None: if lfile_layer_map is None:
lfile_layer_map = layer_map lfile_layer_map = layer_map

34
snarled/utils.py
View File

@ -5,6 +5,10 @@ from .types import layer_t
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class SnarledError(Exception):
pass
def strip_underscored_label(string: str) -> str: def strip_underscored_label(string: str) -> str:
""" """
If the label ends in an underscore followed by an integer, strip If the label ends in an underscore followed by an integer, strip
@ -50,18 +54,18 @@ def read_layermap(path: str) -> dict[str, tuple[int, int]]:
for cc in '*-()': for cc in '*-()':
if cc in line: if cc in line:
raise Exception(f'Failed to read layermap on line {nn} due to special character "{cc}"') raise SnarledError(f'Failed to read layermap on line {nn} due to special character "{cc}"')
for cc in ':/': for cc in ':/':
if cc not in line: if cc not in line:
raise Exception(f'Failed to read layermap on line {nn}; missing "{cc}"') raise SnarledError(f'Failed to read layermap on line {nn}; missing "{cc}"')
try: try:
layer_part, name = line.split(':') layer_part, name = line.split(':')
layer_nums = str2lnum(layer_part) layer_nums = str2lnum(layer_part)
except Exception as err: except Exception:
logger.error(f'Layer map read failed on line {nn}') logger.exception(f'Layer map read failed on line {nn}')
raise err raise
layer_map[name.strip()] = layer_nums layer_map[name.strip()] = layer_nums
@ -101,7 +105,7 @@ def read_connectivity(path: str) -> list[tuple[layer_t, layer_t | None, layer_t]
parts = line.split(',') parts = line.split(',')
if len(parts) not in (2, 3): if len(parts) not in (2, 3):
raise Exception(f'Too many commas in connectivity spec on line {nn}') raise SnarledError(f'Too many commas in connectivity spec on line {nn}')
layers = [] layers = []
for part in parts: for part in parts:
@ -109,13 +113,13 @@ def read_connectivity(path: str) -> list[tuple[layer_t, layer_t | None, layer_t]
if '/' in part: if '/' in part:
try: try:
layer = str2lnum(part) layer = str2lnum(part)
except Exception as err: except Exception:
logger.error(f'Connectivity spec read failed on line {nn}') logger.exception(f'Connectivity spec read failed on line {nn}')
raise err raise
else: else:
layer = part.strip() layer = part.strip()
if not layer: if not layer:
raise Exception(f'Empty layer in connectivity spec on line {nn}') raise SnarledError(f'Empty layer in connectivity spec on line {nn}')
layers.append(layer) layers.append(layer)
if len(layers) == 2: if len(layers) == 2:
@ -156,7 +160,7 @@ def read_remap(path: str) -> dict[layer_t, layer_t]:
parts = line.split(':') parts = line.split(':')
if len(parts) != 2: if len(parts) != 2:
raise Exception(f'Too many commas in layer remap spec on line {nn}') raise SnarledError(f'Too many commas in layer remap spec on line {nn}')
layers = [] layers = []
for part in parts: for part in parts:
@ -164,13 +168,13 @@ def read_remap(path: str) -> dict[layer_t, layer_t]:
if '/' in part: if '/' in part:
try: try:
layer = str2lnum(part) layer = str2lnum(part)
except Exception as err: except Exception:
logger.error(f'Layer remap spec read failed on line {nn}') logger.exception(f'Layer remap spec read failed on line {nn}')
raise err raise
else: else:
layer = part.strip() layer = part.strip()
if not layer: if not layer:
raise Exception(f'Empty layer in layer remap spec on line {nn}') raise SnarledError(f'Empty layer in layer remap spec on line {nn}')
layers.append(layer) layers.append(layer)
remap[layers[0]] = layers[1] remap[layers[0]] = layers[1]