--- parser3/src/classes/int.C	2001/04/15 13:12:17	1.19
+++ parser3/src/classes/int.C	2002/04/18 10:50:59	1.44
@@ -1,37 +1,50 @@
 /** @file
 	Parser: @b int parser class.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: int.C,v 1.19 2001/04/15 13:12:17 paf Exp $
+	$Id: int.C,v 1.44 2002/04/18 10:50:59 paf Exp $
 */
 
+#include "classes.h"
 #include "pa_request.h"
-#include "_int.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
-#include "_string.h"
 
-// global var
+// externs
+
+void _string_format(Request& r, const String& method_name, MethodParams *);
 
-VStateless_class *int_class;
+// class
+
+class MInt : public Methoded {
+public:
+	MInt(Pool& pool);
+public: // Methoded
+	bool used_directly() { return true; }
+};
 
 // methods
 
-static void _int(Request& r, const String&, MethodParams *) {
+static void _int(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
+	 // 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");
+
 	VInt *vint=static_cast<VInt *>(r.self);
-	Value& value=*new(pool) VInt(pool, vint->get_int());
-	r.write_no_lang(value);
+	r.write_no_lang(*new(pool) VInt(pool, vint->get_int()));
 }
 
-static void _double(Request& r, const String&, MethodParams *) {
+static void _double(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
+	 // 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");
+
 	VInt *vint=static_cast<VInt *>(r.self);
-	Value& value=*new(pool) VDouble(pool, vint->as_double());
-	r.write_no_lang(value);
+	r.write_no_lang(*new(pool) VDouble(pool, vint->as_double()));
 }
 
 typedef void (*vint_op_func_ptr)(VInt& vint, double param);
@@ -45,11 +58,7 @@ static void __mod(VInt& vint, double par
 static void vint_op(Request& r, MethodParams *params, 
 					 vint_op_func_ptr func) {
 	VInt *vint=static_cast<VInt *>(r.self);
-	double param=params->size()?
-		r.process(
-			params->get(0),
-			0/*no name*/,
-			false/*don't intercept string*/).as_double():1;
+	double param=params->size()?params->as_double(0, "param must be numerical", r):1;
 	(*func)(*vint, param);
 }
 
@@ -59,29 +68,67 @@ static void _mul(Request& r, const Strin
 static void _div(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__div); }
 static void _mod(Request& r, const String&, MethodParams *params) { vint_op(r, params, &__mod); }
 
-// initialize
+// from string.C
+extern 
+const String* sql_result_string(Request& r, const String& method_name, MethodParams *params,
+								Hash *& options, Value *& default_code);
+
+static void _sql(Request& r, const String& method_name, MethodParams *params) {
+	Pool& pool=r.pool();
 
-void initialize_int_class(Pool& pool, VStateless_class& vclass) {
+	int val;
+	Hash *options;
+	Value *default_code;
+	if(const String *string=sql_result_string(r, method_name, params, options, default_code))
+		val=string->as_int();
+	else
+		if(default_code)
+			val=r.process_to_value(*default_code).as_int();
+		else {
+			throw Exception("parser.runtime",
+				&method_name,
+				"produced no result, but no default option specified");
+			val=0; //calm, compiler
+		}
+	r.write_no_lang(*new(pool) VInt(pool, val));
+}
+
+// constructor
+
+MInt::MInt(Pool& apool) : Methoded(apool, "int") {
 	// ^int.int[]
-	vclass.add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
 
 	// ^int.double[]
-	vclass.add_native_method("double", Method::CT_DYNAMIC, _double, 0, 0);
+	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
 
 	// ^int.inc[] 
 	// ^int.inc[offset]
-	vclass.add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);
+	add_native_method("inc", Method::CT_DYNAMIC, _inc, 0, 1);
 	// ^int.dec[] 
 	// ^int.dec[offset]
-	vclass.add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1);
+	add_native_method("dec", Method::CT_DYNAMIC, _dec, 0, 1);
 	// ^int.mul[k] 
-	vclass.add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1);
+	add_native_method("mul", Method::CT_DYNAMIC, _mul, 1, 1);
 	// ^int.div[d]
-	vclass.add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1);
+	add_native_method("div", Method::CT_DYNAMIC, _div, 1, 1);
 	// ^int.mod[offset]
-	vclass.add_native_method("mod", Method::CT_DYNAMIC, _mod, 1, 1);
+	add_native_method("mod", Method::CT_DYNAMIC, _mod, 1, 1);
 
 
 	// ^int.format{format}
-	vclass.add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
+	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
+
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0)]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
+}
+// global variable
+
+Methoded *int_class;
+
+// creator
+
+Methoded *MInt_create(Pool& pool) {
+	return int_class=new(pool) MInt(pool);
 }