--- parser3/src/classes/table.C	2016/09/08 19:28:34	1.324
+++ parser3/src/classes/table.C	2016/09/29 18:49:43	1.334
@@ -22,7 +22,7 @@
 #define USE_STRINGSTREAM
 #endif
 
-volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.324 2016/09/08 19:28:34 moko Exp $";
+volatile const char * IDENT_TABLE_C="$Id: table.C,v 1.334 2016/09/29 18:49:43 moko Exp $";
 
 // class
 
@@ -121,9 +121,9 @@ struct TableControlChars {
 			if(sencloser->is_empty()){
 				encloser=0;
 			} else {
-			if(sencloser->length()!=1)
-				throw Exception(PARSER_RUNTIME, sencloser, "encloser must be one byte character");
-			encloser=sencloser->first_char();
+				if(sencloser->length()!=1)
+					throw Exception(PARSER_RUNTIME, sencloser, "encloser must be empty or one byte character");
+				encloser=sencloser->first_char();
 			}
 			result++;
 		}
@@ -160,10 +160,12 @@ public:
 
 	String *extract(char *pos){
 		String *result=new String;
-		// first: their langs
-		result->langs.append(result->body, langs, pos-base, strlen(pos));
-		// next: letters themselves
-		result->body=Body(pos);
+		if(size_t len=strlen(pos)){
+			// first: their langs
+			result->langs.append(result->body, langs, pos-base, len);
+			// next: letters themselves
+			result->body=Body(pos);
+		}
 		return result;
 	}
 };
@@ -171,15 +173,15 @@ public:
 inline lsplit_sresult lsplit(char* *string_ref, const char* delims, StringSplitHelper& helper) {
 	lsplit_sresult result;
 	if(char *pos=*string_ref) {
-		while(char* v=strpbrk(pos, delims)) {
-			if(helper.check_lang(v)){
-				result.delim=*v;
-				*v=0;
+		while(pos=strpbrk(pos, delims)) {
+			if(helper.check_lang(pos)){
+				result.delim=*pos;
+				*pos=0;
 				result.piece=helper.extract(*string_ref);
-				*string_ref=v+1;
+				*string_ref=pos+1;
 				return result;
 			}
-			pos=v+1;
+			pos++;
 		}
 		result.piece=helper.extract(*string_ref);
 		*string_ref=0;
@@ -196,19 +198,19 @@ static lsplit_sresult lsplit(char** stri
 
 			// we are enclosed, searching for second encloser
 			while(1) {
-				if(char* v=strchr(pos, encloser)){
-					if(helper.check_lang(v)){
-						*(v++)=0;
+				if(pos=strchr(pos, encloser)){
+					if(helper.check_lang(pos)){
+						*(pos++)=0;
 						result.append(helper.extract(*string_ref));
-						if(*v==encloser && helper.check_lang(v)){ // double-encloser stands for encloser
-							*string_ref=v+1;
+						if(*pos==encloser && helper.check_lang(pos)){ // double-encloser stands for encloser
+							*string_ref=pos;
 						} else {
-							*string_ref=pos=v;
+							*string_ref=pos;
 							break;
 						}
 					}
-					pos=v+1;
-				}{
+					pos++;
+				} else {
 					result.append(helper.extract(*string_ref));
 					*string_ref=0;
 					return result;
@@ -216,17 +218,17 @@ static lsplit_sresult lsplit(char** stri
 			}
 
 			// we are no longer enclosed, searching for delimiter
-			while(char* v=strpbrk(pos, delims)) {
-				if(helper.check_lang(v)){
-					result.delim=*v;
-					if(v>*string_ref){
-						*v=0;
+			while(pos=strpbrk(pos, delims)) {
+				if(helper.check_lang(pos)){
+					result.delim=*pos;
+					if(pos>*string_ref){
+						*pos=0;
 						result.append(helper.extract(*string_ref));
 					}
-					*string_ref=v+1;
+					*string_ref=pos+1;
 					return result;
 				}
-				pos=v+1;
+				pos++;
 			}
 			result.append(helper.extract(*string_ref));
 			*string_ref=0;
@@ -362,12 +364,12 @@ static lsplit_result lsplit(char** strin
 				*write++=c;
 			}
 
-			// we are no longer enclosed, searching for delimiter, skipping extra enclosers
+			// we are no longer enclosed, searching for delimiter
 			while(c=*read++) {
 				if(c==delims[0] || c==delims[1]) {
 					result.delim=c;
 					break;
-				} else 	if(c!=encloser)
+				} else 
 					*write++=c;
 			}
 
@@ -779,7 +781,7 @@ static void _menu(Request& r, MethodPara
 		for(size_t row=0; row<table.count(); row++) {
 			table.set_current(row);
 
-			StringOrValue sv_processed=r.process(body_code);
+			Value& sv_processed=r.process(body_code);
 			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
 
 			const String* s_processed=sv_processed.get_string();
@@ -827,7 +829,7 @@ static void table_row_to_hash(Table::ele
 	const String* key;
 	if(info->key_code) {
 		info->table->set_current(info->row++); // change context row
-		StringOrValue sv_processed=info->r->process(*info->key_code);
+		Value& sv_processed=info->r->process(*info->key_code);
 		key=&sv_processed.as_string();
 	} else {
 		key=info->key_field<row->count()?row->get(info->key_field):0;
@@ -882,7 +884,7 @@ static void table_row_to_hash(Table::ele
 		case C_CODE: {
 			if(!info->key_code)
 				info->table->set_current(info->row++); // change context row
-			exist=info->hash->put_dont_replace(*key, &info->r->process(*info->value_code).as_value());
+			exist=info->hash->put_dont_replace(*key, &info->r->process(*info->value_code));
 			break;
 		}
 	}
@@ -1074,7 +1076,7 @@ static void _sort(Request& r, MethodPara
 	if(r.charsets.source().NAME()=="KOI8-R" && key_values_are_strings) {
 		for(i=0; i<old_count; i++)
 			if(*seq[i].value.c_str)
-				seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), UTF8_charset).cstr();
+				seq[i].value.c_str=Charset::transcode(seq[i].value.c_str, r.charsets.source(), pa_UTF8_charset).cstr();
 	}
 
 	// sort keys
@@ -1147,8 +1149,8 @@ static void _flip(Request& r, MethodPara
 static void _foreach(Request& r, MethodParams& params) {
 	InCycle temp(r);
 
-	const String& rownum_name=params.as_string(0, "rownum-var name must be string");
-	const String& value_name=params.as_string(1, "value-var name must be string");
+	const String* rownum_var_name=&params.as_string(0, "rownum-var name must be string");
+	const String* value_var_name=&params.as_string(1, "value-var name must be string");
 
 	Value& body_code=params.as_junction(2, "body must be code");
 	
@@ -1157,8 +1159,8 @@ static void _foreach(Request& r, MethodP
 	Table& table=GET_SELF(r, VTable).table();
 	size_t saved_current=table.current();
 
-	const String* rownum_var_name=rownum_name.is_empty()? 0 : &rownum_name;
-	const String* value_var_name=value_name.is_empty()? 0 : &value_name;
+	rownum_var_name=rownum_var_name->is_empty()? 0 : rownum_var_name;
+	value_var_name=value_var_name->is_empty()? 0 : value_var_name;
 
 	Value* var_context=r.get_method_frame()->caller();
 
@@ -1172,7 +1174,7 @@ static void _foreach(Request& r, MethodP
 			if(value_var_name)
 				r.put_element(*var_context, *value_var_name, new VTable(&table));
 
-			StringOrValue sv_processed=r.process(body_code);
+			Value& sv_processed=r.process(body_code);
 			Request::Skip lskip=r.get_skip(); r.set_skip(Request::SKIP_NOTHING);
 
 			const String* s_processed=sv_processed.get_string();
@@ -1220,8 +1222,7 @@ inline Table::element_type row_from_stri
 
 	// parse cells
 	Table::element_type row=new ArrayString;
-	size_t pos_after=0;
-	string.split(*row, pos_after, "\t", String::L_AS_IS);
+	string.split(*row, 0, "\t", String::L_AS_IS);
 
 	return row;
 }