--- parser3/src/main/compile.y	2004/04/06 14:08:41	1.210
+++ parser3/src/main/compile.y	2005/11/16 14:45:22	1.215
@@ -2,10 +2,8 @@
 /** @file
 	Parser: compiler(lexical parser and grammar).
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: compile.y,v 1.210 2004/04/06 14:08:41 paf Exp $
 */
 
 /**
@@ -343,9 +341,14 @@ construct:
 |	construct_round
 |	construct_curly
 ;
-construct_square: '[' any_constructor_code_value ']' {
+construct_square: '[' {
+	// allow $result_or_other_variable[ letters here any time ]
+	*reinterpret_cast<bool*>(&$$)=PC.explicit_result; PC.explicit_result=false;
+} any_constructor_code_value {
+	PC.explicit_result=*reinterpret_cast<bool*>(&$2);
+} ']' {
 	// stack: context, name
-	$$=$2; // stack: context, name, value
+	$$=$3; // stack: context, name, value
 	O(*$$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
 ;
@@ -413,10 +416,10 @@ store_param:
 |	store_curly_param
 ;
 store_square_param: '[' {
-	// allow ^call[ whitespace here any time ]
+	// allow ^call[ letters here any time ]
 	*reinterpret_cast<bool*>(&$$)=PC.explicit_result; PC.explicit_result=false;
 } store_code_param_parts {
-	PC.explicit_result=reinterpret_cast<bool>($2);
+	PC.explicit_result=*reinterpret_cast<bool*>(&$2);
 } ']' {$$=$3};
 store_round_param: '(' store_expr_param_parts ')' {$$=$2};
 store_curly_param: '{' store_curly_param_parts '}' {$$=$2};
@@ -436,9 +439,20 @@ store_code_param_part: code_param_value
 	$$=$1;
 	O(*$$, OP_STORE_PARAM);
 };
-store_expr_param_part: write_expr_value {
-	$$=N(); 
-	OA(*$$, OP_EXPR_CODE__STORE_PARAM, $1);
+store_expr_param_part: expr_value {
+	YYSTYPE expr_code=$1;
+	if(expr_code->count()==3
+		&& (*expr_code)[0].code==OP_VALUE) { // optimizing (double) case. [OP_VALUE+origin+Double]
+		$$=expr_code; 
+		O(*$$, OP_STORE_PARAM); // no evaluating
+	} else {
+		ArrayOperation* code=N();
+		O(*code, OP_PREPARE_TO_EXPRESSION);
+		P(*code, *expr_code);
+		O(*code, OP_WRITE_EXPR_RESULT);
+		$$=N(); 
+		OA(*$$, OP_EXPR_CODE__STORE_PARAM, code);
+	}
 };
 store_curly_param_part: maybe_codes {
 	$$=N(); 
@@ -449,12 +463,6 @@ code_param_value:
 |	STRING /* optimized [STRING] case */
 |	constructor_code_value /* [something complex] */
 ;
-write_expr_value: expr_value {
-	$$=N(); 
-	O(*$$, OP_PREPARE_TO_EXPRESSION);
-	P(*$$, *$1);
-	O(*$$, OP_WRITE_EXPR_RESULT);
-};
 
 /* name */
 
@@ -496,9 +504,14 @@ name_expr_with_subvar_value: STRING subv
 	$$=N(); 
 	OA(*$$, OP_STRING_POOL, code);
 };
-name_square_code_value: '[' codes ']' {
+name_square_code_value: '[' {
+	// allow $result_or_other_variable[ letters here any time ]
+	*reinterpret_cast<bool*>(&$$)=PC.explicit_result; PC.explicit_result=false;
+} codes {
+	PC.explicit_result=*reinterpret_cast<bool*>(&$2);
+} ']' {
 	$$=N(); 
-	OA(*$$, OP_OBJECT_POOL, $2); /* stack: empty write context */
+	OA(*$$, OP_OBJECT_POOL, $3); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 };
@@ -541,13 +554,9 @@ class_constructor_prefix: class_static_p
 
 /* expr */
 
-expr_value: expr {
-	// see OP_PREPARE_TO_EXPRESSION!!
-	if(($$=$1)->count()==2) // only one string literal in there?
-		change_string_literal_to_double_literal(*$$); // make that string literal Double
-};
+expr_value: expr;
 expr: 
-	STRING
+	double_or_STRING
 |	get_value
 |	call_value
 |	'"' string_inside_quotes_value '"' { $$ = $2; }
@@ -592,6 +601,11 @@ expr:
 |	expr "is" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_IS) }
 ;
 
+double_or_STRING: STRING {
+	// optimized from OP_STRING->OP_VALUE for doubles
+	maybe_change_string_literal_to_double_literal(*($$=$1));
+};
+
 string_inside_quotes_value: maybe_codes {
 	$$=N();
 	OA(*$$, OP_STRING_POOL, $1); /* stack: empty write context */