enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/edje/src/bin/edje_cc_out.c
View File

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