--- parser3/src/classes/table.C	2016/09/06 22:19:47	1.319
+++ parser3/src/classes/table.C	2016/09/07 11:56:20	1.321
@@ -22,7 +22,7 @@
 #define USE_STRINGSTREAM
 #endif
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.319 2016/09/06 22:19:47 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.321 2016/09/07 11:56:20 moko Exp $";
 
 // class
 
@@ -97,10 +97,15 @@ struct TableControlChars {
 	char separator;  const String* sseparator;
 	char encloser; const String* sencloser;
 
+	char separators[3];
+
 	TableControlChars():
 		separator('\t'), sseparator(new String("\t")),
 		encloser(0), sencloser(0)
-	{}
+	{
+		strcpy(separators,"\t\n");
+	}
+
 	int load( HashStringValue& options ) {
 		int result=0;
 		if(Value* vseparator=options.get(PA_COLUMN_SEPARATOR_NAME)) {
@@ -108,6 +113,7 @@ struct TableControlChars {
 			if(sseparator->length()!=1)
 				throw Exception(PARSER_RUNTIME, sseparator, "separator must be one character long");
 			separator=sseparator->first_char();
+			separators[0]=separator;
 			result++;
 		}
 		if(Value* vencloser=options.get(PA_COLUMN_ENCLOSER_NAME)) {
@@ -216,45 +222,37 @@ struct lsplit_result {
 	char* piece;
 	char delim;
 
+	lsplit_result(char *apiece=0) : piece(apiece), delim(0){}
 	operator bool() { return piece!=0; }
 };
 
-inline lsplit_result lsplit(char* string, char delim1, char delim2) {
-	lsplit_result result;
-	if(string) {
-		char delims[]={delim1, delim2, 0};
-		if(char* v=strpbrk(string, delims)) {
+inline lsplit_result lsplit(char* *string_ref, const char* delims) {
+	lsplit_result result(*string_ref);
+	if(result.piece) {
+		if(char* v=strpbrk(result.piece, delims)) {
 			result.delim=*v;
 			*v=0;
-			result.piece=v+1;
+			*string_ref=v+1;
 			return result;
+		} else {
+			*string_ref=0;
 		}
 	}
-	result.piece=0;
-	result.delim=0;
-	return result;
-}
-
-inline lsplit_result lsplit(char* *string_ref, char delim1, char delim2) {
-	lsplit_result result;
-	result.piece=*string_ref;
-	lsplit_result next=lsplit(*string_ref, delim1, delim2);
-	result.delim=next.delim;
-	*string_ref=next.piece;
 	return result;
 }
 
-static lsplit_result lsplit(char** string_ref, char delim1, char delim2, char encloser) {
-	lsplit_result result;
+static lsplit_result lsplit(char** string_ref, const char* delims, char encloser) {
+	lsplit_result result(*string_ref);
 
-	if(char* string=*string_ref) {
-		if(encloser && *string==encloser) {
-			string++;
+	if(result.piece) {
+		if(encloser && *result.piece==encloser) {
+			result.piece++;
 			
+			char c;
 			char *read;
 			char *write;
-			write=read=string;
-			char c;
+			write=read=result.piece;
+
 			// we are enclosed, searching for second encloser
 			while(c=*read++) {
 				if(c==encloser) {
@@ -265,22 +263,22 @@ static lsplit_result lsplit(char** strin
 				}
 				*write++=c;
 			}
+
 			// we are no longer enclosed, searching for delimiter, skipping extra enclosers
 			while(c=*read++) {
-				if(c==delim1 || c==delim2) {
+				if(c==delims[0] || c==delims[1]) {
 					result.delim=c;
 					break;
 				} else 	if(c!=encloser)
 					*write++=c;
 			}
+
 			*write=0; // terminate
-			*string_ref=c? read: 0;
-			result.piece=string;
+			*string_ref=c ? read : 0;
 			return result;
 		} else
-			return lsplit(string_ref, delim1, delim2);
+			return lsplit(string_ref, delims);
 	}
-	result.piece=0;
 	return result;
 }
 
@@ -332,11 +330,7 @@ static void _load(Request& r, MethodPara
 	}
 
 	// loading text
-	char *data=file_load_text(r,
-		r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)),
-		true,
-		options
-	);
+	char *data=file_load_text(r, r.absolute(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options);
 
 	Skip_lines_action skip_lines_action = (control_chars.separator=='#' || control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;
 
@@ -348,7 +342,7 @@ static void _load(Request& r, MethodPara
 		columns=Table::columns_type(new ArrayString);
 
 		skip_lines_action(&data);
-		while( lsplit_result sr=lsplit(&data, control_chars.separator, '\n', control_chars.encloser) ) {
+		while( lsplit_result sr=lsplit(&data, control_chars.separators, control_chars.encloser) ) {
 			*columns+=new String(sr.piece, String::L_TAINTED);
 			if(sr.delim=='\n') 
 				break;
@@ -361,7 +355,7 @@ static void _load(Request& r, MethodPara
 	// parse cells
 	Table::element_type row(new ArrayString(columns_count));
 	skip_lines_action(&data);
-	while( lsplit_result sr=lsplit(&data, control_chars.separator, '\n', control_chars.encloser) ) {
+	while( lsplit_result sr=lsplit(&data, control_chars.separators, control_chars.encloser) ) {
 		if(!*sr.piece && !sr.delim && !row->count()) // append last empty column [if without \n]
 			break;
 		*row+=new String(sr.piece, String::L_TAINTED);