--- parser3/src/classes/int.C	2001/04/28 15:22:38	1.22
+++ parser3/src/classes/int.C	2002/04/10 09:53:14	1.43
@@ -1,11 +1,10 @@
 /** @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.22 2001/04/28 15:22:38 paf Exp $
+	$Id: int.C,v 1.43 2002/04/10 09:53:14 paf Exp $
 */
 
 #include "classes.h"
@@ -26,23 +25,32 @@ void _string_format(Request& r, const St
 class MInt : public Methoded {
 public:
 	MInt(Pool& pool);
-	bool used_directly() { return false; }
+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();
+	Value *default_code=params->size()>0?
+		default_code=&params->as_junction(0, "default must be int"):0; // (default)
+
 	VInt *vint=static_cast<VInt *>(r.self);
-	Value& value=*new(pool) VInt(pool, vint->get_int());
-	r.write_no_lang(value);
+	Value& result=*new(pool) VInt(pool, vint->get_int());
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
-static void _double(Request& r, const String&, MethodParams *) {
+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)
+
 	VInt *vint=static_cast<VInt *>(r.self);
-	Value& value=*new(pool) VDouble(pool, vint->as_double());
-	r.write_no_lang(value);
+	Value& result=*new(pool) VDouble(pool, vint->as_double());
+	result.set_name(method_name);
+	r.write_no_lang(result);
 }
 
 typedef void (*vint_op_func_ptr)(VInt& vint, double param);
@@ -56,11 +64,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);
 }
 
@@ -70,6 +74,33 @@ 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); }
 
+// 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();
+
+	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
+		}
+	VInt& result=*new(pool) VInt(pool, val);
+	result.set_name(method_name);
+	r.write_assign_lang(result);
+}
+
 // constructor
 
 MInt::MInt(Pool& apool) : Methoded(apool) {
@@ -77,10 +108,10 @@ MInt::MInt(Pool& apool) : Methoded(apool
 
 
 	// ^int.int[]
-	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 0);
+	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
 
 	// ^int.double[]
-	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]
@@ -98,6 +129,10 @@ MInt::MInt(Pool& apool) : Methoded(apool
 
 	// ^int.format{format}
 	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