--- parser3/src/main/compile.y	2009/04/29 06:48:46	1.235
+++ parser3/src/main/compile.y	2010/04/28 17:56:22	1.254
@@ -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.235 2009/04/29 06:48:46 misha Exp $
+	$Id: compile.y,v 1.254 2010/04/28 17:56:22 pretender Exp $
 */
 
 /**
@@ -44,6 +44,7 @@
 #define OPTIONS_CONTROL_METHOD_NAME "OPTIONS"
 #define OPTION_ALL_VARS_LOCAL_NAME "locals"
 #define OPTION_PARTIAL_CLASS "partial"
+#define REM_OPERATOR_NAME "rem"
 
 // forwards
 
@@ -129,11 +130,11 @@ static const VVoid vvoid;
 %%
 all:
 	one_big_piece {
-	Method& method=*new Method(Method::CT_ANY,
+	Method* method=new Method(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(PC.alias_method(main_method_name), method);
+	PC.cclass->set_method(PC.alias_method(main_method_name), method);
 }
 |	methods;
 
@@ -183,7 +184,7 @@ control_method: '@' STRING '\n'
 		}
 		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			const String& base_name=*LA2S(*strings_code);
-			if(Value* base_class_value=PC.request.classes().get(base_name)) {
+			if(Value* base_class_value=PC.request.get_class(base_name)) {
 				// @CLASS == @BASE sanity check
 				if(VStateless_class *base_class=base_class_value->get_class()) {
 					if(PC.cclass==base_class) {
@@ -289,13 +290,13 @@ code_method: '@' STRING bracketed_maybe_
 
 	// todo: check [][;result;]
 } maybe_codes {
-		Method& method=*reinterpret_cast<Method*>($7);
+		Method* method=reinterpret_cast<Method*>($7);
 		// fill in the code
-		method.parser_code=$8;
+		method->parser_code=$8;
 
 		// register in class
 		const String& name=*LA2S(*$2);
-		PC.cclass->add_method(PC.alias_method(name), method);
+		PC.cclass->set_method(PC.alias_method(name), method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -316,14 +317,45 @@ action: get | put | call;
 /* get */
 
 get: get_value {
-	$$=$1; /* stack: resulting value */ 
+	$$=N();
+	YYSTYPE code=$1;
+	size_t count=code->count();
+
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	if(!replace_top_opcode(*$$, 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
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	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!=5
+		|| !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE)
+	)
 #endif
-		changetail_or_append(*$$, 
-			OP::OP_GET_ELEMENT, false,  /*->*/OP::OP_GET_ELEMENT__WRITE,
+	{
+		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 };
 get_name_value: name_without_curly_rdive EON | name_in_curly_rdive;
@@ -333,38 +365,55 @@ name_without_curly_rdive:
 |	name_without_curly_rdive_class;
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=N(); 
-	ArrayOperation* 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(*yyval, OP::OP_WITH_SELF); /* stack: starting context */
-		P(*yyval, *diving_code, 
-			/* skip over... */
-			diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
-	} else {
+	YYSTYPE diving_code=$1;
+	size_t count=diving_code->count();
+
+	if(maybe_make_self(*$$, *diving_code, count)) {
+		// $self.
+	} else
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	if(maybe_make_get_object_element(*$$, *diving_code, count)){
+		// optimization for $object.field + ^object.method[
+	} else
+#endif
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	if(maybe_make_get_object_var_element(*$$, *diving_code, count)){
+		// optimization for $object.$var
+	} else
+#endif
+
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-		if(diving_code->count()==4){ // optimisations for simple (but very popular) cases
-			O(*yyval,
-				(PC.in_call_value) // ^call
-				? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // OP_VALUE+origin+string+OP_GET_ELEMENT -> OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string
-				: OP::OP_VALUE__GET_ELEMENT // OP_VALUE+origin+string+OP_GET_ELEMENT -> OP_VALUE__GET_ELEMENT+origin+string
-			);
-			P(*$$, *diving_code, 1/*offset==1: skip leading OP_VALUE*/, 2/*limit==2: skip trailing OP_GET_ELEMENT*/);
-		} else {
-			O(*yyval, OP::OP_WITH_READ); /* stack: starting context */
-			P(*$$, *diving_code);
-		}
+	if(
+		count>=4
+		&& (*diving_code)[0].code==OP::OP_VALUE
+		&& (*diving_code)[3].code==OP::OP_GET_ELEMENT
+	){
+		 // optimization
+		O(*$$,
+			(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
-		O(*yyval, OP::OP_WITH_READ); /* stack: starting context */
+	{
+		O(*$$, OP::OP_WITH_READ); /* stack: starting context */
 
-		// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
-		// 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 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 && 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) };
@@ -373,8 +422,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], $self.a[value], $self.a(expr)
+	} else 
+#endif
+	{
+		P(*$$, *$2); /* stack: context,name */
+		P(*$$, *$3); /* stack: context,name,constructor_value */
+	}
 };
 name_expr_wdive: 
 	name_expr_wdive_root
@@ -382,16 +439,25 @@ name_expr_wdive:
 |	name_expr_wdive_class;
 name_expr_wdive_root: name_expr_dive_code {
 	$$=N();
-	ArrayOperation* 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 {
+	YYSTYPE diving_code=$1;
+	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);
 	}
@@ -404,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
@@ -451,10 +517,16 @@ codes__excluding_sole_str_literal: actio
 /* call */
 
 call: call_value {
-	$$=$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_CUT_REM_OPERATOR
+	if((*$1).count())
+#endif
+	{
+		$$=$1; /* stack: value */
+		if(!maybe_change_first_opcode(*$$, OP::OP_CONSTRUCT_OBJECT, /*=>*/OP::OP_CONSTRUCT_OBJECT__WRITE))
+			changetail_or_append(*$$, 
+				OP::OP_CALL, true,  /*=>*/ OP::OP_CALL__WRITE,
+				/*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+	}
 };
 call_value: '^' { 
 					PC.in_call_value=true; 
@@ -463,16 +535,44 @@ call_value: '^' {
 				PC.in_call_value=false;
 			} 
 			store_params EON { /* ^field.$method{vasya} */
-	$$=$3; /* with_xxx,diving code; stack: context,method_junction */
+#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 
+#endif
+		{
+			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?
+					if(value->is_void()) // value is VVoid?
+						params_code=0; // ^zzz[] case. don't append lone empty param.
+			}
+			/* 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?
-			if(value->is_void()) // value is VVoid?
-				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;
+			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 
+				{
+					$$=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
+				}
+		}
 };
 
 call_name: name_without_curly_rdive;
@@ -512,7 +612,7 @@ store_expr_param_part: expr_value {
 		&& (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]. no evaluating
 		$$=expr_code; 
 	} else {
-		ArrayOperation* code=N();
+		YYSTYPE code=N();
 		O(*code, OP::OP_PREPARE_TO_EXPRESSION);
 		P(*code, *expr_code);
 		O(*code, OP::OP_WRITE_EXPR_RESULT);
@@ -562,7 +662,7 @@ name_expr_subvar_value: '$' subvar_ref_n
 	O(*$$, OP::OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
-	ArrayOperation* code;
+	YYSTYPE code;
 	{
 		change_string_literal_to_write_string_literal(*(code=$1));
 		P(*code, *$2);
@@ -606,12 +706,8 @@ class_static_prefix: STRING ':' {
 			YYERROR;
 		}
 	}
-#ifdef OPTIMIZE_BYTECODE_GET_CLASS
-	// 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*/)
-#else
-	O(*$$, OP::OP_GET_CLASS);
-#endif
+	// 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)
 };
 class_constructor_prefix: class_static_prefix ':' {
 	$$=$1;
@@ -675,13 +771,25 @@ expr:
 ;
 
 double_or_STRING: STRING {
-	// optimized from OP_STRING->OP_VALUE for doubles
+	// optimized OP_STRING => OP_VALUE for doubles
 	maybe_change_string_literal_to_double_literal(*($$=$1));
 };
 
 string_inside_quotes_value: maybe_codes {
+#ifdef OPTIMIZE_BYTECODE_STRING_POOL
+	// it brakes ^if(" 09 "){...}
+	YYSTYPE code=$1;
+	$$=N();
+	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 {
+		OA(*$$, OP::OP_STRING_POOL, code); /* stack: empty write context */
+	}
+#else
 	$$=N();
 	OA(*$$, OP::OP_STRING_POOL, $1); /* stack: empty write context */
+#endif
 	/* some code that writes to that context */
 	/* context=pop; stack: context.get_string() */
 };
@@ -689,7 +797,7 @@ string_inside_quotes_value: maybe_codes
 /* basics */
 
 write_string: STRING {
-	// optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE
+	// optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE
 	change_string_literal_to_write_string_literal(*($$=$1))
 };
 
@@ -1238,7 +1346,7 @@ default:
 			case ']': case '}': case ')': 
 			case '"': case '\'':
 			case '<': case '>':  // these stand for HTML brackets AND expression binary ops
-			case '+': case '*': case '/': case '%': 
+			case '+': case '*': case '/': case '\\': case '%': 
 			case '&': case '|': 
 			case '=': case '!':
 			// common delimiters