--- parser3/src/main/compile.y	2001/02/22 14:45:27	1.21
+++ parser3/src/main/compile.y	2001/02/23 12:03:51	1.26
@@ -1,3 +1,7 @@
+/*
+  $Id: compile.y,v 1.26 2001/02/23 12:03:51 paf Exp $
+*/
+
 %{
 #define YYSTYPE  Array/*<op>*/ *
 #define YYPARSE_PARAM  pc
@@ -22,7 +26,9 @@ 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
@@ -35,11 +41,11 @@ int yylex(YYSTYPE *lvalp, void *pc);
 
 all:
 	one_big_piece {
-	String& name_main=*new(pool) String(pool);
+	String& name_main=*NEW String(POOL);
 	name_main.APPEND_CONST(MAIN_METHOD_NAME);
-	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);
+	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;
@@ -52,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;
 };
 
@@ -95,16 +101,22 @@ any_name: name_without_curly_rdive EON |
 name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 };
 name_without_curly_rdive: name_without_curly_rdive_read | name_without_curly_rdive_root;
 name_without_curly_rdive_read: name_without_curly_rdive_code {
-/*
-	TODO: подсмотреть в $1, и если там первым элементом self,
-		то выкинуть его и делать не OP_WITH_READ, а WITH_SELF
-		*/
-	$$=N(pool); 
-	OP($$, OP_WITH_READ); /* stack: starting context */
-	P($$, $1); /* diving code; stack: current context */
+	$$=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); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: current context */
 };
@@ -115,7 +127,7 @@ name_without_curly_rdive_code: name_adva
 put: '$' name_expr_dive '(' constructor_value ')' {
 /*
 	TODO: подсмотреть в $3, и если там первым элементом self,
-		то выкинуть его и делать не OP_WITH_OP_WRITE, а WITH_SELF
+		то выкинуть его и делать не WITH_WRITE, а WITH_SELF
 		если ничего не осталось - $self(xxx)
 			обругать
 */
@@ -125,12 +137,22 @@ put: '$' name_expr_dive '(' constructor_
 };
 name_expr_dive: name_expr_dive_write | name_expr_dive_root;
 name_expr_dive_write: name_expr_dive_code {
-	$$=N(pool); 
-	OP($$, OP_WITH_WRITE); /* stack: starting context */
-	P($$, $1); /* diving code; stack: context,name */
+	$$=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); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,name */
 };
@@ -140,12 +162,12 @@ constructor_value:
 |	constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
 ;
 constructor_one_param_value: 
-	empty /* optimized $var() case */
+	empty_value /* optimized $var() case */
 |	STRING /* optimized $var(STRING) case */
 |	complex_constructor_param_value /* $var(something complex) */
 ;
 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() */
@@ -156,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]) {
@@ -192,7 +214,7 @@ call: '^' name_expr_dive store_params EO
 			иначе  // ^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 */
@@ -209,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);
@@ -244,7 +266,7 @@ 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);
@@ -253,12 +275,12 @@ name_expr_with_subvar_value: STRING subv
 };
 subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root;
 subvar_ref_name_rdive_read: STRING {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_READ);
 	P($$, $1);
 };
 subvar_ref_name_rdive_root: ':' STRING {
-	$$=N(pool); 
+	$$=N(POOL); 
 	OP($$, OP_WITH_ROOT);
 	P($$, $2);
 };
@@ -301,7 +323,10 @@ write_str_literal: STRING {
 
 /* */
 
-empty: /* empty */ { $$=N(pool) };
+empty_value: empty {
+	$$=L(NEW VString(POOL));
+};
+empty: /* empty */ { $$=N(POOL) };
 
 %%
 
@@ -634,9 +659,9 @@ break2:
 		// append last piece
 		PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
 		// create STRING value: array of OP_VALUE+vstring
-		*lvalp=L(new(pool) VString(PC->string));
+		*lvalp=L(NEW VString(PC->string));
 		// new pieces storage
-		PC->string=new(pool) String(pool);
+		PC->string=NEW String(POOL);
 		// go!
 		return STRING;
 	}