--- parser3/src/include/pa_string.h	2016/09/07 14:40:07	1.217
+++ parser3/src/include/pa_string.h	2016/11/28 22:42:57	1.221
@@ -8,7 +8,7 @@
 #ifndef PA_STRING_H
 #define PA_STRING_H
 
-#define IDENT_PA_STRING_H "$Id: pa_string.h,v 1.217 2016/09/07 14:40:07 moko Exp $"
+#define IDENT_PA_STRING_H "$Id: pa_string.h,v 1.221 2016/11/28 22:42:57 moko Exp $"
 
 // includes
 #include "pa_types.h"
@@ -73,6 +73,7 @@ unsigned long long int pa_atoul(const ch
 
 
 class String: public PA_Object {
+	friend class StringSplitHelper;
 public:
 
 	/** piece is tainted or not. the lang to use when detaint
@@ -95,11 +96,6 @@ public:
 		L_CLEAN='0',	///< clean  WARNING: read above warning before changing
 		L_AS_IS='A',	///< leave all characters intact  WARNING: read above warning before changing
 
-		L_PASS_APPENDED='P',
-			/**<
-				leave lang built into string being appended.
-				just a flag, that value not stored
-			*/
 		L_TAINTED='T',	///< tainted, untaint lang as assigned later 
 		// untaint langs. assigned by ^untaint[lang]{...}
 		L_FILE_SPEC='F',	///< file specification
@@ -316,6 +312,7 @@ public:
 		size_t length;
 		C(): str(0), length(0) {}
 		C(const char *astr, size_t asize): str(astr), length(asize) {}
+		explicit C(Body abody): str(abody.cstr()), length(abody.length()) {}
 	};
 
 	struct Cm {
@@ -323,6 +320,7 @@ public:
 		size_t length;
 		Cm(): str(0), length(0) {}
 		Cm(char *astr, size_t asize): str(astr), length(asize) {}
+		explicit Cm(Body abody): str(abody.cstrm()), length(abody.length()) {}
 	};
 
 	class Body {
@@ -388,6 +386,7 @@ public:
 		inline CORD get_cord() const { return body; }
 		uint get_hash_code() const;
 
+		// never null
 		const char* cstr() const {
 #ifdef STRING_LENGTH_CACHING
 			string_length = length();
@@ -400,6 +399,7 @@ public:
 			return CORD_to_const_char_star(body, length());
 		}
 
+		// never null
 		char* cstrm() const { return CORD_to_char_star(body, length()); }
 
 #ifdef STRING_LENGTH_CACHING
@@ -486,7 +486,7 @@ public:
 			size_t* out_start=0, size_t* out_length=0, Charset* source_charset=0) const;
 	};
 
-protected:
+private:
 
 	Body body; ///< all characters of string
 	Languages langs; ///< string characters lang
@@ -587,6 +587,7 @@ public:
 		return Body(x).ncmp(0/*x_begin*/, body, 0/*y_begin*/, length())==0;
 	}
 
+	String& append_to(String& dest) const;
 	String& append_to(String& dest, Language lang, bool forced=false) const;
 	String& append(const String& src, Language lang, bool forced=false) { 
 		return src.append_to(*this, lang, forced);
@@ -599,7 +600,7 @@ public:
 		return *this;
 	}
 
-	String& operator << (const String& src) { return append(src, L_PASS_APPENDED); }
+	String& operator << (const String& src) { return src.append_to(*this); }
 	String& operator << (const char* src) { return append_help_length(src, 0, L_AS_IS); }
 	String& operator << (const Body& src){
 		langs.appendHelper(body, L_AS_IS, src);
@@ -653,8 +654,8 @@ public:
 		return body.rskipchars(chars, left, right);
 	}
 
-	void split(ArrayString& result, size_t& pos_after, const char* delim, Language lang=L_UNSPECIFIED, int limit=-1) const;
-	void split(ArrayString& result, size_t& pos_after, const String& delim, Language lang=L_UNSPECIFIED, int limit=-1) const;
+	void split(ArrayString& result, size_t pos_after, const char* delim, Language lang=L_UNSPECIFIED) const;
+	void split(ArrayString& result, size_t pos_after, const String& delim, Language lang=L_UNSPECIFIED) const;
 
 	typedef void (*Row_action)(Table& table, ArrayString* row, int prestart, int prefinish, int poststart, int postfinish, void *info);