- Restore refcount change

Author: felipensp

benchmark/run.clv

@@ -33,31 +33,31 @@ var i = 0;
 env.groups.each(function(g) {
 	print(++i + ') ');
 	println(g.info);
-	
+
 	print('running tests ');
 	flush();
 	var results = g.runTests(function (test) {
 		print('.');
 		flush();
 	});
 	println('');
-	
+
 	// Sorting Results by total execution time
 	/*var set = Set.new(function (a, b) { return a.tt < b.tt; });
 	for (var i = 0; i < rs.size(); i++) { set.insert(rs[i]); }
 
 	for (i = 0; i < set.size(); i++) {
 		var r = set.find(i);
-		
+
 		//println("-- "+ r.test.lang.name + ": " + r.tt);
 		println(r);
 	}
 	*/
-	
+
 	for (var i = 0; i < results.size(); i++) {
 		println("-- "+ results[i].test.lang.name + ": " + results[i].tt);
 	}
-	
+
 	/*
 	g.tests.each(function(t) {
 		println('-- '+ t.lang.name + ': ');

core/vm.cc

@@ -196,7 +196,7 @@ CLEVER_FORCE_INLINE void VM::paramBinding(const Function* func,
 
 		if ((args_count - nargs) > 0) {
 			for (size_t i = nargs; i < args_count; ++i) {
-				arr->getData().push_back(args[i]->clone());
+				arr->push_value(args[i]);
 			}
 		}
 
@@ -212,7 +212,14 @@ CLEVER_FORCE_INLINE void VM::prepareCall(const Function* func, Environment* env)
 	Environment* fenv = func->getEnvironment()->activate(env);
 
 	fenv->setRetAddr(m_pc + 1);
-	fenv->setRetVal(getValue(OPCODE.result));
+
+	Value* retval = getValue(OPCODE.result);
+
+	if (retval->refCount() > 1) {
+		retval = retval->clone();
+		setValue(OPCODE.result, retval, true);
+	}
+	fenv->setRetVal(retval);
 
 	m_call_stack.push(CallStackEntry(fenv, func, &OPCODE.loc));
 

modules/std/core/array.cc

@@ -84,11 +84,10 @@ CLEVER_METHOD(ArrayType::append)
 	}
 
 	if (!args.empty()) {
-		ValueVector& vec = clever_get_this(ArrayObject*)->getData();
+		ArrayObject* arrobj = clever_get_this(ArrayObject*);
 
 		for (size_t i = 0, j = args.size(); i < j; ++i) {
-			vec.push_back(args[i]->clone());
-			vec.back()->setConst(false);
+			arrobj->push_value(args[i]);
 		}
 	}
 	result->setNull();

modules/std/core/array.h

@@ -37,6 +37,11 @@ class ArrayObject : public TypeObject {
 		}
 	}
 
+	void push_value(Value* value) {
+		m_data.push_back(value);
+		clever_addref(value);
+	}
+
 	std::vector<Value*>& getData() { return m_data; }
 private:
 	std::vector<Value*> m_data;

tests/lang/class_005.test

@@ -0,0 +1,48 @@
+Testing array on class member
+==CODE==
+import std.io.*;
+
+class Bar {
+	var name;
+
+	function Bar(s) {
+		this.name = s;
+	}
+
+	function run() {
+		return this.name;
+	}
+}
+
+class Foo {
+	var arr;
+
+	function Foo() {
+		this.arr = [];
+	}
+
+	function append(s) {
+		this.arr.append(Bar.new(s));
+	}
+
+	function getItems() {
+		var items = [];
+
+		for (var i = 0; i < this.arr.size(); ++i) {
+			items.append(this.arr[i].run());
+		}
+
+		return items;
+	}
+}
+
+var f = Foo.new;
+
+f.append('felipe');
+f.append('pericles');
+
+var results = f.getItems();
+
+println(results);
+==RESULT==
+\[felipe, pericles\]