--- parser3/src/classes/Attic/root.C	2001/03/11 21:41:03	1.17
+++ parser3/src/classes/Attic/root.C	2001/03/12 17:16:48	1.26
@@ -3,48 +3,88 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: root.C,v 1.17 2001/03/11 21:41:03 paf Exp $
+	$Id: root.C,v 1.26 2001/03/12 17:16:48 paf Exp $
 */
 
+#include <string.h>
+
 #include "pa_request.h"
 #include "_root.h"
 
-static void _if(Request& r, Array *params) {
+static void _if(Request& r, const String&, Array *params) {
 	bool condition=
-		r.autocalc(
+		r.process(
 			*static_cast<Value *>(params->get(0)), 
 			0/*no name*/,
 			false/*don't intercept string*/).get_bool();
 	if(condition) {
-		Value& value=r.autocalc(*static_cast<Value *>(params->get(1)));
-		r.wcontext->write(value, String::Untaint_lang::PASS_APPENDED);
+		Value& value=r.process(*static_cast<Value *>(params->get(1)));
+		r.write_pass_lang(value);
 	} else if(params->size()==3) {
-		Value& value=r.autocalc(*static_cast<Value *>(params->get(2)));
-		r.wcontext->write(value, String::Untaint_lang::PASS_APPENDED);
+		Value& value=r.process(*static_cast<Value *>(params->get(2)));
+		r.write_pass_lang(value);
 	}
 }
 
-static void _untaint(Request& r, Array *params) {
-	const String& lang_name=r.autocalc(*static_cast<Value *>(params->get(0))).as_string();
+static void _untaint(Request& r, const String& method_name, Array *params) {
+	const String& lang_name=r.process(*static_cast<Value *>(params->get(0))).as_string();
 	String::Untaint_lang lang=static_cast<String::Untaint_lang>(
-		untaint_lang_name_to_enum->get_int(lang_name));
+		untaint_lang_name2enum->get_int(lang_name));
 	if(!lang)
 		R_THROW(0, 0,
 			&lang_name,
-			"invalid language");
+			"invalid untaint language");
 
-	Temp_lang temp_lang(r, lang);
-	Value *value=static_cast<Value *>(params->get(1));
-	// forcing ^untaint[]{param type}
-	if(!value->get_junction())
-		R_THROW(0, 0,
-			&value->as_string(),
-			"untaint body must be junction");
+	{
+		Temp_lang temp_lang(r, lang);
+		Value *vbody=static_cast<Value *>(params->get(1));
+		// forcing ^untaint[]{this param type}
+		r.fail_if_junction_(false, *vbody, 
+			method_name, "body must be junction");
+		
+		r.write_pass_lang(r.process(*vbody));
+	}
+}
+	
 
-	value=&r.autocalc(*value);
-	r.wcontext->write(*value, String::Untaint_lang::PASS_APPENDED);
+static void _process(Request& r, const String& method_name, Array *params) {
+	// calculate pseudo file name of processed chars
+	// would be something like "/some/file(4) process"
+	char place[MAX_STRING];
+#ifndef NO_STRING_ORIGIN
+	const Origin& origin=method_name.origin();
+	snprintf(place, MAX_STRING, "%s(%d) %s", 
+		origin.file, 1+origin.line,
+		method_name.cstr());
+#else
+	strncpy(place, MAX_STRING, method_name.cstr());
+#endif	
+
+	VClass& self_class=*r.self->get_class();
+	{
+		// temporary zero @main so to maybe-replace it in processed code
+		Temp_method temp_method(self_class, *main_method_name, 0);
+		
+		// evaluate source to process
+		const String& source=
+			r.process(*static_cast<Value *>(params->get(0))).as_string();
+
+		// process source code, append processed methods to 'self' class
+		// maybe-define new @main
+		r.use_buf(source.cstr(), place, &self_class);
+		
+		// maybe-execute @main[]
+		if(const Method *method=self_class.get_method(*main_method_name)) {
+			// execute!	
+			r.execute(*method->parser_code);
+		}
+	}
 }
 	
+static void _rem(Request& r, const String& method_name, Array *params) {
+	r.fail_if_junction_(false, *static_cast<Value *>(params->get(0)), 
+		method_name, "body must be junction");
+}
 
 void initialize_root_class(Pool& pool, VClass& vclass) {
 	// ^if(condition){code-when-true}
@@ -53,4 +93,10 @@ void initialize_root_class(Pool& pool, V
 
 	// ^untaint[as-is|sql|js|html|html-typo]{code}
 	vclass.add_native_method("untaint", _untaint, 2, 2);
+
+	// ^process[code]
+	vclass.add_native_method("process", _process, 1, 1);
+
+	// ^rem{code}
+	vclass.add_native_method("rem", _rem, 1, 1);
 }