Merge branch 'fix_attr_function_calls' into develop

Conflicts:
	src/test_module.cpp
This commit is contained in:
Jason Turner
2015-04-21 12:45:59 -06:00
11 changed files with 274 additions and 13 deletions

View File

@@ -0,0 +1,23 @@
// Test attributes/members that are functions
load_module("test_module")
class MyClass
{
var func_member;
def MyClass() {}
}
auto t0 = MyClass();
t0.func_member = fun(int i){ i * 3; };
assert_true(func_member(t0)(2) == 6)
assert_true((func_member(t0))(2) == 6)
assert_true(t0.func_member(2) == 6)
t0.func_member = fun() { 12; };
assert_true(t0.func_member() == 12);

View File

@@ -0,0 +1,12 @@
// Test attributes/members that are functions
load_module("test_module")
auto t0 = TestBaseType()
t0.func_member = fun(int i){ i * 3; };
assert_true(func_member(t0)(2) == 6)
assert_true((func_member(t0))(2) == 6)
assert_true(t0.func_member(2) == 6)