--- parser3/src/main/compile.y	2001/03/08 17:59:29	1.79.2.1
+++ parser3/src/main/compile.y	2001/03/12 21:54:20	1.93
@@ -1,9 +1,24 @@
 /*
-  $Id: compile.y,v 1.79.2.1 2001/03/08 17:59:29 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.93 2001/03/12 21:54:20 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
@@ -20,9 +35,10 @@
 #include "pa_request.h"
 #include "pa_vobject.h"
 #include "pa_vdouble.h"
+#include "core.h"
 
-#define SELF_NAME "self"
-#define USE_NAME "USE"
+#define SELF_ELEMENT_NAME "self"
+#define USE_CONTROL_METHOD_NAME "use"
 
 int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -85,17 +101,14 @@ int yylex(YYSTYPE *lvalp, void *pc);
 %left NEG     /* negation: unary - */
 
 %%
-
-all: /* TODO: у ^execute непременно задать какой-то name, см. 'RUN' */
+all:
 	one_big_piece {
-	String& MAIN=*NEW String(POOL);
-	MAIN.APPEND_CONST(MAIN_METHOD_NAME);
 	Method& method=*NEW Method(POOL, 
-		MAIN, 
-		0, /*numbered_params_count*/
+		*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);
+	PC->cclass->add_method(*main_method_name, method);
 }
 |	methods;
 
@@ -106,7 +119,7 @@ method: control_method | code_method;
 
 control_method: '@' STRING '\n' 
 				control_strings {
-	String& command=*SLA2S($2);
+	const String& command=*SLA2S($2);
 	YYSTYPE strings_code=$4;
 	if(strings_code->size()<1*2) {
 		strcpy(PC->error, "@");
@@ -115,42 +128,44 @@ 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;
 		}
 		if(strings_code->size()==1*2) {
 			// new class' name
-			String *name=SLA2S(strings_code);
+			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;
 		}
 	} else {
-		if(command==USE_NAME) {
+		if(command==USE_CONTROL_METHOD_NAME) {
 			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(), 0);
+				String file(*SLA2S(strings_code, i));
+				file.APPEND_CONST(".p");
+				PC->request->use_file(file.cstr());
 			}
 		} else if(command==BASE_NAME) {
-			if(PC->vclass->base()!=&PC->request->root_class) { // already changed from default?
-				strcpy(PC->error, "there must be only one @"BASE_NAME);
+			if(PC->cclass->base()!=&PC->request->root_class) { // already changed from default?
+				strcpy(PC->error, "class already have a base '");
+				strncat(PC->error, PC->cclass->base()->name().cstr(), 100);
+				strcat(PC->error, "'");
 				YYERROR;
 			}
 			if(strings_code->size()==1*2) {
 				// TODO: преодолеть self и циклические base
-				String& base_name=*SLA2S(strings_code);
+				const String& base_name=*SLA2S(strings_code);
 				VClass *base=static_cast<VClass *>(
 					PC->request->classes().get(base_name));
 				if(!base) {
@@ -158,15 +173,16 @@ 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;
 			}
 		} else {
-			strcpy(PC->error, command.cstr());
-			strcat(PC->error, ": invalid special name. valid names are "
-				CLASS_NAME", "USE_NAME" and "BASE_NAME);
+			strcpy(PC->error, "'");
+			strncat(PC->error, command.cstr(), MAX_STRING/2);
+			strcat(PC->error, "' invalid special name. valid names are "
+				"'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'");
 			YYERROR;
 		}
 	}
@@ -197,10 +213,10 @@ code_method: '@' STRING bracketed_maybe_
 
 	Method& method=*NEW Method(POOL, 
 		*name, 
-		0/*numbered_params_count*/, 
+		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;
@@ -214,11 +230,8 @@ maybe_comment: empty | STRING;
 
 maybe_codes: empty | codes;
 
-codes: code | codes code { 
-	$$=$1; 
-	P($$, $2);
-};
-code: write_str_literal | action;
+codes: code | codes code { $$=$1; P($$, $2) };
+code: write_string | action;
 action: get | put | with | call;
 
 /* get */
@@ -237,8 +250,8 @@ name_without_curly_rdive:
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=N(POOL); 
 	Array *diving_code=$1;
-	String *first_name=SLA2S(diving_code);
-	if(first_name && *first_name==SELF_NAME) {
+	const String *first_name=SLA2S(diving_code);
+	if(first_name && *first_name==SELF_ELEMENT_NAME) {
 		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
 			/* skip over... */
@@ -259,10 +272,9 @@ name_without_curly_rdive_code: name_adva
 
 /* put */
 
-put: '$' name_expr_wdive constructor_value {
+put: '$' name_expr_wdive construct {
 	$$=$2; /* stack: context,name */
 	P($$, $3); /* stack: context,name,constructor_value */
-	O($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 };
 name_expr_wdive: 
 	name_expr_wdive_write
@@ -271,8 +283,8 @@ name_expr_wdive:
 name_expr_wdive_write: name_expr_dive_code {
 	$$=N(POOL);
 	Array *diving_code=$1;
-	String *first_name=SLA2S(diving_code);
-	if(first_name && *first_name==SELF_NAME) {
+	const String *first_name=SLA2S(diving_code);
+	if(first_name && *first_name==SELF_ELEMENT_NAME) {
 		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
 			/* skip over... */
@@ -290,9 +302,16 @@ name_expr_wdive_root: ':' name_expr_dive
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
-constructor_value: 
-	'[' any_constructor_code_value ']' { $$=$2 }
-|	'(' any_expr ')' { $$=$2 }
+construct: construct_by_code | construct_by_expr;
+construct_by_code: '[' any_constructor_code_value ']' {
+	$$=$2; /* stack: context, name, value */
+	O($$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+}
+;
+construct_by_expr: '(' expr_value ')' { 
+	$$=$2; /* stack: context, name, value */
+	O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+}
 ;
 any_constructor_code_value: 
 	empty_string_value /* optimized $var[] case */
@@ -358,7 +377,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);
 };
@@ -433,14 +452,9 @@ with: '$' name_without_curly_rdive '{' c
 
 /* expr */
 
-any_expr:
-	empty_double_value /* optimized $var() case */
-|	optimized_expr /* $var(something) */
-;
-optimized_expr: expr {
-	if(($$=$1)->size()==2) { // only one string literal in there?
+expr_value: expr {
+	if(($$=$1)->size()==2) // only one string literal in there?
 		change_string_literal_to_double_literal($$); // make that string literal Double
-	}
 };
 expr: 
 	STRING
@@ -490,13 +504,12 @@ string_inside_quotes_value: maybe_codes
 
 /* basics */
 
-write_str_literal: STRING {
-	$$=$1;
-	O($$, OP_WRITE);
+write_string: STRING {
+	// optimized from OP_STRING+OP_WRITE to OP_STRING__WRITE
+	change_string_literal_to_write_string_literal($$=$1)
 };
 
-empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL, 0)) };
-empty_string_value: /* empty */ { $$=VL(NEW VString()) };
+empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -530,8 +543,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) {
@@ -763,9 +776,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			if(PC->ls==LS_EXPRESSION_VAR_NAME) {
 				// name in expr ends also before binary operators 
 				switch(c) {
-				case '+': case '-': case '*': case '/': case '%': 
-				case '&': case '|': 
-				case '<': case '>': case '=': case '!':
+				case '-': 
 					pop_LS(PC);
 					PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 					result=EON;
@@ -777,6 +788,10 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			case ' ': case '\t': case '\n':
 			case ';':
 			case ']': case '}': case ')': case '"':
+			case '<': case '>':  // these stand for HTML brackets and expression binary ops
+			case '+': case '*': case '/': case '%': 
+			case '&': case '|': 
+			case '=': case '!':
 				pop_LS(PC);
 				PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 				result=EON;