--- parser3/src/classes/double.C	2002/04/09 06:47:05	1.45
+++ parser3/src/classes/double.C	2003/01/21 15:51:06	1.53
@@ -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.45 2002/04/09 06:47:05 paf Exp $
 */
 
+static const char* IDENT_DOUBLE_C="$Date: 2003/01/21 15:51:06 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vdouble.h"
@@ -16,10 +16,6 @@
 
 void _string_format(Request& r, const String& method_name, MethodParams *);
 
-// defines
-
-#define DOUBLE_CLASS_NAME "double"
-
 // class
 
 class MDouble : public Methoded {
@@ -33,23 +29,23 @@ public: // Methoded
 
 static void _int(Request& r, const String& 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->size()>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) {
 	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->size()>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,7 +59,7 @@ 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);
+	VDouble *vdouble=static_cast<VDouble *>(r.get_self());
 	double param=params->size()?
 			params->as_double(0, "param must be double", r):1/*used in inc/dec*/;
 	(*func)(*vdouble, param);
@@ -90,7 +86,7 @@ static void _sql(Request& r, const Strin
 		val=string->as_double();
 	else
 		if(default_code)
-			val=r.process(*default_code).as_double();
+			val=r.process_to_value(*default_code).as_double();
 		else {
 			throw Exception("parser.runtime",
 				&method_name,
@@ -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);