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

Merge branch 'master' of https://github.com/ChaiScript/ChaiScript

Browse Source 
Conflicts:
	CMakeLists.txt

Fixed conflicted CMakeLists.txt
This commit is contained in:
Jason Turner
2011-09-09 13:58:19 -06:00
parent a386142fa6 dd0d91c7e3
commit 2b64c90a0e
2 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,7 +322,6 @@ namespace chaiscript
*/
bool Float_() {
bool retval = false;
std::string::const_iterator start = m_input_pos;
if (has_more_input() && char_in_alphabet(*m_input_pos,detail::float_alphabet) ) {
while (has_more_input() && char_in_alphabet(*m_input_pos,detail::int_alphabet) ) {
@@ -1478,7 +1477,6 @@ namespace chaiscript
*/
bool Dot_Fun_Array() {
bool retval = false;
std::string::const_iterator prev_pos = m_input_pos;
size_t prev_stack_top = m_match_stack.size();
if (Lambda() || Num(true) || Quoted_String(true) || Single_Quoted_String(true) ||