--- parser3/src/classes/string.C	2001/03/10 11:03:47	1.2
+++ parser3/src/classes/string.C	2001/03/18 13:38:45	1.12
@@ -1,5 +1,9 @@
 /*
-$Id: string.C,v 1.2 2001/03/10 11:03:47 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: string.C,v 1.12 2001/03/18 13:38:45 paf Exp $
 */
 
 #include "pa_request.h"
@@ -9,63 +13,54 @@ $Id: string.C,v 1.2 2001/03/10 11:03:47
 
 // 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);
+	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);
+	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);
+	r.write_no_lang(value);
 }
 
-void initialize_string_class(Pool& pool, VClass& vclass) {
-	// ^string.length[]
-	String& LENGTH_NAME=*new(pool) String(pool);
-	LENGTH_NAME.APPEND_CONST("length");
-
-	Method& LENGTH_METHOD=*new(pool) Method(pool,
-		LENGTH_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _length
-	);
-	vclass.add_method(LENGTH_NAME, LENGTH_METHOD);
+void _string_format(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
 
-	// ^string.int[]
-	String& INT_NAME=*new(pool) String(pool);
-	INT_NAME.APPEND_CONST("int");
+	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());
+	
+	r.write_no_lang(String(pool, buf));
+}
 
-	Method& INT_METHOD=*new(pool) Method(pool,
-		INT_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _int
-	);
-	vclass.add_method(INT_NAME, INT_METHOD);
+// initialize
 
+void initialize_string_class(Pool& pool, VStateless_class& vclass) {
+	// ^string.length[]
+	vclass.add_native_method("length", _length, 0, 0);
+	
+	// ^string.int[]
+	vclass.add_native_method("int", _int, 0, 0);
+	
 	// ^string.double[]
-	String& DOUBLE_NAME=*new(pool) String(pool);
-	DOUBLE_NAME.APPEND_CONST("double");
+	vclass.add_native_method("double", _double, 0, 0);
 
-	Method& DOUBLE_METHOD=*new(pool) Method(pool,
-		DOUBLE_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _double
-	);
-	vclass.add_method(DOUBLE_NAME, DOUBLE_METHOD);
+	// ^string.format[]
+	vclass.add_native_method("format", _string_format, 1, 1);
 }