--- parser3/src/main/pa_common.C 2003/01/21 15:51:13 1.143 +++ parser3/src/main/pa_common.C 2003/03/20 09:41:46 1.143.2.21.2.5 @@ -1,23 +1,44 @@ /** @file Parser: commonly functions. - Copyright(c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_COMMON_C="$Date: 2003/01/21 15:51:13 $"; +static const char* IDENT_COMMON_C="$Date: 2003/03/20 09:41:46 $"; #include "pa_common.h" #include "pa_exception.h" -#include "pa_globals.h" #include "pa_hash.h" +#include "pa_globals.h" + +//#define PA_HTTP + +#ifdef PA_HTTP #include "pa_vstring.h" -#include "pa_vdate.h" +#include "pa_vint.h" -#ifdef WIN32 -# include +#ifdef CYGWIN +#define _GNU_H_WINDOWS32_SOCKETS +// for PASCAL +#include +// SOCKET +typedef u_int SOCKET; +int PASCAL closesocket(SOCKET); #else -# define closesocket close +# if defined(WIN32) +# include +# else +# define closesocket close +# endif +#endif + +#else + +# if defined(WIN32) +# include +# endif + #endif // some maybe-undefined constants @@ -84,8 +105,33 @@ static int unlock(int fd) { FLOCK(F_TLOC #endif #endif +// defines for globals + +#define FILE_STATUS_NAME "status" + +// globals + +const String file_status_name(FILE_STATUS_NAME); + +// defines for statics + +#define HTTP_METHOD_NAME "method" +#define HTTP_TIMEOUT_NAME "timeout" +#define HTTP_HEADERS_NAME "headers" +#define HTTP_ANY_STATUS_NAME "any-status" + +// statics + +static const String http_method_name(HTTP_METHOD_NAME); +static const String http_timeout_name(HTTP_TIMEOUT_NAME); +static const String http_headers_name(HTTP_HEADERS_NAME); +static const String http_any_status_name(HTTP_ANY_STATUS_NAME); + +// defines + #define DEFAULT_USER_AGENT "parser3" +// functions void fix_line_breaks(char* buf, size_t& size) { if(size==0) @@ -115,15 +161,17 @@ void fix_line_breaks(char* buf, size_t& memcpy(dest, bol, eob-bol); } -char* file_read_text(Pool& pool, const String& file_spec, +char* file_read_text(Charset& charset, + const String& file_spec, bool fail_on_read_problem, - Hash *params, Hash** out_fields) { - void *result; size_t size; - return file_read(pool, file_spec, result, size, true, params, out_fields, fail_on_read_problem)?(char *)result:0; + HashStringValue* params/*, HashStringValue* * out_fields*/) { + File_read_result file= + file_read(charset, file_spec, true, params, fail_on_read_problem); + return file.success?file.data:0; } +#ifdef PA_HTTP //http request stuff -/* ************************ http stuff *********************** */ static bool set_addr(struct sockaddr_in *addr, const char* host, const short port){ memset(addr, 0, sizeof(*addr)); @@ -139,29 +187,30 @@ static bool set_addr(struct sockaddr_in return true; } -static int http_read_response(String& response, int sock, bool fail_on_status_ne_200){ - const String* status_code=0; +static int http_read_responseString& response, int sock, bool fail_on_status_ne_200){ + int result=0; ssize_t EOLat=0; while(true) { - char *buf=(char *)response.pool().malloc(MAX_STRING); + char *buf=new char[MAX_STRING]; ssize_t size=recv(sock, buf, MAX_STRING, 0); if(size<=0) break; response.APPEND_TAINTED(buf, size, "remote HTTP server response", 0); - if(!status_code && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response + if(!result && (EOLat=response.pos("\r\n", 2))>=0) { // checking status in first response const String& status_line=response.mid(0, (size_t)EOLat); - Array astatus(response.pool()); - size_t pos_after_ref=0; status_line.split(astatus, &pos_after_ref, " ", 1); - status_code=astatus.get_string(1); + ArrayString astatus; + status_line->split(astatus, 0, " ", 1); + const String& status_code=astatus.get(1); + result=status_code->as_int(); - if(fail_on_status_ne_200 && *status_code!="200") + if(fail_on_status_ne_200 && result!=200) throw Exception("http.status", status_code, "invalid HTTP response status"); } } - if(status_code) - return status_code->as_int(); + if(result) + return result; else throw Exception("http.response", 0, @@ -181,12 +230,13 @@ static void timeout_handler(int sig){ } #endif -static int http_request(String& response, - const String *origin_string, - const char* host, int port, - const char* request, - int timeout, - bool fail_on_status_ne_200){ +static int http_request( + String& response, + const String* origin_string, + const char* host, int port, + const char* request, + int timeout, + bool fail_on_status_ne_200) { if(!host) throw Exception("http.host", origin_string, @@ -240,93 +290,103 @@ static int http_request(String& response #ifdef WE_CAN_USE_ALARM alarm(0); #endif - /*re*/throw; + rethrow; } } #ifndef DOXYGEN struct Http_pass_header_info { + ; + Charset* charset; String* request; bool user_agent_specified; }; #endif -static void http_pass_header(const Hash::Key& key, Hash::Val *value, void *info) -{ - Http_pass_header_info& i=*static_cast(info); - Pool& pool=i.request->pool(); - - *(i.request)<(value), String::UL_HTTP_HEADER, false) +static void http_pass_header(HashStringValue::key_type key, HashStringValue::value_type value, + Http_pass_header_info *info) { + *(info->request)<<*key<<": " + << *attributed_meaning_to_string(*info->value, String::UL_HTTP_HEADER, false) <<"\n"; - if(key.change_case(pool, String::CC_UPPER)=="USER-AGENT") - i.user_agent_specified=true; + if(*key->change_case(*info->*info->charset, String::CC_UPPER)=="USER-AGENT") + info->user_agent_specified=true; } -static void file_read_http(Pool& pool, const String& file_spec, - void*& data, size_t& data_size, - Hash *options=0, Hash** out_fields=0) { +#ifndef DOXYGEN +struct File_read_http_result { + char *data; size_t size; + HashStringValue* headers; +}; +#endif +static File_read_http_result file_read_httpCharset& charset, const String& file_spec, + HashStringValue *options=0) { + File_read_http_result result; char host[MAX_STRING]; const char* uri; int port; - const char* method="GET"; + const char* method(0); int timeout=2; bool fail_on_status_ne_200=true; - Value *vheaders=0; + ValuePtr vheaders(0); - String connect_string(pool); + const String& connect_string(new String()); // not in ^sql{... UL_SQL ...} spirit, but closer to ^file::load one - connect_string.append(file_spec, String::UL_URI); // tainted pieces -> URI pieces + connect_string->append(*file_spec, String::UL_URI); // tainted pieces -> URI pieces - char* connect_string_cstr=connect_string.cstr(String::UL_UNSPECIFIED); - if(strncmp(connect_string_cstr, "http://", 7)!=0) + const char* connect_string_cstr=connect_string->cstr(String::UL_UNSPECIFIED); + const char* current=connect_string_cstr; + if(strncmp(current, "http://", 7)!=0) throw Exception(0, - &connect_string, + connect_string, "does not start with http://"); //never - connect_string_cstr+=7; + current+=7; - strncpy(host, connect_string_cstr, sizeof(host)-1); host[sizeof(host)-1]=0; + strncpy(host, current, sizeof(host)-1); host[sizeof(host)-1]=0; char* host_uri=lsplit(host, '/'); - uri=host_uri?connect_string_cstr+(host_uri-1-host):"/"; + uri=host_uri?current+(host_uri-1-host):"/"; char* port_cstr=lsplit(host, ':'); char* error_pos=0; port=port_cstr?strtol(port_cstr, &error_pos, 0):80; if(options) { int valid_options=0; - if(Value *vmethod=static_cast(options->get(*http_method_name))) { + if(ValuePtr vmethod=options->get(http_method_name)) { valid_options++; - method=vmethod->as_string().cstr(); + method=vmethod->as_string(&pool)->cstr(); } - if(Value *vtimeout=static_cast(options->get(*http_timeout_name))) { + if(ValuePtr vtimeout=options->get(http_timeout_name)) { valid_options++; timeout=vtimeout->as_int(); } - if(vheaders=static_cast(options->get(*http_headers_name))) { + if(vheaders=options->get(http_headers_name)) { valid_options++; } - if(Value *vany_status=static_cast(options->get(*http_any_status_name))) { + if(ValuePtr vany_status=options->get(http_any_status_name)) { valid_options++; fail_on_status_ne_200=!vany_status->as_bool(); } - if(valid_options!=options->size()) + if(valid_options!=options->count()) throw Exception("parser.runtime", 0, "invalid option passed"); } //making request - String request(pool); - request<< method <<" "<< uri <<" HTTP/1.0\nHost: "<< host<<"\n"; + String request; + if(method) + request<is_string()) { // allow empty - if(Hash *headers=vheaders->get_hash(&connect_string)) { - Http_pass_header_info info={&request}; + if(HashStringValue *headers=vheaders->get_hash(connect_string)) { + Http_pass_header_info info={&&charset, &request}; headers->for_each(http_pass_header, &info); user_agent_specified=info.user_agent_specified; } else throw Exception("parser.runtime", - &connect_string, + connect_string, "headers param must be hash"); }; if(!user_agent_specified) // defaulting @@ -334,65 +394,62 @@ static void file_read_http(Pool& pool, c request<<"\n"; //sending request - String response(pool); + String response; + const char* request_cstr=request.cstr(String::UL_UNSPECIFIED); int status_code=http_request(response, - &connect_string, host, port, request.cstr(String::UL_UNSPECIFIED), + connect_string, host, port, request_cstr, timeout, fail_on_status_ne_200); //processing results int pos=response.pos("\r\n\r\n", 4); if(pos<1){ throw Exception("http.response", - &connect_string, + connect_string, "bad response from host - no headers found"); } - String header_block=response.mid(0, pos); - String body=response.mid(pos+4, response.size()); + const String& header_block=response.mid(0, pos); + const String& body=response.mid(pos+4, response.size()); - Array aheaders(pool); - Hash& headers=*new(pool) Hash(pool); - size_t pos_after_ref=0; - header_block.split(aheaders, &pos_after_ref, "\r\n", 2); + ArrayString aheaders; + result.headers=HashStringValue* (new HashStringValue); + header_block->split(aheaders, 0, "\r\n", 2); //processing headers - for(int i=1;ipos(": ", 2); - if(pos<1) - throw Exception("http.response", - &connect_string, - "bad response from host - bad header \"%s\"", line->cstr()); - - headers.put( - line->mid(0, pos).change_case(pool, String::CC_UPPER), - new(pool) VString(line->mid(pos+2, line->size()))); - } else + for(int i=1; ipos(": ", 2); + if(pos<1) throw Exception("http.response", - &connect_string, - "bad response from host - bad headers \"%s\"", header_block.cstr()); + connect_string, + "bad response from host - bad header \"%s\"", line->cstr().get()); + + result.headers->put( + line->mid(0, pos)->change_case(charset, String::CC_UPPER), + ValuePtr(new VString(line->mid(pos+2, line->size())))); } // output response - data=body.cstr(); data_size=body.size(); - if(out_fields) { - headers.put(*file_status_name, new(pool) VInt(pool, status_code)); - *out_fields=&headers; - } + result.data=new char[1/*as text puts terminating zero later*/+(result.size=body->size())]; + body->store_to(result.data, String::UL_AS_IS); + result.headers->put(file_status_name, ValuePtr(new VInt(status_code))); + return result; } +#endif + #ifndef DOXYGEN struct File_read_action_info { - void **data; size_t *data_size; + char **data; size_t *data_size; }; #endif -static void file_read_action(Pool& pool, +static void file_read_action( struct stat& finfo, int f, const String& file_spec, const char* fname, bool as_text, void *context) { File_read_action_info& info=*static_cast(context); if(size_t to_read_size=(size_t)finfo.st_size) { - *info.data=pool.malloc(to_read_size+(as_text?1:0), 3); + *info.data=new char[to_read_size+(as_text?1:0)]; *info.data_size=(size_t)read(f, *info.data, to_read_size); if(ssize_t(*info.data_size)<0 || *info.data_size>to_read_size) @@ -402,7 +459,7 @@ static void file_read_action(Pool& pool, *info.data_size, to_read_size); } else { // empty file if(as_text) { - *info.data=pool.malloc(1); + *info.data=new char[1]; *(char*)(*info.data)=0; } else *info.data=0; @@ -410,41 +467,47 @@ static void file_read_action(Pool& pool, return; } } -bool file_read(Pool& pool, const String& file_spec, - void*& data, size_t& data_size, - bool as_text, Hash *params, Hash** out_fields, +File_read_result file_read(Charset& charset, const String& file_spec, + bool as_text, HashStringValue *params, bool fail_on_read_problem) { - bool result; + File_read_result result; +#ifdef PA_HTTP if(file_spec.starts_with("http://", 7)) { // fail on read problem - file_read_http(pool, file_spec, data, data_size, params, out_fields); - result=true; + File_read_http_result http=file_read_http(charset, file_spec, params); + result.success=true; + result.data=http.data; + result.size=http.size; + result.headers=http.headers; } else { - File_read_action_info info={&data, &data_size}; - result=file_read_action_under_lock(pool, file_spec, +#endif + File_read_action_info info={&result.data, &result.size}; + result.success=file_read_action_under_lock(file_spec, "read", file_read_action, &info, as_text, fail_on_read_problem); +#ifdef PA_HTTP } +#endif - if(result && as_text) { + if(result.success && as_text) { // UTF-8 signature: EF BB BF - if(data_size>=3) { - char *in=(char *)data; + if(result.size>=3) { + char *in=(char *)result.data; if((in[0] == '\xEF') && (in[1] == '\xBB') && (in[2] == '\xBF')) { - data=in+3; data_size-=3;// skip prefix + result.data=in+3; result.size-=3;// skip prefix } } - fix_line_breaks((char *)(data), data_size); + fix_line_breaks((char *)(result.data), result.size); // note: after fixing - ((char*&)(data))[data_size]=0; + ((char*&)(result.data))[result.size]=0; } return result; } -bool file_read_action_under_lock(Pool& pool, const String& file_spec, +bool file_read_action_under_lock(const String& file_spec, const char* action_name, File_read_action action, void *context, bool as_text, bool fail_on_read_problem) { @@ -466,14 +529,14 @@ bool file_read_action_under_lock(Pool& p throw Exception("file.lock", &file_spec, "shared lock failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); struct stat finfo; if(stat(fname, &finfo)!=0) throw Exception("file.missing", // hardly possible: we just opened it OK &file_spec, "stat failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); #ifdef PA_SAFE_MODE if(finfo.st_uid/*foreign?*/!=geteuid() @@ -481,14 +544,14 @@ bool file_read_action_under_lock(Pool& p throw Exception("parser.runtime", &file_spec, "parser is in safe mode: reading files of foreign group and user disabled [recompile parser with --disable-safe-mode configure option], actual filename '%s'", - fname); + fname); #endif - action(pool, finfo, f, file_spec, fname, as_text, context); + action(finfo, f, file_spec, fname, as_text, context); } catch(...) { unlock(f);close(f); if(fail_on_read_problem) - /*re*/throw; + rethrow; return false; } @@ -499,7 +562,7 @@ bool file_read_action_under_lock(Pool& p throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &file_spec, "%s failed: %s (%d), actual filename '%s'", - action_name, strerror(errno), errno, fname); + action_name, strerror(errno), errno, fname); return false; } } @@ -507,7 +570,7 @@ bool file_read_action_under_lock(Pool& p static void create_dir_for_file(const String& file_spec) { size_t pos_after=1; int pos_before; - while((pos_before=file_spec.pos("/", 1, pos_after))>=0) { + while((pos_before=file_spec.pos("/", pos_after))>=0) { mkdir(file_spec.mid(0, pos_before).cstr(String::UL_FILE_SPEC), 0775); pos_after=pos_before+1; } @@ -533,7 +596,7 @@ bool file_write_action_under_lock( Exception e("file.lock", &file_spec, "shared lock failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); close(f); if(fail_on_lock_problem) throw e; @@ -548,7 +611,7 @@ bool file_write_action_under_lock( ftruncate(f, lseek(f, 0, SEEK_CUR)); // one can not use O_TRUNC, read lower #endif unlock(f);close(f); - /*re*/throw; + rethrow; } #ifdef HAVE_FTRUNCATE @@ -561,13 +624,13 @@ bool file_write_action_under_lock( throw Exception(errno==EACCES?"file.access":0, &file_spec, "%s failed: %s (%d), actual filename '%s'", - action_name, strerror(errno), errno, fname); + action_name, strerror(errno), errno, fname); // here should be nothing, see rethrow above } #ifndef DOXYGEN struct File_write_action_info { - const void *data; size_t size; + const char* data; size_t size; }; #endif static void file_write_action(int f, void *context) { @@ -582,21 +645,21 @@ static void file_write_action(int f, voi } void file_write( const String& file_spec, - const void *data, size_t size, + const char* data, size_t size, bool as_text, bool do_append) { File_write_action_info info={data, size}; file_write_action_under_lock( - file_spec, - "write", file_write_action, &info, - as_text, - do_append); + file_spec, + "write", file_write_action, &info, + as_text, + do_append); } // throws nothing! [this is required in file_move & file_delete] static void rmdir(const String& file_spec, size_t pos_after) { int pos_before; - if((pos_before=file_spec.pos("/", 1, pos_after))>=0) + if((pos_before=file_spec.pos("/", pos_after))>=0) rmdir(file_spec, pos_before+1); rmdir(file_spec.mid(0, pos_after-1/* / */).cstr(String::UL_FILE_SPEC)); @@ -608,7 +671,7 @@ bool file_delete(const String& file_spec throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &file_spec, "unlink failed: %s (%d), actual filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); else return false; @@ -625,7 +688,7 @@ void file_move(const String& old_spec, c throw Exception(errno==EACCES?"file.access":errno==ENOENT?"file.missing":0, &old_spec, "rename failed: %s (%d), actual filename '%s' to '%s'", - strerror(errno), errno, old_spec_cstr, new_spec_cstr); + strerror(errno), errno, old_spec_cstr, new_spec_cstr); rmdir(old_spec, 1); } @@ -645,7 +708,7 @@ bool entry_exists(const String& file_spe } static bool entry_readable(const String& file_spec, bool need_dir) { - char* fname=file_spec.cstr(String::UL_FILE_SPEC); + char* fname=file_spec.cstrm(String::UL_FILE_SPEC); if(need_dir) { size_t size=strlen(fname); while(size) { @@ -669,11 +732,11 @@ bool file_readable(const String& file_sp bool dir_readable(const String& file_spec) { return entry_readable(file_spec, true); } -String *file_readable(const String& path, const String& name) { - String *result=new(path.pool()) String(path); - *result << "/"; - *result << name; - return file_readable(*result)?result:0; +const String* file_readable(String& path, String& name) { + String& result=*new String(path); + result << "/"; + result << name; + return file_readable(result)?&result:0; } bool file_executable(const String& file_spec) { return access(file_spec.cstr(String::UL_FILE_SPEC), X_OK)==0; @@ -685,7 +748,6 @@ bool file_stat(const String& file_spec, time_t& rmtime, time_t& rctime, bool fail_on_read_problem) { - Pool& pool=file_spec.pool(); const char* fname=file_spec.cstr(String::UL_FILE_SPEC); struct stat finfo; if(stat(fname, &finfo)!=0) @@ -693,7 +755,7 @@ bool file_stat(const String& file_spec, throw Exception("file.missing", &file_spec, "getting file size failed: %s (%d), real filename '%s'", - strerror(errno), errno, fname); + strerror(errno), errno, fname); else return false; rsize=finfo.st_size; @@ -745,7 +807,7 @@ char* rsplit(char* string, char delim) { } /// @todo less stupid type detection -char* format(Pool& pool, double value, char* fmt) { +const char* format(double value, char* fmt) { char local_buf[MAX_NUMBER]; size_t size; @@ -760,15 +822,13 @@ char* format(Pool& pool, double value, c else size=snprintf(local_buf, sizeof(local_buf), "%d", (int)value); - char* pool_buf=(char *)pool.malloc(size+1, 4); - memcpy(pool_buf, local_buf, size+1); - return pool_buf; + return pa_strdup(local_buf, size); } size_t stdout_write(const void *buf, size_t size) { #ifdef WIN32 do{ - int chunk_written=fwrite(buf, 1, min(8*0x400, size), stdout); + int chunk_written=fwrite(buf, 1, min((size_t)8*0x400, size), stdout); if(chunk_written<=0) break; size-=chunk_written; @@ -781,8 +841,8 @@ size_t stdout_write(const void *buf, siz #endif } -char* unescape_chars(Pool& pool, const char* cp, int len) { - char* s=(char *)pool.malloc(len + 1, 5); +char* unescape_chars(const char* cp, int len) { + char* s=new char[len + 1]; enum EscapeState { EscapeRest, EscapeFirst, @@ -903,7 +963,7 @@ int __vsnprintf(char* b, size_t s, const win32: mk:@MSITStore:C:\Program%20Files\Microsoft%20Visual%20Studio\MSDN\2001APR\1033\vccore.chm::/html/_crt__vsnprintf.2c_._vsnwprintf.htm - if the number of bytes to write exceeds buffer, then count bytes are written and –1 is returned + if the number of bytes to write exceeds buffer, then count bytes are written and Ö1 is returned */ r=_vsnprintf(b, s, f, l); if(r<0) @@ -953,74 +1013,3 @@ int pa_sleep(unsigned long secs, unsigne } -// attributed meaning - -static size_t date_attribute(const VDate& vdate, char *buf, size_t buf_size) { - const char month_names[12][4]={ - "Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; - const char days[7][4]={ - "Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; - - time_t when=vdate.get_time(); - struct tm *tms=gmtime(&when); - if(!tms) - throw Exception(0, - 0, - "bad time in attribute value (seconds from epoch=%ld)", when); - return snprintf(buf, MAX_STRING, "%s, %.2d-%s-%.4d %.2d:%.2d:%.2d GMT", - days[tms->tm_wday], - tms->tm_mday,month_names[tms->tm_mon],tms->tm_year+1900, - tms->tm_hour,tms->tm_min,tms->tm_sec); -} -static void append_attribute_meaning(String& result, - Value& value, String::Untaint_lang lang, bool forced) { - if(const String *string=value.get_string()) - result.append(string->join_chains(result.pool(), 0), lang, forced); - else - if(Value *vdate=value.as(VDATE_TYPE, false)) { - char *buf=(char *)result.malloc(MAX_STRING); - size_t size=date_attribute(*static_cast(vdate), - buf, MAX_STRING); - - result.APPEND_CLEAN(buf, size, "converted from date", 0); - } else - throw Exception("parser.runtime", - &result, - "trying to append here neither string nor date (%s)", - value.type()); -} -#ifndef DOXYGEN -struct Attributed_meaning_info { - String *header; // header line being constructed - String::Untaint_lang lang; // language in which to append to that line - bool forced; // do they force that lang? -}; -#endif -static void append_attribute_subattribute(const Hash::Key& akey, Hash::Val *avalue, - void *info) { - if(akey==VALUE_NAME) - return; - - Attributed_meaning_info& ami=*static_cast(info); - - // ...; charset=windows1251 - *ami.header << "; "; - ami.header->append(akey, ami.lang, ami.forced); - *ami.header << "="; - append_attribute_meaning(*ami.header, *static_cast(avalue), ami.lang, ami.forced); -} -const String& attributed_meaning_to_string(Value& meaning, - String::Untaint_lang lang, bool forced) { - String &result=*new(meaning.pool()) String(meaning.pool()); - if(Hash *hash=meaning.get_hash(0)) { - // $value(value) $subattribute(subattribute value) - if(Value *value=static_cast(hash->get(*value_name))) - append_attribute_meaning(result, *value, lang, forced); - - Attributed_meaning_info attributed_meaning_info={&result, lang}; - hash->for_each(append_attribute_subattribute, &attributed_meaning_info); - } else // result value - append_attribute_meaning(result, meaning, lang, forced); - - return result; -}