DSN reader: only the declared string_quote character opens a string
KiCad declares " and writes a keycap part number as a bare ', which the tokenizer took for an unterminated string (PCBench f.60_keyboard).
This commit is contained in:
@@ -9,6 +9,8 @@ tolerant ``skip_scope`` behaviour.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
|
||||
from .model import (
|
||||
ClearanceRule,
|
||||
ComponentPlace,
|
||||
@@ -481,12 +483,26 @@ def _read_network(node: SExp, board: DsnBoard) -> None:
|
||||
# --- top level ---------------------------------------------------------------
|
||||
|
||||
|
||||
_STRING_QUOTE = re.compile(r"\(\s*string_quote\s+(\S)\s*\)")
|
||||
|
||||
|
||||
def _declared_quote(text: str) -> str:
|
||||
"""The quote character the file declares in ``(string_quote X)``.
|
||||
|
||||
Only that character opens a string. Without a declaration both kinds are
|
||||
accepted, as before: KiCad declares ``"`` and then writes a bare ``'``
|
||||
where a value is a single quote mark, e.g. a keycap part number.
|
||||
"""
|
||||
found = _STRING_QUOTE.search(text[:4096])
|
||||
return found.group(1) if found else "\"'"
|
||||
|
||||
|
||||
def parse_dsn(text: str) -> DsnBoard:
|
||||
"""Parse DSN ``text`` into a :class:`DsnBoard`.
|
||||
|
||||
Raises :class:`DsnParseError` if the top-level scope is not ``(pcb ...)``.
|
||||
"""
|
||||
top = parse(text)
|
||||
top = parse(text, _declared_quote(text))
|
||||
if top.head != "pcb":
|
||||
raise DsnParseError(
|
||||
f"not a Specctra DSN file: expected top-level '(pcb ...)', got '({top.head} ...)'"
|
||||
|
||||
Reference in New Issue
Block a user