--- parser3/src/classes/int.C	2001/08/07 13:54:13	1.32
+++ parser3/src/classes/int.C	2002/03/27 15:30:34	1.41
@@ -1,13 +1,11 @@
 /** @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.32 2001/08/07 13:54:13 parser Exp $
+	$Id: int.C,v 1.41 2002/03/27 15:30:34 paf Exp $
 */
-static const char *RCSId="$Id: int.C,v 1.32 2001/08/07 13:54:13 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);
 }
 
@@ -76,31 +70,24 @@ static void _mod(Request& r, const Strin
 
 // from string.C
 extern 
-const String* sql_result_string(Request& r, const String& method_name, 
-								MethodParams *params,
-								Hash *&options);
+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;
-	if(const String *string=sql_result_string(r, method_name, params, options))
+	Value *default_code;
+	if(const String *string=sql_result_string(r, method_name, params, options, default_code))
 		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,
+		if(default_code)
+			val=r.process(*default_code).as_int();
+		else {
+			throw Exception("parser.runtime",
 				&method_name,
-				"produced no result, but no options (no default) specified");
+				"produced no result, but no default option specified");
 			val=0; //calm, compiler
 		}
 	VInt& result=*new(pool) VInt(pool, val);