--- parser3/src/main/compile.y	2009/05/19 08:47:20	1.238
+++ parser3/src/main/compile.y	2009/06/04 09:31:37	1.245
@@ -2,10 +2,10 @@
 /** @file
 	Parser: compiler(lexical parser and grammar).
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.238 2009/05/19 08:47:20 misha Exp $
+	$Id: compile.y,v 1.245 2009/06/04 09:31:37 misha Exp $
 */
 
 /**
@@ -319,30 +319,35 @@ action: get | put | call;
 get: get_value {
 	$$=N();
 	YYSTYPE code=$1;
+
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	if(!replace_top_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE))
+	if(!maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE))
 #endif
-		{
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD
-			size_t count=code->count();
-			if(
-#ifdef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS
-				count==6
-#else
-				count==7
+
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+	if(!maybe_change_first_opcode(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE))
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+		if(
+			code->count()!=5
+			|| !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE)
+		)
 #endif
-				&& (*code)[count-1].code==OP::OP_GET_ELEMENT
-				&& replace_top_opcode(*code, OP::OP_GET_ELEMENT_FIELD, /*=>*/OP::OP_GET_ELEMENT_FIELD__WRITE)
-			){
-				//P(*$$, *code, 0/*offset*/, count-1/*limit*/); // someday skip last OP_GET_ELEMENT
-				//break;
-			} else
-#endif
-				changetail_or_append(*code, 
-					OP::OP_GET_ELEMENT, false,  /*=>*/OP::OP_GET_ELEMENT__WRITE,
-					/*or */OP::OP_WRITE_VALUE
-					); /* value=pop; wcontext.write(value) */
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+		if(
+			code->count()!=5
+			|| !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE)
+		)
+#endif
+		{
+			changetail_or_append(*code, 
+				OP::OP_GET_ELEMENT, false,  /*=>*/OP::OP_GET_ELEMENT__WRITE,
+				/*or */OP::OP_WRITE_VALUE
+				); /* value=pop; wcontext.write(value) */
 		}
+
 	P(*$$, *code);
 };
 get_value: '$' get_name_value { $$=$2 };
@@ -355,56 +360,58 @@ name_without_curly_rdive_read: name_with
 	$$=N(); 
 	YYSTYPE diving_code=$1;
 	const String* first_name=LA2S(*diving_code);
+	size_t count=diving_code->count();
 	// self.xxx... => xxx...
 	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
-		O(*$$, OP::OP_WITH_SELF); /* stack: starting context */
-		P(*$$, *diving_code, 
-			/* skip over... */
-			diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
-	} else {
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-		size_t count=diving_code->count();
-		if(count==4){ // optimization
-			O(*$$,
-				(PC.in_call_value)
-				? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // ^object[ : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string
-				: OP::OP_VALUE__GET_ELEMENT             // $object  : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT+origin+string
-			);
-			P(*$$, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
-		}
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD
-		else if(
-			count==8
-			&& (*diving_code)[7].code==OP::OP_GET_ELEMENT
-			&& replace_top_opcode(*diving_code, OP::OP_VALUE, /*=>*/OP::OP_GET_ELEMENT_FIELD)
-		){
-			// optimisation for ^object.method[ + $object.field
-			// OP_VALUE+origin+value+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT => OP_GET_ELEMENT_FIELD+origin+value+OP_VALUE+origin+value+OP_GET_ELEMENT
-			//         OP_VALUE+origin+value+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT
-			// offset  0        1      2     3              4        5      6     7
-			P(*$$, *diving_code, 0/*offset*/, 3/*limit*/); // copy OP_GET_ELEMENT_FIELD+origin+value (skip first OP_GET_ELEMENT)
-#ifdef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS
-			P(*$$, *diving_code, 5/*offset*/, 3/*limit*/); // copy origin+value+OP_GET_ELEMENT (last one is important!)
-#else
-			P(*$$, *diving_code, 4/*offset*/, 4/*limit*/); // copy OP_VALUE+origin+value+OP_GET_ELEMENT (last one is important!)
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+		if(maybe_make_with_self_get_element(*$$, *diving_code, count)){
+			// optimization for $self.field and ^self.method
+		} else
 #endif
-		}
+			{
+				O(*$$, OP::OP_WITH_SELF); /* stack: starting context */
+				P(*$$, *diving_code, 
+					/* skip over... */
+					count>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
+			}
+	}
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	else if(maybe_make_get_object_element(*$$, *diving_code, count)){
+		// optimization for $object.field + ^object.method[
+	}
 #endif
-		else {
-			O(*$$, OP::OP_WITH_READ); /* stack: starting context */
-			P(*$$, *diving_code);
-		}
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	else if(maybe_make_get_object_var_element(*$$, *diving_code, count)){
+		// optimization for $object.$var
+	}
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	else if(count==4){ // optimization
+		O(*$$,
+			(PC.in_call_value)
+			? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // ^object[ : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string
+			: OP::OP_VALUE__GET_ELEMENT             // $object  : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT+origin+string
+		);
+		P(*$$, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
+	} else {
+		O(*$$, OP::OP_WITH_READ); /* stack: starting context */
+		P(*$$, *diving_code);
+	}
 #else
+	else {
 		O(*$$, OP::OP_WITH_READ); /* stack: starting context */
 
 		// ^if OP_ELEMENT => ^if OP_ELEMENT_OR_OPERATOR
 		// optimized OP_VALUE+origin+string+OP_GET_ELEMENT. => OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR.
-		if(PC.in_call_value && diving_code->count()==4)
-			diving_code->put(4-1, OP::OP_GET_ELEMENT_OR_OPERATOR);
+		if(PC.in_call_value && count==4)
+			diving_code->put(count-1, OP::OP_GET_ELEMENT_OR_OPERATOR);
 		P(*$$, *diving_code);
-#endif
 	}
+#endif
 	/* diving code; stack: current context */
 };
 name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P(*$$, *$2) };
@@ -413,8 +420,16 @@ name_without_curly_rdive_code: name_adva
 /* put */
 
 put: '$' name_expr_wdive construct {
-	$$=$2; /* stack: context,name */
-	P(*$$, *$3); /* stack: context,name,constructor_value */
+	$$=N();
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT
+	if(maybe_optimize_construct(*$$, *$2, *$3)){
+		// $a(expr), $.a(expr), $a[value], $.a[value]
+	} else 
+#endif
+	{
+		P(*$$, *$2); /* stack: context,name */
+		P(*$$, *$3); /* stack: context,name,constructor_value */
+	}
 };
 name_expr_wdive: 
 	name_expr_wdive_root
@@ -444,7 +459,7 @@ name_expr_wdive_write: '.' name_expr_div
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P(*$$, *$2) };
 
-construct: 
+construct:
 	construct_square
 |	construct_round
 |	construct_curly
@@ -509,7 +524,11 @@ call_value: '^' {
 			} 
 			store_params EON { /* ^field.$method{vasya} */
 #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
 	const String* operator_name=LA2S(*$3, 0, OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR);
+#else
+	const String* operator_name=LA2S(*$3, 1);
+#endif
 	if(operator_name && *operator_name == REM_OPERATOR_NAME){
 		$$=N();
 	} else 
@@ -661,7 +680,7 @@ class_static_prefix: STRING ':' {
 	}
 #ifdef OPTIMIZE_BYTECODE_GET_CLASS
 	// optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string
-	replace_top_opcode(*$$, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS, true/*assert if top opcode != OP_VALUE*/)
+	maybe_change_first_opcode(*$$, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS)
 #else
 	O(*$$, OP::OP_GET_CLASS);
 #endif
@@ -737,7 +756,7 @@ string_inside_quotes_value: maybe_codes
 	// it brakes ^if(" 09 "){...}
 	YYSTYPE code=$1;
 	$$=N();
-	if(code->count()==3 && replace_top_opcode(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){
+	if(code->count()==3 && maybe_change_first_opcode(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){
 		// optimized OP_STRING__WRITE+origin+value => OP_VALUE+origin+value without starting OP_STRING_POOL
 		P(*$$, *code);
 	} else {