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.187 and 1.191

version 1.187, 2009/07/15 12:59:19	version 1.191, 2009/11/06 05:02:53
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

Line 41 DECLARE_CLASS_VAR(string, new MString, 0	Line 42 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 374 static void _match(Request& r, MethodPar	Line 377 static void _match(Request& r, MethodPar
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 431 static void _match(Request& r, MethodPar	Line 434 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);	r.write_assign_lang(result);
}	}
Line 613 static void _replace(Request& r, MethodP	Line 609 static void _replace(Request& r, MethodP
}	}

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,
	INVALID_OPTION_PASSED);
	} 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 767 MString::MString(): Methoded("string") {	Line 781 MString::MString(): Methoded("string") {
// ^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, 1);

// ^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 791 MString::MString(): Methoded("string") {	Line 807 MString::MString(): Methoded("string") {
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.187
changed lines
	Added in v.1.191