Re: master: Restore non-simple strings of length 1 as character designators

VGhlIGFycmF5IHR5cGUgc3BlY2lmaWVycyBzaG91bGQgZmluYWxseSBiZSBleHRlbmRlZC4gVG8g
ZXhwcmVzcyBmcC9ubwpmcCwgbGVuZ3RoLCBsaWtlIHRoaXMsIGRpc3BsYWNlbWVudCwgZXRjLiBB
bmQgYWxzbyBhbGxvdyBtYWtpbmcgdGhlCmxlbmd0aCB2YXJpYWJsZSwgaS5lLiAoc3RyaW5nIChp
bnRlZ2VyIDAgNSkpLgoKT24gU3VuLCBNYXkgMywgMjAyNiBhdCAxOjA44oCvQU0gY3Job2RlcyB2
aWEgU2JjbC1jb21taXRzCjxzYmNsLWNvbW1pdHNAbGlzdHMuc291cmNlZm9yZ2UubmV0PiB3cm90
ZToKPgo+IFRoZSBicmFuY2ggIm1hc3RlciIgaGFzIGJlZW4gdXBkYXRlZCBpbiBTQkNMOgo+ICAg
ICAgICB2aWEgIDM5YTk3YzczMjg3ZjFmNTVkYWUzN2RjMmUzNTFiYWRiNWRhMjUzNmYgKGNvbW1p
dCkKPiAgICAgICBmcm9tICAwNzIwNjFiNTY3ZTliZDNkNmMyZDRiNDI5NzJkNWJhZWJhMDcwMTcy
IChjb21taXQpCj4KPiAtIExvZyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+IGNvbW1pdCAzOWE5N2M3MzI4N2YxZjU1ZGFl
MzdkYzJlMzUxYmFkYjVkYTI1MzZmCj4gQXV0aG9yOiBDaHJpc3RvcGhlIFJob2RlcyA8Y3NyMjFA
Y2FudGFiLm5ldD4KPiBEYXRlOiAgIFNhdCBNYXkgMiAyMjo0NTo1OCAyMDI2ICswMTAwCj4KPiAg
ICAgUmVzdG9yZSBub24tc2ltcGxlIHN0cmluZ3Mgb2YgbGVuZ3RoIDEgYXMgY2hhcmFjdGVyIGRl
c2lnbmF0b3JzCj4KPiAgICAgVGhlIDEgaW4gdGhlIChTVFJJTkcgMSkgdHlwZSByZWZlcnMgdG8g
dGhlIHNpemUgb2YgdGhlIHVuZGVybHlpbmcKPiAgICAgYXJyYXksIG5vdCB0aGUgbGVuZ3RoIG9m
IHRoZSBzZXF1ZW5jZS4KPiAtLS0KPiAgTkVXUyAgICAgICAgICAgICAgICAgICAgICAgfCAgNCAr
KysrCj4gIHNyYy9jb2RlL3RhcmdldC1jaGFyLmxpc3AgIHwgMTAgKysrKysrKystLQo+ICBzcmMv
Y29tcGlsZXIvZm5kYi5saXNwICAgICB8ICAyICstCj4gIHNyYy9jb21waWxlci90eXBldHJhbi5s
aXNwIHwgIDIgKy0KPiAgdGVzdHMvY2hhcmFjdGVyLnB1cmUubGlzcCAgfCAyMiArKysrKysrKysr
KysrKysrKysrKystCj4gIDUgZmlsZXMgY2hhbmdlZCwgMzUgaW5zZXJ0aW9ucygrKSwgNSBkZWxl
dGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9ORVdTIGIvTkVXUwo+IGluZGV4IDAxYTcxZmY1Ny4u
MzQzMTMzY2RmIDEwMDY0NAo+IC0tLSBhL05FV1MKPiArKysgYi9ORVdTCj4gQEAgLTEsNSArMSw5
IEBACj4gIDs7OzsgLSotIGNvZGluZzogdXRmLTg7IGZpbGwtY29sdW1uOiA3OCAtKi0KPgo+ICtj
aGFuZ2VzIHJlbGF0aXZlIHRvIHNiY2wtMi42LjQ6Cj4gKyAgKiBidWcgZml4OiBzdHJpbmdzIG9m
IGFyYml0cmFyeSBzaXplIHdpdGggZmlsbC1wb2ludGVyIHNldCB0byAxIGFyZQo+ICsgICAgY2hh
cmFjdGVyIGRlc2lnbmF0b3JzLiAgKHJlcG9ydGVkIGJ5IF9kZWF0aCkKPiArCj4gIGNoYW5nZXMg
aW4gc2JjbC0yLjYuNCByZWxhdGl2ZSB0byBzYmNsLTIuNi4zOgo+ICAgICogbWlub3IgaW5jb21w
YXRpYmxlIGNoYW5nZTogd2hlbiBERUZTRVRGIGlzIGNhbGxlZCBvbiBhIG5hbWUgdGhhdCB3YXMK
PiAgICAgIHByZXZpb3VzbHkgdXNlZCBhcyBhIChwcmVzdW1lZCkgY2FsbCB0byBhIGZ1bmN0aW9u
LCBpdCBpc3N1ZXMgYSBzaW5nbGUKPiBkaWZmIC0tZ2l0IGEvc3JjL2NvZGUvdGFyZ2V0LWNoYXIu
bGlzcCBiL3NyYy9jb2RlL3RhcmdldC1jaGFyLmxpc3AKPiBpbmRleCBkM2FlMmM4N2MuLmE2ZDJj
ZTE0MSAxMDA2NDQKPiAtLS0gYS9zcmMvY29kZS90YXJnZXQtY2hhci5saXNwCj4gKysrIGIvc3Jj
L2NvZGUvdGFyZ2V0LWNoYXIubGlzcAo+IEBAIC0yNDksMTQgKzI0OSwyMCBAQCB0aGVyZSBhcmUg
bm8gY2hhcmFjdGVyIGJpdHMgb3IgZm9udHMuKSIKPiAgICAiUmV0dXJuIHRoZSBjaGFyYWN0ZXIg
d2l0aCB0aGUgY29kZSBDT0RFLiIKPiAgICAoY29kZS1jaGFyIGNvZGUpKQo+Cj4gKyhkZWZ1biBs
ZW5ndGgtMS1zdHJpbmctcCAoeCkKPiArICAoYW5kICh0eXBlcCB4ICdzdHJpbmcpICg9IChsZW5n
dGggeCkgMSkpKQo+ICsoZGVmdW4gc3ltYm9sLXdpdGgtbGVuZ3RoLTEtbmFtZS1wICh4KQo+ICsg
IChhbmQgKHR5cGVwIHggJ3N5bWJvbCkgKGxlbmd0aC0xLXN0cmluZy1wIChzeW1ib2wtbmFtZSB4
KSkpKQo+ICsoZGVmdHlwZSBjaGFyYWN0ZXItZGVzaWduYXRvciAoKQo+ICsgICcob3IgY2hhcmFj
dGVyIChzYXRpc2ZpZXMgbGVuZ3RoLTEtc3RyaW5nLXApIChzYXRpc2ZpZXMgc3ltYm9sLXdpdGgt
bGVuZ3RoLTEtbmFtZS1wKSkpCj4gKwo+ICAoZGVmdW4gY2hhcmFjdGVyIChvYmplY3QpCj4gICAg
IkNvZXJjZSBPQkpFQ1QgaW50byBhIENIQVJBQ1RFUiBpZiBwb3NzaWJsZS4gTGVnYWwgaW5wdXRz
IGFyZSBjaGFyYWN0ZXJzLAo+ICBzdHJpbmdzIGFuZCBzeW1ib2xzIG9mIGxlbmd0aCAxLiIKPiAg
ICAoZmxldCAoKGRvLWVycm9yIChjb250cm9sIGFyZ3MpCj4gICAgICAgICAgICAgKGVycm9yICdz
aW1wbGUtdHlwZS1lcnJvcgo+ICAgICAgICAgICAgICAgICAgICA6ZGF0dW0gb2JqZWN0Cj4gLSAg
ICAgICAgICAgICAgICAgIDs7Pz8gaG93IHRvIGV4cHJlc3MgInN5bWJvbCB3aXRoIG5hbWUgb2Yg
bGVuZ3RoIDEiPwo+IC0gICAgICAgICAgICAgICAgICA6ZXhwZWN0ZWQtdHlwZSAnKG9yIGNoYXJh
Y3RlciAoc3RyaW5nIDEpKQo+ICsgICAgICAgICAgICAgICAgICA6ZXhwZWN0ZWQtdHlwZSAnY2hh
cmFjdGVyLWRlc2lnbmF0b3IKPiAgICAgICAgICAgICAgICAgICAgOmZvcm1hdC1jb250cm9sIGNv
bnRyb2wKPiAgICAgICAgICAgICAgICAgICAgOmZvcm1hdC1hcmd1bWVudHMgYXJncykpKQo+ICAg
ICAgKHR5cGVjYXNlIG9iamVjdAo+IGRpZmYgLS1naXQgYS9zcmMvY29tcGlsZXIvZm5kYi5saXNw
IGIvc3JjL2NvbXBpbGVyL2ZuZGIubGlzcAo+IGluZGV4IDRiZWUxODQzZi4uNmVkNzcwMTFjIDEw
MDY0NAo+IC0tLSBhL3NyYy9jb21waWxlci9mbmRiLmxpc3AKPiArKysgYi9zcmMvY29tcGlsZXIv
Zm5kYi5saXNwCj4gQEAgLTU5MSw3ICs1OTEsNyBAQAo+ICAgICAgKGNoYXJhY3RlciBjaGFyYWN0
ZXIpIGJvb2xlYW4KPiAgICAobW92YWJsZSBmb2xkYWJsZSBmbHVzaGFibGUgbm8tdmVyaWZ5LWFy
Zy1jb3VudCkpCj4KPiAtKGRlZmtub3duIGNoYXJhY3RlciAoKG9yIGNoYXJhY3RlciAoc3RyaW5n
IDEpIHN5bWJvbCkpCj4gKyhkZWZrbm93biBjaGFyYWN0ZXIgKChvciBjaGFyYWN0ZXIgKHNpbXBs
ZS1zdHJpbmcgMSkgKGFuZCBzdHJpbmcgKG5vdCBzaW1wbGUtc3RyaW5nKSkgc3ltYm9sKSkKPiAg
ICAgIGNoYXJhY3Rlcgo+ICAgICAgKG1vdmFibGUgZm9sZGFibGUgdW5zYWZlbHktZmx1c2hhYmxl
KSkKPiAgKGRlZmtub3duIGNoYXItY29kZSAoY2hhcmFjdGVyKSAlY2hhci1jb2RlIChtb3ZhYmxl
IGZvbGRhYmxlIGZsdXNoYWJsZSkpCj4gZGlmZiAtLWdpdCBhL3NyYy9jb21waWxlci90eXBldHJh
bi5saXNwIGIvc3JjL2NvbXBpbGVyL3R5cGV0cmFuLmxpc3AKPiBpbmRleCBlNmFkYzEwZmMuLmIx
OThjMWYzNSAxMDA2NDQKPiAtLS0gYS9zcmMvY29tcGlsZXIvdHlwZXRyYW4ubGlzcAo+ICsrKyBi
L3NyYy9jb21waWxlci90eXBldHJhbi5saXNwCj4gQEAgLTE4NDYsNyArMTg0Niw3IEBACj4gICAg
ICAgICAgICAgICAoZmFpbCkpKQo+ICAgICAgICAgICAgKChlcWwgdHlwZS1zcGVjaWZpZXIgJ2No
YXJhY3RlcikKPiAgICAgICAgICAgICAodW5sZXNzICh0eXBlcy1lcXVhbC1vci1pbnRlcnNlY3Qg
dmFsdWUtdHlwZQo+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAoc3BlY2lmaWVyLXR5cGUgJyhvciBzeW1ib2wgKHN0cmluZyAxKSkpKQo+ICsgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3BlY2lmaWVyLXR5cGUgJyhvciBz
eW1ib2wgKHNpbXBsZS1zdHJpbmcgMSkgKGFuZCBzdHJpbmcgKG5vdCBzaW1wbGUtc3RyaW5nKSkp
KSkKPiAgICAgICAgICAgICAgIChmYWlsKSkpCj4gICAgICAgICAgICAoKGNzdWJ0eXBlcCB0by10
eXBlIChzcGVjaWZpZXItdHlwZSAnY29tcGxleCkpCj4gICAgICAgICAgICAgKHVubGVzcyAodHlw
ZXMtZXF1YWwtb3ItaW50ZXJzZWN0IHZhbHVlLXR5cGUKPiBkaWZmIC0tZ2l0IGEvdGVzdHMvY2hh
cmFjdGVyLnB1cmUubGlzcCBiL3Rlc3RzL2NoYXJhY3Rlci5wdXJlLmxpc3AKPiBpbmRleCBjZjIw
M2MwNTIuLjcyMmMzN2U4MiAxMDA2NDQKPiAtLS0gYS90ZXN0cy9jaGFyYWN0ZXIucHVyZS5saXNw
Cj4gKysrIGIvdGVzdHMvY2hhcmFjdGVyLnB1cmUubGlzcAo+IEBAIC0yMzgsNCArMjM4LDI0IEBA
Cj4gICAgIChsYW1iZGEgKHgpCj4gICAgICAgKGNoYXJhY3RlciB4KQo+ICAgICAgIHgpCj4gLSAg
IChvciAoc3RyaW5nIDEpIGNoYXJhY3RlciBzeW1ib2wpKSkKPiArICAgKG9yIChzaW1wbGUtc3Ry
aW5nIDEpIChhbmQgc3RyaW5nIChub3Qgc2ltcGxlLXN0cmluZykpIGNoYXJhY3RlciBzeW1ib2wp
KSkKPiArCj4gKyh3aXRoLXRlc3QgKDpuYW1lIChjaGFyYWN0ZXIgOmlucHV0IDpmaWxsLXBvaW50
ZXIpKQo+ICsgIChjaGVja2VkLWNvbXBpbGUtYW5kLWFzc2VydAo+ICsgICAoKQo+ICsgICBgKGxh
bWJkYSAoeCkgKGNoYXJhY3RlciB4KSkKPiArICAgKCgobWFrZS1hcnJheSAxIDplbGVtZW50LXR5
cGUgJ2NoYXJhY3RlciA6ZmlsbC1wb2ludGVyIDAgOmluaXRpYWwtZWxlbWVudCAjXHgpKSAoY29u
ZGl0aW9uICd0eXBlLWVycm9yKSkKPiArICAgKCgobWFrZS1hcnJheSAxIDplbGVtZW50LXR5cGUg
J2NoYXJhY3RlciA6ZmlsbC1wb2ludGVyIDEgOmluaXRpYWwtZWxlbWVudCAjXHgpKSAjXHgpCj4g
KyAgICgoKG1ha2UtYXJyYXkgMiA6ZWxlbWVudC10eXBlICdjaGFyYWN0ZXIgOmZpbGwtcG9pbnRl
ciAwIDppbml0aWFsLWVsZW1lbnQgI1x4KSkgKGNvbmRpdGlvbiAndHlwZS1lcnJvcikpCj4gKyAg
ICgoKG1ha2UtYXJyYXkgMiA6ZWxlbWVudC10eXBlICdjaGFyYWN0ZXIgOmZpbGwtcG9pbnRlciAx
IDppbml0aWFsLWVsZW1lbnQgI1x4KSkgI1x4KQo+ICsgICAoKChtYWtlLWFycmF5IDIgOmVsZW1l
bnQtdHlwZSAnY2hhcmFjdGVyIDpmaWxsLXBvaW50ZXIgMiA6aW5pdGlhbC1lbGVtZW50ICNceCkp
IChjb25kaXRpb24gJ3R5cGUtZXJyb3IpKSkpCj4gKwo+ICsod2l0aC10ZXN0ICg6bmFtZSAoY29l
cmNlIGNoYXJhY3RlciA6aW5wdXQgOmZpbGwtcG9pbnRlcikpCj4gKyAgKGNoZWNrZWQtY29tcGls
ZS1hbmQtYXNzZXJ0Cj4gKyAgICgpCj4gKyAgIGAobGFtYmRhICh4IHkpIChjb2VyY2UgeCB5KSkK
PiArICAgKCgobWFrZS1hcnJheSAxIDplbGVtZW50LXR5cGUgJ2NoYXJhY3RlciA6ZmlsbC1wb2lu
dGVyIDAgOmluaXRpYWwtZWxlbWVudCAjXHgpICdjaGFyYWN0ZXIpIChjb25kaXRpb24gJ3R5cGUt
ZXJyb3IpKQo+ICsgICAoKChtYWtlLWFycmF5IDEgOmVsZW1lbnQtdHlwZSAnY2hhcmFjdGVyIDpm
aWxsLXBvaW50ZXIgMSA6aW5pdGlhbC1lbGVtZW50ICNceCkgJ2NoYXJhY3RlcikgI1x4KQo+ICsg
ICAoKChtYWtlLWFycmF5IDIgOmVsZW1lbnQtdHlwZSAnY2hhcmFjdGVyIDpmaWxsLXBvaW50ZXIg
MCA6aW5pdGlhbC1lbGVtZW50ICNceCkgJ2NoYXJhY3RlcikgKGNvbmRpdGlvbiAndHlwZS1lcnJv
cikpCj4gKyAgICgoKG1ha2UtYXJyYXkgMiA6ZWxlbWVudC10eXBlICdjaGFyYWN0ZXIgOmZpbGwt
cG9pbnRlciAxIDppbml0aWFsLWVsZW1lbnQgI1x4KSAnY2hhcmFjdGVyKSAjXHgpCj4gKyAgICgo
KG1ha2UtYXJyYXkgMiA6ZWxlbWVudC10eXBlICdjaGFyYWN0ZXIgOmZpbGwtcG9pbnRlciAyIDpp
bml0aWFsLWVsZW1lbnQgI1x4KSAnY2hhcmFjdGVyKSAoY29uZGl0aW9uICd0eXBlLWVycm9yKSkp
KQo+Cj4gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0KPgo+Cj4gaG9va3MvcG9zdC1yZWNlaXZlCj4gLS0KPiBTQkNM
Cj4KPgo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4g
U2JjbC1jb21taXRzIG1haWxpbmcgbGlzdAo+IFNiY2wtY29tbWl0c0BsaXN0cy5zb3VyY2Vmb3Jn
ZS5uZXQKPiBodHRwczovL2xpc3RzLnNvdXJjZWZvcmdlLm5ldC9saXN0cy9saXN0aW5mby9zYmNs
LWNvbW1pdHMKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
XwpTYmNsLWNvbW1pdHMgbWFpbGluZyBsaXN0ClNiY2wtY29tbWl0c0BsaXN0cy5zb3VyY2Vmb3Jn
ZS5uZXQKaHR0cHM6Ly9saXN0cy5zb3VyY2Vmb3JnZS5uZXQvbGlzdHMvbGlzdGluZm8vc2JjbC1j
b21taXRzCg==