From 4831cb76a37f3ac2ae7e6205e2a65f85789459b1 Mon Sep 17 00:00:00 2001 From: Zeex Date: Tue, 31 Dec 2013 00:00:11 +0700 Subject: [PATCH] Different fix for arrays of unpacked strings Do it the same way as it's done for packed strings, for consistency. --- source/compiler/sc2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/compiler/sc2.c b/source/compiler/sc2.c index 47ee51c..666dede 100644 --- a/source/compiler/sc2.c +++ b/source/compiler/sc2.c @@ -1746,7 +1746,6 @@ static const unsigned char *unpackedstring(const unsigned char *lptr,int *flags) instring=1; *flags |= STRINGIZE; } else if (*lptr==')' || *lptr==',' || *lptr=='}' || *lptr==';' || *lptr=='\r' || *lptr=='\n') { - lptr=stringize; break; } else if (*lptr!=' ' && *lptr!='\t') { 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" */ } /* while */ litadd(0); - + + if (*lptr==',' || *lptr==')' || *lptr=='}' || *lptr==';' || *lptr=='\n' || *lptr=='\r') + lptr=stringize; /* backtrack to end of last string for closing " */ return lptr; }