--- parser3/src/classes/double.C	2003/02/20 14:53:32	1.53.2.7
+++ parser3/src/classes/double.C	2003/03/18 15:14:13	1.53.2.8.2.1
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_DOUBLE_C="$Date: 2003/02/20 14:53:32 $";
+static const char* IDENT_DOUBLE_C="$Date: 2003/03/18 15:14:13 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -16,7 +16,7 @@ static const char* IDENT_DOUBLE_C="$Date
 
 // externs
 
-void _string_format(Request& r, StringPtr method_name, MethodParams* /*params*/);
+void _string_format(Request& r, const String& method_name, MethodParams* /*params*/);
 
 // class
 
@@ -29,11 +29,11 @@ public: // Methoded
 
 // global variable
 
-MethodedPtr double_class(new MDouble);
+DECLARE_CLASS_VAR(double, new MDouble, 0);
 
 // methods
 
-static void _int(Request& r, StringPtr method_name, MethodParams* params) {
+static void _int(Request& r, const String& method_name, MethodParams* params) {
 	// 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");
@@ -42,7 +42,7 @@ static void _int(Request& r, StringPtr m
 	r.write_no_lang(ValuePtr(new VInt(vdouble.as_int())));
 }
 
-static void _double(Request& r, StringPtr method_name, MethodParams* params) {
+static void _double(Request& r, const String& method_name, MethodParams* params) {
 	// 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");
@@ -67,22 +67,22 @@ static void vdouble_op(Request& r, Metho
 	(*func)(vdouble, param);
 }
 
-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); }
+static void _inc(Request& r, const String& /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__inc); }
+static void _dec(Request& r, const String& /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__dec); }
+static void _mul(Request& r, const String& /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__mul); }
+static void _div(Request& r, const String& /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__div); }
+static void _mod(Request& r, const String& /*method_name*/, MethodParams* params) { vdouble_op(r, params, &__mod); }
 
 // from string.C
 extern 
-StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams* params,
+const String& sql_result_string(Request& r, const String& method_name, MethodParams* params,
 							HashStringValue*& options, ValuePtr& default_code);
 
-static void _sql(Request& r, StringPtr method_name, MethodParams* params) {
+static void _sql(Request& r, const String& method_name, MethodParams* params) {
 	double val;
 	HashStringValue* options;
 	ValuePtr default_code;
-	if(StringPtr string=sql_result_string(r, method_name, params, options, default_code))
+	if(const String& string=sql_result_string(r, method_name, params, options, default_code))
 		val=string->as_double();
 	else
 		if(default_code)