--- parser3/src/classes/hash.C	2009/06/16 07:36:01	1.95
+++ parser3/src/classes/hash.C	2009/08/08 13:30:20	1.103
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_HASH_C="$Date: 2009/06/16 07:36:01 $";
+static const char * const IDENT_HASH_C="$Date: 2009/08/08 13:30:20 $";
 
 #include "classes.h"
 #include "pa_vmethod_frame.h"
@@ -22,7 +22,7 @@ static const char * const IDENT_HASH_C="
 
 class MHash: public Methoded {
 public: // VStateless_class
-	Value* create_new_value(Pool&, HashStringValue*) { return new VHash(); }
+	Value* create_new_value(Pool&) { return new VHash(); }
 
 public:
 	MHash();
@@ -34,10 +34,6 @@ public: // Methoded
 
 DECLARE_CLASS_VAR(hash, new MHash, 0);
 
-// externs
-
-extern String cycle_data_name;
-
 // methods
 
 #ifndef DOXYGEN
@@ -74,9 +70,9 @@ public:
 		empty(0) {
 	}
 
-	bool add_column(SQL_Error& error, const char* str, size_t) {
+	bool add_column(SQL_Error& error, const char* str, size_t length) {
 		try {
-			columns+=new String(str, String::L_TAINTED);
+			columns+=new String(str, String::L_TAINTED, length);
 			return false;
 		} catch(...) {
 			error=SQL_Error("exception occured in Hash_sql_event_handlers::add_column");
@@ -113,9 +109,9 @@ public:
 		return false;
 	}
 
-	bool add_row_cell(SQL_Error& error, const char *ptr, size_t) {
+	bool add_row_cell(SQL_Error& error, const char *ptr, size_t length) {
 		try {
-			String& cell=*new String(ptr, String::L_TAINTED);
+			String& cell=*new String(ptr, String::L_TAINTED, length);
 
 			bool duplicate=false;
 			if(one_bool_column) {
@@ -205,7 +201,7 @@ static void _create_or_add(Request& r, M
 				return;
 			src->for_each<HashStringValue*>(copy_all_overwrite_to, self_hash);
 
-			if(VHash* vhash_src=static_cast<VHash*>(vsrc.as(VHASH_TYPE, false)))
+			if(VHash* vhash_src=static_cast<VHash*>(vsrc.as(VHASH_TYPE)))
 			{
 				if(Value* vdefault=vhash_src->get_default())
 				{
@@ -232,9 +228,9 @@ static void _sub(Request& r, MethodParam
 }
 
 static void copy_all_dontoverwrite_to(
-								  HashStringValue::key_type key, 
-								  HashStringValue::value_type value, 
-								  HashStringValue* dest) {
+					HashStringValue::key_type key, 
+					HashStringValue::value_type value, 
+					HashStringValue* dest) {
 	dest->put_dont_replace(key, value);
 }
 static void _union(Request& r, MethodParams& params) {
@@ -256,9 +252,9 @@ struct Copy_intersection_to_info {
 };
 #endif
 static void copy_intersection_to(
-								 HashStringValue::key_type key, 
-								 HashStringValue::value_type value, 
-								 Copy_intersection_to_info *info) {
+					HashStringValue::key_type key, 
+					HashStringValue::value_type value, 
+					Copy_intersection_to_info *info) {
 	if(info->b->get(key))
 		info->dest->put_dont_replace(key, value);
 }
@@ -276,9 +272,9 @@ static void _intersection(Request& r, Me
 }
 
 static bool intersects(
-					   HashStringValue::key_type key, 
-					   HashStringValue::value_type /*value*/, 
-					   HashStringValue* b) {
+					HashStringValue::key_type key, 
+					HashStringValue::value_type /*value*/, 
+					HashStringValue* b) {
 	return b->get(key)!=0;
 }
 
@@ -354,8 +350,8 @@ static void _sql(Request& r, MethodParam
 
 	Temp_lang temp_lang(r, String::L_SQL);
 	const String& statement_string=r.process_to_string(statement);
-	const char* statement_cstr=
-		statement_string.cstr(String::L_UNSPECIFIED, r.connection());
+	const char* statement_cstr=statement_string.untaint_cstr(r.flang, r.connection());
+
 	HashStringValue& hash=GET_SELF(r, VHash).hash();
 	hash.clear();	
 	Hash_sql_event_handlers handlers(
@@ -376,10 +372,10 @@ static void _sql(Request& r, MethodParam
 }
 
 static void keys_collector(
-			   HashStringValue::key_type key, 
-			   HashStringValue::value_type, 
-			   Table *table) {
-	Table::element_type row(new ArrayString);
+			HashStringValue::key_type key, 
+			HashStringValue::value_type, 
+			Table *table) {
+	Table::element_type row(new ArrayString(1));
 	*row+=new String(key, String::L_TAINTED);
 	*table+=row;
 }
@@ -390,7 +386,7 @@ static void _keys(Request& r, MethodPara
 	else 
 		keys_column_name=new String("key");
 
-	Table::columns_type columns(new ArrayString);
+	Table::columns_type columns(new ArrayString(1));
 	*columns+=keys_column_name;
 	Table* table=new Table(columns);
 
@@ -431,11 +427,11 @@ static bool one_foreach_cycle(
 				Foreach_info *info) {
 	Value& var_context=*info->var_context;
 	if(info->key_var_name){
-		VString* vkey=new VString(*new String(akey, String::L_TAINTED));
-		var_context.put_element(var_context, *info->key_var_name, vkey, false);
+		VString* vkey=new VString(*new String(akey, String::L_TAINTED));
+		var_context.put_element(*info->key_var_name, vkey, false);
 	}
 	if(info->value_var_name)
-		var_context.put_element(var_context, *info->value_var_name, avalue, false);
+		var_context.put_element(*info->value_var_name, avalue, false);
 
 	if(info->delim_maybe_code){ // delimiter set
 		StringOrValue sv_processed=info->r->process(*info->body_code);
@@ -457,8 +453,7 @@ static bool one_foreach_cycle(
 	}
 }
 static void _foreach(Request& r, MethodParams& params) {
-	Temp_hash_value<const String::Body, void*> 
-		cycle_data_setter(r.classes_conf, cycle_data_name, /*any not null flag*/&r);
+	InCycle temp(r);
 
 	const String& key_var_name=params.as_string(0, "key-var name must be string");
 	const String& value_var_name=params.as_string(1, "value-var name must be string");