--- parser3/src/main/compile.tab.C	2008/07/23 09:55:05	1.121
+++ parser3/src/main/compile.tab.C	2009/05/01 12:09:58	1.129
@@ -132,7 +132,7 @@
 	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.tab.C,v 1.121 2008/07/23 09:55:05 misha Exp $
+	$Id: compile.tab.C,v 1.129 2009/05/01 12:09:58 misha Exp $
 */
 
 /**
@@ -170,7 +170,7 @@
 #define USE_CONTROL_METHOD_NAME "USE"
 #define OPTIONS_CONTROL_METHOD_NAME "OPTIONS"
 #define OPTION_ALL_VARS_LOCAL_NAME "locals"
-#define OPTION_APPEND_METHODS "append"
+#define OPTION_PARTIAL_CLASS "partial"
 
 // forwards
 
@@ -456,23 +456,23 @@ static const short int yyrhs[] =
 static const unsigned short int yyrline[] =
 {
        0,   131,   131,   138,   140,   140,   141,   143,   143,   145,
-     240,   240,   241,   241,   242,   243,   243,   245,   245,   295,
-     295,   296,   297,   297,   298,   298,   300,   300,   304,   304,
-     306,   306,   307,   307,   308,   308,   308,   312,   319,   320,
-     320,   321,   323,   324,   325,   347,   348,   348,   352,   357,
-     358,   359,   360,   377,   382,   385,   386,   387,   389,   392,
-     389,   400,   408,   415,   416,   417,   419,   425,   426,   426,
-     430,   436,   439,   436,   455,   457,   457,   459,   460,   461,
-     463,   466,   463,   469,   470,   472,   473,   476,   477,   480,
-     481,   483,   487,   502,   507,   508,   509,   514,   514,   516,
-     516,   517,   518,   526,   531,   534,   535,   536,   537,   539,
-     543,   552,   555,   552,   563,   568,   568,   569,   575,   576,
-     578,   590,   602,   604,   605,   606,   607,   608,   609,   610,
-     611,   613,   614,   615,   616,   617,   618,   619,   620,   622,
-     623,   624,   625,   626,   627,   628,   629,   630,   631,   632,
-     633,   634,   635,   636,   637,   638,   639,   640,   641,   642,
-     643,   644,   645,   646,   647,   648,   651,   656,   665,   670,
-     671,   672,   674
+     246,   246,   247,   247,   248,   249,   249,   251,   251,   301,
+     301,   302,   303,   303,   304,   304,   306,   306,   310,   310,
+     312,   312,   313,   313,   314,   314,   314,   318,   328,   329,
+     329,   330,   332,   333,   334,   373,   374,   374,   378,   383,
+     384,   385,   386,   403,   408,   411,   412,   413,   415,   418,
+     415,   426,   434,   441,   442,   443,   445,   451,   452,   452,
+     456,   462,   465,   462,   481,   483,   483,   485,   486,   487,
+     489,   492,   489,   495,   496,   498,   499,   502,   503,   506,
+     507,   509,   512,   526,   531,   532,   533,   538,   538,   540,
+     540,   541,   542,   550,   555,   558,   559,   560,   561,   563,
+     567,   576,   579,   576,   587,   592,   592,   593,   599,   600,
+     602,   619,   631,   633,   634,   635,   636,   637,   638,   639,
+     640,   642,   643,   644,   645,   646,   647,   648,   649,   651,
+     652,   653,   654,   655,   656,   657,   658,   659,   660,   661,
+     662,   663,   664,   665,   666,   667,   668,   669,   670,   671,
+     672,   673,   674,   675,   676,   677,   680,   685,   694,   699,
+     700,   701,   703
 };
 #endif
 
@@ -1506,22 +1506,28 @@ yyreduce:
 			const String& option=*LA2S(*strings_code, i);
 			if(option==OPTION_ALL_VARS_LOCAL_NAME){
 				PC.set_all_vars_local();
-			} else if(option==OPTION_APPEND_METHODS) {
-				if(!PC.class_reuse()){
-					if(PC.cclass_new){
-						strcpy(PC.error, "can't append methods to '");
-						strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2);
-						strcat(PC.error, "' - the class doesn't exist");
+			} else if(option==OPTION_PARTIAL_CLASS){
+				if(PC.cclass_new){
+					if(VStateless_class* existed=PC.get_existed_class(PC.cclass_new)){
+						if(!PC.reuse_existed_class(existed)){
+							strcpy(PC.error, "can't append methods to '");
+							strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2);
+							strcat(PC.error, "' - the class wasn't marked as partial");
+							YYERROR;
+						}
 					} else {
-						strcpy(PC.error, "'"OPTION_APPEND_METHODS"' option should be used straight after @"CLASS_NAME);
+						// mark new class as partial. we can add methods to it later.
+						PC.cclass_new->set_partial();
 					}
+				} else {
+					strcpy(PC.error, "'"OPTION_PARTIAL_CLASS"' option should be used straight after @"CLASS_NAME);
 					YYERROR;
 				}
 			} else {
 				strcpy(PC.error, "'");
 				strncat(PC.error, option.cstr(), MAX_STRING/2);
 				strcat(PC.error, "' invalid option. valid options are "
-					"'"OPTION_APPEND_METHODS"' and '"OPTION_ALL_VARS_LOCAL_NAME"'");
+					"'"OPTION_PARTIAL_CLASS"' and '"OPTION_ALL_VARS_LOCAL_NAME"'");
 				YYERROR;
 			}
 		}
@@ -1536,12 +1542,12 @@ yyreduce:
     break;
 
   case 13:
-#line 241 "compile.y"
+#line 247 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 17:
-#line 245 "compile.y"
+#line 251 "compile.y"
     { 
 	PC.class_add();
 	PC.explicit_result=false;
@@ -1569,9 +1575,8 @@ yyreduce:
 				*locals_names+=local_name;
 		}
 	}
-	if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local()){
+	if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local())
 		all_vars_local=true;
-	}
 
 	Method* method=new Method(
 		//name, 
@@ -1587,55 +1592,59 @@ yyreduce:
     break;
 
   case 18:
-#line 286 "compile.y"
+#line 291 "compile.y"
     {
-        Method& method=*reinterpret_cast<Method*>(yyvsp[-1]);
-        // fill in the code
-        method.parser_code=yyvsp[0];
-        // register in class
-        const String& name=*LA2S(*yyvsp[-6]);
-        PC.cclass->add_method(PC.alias_method(name), method);
+		Method& method=*reinterpret_cast<Method*>(yyvsp[-1]);
+		// fill in the code
+		method.parser_code=yyvsp[0];
+
+		// register in class
+		const String& name=*LA2S(*yyvsp[-6]);
+		PC.cclass->add_method(PC.alias_method(name), method);
 ;}
     break;
 
   case 21:
-#line 296 "compile.y"
+#line 302 "compile.y"
     {yyval=yyvsp[-1];}
     break;
 
   case 25:
-#line 298 "compile.y"
+#line 304 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 31:
-#line 306 "compile.y"
+#line 312 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 37:
-#line 312 "compile.y"
+#line 318 "compile.y"
     {
 	yyval=yyvsp[0]; /* stack: resulting value */ 
-	changetail_or_append(*yyval, 
-		OP_GET_ELEMENT, false,  /*->*/OP_GET_ELEMENT__WRITE,
-		/*or */OP_WRITE_VALUE
-		); /* value=pop; wcontext.write(value) */
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	if(!replace_top_opcode(*yyval, OP::OP_VALUE__GET_ELEMENT, OP::OP_VALUE__GET_ELEMENT__WRITE))
+#endif
+		changetail_or_append(*yyval, 
+			OP::OP_GET_ELEMENT, false,  /*->*/OP::OP_GET_ELEMENT__WRITE,
+			/*or */OP::OP_WRITE_VALUE
+			); /* value=pop; wcontext.write(value) */
 ;}
     break;
 
   case 38:
-#line 319 "compile.y"
+#line 328 "compile.y"
     { yyval=yyvsp[0] ;}
     break;
 
   case 41:
-#line 321 "compile.y"
+#line 330 "compile.y"
     { yyval=yyvsp[-1] ;}
     break;
 
   case 44:
-#line 325 "compile.y"
+#line 334 "compile.y"
     {
 	yyval=N(); 
 	ArrayOperation* diving_code=yyvsp[0];
@@ -1643,35 +1652,52 @@ yyreduce:
 	// self.xxx... -> xxx...
 	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
-		O(*yyval, OP_WITH_SELF); /* stack: starting context */
+		O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */
 		P(*yyval, *diving_code, 
 			/* skip over... */
-			diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/);
+			diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
 	} else {
-		O(*yyval, OP_WITH_READ); /* stack: starting context */
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+		size_t count=diving_code->count();
+		if(count==4 || (count>4 && PC.in_call_value)){ // optimisations for popular simple cases
+			O(*yyval,
+				(count==4 && 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(*yyval, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
+			if(count>4)
+				P(*yyval, *diving_code, 4/*offset*/); // copy tail
+		} else {
+			O(*yyval, OP::OP_WITH_READ); /* stack: starting context */
+			P(*yyval, *diving_code);
+		}
+#else
+		O(*yyval, 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_GET_ELEMENT_OR_OPERATOR);
+			diving_code->put(4-1, OP::OP_GET_ELEMENT_OR_OPERATOR);
 		P(*yyval, *diving_code);
+#endif
 	}
 	/* diving code; stack: current context */
 ;}
     break;
 
   case 45:
-#line 347 "compile.y"
+#line 373 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 47:
-#line 348 "compile.y"
+#line 374 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 48:
-#line 352 "compile.y"
+#line 378 "compile.y"
     {
 	yyval=yyvsp[-1]; /* stack: context,name */
 	P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */
@@ -1679,7 +1705,7 @@ yyreduce:
     break;
 
   case 52:
-#line 360 "compile.y"
+#line 386 "compile.y"
     {
 	yyval=N();
 	ArrayOperation* diving_code=yyvsp[0];
@@ -1687,12 +1713,12 @@ yyreduce:
 	// $self.xxx... -> $xxx...
 	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
-		O(*yyval, OP_WITH_SELF); /* stack: starting context */
+		O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */
 		P(*yyval, *diving_code, 
 			/* skip over... */
-			diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/);
+			diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
 	} else {
-		O(*yyval, OP_WITH_ROOT); /* stack: starting context */
+		O(*yyval, OP::OP_WITH_ROOT); /* stack: starting context */
 		P(*yyval, *diving_code);
 	}
 	/* diving code; stack: current context */
@@ -1700,21 +1726,21 @@ yyreduce:
     break;
 
   case 53:
-#line 377 "compile.y"
+#line 403 "compile.y"
     {
 	yyval=N(); 
-	O(*yyval, OP_WITH_WRITE); /* stack: starting context */
+	O(*yyval, OP::OP_WITH_WRITE); /* stack: starting context */
 	P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */
 ;}
     break;
 
   case 54:
-#line 382 "compile.y"
+#line 408 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 58:
-#line 389 "compile.y"
+#line 415 "compile.y"
     {
 	// allow $result_or_other_variable[ letters here any time ]
 	*reinterpret_cast<bool*>(&yyval)=PC.explicit_result; PC.explicit_result=false;
@@ -1722,103 +1748,103 @@ yyreduce:
     break;
 
   case 59:
-#line 392 "compile.y"
+#line 418 "compile.y"
     {
 	PC.explicit_result=*reinterpret_cast<bool*>(&yyvsp[-1]);
 ;}
     break;
 
   case 60:
-#line 394 "compile.y"
+#line 420 "compile.y"
     {
 	// stack: context, name
 	yyval=yyvsp[-2]; // stack: context, name, value
-	O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+	O(*yyval, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 ;}
     break;
 
   case 61:
-#line 400 "compile.y"
+#line 426 "compile.y"
     { 
 	yyval=N(); 
-	O(*yyval, OP_PREPARE_TO_EXPRESSION);
+	O(*yyval, OP::OP_PREPARE_TO_EXPRESSION);
 	// stack: context, name
 	P(*yyval, *yyvsp[-1]); // stack: context, name, value
-	O(*yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
+	O(*yyval, OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
 ;}
     break;
 
   case 62:
-#line 408 "compile.y"
+#line 434 "compile.y"
     {
 	// stack: context, name
 	yyval=N(); 
-	OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
+	OA(*yyval, OP::OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
 ;}
     break;
 
   case 66:
-#line 419 "compile.y"
+#line 445 "compile.y"
     {
 	yyval=N(); 
-	OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */
+	OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 ;}
     break;
 
   case 69:
-#line 426 "compile.y"
+#line 452 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 70:
-#line 430 "compile.y"
+#line 456 "compile.y"
     {
 	yyval=yyvsp[0]; /* stack: value */
 	changetail_or_append(*yyval, 
-		OP_CALL, true,  /*->*/ OP_CALL__WRITE,
-		/*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+		OP::OP_CALL, true,  /*->*/ OP::OP_CALL__WRITE,
+		/*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 ;}
     break;
 
   case 71:
-#line 436 "compile.y"
+#line 462 "compile.y"
     { 
 					PC.in_call_value=true; 
 			;}
     break;
 
   case 72:
-#line 439 "compile.y"
+#line 465 "compile.y"
     {
 				PC.in_call_value=false;
 			;}
     break;
 
   case 73:
-#line 442 "compile.y"
+#line 468 "compile.y"
     { /* ^field.$method{vasya} */
 	yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */
 
 	YYSTYPE params_code=yyvsp[-1];
-	if(params_code->count()==4) { // probably [] case. [OP_VALUE+origin+Void+STORE_PARAM]
+	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(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+	OA(*yyval, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
 ;}
     break;
 
   case 76:
-#line 457 "compile.y"
+#line 483 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 80:
-#line 463 "compile.y"
+#line 489 "compile.y"
     {
 	// allow ^call[ letters here any time ]
 	*reinterpret_cast<bool*>(&yyval)=PC.explicit_result; PC.explicit_result=false;
@@ -1826,118 +1852,116 @@ yyreduce:
     break;
 
   case 81:
-#line 466 "compile.y"
+#line 492 "compile.y"
     {
 	PC.explicit_result=*reinterpret_cast<bool*>(&yyvsp[-1]);
 ;}
     break;
 
   case 82:
-#line 468 "compile.y"
+#line 494 "compile.y"
     {yyval=yyvsp[-2];}
     break;
 
   case 83:
-#line 469 "compile.y"
+#line 495 "compile.y"
     {yyval=yyvsp[-1];}
     break;
 
   case 84:
-#line 470 "compile.y"
+#line 496 "compile.y"
     {yyval=yyvsp[-1];}
     break;
 
   case 86:
-#line 473 "compile.y"
+#line 499 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 88:
-#line 477 "compile.y"
+#line 503 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 90:
-#line 481 "compile.y"
+#line 507 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 91:
-#line 483 "compile.y"
+#line 509 "compile.y"
     {
 	yyval=yyvsp[0];
-	O(*yyval, OP_STORE_PARAM);
 ;}
     break;
 
   case 92:
-#line 487 "compile.y"
+#line 512 "compile.y"
     {
 	YYSTYPE expr_code=yyvsp[0];
 	if(expr_code->count()==3
-		&& (*expr_code)[0].code==OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP_VALUE+origin+Double]
+		&& (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]. no evaluating
 		yyval=expr_code; 
-		O(*yyval, OP_STORE_PARAM); // no evaluating
 	} else {
 		ArrayOperation* code=N();
-		O(*code, OP_PREPARE_TO_EXPRESSION);
+		O(*code, OP::OP_PREPARE_TO_EXPRESSION);
 		P(*code, *expr_code);
-		O(*code, OP_WRITE_EXPR_RESULT);
+		O(*code, OP::OP_WRITE_EXPR_RESULT);
 		yyval=N(); 
-		OA(*yyval, OP_EXPR_CODE__STORE_PARAM, code);
+		OA(*yyval, OP::OP_EXPR_CODE__STORE_PARAM, code);
 	}
 ;}
     break;
 
   case 93:
-#line 502 "compile.y"
+#line 526 "compile.y"
     {
 	yyval=N(); 
-	OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]);
+	OA(*yyval, OP::OP_CURLY_CODE__STORE_PARAM, yyvsp[0]);
 ;}
     break;
 
   case 98:
-#line 514 "compile.y"
+#line 538 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 100:
-#line 516 "compile.y"
+#line 540 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 102:
-#line 518 "compile.y"
+#line 542 "compile.y"
     {
 	// we know that name_advance1 not called from ^xxx context
 	// so we'll not check for operator call possibility as we do in name_advance2
 
 	/* stack: context */
 	yyval=yyvsp[0]; /* stack: context,name */
-	O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 ;}
     break;
 
   case 103:
-#line 526 "compile.y"
+#line 550 "compile.y"
     {
 	/* stack: context */
 	yyval=yyvsp[0]; /* stack: context,name */
-	O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O(*yyval, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 ;}
     break;
 
   case 109:
-#line 539 "compile.y"
+#line 563 "compile.y"
     {
 	yyval=yyvsp[0];
-	O(*yyval, OP_GET_ELEMENT);
+	O(*yyval, OP::OP_GET_ELEMENT);
 ;}
     break;
 
   case 110:
-#line 543 "compile.y"
+#line 567 "compile.y"
     {
 	ArrayOperation* code;
 	{
@@ -1945,12 +1969,12 @@ yyreduce:
 		P(*code, *yyvsp[0]);
 	}
 	yyval=N(); 
-	OA(*yyval, OP_STRING_POOL, code);
+	OA(*yyval, OP::OP_STRING_POOL, code);
 ;}
     break;
 
   case 111:
-#line 552 "compile.y"
+#line 576 "compile.y"
     {
 	// allow $result_or_other_variable[ letters here any time ]
 	*reinterpret_cast<bool*>(&yyval)=PC.explicit_result; PC.explicit_result=false;
@@ -1958,46 +1982,46 @@ yyreduce:
     break;
 
   case 112:
-#line 555 "compile.y"
+#line 579 "compile.y"
     {
 	PC.explicit_result=*reinterpret_cast<bool*>(&yyvsp[-1]);
 ;}
     break;
 
   case 113:
-#line 557 "compile.y"
+#line 581 "compile.y"
     {
 	yyval=N(); 
-	OA(*yyval, OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */
+	OA(*yyval, OP::OP_OBJECT_POOL, yyvsp[-2]); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 ;}
     break;
 
   case 114:
-#line 563 "compile.y"
+#line 587 "compile.y"
     {
 	yyval=N(); 
-	O(*yyval, OP_WITH_READ);
+	O(*yyval, OP::OP_WITH_READ);
 	P(*yyval, *yyvsp[0]);
 ;}
     break;
 
   case 116:
-#line 568 "compile.y"
+#line 592 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 117:
-#line 569 "compile.y"
+#line 593 "compile.y"
     {
 	yyval=yyvsp[0];
-	O(*yyval, OP_GET_ELEMENT__WRITE);
+	O(*yyval, OP::OP_GET_ELEMENT__WRITE);
 ;}
     break;
 
   case 120:
-#line 578 "compile.y"
+#line 602 "compile.y"
     {
 	yyval=yyvsp[-1]; // stack: class name string
 	if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class
@@ -2008,214 +2032,219 @@ yyreduce:
 			YYERROR;
 		}
 	}
-	O(*yyval, OP_GET_CLASS);
+#ifdef OPTIMIZE_BYTECODE_GET_CLASS
+	// OP_VALUE+origin+string+OP_GET_CLASS -> OP_VALUE__GET_CLASS+origin+string
+	replace_top_opcode(*yyval, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS, true/*assert if top opcode != OP_VALUE*/)
+#else
+	O(*yyval, OP::OP_GET_CLASS);
+#endif
 ;}
     break;
 
   case 121:
-#line 590 "compile.y"
+#line 619 "compile.y"
     {
 	yyval=yyvsp[-1];
 	if(!PC.in_call_value) {
 		strcpy(PC.error, ":: not allowed here");
 		YYERROR;
 	}
-	O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT);
+	O(*yyval, OP::OP_PREPARE_TO_CONSTRUCT_OBJECT);
 ;}
     break;
 
   case 128:
-#line 609 "compile.y"
+#line 638 "compile.y"
     { yyval = yyvsp[-1] ;}
     break;
 
   case 129:
-#line 610 "compile.y"
+#line 639 "compile.y"
     { yyval = yyvsp[-1] ;}
     break;
 
   case 130:
-#line 611 "compile.y"
+#line 640 "compile.y"
     { yyval = yyvsp[-1]; ;}
     break;
 
   case 131:
-#line 613 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_NEG) ;}
+#line 642 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_NEG) ;}
     break;
 
   case 132:
-#line 614 "compile.y"
+#line 643 "compile.y"
     { yyval=yyvsp[0] ;}
     break;
 
   case 133:
-#line 615 "compile.y"
-    { yyval=yyvsp[0];	 O(*yyval, OP_INV) ;}
+#line 644 "compile.y"
+    { yyval=yyvsp[0];	 O(*yyval, OP::OP_INV) ;}
     break;
 
   case 134:
-#line 616 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_NOT) ;}
+#line 645 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_NOT) ;}
     break;
 
   case 135:
-#line 617 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_DEF) ;}
+#line 646 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_DEF) ;}
     break;
 
   case 136:
-#line 618 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_IN) ;}
+#line 647 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_IN) ;}
     break;
 
   case 137:
-#line 619 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_FEXISTS) ;}
+#line 648 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_FEXISTS) ;}
     break;
 
   case 138:
-#line 620 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_DEXISTS) ;}
+#line 649 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_DEXISTS) ;}
     break;
 
   case 139:
-#line 622 "compile.y"
-    {	yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_SUB) ;}
+#line 651 "compile.y"
+    {	yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_SUB) ;}
     break;
 
   case 140:
-#line 623 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_ADD) ;}
+#line 652 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_ADD) ;}
     break;
 
   case 141:
-#line 624 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MUL) ;}
+#line 653 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_MUL) ;}
     break;
 
   case 142:
-#line 625 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_DIV) ;}
+#line 654 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_DIV) ;}
     break;
 
   case 143:
-#line 626 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MOD) ;}
+#line 655 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_MOD) ;}
     break;
 
   case 144:
-#line 627 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_INTDIV) ;}
+#line 656 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_INTDIV) ;}
     break;
 
   case 145:
-#line 628 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SL) ;}
+#line 657 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_SL) ;}
     break;
 
   case 146:
-#line 629 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SR) ;}
+#line 658 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_SR) ;}
     break;
 
   case 147:
-#line 630 "compile.y"
-    { yyval=yyvsp[-2]; 	P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_AND) ;}
+#line 659 "compile.y"
+    { yyval=yyvsp[-2]; 	P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_AND) ;}
     break;
 
   case 148:
-#line 631 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_OR) ;}
+#line 660 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_OR) ;}
     break;
 
   case 149:
-#line 632 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_XOR) ;}
+#line 661 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_XOR) ;}
     break;
 
   case 150:
-#line 633 "compile.y"
-    { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_AND) ;}
+#line 662 "compile.y"
+    { yyval=yyvsp[-2];  OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP::OP_LOG_AND) ;}
     break;
 
   case 151:
-#line 634 "compile.y"
-    { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_OR) ;}
+#line 663 "compile.y"
+    { yyval=yyvsp[-2];  OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP::OP_LOG_OR) ;}
     break;
 
   case 152:
-#line 635 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_LOG_XOR) ;}
+#line 664 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_LOG_XOR) ;}
     break;
 
   case 153:
-#line 636 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LT) ;}
+#line 665 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_LT) ;}
     break;
 
   case 154:
-#line 637 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GT) ;}
+#line 666 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_GT) ;}
     break;
 
   case 155:
-#line 638 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LE) ;}
+#line 667 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_LE) ;}
     break;
 
   case 156:
-#line 639 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GE) ;}
+#line 668 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_GE) ;}
     break;
 
   case 157:
-#line 640 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_EQ) ;}
+#line 669 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_EQ) ;}
     break;
 
   case 158:
-#line 641 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_NE) ;}
+#line 670 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_NE) ;}
     break;
 
   case 159:
-#line 642 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LT) ;}
+#line 671 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_LT) ;}
     break;
 
   case 160:
-#line 643 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GT) ;}
+#line 672 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_GT) ;}
     break;
 
   case 161:
-#line 644 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LE) ;}
+#line 673 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_LE) ;}
     break;
 
   case 162:
-#line 645 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GE) ;}
+#line 674 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_GE) ;}
     break;
 
   case 163:
-#line 646 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_EQ) ;}
+#line 675 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_EQ) ;}
     break;
 
   case 164:
-#line 647 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_NE) ;}
+#line 676 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_NE) ;}
     break;
 
   case 165:
-#line 648 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_IS) ;}
+#line 677 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_IS) ;}
     break;
 
   case 166:
-#line 651 "compile.y"
+#line 680 "compile.y"
     {
 	// optimized from OP_STRING->OP_VALUE for doubles
 	maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0]));
@@ -2223,17 +2252,17 @@ yyreduce:
     break;
 
   case 167:
-#line 656 "compile.y"
+#line 685 "compile.y"
     {
 	yyval=N();
-	OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
+	OA(*yyval, OP::OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.get_string() */
 ;}
     break;
 
   case 168:
-#line 665 "compile.y"
+#line 694 "compile.y"
     {
 	// optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE
 	change_string_literal_to_write_string_literal(*(yyval=yyvsp[0]))
@@ -2241,22 +2270,22 @@ yyreduce:
     break;
 
   case 169:
-#line 670 "compile.y"
+#line 699 "compile.y"
     { yyval=VL(/*we know that we will not change it*/const_cast<VVoid*>(&vvoid), 0, 0, 0) ;}
     break;
 
   case 170:
-#line 671 "compile.y"
+#line 700 "compile.y"
     { yyval = VL(/*we know that we will not change it*/const_cast<VBool*>(&vtrue), 0, 0, 0) ;}
     break;
 
   case 171:
-#line 672 "compile.y"
+#line 701 "compile.y"
     { yyval = VL(/*we know that we will not change it*/const_cast<VBool*>(&vfalse), 0, 0, 0) ;}
     break;
 
   case 172:
-#line 674 "compile.y"
+#line 703 "compile.y"
     { yyval=N() ;}
     break;
 
@@ -2264,7 +2293,7 @@ yyreduce:
     }
 
 /* Line 1010 of yacc.c.  */
-#line 2268 "compile.tab.C"
+#line 2297 "compile.tab.C"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2489,7 +2518,7 @@ yyreturn:
 }
 
 
-#line 676 "compile.y"
+#line 705 "compile.y"
 
 #endif