--- parser3/src/classes/int.C	2004/02/11 15:33:12	1.53
+++ parser3/src/classes/int.C	2013/07/29 15:02:17	1.63
@@ -1,18 +1,19 @@
 /** @file
 	Parser: @b int parser class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_INT_C="$Date: 2004/02/11 15:33:12 $";
-
 #include "classes.h"
 #include "pa_vmethod_frame.h"
 
 #include "pa_request.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "pa_vbool.h"
+
+volatile const char * IDENT_INT_C="$Id: int.C,v 1.63 2013/07/29 15:02:17 moko Exp $" IDENT_PA_VINT_H;
 
 // externs
 
@@ -23,8 +24,6 @@ void _string_format(Request& r, MethodPa
 class MInt: public Methoded {
 public:
 	MInt();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
@@ -33,24 +32,21 @@ DECLARE_CLASS_VAR(int, new MInt, 0);
 
 // methods
 
-static void _int(Request& r, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it  here, just for string.int compatibility
-	if(params.count()>0)
-		params.as_junction(0, "default must be int");
-
+static void _int(Request& r, MethodParams&) {
 	VInt& vint=GET_SELF(r, VInt);
 	r.write_no_lang(*new VInt(vint.get_int()));
 }
 
-static void _double(Request& r, MethodParams& params) {
-	// just checking (default) syntax validity, never really using it  here, just for string.doube compatibility
-	if(params.count()>0)
-		params.as_junction(0, "default must be double");
-
+static void _double(Request& r, MethodParams&) {
 	VInt& vint=GET_SELF(r, VInt);
 	r.write_no_lang(*new VDouble(vint.as_double()));
 }
 
+static void _bool(Request& r, MethodParams&) {
+	VInt& vint=GET_SELF(r, VInt);
+	r.write_no_lang(VBool::get(vint.as_bool()));
+}
+
 typedef void (*vint_op_func_ptr)(VInt& vint, double param);
 
 static void __inc(VInt& vint, double param) { vint.inc((int)param); }
@@ -73,20 +69,18 @@ static void _div(Request& r, MethodParam
 static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); }
 
 // from string.C
-extern 
-const String* sql_result_string(Request& r, MethodParams& params,
-				HashStringValue*& options, Value*& default_code);
+extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code);
+
 static void _sql(Request& r, MethodParams& params) {
 	int val;
-	HashStringValue* options;
 	Value* default_code=0;
-	if(const String* string=sql_result_string(r, params, options, default_code))
+	if(const String* string=sql_result_string(r, params, default_code))
 		val=string->as_int();
 	else
 		if(default_code)
 			val=r.process_to_value(*default_code).as_int();
 		else {
-			throw Exception("parser.runtime",
+			throw Exception(PARSER_RUNTIME,
 				0,
 				"produced no result, but no default option specified");
 		}
@@ -97,10 +91,14 @@ static void _sql(Request& r, MethodParam
 
 MInt::MInt(): Methoded("int") {
 	// ^int.int[]
+	// ^int.int[default for ^string.int compatibility]
 	add_native_method("int", Method::CT_DYNAMIC, _int, 0, 1);
-
 	// ^int.double[]
+	// ^int.double[default for ^string.double compatibility]
 	add_native_method("double", Method::CT_DYNAMIC, _double, 0, 1);
+	// ^int.bool[]
+	// ^int.bool[default for ^string.bool compatibility]
+	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);
 
 	// ^int.inc[] 
 	// ^int.inc[offset]