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

Add \r skipping code from @jespada

Browse Source
This commit is contained in:
Jason Turner
2014-11-03 21:37:25 -07:00
parent f5304ac75c
commit 99396ba05c
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,16 +266,27 @@ namespace chaiscript
return false; return false;
} }
/// Skips ChaiScript whitespace, which means space and tab, but not cr/lf /// Skips ChaiScript whitespace, which means space and tab, but not cr/lf
/// jespada: Modified SkipWS to skip optionally CR ('\n') /// jespada: Modified SkipWS to skip optionally CR ('\n') and/or LF+CR ("\r\n")
bool SkipWS(const bool skip_cr=false) { bool SkipWS(bool skip_cr=false) {
bool retval = false; bool retval = false;
while (has_more_input()) { while (has_more_input()) {
if ( char_in_alphabet(*m_input_pos,detail::white_alphabet) || (skip_cr && (*m_input_pos == '\n'))) { auto end_line = (*m_input_pos != 0) && ((*m_input_pos == '\n') || (*m_input_pos == '\r' && *(m_input_pos+1) == '\n'));
if(*m_input_pos == '\n') {
if ( char_in_alphabet(*m_input_pos,detail::white_alphabet) || (skip_cr && end_line)) {
if(end_line) {
m_col = 1; m_col = 1;
++m_line; ++m_line;
} else {
if(*(m_input_pos) == '\r') {
// discards lf
++m_input_pos;
}
}
else {
++m_col; ++m_col;
} }
++m_input_pos; ++m_input_pos;
@@ -284,14 +295,14 @@ namespace chaiscript
} }
else if (SkipComment()) { else if (SkipComment()) {
retval = true; retval = true;
} } else {
else {
break; break;
} }
} }
return retval; return retval;
} }
/// Reads a floating point value from input, without skipping initial whitespace /// Reads a floating point value from input, without skipping initial whitespace
bool Float_() { bool Float_() {
if (has_more_input() && char_in_alphabet(*m_input_pos,detail::float_alphabet) ) { if (has_more_input() && char_in_alphabet(*m_input_pos,detail::float_alphabet) ) {