--- parser3/src/main/compile.C	2001/02/21 17:50:02	1.11
+++ parser3/src/main/compile.C	2001/03/08 13:13:40	1.21
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.C,v 1.11 2001/02/21 17:50:02 paf Exp $
+  $Id: compile.C,v 1.21 2001/03/08 13:13:40 paf Exp $
 */
 
 #include "pa_request.h"
@@ -14,15 +14,26 @@
 extern int yydebug;
 extern int yyparse (void *);
 
-Array& Request::real_compile(COMPILE_PARAMS) {
+VClass& Request::real_compile(COMPILE_PARAMS) {
 	// prepare to parse
 	struct parse_control pc;
 
 	// input 
 	pc.pool=&pool();
-	pc.methods=new(pool()) Array(pool());
-	if(!source)
-		return *pc.methods;
+	pc.request=this;
+	VClass *vclass;
+	if(name) { // we were told the name of a class?
+		// yes. create it
+		vclass=NEW VClass(pool());
+		vclass->set_name(*name);
+		// defaulting base. may change with @BASE
+		vclass->set_base(root_class);
+		// append to request's classes
+		classes_array()+=vclass;
+		classes().put(*name, vclass);
+	} else
+		vclass=&root_class; // until changed with @CLASS would consider operators loading
+	pc.vclass=vclass;
 
 	pc.source=source;
 #ifndef NO_STRING_ORIGIN
@@ -31,23 +42,23 @@ Array& Request::real_compile(COMPILE_PAR
 #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! 
+	// parse=compile! 
 	yydebug=1;
 	if(yyparse(&pc)) { // error?
-		if(pc.col==1) {
-			// step back from last char.  -1 col means EOL
+		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;
-		}
-		exception().raise(0,0,
+		} 
+		THROW(0,0,
 			0,
-			"%s [%s:%d:%d]", pc.error, file, 1+pc.line, pc.col);
+			"%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error);
 	}
 
 	// result
-	return *pc.methods;
+	return *pc.vclass;
 }