generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Parse strings in ${} closes #131

Browse Source
This commit is contained in:
Jason Turner
2016-01-29 21:34:04 -07:00
parent bde2a45384
commit 7688c14d43
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/chaiscript/language/chaiscript_parser.hpp
View File

@@ -881,9 +881,19 @@ namespace chaiscript
char prev_char = *m_position;
++m_position;
while (m_position.has_more() && ((*m_position != '\"') || ((*m_position == '\"') && (prev_char == '\\')))) {
int in_interpolation = 0;
bool in_quote = false;
while (m_position.has_more() && ((*m_position != '\"') || ((*m_position == '\"') && (in_interpolation > 0)) || ((*m_position == '\"') && (prev_char == '\\')))) {
if (!Eol_()) {
if (prev_char == '\\') {
if (prev_char == '$' && *m_position == '{') {
++in_interpolation;
} else if (*m_position == '"') {
in_quote = !in_quote;
} else if (*m_position == '}' && !in_quote) {
--in_interpolation;
} else if (prev_char == '\\') {
prev_char = 0;
} else {
prev_char = *m_position;