--- parser3/src/classes/int.C	2001/07/26 12:25:37	1.30
+++ parser3/src/classes/int.C	2001/10/09 07:06:00	1.35
@@ -2,12 +2,10 @@
 	Parser: @b int parser class.
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: int.C,v 1.30 2001/07/26 12:25:37 parser Exp $
+	$Id: int.C,v 1.35 2001/10/09 07:06:00 parser Exp $
 */
-static const char *RCSId="$Id: int.C,v 1.30 2001/07/26 12:25:37 parser Exp $"; 
 
 #include "classes.h"
 #include "pa_request.h"
@@ -60,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);
 }
 
@@ -77,13 +71,32 @@ static void _mod(Request& r, const Strin
 // from string.C
 extern 
 const String* sql_result_string(Request& r, const String& method_name, 
-								MethodParams *params);
+								MethodParams *params,
+								Hash *&options);
 
 static void _sql(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
 
-	const String *string=sql_result_string(r, method_name, params);
-	int val=string?string->as_int():params->as_int(1, r);
+	int val;
+	Hash *options;
+	if(const String *string=sql_result_string(r, method_name, params, options))
+		val=string->as_int();
+	else
+		if(options) {
+			if(Value *vdefault=(Value *)options->get(*sql_default_name))
+				val=r.process(*vdefault).as_int();
+			else {
+				PTHROW(0, 0,
+					&method_name,
+					"produced no result, but no default option specified");
+				val=0; //calm, compiler
+			}
+		} else {
+			PTHROW(0, 0,
+				&method_name,
+				"produced no result, but no options (no default) specified");
+			val=0; //calm, compiler
+		}
 	VInt& result=*new(pool) VInt(pool, val);
 	result.set_name(method_name);
 	r.write_assign_lang(result);
@@ -118,8 +131,8 @@ 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](default)
+	// ^sql[query]
+	// ^sql[query][$.limit(1) $.offset(2) $.default(0)]
 	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);
 }
 // global variable