--- parser3/src/include/pa_request.h	2001/03/11 12:04:43	1.39
+++ parser3/src/include/pa_request.h	2001/03/13 12:37:04	1.45
@@ -3,7 +3,7 @@
 	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.39 2001/03/11 12:04:43 paf Exp $
+	$Id: pa_request.h,v 1.45 2001/03/13 12:37:04 paf Exp $
 */
 
 #ifndef PA_REQUEST_H
@@ -16,6 +16,9 @@
 #include "pa_value.h"
 #include "pa_stack.h"
 #include "pa_vclass.h"
+#include "pa_vobject.h"
+
+#define UNNAMED_NAME "unnamed"
 
 #define MAIN_METHOD_NAME "main"
 #define AUTO_METHOD_NAME "auto"
@@ -23,13 +26,23 @@
 
 #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 Temp_lang;
@@ -48,11 +61,17 @@ 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(
+	void execute(const Array& ops);
+
+	VClass *use_file(
+		const char *file, bool fail_on_read_problem=true,
+		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
@@ -61,10 +80,19 @@ public:
 		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, 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); 
+	}
+
+	void fail_if_junction_(bool is, Value& value, const String& method_name, char *msg);
+
+	char *relative(const char *path, const char *file);
+	char *absolute(const char *name);
 
 public:
 	
@@ -86,18 +114,14 @@ private: // core data
 	// execution stack
 	Stack stack;
 
-private: // core.C
-
-	char *execute_MAIN();
-
 private: // compile.C
 
 	VClass& real_compile(COMPILE_PARAMS);
 
 private: // execute.C
 
-	char *execute_static_method(VClass& vclass, String& method_name, bool return_cstr);
-	void execute(const Array& ops);
+	char *execute_method(Value& aself, const Method& method, bool return_cstr);
+	char *execute_method(Value& aself, const String& method_name, bool return_cstr);
 
 	Value *get_element();
 
@@ -116,6 +140,11 @@ private: // lang manipulation
 		flang=alang;
 	}
 
+private: // web
+
+	const char *document_root;
+	const char *page_filespec;
+
 };
 
 class Temp_lang {