--- parser3/src/main/compile.C	2001/03/13 13:39:58	1.28.2.1
+++ parser3/src/main/compile.C	2002/02/07 11:16:27	1.55
@@ -1,20 +1,19 @@
-/*
-	Parser
+/** @file
+	Parser: compiler part of request class.
+
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
 
-	$Id: compile.C,v 1.28.2.1 2001/03/13 13:39:58 paf Exp $
+	$Id: compile.C,v 1.55 2002/02/07 11:16:27 paf Exp $
 */
 
+#include "pa_opcode.h"
 #include "pa_request.h"
 #include "pa_string.h"
 #include "pa_array.h"
-#include "code.h"
 #include "compile_tools.h"
 #include "pa_exception.h"
 
-#include <stdio.h>
-
 extern int yydebug;
 extern int yyparse (void *);
 
@@ -32,15 +31,13 @@ VStateless_class& Request::real_compile(
 		// yes. create it
 		cclass=NEW VClass(pool());
 		// defaulting base. may change with @BASE
-		if(!base_class)
-			base_class=&root_class;
-		cclass->set_base(*base_class);
-		// append to request's classes
-		classes_array()+=cclass;
+		// dont use ?: for there would be getting & of temp object
+		if(base_class)
+			cclass->set_base(*base_class);
 		classes().put(*name, cclass);
 		cclass->set_name(*name);
 	} else
-		cclass=&root_class; // until changed with @CLASS would consider operators loading
+		cclass=&OP; // until changed with @CLASS would consider operators loading
 	pc.cclass=cclass;
 
 	pc.source=source;
@@ -49,22 +46,31 @@ VStateless_class& Request::real_compile(
 	pc.line=pc.col=0;
 #endif
 	// initialise state
+	pc.trim_bof=true;
 	pc.pending_state=0;
 	pc.string=NEW String(pool());	
 	pc.ls=LS_USER;
-	pc.sp=0;
+	pc.ls_sp=0;
+	pc.object_constructor_allowed=false;
 	
 	// parse=compile! 
-//	yydebug=1;
+	//yydebug=1;
 	if(yyparse(&pc)) { // error?
 		if(pc.col==0) { // expecting something after EOL means they've expected it BEFORE
 			// step back.  -1 col means EOL
 			pc.line--;
 			pc.col=-1;
 		} 
-		THROW(0,0,
+		throw Exception(0,0,
 			0,
-			"%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error);
+#ifndef NO_STRING_ORIGIN
+			"%s(%d:%d): "
+#endif
+			"%s", 
+#ifndef NO_STRING_ORIGIN
+			file, 1+pc.line, pc.col, 
+#endif
+			pc.error);
 	}
 
 	// result