--- parser3/src/main/compile.C	2001/02/21 11:13:16	1.7
+++ parser3/src/main/compile.C	2001/03/11 12:04:44	1.26
@@ -1,12 +1,16 @@
 /*
-  $Id: compile.C,v 1.7 2001/02/21 11:13:16 paf Exp $
+	Parser
+	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 $
 */
 
+#include "pa_request.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "code.h"
 #include "compile_tools.h"
-#include "compile.h"
 #include "pa_exception.h"
 
 #include <stdio.h>
@@ -14,18 +18,27 @@
 extern int yydebug;
 extern int yyparse (void *);
 
-Array *real_compile(COMPILE_PARAMS) {
-	if(!source)
-		return 0;
-
-	Pool& pool=request.pool();
-
+VClass& Request::real_compile(COMPILE_PARAMS) {
 	// prepare to parse
 	struct parse_control pc;
+
 	// input 
-	pc.pool=&pool;
-	pc.methods=new(pool) Array(pool);
-	//   create new 'name' vclass, add it to request's classes
+	pc.pool=&pool();
+	pc.request=this;
+	VClass *vclass;
+	if(name) { // we were told the name of compiled class?
+		// yes. create it
+		vclass=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);
+	} else
+		vclass=&root_class; // until changed with @CLASS would consider operators loading
+	pc.vclass=vclass;
+
 	pc.source=source;
 #ifndef NO_STRING_ORIGIN
 	pc.file=file;
@@ -33,17 +46,23 @@ Array *real_compile(COMPILE_PARAMS) {
 #endif
 	// initialise state
 	pc.pending_state=0;
-	pc.string=new(pool) String(pool);
+	pc.string=NEW String(pool());	
 	pc.ls=LS_USER;
 	pc.sp=0;
 	
-	// parse! 
-	yydebug=1;
-	if(yyparse(&pc)) // error?
-		request.exception().raise(0,0,
+	// parse=compile! 
+//	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,
 			0,
-			"%s @%s[%d:%d]", pc.error, file, 1+pc.line, pc.col/*already+1*/);
+			"%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error);
+	}
 
 	// result
-	return pc.methods;
+	return *pc.vclass;
 }