Modified the "makedbh.in" script ("makedbh", after running
configure) so that it does not use python-3.6-style f-strings, and so is backwardly compatible with any python-3 revision.
This commit is contained in:
parent
22ea7a924f
commit
df6333bb7b
|
|
@ -12,10 +12,8 @@ maxtypes_rx = re.compile(r"#define\s+TT_MAXTYPES\s+(\d+)")
|
||||||
|
|
||||||
match = maxtypes_rx.findall(database_h_in)
|
match = maxtypes_rx.findall(database_h_in)
|
||||||
if len(match) == 0:
|
if len(match) == 0:
|
||||||
print(
|
print("Bad regular expression in " + sys.argv[0] + ": Cannot "
|
||||||
f"Bad regular expression in {sys.argv[0]}: Cannot generate database/database.h!",
|
+ "generate database/database.h!", file=sys.stderr)
|
||||||
file=sys.stderr,
|
|
||||||
)
|
|
||||||
exit(-1)
|
exit(-1)
|
||||||
|
|
||||||
maxtypes = int(match[0])
|
maxtypes = int(match[0])
|
||||||
|
|
@ -33,20 +31,20 @@ out_string = database_h_in
|
||||||
|
|
||||||
def p(string):
|
def p(string):
|
||||||
global out_string
|
global out_string
|
||||||
out_string += f"{string}"
|
out_string += string
|
||||||
|
|
||||||
|
|
||||||
# Generated macros
|
# Generated macros
|
||||||
def add_generated_mask_macro(name, expression, *, connector=","):
|
def add_generated_mask_macro(name, expression, *, connector=","):
|
||||||
global maskwords
|
global maskwords
|
||||||
|
|
||||||
p(f"#define {name} ( \\\n")
|
p("#define " + name + " ( \\\n")
|
||||||
for i in reversed(range(maskwords)):
|
for i in reversed(range(maskwords)):
|
||||||
p(f"\t{expression.format(i=i)}")
|
p("\t" + expression.format(i=i))
|
||||||
if i == 0:
|
if i == 0:
|
||||||
p(")\n\n")
|
p(")\n\n")
|
||||||
else:
|
else:
|
||||||
p(f"{connector} \\\n")
|
p(connector + " \\\n")
|
||||||
|
|
||||||
|
|
||||||
add_generated_mask_macro(
|
add_generated_mask_macro(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue