--- parser3/src/include/pa_request.h	2001/03/10 16:34:35	1.32
+++ parser3/src/include/pa_request.h	2001/03/11 12:04:43	1.39
@@ -1,9 +1,9 @@
 /*
 	Parser
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: pa_request.h,v 1.32 2001/03/10 16:34:35 paf Exp $
+	$Id: pa_request.h,v 1.39 2001/03/11 12:04:43 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -19,8 +19,7 @@
 
 #define MAIN_METHOD_NAME "main"
 #define AUTO_METHOD_NAME "auto"
-#define RUN_CLASS_NAME "RUN"
-#define AUTO_CLASS_NAME "AUTO"
+#define MAIN_CLASS_NAME "MAIN"
 
 #define ROOT_CLASS_NAME "ROOT"
 #define ENV_CLASS_NAME "ENV"
@@ -33,9 +32,10 @@
 #	define COMPILE(source, name, base_class, file) real_compile(source, name, base_class)
 #endif
 
-class Local_request_exception;
+class Temp_lang;
 
 class Request : public Pooled {
+	friend Temp_lang;
 public:
 	
 	Request(Pool& apool);
@@ -52,8 +52,10 @@ public:
 		String *name=0, 
 		VClass *base_class=0, 
 		bool fail_on_read_problem=true); // core.C
-	Value& autocalc(Value& value, const String *name=0, 
-		bool make_string=true); // execute.C
+	Value& autocalc(
+		Value& value, 
+		const String *name=0,
+		bool intercept_string=true); // execute.C
 
 	void write(const String& astring) {
 		wcontext->write(astring, String::Untaint_lang::NO);  // write(const) = clean
@@ -61,7 +63,7 @@ public:
 
 	void write(Value& avalue) {
 		// appending possible string, assigning untaint language
-		wcontext->write(avalue, lang); 
+		wcontext->write(avalue, flang); 
 	}
 
 public:
@@ -101,11 +103,32 @@ private: // execute.C
 
 private: // lang&raw 
 	
-	String::Untaint_lang lang;
+	String::Untaint_lang flang;
 
-private: // lang&raw manipulation
+private: // lang manipulation
 
-	// TODO
+	String::Untaint_lang set_lang(String::Untaint_lang alang) {
+		String::Untaint_lang result=flang;
+		flang=alang;
+		return result;
+	}
+	void restore_lang(String::Untaint_lang alang) {
+		flang=alang;
+	}
+
+};
+
+class Temp_lang {
+	Request& frequest;
+	String::Untaint_lang saved_lang;
+public:
+	Temp_lang(Request& arequest, String::Untaint_lang alang) : 
+		frequest(arequest),
+		saved_lang(arequest.set_lang(alang)) {
+	}
+	~Temp_lang() { 
+		frequest.restore_lang(saved_lang); 
+	}
 };
 
 #endif