--- parser3/src/main/compile.C	2001/02/21 11:13:16	1.7
+++ parser3/src/main/compile.C	2015/10/26 01:21:57	1.85
@@ -1,49 +1,34 @@
-/*
-  $Id: compile.C,v 1.7 2001/02/21 11:13:16 paf Exp $
+/** @file
+	Parser: compiler part of request class.
+
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#include "pa_string.h"
-#include "pa_array.h"
-#include "code.h"
-#include "compile_tools.h"
-#include "compile.h"
-#include "pa_exception.h"
+volatile const char * IDENT_COMPILE_C="$Id: compile.C,v 1.85 2015/10/26 01:21:57 moko Exp $";
 
-#include <stdio.h>
+#include "pa_request.h"
+#include "compile_tools.h"
 
 extern int yydebug;
-extern int yyparse (void *);
-
-Array *real_compile(COMPILE_PARAMS) {
-	if(!source)
-		return 0;
-
-	Pool& pool=request.pool();
+extern int yyparse (Parse_control *);
 
+ArrayClass& 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;
-	// input 
-	pc.pool=&pool;
-	pc.methods=new(pool) Array(pool);
-	//   create new 'name' vclass, add it to request's classes
-	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(pool) String(pool);
-	pc.ls=LS_USER;
-	pc.sp=0;
-	
-	// parse! 
-	yydebug=1;
-	if(yyparse(&pc)) // error?
-		request.exception().raise(0,0,
-			0,
-			"%s @%s[%d:%d]", pc.error, file, 1+pc.line, pc.col/*already+1*/);
+	Parse_control pc(*this, aclass, source, main_alias, file_no, line_no_offset);
+
+	// parse=compile! 
+	//yydebug=1;
+	if(yyparse(&pc)) { // error?
+		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();
+
+		exception_trace.push(Trace(0, Operation::Origin::create(file_no, pc.pos.line, pc.pos.col)));
+		throw Exception("parser.compile", 0, "%s", pc.error);
+	}
 
 	// result
-	return pc.methods;
+	return *pc.cclasses;
 }