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

Various cleanups

Browse Source
This commit is contained in:
Jason Turner
2015-04-02 15:40:45 -06:00
parent 59103b5a22
commit 7f1cd29a2c
5 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1118,8 +1118,8 @@ namespace chaiscript
const auto prev_col = m_col;
const auto prev_line = m_line;
if (Char_(t_c)) {
std::string match(start, m_input_pos);
m_match_stack.push_back(std::make_shared<eval::Char_AST_Node>(std::move(match), m_filename, prev_line, prev_col, m_line, m_col));
m_match_stack.push_back(
std::make_shared<eval::Char_AST_Node>(std::string(start, m_input_pos), m_filename, prev_line, prev_col, m_line, m_col));
return true;
} else {
return false;
@@ -1163,8 +1163,8 @@ namespace chaiscript
}
if ( t_capture && retval ) {
std::string match(start, m_input_pos);
m_match_stack.push_back(std::make_shared<eval::Str_AST_Node>(std::move(match), m_filename, prev_line, prev_col, m_line, m_col));
m_match_stack.push_back(std::make_shared<eval::Str_AST_Node>(
std::string(start, m_input_pos), m_filename, prev_line, prev_col, m_line, m_col));
}
return retval;
}
@@ -1206,8 +1206,8 @@ namespace chaiscript
}
if ( t_capture && retval ) {
std::string match(start, m_input_pos);
m_match_stack.push_back(std::make_shared<eval::Str_AST_Node>(std::move(match), m_filename, prev_line, prev_col, m_line, m_col));
m_match_stack.push_back(std::make_shared<eval::Str_AST_Node>(
std::string(start, m_input_pos), m_filename, prev_line, prev_col, m_line, m_col));
}
return retval;
@@ -1239,8 +1239,8 @@ namespace chaiscript
const auto prev_col = m_col;
const auto prev_line = m_line;
if (Eol_()) {
std::string match(start, m_input_pos);
m_match_stack.push_back(std::make_shared<eval::Eol_AST_Node>(std::move(match), m_filename, prev_line, prev_col, m_line, m_col));
m_match_stack.push_back(std::make_shared<eval::Eol_AST_Node>(
std::string(start, m_input_pos), m_filename, prev_line, prev_col, m_line, m_col));
return true;
} else {
return false;