--- parser3/src/classes/double.C	2002/04/10 09:53:13	1.46
+++ parser3/src/classes/double.C	2003/02/04 14:04:45	1.53.2.2
@@ -1,12 +1,12 @@
 /** @file
 	Parser: @b double parser class.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: double.C,v 1.46 2002/04/10 09:53:13 paf Exp $
 */
 
+static const char* IDENT_DOUBLE_C="$Date: 2003/02/04 14:04:45 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vdouble.h"
@@ -14,11 +14,7 @@
 
 // externs
 
-void _string_format(Request& r, const String& method_name, MethodParams *);
-
-// defines
-
-#define DOUBLE_CLASS_NAME "double"
+void _string_format(Request& r, StringPtr method_name, MethodParams& );
 
 // class
 
@@ -31,25 +27,25 @@ public: // Methoded
 
 // methods
 
-static void _int(Request& r, const String& method_name, MethodParams *params) {
+static void _int(Request& r, StringPtr method_name, MethodParams& params) {
 	Pool& pool=r.pool();
-	Value *default_code=params->size()>0?
-		default_code=&params->as_junction(0, "default must be int"):0; // (default)
+	// just checking (default) syntax validity, never really using it  here, just for string.int compatibility
+	if(params.count()>0)
+		params.as_junction(0, "default must be int");
 
-	VDouble *vdouble=static_cast<VDouble *>(r.self);
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
 	Value& result=*new(pool) VInt(pool, vdouble->as_int());
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
-static void _double(Request& r, const String& method_name, MethodParams *params) {
+static void _double(Request& r, StringPtr method_name, MethodParams& params) {
 	Pool& pool=r.pool();
-	Value *default_code=params->size()>0?
-		default_code=&params->as_junction(0, "default must be double"):0; // (default)
+	// just checking (default) syntax validity, never really using it  here, just for string.doube compatibility
+	if(params.count()>0)
+		params.as_junction(0, "default must be double");
 
-	VDouble *vdouble=static_cast<VDouble *>(r.self);
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
 	Value& result=*new(pool) VDouble(pool, vdouble->as_double());
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
@@ -63,24 +59,24 @@ static void __mod(VDouble& vdouble, doub
 
 static void vdouble_op(Request& r, MethodParams *params, 
 					   vdouble_op_func_ptr func) {
-	VDouble *vdouble=static_cast<VDouble *>(r.self);
-	double param=params->size()?
-			params->as_double(0, "param must be double", r):1/*used in inc/dec*/;
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
+	double param=params.count()?
+			params.as_double(0, "param must be double", r):1/*used in inc/dec*/;
 	(*func)(*vdouble, param);
 }
 
-static void _inc(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__inc); }
-static void _dec(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__dec); }
-static void _mul(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__mul); }
-static void _div(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__div); }
-static void _mod(Request& r, const String&, MethodParams *params) { vdouble_op(r, params, &__mod); }
+static void _inc(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__inc); }
+static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__dec); }
+static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__mul); }
+static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__div); }
+static void _mod(Request& r, StringPtr /*method_name*/, MethodParams& params) { vdouble_op(r, params, &__mod); }
 
 // from string.C
 extern 
-const String* sql_result_string(Request& r, const String& method_name, MethodParams *params,
+const String* sql_result_string(Request& r, StringPtr method_name, MethodParams& params,
 								Hash *& options, Value *& default_code);
 
-static void _sql(Request& r, const String& method_name, MethodParams *params) {
+static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
 	Pool& pool=r.pool();
 
 	double val;
@@ -98,16 +94,12 @@ static void _sql(Request& r, const Strin
 			val=0; //calm, compiler
 		}
 	VDouble& result=*new(pool) VDouble(pool, val);
-	result.set_name(method_name);
-	r.write_assign_lang(result);
+	r.write_no_lang(result);
 }
 
 // constructor
 
-MDouble::MDouble(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
-
-
+MDouble::MDouble(Pool& apool) : Methoded(apool, "double") {
 	// ^double.int[]
 	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);