vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edc_parser: Fix to show double quotation marks(") 

Change the markup for double quotation marks from "\"" to """.
This commit is contained in:
Jaehyun Cho 2015-01-16 17:56:26 +09:00
parent aeb4bcda16
commit af1dc2f23d
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/edc_parser.c
View File

@ -68,7 +68,7 @@ group_name_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
while (p <= end)
{
//Skip "" range
if (*p == *quot)
if (!strncmp(p, quot, quot_len))
{
p += quot_len;
p = strstr(p, quot);
@ -146,7 +146,7 @@ cur_name_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
while (p <= end)
{
//Skip "" range
if (*p == *quot)
if (!strncmp(p, quot, quot_len))
{
p += quot_len;
p = strstr(p, quot);
@ -851,6 +851,7 @@ group_beginning_pos_get(const char* source, const char *group_name)
{
const char* GROUP_SYNTAX_NAME = "group";
const char *quot = QUOT;
const int quot_len = QUOT_LEN;
const char *pos = strstr(source, GROUP_SYNTAX_NAME);
@ -859,7 +860,8 @@ group_beginning_pos_get(const char* source, const char *group_name)
{
const char *name = strstr(pos, quot);
if (!name) return NULL;
pos = strstr(++name, quot);
name += quot_len;
pos = strstr(name, quot);
if (!pos) return NULL;
if (!strncmp(name, group_name, strlen(group_name)))
return pos;
@ -1054,7 +1056,7 @@ parser_paragh_name_get(parser_data *pd EINA_UNUSED, Evas_Object *entry)
while (cur <= end)
{
//Skip "" range
if (*cur == *quot)
if (!strncmp(cur, quot, quot_len))
{
cur += quot_len;
cur = strstr(cur, quot);
@ -1118,7 +1120,7 @@ parser_cur_name_fast_get(Evas_Object *entry, const char *scope)
while (p <= end)
{
//Skip "" range
if (*p == *quot)
if (!strncmp(p, quot, quot_len))
{
p += quot_len;
p = strstr(p, quot);

5
src/lib/enventor_private.h
View File

@ -1,9 +1,8 @@
#ifndef __ENVENTOR_PRIVATE_H__
#define __ENVENTOR_PRIVATE_H__
#define QUOT "\""
#define QUOT_C '\"'
#define QUOT_LEN 1
#define QUOT "&quot;"
#define QUOT_LEN 6
#define EOL "<br/>"
#define EOL_LEN 5
#define TAB "<tab/>"

21
src/lib/syntax_color.c
View File

@ -386,25 +386,20 @@ string_apply(Eina_Strbuf *strbuf, char **cur, char **prev,
const Eina_Stringshare *col, Eina_Bool inside_string)
{
//escape string: " ~ "
if ((*cur)[0] != QUOT_C) return 0;
if (strncmp(*cur, QUOT, QUOT_LEN)) return 0;
char buf[128];
if (!inside_string)
{
snprintf(buf, sizeof(buf), "<color=#%s>", col);
eina_strbuf_append(strbuf, buf);
}
eina_strbuf_append_length(strbuf, *prev, (*cur - *prev) + 1);
if (inside_string)
{
snprintf(buf, sizeof(buf), "</color>");
eina_strbuf_append(strbuf, buf);
}
if (!inside_string)
snprintf(buf, sizeof(buf), "<color=#%s>%s", col, QUOT);
else
snprintf(buf, sizeof(buf), "%s</color>", QUOT);
(*cur)++;
eina_strbuf_append(strbuf, buf);
*cur += QUOT_LEN;
*prev = *cur;
return 1;