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

Conflicts:
	include/chaiscript/dispatchkit/bootstrap.hpp

include/chaiscript/dispatchkit/bootstrap.hpp

@@ -406,7 +406,7 @@ namespace chaiscript
         m->add(fun(&dispatch::Dynamic_Object::get_attrs), "get_attrs");
         m->add(fun(&dispatch::Dynamic_Object::get_attr), "get_attr");
 
-        m->eval("def Dynamic_Object::clone() { auto &new_o = Dynamic_Object(this.get_type_name()); for_each(this.get_attrs(), bind(fun(new_o, x) { new_o.get_attr(x.first) = x.second; }, new_o, _) ); return new_o; }");
+        m->eval("def Dynamic_Object::clone() { auto &new_o = Dynamic_Object(this.get_type_name()); for_each(this.get_attrs(), bind([](new_o, x) { new_o.get_attr(x.first) = x.second; }, new_o, _) ); return new_o; }");
 
         m->add(fun(&has_guard), "has_guard");
         m->add(fun(&get_guard), "get_guard");

include/chaiscript/language/chaiscript_parser.hpp

@@ -1119,7 +1119,11 @@ namespace chaiscript
 
           size_t prev_stack_top = m_match_stack.size();
 
-          if (Keyword("fun")) {
+          //if (Keyword("fun")) {
+          if (Char('[')) {
+            if (!Char(']')) {
+              throw exception::eval_error("Closure list not currently supported", File_Position(m_line, m_col), *m_filename);
+            }
             retval = true;
 
             if (Char('(')) {
@@ -1597,10 +1601,10 @@ namespace chaiscript
 
           size_t prev_stack_top = m_match_stack.size();
 
-          if (Char('[')) {
+          if (Char('{')) {
             retval = true;
             Container_Arg_List();
-            if (!Char(']')) {
+            if (!Char('}')) {
               throw exception::eval_error("Missing closing square bracket", File_Position(m_line, m_col), *m_filename);
             }
             if ((prev_stack_top != m_match_stack.size()) && (m_match_stack.back()->children.size() > 0)) {

include/chaiscript/language/chaiscript_prelude.hpp

@@ -7,7 +7,7 @@
 #ifndef CHAISCRIPT_PRELUDE_HPP_
 #define CHAISCRIPT_PRELUDE_HPP_
 
-//Note, the expression "[x,y]" in "collate" is parsed as two separate expressions
+//Note, the expression "{x,y}" in "collate" is parsed as two separate expressions
 //by C++, so CODE_STRING, takes two expressions and adds in the missing comma
 #define CODE_STRING(x, y) #x ", " #y 
 
@@ -23,7 +23,7 @@ def to_string(x) : call_exists(first, x) && call_exists(second, x) { \n\
 }\n\
 # to_string for containers\n\
 def to_string(x) : call_exists(range, x) && !x.is_type("string"){ \n\
-  "[" + x.join(", ") + "]"; \n\
+  "{" + x.join(", ") + "}"; \n\
 }\n\
 # Basic to_string function\n\
 def to_string(x) { \n\
@@ -259,7 +259,7 @@ def generate_range(x, y) { \n\
 }\n\
 # Returns a new Vector with the first value to the second value as its elements\n\
 def collate(x, y) { \n\
-  [x, y]; \n\
+  {x, y}; \n\
 } \n\
 def zip_with(f, x, y, inserter) : call_exists(range, x) && call_exists(range, y) { \n\
   auto r_x = range(x); \n\
@@ -305,10 +305,10 @@ def string::find_last_not_of(list) : is_type(list, "string") { \n\
   int(find_last_not_of(this, list, -1)); \n\
 } \n\
 def string::ltrim() { \n\
-  drop_while(this, fun(x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'}); \n\
+  drop_while(this, [](x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'}); \n\
 } \n\
 def string::rtrim() { \n\
-  reverse(drop_while(reverse(this), fun(x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'})); \n\
+  reverse(drop_while(reverse(this), [](x) { x == ' ' || x == '\t' || x == '\r' || x == '\n'})); \n\
 } \n\
 def string::trim() { \n\
   ltrim(rtrim(this)); \n\

unittests/assign_const.chai

@@ -1,2 +1,2 @@
-assert_throws("Mismatched types in equation, lhs is const.", fun() { 1 = 2 } );
+assert_throws("Mismatched types in equation, lhs is const.", []() { 1 = 2 } );
-assert_throws("Mismatched types in equation, lhs is const.", fun() { 1 + 2 = 2 } );
+assert_throws("Mismatched types in equation, lhs is const.", []() { 1 + 2 = 2 } );

unittests/bind.chai

@@ -1,2 +1,2 @@
 auto prod = bind(foldl, _, `*`, 1.0)
-assert_equal(60, prod([3, 4, 5]))
+assert_equal(60, prod({3, 4, 5}))

unittests/concat.chai

@@ -1,4 +1,4 @@
-auto v = concat([1, 2], [3, 4]);
+auto v = concat({1, 2}, {3, 4});
 
 assert_equal(4, v.size());
 assert_equal(1, v[0]);

unittests/const_range_test.chai

@@ -1,4 +1,4 @@
 //If the following succeeds, the test passes
 
 
-"Hello World".for_each(fun(x) { print(x) } )
+"Hello World".for_each([](x) { print(x) } )

unittests/deep_array_lookup.chai

@@ -1,9 +1,9 @@
-auto a = [1,2,3, [4,5,6] ]
+auto a = {1,2,3, {4,5,6} }
 
 assert_equal(a[3][0], 4)
 
 
-def Test::Test() { this.a = [1,2,3]; }
+def Test::Test() { this.a = {1,2,3}; }
 attr Test::a;
 
 auto t = Test();

unittests/drop.chai

@@ -1 +1 @@
-assert_equal([3,4], drop([1, 2, 3, 4], 2))
+assert_equal({3,4}, drop({1, 2, 3, 4}, 2))

unittests/drop_while.chai

@@ -1 +1 @@
-assert_equal([2, 3], drop_while([1, 2, 3], odd))
+assert_equal({2, 3}, drop_while({1, 2, 3}, odd))

unittests/eval_error.chai

@@ -34,6 +34,6 @@ def while_doing()
   }
 }
 
-auto f = fun() { while_doing(); }
+auto f = []() { while_doing(); }
 
 assert_equal(get_eval_error(f).call_stack.size(), 16)

unittests/exception_guards.chai

@@ -1,4 +1,4 @@
-auto results = [];
+auto results = {};
 
 for (auto i = 2; i < 6; ++i) {
   try {
@@ -31,4 +31,4 @@ catch {
   results.push_back("defaultcatch");
 }
 
-assert_equal(["c2: 2", "c2: 3", "c3: 4", "c3: 5", "defaultcatch"], results);
+assert_equal({"c2: 2", "c2: 3", "c3: 4", "c3: 5", "defaultcatch"}, results);

unittests/filter.chai

@@ -1 +1 @@
-assert_equal([1,3], filter([1, 2, 3, 4], odd))
+assert_equal({1,3}, filter({1, 2, 3, 4}, odd))

unittests/foldl.chai

@@ -1 +1 @@
-assert_equal(10, foldl([1, 2, 3, 4], `+`, 0))
+assert_equal(10, foldl({1, 2, 3, 4}, `+`, 0))

unittests/for.chai

@@ -1,7 +1,7 @@
-auto ret = []
+auto ret = {}
 
 for (auto i = 0; i < 5; ++i) {
   ret.push_back(i);
 }
 
-assert_equal([0,1,2,3,4], ret);
+assert_equal({0,1,2,3,4}, ret);

unittests/for_each.chai

@@ -1 +1 @@
-for_each([1, 2, 3], print)
+for_each({1, 2, 3}, print)

unittests/for_each_range.chai

@@ -1,3 +1,3 @@
-auto v = [1,2,3];
+auto v = {1,2,3};
 auto r = range(v);
-for_each(r, fun(x) { assert_equal(true, x>0); } )
+for_each(r, [](x) { assert_equal(true, x>0); } )

unittests/for_each_retro.chai

@@ -1,4 +1,4 @@
 // Don't bother checking the output from this one, just makes sure it executes
-auto v = [1,2,3];
+auto v = {1,2,3};
 auto r = retro(range(v));
 for_each(r, print)

unittests/function_introspection.chai

@@ -18,7 +18,7 @@ assert_equal(test_function, test_function);
 
 assert_not_equal(test_function, `+`);
 
-assert_equal(test_function.call([1]), 1);
+assert_equal(test_function.call({1}), 1);
 
 // dynamic object function tests
 
@@ -67,10 +67,10 @@ auto group = group_guard.get_contained_functions();
 assert_equal(true, group[0].has_guard())
 assert_equal(false, group[1].has_guard())
 
-assert_throws("Function does not have a guard", fun() { group[0].get_guard(); } );
+assert_throws("Function does not have a guard", []() { group[0].get_guard(); } );
-assert_throws("Function does not have a guard", fun() { without_guard.get_guard(); } );
+assert_throws("Function does not have a guard", []() { without_guard.get_guard(); } );
 
 auto guard = with_guard.get_guard();
 
 assert_equal(false, guard.has_guard());
-assert_throws("Function does not have a guard", fun() { guard.get_guard(); } );
+assert_throws("Function does not have a guard", []() { guard.get_guard(); } );

unittests/generate_range.chai

@@ -1 +1 @@
-assert_equal([1,2,3,4,5,6,7,8,9,10], generate_range(1, 10))
+assert_equal({1,2,3,4,5,6,7,8,9,10}, generate_range(1, 10))

unittests/index_operator.chai

@@ -1,7 +1,7 @@
 
 // tests more complex parses of the index operator
 
-def Bob::bob3() { return [1,2,3]; }
+def Bob::bob3() { return {1,2,3}; }
 def Bob::Bob() {}
 auto b = Bob();
 

unittests/invalid_function_assignment.chai

@@ -1 +1 @@
-assert_throws("Illegal const function assignment", fun() { clone = `-` } );
+assert_throws("Illegal const function assignment", []() { clone = `-` } );

unittests/invalid_function_reassignment.chai

@@ -1 +1 @@
-assert_throws("Invalid function reassignment", fun() { auto x = 5; x = `-`; } );
+assert_throws("Invalid function reassignment", []() { auto x = 5; x = `-`; } );

unittests/join.chai

@@ -1 +1 @@
-assert_equal("1*2*3", join([1, 2, 3], "*"))
+assert_equal("1*2*3", join({1, 2, 3}, "*"))

unittests/lambda.chai

@@ -1,2 +1,2 @@
-auto bob = fun(x) { x + 1 }
+auto bob = [](x) { x + 1 }
 assert_equal(4, bob(3));

unittests/malformed_inline_map.chai

@@ -1,2 +1,2 @@
 
-assert_throws("Parse failure", fun() { eval("[\"hello\":5,\"j\",\"k\"]") } );
+assert_throws("Parse failure", []() { eval("{\"hello\":5,\"j\",\"k\"}") } );

unittests/map.chai

@@ -1 +1 @@
-assert_equal([true, false, true], map([1,2,3], odd))
+assert_equal({true, false, true}, map({1,2,3}, odd))

unittests/map_access.chai

@@ -1,2 +1,2 @@
-auto x = ["bob":2, "fred":3]
+auto x = {"bob":2, "fred":3}
 assert_equal(3, x["fred"])

unittests/map_inplace_init.chai

@@ -1,3 +1,3 @@
-auto x = ["bob":1, "fred":2]
+auto x = {"bob":1, "fred":2}
 
 assert_equal(2, x.size());

unittests/map_literal_access.chai

@@ -0,0 +1 @@
+assert_equal(1, {"bob":1,"fred":2}["bob"])

unittests/method_sugar.chai

@@ -1 +1 @@
-assert_equal(6, [1, 2, 3].sum())
+assert_equal(6, {1, 2, 3}.sum())

unittests/multiline.chai

@@ -1,9 +1,9 @@
-auto x = [1, 2,
+auto x = {1, 2,
- 3, 4]
+ 3, 4}
 
 assert_equal(1, x[0])
 
 auto y = map(x, 
- fun(x) { x + 1 })
+ [](x) { x + 1 })
 
 assert_equal(2, y[0])

unittests/operators_float.chai

@@ -13,4 +13,4 @@ assert_equal(0, i -= i)
 assert_equal(3, j *= 1.5)
 assert_equal(1.5, j /= 2)
 assert_equal(2.5, j += 1)
-assert_throws("No modulous for float", fun() { k % 2 } );
+assert_throws("No modulous for float", []() { k % 2 } );

unittests/product.chai

@@ -1 +1 @@
-assert_equal(24, product([1, 2, 3, 4]))
+assert_equal(24, product({1, 2, 3, 4}))

unittests/range.chai

@@ -1,4 +1,4 @@
-auto x = [1, 2, 3, 4]
+auto x = {1, 2, 3, 4}
 auto r = range(x)
 r.pop_front()
 assert_equal(2, r.front());

unittests/range_back.chai

@@ -1,4 +1,4 @@
-auto x = [1, 2, 3, 4]
+auto x = {1, 2, 3, 4}
 auto r = range(x)
 r.pop_back()
 assert_equal(3, r.back())

unittests/range_contains.chai

@@ -1,4 +1,4 @@
-auto v = [1,2,"hi", "world", 5.5]
+auto v = {1,2,"hi", "world", 5.5}
 assert_equal(true, v.contains(5.5))
 assert_equal(false, v.contains(0))
 assert_equal(false, v.contains(1, lt))

unittests/range_find.chai

@@ -1,4 +1,4 @@
-auto v = [2, 1, "Hi", 5.5]
+auto v = {2, 1, "Hi", 5.5}
 auto r = v.find("Hi");
 
 assert_equal("Hi", r.front())

unittests/range_inplace.chai

@@ -1 +1 @@
-assert_equal([3,4,5,6], [3..6])
+assert_equal({3,4,5,6}, {3..6})

unittests/reduce.chai

@@ -1 +1 @@
-assert_equal(10, reduce([1, 2, 3, 4], `+`))
+assert_equal(10, reduce({1, 2, 3, 4}, `+`))

unittests/reflection_test.chai

@@ -28,7 +28,7 @@ def my_fun()
 assert_equal(true, my_fun.has_parse_tree());
 assert_equal(false, `+`.has_parse_tree());
 
-assert_throws("Function does not have a parse tree", fun() { `+`.get_parse_tree(); } );
+assert_throws("Function does not have a parse tree", []() { `+`.get_parse_tree(); } );
 
 auto& parsetree = my_fun.get_parse_tree();
 

unittests/retro.chai

@@ -1,4 +1,4 @@
-auto x = [1, 2, 3, 4]
+auto x = {1, 2, 3, 4}
 auto r = retro(range(x))
 r.pop_front()
 assert_equal(3, r.front())

unittests/retroretro.chai

@@ -1,4 +1,4 @@
-auto x = [1, 2, 3, 4]
+auto x = {1, 2, 3, 4}
 auto r = retro(range(x))
 r.pop_back()
 auto r2 = retro(r)

unittests/sum.chai

@@ -1 +1 @@
-assert_equal(10, sum([1, 2, 3, 4]))
+assert_equal(10, sum({1, 2, 3, 4}))

unittests/take.chai

@@ -1 +1 @@
-assert_equal(2, take([1, 2, 3, 4], 2).back())
+assert_equal(2, take({1, 2, 3, 4}, 2).back())

unittests/take_while.chai

@@ -1 +1 @@
-assert_equal([1], take_while([1, 2, 3, 4], odd))
+assert_equal({1}, take_while({1, 2, 3, 4}, odd))

unittests/vector_access.chai

@@ -1,2 +1,2 @@
-auto x = [1, 2, 3]
+auto x = {1, 2, 3}
 assert_equal(3, x[2])

unittests/vector_erase_at.chai

@@ -1,3 +1,3 @@
-auto x = [1, 2, 3]
+auto x = {1, 2, 3}
 x.erase_at(1)
-assert_equal([1,3], x);
+assert_equal({1,3}, x);

unittests/vector_inplace_init.chai

@@ -1,2 +1,2 @@
-auto x = [1, 2, 3]
+auto x = {1, 2, 3}
 assert_equal(3, x.size())

unittests/vector_insert_at.chai

@@ -1,3 +1,3 @@
-auto x = [1, 2, 3]
+auto x = {1, 2, 3}
 x.insert_at(1, 6)
-assert_equal([1,6,2,3], x);
+assert_equal({1,6,2,3}, x);

unittests/vector_literal_acccess.chai

@@ -1 +1 @@
-assert_equal(1, [1,2,3][0])
+assert_equal(1, {1,2,3}[0])

unittests/vector_of_one.chai

@@ -1,2 +1,2 @@
-auto x = [1]
+auto x = {1}
 assert_equal(1, x[0])

unittests/vector_paren_literal_access.chai

@@ -1 +1 @@
-assert_equal(1, ([1,2,3])[0])
+assert_equal(1, ({1,2,3})[0])

unittests/vector_push_back.chai

@@ -1,4 +1,4 @@
-auto x = [1, 2]
+auto x = {1, 2}
 x.push_back(3)
 assert_equal(3, x.size())
 assert_equal(3, x.back())

unittests/vector_push_empty.chai

@@ -1,4 +1,4 @@
-auto bob = []
+auto bob = {}
 bob.push_back(3)
 assert_equal(1, bob.size())
 assert_equal(3, bob.front())

unittests/zip.chai

@@ -1,5 +1,5 @@
-auto z = zip([1, 2, 3], [4, 5, 6])
+auto z = zip({1, 2, 3}, {4, 5, 6})
 
-assert_equal([1,4], z[0])
+assert_equal({1,4}, z[0])
-assert_equal([2,5], z[1])
+assert_equal({2,5}, z[1])
-assert_equal([3,6], z[2])
+assert_equal({3,6}, z[2])

unittests/zip_with.chai

@@ -1,3 +1,3 @@
-auto z = zip_with(`+`, [1, 2, 3], [4, 5, 6])
+auto z = zip_with(`+`, {1, 2, 3}, {4, 5, 6})
 
-assert_equal([5,7,9], z)
+assert_equal({5,7,9}, z)