--- parser3/src/main/compile.C	2001/02/20 19:21:13	1.2
+++ parser3/src/main/compile.C	2001/02/21 17:50:02	1.11
@@ -1,37 +1,53 @@
 /*
-  $Id: compile.C,v 1.2 2001/02/20 19:21:13 paf Exp $
+  $Id: compile.C,v 1.11 2001/02/21 17:50:02 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>
 
 extern int yydebug;
 extern int yyparse (void *);
 
-Array *real_compile(COMPILE_PARAMS) {
+Array& 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 0;
+		return *pc.methods;
 
-	yydebug=1;
-	struct parse_control pc;
-	/* input */
-	pc.pool=pool;
 	pc.source=source;
 #ifndef NO_STRING_ORIGIN
 	pc.file=file;
-	pc.line=1;
+	pc.line=pc.col=0;
 #endif
-	/* state to initial */
+	// initialise state
 	pc.pending_state=0;
-	pc.string=string_create(pool);
+	pc.string=new(pool()) String(pool());	
 	pc.ls=LS_USER;
 	pc.sp=0;
-	/* parse! */
-	int parse_error=yyparse(&pc);
-	/* result */
-	return parse_error?0:static_cast<Array *>(pc.result);
+	
+	// parse! 
+	yydebug=1;
+	if(yyparse(&pc)) { // error?
+		if(pc.col==1) {
+			// step back from last char.  -1 col means EOL
+			pc.line--;
+			pc.col=-1;
+		}
+		exception().raise(0,0,
+			0,
+			"%s [%s:%d:%d]", pc.error, file, 1+pc.line, pc.col);
+	}
+
+	// result
+	return *pc.methods;
 }