--- parser3/src/main/compile.y	2004/04/06 11:58:15	1.209.2.1
+++ parser3/src/main/compile.y	2005/08/05 13:03:00	1.213.10.2
@@ -2,10 +2,10 @@
 /** @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.209.2.1 2004/04/06 11:58:15 paf Exp $
+	$Id: compile.y,v 1.213.10.2 2005/08/05 13:03:00 paf Exp $
 */
 
 /**
@@ -343,9 +343,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) */
 }
 ;
@@ -381,14 +386,9 @@ codes__excluding_sole_str_literal: actio
 
 call: call_value {
 	$$=$1; /* stack: value */
-	if(PC.explicit_result)
-		changetail_or_append(*$$, 
-			OP_CALL, true,  /*->*/ OP_CALL__WRITE__EXPLICIT_RESULT,
-			/*or */OP_WRITE_VALUE/*__EXPLICIT_RESULT*/); /* value=pop; check_empty(value) */
-	else
-		changetail_or_append(*$$, 
-			OP_CALL, true,  /*->*/ OP_CALL__WRITE,
-			/*or */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.in_call_value=true; 
@@ -417,7 +417,12 @@ store_param:
 |	store_round_param
 |	store_curly_param
 ;
-store_square_param: '[' store_code_param_parts ']' {$$=$2};
+store_square_param: '[' {
+	// 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);
+} ']' {$$=$3};
 store_round_param: '(' store_expr_param_parts ')' {$$=$2};
 store_curly_param: '{' store_curly_param_parts '}' {$$=$2};
 store_code_param_parts:
@@ -496,9 +501,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 +551,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 +598,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 */