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.185 and 1.201

version 1.185, 2009/07/07 05:47:43	version 1.201, 2012/01/08 05:58:27
Line 20 static const char * const IDENT_STRING_C	Line 20 static const char * const IDENT_STRING_C
#include "pa_dictionary.h"	#include "pa_dictionary.h"
#include "pa_vmethod_frame.h"	#include "pa_vmethod_frame.h"
#include "pa_vregex.h"	#include "pa_vregex.h"
	#include "pa_charsets.h"

// class	// class

class MString: public Methoded {	class MString: public Methoded {
public:	public:
MString();	MString();
public: // Methoded
bool used_directly() { return true; }
};	};

// global variable	// global variable

DECLARE_CLASS_VAR(string, new MString, 0);	DECLARE_CLASS_VAR(string, new MString, 0);

	// void class, inherited from string and thus should be inited afterwards

	class MVoid: public Methoded {
	public:
	MVoid();
	};

	// void global variable should be after string global variable

	DECLARE_CLASS_VAR(void, new MVoid, 0);

// defines for statics	// defines for statics

#define MATCH_VAR_NAME "match"	#define MATCH_VAR_NAME "match"
Line 41 DECLARE_CLASS_VAR(string, new MString, 0	Line 51 DECLARE_CLASS_VAR(string, new MString, 0
#define TRIM_END_OPTION "right"	#define TRIM_END_OPTION "right"
#define TRIM_BOTH_OPTION "both"	#define TRIM_BOTH_OPTION "both"

	#define MODE_APPEND "append"

// statics	// statics

static const String match_var_name(MATCH_VAR_NAME);	static const String match_var_name(MATCH_VAR_NAME);
Line 59 static void _int(Request& r, MethodParam	Line 71 static void _int(Request& r, MethodParam
if(self_string.is_empty())	if(self_string.is_empty())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"parameter is empty string, error converting");	"unable to convert empty string without default specified");
converted=self_string.as_int();	converted=self_string.as_int();
} catch(...) { // convert problem	} catch(...) { // convert problem
if(params.count()>0)	if(params.count()>0)
Line 77 static void _double(Request& r, MethodPa	Line 89 static void _double(Request& r, MethodPa
if(self_string.is_empty())	if(self_string.is_empty())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"parameter is empty string, error converting");	"unable to convert empty string without default specified");
converted=self_string.as_double();	converted=self_string.as_double();
} catch(...) { // convert problem	} catch(...) { // convert problem
if(params.count()>0)	if(params.count()>0)
Line 96 static void _bool(Request& r, MethodPara	Line 108 static void _bool(Request& r, MethodPara
if(self_string.is_empty())	if(self_string.is_empty())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
"parameter is empty string, error converting");	"unable to convert empty string without default specified");

try {	try {
converted=self_string.as_bool();	converted=self_string.as_bool();
Line 292 static void split_with_options(Request&	Line 304 static void split_with_options(Request&
if(!bits) {	if(!bits) {
const String* options=0;	const String* options=0;
if(params_count>1)	if(params_count>1)
options=&params.as_string(1, "options must not be code");	options=&params.as_string(1, OPTIONS_MUST_NOT_BE_CODE);

bits=split_options(options);	bits=split_options(options);
}	}
Line 369 static void _match(Request& r, MethodPar	Line 381 static void _match(Request& r, MethodPar
size_t params_count=params.count();	size_t params_count=params.count();

Value& regexp=params.as_no_junction(0, "regexp must not be code");	Value& regexp=params.as_no_junction(0, "regexp must not be code");
Value* options=(params_count>1)?&params.as_no_junction(1, "options must not be code"):0;	Value* options=(params_count>1)?&params.as_no_junction(1, OPTIONS_MUST_NOT_BE_CODE):0;

VRegex* vregex;	VRegex* vregex;
VRegexCleaner vrcleaner;	VRegexCleaner vrcleaner;

if(Value* value=regexp.as(VREGEX_TYPE, false)){	if(Value* value=regexp.as(VREGEX_TYPE)){
if(options && options->is_defined())	if(options && options->is_defined())
throw Exception(PARSER_RUNTIME,	throw Exception(PARSER_RUNTIME,
0,	0,
Line 421 static void _match(Request& r, MethodPar	Line 433 static void _match(Request& r, MethodPar
0,	0,
"replacement option should be junction or string");	"replacement option should be junction or string");

	Value* default_code=(params_count==4)?&params.as_junction(3, "default value must be code"):0;

String result;	String result;
VTable* vtable=new VTable;	VTable* vtable=new VTable;
Replace_action_info info={	Replace_action_info info={
Line 431 static void _match(Request& r, MethodPar	Line 445 static void _match(Request& r, MethodPar
replacement_code	replacement_code
};	};

Temp_value_element* temp_match_var=0;	if(is_junction){
	Temp_value_element temp( *replacement_code->get_junction()->method_frame, match_var_name, vtable);
if(is_junction)	src.match(vregex, replace_action, &info, matches_count);
temp_match_var=new Temp_value_element(	} else {
*replacement_code->get_junction()->method_frame,	src.match(vregex, replace_action, &info, matches_count);
match_var_name, vtable);	}

src.match(vregex,
replace_action, &info,
matches_count);

if(temp_match_var)
delete temp_match_var;

r.write_assign_lang(result);	if(!matches_count && default_code)
	r.process_write(*default_code);
	else
	r.write_assign_lang(result);
}	}
}	}

Line 524 const String* sql_result_string(Request&	Line 534 const String* sql_result_string(Request&
ulong limit=SQL_NO_LIMIT;	ulong limit=SQL_NO_LIMIT;
ulong offset=0;	ulong offset=0;
default_code=0;	default_code=0;
if(params.count()>1) {	if(params.count()>1)
Value& voptions=params.as_no_junction(1, "options must be hash, not code");	if((options=params.as_hash(1))) {
if(voptions.is_defined() && !voptions.is_string())	int valid_options=0;
if((options=voptions.get_hash())) {	if(Value* vbind=options->get(sql_bind_name)) {
int valid_options=0;	valid_options++;
if(Value* vbind=options->get(sql_bind_name)) {	bind=vbind->get_hash();
valid_options++;	}
bind=vbind->get_hash();	if(Value* vlimit=options->get(sql_limit_name)) {
}	valid_options++;
if(Value* vlimit=options->get(sql_limit_name)) {	limit=(ulong)r.process_to_value(*vlimit).as_double();
valid_options++;	}
limit=(ulong)r.process_to_value(*vlimit).as_double();	if(Value* voffset=options->get(sql_offset_name)) {
}	valid_options++;
if(Value* voffset=options->get(sql_offset_name)) {	offset=(ulong)r.process_to_value(*voffset).as_double();
valid_options++;	}
offset=(ulong)r.process_to_value(*voffset).as_double();	if((default_code=options->get(sql_default_name))) {
}	valid_options++;
if((default_code=options->get(sql_default_name))) {	}
valid_options++;	if(valid_options!=options->count())
}	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
if(valid_options!=options->count())	}
throw Exception(PARSER_RUNTIME,	else
0,
"called with invalid option");
} else
throw Exception(PARSER_RUNTIME,
0,
"options must be hash");
} else
options=0;	options=0;

SQL_Driver::Placeholder* placeholders=0;	SQL_Driver::Placeholder* placeholders=0;
Line 602 static void _sql(Request& r, MethodParam	Line 605 static void _sql(Request& r, MethodParam
static void _replace(Request& r, MethodParams& params) {	static void _replace(Request& r, MethodParams& params) {
const String& src=GET_SELF(r, VString).string();	const String& src=GET_SELF(r, VString).string();

Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table();	if(params.count()==1) {
if(!table)	// ^string.replace[table]
throw Exception(PARSER_RUNTIME,	Table* table=params.as_no_junction(0, PARAM_MUST_NOT_BE_CODE).get_table();
0,	if(!table)
"parameter must be table");	throw Exception(PARSER_RUNTIME,
	0,
	"parameter must be table");
	Dictionary dict(*table);
	r.write_assign_lang(src.replace(dict));
	} else {
	// ^string.replace[from-string;to-string]
	Dictionary dict(
	params.as_string(0, "from must be string"),
	params.as_string(1, "to must be string")
	);
	r.write_assign_lang(src.replace(dict));
	}

Dictionary dict(*table);
r.write_assign_lang(src.replace(dict));
}	}

static void _save(Request& r, MethodParams& params) {	static void _save(Request& r, MethodParams& params) {
size_t params_count=params.count();	bool do_append=false;
const String& file_name=params.as_string(params_count-1, FILE_NAME_MUST_BE_STRING);	Charset* asked_charset=0;

	size_t file_name_index=0;
	if(params.count()>1)
	if(HashStringValue* options=params.as_no_junction(1, "second parameter should be string or hash").get_hash()){
	int valid_options=0;
	if(Value* vcharset_name=options->get(PA_CHARSET_NAME)){
	asked_charset=&::charsets.get(vcharset_name->as_string().change_case(r.charsets.source(), String::CC_UPPER));
	valid_options++;
	}
	if(Value* vappend=options->get(MODE_APPEND)){
	do_append=vappend->as_bool();
	valid_options++;
	}
	if(valid_options != options->count())
	throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION);
	} else {
	const String& mode=params.as_string(0, "mode must be string");
	if(mode==MODE_APPEND){
	do_append=true;
	file_name_index++;
	} else
	throw Exception(PARSER_RUNTIME,
	&mode,
	"unknown mode, must be 'append'");
	}

	const String& file_name=params.as_string(file_name_index, FILE_NAME_MUST_BE_STRING);
const String& src=GET_SELF(r, VString).string();	const String& src=GET_SELF(r, VString).string();

bool do_append=false;	String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/no error if none/));
if(params_count>1) {
const String& mode=params.as_string(0, "mode must be string");
if(mode=="append")
do_append=true;
else
throw Exception(PARSER_RUNTIME,
&mode,
"unknown mode, must be 'append'");
}

// write	// write
String::Body sbody=src.cstr_to_string_body_untaint(String::L_AS_IS, r.connection(false/no error if none/));	file_write(r.charsets, r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append, asked_charset);
file_write(r.absolute(file_name), sbody.cstr(), sbody.length(), true, do_append);
}	}

static void _normalize(Request& r, MethodParams&) {	static void _normalize(Request& r, MethodParams&) {
Line 670 static void _trim(Request& r, MethodPara	Line 699 static void _trim(Request& r, MethodPara
r.write_assign_lang(src.trim(kind, chars, &r.charsets.source()));	r.write_assign_lang(src.trim(kind, chars, &r.charsets.source()));
}	}

static void _append(Request& r, MethodParams& params) {
// c=a+b
VString& va=GET_SELF(r, VString);
const String& a=va.string();
const String& b=params.as_string(0, PARAMETER_MUST_BE_STRING);
String& c=*new String(a);
c.append(b, String::L_PASS_APPENDED);
va.set_string(c);
}

static void _base64(Request& r, MethodParams& params) {	static void _base64(Request& r, MethodParams& params) {
if(params.count()) {	if(params.count()) {
// decode: ^string:base64[encoded]	// decode: ^string:base64[encoded]
Line 713 static void _escape(Request& r, MethodPa	Line 732 static void _escape(Request& r, MethodPa

static void _unescape(Request& r, MethodParams& params){	static void _unescape(Request& r, MethodParams& params){
const String& src=params.as_string(0, PARAMETER_MUST_BE_STRING);	const String& src=params.as_string(0, PARAMETER_MUST_BE_STRING);
if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true/* don't unescape '+' char */))	if(const char* result=unescape_chars(src.cstr(), src.length(), &r.charsets.source(), true))
r.write_assign_lang(*new String(result));	r.write_assign_lang(*new String(result));
}	}

Line 760 MString::MString(): Methoded("string") {	Line 779 MString::MString(): Methoded("string") {

// ^string.match[regexp][options]	// ^string.match[regexp][options]
// ^string.match[regexp][options]{replacement-code}	// ^string.match[regexp][options]{replacement-code}
add_native_method("match", Method::CT_DYNAMIC, _match, 1, 3);	// ^string.match[regexp][options]{replacement-code}{code-if-nothing-is-found}
	add_native_method("match", Method::CT_DYNAMIC, _match, 1, 4);

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

// ^sql[query]	// ^string:sql{query}
// ^sql[query][options hash]	// ^string:sql{query}[options hash]
add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);	add_native_method("sql", Method::CT_STATIC, _sql, 1, 2);

// ^string.replace[table]	// ^string.replace[table]
add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 1);	add_native_method("replace", Method::CT_DYNAMIC, _replace, 1, 2);

// ^string.save[file]	// ^string.save[append][file]
	// ^string.save[file]
	// ^string.save[file][$.append(true) $.charset[...]]
add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);	add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2);

// ^string.normalize[]	// ^string.normalize[]
Line 783 MString::MString(): Methoded("string") {	Line 805 MString::MString(): Methoded("string") {
// ^string.trim[[start\|both\|end][;chars]]	// ^string.trim[[start\|both\|end][;chars]]
add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2);	add_native_method("trim", Method::CT_DYNAMIC, _trim, 0, 2);

// ^string.append[string]
add_native_method("append", Method::CT_DYNAMIC, _append, 1, 1);

// ^string.base64[] << encode	// ^string.base64[] << encode
// ^string:base64[encoded string] << decode	// ^string:base64[encoded string] << decode
add_native_method("base64", Method::CT_ANY, _base64, 0, 1);	add_native_method("base64", Method::CT_ANY, _base64, 0, 1);

// ^string.js-escape[]	// ^string.js-escape[]
// ^string:js-unescape[escaped%uXXXXstring]
add_native_method("js-escape", Method::CT_ANY, _escape, 0, 0);	add_native_method("js-escape", Method::CT_ANY, _escape, 0, 0);

	// ^string:js-unescape[escaped%uXXXXstring]
add_native_method("js-unescape", Method::CT_STATIC, _unescape, 1, 1);	add_native_method("js-unescape", Method::CT_STATIC, _unescape, 1, 1);
}	}

E-mail:

Removed from v.1.185
changed lines
	Added in v.1.201