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

Merge branch 'master' into 2011-09-09-CxScript

Browse Source 
Conflicts:
	include/chaiscript/language/chaiscript_common.hpp
	src/main.cpp
This commit is contained in:
Jason Turner
2012-06-03 06:04:24 -06:00
parent b1a27020f7 832df7f9e8
commit a3e299fe1b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1484,10 +1484,10 @@ namespace chaiscript
while (Eol()) {} while (Eol()) {}
while (Case()) { while (Case()) {
while (Eol()); while (Eol()) { } // eat
} }
while (Eol()); while (Eol()) { } // eat
if (!Char('}')) { if (!Char('}')) {
throw exception::eval_error("Incomplete block", File_Position(m_line, m_col), *m_filename); throw exception::eval_error("Incomplete block", File_Position(m_line, m_col), *m_filename);