--- parser3/src/main/compile.C	2001/03/11 12:04:44	1.26
+++ parser3/src/main/compile.C	2001/10/31 16:19:58	1.52
@@ -1,43 +1,44 @@
-/*
-	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)
 
-	$Id: compile.C,v 1.26 2001/03/11 12:04:44 paf Exp $
+	$Id: compile.C,v 1.52 2001/10/31 16:19:58 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 *);
 
-VClass& Request::real_compile(COMPILE_PARAMS) {
+VStateless_class& Request::real_compile(COMPILE_PARAMS) {
 	// prepare to parse
 	struct parse_control pc;
 
 	// input 
 	pc.pool=&pool();
 	pc.request=this;
-	VClass *vclass;
-	if(name) { // we were told the name of compiled class?
+	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
-		vclass=NEW VClass(pool());
+		cclass=NEW VClass(pool());
 		// defaulting base. may change with @BASE
-		vclass->set_base(base_class?*base_class:root_class);
-		// append to request's classes
-		classes_array()+=vclass;
-		classes().put(*name, vclass);
-		vclass->set_name(*name);
+		// 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
-		vclass=&root_class; // until changed with @CLASS would consider operators loading
-	pc.vclass=vclass;
+		cclass=&OP; // until changed with @CLASS would consider operators loading
+	pc.cclass=cclass;
 
 	pc.source=source;
 #ifndef NO_STRING_ORIGIN
@@ -45,24 +46,33 @@ VClass& Request::real_compile(COMPILE_PA
 	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.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
-	return *pc.vclass;
+	return *pc.cclass;
 }