--- parser3/src/classes/string.C	2001/03/10 12:12:49	1.3
+++ parser3/src/classes/string.C	2001/03/29 17:11:39	1.17
@@ -1,71 +1,149 @@
 /*
-$Id: string.C,v 1.3 2001/03/10 12:12:49 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: string.C,v 1.17 2001/03/29 17:11:39 paf Exp $
 */
 
 #include "pa_request.h"
 #include "_string.h"
 #include "pa_vdouble.h"
 #include "pa_vint.h"
+#include "pa_vtable.h"
 
 // global var
 
-VClass *string_class;
+VStateless_class *string_class;
 
 // methods
 
-static void _length(Request& r, Array *) {
+static void _length(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VDouble(pool, r.self->as_string().size());
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	Value& value=*new(pool) VDouble(pool, r.self->get_string()->size());
+	r.write_no_lang(value);
 }
 
-static void _int(Request& r, Array *) {
+static void _int(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VInt(pool, static_cast<int>(r.self->get_double()));
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	Value& value=*new(pool) VInt(pool, (int)r.self->as_double());
+	r.write_no_lang(value);
 }
 
-static void _double(Request& r, Array *) {
+static void _double(Request& r, const String&, Array *) {
 	Pool& pool=r.pool();
-	Value& value=*new(pool) VDouble(pool, r.self->get_double());
-	r.wcontext->write(value, String::Untaint_lang::NO /*always object, not string*/);
+	Value& value=*new(pool) VDouble(pool, r.self->as_double());
+	r.write_no_lang(value);
 }
 
-void initialize_string_class(Pool& pool, VClass& vclass) {
-	// ^string.length[]
-	String& LENGTH_NAME=*new(pool) String(pool);
-	LENGTH_NAME.APPEND_CONST("length");
+void _string_format(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+
+	Value& fmt=*static_cast<Value *>(params->get(0));
+	// forcing [this param type]
+	r.fail_if_junction_(true, fmt, method_name, "fmt must not be junction");
+
+	char *buf=format(pool, r.self->as_double(), fmt.as_string().cstr());
+	
+	r.write_no_lang(String(pool, buf));
+}
 
-	Method& LENGTH_METHOD=*new(pool) Method(pool,
-		LENGTH_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _length
-	);
-	vclass.add_method(LENGTH_NAME, LENGTH_METHOD);
+void _left(Request& r, const String&, Array *params) {
+	Pool& pool=r.pool();
 
-	// ^string.int[]
-	String& INT_NAME=*new(pool) String(pool);
-	INT_NAME.APPEND_CONST("int");
+	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
+	
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+	r.write_assign_lang(*new(pool) VString(string.piece(0, n)));
+}
+
+void _right(Request& r, const String&, Array *params) {
+	Pool& pool=r.pool();
+
+	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
+	
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+	r.write_assign_lang(*new(pool) VString(string.piece(string.size()-n, string.size())));
+}
+
+void _mid(Request& r, const String&, Array *params) {
+	Pool& pool=r.pool();
+
+	size_t p=(size_t)r.process(*static_cast<Value *>(params->get(0))).as_double();
+	size_t n=(size_t)r.process(*static_cast<Value *>(params->get(1))).as_double();
+	
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+	r.write_assign_lang(*new(pool) VString(string.piece(p, p+n)));
+}
+
+void _pos(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
+
+	Value& substr=*static_cast<Value *>(params->get(0));
+	// forcing [this param type]
+	r.fail_if_junction_(true, substr, method_name, "substr must not be junction");
+	
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+	r.write_assign_lang(*new(pool) VInt(pool, string.pos(substr.as_string())));
+}
+
+void _lsplit(Request& r, const String& method_name, Array *params) {
+	Pool& pool=r.pool();
 
-	Method& INT_METHOD=*new(pool) Method(pool,
-		INT_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _int
-	);
-	vclass.add_method(INT_NAME, INT_METHOD);
+	Value& delim_value=*static_cast<Value *>(params->get(0));
+	// forcing [this param type]
+	r.fail_if_junction_(true, delim_value, method_name, "delimiter must not be junction");
+	const String& delim=delim_value.as_string();
+	
+	const String& string=*static_cast<VString *>(r.self)->get_string();
+
+	Table& result=*new(pool) Table(pool, &string, 0);
+
+	int pos_before=string.pos(delim);
+	if(pos_before>=0) {
+		{
+			Array& row=*new(pool) Array(pool, 1);
+			result+=&(row+=&string.piece(0, pos_before));
+		}
+		size_t pos_after=pos_before+delim.size();
+		if(pos_after<string.size()) {
+			Array& row=*new(pool) Array(pool, 1);
+			result+=&(row+=&string.piece(pos_after, string.size()));
+		}
+	} else {
+		Array& row=*new(pool) Array(pool, 1);
+		result+=&(row+=&string);
+	}
 
+	r.write_no_lang(*new(pool) VTable(pool, &result));
+}
+
+// initialize
+
+void initialize_string_class(Pool& pool, VStateless_class& vclass) {
+	// ^string.length[]
+	vclass.add_native_method("length", _length, 0, 0);
+	
+	// ^string.int[]
+	vclass.add_native_method("int", _int, 0, 0);
+	
 	// ^string.double[]
-	String& DOUBLE_NAME=*new(pool) String(pool);
-	DOUBLE_NAME.APPEND_CONST("double");
+	vclass.add_native_method("double", _double, 0, 0);
+
+	// ^string.format[]
+	vclass.add_native_method("format", _string_format, 1, 1);
+
+	// ^string.left(n)
+	vclass.add_native_method("left", _left, 1, 1);
+	// ^string.right(n)
+	vclass.add_native_method("right", _right, 1, 1);
+	// ^string.mid(p;n)
+	vclass.add_native_method("mid", _mid, 2, 2);
+
+	// ^string.pos[substr]
+	vclass.add_native_method("pos", _pos, 1, 1);
 
-	Method& DOUBLE_METHOD=*new(pool) Method(pool,
-		DOUBLE_NAME,
-		0, 0, // min,max numbered_params_count
-		0/*params_names*/, 0/*locals_names*/,
-		0/*parser_code*/, _double
-	);
-	vclass.add_method(DOUBLE_NAME, DOUBLE_METHOD);
+	// ^string.lsplit[delim]
+	vclass.add_native_method("lsplit", _lsplit, 1, 1);
 }