--- parser3/src/main/pa_string.C	2003/09/24 10:49:14	1.175.2.5
+++ parser3/src/main/pa_string.C	2003/09/24 14:32:06	1.175.2.6
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_STRING_C="$Date: 2003/09/24 10:49:14 $";
+static const char* IDENT_STRING_C="$Date: 2003/09/24 14:32:06 $";
 
 #include "pcre.h"
 
@@ -54,19 +54,19 @@ public:
 		*this+=new String("match");
 		*this+=new String("postmatch");
 		for(int i=0; i<MAX_MATCH_GROUPS; i++) {
-			*this+=new String(StringBody::Format(1+i), String::L_CLEAN);
+			*this+=new String(String::Body::Format(1+i), String::L_CLEAN);
 		}
 	}
 };
 
 Table string_match_table_template(new String_match_table_template_columns);
 
-// StringBody methods
+// String::Body methods
 
-StringBody StringBody::Format(int value) {
+String::Body String::Body::Format(int value) {
 	char local[MAX_NUMBER];
 	size_t length=snprintf(local, MAX_NUMBER, "%d", value);
-	return StringBody(pa_strdup(local, length), length);
+	return String::Body(pa_strdup(local, length), length);
 }
 
 static int CORD_batched_iter_fn_generic_hash_code(char c, void * client_data) {
@@ -79,7 +79,7 @@ static int CORD_batched_iter_fn_generic_
 	generic_hash_code(result, s);
 	return 0;
 };
-uint StringBody::hash_code() const {
+uint String::Body::hash_code() const {
 	uint result=0;
 	CORD_iter5(body, 0,
 		CORD_batched_iter_fn_generic_hash_code, 
@@ -153,7 +153,7 @@ String& String::mid(size_t substr_begin,
 	return result;
 }
 
-size_t String::pos(const StringBody substr, size_t this_offset, Language lang) const {
+size_t String::pos(const String::Body substr, size_t this_offset, Language lang) const {
 	size_t substr_begin=body.pos(substr, this_offset);
 	if(substr_begin==CORD_NOT_FOUND || !langs.check_lang(lang, substr_begin, substr.length()))
 		return STRING_NOT_FOUND;
@@ -570,7 +570,7 @@ bool String::deserialize(size_t prolog_l
 		if(buf_length!=total_length)
 			return false;
 
-		body=StringBody(cur, buf_length);
+		body=String::Body(cur, buf_length);
 	}
 
 	ASSERT_STRING_INVARIANT(*this);
@@ -578,3 +578,28 @@ bool String::deserialize(size_t prolog_l
 #endif
 	return false;
 }
+
+const char* String::Body::v() const {
+	return CORD_to_const_char_star(body);
+}
+const char* String::Languages::v() const {
+	if(is_not_just_lang)
+		return CORD_to_const_char_star(langs);
+	else
+		return (const char*)&langs;
+}
+const char* String::v() const {
+#define LIMIT_VIEW 20
+	char* buf=(char*)malloc(MAX_STRING);
+	const char*body_view=body.v();
+	const char*langs_view=langs.v();
+	snprintf(buf, MAX_STRING, 
+		"body=[[[%.*s%s]]]   "
+		"langs=[[[%.*s%s]]]",
+		LIMIT_VIEW, body_view, strlen(body_view)>LIMIT_VIEW?"...":"",
+		LIMIT_VIEW, langs_view, strlen(langs_view)>LIMIT_VIEW?"...":""
+	);
+
+	return buf;
+#undef LIMIT_VIEW
+}