--- parser3/src/main/pa_string.C	2004/02/27 15:24:03	1.196
+++ parser3/src/main/pa_string.C	2004/10/07 09:22:01	1.201
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_STRING_C="$Date: 2004/02/27 15:24:03 $";
+static const char * const IDENT_STRING_C="$Date: 2004/10/07 09:22:01 $";
 
 #include "pcre.h"
 
@@ -21,24 +21,36 @@ int pa_atoi(const char* str, const Strin
 	if(!str)
 		return 0;
 
-	while(*str && isspace(*str))
+	while(*str && isspace((unsigned char)*str))
 		str++;
 	if(!*str)
 		return 0;
 
 	int result;
 	char *error_pos;
+	bool negative=false;
+	if(str[0]=='-') {
+		negative=true;
+		str++;
+	} else if(str[0]=='+') {
+		str++;
+	}
 	// 0xABC
 	if(str[0]=='0')
 		if(str[1]=='x' || str[1]=='X')
 			result=(int)(unsigned long)strtol(str, &error_pos, 0);
-		else
-			result=(int)strtol(str+1/*skip leading 0*/, &error_pos, 0);
+		else {
+			 // skip leading 0000, to disable octal interpretation
+			do str++; while(*str=='0');				
+			result=(int)strtol(str, &error_pos, 0);
+		}
 	else
 		result=(int)strtol(str, &error_pos, 0);
+	if(negative)
+		result=-result;
 
 	while(char c=*error_pos++)
-		if(!isspace(c))
+		if(!isspace((unsigned char)c))
 			throw Exception("number.format",
 				problem_source,
 				problem_source?"invalid number (int)": "'%s' is invalid number (int)", str);
@@ -50,24 +62,36 @@ double pa_atod(const char* str, const St
 	if(!str)
 		return 0;
 
-	while(*str && isspace(*str))
+	while(*str && isspace((unsigned char)*str))
 		str++;
 	if(!*str)
 		return 0;
 
 	double result;
 	char *error_pos;
+	bool negative=false;
+	if(str[0]=='-') {
+		negative=true;
+		str++;
+	} else if(str[0]=='+') {
+		str++;
+	}
 	// 0xABC
 	if(str[0]=='0')
 		if(str[1]=='x' || str[1]=='X')
 			result=(double)(unsigned long)strtol(str, &error_pos, 0);
-		else
-			result=(double)strtod(str+1/*skip leading 0*/, &error_pos);
+		else {
+			 // skip leading 0000, to disable octal interpretation
+			do str++; while(*str=='0');				
+			result=(double)strtod(str, &error_pos);
+		}
 	else
 		result=(double)strtod(str, &error_pos);
+	if(negative)
+		result=-result;
 
 	while(char c=*error_pos++)
-		if(!isspace(c))
+		if(!isspace((unsigned char)c))
 			throw Exception("number.format",
 				problem_source,
 				problem_source?"invalid number (double)": "'%s' is invalid number (double)", str);
@@ -149,7 +173,6 @@ String::Body String::Body::trim(String::
 		return *this;
 	if(!chars)
 		chars=" \t\n"; // white space
-	Body result=*this;
 
 	size_t start=0;
 	size_t end=our_length;
@@ -272,8 +295,6 @@ String& String::mid(size_t substr_begin,
 	// next: letters themselves
 	result.body=body.mid(substr_begin, substr_length);
 
-//	SAPI::log("piece of '%s' from %d to %d is '%s'",
-		//cstr(), substr_begin, substr_end, result.cstr());
 	ASSERT_STRING_INVARIANT(result);
 	return result;
 }
@@ -663,14 +684,24 @@ bool String::deserialize(size_t prolog_l
 const char* String::Body::v() const {
 	return CORD_to_const_char_star(body);
 }
+void String::Body::dump() const {
+	CORD_dump(body);
+}
+
 const char* String::Languages::v() const {
 	if(opt.is_not_just_lang)
 		return CORD_to_const_char_star(langs);
 	else
 		return (const char*)&langs;
 }
+void String::Languages::dump() const {
+	if(opt.is_not_just_lang)
+		CORD_dump(langs);
+	else
+		puts((const char*)&langs);
+}
 const char* String::v() const {
-	const int LIMIT_VIEW=20;
+	const uint LIMIT_VIEW=20;
 	char* buf=(char*)malloc(MAX_STRING);
 	const char*body_view=body.v();
 	const char*langs_view=langs.v();
@@ -683,7 +714,10 @@ const char* String::v() const {
 
 	return buf;
 }
-
+void String::dump() const {
+	body.dump();
+	langs.dump();
+}
 const String& String::trim(String::Trim_kind kind, const char* chars) const {
 	if(!length())
 		return *this;
@@ -706,4 +740,4 @@ const String& String::trim(String::Trim_
 
 	ASSERT_STRING_INVARIANT(result);
 	return result;
-}
\ No newline at end of file
+}