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

2012-05-20 10:48:45 -07:00
parent 1bdedd3b45 4aec12c68f
commit e853e2e4ac
2 changed files with 5 additions and 0 deletions
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -1837,6 +1837,7 @@ namespace chaiscript
              retval = true;
              if (Operator_Helper(t_precedence)) {
                do {
+                  while (Eol()) {}
                  if (!Operator(t_precedence+1)) {
                    throw exception::eval_error("Incomplete "
                        + std::string(ast_node_type_to_string(m_operators[t_precedence])) + " expression",