--- parser3/src/classes/string.C	2001/03/11 12:04:43	1.6
+++ parser3/src/classes/string.C	2001/03/13 17:17:25	1.11
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: string.C,v 1.6 2001/03/11 12:04:43 paf Exp $
+	$Id: string.C,v 1.11 2001/03/13 17:17:25 paf Exp $
 */
 
 #include "pa_request.h"
@@ -13,29 +13,45 @@
 
 // global var
 
-VClass *string_class;
+VStateless_class *string_class;
 
 // methods
 
-static void _length(Request& r, Array *) {
+static void _length(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VDouble(pool, r.self->as_string().size());
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	r.write_no_lang(value);
 }
 
-static void _int(Request& r, Array *) {
+static void _int(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, static_cast<int>(r.self->get_double()));
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	Value& value=*new(pool) VInt(pool, (int)r.self->get_double());
+	r.write_no_lang(value);
 }
 
-static void _double(Request& r, Array *) {
+static void _double(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
 	Value& value=*new(pool) VDouble(pool, r.self->get_double());
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	r.write_no_lang(value);
 }
 
-void initialize_string_class(Pool& pool, VClass& vclass) {
+void _string_format(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+
+	Value& fmt=*static_cast<Value *>(params->get(0));
+	// forcing ^format[this param type]
+	r.fail_if_junction_(true, fmt, 
+		method_name, "fmt must not be junction");
+
+	char *buf=format(pool, r.self->get_double(), fmt.as_string().cstr());
+	
+	String *string=new(pool) String(pool);
+	r.write_no_lang(string->APPEND_CONST(buf));
+}
+
+// initialize
+
+void initialize_string_class(Pool& pool, VStateless_class& vclass) {
 	// ^string.length[]
 	vclass.add_native_method("length", _length, 0, 0);
 	
@@ -44,5 +60,8 @@ void initialize_string_class(Pool& pool,
 	
 	// ^string.double[]
 	vclass.add_native_method("double", _double, 0, 0);
+
+	// ^string.format[]
+	vclass.add_native_method("format", _string_format, 1, 1);
 }