nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

symbol parsing improvement

Browse Source 
This gets rid of a FIXME and K4056 internal bug report.

Allow the comma to be quoted as follows:
     SYMBOLS=S_ice:\,
or
     SYMBOLS=S_ice:','

Disclaimer:
The use of the comma on the map could conflict with future
use of that currently unused symbol for other intended purposes.
This commit is contained in:
nhmall
2023-12-04 14:20:07 -05:00
parent b0f5ad13e1
commit 418953e0e6
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/options.c
View File

@@ -6491,6 +6491,8 @@ escapes(const char *cp, /* might be 'tp', updating in place */
case 'r':
cval = '\r';
break;
case ',':
cval = ',';
default:
cval = *cp;
}

38
src/symbols.c
View File

@@ -764,25 +764,43 @@ boolean
parsesymbols(register char *opts, int which_set)
{
int val;
char *op, *symname, *strval;
unsigned i;
char *symname, *strval, *ch = opts,
*first_unquoted_comma = 0, *first_unquoted_colon = 0;
const struct symparse *symp;
boolean is_glyph = FALSE;
/*
* FIXME:
* The parsing here (and next) yields incorrect results for
* "S_sample=','" or "S_sample=':'".
*/
/* are there any commas or colons that aren't quoted? */
for (i = 0; i < strlen(opts); ++i) {
char *prech, *postch;
if ((op = strchr(opts, ',')) != 0) {
*op++ = '\0';
if (!parsesymbols(op, which_set))
ch++; /* we never want to match on the first char, so this is ok */
prech = ch - 1;
postch = ch + 1;
if (*ch == ',') {
if (*prech == '\'' && *postch == '\'')
continue;
if (*prech == '\\')
continue;
}
if (*ch == ':') {
if (*prech == '\'' && *postch == '\'')
continue;
}
if (*ch == ',' && !first_unquoted_comma)
first_unquoted_comma = ch;
if (*ch == ':' && !first_unquoted_colon)
first_unquoted_colon = ch;
}
if (first_unquoted_comma != 0) {
*first_unquoted_comma++ = '\0';
if (!parsesymbols(first_unquoted_comma, which_set))
return FALSE;
}
/* S_sample:string */
symname = opts;
strval = strchr(opts, ':');
strval = first_unquoted_colon;
if (!strval)
strval = strchr(opts, '=');
if (!strval)