--- parser3/src/classes/int.C	2003/02/04 14:12:42	1.49.2.3
+++ parser3/src/classes/int.C	2015/10/26 01:21:54	1.64
@@ -1,54 +1,50 @@
 /** @file
 	Parser: @b int parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_INT_C="$Date: 2003/02/04 14:12:42 $";
-
 #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.64 2015/10/26 01:21:54 moko Exp $" IDENT_PA_VINT_H;
 
 // externs
 
-void _string_format(Request& r, StringPtr method_name, MethodParams& /*params*/);
+void _string_format(Request& r, MethodParams&);
 
 // class
 
-class MInt : public Methoded {
+class MInt: public Methoded {
 public:
 	MInt();
-public: // Methoded
-	bool used_directly() { return true; }
 };
 
 // global variable
 
-MethodedPtr int_class(new MInt);
+DECLARE_CLASS_VAR(int, new MInt, 0);
 
 // methods
 
-static void _int(Request& r, StringPtr method_name, 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");
-
-	VInt& vint=*static_cast<VInt *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(new VInt(vint.get_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, StringPtr method_name, 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()));
+}
 
-	VInt& vint=*static_cast<VInt *>(r.get_self().get());
-	r.write_no_lang(ValuePtr(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);
@@ -61,48 +57,48 @@ 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.get_self().get());
+	VInt& vint=GET_SELF(r, VInt);
 	double param=params.count()?params.as_double(0, "param must be numerical", r):1;
 	(*func)(vint, param);
 }
 
-static void _inc(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__inc); }
-static void _dec(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__dec); }
-static void _mul(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mul); }
-static void _div(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__div); }
-static void _mod(Request& r, StringPtr /*method_name*/, MethodParams& params) { vint_op(r, params, &__mod); }
+static void _inc(Request& r, MethodParams& params) { vint_op(r, params, &__inc); }
+static void _dec(Request& r, MethodParams& params) { vint_op(r, params, &__dec); }
+static void _mul(Request& r, MethodParams& params) { vint_op(r, params, &__mul); }
+static void _div(Request& r, MethodParams& params) { vint_op(r, params, &__div); }
+static void _mod(Request& r, MethodParams& params) { vint_op(r, params, &__mod); }
 
 // from string.C
-extern 
-StringPtr sql_result_string(Request& r, StringPtr method_name, MethodParams& params,
-								HashStringValuePtr& options, ValuePtr& default_code);
+extern const String* sql_result_string(Request& r, MethodParams& params, Value*& default_code);
 
-static void _sql(Request& r, StringPtr method_name, MethodParams& params) {
+static void _sql(Request& r, MethodParams& params) {
 	int val;
-	HashStringValuePtr options(0);
-	ValuePtr default_code(0);
-	if(StringPtr string=sql_result_string(r, method_name, params, options, default_code))
+	Value* default_code=0;
+	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();
+			val=r.process_to_value(*default_code).as_int();
 		else {
-			throw Exception("parser.runtime",
-				method_name,
+			throw Exception(PARSER_RUNTIME,
+				0,
 				"produced no result, but no default option specified");
-			val=0; //calm, compiler
 		}
-	r.write_no_lang(ValuePtr(new VInt(val)));
+	r.write_no_lang(*new VInt(val));
 }
 
 // constructor
 
 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]