Different fix for arrays of unpacked strings
Do it the same way as it's done for packed strings, for consistency.
This commit is contained in:
parent
c316b6d3be
commit
4831cb76a3
@ -1746,7 +1746,6 @@ static const unsigned char *unpackedstring(const unsigned char *lptr,int *flags)
|
|||||||
instring=1;
|
instring=1;
|
||||||
*flags |= STRINGIZE;
|
*flags |= STRINGIZE;
|
||||||
} else if (*lptr==')' || *lptr==',' || *lptr=='}' || *lptr==';' || *lptr=='\r' || *lptr=='\n') {
|
} else if (*lptr==')' || *lptr==',' || *lptr=='}' || *lptr==';' || *lptr=='\r' || *lptr=='\n') {
|
||||||
lptr=stringize;
|
|
||||||
break;
|
break;
|
||||||
} else if (*lptr!=' ' && *lptr!='\t') {
|
} else if (*lptr!=' ' && *lptr!='\t') {
|
||||||
error(1,"-string end-","-identifier-");
|
error(1,"-string end-","-identifier-");
|
||||||
@ -1786,7 +1785,9 @@ static const unsigned char *unpackedstring(const unsigned char *lptr,int *flags)
|
|||||||
litadd(litchar(&lptr,*flags | UTF8MODE)); /* litchar() alters "lptr" */
|
litadd(litchar(&lptr,*flags | UTF8MODE)); /* litchar() alters "lptr" */
|
||||||
} /* while */
|
} /* while */
|
||||||
litadd(0);
|
litadd(0);
|
||||||
|
|
||||||
|
if (*lptr==',' || *lptr==')' || *lptr=='}' || *lptr==';' || *lptr=='\n' || *lptr=='\r')
|
||||||
|
lptr=stringize; /* backtrack to end of last string for closing " */
|
||||||
return lptr;
|
return lptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user