--- parser3/src/classes/hash.C 2002/02/08 08:30:10 1.35 +++ parser3/src/classes/hash.C 2002/04/10 09:53:14 1.37 @@ -4,7 +4,7 @@ Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) - $Id: hash.C,v 1.35 2002/02/08 08:30:10 paf Exp $ + $Id: hash.C,v 1.37 2002/04/10 09:53:14 paf Exp $ */ #include "classes.h" @@ -57,7 +57,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"); } @@ -206,17 +206,17 @@ static void _sql(Request& r, const Strin if(voptions.is_defined()) 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(r.self)->hash(&method_name); @@ -286,11 +286,11 @@ static void one_foreach_cycle(const Hash i.r->root->put_element(*i.key_var_name, i.vkey); i.r->root->put_element(*i.value_var_name, static_cast(avalue)); - Value& processed_body=i.r->process(*i.body_code); + Value& processed_body=i.r->process_to_value(*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? - i.r->write_pass_lang(i.r->process(*i.delim_maybe_code)); + i.r->write_pass_lang(i.r->process_to_string(*i.delim_maybe_code)); i.need_delim=true; } i.r->write_pass_lang(processed_body);