--- parser3/src/classes/int.C	2001/05/21 16:38:46	1.25
+++ parser3/src/classes/int.C	2002/03/27 15:30:34	1.41
@@ -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.25 2001/05/21 16:38:46 parser Exp $
+	$Id: int.C,v 1.41 2002/03/27 15:30:34 paf Exp $
 */
 
 #include "classes.h"
@@ -24,9 +23,6 @@ void _string_format(Request& r, const St
 // class
 
 class MInt : public Methoded {
-public: // VStateless_class
-	Value *create_new_value(Pool& pool) { return new(pool) VInt(pool); }
-
 public:
 	MInt(Pool& pool);
 public: // Methoded
@@ -62,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);
 }
 
@@ -76,15 +68,31 @@ 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 
-String& sql_result_string(Request& r, const String& method_name, MethodParams *params);
+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();
 
-	VInt& result=*new(pool) VInt(sql_result_string(r, method_name, params).as_int());
+	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(*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_no_lang(result);
+	r.write_assign_lang(result);
 }
 
 // constructor
@@ -115,9 +123,10 @@ MInt::MInt(Pool& apool) : Methoded(apool
 
 	// ^int.format{format}
 	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);
-	// ^int:sql[query]
-	// ^int:sql[query](offset)
-	add_native_method("sql", Method::CT_DYNAMIC, _sql, 1, 2);
+
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0)]
+	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable