--- parser3/src/main/compile.y	2001/03/10 16:15:38	1.86
+++ parser3/src/main/compile.y	2001/03/12 09:08:50	1.91
@@ -1,9 +1,24 @@
 /*
-  $Id: compile.y,v 1.86 2001/03/10 16:15:38 paf Exp $
+	Parser
+	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: compile.y,v 1.91 2001/03/12 09:08:50 paf Exp $
+*/
+
+/*
+	TODO.parser4: 
+		cache compiled code from request to request. to do that...
+		1:	make method definitions, @CLASS, @BASE, @USE instructions,
+			which would be executed afterwards, and actions
+			now performed at compile time would be delayed to run time.
+		2:	make cache expiration on time and on disk-change of class source
+		3:	in apache use subpools for compiled class storage
+		4:	in iis make up specialized Pool object for that
 */
 
 %{
-#define YYSTYPE  Array/*<op>*/ *
+#define YYSTYPE  Array/*<Operation>*/ *
 #define YYPARSE_PARAM  pc
 #define YYLEX_PARAM  pc
 #define YYDEBUG  1
@@ -86,15 +101,14 @@ int yylex(YYSTYPE *lvalp, void *pc);
 %left NEG     /* negation: unary - */
 
 %%
-
-all: /* TODO: у ^execute непременно задать какой-то name, см. 'RUN' */
+all:
 	one_big_piece {
 	Method& method=*NEW Method(POOL, 
 		*main_method_name, 
 		0, 0, /*min, max numbered_params_count*/
 		0/*param_names*/, 0/*local_names*/, 
 		$1/*parser_code*/, 0/*native_code*/);
-	PC->vclass->add_method(*main_method_name, method);
+	PC->cclass->add_method(*main_method_name, method);
 }
 |	methods;
 
@@ -114,9 +128,9 @@ control_method: '@' STRING '\n'
 		YYERROR;
 	}
 	if(command==CLASS_NAME) {
-		if(PC->vclass!=&PC->request->root_class) { // already changed from default?
+		if(PC->cclass!=&PC->request->root_class) { // already changed from default?
 			strcpy(PC->error, "class already have a name '");
-			strncat(PC->error, PC->vclass->name().cstr(), 100);
+			strncat(PC->error, PC->cclass->name().cstr(), 100);
 			strcat(PC->error, "'");
 			YYERROR;
 		}
@@ -124,13 +138,13 @@ control_method: '@' STRING '\n'
 			// new class' name
 			const String *name=SLA2S(strings_code);
 			// creating the class
-			PC->vclass=NEW VClass(POOL);
-			PC->vclass->set_name(*name);
+			PC->cclass=NEW VClass(POOL);
+			PC->cclass->set_name(*name);
 			// defaulting base. may change with @BASE
-			PC->vclass->set_base(PC->request->root_class);
+			PC->cclass->set_base(PC->request->root_class);
 			// append to request's classes
-			PC->request->classes_array()+=PC->vclass;
-			PC->request->classes().put(*name, PC->vclass);
+			PC->request->classes_array()+=PC->cclass;
+			PC->request->classes().put(*name, PC->cclass);
 		} else {
 			strcpy(PC->error, "@"CLASS_NAME" must contain sole name");
 			YYERROR;
@@ -140,12 +154,12 @@ control_method: '@' STRING '\n'
 			for(int i=0; i<strings_code->size(); i+=2) {
 				String file(*SLA2S(strings_code, i));
 				file.APPEND_CONST(".p");
-				PC->request->use(file.cstr());
+				PC->request->use_file(file.cstr());
 			}
 		} else if(command==BASE_NAME) {
-			if(PC->vclass->base()!=&PC->request->root_class) { // already changed from default?
+			if(PC->cclass->base()!=&PC->request->root_class) { // already changed from default?
 				strcpy(PC->error, "class already have a base '");
-				strncat(PC->error, PC->vclass->base()->name().cstr(), 100);
+				strncat(PC->error, PC->cclass->base()->name().cstr(), 100);
 				strcat(PC->error, "'");
 				YYERROR;
 			}
@@ -159,7 +173,7 @@ control_method: '@' STRING '\n'
 					strcat(PC->error, ": undefined class in @"BASE_NAME);
 					YYERROR;
 				}
-				PC->vclass->set_base(*base);
+				PC->cclass->set_base(*base);
 			} else {
 				strcpy(PC->error, "@"BASE_NAME" must contain sole name");
 				YYERROR;
@@ -201,7 +215,7 @@ code_method: '@' STRING bracketed_maybe_
 		0, 0/*min,max numbered_params_count*/, 
 		params_names, locals_names, 
 		$7, 0);
-	PC->vclass->add_method(*name, method);
+	PC->cclass->add_method(*name, method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -215,10 +229,7 @@ maybe_comment: empty | STRING;
 
 maybe_codes: empty | codes;
 
-codes: code | codes code { 
-	$$=$1; 
-	P($$, $2);
-};
+codes: code | codes code { $$=$1; P($$, $2) };
 code: write_string | action;
 action: get | put | with | call;
 
@@ -296,7 +307,7 @@ construct_by_code: '[' any_constructor_c
 	O($$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
 ;
-construct_by_expr: '(' any_expr ')' { 
+construct_by_expr: '(' expr_value ')' { 
 	$$=$2; /* stack: context, name, value */
 	O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
@@ -365,7 +376,7 @@ store_expr_param_part: write_expr_value
 	$$=N(POOL); 
 	PCA($$, $1);
 };
-write_expr_value: any_expr {
+write_expr_value: expr_value {
 	$$=$1;
 	O($$, OP_WRITE);
 };
@@ -440,10 +451,6 @@ with: '$' name_without_curly_rdive '{' c
 
 /* expr */
 
-any_expr:
-	empty_double_value /* optimized $var() case */
-|	expr_value /* $var(something) */
-;
 expr_value: expr {
 	if(($$=$1)->size()==2) // only one string literal in there?
 		change_string_literal_to_double_literal($$); // make that string literal Double
@@ -501,7 +508,6 @@ write_string: STRING {
 	change_string_literal_to_write_string_literal($$=$1)
 };
 
-empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL, 0)) };
 empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
@@ -536,8 +542,8 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 		return result;
 	}
 	
-	char *begin=PC->source;
-	char *end;
+	const char *begin=PC->source;
+	const char *end;
 	int begin_line=PC->line;
 	int skip_analized=0;
 	while(true) {