--- parser3/src/include/pa_request.h	2001/03/10 16:15:37	1.31
+++ parser3/src/include/pa_request.h	2001/03/12 12:00:04	1.41
@@ -1,5 +1,9 @@
 /*
-  $Id: pa_request.h,v 1.31 2001/03/10 16:15:37 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: pa_request.h,v 1.41 2001/03/12 12:00:04 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -15,23 +19,33 @@
 
 #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"
+#define TABLE_CLASS_NAME "table"
 
 #ifndef NO_STRING_ORIGIN
-#	define COMPILE_PARAMS char *source, String *name, VClass *base_class, char *file
-#	define COMPILE(source, name, base_class, file) real_compile(source, name, base_class, file)
+#	define COMPILE_PARAMS  \
+		const char *source, \
+		VClass *aclass, const String *name, \
+		VClass *base_class, \
+		const char *file
+#	define COMPILE(source, aclass, name, base_class, file)  \
+		real_compile(source, aclass, name, base_class, file)
 #else
-#	define COMPILE_PARAMS char *source, String *name, VClass *base_class
-#	define COMPILE(source, name, base_class, file) real_compile(source, name, base_class)
+#	define COMPILE_PARAMS  \
+		const char *source, \
+		VClass *aclass, const String *name, \
+		VClass *base_class
+#	define COMPILE(source, aclass, name, base_class, file)  \
+		real_compile(source, aclass, name, base_class)
 #endif
 
-class Local_request_exception;
+class Temp_lang;
 
 class Request : public Pooled {
+	friend Temp_lang;
 public:
 	
 	Request(Pool& apool);
@@ -44,20 +58,32 @@ public:
 	// core request processing
 	void core();
 
-	VClass *use(char *file, 
-		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
+	void execute(const Array& ops);
+
+	VClass *use_file(
+		const char *file, bool fail_on_read_problem=true,
+		VClass *aclass=0, const String *name=0, 
+		VClass *base_class=0); // core.C
+	VClass *use_buf(
+		const char *source, const char *file,
+		VClass *aclass=0, const String *name=0, 
+		VClass *base_class=0); // core.C
+	Value& process(
+		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
 	}
 
-	void write(Value& avalue) {
+	void write_assign_lang(Value& avalue) {
 		// appending possible string, assigning untaint language
-		wcontext->write(avalue, lang); 
+		wcontext->write(avalue, flang); 
+	}
+	void write_pass_lang(Value& avalue) {
+		// appending possible string, passing language built into string being written
+		wcontext->write(avalue, String::Untaint_lang::PASS_APPENDED); 
 	}
 
 public:
@@ -91,17 +117,37 @@ private: // compile.C
 private: // execute.C
 
 	char *execute_static_method(VClass& vclass, String& method_name, bool return_cstr);
-	void execute(const Array& ops);
 
 	Value *get_element();
 
 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