--- parser3/src/main/compile.y	2002/02/07 11:16:28	1.179
+++ parser3/src/main/compile.y	2002/08/12 14:21:51	1.188
@@ -5,7 +5,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.179 2002/02/07 11:16:28 paf Exp $
+	$Id: compile.y,v 1.188 2002/08/12 14:21:51 paf Exp $
 */
 
 /**
@@ -107,12 +107,12 @@ static int yylex(YYSTYPE *lvalp, void *p
 all: 
 	one_big_piece {
 	Method& method=*NEW Method(POOL, 
-		*main_method_name, 
+		PC.request->main_method_name, 
 		Method::CT_ANY,
 		0, 0, /*min, max numbered_params_count*/
 		0/*param_names*/, 0/*local_names*/, 
 		$1/*parser_code*/, 0/*native_code*/);
-	PC.cclass->add_method(*main_method_name, method);
+	PC.cclass->add_method(PC.request->main_method_name, method);
 }
 |	methods;
 
@@ -132,7 +132,7 @@ control_method: '@' STRING '\n'
 		YYERROR;
 	}
 	if(command==CLASS_NAME) {
-		if(PC.cclass->base()) { // already changed from default?
+		if(PC.cclass->base_class()) { // already changed from default?
 			strcpy(PC.error, "class already have a name '");
 			strncat(PC.error, PC.cclass->name().cstr(), 100);
 			strcat(PC.error, "'");
@@ -154,9 +154,9 @@ control_method: '@' STRING '\n'
 		for(int i=0; i<strings_code->size(); i+=2) 
 			PC.request->use_file(*LA2S(strings_code, i));
 	} else if(command==BASE_NAME) {
-		if(PC.cclass->base()) { // already changed from default?
+		if(PC.cclass->base_class()) { // already changed from default?
 			strcpy(PC.error, "class already have a base '");
-			strncat(PC.error, PC.cclass->base()->name().cstr(), 100);
+			strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100);
 			strcat(PC.error, "'");
 			YYERROR;
 		}
@@ -239,8 +239,11 @@ action: get | put | call;
 /* get */
 
 get: get_value {
-	$$=$1; /* stack: resulting value */
-	O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+	$$=$1; /* stack: resulting value */ 
+	changetail_or_append($$, 
+		OP_GET_ELEMENT, false,  /*->*/OP_GET_ELEMENT__WRITE,
+		/*or */OP_WRITE_VALUE
+		); /* value=pop; wcontext.write(value) */
 };
 get_value: '$' get_name_value { $$=$2 };
 get_name_value: name_without_curly_rdive EON | name_in_curly_rdive;
@@ -264,7 +267,7 @@ name_without_curly_rdive_read: name_with
 
 		// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
 		// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR.
-		if(diving_code->size()==3)
+		if(PC.in_call_value && diving_code->size()==3)
 			diving_code->put_int(2, OP_GET_ELEMENT_OR_OPERATOR);
 		P($$, diving_code);
 	}
@@ -319,15 +322,17 @@ construct_square: '[' any_constructor_co
 }
 ;
 construct_round: '(' expr_value ')' { 
+	$$=N(POOL); 
+	O($$, OP_PREPARE_TO_EXPRESSION);
 	// stack: context, name
-	$$=$2; // stack: context, name, value
+	P($$, $2); // stack: context, name, value
 	O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
 }
 ;
 construct_curly: '{' maybe_codes '}' {
 	// stack: context, name
 	$$=N(POOL); 
-	CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
+	OA($$, OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
 };
 
 any_constructor_code_value: 
@@ -337,9 +342,9 @@ any_constructor_code_value:
 ;
 constructor_code_value: constructor_code {
 	$$=N(POOL); 
-	O($$, OP_CREATE_EWPOOL); /* stack: empty write context */
-	P($$, $1); /* some code that writes to that context */
-	O($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
+	OA($$, OP_OBJECT_POOL, $1); /* stack: empty write context */
+	/* some code that writes to that context */
+	/* context=pop; stack: context.value() */
 };
 constructor_code: codes__excluding_sole_str_literal;
 codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) };
@@ -348,26 +353,27 @@ codes__excluding_sole_str_literal: actio
 
 call: call_value {
 	$$=$1; /* stack: value */
-	O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+	changetail_or_append($$, 
+		OP_CALL, true,  /*->*/ OP_CALL__WRITE,
+		/*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 };
 call_value: '^' { 
-					PC.object_constructor_allowed=true; 
+					PC.in_call_value=true; 
 			}
 			call_name {
-				PC.object_constructor_allowed=false;
+				PC.in_call_value=false;
 			} 
 			store_params EON { /* ^field.$method{vasya} */
 	$$=$3; /* with_xxx,diving code; stack: context,method_junction */
-	O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
 
 	YYSTYPE params_code=$5;
-	if(params_code->size()==3) // probably [] case. [OP_VALUE + Void + STORE_PARAM]
+	if(params_code->size()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM]
 		if(Value *value=LA2V(params_code)) // it is OP_VALUE + value?
 			if(!value->is_defined()) // value is VVoid?
 				params_code=0; // ^zzz[] case. don't append lone empty param.
-	if(params_code)
-		P($$, params_code); // filling method_frame.store_params
-	O($$, OP_CALL); // method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value
+	}
+	/* stack: context, method_junction */
+	OA($$, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
 };
 
 call_name: name_without_curly_rdive;
@@ -399,11 +405,11 @@ store_code_param_part: code_param_value
 };
 store_expr_param_part: write_expr_value {
 	$$=N(POOL); 
-	PEA($$, $1);
+	OA($$, OP_EXPR_CODE__STORE_PARAM, $1);
 };
 store_curly_param_part: maybe_codes {
 	$$=N(POOL); 
-	PCA($$, $1);
+	OA($$, OP_CURLY_CODE__STORE_PARAM, $1);
 };
 code_param_value:
 	void_value /* optimized [;...] case */
@@ -411,7 +417,9 @@ code_param_value:
 |	constructor_code_value /* [something complex] */
 ;
 write_expr_value: expr_value {
-	$$=$1;
+	$$=N(POOL); 
+	O($$, OP_PREPARE_TO_EXPRESSION);
+	P($$, $1);
 	O($$, OP_WRITE_EXPR_RESULT);
 };
 
@@ -447,18 +455,19 @@ name_expr_subvar_value: '$' subvar_ref_n
 	O($$, OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
+	Array *code;
+	{
+		change_string_literal_to_write_string_literal(code=$1);
+		P(code, $2);
+	}
 	$$=N(POOL); 
-	O($$, OP_CREATE_EWPOOL);
-	P($$, $1);
-	O($$, OP_WRITE_VALUE);
-	P($$, $2);
-	O($$, OP_REDUCE_EWPOOL);
+	OA($$, OP_STRING_POOL, code);
 };
 name_square_code_value: '[' codes ']' {
 	$$=N(POOL); 
-	O($$, OP_CREATE_EWPOOL);
-	P($$, $2);
-	O($$, OP_REDUCE_EWPOOL);
+	OA($$, OP_OBJECT_POOL, $2); /* stack: empty write context */
+	/* some code that writes to that context */
+	/* context=pop; stack: context.value() */
 };
 subvar_ref_name_rdive: STRING {
 	$$=N(POOL); 
@@ -481,7 +490,7 @@ class_static_prefix: STRING ':' {
 };
 class_constructor_prefix: class_static_prefix ':' {
 	$$=$1;
-	if(!PC.object_constructor_allowed) {
+	if(!PC.in_call_value) {
 		strcpy(PC.error, ":: not allowed here");
 		YYERROR;
 	}
@@ -492,6 +501,7 @@ class_constructor_prefix: class_static_p
 /* expr */
 
 expr_value: expr {
+	// see OP_PREPARE_TO_EXPRESSION!!
 	if(($$=$1)->size()==2) // only one string literal in there?
 		change_string_literal_to_double_literal($$); // make that string literal Double
 };
@@ -521,8 +531,8 @@ expr:
 |	expr '&' expr { $$=$1; 	P($$, $3);  O($$, OP_BIN_AND) }
 |	expr '|' expr { $$=$1;  P($$, $3);  O($$, OP_BIN_OR) }
 |	expr '#' expr { $$=$1;  P($$, $3);  O($$, OP_BIN_XOR) }
-|	expr "&&" expr { $$=$1;  PNC($$, $3);  O($$, OP_LOG_AND) }
-|	expr "||" expr { $$=$1;  PNC($$, $3);  O($$, OP_LOG_OR) }
+|	expr "&&" expr { $$=$1;  OA($$, OP_NESTED_CODE, $3);  O($$, OP_LOG_AND) }
+|	expr "||" expr { $$=$1;  OA($$, OP_NESTED_CODE, $3);  O($$, OP_LOG_OR) }
 |	expr "##" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_XOR) }
 |	expr '<' expr { $$=$1;  P($$, $3);  O($$, OP_NUM_LT) }
 |	expr '>' expr { $$=$1;  P($$, $3);  O($$, OP_NUM_GT) }
@@ -541,9 +551,9 @@ expr:
 
 string_inside_quotes_value: maybe_codes {
 	$$=N(POOL);
-	O($$, OP_CREATE_SWPOOL); /* stack: empty write context */
-	P($$, $1); /* some code that writes to that context */
-	O($$, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() */
+	OA($$, OP_STRING_POOL, $1); /* stack: empty write context */
+	/* some code that writes to that context */
+	/* context=pop; stack: context.get_string() */
 };
 
 /* basics */
@@ -943,9 +953,12 @@ default:
 			if(
 				PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON ||
 				PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {
-				// name in expr ends also before binary operators 
+				// name in expr ends also before 
 				switch(c) {
+				// expression minus
 				case '-': 
+				// expression integer division
+				case '\\':
 					pop_LS(PC);
 					PC.source--;  if(--PC.col<0) { PC.line--;  PC.col=-1; }
 					result=EON;