rdelaage
/
gmid
mirror of https://github.com/omar-polo/gmid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

@-macros, rollback changes to strings and optional semicolons 

* expand $-macros as string, only the new @-macros get expanded as-is
* rollback changes to characters allowed in bare strings
* optional semicolons in optnl, useful for readable @-macros
This commit is contained in:
Omar Polo 2021-07-09 12:49:15 +00:00
parent c39be742cf
commit 67f494057a
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
parse.y
View File

@ -354,6 +354,7 @@ fastcgi : TSPAWN string {
;
optnl : '\n' optnl /* zero or more newlines */
| ';' optnl /* semicolons too */
| /*empty*/
;
@ -559,6 +560,30 @@ top:
while ((c = lgetc(0)) != '\n' && c != EOF)
; /* nothing */
if (c == '$' && !expanding) {
while (1) {
if ((c = lgetc(0)) == EOF)
return 0;
if (p + 1 >= buf + sizeof(buf) -1) {
yyerror("string too long");
return findeol();
}
if (isalnum(c) || c == '_') {
*p++ = c;
continue;
}
*p = '\0';
lungetc(c);
break;
}
val = symget(buf);
if (val == NULL) {
yyerror("macro `%s' not defined", buf);
return findeol();
}
yylval.v.string = xstrdup(val);
return STRING;
}
if (c == '@' && !expanding) {
while (1) {
if ((c = lgetc(0)) == EOF)
return 0;
@ -670,9 +695,9 @@ nodigits:
(isalnum(x) || (ispunct(x) && x != '(' && x != ')' && \
x != '{' && x != '}' && \
x != '!' && x != '=' && x != '#' && \
x != ','))
x != ',' && x != ';'))
if (isalnum(c) || c == ':' || c == '_' || c == '/' || c == '.') {
if (isalnum(c) || c == ':' || c == '_') {
do {
*p++ = c;
if ((size_t)(p-buf) >= sizeof(buf)) {