Fixed prefix operator precedence bug. Added collate(?), zip_with, and zip

chaiscript/chaiscript_parser.hpp

@@ -1044,7 +1044,7 @@ namespace chaiscript
             if (Symbol("-")) {
                 retval = true;
 
-                if (!Additive()) {
+                if (!Dot_Access()) {
                     throw Parse_Error("Incomplete negation expression", File_Position(line, col), filename);
                 }
 
@@ -1053,7 +1053,7 @@ namespace chaiscript
             else if (Symbol("!")) {
                 retval = true;
 
-                if (!Expression()) {
+                if (!Dot_Access()) {
                     throw Parse_Error("Incomplete '!' expression", File_Position(line, col), filename);
                 }
 
@@ -1062,7 +1062,7 @@ namespace chaiscript
             if (Symbol("++", true)) {
                 retval = true;
 
-                if (!Expression()) {
+                if (!Dot_Access()) {
                     throw Parse_Error("Incomplete '++' expression", File_Position(line, col), filename);
                 }
 
@@ -1071,7 +1071,7 @@ namespace chaiscript
             else if (Symbol("--", true)) {
                 retval = true;
 
-                if (!Expression()) {
+                if (!Dot_Access()) {
                     throw Parse_Error("Incomplete '--' expression", File_Position(line, col), filename);
                 }
 

chaiscript/chaiscript_prelude.hpp

@@ -6,58 +6,75 @@
 
 const char *chaiscript_prelude = " \
 def to_string(x) : call_exists(first, x) && call_exists(second, x) { \n\
-    \"<\" + x.first.to_string() + \", \" + x.second.to_string() + \">\"\n\
+  \"<\" + x.first.to_string() + \", \" + x.second.to_string() + \">\"\n\
 }\n\
 def to_string(x) : call_exists(range, x) { \n\
-    \"[\" + x.join(\", \") + \"]\"\n\
+  \"[\" + x.join(\", \") + \"]\"\n\
 }\n\
 def to_string(x) { \n\
-    return internal_to_string(x)\n\
+  return internal_to_string(x)\n\
 }\n\
 def puts(x) { \n\
-    print_string(x.to_string()) \n\
+  print_string(x.to_string()) \n\
 }; \n\
 def print(x) { \n\
-	println_string(x.to_string()) \n\
+  println_string(x.to_string()) \n\
 }; \n\
 def for_each(container, func) { \n\
-	var range = range(container); \n\
-	while (!range.empty()) { \n\
-		func(range.front()) \n\
-		range.pop_front() \n\
-	} \n\
+  var range = range(container); \n\
+  while (!range.empty()) { \n\
+    func(range.front()) \n\
+    range.pop_front() \n\
+  } \n\
 } \n\
 def map(container, func) { \n\
-	var retval = Vector() \n\
-	var range = range(container) \n\
-	while (!range.empty()) { \n\
-		retval.push_back(func(range.front())) \n\
-		range.pop_front() \n\
-	} \n\
-	retval \n\
+  var retval = Vector() \n\
+  var range = range(container) \n\
+  while (!range.empty()) { \n\
+    retval.push_back(func(range.front())) \n\
+    range.pop_front() \n\
+  } \n\
+  retval \n\
 } \n\
 def reduce(container, func, initial) { \n\
-	var retval = initial \n\
-    var range = range(container) \n\
-	while (!range.empty()) { \n\
-		retval = (func(range.front(), retval)) \n\
-		range.pop_front() \n\
-	} \n\
-	retval \n\
+  var retval = initial \n\
+  var range = range(container) \n\
+  while (!range.empty()) { \n\
+    retval = (func(range.front(), retval)) \n\
+    range.pop_front() \n\
+  } \n\
+  retval \n\
 } \n\
 def join(container, delim) { \n\
-	var retval = \"\" \n\
-	var range = range(container) \n\
-	if (!range.empty()) { \n\
-		retval += to_string(range.front()) \n\
-		range.pop_front() \n\
-		while (!range.empty()) { \n\
-			retval += delim \n\
-			retval += to_string(range.front()) \n\
-			range.pop_front() \n\
-		} \n\
-	} \n\
-	retval \n\
-}";
+  var retval = \"\" \n\
+  var range = range(container) \n\
+  if (!range.empty()) { \n\
+    retval += to_string(range.front()) \n\
+    range.pop_front() \n\
+    while (!range.empty()) { \n\
+      retval += delim \n\
+      retval += to_string(range.front()) \n\
+      range.pop_front() \n\
+    } \n\
+  } \n\
+  retval \n\
+} \n\
+def collate(x, y) { \n\
+  [x, y] \n\
+} \n\
+def zip_with(f, x, y) : call_exists(range, x) && call_exists(range, y) { \n\
+  var r_x = range(x); \n\
+  var r_y = range(y); \n\
+  var retval = Vector(); \n\
+  while (!r_x.empty() && !r_y.empty()) { \n\
+    retval.push_back(f(r_x.front(), r_y.front())); \n\
+    r_x.pop_front(); \n\
+    r_y.pop_front(); \n\
+  } \n\
+  retval \n\
+} \n\
+def zip(x, y) { \n\
+  zip_with(collate, x, y) \n\
+}\n";
 
 #endif /* CHAISCRIPT_PRELUDE_HPP_ */