--- parser3/src/main/compile.y	2009/05/23 05:23:19	1.242
+++ parser3/src/main/compile.y	2009/06/13 07:05:22	1.249
@@ -5,7 +5,7 @@
 	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.242 2009/05/23 05:23:19 misha Exp $
+	$Id: compile.y,v 1.249 2009/06/13 07:05:22 misha Exp $
 */
 
 /**
@@ -319,38 +319,42 @@ action: get | put | call;
 get: get_value {
 	$$=N();
 	YYSTYPE code=$1;
+	size_t count=code->count();
+
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	if(!maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE))
+	if(
+		count!=3
+		|| !maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE)
+	)
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+	if(
+		count!=3
+		|| !maybe_change_first_opcode(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE)
+	)
 #endif
-		{
-			size_t count=code->count();
-			size_t len=6;
 
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
-			if(
-				count==len
-				&& maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE)
-			){
-				//P(*$$, *code, 0/*offset*/, count-1/*limit*/); // someday skip last OP_GET_ELEMENT
-				//break;
-			} else
+	if(
+		count!=5
+		|| !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE)
+	)
 #endif
 
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
-			if(
-				count==len
-				&& maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE)
-			){
-				//P(*$$, *code, 0/*offset*/, count-1/*limit*/); // someday skip last OP_GET_ELEMENT
-				//break;
-			} else
+	if(
+		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) */
+	}
 
-				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 };
@@ -362,46 +366,45 @@ name_without_curly_rdive:
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=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... */
-			count>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
-	}
 
+	if(maybe_make_self(*$$, *diving_code, count)) {
+		// $self.
+	} else
 
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
-	else if(maybe_make_get_object_element(*$$, *diving_code, count)){
-		// optimisation for $object.field + ^object.method[
-	}
+	if(maybe_make_get_object_element(*$$, *diving_code, count)){
+		// optimization for $object.field + ^object.method[
+	} else
 #endif
 
-
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
-	else if(maybe_make_get_object_var_element(*$$, *diving_code, count)){
-		// optimisation for $object.$var
-	}
+	if(maybe_make_get_object_var_element(*$$, *diving_code, count)){
+		// optimization for $object.$var
+	} else
 #endif
 
-
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	else if(count==4){ // optimization
+	if(
+		count>=4
+		&& (*diving_code)[0].code==OP::OP_VALUE
+		&& (*diving_code)[3].code==OP::OP_GET_ELEMENT
+	){
+		 // optimization
 		O(*$$,
-			(PC.in_call_value)
+			(PC.in_call_value && count==4)
 			? 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
+		if(count>4)
+			P(*$$, *diving_code, 4); // copy tail
 	} 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
@@ -421,8 +424,8 @@ name_without_curly_rdive_code: name_adva
 put: '$' name_expr_wdive construct {
 	$$=N();
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
-	if(maybe_make_root_or_write_construct(*$$, *$2, *$3)){
-		// $a(1), $.a(1), $a[b], $.a[b], $a($b), $.a($b), $a[$b], $.a[$b]
+	if(maybe_optimize_construct(*$$, *$2, *$3)){
+		// $a(expr), $.a(expr), $a[value], $.a[value], $self.a[value], $self.a(expr)
 	} else 
 #endif
 	{
@@ -437,15 +440,24 @@ name_expr_wdive:
 name_expr_wdive_root: name_expr_dive_code {
 	$$=N();
 	YYSTYPE diving_code=$1;
-	const String* first_name=LA2S(*diving_code);
-	// $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 {
+	size_t count=diving_code->count();
+
+	if(maybe_make_self(*$$, *diving_code, count)) {
+		// $self.
+	} else
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	if(
+		count>=4
+		&& (*diving_code)[0].code==OP::OP_VALUE
+		&& (*diving_code)[3].code==OP::OP_GET_ELEMENT
+	){
+		O(*$$, OP::OP_WITH_ROOT__VALUE__GET_ELEMENT);
+		P(*$$, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
+		if(count>4)
+			P(*$$, *diving_code, 4); // tail
+	} else
+#endif
+	{
 		O(*$$, OP::OP_WITH_ROOT); /* stack: starting context */
 		P(*$$, *diving_code);
 	}
@@ -458,7 +470,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
@@ -510,9 +522,12 @@ call: call_value {
 #endif
 	{
 		$$=$1; /* stack: value */
-		changetail_or_append(*$$, 
-			OP::OP_CALL, true,  /*=>*/ OP::OP_CALL__WRITE,
-			/*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT
+		if(!maybe_change_first_opcode(*$$, OP::OP_CONSTRUCT_OBJECT, /*=>*/OP::OP_CONSTRUCT_OBJECT__WRITE))
+#endif
+			changetail_or_append(*$$, 
+				OP::OP_CALL, true,  /*=>*/ OP::OP_CALL__WRITE,
+				/*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 	}
 };
 call_value: '^' { 
@@ -528,13 +543,11 @@ call_value: '^' {
 #else
 	const String* operator_name=LA2S(*$3, 1);
 #endif
-	if(operator_name && *operator_name == REM_OPERATOR_NAME){
+	if(operator_name && *operator_name==REM_OPERATOR_NAME){
 		$$=N();
 	} else 
 #endif
 		{
-			$$=$3; /* with_xxx,diving code; stack: context,method_junction */
-
 			YYSTYPE params_code=$5;
 			if(params_code->count()==3) { // probably [] case. [OP::OP_VALUE+origin+Void]
 				if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value?
@@ -542,7 +555,27 @@ call_value: '^' {
 						params_code=0; // ^zzz[] case. don't append lone empty param.
 			}
 			/* stack: context, method_junction */
-			OA(*$$, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+
+			YYSTYPE var_code=$3;
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT_OBJECT
+			if(
+				var_code->count()==8
+				&& (*var_code)[0].code==OP::OP_VALUE__GET_CLASS
+				&& (*var_code)[3].code==OP::OP_PREPARE_TO_CONSTRUCT_OBJECT
+				&& (*var_code)[4].code==OP::OP_VALUE
+				&& (*var_code)[7].code==OP::OP_GET_ELEMENT
+			){
+				yyval=N();
+				O(*$$, OP::OP_CONSTRUCT_OBJECT);
+				P(*$$, *var_code, 1/*offset*/, 2/*limit*/); // class name
+				P(*$$, *var_code, 5/*offset*/, 2/*limit*/); // constructor name
+				OA(*$$, params_code);
+			} else 
+#endif
+				{
+					$$=var_code; /* with_xxx,diving code; stack: context,method_junction */
+					OA(*$$, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+				}
 		}
 };
 
@@ -679,7 +712,7 @@ class_static_prefix: STRING ':' {
 	}
 #ifdef OPTIMIZE_BYTECODE_GET_CLASS
 	// optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string
-	maybe_change_first_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