From d5480c31031c147ebf7c3c14981666aa6f1857fd Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Sat, 21 Jan 2017 00:17:20 +0000 Subject: [PATCH] elm_code: Improve string syntax parsing --- src/lib/elementary/elm_code_syntax.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_code_syntax.c b/src/lib/elementary/elm_code_syntax.c index 3a35f2e632..96becb9236 100644 --- a/src/lib/elementary/elm_code_syntax.c +++ b/src/lib/elementary/elm_code_syntax.c @@ -90,7 +90,7 @@ elm_code_syntax_parse_line(Elm_Code_Syntax *syntax, Elm_Code_Line *line) { unsigned int start = i, end; - for (i++; content[i] != '"' && i < length; i++) {} + for (i++; i < length && (content[i] != '"' || content[i-1] == '\\'); i++) {} end = i; elm_code_line_token_add(line, start, end, 1, ELM_CODE_TOKEN_TYPE_STRING); @@ -100,7 +100,7 @@ elm_code_syntax_parse_line(Elm_Code_Syntax *syntax, Elm_Code_Line *line) { unsigned int start = i, end; - for (i++; content[i] != '\'' && i < length; i++) {} + for (i++; i < length && (content[i] != '\'' || content[i-1] == '\\'); i++) {} end = i; elm_code_line_token_add(line, start, end, 1, ELM_CODE_TOKEN_TYPE_STRING);