--- parser3/src/classes/double.C	2001/03/11 08:44:39	1.7
+++ parser3/src/classes/double.C	2001/03/12 21:54:18	1.12
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: double.C,v 1.7 2001/03/11 08:44:39 paf Exp $
+	$Id: double.C,v 1.12 2001/03/12 21:54:18 paf Exp $
 */
 
 #include "pa_request.h"
@@ -17,33 +17,56 @@ VClass *double_class;
 
 // methods
 
-static void _int(Request& r, Array *) {
+static void _int(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
-	Value& value=*new(pool) VInt(pool, static_cast<int>(vdouble->get_double()));
+	Value& value=*new(pool) VInt(pool, (int)vdouble->get_double());
 	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
 }
 
-static void _double(Request& r, Array *) {
+static void _double(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
 	Value& value=*new(pool) VDouble(pool, vdouble->get_double());
 	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
 }
 
-static void _inc(Request& r, Array *params) {
+static void _inc(Request& r, const String&, Array *params) {
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
 	double increment=params->size()?
-		r.autocalc(
+		r.process(
 			*static_cast<Value *>(params->get(0)),
 			0/*no name*/,
-			false/*don't make it string*/).get_double():1;
+			false/*don't intercept string*/).get_double():1;
 	vdouble->inc(increment);
 }
 
-void initialize_double_class(Pool& pool, VClass& vclass) {
-	vclass.add_native_method("int", _int, 0, 0); // ^double.int[]
-	vclass.add_native_method("double", _double, 0, 0); // ^double.double[]
-	vclass.add_native_method("inc", _inc, 0, 1); // ^double.inc[] ^double.inc[offset]
+static void _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.wcontext->write(string->APPEND_CONST(buf), 
+		String::Untaint_lang::NO /*always object, not string*/);
 }
 
+void initialize_double_class(Pool& pool, VClass& vclass) {
+	// ^double.int[]
+	vclass.add_native_method("int", _int, 0, 0);
+
+	// ^double.double[]
+	vclass.add_native_method("double", _double, 0, 0);
+	
+	// ^double.inc[]
+	// ^double.inc[offset]
+	vclass.add_native_method("inc", _inc, 0, 1);
+
+	// ^string.format[]
+	vclass.add_native_method("format", _format, 1, 1);
+}