Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts:
	include/chaiscript/language/chaiscript_common.hpp
	include/chaiscript/language/chaiscript_parser.hpp
This commit is contained in:
Jason Turner
2013-02-23 21:37:50 -07:00
9 changed files with 223 additions and 13 deletions

11
unittests/break_for.chai Normal file
View File

@@ -0,0 +1,11 @@
var j = 0;
for (var i = 0; i < 10; ++i) {
if (i == 5) {
break
}
j = i
}
assert_equal(4, j);

View File

@@ -0,0 +1,16 @@
var j = 0;
var k = 0;
for (var i = 0; i < 10; ++i)
{
j = i
if (i > 5)
{
continue
}
k = i
}
assert_equal(5, k);
assert_equal(9, j);

View File

@@ -0,0 +1,14 @@
var i = 0
var j = 0
while (i < 10) {
if (++i > 5)
{
continue
}
j = i;
}
assert_equal(10, i);
assert_equal(5, j);

View File

@@ -5,3 +5,57 @@ for (auto i = 0; i < 5; ++i) {
}
assert_equal([0,1,2,3,4], ret);
var j = 0;
for (;j<10; ++j)
{
}
assert_equal(10, j);
var k = 0;
for (;k<10; )
{
++k;
}
assert_equal(10, k);
for (;;)
{
break;
}
var l = 0;
for (;;l = 1)
{
break;
}
assert_equal(0, l)
def isNotFive(x)
{
if (x != 5)
{
return true
} else {
return false
}
}
var m;
for (m = 0; isNotFive(m); m = m + 1)
{
}
assert_equal(5, m);

View File

@@ -0,0 +1,3 @@
var x = [1, 2u, 3.0l]
assert_equal(3.0l, x[2])
assert_equal(2u, x[1])