--- parser3/src/main/compile.tab.C	2007/10/25 10:52:48	1.115
+++ parser3/src/main/compile.tab.C	2009/05/20 13:38:41	1.134
@@ -129,10 +129,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.tab.C,v 1.115 2007/10/25 10:52:48 misha Exp $
+	$Id: compile.tab.C,v 1.134 2009/05/20 13:38:41 misha Exp $
 */
 
 /**
@@ -168,6 +168,10 @@
 // defines
 
 #define USE_CONTROL_METHOD_NAME "USE"
+#define OPTIONS_CONTROL_METHOD_NAME "OPTIONS"
+#define OPTION_ALL_VARS_LOCAL_NAME "locals"
+#define OPTION_PARTIAL_CLASS "partial"
+#define REM_OPERATOR_NAME "rem"
 
 // forwards
 
@@ -213,7 +217,7 @@ typedef int YYSTYPE;
 
 
 /* Line 214 of yacc.c.  */
-#line 217 "compile.tab.C"
+#line 221 "compile.tab.C"
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
@@ -452,24 +456,24 @@ static const short int yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,   128,   128,   135,   137,   137,   138,   140,   140,   142,
-     214,   214,   215,   215,   216,   217,   217,   219,   219,   263,
-     263,   264,   265,   265,   266,   266,   268,   268,   272,   272,
-     274,   274,   275,   275,   276,   276,   276,   280,   287,   288,
-     288,   289,   291,   292,   293,   315,   316,   316,   320,   325,
-     326,   327,   328,   345,   350,   353,   354,   355,   357,   360,
-     357,   368,   376,   383,   384,   385,   387,   393,   394,   394,
-     398,   404,   407,   404,   423,   425,   425,   427,   428,   429,
-     431,   434,   431,   437,   438,   440,   441,   444,   445,   448,
-     449,   451,   455,   470,   475,   476,   477,   482,   482,   484,
-     484,   485,   486,   494,   499,   502,   503,   504,   505,   507,
-     511,   520,   523,   520,   531,   536,   536,   537,   543,   544,
-     546,   558,   570,   572,   573,   574,   575,   576,   577,   578,
-     579,   581,   582,   583,   584,   585,   586,   587,   588,   590,
-     591,   592,   593,   594,   595,   596,   597,   598,   599,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-     611,   612,   613,   614,   615,   616,   619,   624,   633,   638,
-     639,   640,   642
+       0,   132,   132,   139,   141,   141,   142,   144,   144,   146,
+     247,   247,   248,   248,   249,   250,   250,   252,   252,   302,
+     302,   303,   304,   304,   305,   305,   307,   307,   311,   311,
+     313,   313,   314,   314,   315,   315,   315,   319,   356,   357,
+     357,   358,   360,   361,   362,   416,   417,   417,   421,   434,
+     435,   436,   437,   454,   459,   462,   463,   464,   466,   469,
+     466,   477,   485,   492,   493,   494,   496,   502,   503,   503,
+     507,   518,   521,   518,   545,   547,   547,   549,   550,   551,
+     553,   556,   553,   559,   560,   562,   563,   566,   567,   570,
+     571,   573,   576,   590,   595,   596,   597,   602,   602,   604,
+     604,   605,   606,   614,   619,   622,   623,   624,   625,   627,
+     631,   640,   643,   640,   651,   656,   656,   657,   663,   664,
+     666,   683,   695,   697,   698,   699,   700,   701,   702,   703,
+     704,   706,   707,   708,   709,   710,   711,   712,   713,   715,
+     716,   717,   718,   719,   720,   721,   722,   723,   724,   725,
+     726,   727,   728,   729,   730,   731,   732,   733,   734,   735,
+     736,   737,   738,   739,   740,   741,   744,   749,   770,   775,
+     776,   777,   779
 };
 #endif
 
@@ -1424,7 +1428,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 128 "compile.y"
+#line 132 "compile.y"
     {
 	Method& method=*new Method(Method::CT_ANY,
 		0, 0, /*min, max numbered_params_count*/
@@ -1435,7 +1439,7 @@ yyreduce:
     break;
 
   case 9:
-#line 143 "compile.y"
+#line 147 "compile.y"
     {
 	const String& command=*LA2S(*yyvsp[-2]);
 	YYSTYPE strings_code=yyvsp[0];
@@ -1446,21 +1450,13 @@ yyreduce:
 		YYERROR;
 	}
 	if(command==CLASS_NAME) {
-		if(PC.cclass->base_class()) { // already changed from default?
-			strcpy(PC.error, "class already have a name '");
-			strncat(PC.error, PC.cclass->name().cstr(), 100);
-			strcat(PC.error, "'");
-			YYERROR;
-		}
 		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			// new class' name
 			const String& name=*LA2S(*strings_code);
 			// creating the class
 			VStateless_class* cclass=new VClass;
-			PC.cclass=cclass;
-			PC.cclass->set_name(name);
-			// append to request's classes
-			PC.request.classes().put(name, cclass);
+			PC.cclass_new=cclass;
+			PC.cclass_new->set_name(name);
 		} else {
 			strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)");
 			YYERROR;
@@ -1469,9 +1465,16 @@ yyreduce:
 		for(size_t i=0; i<strings_code->count(); i+=OPERATIONS_PER_OPVALUE) 
 			PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i));
 	} else if(command==BASE_NAME) {
+		if(PC.append){
+			strcpy(PC.error, "can't set base while appending methods to class '");
+			strncat(PC.error, PC.cclass->name().cstr(), MAX_STRING/2);
+			strcat(PC.error, "'");
+			YYERROR;
+		}
+		PC.class_add();
 		if(PC.cclass->base_class()) { // already changed from default?
 			strcpy(PC.error, "class already have a base '");
-			strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100);
+			strncat(PC.error, PC.cclass->base_class()->name().cstr(), MAX_STRING/2);
 			strcat(PC.error, "'");
 			YYERROR;
 		}
@@ -1499,26 +1502,56 @@ yyreduce:
 			strcpy(PC.error, "@"BASE_NAME" must contain sole name");
 			YYERROR;
 		}
+	} else if(command==OPTIONS_CONTROL_METHOD_NAME) {
+		for(size_t i=0; i<strings_code->count(); i+=OPERATIONS_PER_OPVALUE) {
+			const String& option=*LA2S(*strings_code, i);
+			if(option==OPTION_ALL_VARS_LOCAL_NAME){
+				PC.set_all_vars_local();
+			} 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 {
+						// 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_PARTIAL_CLASS"' and '"OPTION_ALL_VARS_LOCAL_NAME"'");
+				YYERROR;
+			}
+		}
 	} else {
 		strcpy(PC.error, "'");
 		strncat(PC.error, command.cstr(), MAX_STRING/2);
 		strcat(PC.error, "' invalid special name. valid names are "
-			"'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'");
+			"'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"', '"BASE_NAME"' and '"OPTIONS_CONTROL_METHOD_NAME"'.");
 		YYERROR;
 	}
 ;}
     break;
 
   case 13:
-#line 215 "compile.y"
+#line 248 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 17:
-#line 219 "compile.y"
+#line 252 "compile.y"
     { 
+	PC.class_add();
 	PC.explicit_result=false;
-//	const String& name=*LA2S(*$2);
 
 	YYSTYPE params_names_code=yyvsp[-3];
 	ArrayString* params_names=0;
@@ -1530,23 +1563,28 @@ yyreduce:
 
 	YYSTYPE locals_names_code=yyvsp[-2];
 	ArrayString* locals_names=0;
+	bool all_vars_local=false;
 	if(int size=locals_names_code->count()) {
 		locals_names=new ArrayString;
 		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE) {
 			const String* local_name=LA2S(*locals_names_code, i);
 			if(*local_name==RESULT_VAR_NAME)
 				PC.explicit_result=true;
+			else if(*local_name==OPTION_ALL_VARS_LOCAL_NAME)
+				all_vars_local=true;
 			else
 				*locals_names+=local_name;
 		}
 	}
+	if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local())
+		all_vars_local=true;
 
 	Method* method=new Method(
 		//name, 
 		Method::CT_ANY,
 		0, 0/*min,max numbered_params_count*/, 
 		params_names, locals_names, 
-		0/*to be filled later in next {} */, 0);
+		0/*to be filled later in next {} */, 0, all_vars_local);
 
 	*reinterpret_cast<Method**>(&yyval)=method;
 
@@ -1555,112 +1593,183 @@ yyreduce:
     break;
 
   case 18:
-#line 254 "compile.y"
+#line 292 "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 264 "compile.y"
+#line 303 "compile.y"
     {yyval=yyvsp[-1];}
     break;
 
   case 25:
-#line 266 "compile.y"
+#line 305 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 31:
-#line 274 "compile.y"
+#line 313 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 37:
-#line 280 "compile.y"
+#line 319 "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) */
+	yyval=N();
+	YYSTYPE code=yyvsp[0];
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	if(!maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_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
+#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
+#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) */
+		}
+	P(*yyval, *code);
 ;}
     break;
 
   case 38:
-#line 287 "compile.y"
+#line 356 "compile.y"
     { yyval=yyvsp[0] ;}
     break;
 
   case 41:
-#line 289 "compile.y"
+#line 358 "compile.y"
     { yyval=yyvsp[-1] ;}
     break;
 
   case 44:
-#line 293 "compile.y"
+#line 362 "compile.y"
     {
 	yyval=N(); 
-	ArrayOperation* diving_code=yyvsp[0];
+	YYSTYPE diving_code=yyvsp[0];
 	const String* first_name=LA2S(*diving_code);
-	// self.xxx... -> xxx...
+	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(*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*/);
+			count>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
+	}
+
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	else if(maybe_make_get_object_element(*yyval, *diving_code, count)){
+		// optimisation for $object.field + ^object.method[
+	}
+#endif
+
+
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	else if(maybe_make_get_object_var_element(*yyval, *diving_code, count)){
+		// optimisation for $object.$var
+	}
+#endif
+
+
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	else if(count==4){ // optimization
+		O(*yyval,
+			(PC.in_call_value)
+			? 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(*yyval, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
 	} else {
-		O(*yyval, OP_WITH_READ); /* stack: starting context */
+		O(*yyval, OP::OP_WITH_READ); /* stack: starting context */
+		P(*yyval, *diving_code);
+	}
+#else
+	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);
+		// ^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(*yyval, *diving_code);
 	}
+#endif
 	/* diving code; stack: current context */
 ;}
     break;
 
   case 45:
-#line 315 "compile.y"
+#line 416 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 47:
-#line 316 "compile.y"
+#line 417 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 48:
-#line 320 "compile.y"
+#line 421 "compile.y"
     {
-	yyval=yyvsp[-1]; /* stack: context,name */
-	P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */
+	yyval=N();
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT
+	if(maybe_make_root_or_write_construct(*yyval, *yyvsp[-1], *yyvsp[0])){
+		// $a(1) or $.b(2) or $c[d] or $.e[f]
+	} else 
+#endif
+	{
+		P(*yyval, *yyvsp[-1]); /* stack: context,name */
+		P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */
+	}
 ;}
     break;
 
   case 52:
-#line 328 "compile.y"
+#line 437 "compile.y"
     {
 	yyval=N();
-	ArrayOperation* diving_code=yyvsp[0];
+	YYSTYPE diving_code=yyvsp[0];
 	const String* first_name=LA2S(*diving_code);
-	// $self.xxx... -> $xxx...
-	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
+	// $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 */
@@ -1668,21 +1777,21 @@ yyreduce:
     break;
 
   case 53:
-#line 345 "compile.y"
+#line 454 "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 350 "compile.y"
+#line 459 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 58:
-#line 357 "compile.y"
+#line 466 "compile.y"
     {
 	// allow $result_or_other_variable[ letters here any time ]
 	*reinterpret_cast<bool*>(&yyval)=PC.explicit_result; PC.explicit_result=false;
@@ -1690,103 +1799,116 @@ yyreduce:
     break;
 
   case 59:
-#line 360 "compile.y"
+#line 469 "compile.y"
     {
 	PC.explicit_result=*reinterpret_cast<bool*>(&yyvsp[-1]);
 ;}
     break;
 
   case 60:
-#line 362 "compile.y"
+#line 471 "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 368 "compile.y"
+#line 477 "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 376 "compile.y"
+#line 485 "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 387 "compile.y"
+#line 496 "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 394 "compile.y"
+#line 503 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 70:
-#line 398 "compile.y"
+#line 507 "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) */
+#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
+	if((*yyvsp[0]).count())
+#endif
+	{
+		yyval=yyvsp[0]; /* stack: value */
+		changetail_or_append(*yyval, 
+			OP::OP_CALL, true,  /*=>*/ OP::OP_CALL__WRITE,
+			/*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+	}
 ;}
     break;
 
   case 71:
-#line 404 "compile.y"
+#line 518 "compile.y"
     { 
 					PC.in_call_value=true; 
 			;}
     break;
 
   case 72:
-#line 407 "compile.y"
+#line 521 "compile.y"
     {
 				PC.in_call_value=false;
 			;}
     break;
 
   case 73:
-#line 410 "compile.y"
+#line 524 "compile.y"
     { /* ^field.$method{vasya} */
-	yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */
+#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
+	const String* operator_name=LA2S(*yyvsp[-3], 0, OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR);
+	if(operator_name && *operator_name == REM_OPERATOR_NAME){
+		yyval=N();
+	} else 
+#endif
+		{
+			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(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
+			YYSTYPE params_code=yyvsp[-1];
+			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::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+		}
 ;}
     break;
 
   case 76:
-#line 425 "compile.y"
+#line 547 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 80:
-#line 431 "compile.y"
+#line 553 "compile.y"
     {
 	// allow ^call[ letters here any time ]
 	*reinterpret_cast<bool*>(&yyval)=PC.explicit_result; PC.explicit_result=false;
@@ -1794,131 +1916,129 @@ yyreduce:
     break;
 
   case 81:
-#line 434 "compile.y"
+#line 556 "compile.y"
     {
 	PC.explicit_result=*reinterpret_cast<bool*>(&yyvsp[-1]);
 ;}
     break;
 
   case 82:
-#line 436 "compile.y"
+#line 558 "compile.y"
     {yyval=yyvsp[-2];}
     break;
 
   case 83:
-#line 437 "compile.y"
+#line 559 "compile.y"
     {yyval=yyvsp[-1];}
     break;
 
   case 84:
-#line 438 "compile.y"
+#line 560 "compile.y"
     {yyval=yyvsp[-1];}
     break;
 
   case 86:
-#line 441 "compile.y"
+#line 563 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 88:
-#line 445 "compile.y"
+#line 567 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 90:
-#line 449 "compile.y"
+#line 571 "compile.y"
     { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 91:
-#line 451 "compile.y"
+#line 573 "compile.y"
     {
 	yyval=yyvsp[0];
-	O(*yyval, OP_STORE_PARAM);
 ;}
     break;
 
   case 92:
-#line 455 "compile.y"
+#line 576 "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);
+		YYSTYPE code=N();
+		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 470 "compile.y"
+#line 590 "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 482 "compile.y"
+#line 602 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 100:
-#line 484 "compile.y"
+#line 604 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 102:
-#line 486 "compile.y"
+#line 606 "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 494 "compile.y"
+#line 614 "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 507 "compile.y"
+#line 627 "compile.y"
     {
 	yyval=yyvsp[0];
-	O(*yyval, OP_GET_ELEMENT);
+	O(*yyval, OP::OP_GET_ELEMENT);
 ;}
     break;
 
   case 110:
-#line 511 "compile.y"
+#line 631 "compile.y"
     {
-	ArrayOperation* code;
+	YYSTYPE code;
 	{
 		change_string_literal_to_write_string_literal(*(code=yyvsp[-1]));
 		P(*code, *yyvsp[0]);
 	}
 	yyval=N(); 
-	OA(*yyval, OP_STRING_POOL, code);
+	OA(*yyval, OP::OP_STRING_POOL, code);
 ;}
     break;
 
   case 111:
-#line 520 "compile.y"
+#line 640 "compile.y"
     {
 	// allow $result_or_other_variable[ letters here any time ]
 	*reinterpret_cast<bool*>(&yyval)=PC.explicit_result; PC.explicit_result=false;
@@ -1926,46 +2046,46 @@ yyreduce:
     break;
 
   case 112:
-#line 523 "compile.y"
+#line 643 "compile.y"
     {
 	PC.explicit_result=*reinterpret_cast<bool*>(&yyvsp[-1]);
 ;}
     break;
 
   case 113:
-#line 525 "compile.y"
+#line 645 "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 531 "compile.y"
+#line 651 "compile.y"
     {
 	yyval=N(); 
-	O(*yyval, OP_WITH_READ);
+	O(*yyval, OP::OP_WITH_READ);
 	P(*yyval, *yyvsp[0]);
 ;}
     break;
 
   case 116:
-#line 536 "compile.y"
+#line 656 "compile.y"
     { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;}
     break;
 
   case 117:
-#line 537 "compile.y"
+#line 657 "compile.y"
     {
 	yyval=yyvsp[0];
-	O(*yyval, OP_GET_ELEMENT__WRITE);
+	O(*yyval, OP::OP_GET_ELEMENT__WRITE);
 ;}
     break;
 
   case 120:
-#line 546 "compile.y"
+#line 666 "compile.y"
     {
 	yyval=yyvsp[-1]; // stack: class name string
 	if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class
@@ -1976,255 +2096,272 @@ yyreduce:
 			YYERROR;
 		}
 	}
-	O(*yyval, OP_GET_CLASS);
+#ifdef OPTIMIZE_BYTECODE_GET_CLASS
+	// optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string
+	maybe_change_first_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 558 "compile.y"
+#line 683 "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 577 "compile.y"
+#line 702 "compile.y"
     { yyval = yyvsp[-1] ;}
     break;
 
   case 129:
-#line 578 "compile.y"
+#line 703 "compile.y"
     { yyval = yyvsp[-1] ;}
     break;
 
   case 130:
-#line 579 "compile.y"
+#line 704 "compile.y"
     { yyval = yyvsp[-1]; ;}
     break;
 
   case 131:
-#line 581 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_NEG) ;}
+#line 706 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_NEG) ;}
     break;
 
   case 132:
-#line 582 "compile.y"
+#line 707 "compile.y"
     { yyval=yyvsp[0] ;}
     break;
 
   case 133:
-#line 583 "compile.y"
-    { yyval=yyvsp[0];	 O(*yyval, OP_INV) ;}
+#line 708 "compile.y"
+    { yyval=yyvsp[0];	 O(*yyval, OP::OP_INV) ;}
     break;
 
   case 134:
-#line 584 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_NOT) ;}
+#line 709 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_NOT) ;}
     break;
 
   case 135:
-#line 585 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_DEF) ;}
+#line 710 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_DEF) ;}
     break;
 
   case 136:
-#line 586 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_IN) ;}
+#line 711 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_IN) ;}
     break;
 
   case 137:
-#line 587 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_FEXISTS) ;}
+#line 712 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_FEXISTS) ;}
     break;
 
   case 138:
-#line 588 "compile.y"
-    { yyval=yyvsp[0];  O(*yyval, OP_DEXISTS) ;}
+#line 713 "compile.y"
+    { yyval=yyvsp[0];  O(*yyval, OP::OP_DEXISTS) ;}
     break;
 
   case 139:
-#line 590 "compile.y"
-    {	yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_SUB) ;}
+#line 715 "compile.y"
+    {	yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_SUB) ;}
     break;
 
   case 140:
-#line 591 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_ADD) ;}
+#line 716 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_ADD) ;}
     break;
 
   case 141:
-#line 592 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MUL) ;}
+#line 717 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_MUL) ;}
     break;
 
   case 142:
-#line 593 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_DIV) ;}
+#line 718 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_DIV) ;}
     break;
 
   case 143:
-#line 594 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MOD) ;}
+#line 719 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_MOD) ;}
     break;
 
   case 144:
-#line 595 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_INTDIV) ;}
+#line 720 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_INTDIV) ;}
     break;
 
   case 145:
-#line 596 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SL) ;}
+#line 721 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_SL) ;}
     break;
 
   case 146:
-#line 597 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SR) ;}
+#line 722 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_SR) ;}
     break;
 
   case 147:
-#line 598 "compile.y"
-    { yyval=yyvsp[-2]; 	P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_AND) ;}
+#line 723 "compile.y"
+    { yyval=yyvsp[-2]; 	P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_AND) ;}
     break;
 
   case 148:
-#line 599 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_OR) ;}
+#line 724 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_OR) ;}
     break;
 
   case 149:
-#line 600 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_XOR) ;}
+#line 725 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_BIN_XOR) ;}
     break;
 
   case 150:
-#line 601 "compile.y"
-    { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_AND) ;}
+#line 726 "compile.y"
+    { yyval=yyvsp[-2];  OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP::OP_LOG_AND) ;}
     break;
 
   case 151:
-#line 602 "compile.y"
-    { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_OR) ;}
+#line 727 "compile.y"
+    { yyval=yyvsp[-2];  OA(*yyval, OP::OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP::OP_LOG_OR) ;}
     break;
 
   case 152:
-#line 603 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_LOG_XOR) ;}
+#line 728 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_LOG_XOR) ;}
     break;
 
   case 153:
-#line 604 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LT) ;}
+#line 729 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_LT) ;}
     break;
 
   case 154:
-#line 605 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GT) ;}
+#line 730 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_GT) ;}
     break;
 
   case 155:
-#line 606 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LE) ;}
+#line 731 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_LE) ;}
     break;
 
   case 156:
-#line 607 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GE) ;}
+#line 732 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_GE) ;}
     break;
 
   case 157:
-#line 608 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_EQ) ;}
+#line 733 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_EQ) ;}
     break;
 
   case 158:
-#line 609 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_NE) ;}
+#line 734 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_NUM_NE) ;}
     break;
 
   case 159:
-#line 610 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LT) ;}
+#line 735 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_LT) ;}
     break;
 
   case 160:
-#line 611 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GT) ;}
+#line 736 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_GT) ;}
     break;
 
   case 161:
-#line 612 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LE) ;}
+#line 737 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_LE) ;}
     break;
 
   case 162:
-#line 613 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GE) ;}
+#line 738 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_GE) ;}
     break;
 
   case 163:
-#line 614 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_EQ) ;}
+#line 739 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_EQ) ;}
     break;
 
   case 164:
-#line 615 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_NE) ;}
+#line 740 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_STR_NE) ;}
     break;
 
   case 165:
-#line 616 "compile.y"
-    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_IS) ;}
+#line 741 "compile.y"
+    { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP::OP_IS) ;}
     break;
 
   case 166:
-#line 619 "compile.y"
+#line 744 "compile.y"
     {
-	// optimized from OP_STRING->OP_VALUE for doubles
+	// optimized OP_STRING => OP_VALUE for doubles
 	maybe_change_string_literal_to_double_literal(*(yyval=yyvsp[0]));
 ;}
     break;
 
   case 167:
-#line 624 "compile.y"
+#line 749 "compile.y"
     {
+#ifdef OPTIMIZE_BYTECODE_STRING_POOL
+	// it brakes ^if(" 09 "){...}
+	YYSTYPE code=yyvsp[0];
 	yyval=N();
-	OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
+	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(*yyval, *code);
+	} else {
+		OA(*yyval, OP::OP_STRING_POOL, code); /* stack: empty write context */
+	}
+#else
+	yyval=N();
+	OA(*yyval, OP::OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
+#endif
 	/* some code that writes to that context */
 	/* context=pop; stack: context.get_string() */
 ;}
     break;
 
   case 168:
-#line 633 "compile.y"
+#line 770 "compile.y"
     {
-	// 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(*(yyval=yyvsp[0]))
 ;}
     break;
 
   case 169:
-#line 638 "compile.y"
+#line 775 "compile.y"
     { yyval=VL(/*we know that we will not change it*/const_cast<VVoid*>(&vvoid), 0, 0, 0) ;}
     break;
 
   case 170:
-#line 639 "compile.y"
+#line 776 "compile.y"
     { yyval = VL(/*we know that we will not change it*/const_cast<VBool*>(&vtrue), 0, 0, 0) ;}
     break;
 
   case 171:
-#line 640 "compile.y"
+#line 777 "compile.y"
     { yyval = VL(/*we know that we will not change it*/const_cast<VBool*>(&vfalse), 0, 0, 0) ;}
     break;
 
   case 172:
-#line 642 "compile.y"
+#line 779 "compile.y"
     { yyval=N() ;}
     break;
 
@@ -2232,7 +2369,7 @@ yyreduce:
     }
 
 /* Line 1010 of yacc.c.  */
-#line 2236 "compile.tab.C"
+#line 2373 "compile.tab.C"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -2457,7 +2594,7 @@ yyreturn:
 }
 
 
-#line 644 "compile.y"
+#line 781 "compile.y"
 
 #endif
 
@@ -2550,7 +2687,7 @@ case LS_DEF_COMMENT:
 default:
 			switch(*pc.source) {
 			// ^escaping some punctuators
-			case '^': case '$': case ';':
+			case '^': case '$': case ';': case '@':
 			case '(': case ')':
 			case '[': case ']':
 			case '{': case '}':
@@ -2578,7 +2715,7 @@ default:
 					pc.string.append_strdup_know_length(begin, end-begin);
 				}
 				// #HH ?
-				if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) {
+				if(pc.source[1] && isxdigit(pc.source[1]) && pc.source[2] && isxdigit(pc.source[2])) {
 					char c=(char)(
 						hex_value[(unsigned char)pc.source[1]]*0x10+
 						hex_value[(unsigned char)pc.source[2]]);
@@ -2597,7 +2734,14 @@ default:
 					// skip analysis = forced literal
 					continue;
 				}
-				break;
+				// just escaped char
+				// reset piece 'begin' position & line
+				begin=pc.source;
+				begin_pos=pc.pos;
+				// skip over _ after ^
+				pc.source++;  pc.pos.col++;
+				// skip analysis = forced literal
+				continue;
 			}
 			break;
 			}
@@ -2894,14 +3038,18 @@ default:
 			case 'd':
 				if(end==begin) // right after whitespace
 					if(pc.source[0]=='e' && pc.source[1]=='f') { // def
-						skip_analized=2;
-						result=DEF;
-						goto break2;
+						switch(pc.source[2]){
+						case ' ': case '\t': case '\n': case '"': case '\'': case '^': case '$': // non-quoted string without whitespace after 'def' is not allowed
+							skip_analized=2;
+							result=DEF;
+							goto break2;
+						}
+						// error: incorrect char after 'def'
 					}
 				break;
 			case 't':
 				if(end==begin) // right after whitespace
-					if(pc.source[0]=='r' && pc.source[1]=='u' && pc.source[2]=='e') { // def
+					if(pc.source[0]=='r' && pc.source[1]=='u' && pc.source[2]=='e') { // true
 						skip_analized=3;
 						result=LITERAL_TRUE;
 						goto break2;
@@ -2909,7 +3057,7 @@ default:
 				break;
 			case 'f':
 				if(end==begin) // right after whitespace
-					if(pc.source[0]=='a' && pc.source[1]=='l' && pc.source[2]=='s' && pc.source[3]=='e') { // def
+					if(pc.source[0]=='a' && pc.source[1]=='l' && pc.source[2]=='s' && pc.source[3]=='e') { // false
 						skip_analized=4;
 						result=LITERAL_FALSE;
 						goto break2;