parser3/src/main/pa_table.C - diff

Return to pa_table.C CVS log

Up to [parser3project] / parser3 / src / main

Diff for /parser3/src/main/pa_table.C between versions 1.53.2.10.2.2 and 1.57

version 1.53.2.10.2.2, 2003/03/19 16:28:09	version 1.57, 2003/11/20 15:35:32
Line 11 static const char* IDENT_TABLE_C="$Date$	Line 11 static const char* IDENT_TABLE_C="$Date$

#include "pa_exception.h"	#include "pa_exception.h"

Table::Table(columns_type acolumns, int initial_rows):	Table::Table(columns_type acolumns, size_t initial_rows):
Array<element_type>(initial_rows),	Array<element_type>(initial_rows),

fcurrent(0),	fcurrent(0),
fcolumns(acolumns),	fcolumns(acolumns),
name2number(new name2number_hash_class) {	name2number(new name2number_hash_class) {

if(fcolumns)	if(fcolumns) {
for(int i=0; i<fcolumns->count(); i++) {	size_t number=1;
const String& name=*fcolumns->get(i);	for(Array_iterator<const String> i(fcolumns); i.has_next(); ) {
name2number->put(name, i+1);	const String& name=*i.next();
	name2number->put(name, number++);
}	}
	}
}	}

Table::Table(const Table& src, int offset, int limit) :	Table::Table(const Table& src, Action_options& options) :
Array<element_type>(limit/may be more than needed, no harm done/),	Array<element_type>(options.limit==ARRAY_OPTION_LIMIT_ALL?0:options.limit/may be more than needed, no harm done/),

fcurrent(0),	fcurrent(0),
fcolumns(src.fcolumns),	fcolumns(src.fcolumns),
name2number(src.name2number) {	name2number(src.name2number) {

append(src, offset, limit);	append(src, options.offset, options.limit, options.reverse);
}	}

int Table::column_name2index(const String& column_name, bool bark) const {	int Table::column_name2index(const String& column_name, bool bark) const {
Line 47 int Table::column_name2index(const Strin	Line 49 int Table::column_name2index(const Strin
return column_name.as_int();	return column_name.as_int();
}	}

const String* Table::item(int column) {	const String* Table::item(size_t column) {
if(valid(fcurrent)) {	if(valid(fcurrent)) {
element_type row=get(fcurrent);	element_type row=get(fcurrent);
if(column>=0 && column<row->count()) // proper index?	if(column>=0 && column<row->count()) // proper index?
Line 56 const String* Table::item(int column) {	Line 58 const String* Table::item(int column) {
return 0; // it's OK we don't have row\|column, just return nothing	return 0; // it's OK we don't have row\|column, just return nothing
}	}

bool Table::locate(int column, const String& value) {	#ifndef DOXYGEN
int scurrent=fcurrent;	struct Locate_int_string_info {
for(fcurrent=0; fcurrent<count(); fcurrent++) {	int column;
const String* item_value=item(column);	const String* value;
if(*item_value == value)	};
return true;	#endif
}	bool locate_int_string(Table& self, Locate_int_string_info* info) {
	const String *item_value=self.item(info->column);
fcurrent=scurrent;	return item_value && item_value==info->value;
return false;	}
}
	bool Table::locate(int column, const String& value,
bool Table::locate(const String& column, const String& value) {	Table::Action_options& options) {
return locate(column_name2index(column, true), value);	Locate_int_string_info info={column, &value};
	return table_first_that(locate_int_string, &info, options);
	}

	bool Table::locate(const String& column, const String& value,
	Table::Action_options& options) {
	return locate(column_name2index(column, true), value, options);
}	}

void Table::offset(bool absolute, int offset) {	void Table::offset(bool absolute, int offset) {
if(count())	if(size_t lcount=count())
fcurrent=((absolute?0:fcurrent)+offset+count())%count();	fcurrent=((absolute?0:fcurrent)+offset+lcount)%lcount;
}	}

E-mail:

Removed from v.1.53.2.10.2.2
changed lines
	Added in v.1.57