Clifford Wolf:

	Added str function
	Fixed 'make' integration



git-svn-id: http://svn.clifford.at/openscad/trunk@139 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 14 insertions, 0 deletions

diff --git a/func.cc b/func.cc
index 203ad6b..867a1cf 100644
--- a/func.cc
+++ b/func.cc
@@ -156,6 +156,19 @@ Value builtin_pow(const QVector<QString>&, const QVector<Value> &args)
 	return Value();
 }
 
+Value builtin_str(const QVector<QString>&, const QVector<Value> &args)
+{
+	QString str;
+	for (int i = 0; i < args.size(); i++)
+	{
+		if (args[i].type == Value::STRING)
+			str += args[i].text;
+		else
+			str += args[i].dump();
+	}
+	return Value(str);
+}
+
 void initialize_builtin_functions()
 {
 	builtin_functions["sin"] = new BuiltinFunction(&builtin_sin);
@@ -166,6 +179,7 @@ void initialize_builtin_functions()
 	builtin_functions["atan"] = new BuiltinFunction(&builtin_atan);
 	builtin_functions["atan2"] = new BuiltinFunction(&builtin_atan2);
 	builtin_functions["pow"] = new BuiltinFunction(&builtin_pow);
+	builtin_functions["str"] = new BuiltinFunction(&builtin_str);
 	initialize_builtin_dxf_dim();
 }