--- parser3/src/classes/hash.C	2002/02/08 08:30:10	1.35
+++ parser3/src/classes/hash.C	2002/08/29 12:22:46	1.46
@@ -3,10 +3,10 @@
 
 	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: hash.C,v 1.35 2002/02/08 08:30:10 paf Exp $
 */
 
+static const char* IDENT_HASH_C="$Date: 2002/08/29 12:22:46 $";
+
 #include "classes.h"
 #include "pa_request.h"
 #include "pa_vhash.h"
@@ -16,10 +16,6 @@
 #include "pa_vbool.h"
 #include "pa_vmethod_frame.h"
 
-// defines
-
-#define HASH_CLASS_NAME "hash"
-
 // class
 
 class MHash : public Methoded {
@@ -57,7 +53,7 @@ public:
 	}
 	void before_rows() { 
 		if(columns.size()<=1)
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"column count must be more than 1 to create a hash");
 	}
@@ -133,7 +129,6 @@ static void _union(Request& r, const Str
 
 	// return result
 	Value& result=*new(pool) VHash(pool, dest);
-	result.set_name(method_name);
 	r.write_no_lang(result);
 }
 
@@ -166,9 +161,7 @@ static void _intersection(Request& r, co
 	}
 
 	// return result
-	Value& result=*new(pool) VHash(pool, dest);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new(pool) VHash(pool, dest));
 }
 
 static void *intersects(const Hash::Key& key, Hash::Val *value, void *info) {
@@ -188,9 +181,7 @@ static void _intersects(Request& r, cons
 		yes=static_cast<VHash *>(r.self)->hash(&method_name).first_that(intersects, b)!=0;
 
 	// return result
-	Value& result=*new(pool) VBool(pool, yes);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new(pool) VBool(pool, yes));
 }
 
 
@@ -203,20 +194,20 @@ static void _sql(Request& r, const Strin
 	ulong offset=0;
 	if(params->size()>1) {
 		Value& voptions=params->as_no_junction(1, "options must be hash, not code");
-		if(voptions.is_defined())
+		if(!voptions.is_string())
 			if(Hash *options=voptions.get_hash(&method_name)) {
 				if(Value *vlimit=(Value *)options->get(*sql_limit_name))
-					limit=(ulong)r.process(*vlimit).as_double();
+					limit=(ulong)r.process_to_value(*vlimit).as_double();
 				if(Value *voffset=(Value *)options->get(*sql_offset_name))
-					offset=(ulong)r.process(*voffset).as_double();
+					offset=(ulong)r.process_to_value(*voffset).as_double();
 			} else
-				throw Exception(0, 0,
+				throw Exception("parser.runtime",
 					&method_name,
 					"options must be hash");
 	}
 
 	Temp_lang temp_lang(r, String::UL_SQL);
-	const String& statement_string=r.process(statement).as_string();
+	const String& statement_string=r.process_to_string(statement);
 	const char *statement_cstr=
 		statement_string.cstr(String::UL_UNSPECIFIED, r.connection(&method_name));
 	Hash& hash=static_cast<VHash *>(r.self)->hash(&method_name);
@@ -226,7 +217,8 @@ static void _sql(Request& r, const Strin
 
 	r.connection(&method_name)->query(
 		statement_cstr, offset, limit,
-		handlers);
+		handlers,
+		statement_string);
 }
 
 static void keys_collector(const Hash::Key& key, Hash::Val *value, void *info) {
@@ -246,17 +238,14 @@ static void _keys(Request& r, const Stri
 
 	static_cast<VHash *>(r.self)->hash(&method_name).for_each(keys_collector, &table);
 
-	VTable& result=*new(pool) VTable(pool, &table);
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(*new(pool) VTable(pool, &table));
 }
 
 static void _count(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
 
-	Value& result=*new(pool) VInt(pool, static_cast<VHash *>(r.self)->hash(&method_name).size());
-	result.set_name(method_name);
-	r.write_no_lang(result);
+	r.write_no_lang(
+		*new(pool) VInt(pool, static_cast<VHash *>(r.self)->hash(&method_name).size()));
 }
 
 static void _delete(Request& r, const String& method_name, MethodParams *params) {
@@ -283,10 +272,10 @@ static void one_foreach_cycle(const Hash
 	Foreach_info& i=*static_cast<Foreach_info *>(info);
 
 	i.vkey->set_string(akey);
-	i.r->root->put_element(*i.key_var_name, i.vkey);
-	i.r->root->put_element(*i.value_var_name, static_cast<Value *>(avalue));
+	i.r->method_frame->put_element(*i.key_var_name, i.vkey, false);
+	i.r->method_frame->put_element(*i.value_var_name, static_cast<Value *>(avalue), false);
 
-	Value& processed_body=i.r->process(*i.body_code);
+	StringOrValue processed_body=i.r->process(*i.body_code);
 	if(i.delim_maybe_code) { // delimiter set?
 		const String *string=processed_body.get_string();
 		if(i.need_delim && string && string->size()) // need delim & iteration produced string?
@@ -319,9 +308,8 @@ static void _foreach(Request& r, const S
 
 // constructor
 
-MHash::MHash(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), HASH_CLASS_NAME));
-
+MHash::MHash(Pool& apool) : Methoded(apool, "hash") 
+{
 	// ^hash::create[[copy_from]]
 	add_native_method("create", Method::CT_DYNAMIC, _create_or_add, 0, 1);
 	// ^hash.add[add_from]
@@ -353,10 +341,10 @@ MHash::MHash(Pool& apool) : Methoded(apo
 
 // global variable
 
-Methoded *hash_base_class;
+Methoded *hash_class;
 
 // creator
 
 Methoded *MHash_create(Pool& pool) {
-	return hash_base_class=new(pool) MHash(pool);
+	return hash_class=new(pool) MHash(pool);
 }