coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-07 09:16:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2011-09-09-CxScript' of https://github.com/ChaiScript/ChaiScript into 2011-09-09-CxScript

Browse Source
This commit is contained in:
Jason Turner 2011-10-01 11:04:21 -06:00
commit 27ae40b813
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1977,6 +1977,11 @@ namespace chaiscript
retval = true; retval = true;
saw_eol = false; saw_eol = false;
} }
else if (Block()) {
has_more = true;
retval = true;
saw_eol = true;
}
else if (Equation()) { else if (Equation()) {
if (!saw_eol) { if (!saw_eol) {
throw exception::eval_error("Two expressions missing line separator", File_Position(prev_line, prev_col), *m_filename); throw exception::eval_error("Two expressions missing line separator", File_Position(prev_line, prev_col), *m_filename);
@ -1990,11 +1995,6 @@ namespace chaiscript
retval = true; retval = true;
saw_eol = true; saw_eol = true;
} }
else if (Block()) {
has_more = true;
retval = true;
saw_eol = true;
}
else { else {
has_more = false; has_more = false;
} }

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

@ -259,7 +259,7 @@ def generate_range(x, y) { \n\
}\n\ }\n\
# Returns a new Vector with the first value to the second value as its elements\n\ # Returns a new Vector with the first value to the second value as its elements\n\
def collate(x, y) { \n\ def collate(x, y) { \n\
{x, y}; \n\ return {x, y}; \n\
} \n\ } \n\
def zip_with(f, x, y, inserter) : call_exists(range, x) && call_exists(range, y) { \n\ def zip_with(f, x, y, inserter) : call_exists(range, x) && call_exists(range, y) { \n\
auto r_x = range(x); \n\ auto r_x = range(x); \n\