--- parser3/src/main/compile.y	2001/02/21 15:00:02	1.10
+++ parser3/src/main/compile.y	2001/02/23 09:43:14	1.25
@@ -1,3 +1,7 @@
+/*
+  $Id: compile.y,v 1.25 2001/02/23 09:43:14 paf Exp $
+*/
+
 %{
 #define YYSTYPE  Array/*<op>*/ *
 #define YYPARSE_PARAM  pc
@@ -13,6 +17,7 @@
 
 #include "compile_tools.h"
 #include "pa_value.h"
+#include "pa_request.h"
 
 int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -21,12 +26,14 @@ int yylex(YYSTYPE *lvalp, void *pc);
 
 // local convinient inplace typecast & var
 #define PC  ((parse_control *)pc)
-#define pool  *PC->pool
+#define POOL  *PC->pool
+#undef NEW
+#define NEW new(POOL)
 %}
 
 %pure_parser
 
-%token END_OF_NAME
+%token EON
 %token STRING
 %token BOGUS
 
@@ -34,11 +41,11 @@ int yylex(YYSTYPE *lvalp, void *pc);
 
 all:
 	one_big_piece {
-	String& name_main=*new(pool) String(pool);
-	name_main.APPEND_CONST("main");
-	Array& param_names=*new(pool) Array(pool);
-	Array& local_names=*new(pool) Array(pool);
-	Method *method=new(pool) Method(pool, name_main, param_names, local_names, *$1);
+	String& name_main=*NEW String(POOL);
+	name_main.APPEND_CONST(MAIN_METHOD_NAME);
+	Array& param_names=*NEW Array(POOL);
+	Array& local_names=*NEW Array(POOL);
+	Method *method=NEW Method(POOL, name_main, param_names, local_names, *$1);
 	*PC->methods+=method;
 }
 |	methods;
@@ -51,16 +58,16 @@ method: '@' STRING bracketed_maybe_strin
 	const String *name=LA2S($2);
 
 	YYSTYPE params_names_code=$3;
-	Array& params_names=*new(pool) Array(pool);
+	Array& params_names=*NEW Array(POOL);
 	for(int i=0; i<params_names_code->size(); i+=2)
 		params_names+=LA2S(params_names_code, i);
 
 	YYSTYPE locals_names_code=$4;
-	Array& locals_names=*new(pool) Array(pool);
+	Array& locals_names=*NEW Array(POOL);
 	for(int i=0; i<locals_names_code->size(); i+=2)
 		locals_names+=LA2S(locals_names_code, i);
 
-	Method *method=new(pool) Method(pool, *name, params_names, locals_names, *$7);
+	Method *method=NEW Method(POOL, *name, params_names, locals_names, *$7);
 	*PC->methods+=method;
 };
 
@@ -89,50 +96,78 @@ get: '$' any_name {
 	OP($$, OP_WRITE); /* value=pop; write(value) */
 };
 
-any_name: name_without_curly_rdive END_OF_NAME | name_in_curly_rdive;
+any_name: name_without_curly_rdive EON | name_in_curly_rdive;
 
 name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 };
-name_without_curly_rdive: name_rdive {
- 	/* 
-	TODO: подсмотреть в $1, и если там в первом элементе первая буква ":"
-		то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT
-	TODO: подсмотреть в $1, и если там первым элементом self,
-		то выкинуть его и делать не OP_WITH_READ, а WITH_SELF
-	*/ 
-	$$=N(pool); OP($$, OP_WITH_READ); /* stack: starting context */
-	P($$, $1); /* diving code; stack: current context */
+name_without_curly_rdive: name_without_curly_rdive_read | name_without_curly_rdive_root;
+name_without_curly_rdive_read: name_without_curly_rdive_code {
+	$$=N(POOL); 
+	Array *diving_code=$1;
+	String *first_name=LA2S(diving_code);
+	if(first_name && *first_name==SELF_NAME) {
+		OP($$, OP_WITH_SELF); /* stack: starting context */
+		P($$, diving_code, 
+			/* skip over... */
+			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
+	} else {
+		OP($$, OP_WITH_READ); /* stack: starting context */
+		P($$, diving_code);
+	}
+	/* diving code; stack: current context */
+};
+name_without_curly_rdive_root: ':' name_without_curly_rdive_code {
+	$$=N(POOL); 
+	OP($$, OP_WITH_ROOT); /* stack: starting context */
+	P($$, $2); /* diving code; stack: current context */
 };
-name_rdive: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) };
+name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) };
 
 /* put */
 
 put: '$' name_expr_dive '(' constructor_value ')' {
 /*
-	TODO: подсмотреть в $3, и если там в первом элементе первая буква ":"
-		то выкинуть её и делать не OP_WITH_OP_WRITE, а WITH_ROOT
 	TODO: подсмотреть в $3, и если там первым элементом self,
-		то выкинуть его и делать не OP_WITH_OP_WRITE, а WITH_SELF
+		то выкинуть его и делать не WITH_WRITE, а WITH_SELF
 		если ничего не осталось - $self(xxx)
 			обругать
 */
-	$$=N(pool); 
-	OP($$, OP_WITH_WRITE); /* stack: starting context */
-	P($$, $2); /* diving code; stack: context,name */
+	$$=$2; /* stack: context,name */
 	P($$, $4); /* stack: context,name,constructor_value */
 	OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 };
+name_expr_dive: name_expr_dive_write | name_expr_dive_root;
+name_expr_dive_write: name_expr_dive_code {
+	$$=N(POOL); 
+	Array *diving_code=$1;
+	String *first_name=LA2S(diving_code);
+	if(first_name && *first_name==SELF_NAME) {
+		OP($$, OP_WITH_SELF); /* stack: starting context */
+		P($$, diving_code, 
+			/* skip over... */
+			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
+	} else {
+		OP($$, OP_WITH_WRITE); /* stack: starting context */
+		P($$, diving_code);
+	}
+	/* diving code; stack: current context */
+};
+name_expr_dive_root: ':' name_expr_dive_code {
+	$$=N(POOL); 
+	OP($$, OP_WITH_ROOT); /* stack: starting context */
+	P($$, $2); /* diving code; stack: context,name */
+};
+
 constructor_value: 
 	constructor_one_param_value
 |	constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
 ;
 constructor_one_param_value: 
-	empty_value /* optimized $var() case */
+	empty /* optimized $var() case */
 |	STRING /* optimized $var(STRING) case */
 |	complex_constructor_param_value /* $var(something complex) */
 ;
-empty_value: empty;
 complex_constructor_param_value: complex_constructor_param_body {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */
 	P($$, $1); /* some codes to that context */
 	OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
@@ -143,7 +178,7 @@ complex_constructor_param_body:
 ;
 constructor_two_params_value: STRING ';' constructor_one_param_value {
 	char *operator_or_fmt=LA2S($1)->cstr();
-	$$=N(pool);
+	$$=N(POOL);
 	P($$, $1); /* stack: ncontext name operator_or_fmt */
 	P($$, $3); /* stack: ncontext name operator_or_fmt expr */
 	switch(operator_or_fmt[0]) {
@@ -163,7 +198,7 @@ constructor_two_params_value: STRING ';'
 
 /* call */
 
-call: '^' name_expr_dive store_params END_OF_NAME { /* ^field.$method{vasya} */
+call: '^' name_expr_dive store_params EON { /* ^field.$method{vasya} */
 /*
 	TODO: подсмотреть в $3, и если там в первом элементе первая буква ":"
 		то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT
@@ -179,7 +214,7 @@ call: '^' name_expr_dive store_params EN
 			иначе  // ^result(value)
 				обругать безобразие
 */
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_READ); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,method_name */
 	OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
@@ -196,7 +231,7 @@ store_param_part: constructor_one_param_
 	OP($$, OP_STORE_PARAM);
 }
 store_curly_param: '{' maybe_codes '}' {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_CODE_ARRAY);
 	AA($$, $2);
 	OP($$, OP_CREATE_JUNCTION);
@@ -205,7 +240,7 @@ store_curly_param: '{' maybe_codes '}' {
 
 /* name */
 
-name_expr_dive: name_expr_value | name_path name_expr_value { $$=$1; P($$, $2) };
+name_expr_dive_code: name_expr_value | name_path name_expr_value { $$=$1; P($$, $2) };
 
 name_path: name_step | name_path name_step { $$=$1; P($$, $2) };
 name_step: name_advance1 '.';
@@ -231,21 +266,24 @@ name_expr_subvar_value: '$' subvar_ref_n
 	OP($$, OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_CREATE_EWPOOL);
 	P($$, $1);
 	OP($$, OP_WRITE);
 	P($$, $2);
 	OP($$, OP_REDUCE_EWPOOL);
 };
-subvar_ref_name_rdive: STRING {
-/*
-	TODO: подсмотреть в $1, и если там в первом элементе первая буква ":"
-		то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT
-*/
-	$$=N(pool); OP($$, OP_WITH_READ);
+subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root;
+subvar_ref_name_rdive_read: STRING {
+	$$=N(POOL); 
+	OP($$, OP_WITH_READ);
 	P($$, $1);
 };
+subvar_ref_name_rdive_root: ':' STRING {
+	$$=N(POOL); 
+	OP($$, OP_WITH_ROOT);
+	P($$, $2);
+};
 subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) };
 subvar__get_write: '$' subvar_ref_name_rdive {
 	$$=$2;
@@ -285,7 +323,7 @@ write_str_literal: STRING {
 
 /* */
 
-empty: /* empty */ { $$=N(pool) };
+empty: /* empty */ { $$=N(POOL) };
 
 %%
 
@@ -429,14 +467,18 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				c==')' || c=='}') {
 				pop_LS(PC);
 				PC->source--;	PC->col--;
-				result=END_OF_NAME;
+				result=EON;
 				goto break2;
 			}
-			if(begin==end && c=='{') { /* ${name}, no need of END_OF_NAME, switching LS */
+			if(begin==end && c=='{') { /* ${name}, no need of EON, switching LS */
 				PC->ls=LS_VAR_NAME_CURLY; 
 				result=c;
 				goto break2;
 			}
+			if(c==':') {
+				result=c;
+				goto break2;
+			}
 			if(c=='(') {
 				PC->ls=LS_VAR_ROUND;
 				lexical_brackets_nestage=1;
@@ -455,6 +497,10 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			}
 			break;
 		case LS_VAR_NAME_CURLY:
+			if(c==':') {
+				result=c;
+				goto break2;
+			}
 			if(c=='}') {  /* ${name} finished, restoring LS */
 				pop_LS(PC);
 				result=c;
@@ -589,12 +635,12 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			}					   
 			pop_LS(PC);
 			PC->source--;  PC->col--;
-			result=END_OF_NAME;
+			result=EON;
 			goto break2;
 		}
 		if(c==0) {
 			result=-1;
-			PC->source--;  PC->col--;
+//			PC->source--;  PC->col--;
 			break;
 		}
 	}
@@ -609,10 +655,10 @@ break2:
 			end--;
 		// append last piece
 		PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
-		// create STRING value: array of OP_STRING+string
-		*lvalp=L(PC->string);
+		// create STRING value: array of OP_VALUE+vstring
+		*lvalp=L(NEW VString(PC->string));
 		// new pieces storage
-		PC->string=new(pool) String(pool);
+		PC->string=NEW String(POOL);
 		// go!
 		return STRING;
 	}
@@ -620,7 +666,7 @@ break2:
 
 int real_yyerror(parse_control *pc, char *s)  /* Called by yyparse on error */
      {
-       fprintf(stderr, "[%s]\n", s);
+       //fprintf(stderr, "[%s]\n", s);
 
 	   s[MAX_STRING-1]=0; strcpy(pc->error, s);
 	   return 1;