String concatenation ("foo""bar" -> "foobar") now works when used in arguments to PART/PROGRAM/IMAGE lookups, e.g. PART:"foo""bar" will look up the part id of "foobar".

SVN revision: 11836
This commit is contained in:
tsauerbeck 2004-10-11 20:48:32 +00:00 committed by tsauerbeck
parent c52cd76b91
commit 226bc8ccf3
1 changed files with 16 additions and 3 deletions

View File

@ -848,7 +848,14 @@ data_process_string(Edje_Part_Collection *pc, char *prefix, char *s, void (*func
if (!inesc)
{
if (*p == '\\') inesc = 1;
else if (*p == '\"') break;
else if (*p == '\"')
{
/* string concatenation, see below */
if (*(p + 1) != '\"')
break;
else
p++;
}
}
else
inesc = 0;
@ -872,8 +879,14 @@ data_process_string(Edje_Part_Collection *pc, char *prefix, char *s, void (*func
if (*pp == '\\') inesc = 1;
else if (*pp == '\"')
{
name[i] = 0;
break;
/* concat strings like "foo""bar" to "foobar" */
if (*(pp + 1) == '\"')
pp++;
else
{
name[i] = 0;
break;
}
}
else
{