--- parser3/src/main/compile.C	2001/07/26 10:47:02	1.45
+++ parser3/src/main/compile.C	2001/10/31 16:19:58	1.52
@@ -2,10 +2,10 @@
 	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.52 2001/10/31 16:19:58 paf Exp $
 */
-static const char *RCSId="$Id: compile.C,v 1.45 2001/07/26 10:47:02 parser Exp $"; 
 
 #include "pa_opcode.h"
 #include "pa_request.h"
@@ -14,8 +14,6 @@ static const char *RCSId="$Id: compile.C
 #include "compile_tools.h"
 #include "pa_exception.h"
 
-#include <stdio.h>
-
 extern int yydebug;
 extern int yyparse (void *);
 
@@ -53,19 +51,26 @@ VStateless_class& Request::real_compile(
 	pc.string=NEW String(pool());	
 	pc.ls=LS_USER;
 	pc.sp=0;
-	pc.object_constructor_allowed=pc.object_constructing=false;
+	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