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

Conflicts: include/chaiscript/language/chaiscript_common.hpp
2012-05-20 10:36:49 -07:00
parent 9162b02ce9 a818e7b185
commit 1bdedd3b45
4 changed files with 50 additions and 2 deletions
--- a/unittests/ternary_condition.chai
+++ b/unittests/ternary_condition.chai
@@ -0,0 +1,2 @@
+var x = 4;
+assert_equal(x < 3 ? 4 < 1 : 5 > 3, true);