--- parser3/src/classes/Attic/root.C	2001/03/12 13:13:19	1.24
+++ parser3/src/classes/Attic/root.C	2001/03/12 17:16:48	1.26
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: root.C,v 1.24 2001/03/12 13:13:19 paf Exp $
+	$Id: root.C,v 1.26 2001/03/12 17:16:48 paf Exp $
 */
 
 #include <string.h>
@@ -39,10 +39,8 @@ static void _untaint(Request& r, const S
 		Temp_lang temp_lang(r, lang);
 		Value *vbody=static_cast<Value *>(params->get(1));
 		// forcing ^untaint[]{this param type}
-		if(!vbody->get_junction())
-			R_THROW(0, 0,
-			&method_name,
-			"body must be junction");
+		r.fail_if_junction_(false, *vbody, 
+			method_name, "body must be junction");
 		
 		r.write_pass_lang(r.process(*vbody));
 	}
@@ -50,14 +48,11 @@ static void _untaint(Request& r, const S
 	
 
 static void _process(Request& r, const String& method_name, Array *params) {
-	// evaluate source to process
-	const String& source=r.process(*static_cast<Value *>(params->get(0))).as_string();
-
 	// 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=source.origin();
+	const Origin& origin=method_name.origin();
 	snprintf(place, MAX_STRING, "%s(%d) %s", 
 		origin.file, 1+origin.line,
 		method_name.cstr());
@@ -70,6 +65,10 @@ static void _process(Request& r, const S
 		// 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);
@@ -82,6 +81,10 @@ static void _process(Request& r, const S
 	}
 }
 	
+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}
@@ -93,4 +96,7 @@ void initialize_root_class(Pool& pool, V
 
 	// ^process[code]
 	vclass.add_native_method("process", _process, 1, 1);
+
+	// ^rem{code}
+	vclass.add_native_method("rem", _rem, 1, 1);
 }