parser3/src/classes/table.C - diff

Return to table.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/table.C between versions 1.352 and 1.384

version 1.352, 2020/12/14 20:58:15	version 1.384, 2026/09/29 02:56:52
Line 1	Line 1
/** @file	/** @file
Parser: @b table parser class.	Parser: @b table parser class.

Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)	Authors: Konstantin Morshnev <moko@design.ru>, Alexandr Petrosian <paf@design.ru>
*/	*/

#include "pa_config_includes.h"	#include "pa_config_includes.h"

#define NO_STRINGSTREAM

#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4) && !defined(PA_DEBUG_DISABLE_GC))	#if (!defined(NO_STRINGSTREAM) && !defined(FREEBSD4) && !defined(PA_DEBUG_DISABLE_GC))
#include <sstream>	#include <sstream>
#include "../lib/gc/include/gc_allocator.h"	#include "../lib/gc/include/gc_allocator.h"
Line 26	Line 24
#include "pa_sql_connection.h"	#include "pa_sql_connection.h"
#include "pa_vbool.h"	#include "pa_vbool.h"
#include "pa_array.h"	#include "pa_array.h"
	#include "pa_varray.h"

volatile const char * IDENT_TABLE_C="$Id$";	volatile const char * IDENT_TABLE_C="$Id$";

Line 71 static Table::Action_options get_action_	Line 70 static Table::Action_options get_action_
result.offset=source.current();	result.offset=source.current();
else	else
throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression");	throw Exception(PARSER_RUNTIME, &soffset, "must be 'cur' string or expression");
} else	} else {
result.offset=r.process(*voffset).as_int();	int offset=r.process(*voffset).as_int();
	result.offset=offset < 0 ? 0 : offset;
	}
}	}
if(Value* vlimit=options->get(sql_limit_name)) {	if(Value* vlimit=options->get(sql_limit_name)) {
valid_options++;	valid_options++;
result.limit=r.process(*vlimit).as_int();	int limit=r.process(*vlimit).as_int();
	result.limit=limit < 0 ? 0: limit;
}	}
if(Value vreverse=(Value )options->get(table_reverse_name)) {	if(Value vreverse=(Value )options->get(table_reverse_name)) {
valid_options++;	valid_options++;
result.reverse=r.process(*vreverse).as_bool();	result.reverse=r.process(*vreverse).as_bool();
if(result.reverse && !defined_offset)	if(result.reverse && !defined_offset)
result.offset=source.count()-1;	result.offset=source.count()-1;
}	}

if(valid_options!=options->count())	if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
Line 258 static void _create(Request& r, MethodPa	Line 260 static void _create(Request& r, MethodPa

if(params.count()>1) {	if(params.count()>1) {
if(params[0].is_string()){ // can be nameless only	if(params[0].is_string()){ // can be nameless only
const String& snameless=params.as_string(0, "called with more then 1 param, first param may be only string 'nameless' or junction");	const String& snameless=params.as_string(0, "called with more than 1 param, first param may be only string 'nameless' or junction");
if(snameless!="nameless")	if(snameless!="nameless")
throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more then 1 param, first param may be only 'nameless'");	throw Exception(PARSER_RUNTIME, &snameless, "table::create called with more than 1 param, first param may be only 'nameless'");
nameless=true;	nameless=true;
data_param_index++;	data_param_index++;
}	}
Line 402 static void skip_empty_lines( char** dat	Line 404 static void skip_empty_lines( char** dat
typedef void (Skip_lines_action)(char* data_ref);	typedef void (Skip_lines_action)(char* data_ref);

static void _load(Request& r, MethodParams& params) {	static void _load(Request& r, MethodParams& params) {
const String& first_param=params.as_string(0, FILE_NAME_MUST_BE_STRING);	const String& first_param=params.as_file_name(0);
int filename_param_index=0;	int filename_param_index=0;
bool nameless=first_param=="nameless";	bool nameless=first_param=="nameless";
if(nameless)	if(nameless)
Line 415 static void _load(Request& r, MethodPara	Line 417 static void _load(Request& r, MethodPara
control_chars.load(*options);	control_chars.load(*options);

// loading text	// loading text
char *data=file_load_text(r, r.full_disk_path(params.as_string(filename_param_index, FILE_NAME_MUST_BE_STRING)), true, options);	char *data=file_load_text(r, r.full_disk_path(params.as_file_name(filename_param_index), PA_ALLOW_HTTP), true, options);

Skip_lines_action skip_lines_action = (control_chars.separator=='#' \|\| control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;	Skip_lines_action skip_lines_action = (control_chars.separator=='#' \|\| control_chars.encloser=='#') ? skip_empty_lines : skip_empty_and_comment_lines;

Line 487 static void table_to_csv(pa_stringstream	Line 489 static void table_to_csv(pa_stringstream
if(output_column_names) {	if(output_column_names) {
if(table.columns()) { // named table	if(table.columns()) { // named table
if(control_chars.encloser){	if(control_chars.encloser){
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i; ) {
enclose( result, i.next(), control_chars.encloser );	enclose( result, i.next(), control_chars.encloser );
if(i.has_next())	if(i)
result<<control_chars.separator;	result<<control_chars.separator;
}	}
} else {	} else {
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i; ) {
result<<i.next()->cstr();	result<<i.next()->cstr();
if(i.has_next())	if(i)
result<<control_chars.separator;	result<<control_chars.separator;
}	}
}	}
Line 520 static void table_to_csv(pa_stringstream	Line 522 static void table_to_csv(pa_stringstream
// process data lines	// process data lines
Array_iterator<ArrayString*> i(table);	Array_iterator<ArrayString*> i(table);
if(control_chars.encloser){	if(control_chars.encloser){
while(i.has_next()) {	while(i) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c; ) {
enclose( result, c.next(), control_chars.encloser );	enclose( result, c.next(), control_chars.encloser );
if(c.has_next())	if(c)
result<<control_chars.separator;	result<<control_chars.separator;
}	}
result<<'\n';	result<<'\n';
}	}
} else {	} else {
while(i.has_next()) {	while(i) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c; ) {
result<<c.next()->cstr();	result<<c.next()->cstr();
if(c.has_next())	if(c)
result<<control_chars.separator;	result<<control_chars.separator;
}	}
result<<'\n';	result<<'\n';
Line 566 static void table_to_csv(String& result,	Line 568 static void table_to_csv(String& result,
if(output_column_names) {	if(output_column_names) {
if(table.columns()) { // named table	if(table.columns()) { // named table
if(control_chars.encloser) {	if(control_chars.encloser) {
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i; ) {
enclose( result, i.next(), control_chars.encloser, control_chars.sencloser );	enclose( result, i.next(), control_chars.encloser, control_chars.sencloser );
if(i.has_next())	if(i)
result<<*control_chars.sseparator;	result<<*control_chars.sseparator;
}	}
} else {	} else {
for(Array_iterator<const String> i(table.columns()); i.has_next(); ) {	for(Array_iterator<const String> i(table.columns()); i; ) {
result<<*i.next();	result<<*i.next();
if(i.has_next())	if(i)
result<<*control_chars.sseparator;	result<<*control_chars.sseparator;
}	}
}	}
Line 582 static void table_to_csv(String& result,	Line 584 static void table_to_csv(String& result,
if(int lsize=table.count()?table[0]->count():0)	if(int lsize=table.count()?table[0]->count():0)
for(int column=0; column<lsize; column++) {	for(int column=0; column<lsize; column++) {
if(control_chars.encloser) {	if(control_chars.encloser) {
result<<control_chars.sencloser<<String::Body::Format(column)<<control_chars.sencloser;	result<<control_chars.sencloser<<pa_uitoa(column)<<control_chars.sencloser;
} else {	} else {
result<<String::Body::Format(column);	result<<pa_uitoa(column);
}	}
if(column<lsize-1){	if(column<lsize-1){
result<<*control_chars.sseparator;	result<<*control_chars.sseparator;
Line 599 static void table_to_csv(String& result,	Line 601 static void table_to_csv(String& result,
// data lines	// data lines
Array_iterator<ArrayString*> i(table);	Array_iterator<ArrayString*> i(table);
if(control_chars.encloser){	if(control_chars.encloser){
while(i.has_next()) {	while(i) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c; ) {
enclose( result, c.next(), control_chars.encloser, control_chars.sencloser );	enclose( result, c.next(), control_chars.encloser, control_chars.sencloser );
if(c.has_next())	if(c)
result<<*control_chars.sseparator;	result<<*control_chars.sseparator;
}	}
result.append_know_length("\n", 1, String::L_CLEAN);	result.append_know_length("\n", 1, String::L_CLEAN);
}	}
} else {	} else {
while(i.has_next()) {	while(i) {
for(Array_iterator<const String> c(i.next()); c.has_next(); ) {	for(Array_iterator<const String> c(i.next()); c; ) {
result<<*c.next();	result<<*c.next();
if(c.has_next())	if(c)
result<<*control_chars.sseparator;	result<<*control_chars.sseparator;
}	}
result.append_know_length("\n", 1, String::L_CLEAN);	result.append_know_length("\n", 1, String::L_CLEAN);
Line 622 static void table_to_csv(String& result,	Line 624 static void table_to_csv(String& result,


static void _save(Request& r, MethodParams& params) {	static void _save(Request& r, MethodParams& params) {
const String& first_arg=params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE);	const String& first_arg=params.as_string(0, PARAMETER_MUST_BE_STRING);
size_t param_index=1;	size_t param_index=1;

bool do_append=false;	bool do_append=false;
Line 636 static void _save(Request& r, MethodPara	Line 638 static void _save(Request& r, MethodPara
else	else
--param_index;	--param_index;

const String& file_name=params.as_string(param_index++, FILE_NAME_MUST_NOT_BE_CODE);	const String& file_name=params.as_file_name(param_index++);
String file_spec=r.full_disk_path(file_name);	String file_spec=r.full_disk_path(file_name);

if(do_append && file_exist(file_spec))	if(do_append && file_exist(file_spec))
Line 681 static void _csv_string(Request& r, Meth	Line 683 static void _csv_string(Request& r, Meth
bool output_column_names=true;	bool output_column_names=true;
size_t param_index=0;	size_t param_index=0;
if(params.count()>0 && params[0].is_string()) {	if(params.count()>0 && params[0].is_string()) {
if(params.as_string(0, FIRST_ARG_MUST_NOT_BE_CODE)=="nameless") {	if(params.as_string(0, PARAM_MUST_NOT_BE_CODE)=="nameless") {
output_column_names=false;	output_column_names=false;
param_index++;	param_index++;
} else {	} else {
Line 749 static void _offset(Request& r, MethodPa	Line 751 static void _offset(Request& r, MethodPa
else if(whence=="set")	else if(whence=="set")
absolute=true;	absolute=true;
else	else
throw Exception(PARSER_RUNTIME, &whence, "is invalid whence, valid are 'cur' or 'set'");	throw Exception(PARSER_RUNTIME, &whence, "is an invalid whence, valid are 'cur' or 'set'");
}	}

int offset=params.as_int(params.count()-1, "offset must be expression", r);	int offset=params.as_int(params.count()-1, "offset must be expression", r);
Line 766 static void _menu(Request& r, MethodPara	Line 768 static void _menu(Request& r, MethodPara
Value* delim_maybe_code=params.count()>1?&params[1]:0;	Value* delim_maybe_code=params.count()>1?&params[1]:0;

Table& table=GET_SELF(r, VTable).table();	Table& table=GET_SELF(r, VTable).table();
size_t saved_current=table.current();	Temp_current tc(table);

if(delim_maybe_code) { // delimiter set	if(delim_maybe_code) { // delimiter set
bool need_delim=false;	bool need_delim=false;
Line 799 static void _menu(Request& r, MethodPara	Line 801 static void _menu(Request& r, MethodPara
break;	break;
}	}
}	}
table.set_current(saved_current);
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
Line 823 static void table_row_to_hash(Table::ele	Line 824 static void table_row_to_hash(Table::ele
Value& sv_processed=info->r->process(*info->key_code);	Value& sv_processed=info->r->process(*info->key_code);
key=&sv_processed.as_string();	key=&sv_processed.as_string();
} else {	} else {
key=info->key_field<row->count()?row->get(info->key_field):0;	key=info->key_field < row->count() ? row->get(info->key_field) : 0;
}	}

if(!key)	if(!key)
Line 843 static void table_row_to_hash(Table::ele	Line 844 static void table_row_to_hash(Table::ele
case C_HASH: {	case C_HASH: {
VHash* vhash=new VHash;	VHash* vhash=new VHash;
HashStringValue& hash=vhash->hash();	HashStringValue& hash=vhash->hash();
for(Array_iterator<int> i(*info->value_fields); i.has_next(); ) {	Table::columns_type columns=info->table->columns();
size_t value_field=i.next();	if(info->value_fields){ // selected fields (can be empty)
if(value_field<row->count())	for(Array_iterator<int> i(*info->value_fields); i; ) {
hash.put(info->table->columns()->get(value_field), new VString(row->get(value_field)));	size_t value_field=i.next();
	if(value_field<row->count())
	hash.put(columns ? columns->get(value_field) : String::Body::uitoa(value_field), new VString(row->get(value_field)));
	}
	} else { // all fields
	for(size_t index=0; index<row->count(); index++) {
	hash.put(columns && index < columns->count() ? columns->get(index) : String::Body::uitoa(index), new VString(row->get(index)));
	}
}	}

exist=info->hash->put_dont_replace(*key, vhash);	exist=info->hash->put_dont_replace(*key, vhash);
break;	break;
}	}
Line 914 static Table2hash_distint get_distinct(V	Line 921 static Table2hash_distint get_distinct(V
static void _hash(Request& r, MethodParams& params) {	static void _hash(Request& r, MethodParams& params) {
Table& self_table=GET_SELF(r, VTable).table();	Table& self_table=GET_SELF(r, VTable).table();
VHash& result=*new VHash;	VHash& result=*new VHash;
if(Table::columns_type columns=self_table.columns()){
if(columns->count()>0) {
Table2hash_distint distinct=D_ILLEGAL;
Table2hash_value_type value_type=C_HASH;
int param_index=params.count()-1;
if(param_index>0) {

if(params[1].get_junction())
value_type=C_CODE;

if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error
--param_index;
int valid_options=0;
if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
valid_options++;
distinct=get_distinct(r.process(*vdistinct_code), value_type);
}
if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
if(value_type==C_TABLE) // $.distinct[tables] already was specified
throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together");
if(value_type==C_CODE)
throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code");
valid_options++;
value_type=get_value_type(r.process(*vvalue_type_code));
}

if(valid_options!=options->count())	Table2hash_distint distinct=D_ILLEGAL;
throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);	Table2hash_value_type value_type=C_HASH;
}
	int param_index=params.count()-1;
	if(param_index>0) {
	if(params[1].get_junction())
	value_type=C_CODE;

	if(HashStringValue* options=params[param_index].get_hash()){ // can't use .as_hash because the 2nd param could be table so .as_hash throws an error
	--param_index;
	int valid_options=0;
	if(Value* vdistinct_code=options->get(sql_distinct_name)) { // $.distinct ?
	valid_options++;
	distinct=get_distinct(r.process(*vdistinct_code), value_type);
	}
	if(Value* vvalue_type_code=options->get(sql_value_type_name)) { // $.type ?
	if(value_type==C_TABLE) // $.distinct[tables] already was specified
	throw Exception(PARSER_RUNTIME, 0, "you can't specify $.distinct[tables] and $.type[] together");
	if(value_type==C_CODE)
	throw Exception(PARSER_RUNTIME, 0, "you can't specify $.type[] if value is code");
	valid_options++;
	value_type=get_value_type(r.process(*vvalue_type_code));
}	}

if(param_index==2) // options were specified but not as hash	if(valid_options!=options->count())
throw Exception(PARSER_RUNTIME, 0, "options must be hash");	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
	}
	}

Array<int> value_fields;	if(param_index==2) // options were specified but not as hash
Value* value_code=0;	throw Exception(PARSER_RUNTIME, 0, "options must be hash");

if(param_index==0){ // list of columns wasn't specified	bool value_all=false;
if(value_type==C_STRING) // $.type[string]	Array<int> value_fields;
throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]");	Value* value_code=0;

for(size_t i=0; i<columns->count(); i++) // by all columns, including key	if(param_index==0){ // list of columns wasn't specified
value_fields+=i;	if(value_type==C_STRING)
	throw Exception(PARSER_RUNTIME, 0, "you must specify one value field with option $.type[string]");
} else { // list of columns or code was specified
if(value_type==C_TABLE)	value_all=true; // all columns, including key
throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");	} else { // list of columns or code was specified
	if(value_type==C_TABLE)
Value& value_fields_param=params[1];	throw Exception(PARSER_RUNTIME, 0, "you can't specify value field(s) with option $.distinct[tables] or $.type[tables]");
if(value_fields_param.get_junction()){ // code specified
value_code=&value_fields_param;	Value& value_fields_param=params[1];
} else if(value_fields_param.is_string()) { // one column as string was specified	if(value_fields_param.get_junction()){ // code specified
const String &field_name=*value_fields_param.get_string();	value_code=&value_fields_param;
if(!field_name.is_empty())	} else if(value_fields_param.is_string()) { // one column as string was specified
value_fields+=self_table.column_name2index(field_name, true);	const String &field_name=*value_fields_param.get_string();
} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table	if(!field_name.is_empty())
for(Array_iterator<Table::element_type> i(*value_fields_table); i.has_next(); ) {	value_fields+=self_table.column_name2index(field_name, true);
const String& value_field_name =*i.next()->get(0);	} else if(Table* value_fields_table=value_fields_param.get_table()) { // list of columns were specified in table
value_fields +=self_table.column_name2index(value_field_name, true);	for(Array_iterator<Table::element_type> i(*value_fields_table); i; ) {
}	const String& value_field_name =*i.next()->get(0);
} else	value_fields +=self_table.column_name2index(value_field_name, true);
throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");
}	}
	} else
	throw Exception(PARSER_RUNTIME, 0, "value field(s) must be string or table or code");

	if(value_type==C_STRING && value_fields.count()>1)
	throw Exception(PARSER_RUNTIME, 0, "you can't specify more than one value field with option $.type[string]");
	}

if(value_type==C_STRING && value_fields.count()>1)	Value* key_param=&params[0];
throw Exception(PARSER_RUNTIME, 0, "you can't specify more then one value field with option $.type[string]");	Row_info info={
	&r,
	&self_table,
	/key_code=/key_param->get_junction() ? key_param : 0,
	/key_field=/0/filled below/,
	value_all ? NULL : &value_fields,
	value_code,
	&result.hash(),
	distinct,
	/row=/0,
	value_type
	};
	info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true));

	Temp_current tc(self_table);
	for(Table::RobustIterator i(self_table); i; i.next()) {
	table_row_to_hash(i.value(), &info);
	}

{	result.extract_default();
Value* key_param=&params[0];
Row_info info={
&r,
&self_table,
/key_code=/key_param->get_junction() ? key_param : 0,
/key_field=/0/filled below/,
&value_fields,
value_code,
&result.hash(),
distinct,
/row=/0,
value_type
};
info.key_field=(info.key_code ? -1 : self_table.column_name2index(key_param->as_string(), true));

int saved_current=self_table.current();
self_table.for_each(table_row_to_hash, &info);
self_table.set_current(saved_current);

result.extract_default();	r.write(result);
	}

	static void _array(Request& r, MethodParams& params) {
	Table& table=GET_SELF(r, VTable).table();
	VArray& result=*new VArray;
	ArrayValue& array=result.array();

	Table2hash_value_type value_type=C_HASH;
	Array<int> value_fields;
	Value* value_code=0;

	if(params.count()>0) {
	if(params[0].get_junction()){
	value_type=C_CODE;
	value_code=&params[0];
	} else if(params[0].is_string()) {
	const String &field_name=*params[0].get_string();
	if(!field_name.is_empty()){
	value_type=C_STRING;
	value_fields+=table.column_name2index(field_name, true);
}	}
	} else {
	throw Exception(PARSER_RUNTIME, 0, "value field must be string or code or empty");
}	}
}	}

	Temp_current tc(table);
	for(Table::RobustIterator i(table); i; i.next()) {
	switch(value_type) {
	case C_STRING: {
	size_t index=value_fields.get(0);
	Table::element_type row=i.value();
	array+=(index < row->count() ? new VString(*row->get(index)) : VString::empty());
	break;
	}
	case C_HASH: {
	VHash* vhash=new VHash;
	HashStringValue& hash=vhash->hash();
	Table::element_type row=i.value();
	Table::columns_type columns=table.columns();
	for(size_t index=0; index<row->count(); index++) {
	hash.put(columns && index < columns->count() ? columns->get(index) : String(pa_uitoa(index)), new VString(row->get(index)));
	}
	array+=vhash;
	break;
	}
	case C_CODE: {
	table.set_current(i.index());
	array+=&r.process(*value_code);
	break;
	}
	}
	}

	r.write(result);
	}

	static void _cells(Request& r, MethodParams& params) {
	Table& self_table=GET_SELF(r, VTable).table();
	size_t row_size=self_table[self_table.current()]->count(); // number of columns in current row

	if(params.count()){
	int limit=params.as_int(params.count()-1, "limit must be expression", r);
	if(limit<0)
	limit=0;
	if((size_t)limit<row_size)
	row_size=limit;
	}

	VArray& result=*new VArray(row_size);
	ArrayValue& result_array=result.array();

	for(size_t index=0; index<row_size; index++){
	const String* column_item=self_table.item(index);
	result_array+=column_item ? new VString(*column_item) : VString::empty();
	}

	result_array.confirm_all_used();
r.write(result);	r.write(result);
}	}

Line 1146 static void _foreach(Request& r, MethodP	Line 1228 static void _foreach(Request& r, MethodP
Value* delim_maybe_code=params.count()>3?&params[3]:0;	Value* delim_maybe_code=params.count()>3?&params[3]:0;

Table& table=GET_SELF(r, VTable).table();	Table& table=GET_SELF(r, VTable).table();
size_t saved_current=table.current();	Temp_current tc(table);

rownum_var_name=rownum_var_name->is_empty()? 0 : rownum_var_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_name=value_var_name->is_empty()? 0 : value_var_name;
Line 1159 static void _foreach(Request& r, MethodP	Line 1241 static void _foreach(Request& r, MethodP
table.set_current(row);	table.set_current(row);

if(rownum_var_name)	if(rownum_var_name)
r.put_element(var_context, rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));	r.put_element(var_context, rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN)));
if(value_var_name)	if(value_var_name)
r.put_element(var_context, value_var_name, new VTable(&table));	r.put_element(var_context, value_var_name, new VTable(&table));

Line 1184 static void _foreach(Request& r, MethodP	Line 1266 static void _foreach(Request& r, MethodP
table.set_current(row);	table.set_current(row);

if(rownum_var_name)	if(rownum_var_name)
r.put_element(var_context, rownum_var_name, new VString(*new String(String::Body::Format(row), String::L_CLEAN)));	r.put_element(var_context, rownum_var_name, new VString(*new String(pa_uitoa(row), String::L_CLEAN)));
if(value_var_name)	if(value_var_name)
r.put_element(var_context, value_var_name, new VTable(&table));	r.put_element(var_context, value_var_name, new VTable(&table));

Line 1194 static void _foreach(Request& r, MethodP	Line 1276 static void _foreach(Request& r, MethodP
break;	break;
}	}
}	}
table.set_current(saved_current);
}	}

static void update_cell(HashStringValue::key_type aname, HashStringValue::value_type avalue, VTable *dest) {	static void update_cell(HashStringValue::key_type aname, HashStringValue::value_type avalue, VTable *dest) {
Line 1220 static void _append(Request& r, MethodPa	Line 1301 static void _append(Request& r, MethodPa

HashStringValue* hash=params[0].get_hash();	HashStringValue* hash=params[0].get_hash();
if(hash){	if(hash){
	Temp_current tc(table);
table+=new ArrayString();	table+=new ArrayString();
size_t saved_current=table.current();
table.set_current(table.count()-1);	table.set_current(table.count()-1);
hash->for_each<VTable*>(update_cell, &vtable);	hash->for_each<VTable*>(update_cell, &vtable);
table.set_current(saved_current);
} else {	} else {
table+=row_from_string(r, params[0]);	table+=row_from_string(r, params[0]);
}	}

	if(table.count() > pa_array_limit)
	throw Exception(PARSER_RUNTIME, 0, "table size (%d) exceeds limit $MAIN:LIMITS.max_array_size (%d)", table.count(), pa_array_limit);
}	}

static void _insert(Request& r, MethodParams& params) {	static void _insert(Request& r, MethodParams& params) {
Line 1240 static void _insert(Request& r, MethodPa	Line 1323 static void _insert(Request& r, MethodPa
} else {	} else {
table.insert(table.current(), row_from_string(r, params[0]));	table.insert(table.current(), row_from_string(r, params[0]));
}	}

	if(table.count() > pa_array_limit)
	throw Exception(PARSER_RUNTIME, 0, "table size (%d) exceeds limit $MAIN:LIMITS.max_array_size (%d)", table.count(), pa_array_limit);
}	}

static void _delete(Request& r, MethodParams&) {	static void _delete(Request& r, MethodParams&) {
Line 1261 static void join_nameless_row(Table& src	Line 1347 static void join_nameless_row(Table& src
*dest+=src[src.current()];	*dest+=src[src.current()];
}	}
static void _join(Request& r, MethodParams& params) {	static void _join(Request& r, MethodParams& params) {
Table& src=*params.as_table(0, "source");	if(Table* src=params.as_table(0, "source")){
	Table::Action_options o=get_action_options(r, params, 1, *src);
Table::Action_options o=get_action_options(r, params, 1, src);

Table& dest=GET_SELF(r, VTable).table();	Table& dest=GET_SELF(r, VTable).table();
if(&src == &dest)	if(src == &dest)
throw Exception(PARSER_RUNTIME, 0, "source and destination are same table");	throw Exception(PARSER_RUNTIME, 0, "source and destination are same table");

if(dest.columns()) // dest is named	if(dest.columns()) // dest is named
src.table_for_each(join_named_row, &dest, o);	src->table_for_each(join_named_row, &dest, o);
else // dest is nameless	else // dest is nameless
src.table_for_each(join_nameless_row, &dest, o);	src->table_for_each(join_nameless_row, &dest, o);
	}
}	}

#ifndef DOXYGEN	#ifndef DOXYGEN
Line 1359 void unmarshal_bind_updates(HashStringVa	Line 1445 void unmarshal_bind_updates(HashStringVa
if(ph->is_null)	if(ph->is_null)
value=VVoid::get();	value=VVoid::get();
else	else
value=new VString(*new String(ph->value, String::L_TAINTED));	value=new VString(ph->value);
hash.put(ph->name, value);	hash.put(ph->name, value);
}	}
}	}
Line 1430 static void _columns(Request& r, MethodP	Line 1516 static void _columns(Request& r, MethodP

Table& source_table=GET_SELF(r, VTable).table();	Table& source_table=GET_SELF(r, VTable).table();
if(Table::columns_type source_columns=source_table.columns()) {	if(Table::columns_type source_columns=source_table.columns()) {
for(Array_iterator<const String> i(source_columns); i.has_next(); ) {	for(Array_iterator<const String> i(source_columns); i; ) {
Table::element_type result_row(new ArrayString);	Table::element_type result_row(new ArrayString);
*result_row+=i.next();	*result_row+=i.next();
result_table+=result_row;	result_table+=result_row;
Line 1441 static void _columns(Request& r, MethodP	Line 1527 static void _columns(Request& r, MethodP
}	}

static void _select(Request& r, MethodParams& params) {	static void _select(Request& r, MethodParams& params) {
	InCycle temp(r);
Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");	Value& vcondition=params.as_expression(0, "condition must be number, bool or expression");

Table& source_table=GET_SELF(r, VTable).table();	Table& source_table=GET_SELF(r, VTable).table();
Line 1474 static void _select(Request& r, MethodPa	Line 1561 static void _select(Request& r, MethodPa
if(offset<0)	if(offset<0)
offset+=size;	offset+=size;
if(size && limit>0 && offset>=0 && (size_t)offset<size){	if(size && limit>0 && offset>=0 && (size_t)offset<size){
size_t saved_current=source_table.current();	Temp_current tcurrent(source_table);
size_t appended=0;	size_t appended=0;

if(reverse){	if(reverse){
Line 1483 static void _select(Request& r, MethodPa	Line 1570 static void _select(Request& r, MethodPa

bool condition=r.process(vcondition).as_bool();	bool condition=r.process(vcondition).as_bool();

if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result	if(r.check_skip_break())
	break;

	if(condition && ++appended > (size_t)offset && source_table.valid(row)) // ...condition is true, adding to the result
result_table+=source_table[row];	result_table+=source_table[row];
if(row==0) break;	if(row==0) break;
}	}
Line 1493 static void _select(Request& r, MethodPa	Line 1583 static void _select(Request& r, MethodPa

bool condition=r.process(vcondition).as_bool();	bool condition=r.process(vcondition).as_bool();

if(condition && ++appended > (size_t)offset) // ...condition is true, adding to the result	if(r.check_skip_break())
	break;

	if(condition && ++appended > (size_t)offset && source_table.valid(row)) // ...condition is true, adding to the result
result_table+=source_table[row];	result_table+=source_table[row];
}	}
}	}
source_table.set_current(saved_current);
}	}

r.write(*new VTable(&result_table));	r.write(*new VTable(&result_table));
}	}


	static void _rename(Request& r, MethodParams& params) {
	const String* name_from=NULL;
	const String* name_to=NULL;
	HashStringValue* names=NULL;

	if(params.count()>1){
	name_from=&params.as_string(0, COLUMN_NAME_MUST_BE_STRING);
	name_to=&params.as_string(1, COLUMN_NAME_MUST_BE_STRING);
	} else
	names=params.as_hash(0);

	Table& table=GET_SELF(r, VTable).table();
	if(Table::columns_type columns=table.columns()) {
	if(names){
	for(size_t i=0; i<columns->count(); i++) {
	const String *column = columns->get(i);
	if(Value* vto=names->get(*column)){
	if(const String *sto=vto->get_string())
	columns->put(i, sto);
	else
	throw Exception(PARSER_RUNTIME, column, COLUMN_NAME_MUST_BE_STRING);
	}
	}
	} else if(name_from){
	for(size_t i=0; i<columns->count(); i++) {
	const String *column = columns->get(i);
	if(column == name_from)
	columns->put(i, name_to);
	}
	}
	table.column_names_init();
	} else
	throw Exception(PARSER_RUNTIME, 0, "columns renaming is not supported for nameless tables");
	}

// constructor	// constructor

MTable::MTable(): Methoded("table") {	MTable::MTable(): Methoded("table") {
Line 1550 MTable::MTable(): Methoded("table") {	Line 1678 MTable::MTable(): Methoded("table") {
// ^table.hash[key field name][value field name(s) string/table]	// ^table.hash[key field name][value field name(s) string/table]
add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);	add_native_method("hash", Method::CT_DYNAMIC, _hash, 1, 3);

	// ^table.array[]
	// ^table.array[string]
	// ^table.array{code}
	add_native_method("array", Method::CT_DYNAMIC, _array, 0, 1);

	// ^table.cells[]
	// ^table.cells(limit)
	add_native_method("cells", Method::CT_DYNAMIC, _cells, 0, 1);

// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]	// ^table.sort{string-key-maker} ^table.sort{string-key-maker}[desc\|asc]
// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc\|asc]	// ^table.sort(numeric-key-maker) ^table.sort(numeric-key-maker)[desc\|asc]
add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);	add_native_method("sort", Method::CT_DYNAMIC, _sort, 1, 2);
Line 1586 MTable::MTable(): Methoded("table") {	Line 1723 MTable::MTable(): Methoded("table") {

// ^table.select(expression) = table	// ^table.select(expression) = table
add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2);	add_native_method("select", Method::CT_DYNAMIC, _select, 1, 2);

	// ^table.rename[column name from;column name to]
	// ^table.rename[ $.[column name from][column name to] ... ]
	add_native_method("rename", Method::CT_DYNAMIC, _rename, 1, 2);
}	}

E-mail:

Removed from v.1.352
changed lines
	Added in v.1.384