--- parser3/src/main/compile.C	2001/04/06 10:32:20	1.35
+++ parser3/src/main/compile.C	2005/08/09 08:14:51	1.78
@@ -1,69 +1,37 @@
 /** @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)
-
-	$Id: compile.C,v 1.35 2001/04/06 10:32:20 paf Exp $
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#include "code.h"
+static const char * const IDENT_COMPILE_C="$Date: 2005/08/09 08:14:51 $";
+
+#include "pa_opcode.h"
 #include "pa_request.h"
-#include "pa_string.h"
-#include "pa_array.h"
 #include "compile_tools.h"
-#include "pa_exception.h"
-
-#include <stdio.h>
 
 extern int yydebug;
 extern int yyparse (void *);
 
-VStateless_class& Request::real_compile(COMPILE_PARAMS) {
+VStateless_class& Request::compile(VStateless_class* aclass, 
+				   const char* source, const String* main_alias, 
+				   uint file_no,
+				   int line_no_offset) {
 	// prepare to parse
-	struct parse_control pc;
+	Parse_control pc(*this, aclass, source, main_alias, file_no, line_no_offset);
 
-	// input 
-	pc.pool=&pool();
-	pc.request=this;
-	VStateless_class *cclass;
-	if(aclass) // we were told the class to compile to?
-		cclass=aclass; // yes, remember it [used in ^process]
-	else if(name) { // we were told the name of compiled class?
-		// yes. create it
-		cclass=NEW VClass(pool());
-		// defaulting base. may change with @BASE
-		if(base_class)
-			cclass->set_base(*base_class);
-		classes().put(*name, cclass);
-		cclass->set_name(*name);
-	} else
-		cclass=&OP; // until changed with @CLASS would consider operators loading
-	pc.cclass=cclass;
-
-	pc.source=source;
-#ifndef NO_STRING_ORIGIN
-	pc.file=file;
-	pc.line=pc.col=0;
-#endif
-	// initialise state
-	pc.pending_state=0;
-	pc.string=NEW String(pool());	
-	pc.ls=LS_USER;
-	pc.sp=0;
-	
 	// 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,
+		pc.pos_prev_c();
+		if(!pc.explicit_result)
+			if(pc.pos.col==0) // expecting something after EOL means they've expected it BEFORE
+				pc.pos_prev_c();
+
+		throw Exception("parser.compile",
 			0,
-			"%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error);
+			"%s(%d:%d): %s",  file_list[file_no].cstr(), 1+pc.pos.line, 1+pc.pos.col,  pc.error);
 	}
 
 	// result