--- parser3/src/main/execute.C	2001/03/19 22:11:09	1.121
+++ parser3/src/main/execute.C	2001/03/24 19:12:19	1.125
@@ -5,9 +5,10 @@
 
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: execute.C,v 1.121 2001/03/19 22:11:09 paf Exp $
+	$Id: execute.C,v 1.125 2001/03/24 19:12:19 paf Exp $
 */
 
+#include "pa_config_includes.h"
 #include "code.h"
 #include "pa_array.h" 
 #include "pa_request.h"
@@ -22,7 +23,6 @@
 #include "pa_vtable.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #define PUSH(value) stack.push(value)
 #define POP() static_cast<Value *>(stack.pop())
@@ -63,7 +63,6 @@ void va_log_printf(const char *fmt,va_li
 }
 
 void log_printf(const char *fmt, ...) {
-	// TODO: куда-нибудь пристроить
     va_list args;
     va_start(args,fmt);
     va_log_printf(fmt,args);
@@ -223,7 +222,7 @@ void Request::execute(const Array& ops)
 			{
 				VString *vstring=static_cast<VString *>(ops.quick_get(++i));
 				log_printf(" \"%s\"", vstring->string().cstr());
-				write(vstring->string());
+				write_no_lang(vstring->string());
 				break;
 			}
 			
@@ -352,7 +351,7 @@ void Request::execute(const Array& ops)
 						else // stateful object
 							self=NEW VObject(pool(), *called_class);
 						frame->write(*self, 
-							String::Untaint_lang::NO  // not used, always an object, not string
+							String::UL_NO  // not used, always an object, not string
 						);
 					} else 
 						self=&frame->junction.self; // no, static or simple dynamic call
@@ -642,7 +641,7 @@ Value *Request::get_element() {
 	- false:
 		they want any result[string|object]
 		nothing goes to wcontext.
-		used in (expression) params evaluation
+		used in @c (expression) params evaluation
 */
 Value& Request::process(Value& value, const String *name, bool intercept_string) {
 	Value *result;
@@ -653,7 +652,7 @@ Value& Request::process(Value& value, co
 		PUSH(self);  
 		PUSH(root);  
 		PUSH(rcontext);  
-		PUSH(wcontext);
+			PUSH(wcontext);
 		
 		WContext *frame;
 		// for expression method params