--- parser3/src/classes/int.C	2003/02/17 07:18:57	1.49.2.4
+++ parser3/src/classes/int.C	2003/03/21 13:42:27	1.49.2.7.2.2
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_INT_C="$Date: 2003/02/17 07:18:57 $";
+static const char* IDENT_INT_C="$Date: 2003/03/21 13:42:27 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -16,11 +16,11 @@ static const char* IDENT_INT_C="$Date: 2
 
 // externs
 
-void _string_format(Request& r, StringPtr method_name, MethodParams& /*params*/);
+void _string_format(Request& r, const String& method_name, MethodParams* /*params*/);
 
 // class
 
-class MInt : public Methoded {
+class MInt: public Methoded {
 public:
 	MInt();
 public: // Methoded
@@ -29,26 +29,26 @@ public: // Methoded
 
 // global variable
 
-MethodedPtr int_class(new MInt);
+DECLARE_CLASS_VAR(int, new MInt, 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");
+	if(params->count()>0)
+		params->as_junction(0, "default must be int");
 
 	VInt& vint=*static_cast<VInt *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VInt(vint.get_int())));
+	r.write_no_lang(Value*(new VInt(vint.get_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");
+	if(params->count()>0)
+		params->as_junction(0, "default must be double");
 
 	VInt& vint=*static_cast<VInt *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VDouble(vint.as_double())));
+	r.write_no_lang(Value*(new VDouble(vint.as_double())));
 }
 
 typedef void (*vint_op_func_ptr)(VInt& vint, double param);
@@ -59,28 +59,28 @@ static void __mul(VInt& vint, double par
 static void __div(VInt& vint, double param) { vint.div(param); }
 static void __mod(VInt& vint, double param) { vint.mod((int)param); }
 
-static void vint_op(Request& r, MethodParams& params, 
+static void vint_op(Request& r, MethodParams* params, 
 					 vint_op_func_ptr func) {
 	VInt& vint=*static_cast<VInt *>(r.get_self().get());
-	double param=params.count()?params.as_double(0, "param must be numerical", r):1;
+	double param=params->count()?params->as_double(0, "param must be numerical", r):1;
 	(*func)(vint, param);
 }
 
-static void _inc(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__inc); }
-static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__dec); }
-static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mul); }
-static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__div); }
-static void _mod(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mod); }
+static void _inc(Request& r, const String& /*method_name*/, MethodParams* params) { vint_op(r, params, &__inc); }
+static void _dec(Request& r, const String& /*method_name*/, MethodParams* params) { vint_op(r, params, &__dec); }
+static void _mul(Request& r, const String& /*method_name*/, MethodParams* params) { vint_op(r, params, &__mul); }
+static void _div(Request& r, const String& /*method_name*/, MethodParams* params) { vint_op(r, params, &__div); }
+static void _mod(Request& r, const String& /*method_name*/, MethodParams* params) { vint_op(r, params, &__mod); }
 
 // from string.C
 extern 
-StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params,
-							HashStringValue*& options, ValuePtr& default_code);
-static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
+const String& sql_result_string(Request& r, const String& method_name, MethodParams* params,
+							HashStringValue*& options, Value*& default_code);
+static void _sql(Request& r, const String& method_name, MethodParams* params) {
 	int val;
 	HashStringValue* options;
-	ValuePtr default_code(0);
-	if(StringPtr string=sql_result_string(r, method_name, params, options, default_code))
+	Value* default_code(0);
+	if(const String& string=sql_result_string(r, method_name, params, options, default_code))
 		val=string->as_int();
 	else
 		if(default_code)
@@ -91,7 +91,7 @@ static void _sql(Request& r, StringPtr m
 				"produced no result, but no default option specified");
 			val=0; //calm, compiler
 		}
-	r.write_no_lang(ValuePtr(new VInt(val)));
+	r.write_no_lang(Value*(new VInt(val)));
 }
 
 // constructor