Skip to content

Commit 28e80e4

Browse files
committed
makeqstrdefs: don't make _and_, _or_ poisoned substrings for QSTRs
New contributor @mdroberts1243 encountered an interesting problem in which the argument they had named "column_underscore_and_page_addressing" simply couldn't be used; I discovered that internally this had been transformed into "column_underscore∧page_addressing", because QSTR makes _ENTITY_ stand for the same thing as &ENTITY; does in HTML. This might be nice for some things, but we don't want it here! I was unable to find a sensible way to "escape" and prevent this entity coding, so instead I ripped out support for the _and_ and _or_ escapes.
1 parent df067b4 commit 28e80e4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

py/makeqstrdefs.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
name2codepoint['pipe'] = ord('|')
5858
name2codepoint['tilde'] = ord('~')
5959

60+
# These are just vexing!
61+
del name2codepoint['and']
62+
del name2codepoint['or']
63+
6064
def write_out(fname, output):
6165
if output:
6266
for m, r in [("/", "__"), ("\\", "__"), (":", "@"), ("..", "@@")]:

0 commit comments

Comments
 (0)