--- parser3/src/classes/double.C	2001/03/10 12:12:49	1.3
+++ parser3/src/classes/double.C	2001/04/28 15:22:38	1.24
@@ -1,73 +1,108 @@
-/*
-$Id: double.C,v 1.3 2001/03/10 12:12:49 paf Exp $
+/** @file
+	Parser: @b double parser class.
+
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: double.C,v 1.24 2001/04/28 15:22:38 paf Exp $
 */
 
+#include "classes.h"
 #include "pa_request.h"
-#include "_double.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
 
-// global var
+// externs
+
+void _string_format(Request& r, const String& method_name, MethodParams *);
 
-VClass *double_class;
+// defines
+
+#define DOUBLE_CLASS_NAME "double"
+
+// class
+
+class MDouble : public Methoded {
+public:
+	MDouble(Pool& pool);
+	bool used_directly() { return true; }
+};
 
 // methods
 
-static void _int(Request& r, Array *) {
+static void _int(Request& r, const String&, MethodParams *) {
 	Pool& pool=r.pool();
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
-	Value& value=*new(pool) VInt(pool, static_cast<int>(vdouble->get_double()));
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	Value& value=*new(pool) VInt(pool, (int)vdouble->as_double());
+	r.write_no_lang(value);
 }
 
-static void _double(Request& r, Array *) {
+static void _double(Request& r, const String&, MethodParams *) {
 	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*/);
+	Value& value=*new(pool) VDouble(pool, vdouble->as_double());
+	r.write_no_lang(value);
 }
 
-static void _inc(Request& r, Array *params) {
+typedef void (*vdouble_op_func_ptr)(VDouble& vdouble, double param);
+
+static void __inc(VDouble& vdouble, double param) { vdouble.inc(param); }
+static void __dec(VDouble& vdouble, double param) { vdouble.inc(-param); }
+static void __mul(VDouble& vdouble, double param) { vdouble.mul(param); }
+static void __div(VDouble& vdouble, double param) { vdouble.div(param); }
+static void __mod(VDouble& vdouble, double param) { vdouble.mod((int)param); }
+
+static void vdouble_op(Request& r, MethodParams *params, 
+					   vdouble_op_func_ptr func) {
 	VDouble *vdouble=static_cast<VDouble *>(r.self);
-	double increment=params->size()?static_cast<Value *>(params->get(0))->get_double():1;
-	vdouble->inc(increment);
+	double param=params->size()?
+		r.process(
+			params->get(0),
+			0/*no name*/,
+			false/*don't intercept string*/).as_double():1/*used in inc/dec*/;
+	(*func)(*vdouble, param);
 }
 
-void initialize_double_class(Pool& pool, VClass& vclass) {
-	// ^double.int[]
-	String& INT_NAME=*new(pool) String(pool);
-	INT_NAME.APPEND_CONST("int");
+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); }
+
+// constructor
+
+MDouble::MDouble(Pool& apool) : Methoded(apool) {
+	set_name(*NEW String(pool(), DOUBLE_CLASS_NAME));
 
-	Method& INT_METHOD=*new(pool) Method(pool,
-		INT_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _int
-	);
-	vclass.add_method(INT_NAME, INT_METHOD);
+	// ^double.int[]
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
 
 	// ^double.double[]
-	String& DOUBLE_NAME=*new(pool) String(pool);
-	DOUBLE_NAME.APPEND_CONST("double");
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+	
+	// ^double.inc[] 
+	// ^double.inc[offset]
+	add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);
+	// ^double.dec[] 
+	// ^double.dec[offset]
+	add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1);
+	// ^double.mul[k] 
+	add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1);
+	// ^double.div[d]
+	add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1);
+	// ^double.mod[offset]
+	add_native_method("mod", Method::CT_DYNAMIC, _mod, 1, 1);
 
-	Method& DOUBLE_METHOD=*new(pool) Method(pool,
-		DOUBLE_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _double
-	);
-	vclass.add_method(DOUBLE_NAME, DOUBLE_METHOD);
-
-	// ^double.inc[] ^double.inc[offset]
-	String& INC_NAME=*new(pool) String(pool);
-	INC_NAME.APPEND_CONST("inc");
-
-	Method& INC_METHOD=*new(pool) Method(pool,
-		INC_NAME,
-		0, 1, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _inc
-	);
-	vclass.add_method(INC_NAME, INC_METHOD);
+	// ^double.format{format}
+	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
 }
+// global variable
+
+Methoded *double_class;
 
+// creator
+
+Methoded *MDouble_create(Pool& pool) {
+	return double_class=new(pool) MDouble(pool);
+}