shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[sstruct] Accept pad byte format character

Browse Source 
The list of format characters that sstruct accepts was missing “x” for
ignored pad bytes.
This commit is contained in:
Khaled Hosny 2021-07-03 13:47:41 +02:00
parent bdd462f066
commit 383e70fc39
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/fontTools/misc/sstruct.py
View File

@ -59,7 +59,7 @@ class Error(Exception):
pass pass
def pack(fmt, obj): def pack(fmt, obj):
formatstring, names, fixes = getformat(fmt) formatstring, names, fixes = getformat(fmt, keep_pad_byte=True)
elements = [] elements = []
if not isinstance(obj, dict): if not isinstance(obj, dict):
obj = obj.__dict__ obj = obj.__dict__
@ -112,7 +112,7 @@ _elementRE = re.compile(
r"\s*" # whitespace r"\s*" # whitespace
r"([A-Za-z_][A-Za-z_0-9]*)" # name (python identifier) r"([A-Za-z_][A-Za-z_0-9]*)" # name (python identifier)
r"\s*:\s*" # whitespace : whitespace r"\s*:\s*" # whitespace : whitespace
r"([cbB?hHiIlLqQfd]|" # formatchar... r"([xcbB?hHiIlLqQfd]|" # formatchar...
r"[0-9]+[ps]|" # ...formatchar... r"[0-9]+[ps]|" # ...formatchar...
r"([0-9]+)\.([0-9]+)(F))" # ...formatchar r"([0-9]+)\.([0-9]+)(F))" # ...formatchar
r"\s*" # whitespace r"\s*" # whitespace
@ -132,7 +132,7 @@ _fixedpointmappings = {
_formatcache = {} _formatcache = {}
def getformat(fmt): def getformat(fmt, keep_pad_byte=False):
fmt = tostr(fmt, encoding="ascii") fmt = tostr(fmt, encoding="ascii")
try: try:
formatstring, names, fixes = _formatcache[fmt] formatstring, names, fixes = _formatcache[fmt]
@ -154,8 +154,9 @@ def getformat(fmt):
if not m: if not m:
raise Error("syntax error in fmt: '%s'" % line) raise Error("syntax error in fmt: '%s'" % line)
name = m.group(1) name = m.group(1)
names.append(name)
formatchar = m.group(2) formatchar = m.group(2)
if keep_pad_byte or formatchar != "x":
names.append(name)
if m.group(3): if m.group(3):
# fixed point # fixed point
before = int(m.group(3)) before = int(m.group(3))
@ -184,6 +185,7 @@ def _test():
afloat: f; adouble: d # multiple "statements" are allowed afloat: f; adouble: d # multiple "statements" are allowed
afixed: 16.16F afixed: 16.16F
abool: ? abool: ?
apad: x
""" """
print('size:', calcsize(fmt)) print('size:', calcsize(fmt))