parser3/src/classes/string.C - diff

Return to string.C CVS log

Up to [parser3project] / parser3 / src / classes

Diff for /parser3/src/classes/string.C between versions 1.162 and 1.166

version 1.162, 2008/07/04 11:16:51	version 1.166, 2008/07/18 09:12:17
Line 47 static const String match_var_name(MATCH	Line 47 static const String match_var_name(MATCH
// methods	// methods

static void _length(Request& r, MethodParams&) {	static void _length(Request& r, MethodParams&) {
double result=GET_SELF(r, VString).string().length();	double result=GET_SELF(r, VString).string().length(r.charsets.source());
r.write_no_lang(*new VDouble(result));	r.write_no_lang(*new VDouble(result));
}	}

Line 139 static void _left(Request& r, MethodPara	Line 139 static void _left(Request& r, MethodPara
size_t n=(size_t)sn;	size_t n=(size_t)sn;

const String& string=GET_SELF(r, VString).string();	const String& string=GET_SELF(r, VString).string();
r.write_assign_lang(string.mid(0, n));	r.write_assign_lang(string.mid(r.charsets.source(), 0, n));
}	}

static void _right(Request& r, MethodParams& params) {	static void _right(Request& r, MethodParams& params) {
Line 151 static void _right(Request& r, MethodPar	Line 151 static void _right(Request& r, MethodPar
size_t n=(size_t)sn;	size_t n=(size_t)sn;

const String& string=GET_SELF(r, VString).string();	const String& string=GET_SELF(r, VString).string();
size_t length=string.length();	size_t length=string.length(r.charsets.source());
r.write_assign_lang(n<length?string.mid(length-n, string.length()):string);	r.write_assign_lang(n<length?string.mid(r.charsets.source(), length-n, length, length):string);
}	}

static void _mid(Request& r, MethodParams& params) {	static void _mid(Request& r, MethodParams& params) {
Line 166 static void _mid(Request& r, MethodParam	Line 166 static void _mid(Request& r, MethodParam
size_t begin=(size_t)sbegin;	size_t begin=(size_t)sbegin;

size_t end;	size_t end;
	size_t length=0;
if(params.count()>1) {	if(params.count()>1) {
ssize_t sn=params.as_int(1, "n must be int", r);	ssize_t sn=params.as_int(1, "n must be int", r);
if(sn<0)	if(sn<0)
Line 173 static void _mid(Request& r, MethodParam	Line 174 static void _mid(Request& r, MethodParam
0,	0,
"n(%d) must be >=0", sn);	"n(%d) must be >=0", sn);
end=begin+(size_t)sn;	end=begin+(size_t)sn;
} else	} else {
end=string.length();	length=string.length(r.charsets.source());
	end=length;
r.write_assign_lang(string.mid(begin, end));	}

	r.write_assign_lang(string.mid(r.charsets.source(), begin, end, length));
}	}

static void _pos(Request& r, MethodParams& params) {	static void _pos(Request& r, MethodParams& params) {
Value& substr=params.as_no_junction(0, "substr must not be code");	Value& substr=params.as_no_junction(0, "substr must not be code");

const String& string=GET_SELF(r, VString).string();	const String& string=GET_SELF(r, VString).string();
r.write_assign_lang(*new VInt((int)string.pos(substr.as_string())));	ssize_t offset=0;
	if(params.count()>1){
	offset=params.as_int(1, "n must be int", r);
	if(offset<0)
	throw Exception(PARSER_RUNTIME,
	0,
	"n(%d) must be >=0", offset);
	}

	r.write_no_lang(*new VInt((int)string.pos(r.charsets.source(), substr.as_string(), (size_t)offset)));
}	}

static void split_list(MethodParams& params, int paramIndex,	static void split_list(MethodParams& params, int paramIndex,
Line 659 MString::MString(): Methoded("string") {	Line 671 MString::MString(): Methoded("string") {
// ^void.bool(default)	// ^void.bool(default)
add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);	add_native_method("bool", Method::CT_DYNAMIC, _bool, 0, 1);

// ^string.format{format}	// ^string.format[format]
add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);	add_native_method("format", Method::CT_DYNAMIC, _string_format, 1, 1);

// ^string.left(n)	// ^string.left(n)
add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);	add_native_method("left", Method::CT_DYNAMIC, _left, 1, 1);
// ^string.right(n)	// ^string.right(n)
add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1);	add_native_method("right", Method::CT_DYNAMIC, _right, 1, 1);
	// ^string.mid(p)
// ^string.mid(p;n)	// ^string.mid(p;n)
add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);	add_native_method("mid", Method::CT_DYNAMIC, _mid, 1, 2);

// ^string.pos[substr]	// ^string.pos[substr]
add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 1);	// ^string.pos[substr](n)
	add_native_method("pos", Method::CT_DYNAMIC, _pos, 1, 2);

// ^string.split[delim]	// ^string.split[delim]
// ^string.split[delim][options]	// ^string.split[delim][options]
Line 686 MString::MString(): Methoded("string") {	Line 700 MString::MString(): Methoded("string") {
// ^string.match[regexp][options]{replacement-code}	// ^string.match[regexp][options]{replacement-code}
add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);

// ^string.toupper[]	// ^string.upper[]
add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);	add_native_method("upper", Method::CT_DYNAMIC, _upper, 0, 0);
// ^string.tolower[]	// ^string.lower[]
add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);	add_native_method("lower", Method::CT_DYNAMIC, _lower, 0, 0);

// ^sql[query]	// ^sql[query]

E-mail:

Removed from v.1.162
changed lines
	Added in v.1.166