--- parser3/src/main/compile.y	2003/04/03 12:40:53	1.204.2.8.2.13
+++ parser3/src/main/compile.y	2009/04/17 09:11:15	1.231
@@ -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.204.2.8.2.13 2003/04/03 12:40:53 paf Exp $
+	$Id: compile.y,v 1.231 2009/04/17 09:11:15 misha Exp $
 */
 
 /**
@@ -41,7 +41,9 @@
 // defines
 
 #define USE_CONTROL_METHOD_NAME "USE"
-#define TAB_SIZE 8
+#define OPTIONS_CONTROL_METHOD_NAME "OPTIONS"
+#define OPTION_ALL_VARS_LOCAL_NAME "locals"
+#define OPTION_PARTIAL_CLASS "partial"
 
 // forwards
 
@@ -49,6 +51,9 @@ static int real_yyerror(Parse_control* p
 static void yyprint(FILE* file, int type, YYSTYPE value);
 static int yylex(YYSTYPE* lvalp, void* pc);
 
+static const VBool vfalse(false);
+static const VBool vtrue(true);
+static const VVoid vvoid;
 
 // local convinient inplace typecast & var
 #undef PC
@@ -68,7 +73,7 @@ static int yylex(YYSTYPE* lvalp, void* p
 %token BAD_HEX_LITERAL
 %token BAD_METHOD_DECL_START
 %token BAD_METHOD_PARAMETER_NAME_CHARACTER
-%token BAD_MATH_OPERATOR_CHARACTER
+%token BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE
 
 %token LAND "&&"
 %token LOR "||"
@@ -95,6 +100,9 @@ static int yylex(YYSTYPE* lvalp, void* p
 %token DEXISTS "-d"
 %token IS "is"
 
+%token LITERAL_TRUE "true"
+%token LITERAL_FALSE "false"
+
 /* logical */
 %left "!||"
 %left "||"
@@ -138,43 +146,42 @@ control_method: '@' STRING '\n'
 				maybe_control_strings {
 	const String& command=*LA2S(*$2);
 	YYSTYPE strings_code=$4;
-	if(strings_code->count()<1*2) {
+	if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) {
 		strcpy(PC.error, "@");
 		strcat(PC.error, command.cstr());
 		strcat(PC.error, " is empty");
 		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*2) {
+		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 sole name");
+			strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)");
 			YYERROR;
 		}
 	} else if(command==USE_CONTROL_METHOD_NAME) {
-		for(size_t i=0; i<strings_code->count(); i+=2) 
+		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;
 		}
-		if(strings_code->count()==1*2) {
+		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)) {
 				// @CLASS == @BASE sanity check
@@ -198,11 +205,41 @@ control_method: '@' STRING '\n'
 			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;
 	}
 };
@@ -211,33 +248,58 @@ control_strings: control_string | contro
 control_string: maybe_string '\n';
 maybe_string: empty | STRING;
 
-code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' 
-			maybe_codes {
-	const String& name=*LA2S(*$2);
+code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' { 
+	PC.class_add();
+	PC.explicit_result=false;
+	PC.write_to_result=false;
 
 	YYSTYPE params_names_code=$3;
 	ArrayString* params_names=0;
 	if(int size=params_names_code->count()) {
 		params_names=new ArrayString;
-		for(int i=0; i<size; i+=2)
+		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE)
 			*params_names+=LA2S(*params_names_code, i);
 	}
 
 	YYSTYPE locals_names_code=$4;
 	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+=2)
-			*locals_names+=LA2S(*locals_names_code, i);
+		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(
+	Method* method=new Method(
 		//name, 
 		Method::CT_ANY,
 		0, 0/*min,max numbered_params_count*/, 
 		params_names, locals_names, 
-		$7, 0);
-	PC.cclass->add_method(PC.alias_method(name), method);
+		0/*to be filled later in next {} */, 0, all_vars_local);
+
+	*reinterpret_cast<Method**>(&$$)=method;
+
+	// todo: check [][;result;]
+} maybe_codes {
+		Method& method=*reinterpret_cast<Method*>($7);
+		// fill in the code
+		method.parser_code=$8;
+
+		// write to $result was detected in method's code during compilation
+		method.write_to_result=PC.write_to_result;
+
+		// register in class
+		const String& name=*LA2S(*$2);
+		PC.cclass->add_method(PC.alias_method(name), method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -260,8 +322,8 @@ action: get | put | call;
 get: get_value {
 	$$=$1; /* stack: resulting value */ 
 	changetail_or_append(*$$, 
-		OP_GET_ELEMENT, false,  /*->*/OP_GET_ELEMENT__WRITE,
-		/*or */OP_WRITE_VALUE
+		OP::OP_GET_ELEMENT, false,  /*->*/OP::OP_GET_ELEMENT__WRITE,
+		/*or */OP::OP_WRITE_VALUE
 		); /* value=pop; wcontext.write(value) */
 };
 get_value: '$' get_name_value { $$=$2 };
@@ -275,19 +337,19 @@ name_without_curly_rdive_read: name_with
 	ArrayOperation* diving_code=$1;
 	const String* first_name=LA2S(*diving_code);
 	// self.xxx... -> xxx...
-	// OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
+	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
-		O(*$$, OP_WITH_SELF); /* stack: starting context */
-		P(*$$, *diving_code, 
+		O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */
+		P(*yyval, *diving_code, 
 			/* skip over... */
-			diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/);
+			diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
 	} else {
-		O(*$$, OP_WITH_READ); /* stack: starting context */
+		O(*yyval, OP::OP_WITH_READ); /* stack: starting context */
 
 		// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
-		// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR.
-		if(PC.in_call_value && diving_code->count()==3)
-			diving_code->put(2, OP_GET_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);
 		P(*$$, *diving_code);
 	}
 	/* diving code; stack: current context */
@@ -310,21 +372,23 @@ name_expr_wdive_root: name_expr_dive_cod
 	ArrayOperation* diving_code=$1;
 	const String* first_name=LA2S(*diving_code);
 	// $self.xxx... -> $xxx...
-	// OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
+	// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
-		O(*$$, OP_WITH_SELF); /* stack: starting context */
+		O(*$$, OP::OP_WITH_SELF); /* stack: starting context */
 		P(*$$, *diving_code, 
 			/* skip over... */
-			diving_code->count()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/);
+			diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
 	} else {
-		O(*$$, OP_WITH_ROOT); /* stack: starting context */
+		if(first_name && *first_name==RESULT_VAR_NAME)
+			PC.write_to_result=true;
+		O(*$$, OP::OP_WITH_ROOT); /* stack: starting context */
 		P(*$$, *diving_code);
 	}
 	/* diving code; stack: current context */
 };
 name_expr_wdive_write: '.' name_expr_dive_code {
 	$$=N(); 
-	O(*$$, OP_WITH_WRITE); /* stack: starting context */
+	O(*$$, OP::OP_WITH_WRITE); /* stack: starting context */
 	P(*$$, *$2); /* diving code; stack: context,name */
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P(*$$, *$2) };
@@ -334,24 +398,29 @@ 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
-	O(*$$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
+	$$=$3; // stack: context, name, value
+	O(*$$, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
 ;
 construct_round: '(' expr_value ')' { 
 	$$=N(); 
-	O(*$$, OP_PREPARE_TO_EXPRESSION);
+	O(*$$, OP::OP_PREPARE_TO_EXPRESSION);
 	// stack: context, name
 	P(*$$, *$2); // stack: context, name, value
-	O(*$$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
+	O(*$$, OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
 }
 ;
 construct_curly: '{' maybe_codes '}' {
 	// stack: context, name
 	$$=N(); 
-	OA(*$$, OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
+	OA(*$$, OP::OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
 };
 
 any_constructor_code_value: 
@@ -361,7 +430,7 @@ any_constructor_code_value:
 ;
 constructor_code_value: constructor_code {
 	$$=N(); 
-	OA(*$$, OP_OBJECT_POOL, $1); /* stack: empty write context */
+	OA(*$$, OP::OP_OBJECT_POOL, $1); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 };
@@ -373,8 +442,8 @@ codes__excluding_sole_str_literal: actio
 call: call_value {
 	$$=$1; /* stack: value */
 	changetail_or_append(*$$, 
-		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) */
 };
 call_value: '^' { 
 					PC.in_call_value=true; 
@@ -386,13 +455,13 @@ call_value: '^' {
 	$$=$3; /* with_xxx,diving code; stack: context,method_junction */
 
 	YYSTYPE params_code=$5;
-	if(params_code->count()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM]
-		if(Value* value=LA2V(*params_code)) // it is OP_VALUE + value?
-			if(!value->is_defined()) // value is VVoid?
+	if(params_code->count()==4) { // probably [] case. [OP::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(*$$, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
+	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;
@@ -403,7 +472,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:
@@ -420,27 +494,32 @@ store_curly_param_parts:
 ;
 store_code_param_part: code_param_value {
 	$$=$1;
-	O(*$$, OP_STORE_PARAM);
+	O(*$$, OP::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::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]
+		$$=expr_code; 
+		O(*$$, OP::OP_STORE_PARAM); // no evaluating
+	} else {
+		ArrayOperation* code=N();
+		O(*code, OP::OP_PREPARE_TO_EXPRESSION);
+		P(*code, *expr_code);
+		O(*code, OP::OP_WRITE_EXPR_RESULT);
+		$$=N(); 
+		OA(*$$, OP::OP_EXPR_CODE__STORE_PARAM, code);
+	}
 };
 store_curly_param_part: maybe_codes {
 	$$=N(); 
-	OA(*$$, OP_CURLY_CODE__STORE_PARAM, $1);
+	OA(*$$, OP::OP_CURLY_CODE__STORE_PARAM, $1);
 };
 code_param_value:
 	void_value /* optimized [;...] case */
 |	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 */
 
@@ -454,12 +533,12 @@ name_advance1: name_expr_value {
 
 	/* stack: context */
 	$$=$1; /* stack: context,name */
-	O(*$$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O(*$$, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 };
 name_advance2: name_expr_value {
 	/* stack: context */
 	$$=$1; /* stack: context,name */
-	O(*$$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O(*$$, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 }
 |	STRING BOGUS
 ;
@@ -471,7 +550,7 @@ name_expr_value:
 ;
 name_expr_subvar_value: '$' subvar_ref_name_rdive {
 	$$=$2;
-	O(*$$, OP_GET_ELEMENT);
+	O(*$$, OP::OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
 	ArrayOperation* code;
@@ -480,23 +559,28 @@ name_expr_with_subvar_value: STRING subv
 		P(*code, *$2);
 	}
 	$$=N(); 
-	OA(*$$, OP_STRING_POOL, code);
+	OA(*$$, OP::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::OP_OBJECT_POOL, $3); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 };
 subvar_ref_name_rdive: STRING {
 	$$=N(); 
-	O(*$$, OP_WITH_READ);
+	O(*$$, OP::OP_WITH_READ);
 	P(*$$, *$1);
 };
 subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P(*$$, *$2) };
 subvar__get_write: '$' subvar_ref_name_rdive {
 	$$=$2;
-	O(*$$, OP_GET_ELEMENT__WRITE);
+	O(*$$, OP::OP_GET_ELEMENT__WRITE);
 };
 
 class_prefix:
@@ -513,7 +597,7 @@ class_static_prefix: STRING ':' {
 			YYERROR;
 		}
 	}
-	O(*$$, OP_GET_CLASS);
+	O(*$$, OP::OP_GET_CLASS);
 };
 class_constructor_prefix: class_static_prefix ':' {
 	$$=$1;
@@ -521,66 +605,69 @@ class_constructor_prefix: class_static_p
 		strcpy(PC.error, ":: not allowed here");
 		YYERROR;
 	}
-	O(*$$, OP_PREPARE_TO_CONSTRUCT_OBJECT);
+	O(*$$, OP::OP_PREPARE_TO_CONSTRUCT_OBJECT);
 };
 
 
 /* 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
+|   true_value
+|   false_value
 |	get_value
 |	call_value
-|	'"' string_inside_quotes_value '"' { $$ = $2; }
-|	'\'' string_inside_quotes_value '\'' { $$ = $2; }
+|	'"' string_inside_quotes_value '"' { $$ = $2 }
+|	'\'' string_inside_quotes_value '\'' { $$ = $2 }
 |	'(' expr ')' { $$ = $2; }
 /* stack: operand // stack: @operand */
-|	'-' expr %prec NUNARY { $$=$2;  O(*$$, OP_NEG) }
+|	'-' expr %prec NUNARY { $$=$2;  O(*$$, OP::OP_NEG) }
 |	'+' expr %prec NUNARY { $$=$2 }
-|	'~' expr { $$=$2;	 O(*$$, OP_INV) }
-|	'!' expr { $$=$2;  O(*$$, OP_NOT) }
-|	"def" expr { $$=$2;  O(*$$, OP_DEF) }
-|	"in" expr { $$=$2;  O(*$$, OP_IN) }
-|	"-f" expr { $$=$2;  O(*$$, OP_FEXISTS) }
-|	"-d" expr { $$=$2;  O(*$$, OP_DEXISTS) }
+|	'~' expr { $$=$2;	 O(*$$, OP::OP_INV) }
+|	'!' expr { $$=$2;  O(*$$, OP::OP_NOT) }
+|	"def" expr { $$=$2;  O(*$$, OP::OP_DEF) }
+|	"in" expr { $$=$2;  O(*$$, OP::OP_IN) }
+|	"-f" expr { $$=$2;  O(*$$, OP::OP_FEXISTS) }
+|	"-d" expr { $$=$2;  O(*$$, OP::OP_DEXISTS) }
 /* stack: a,b // stack: a@b */
-|	expr '-' expr {	$$=$1;  P(*$$, *$3);  O(*$$, OP_SUB) }
-|	expr '+' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_ADD) }
-|	expr '*' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_MUL) }
-|	expr '/' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_DIV) }
-|	expr '%' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_MOD) }
-|	expr '\\' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_INTDIV) }
-|	expr "<<" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_BIN_SL) }
-|	expr ">>" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_BIN_SR) }
-|	expr '&' expr { $$=$1; 	P(*$$, *$3);  O(*$$, OP_BIN_AND) }
-|	expr '|' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_BIN_OR) }
-|	expr "!|" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_BIN_XOR) }
-|	expr "&&" expr { $$=$1;  OA(*$$, OP_NESTED_CODE, $3);  O(*$$, OP_LOG_AND) }
-|	expr "||" expr { $$=$1;  OA(*$$, OP_NESTED_CODE, $3);  O(*$$, OP_LOG_OR) }
-|	expr "!||" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_LOG_XOR) }
-|	expr '<' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_NUM_LT) }
-|	expr '>' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_NUM_GT) }
-|	expr "<=" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_NUM_LE) }
-|	expr ">=" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_NUM_GE) }
-|	expr "==" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_NUM_EQ) }
-|	expr "!=" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_NUM_NE) }
-|	expr "lt" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_STR_LT) }
-|	expr "gt" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_STR_GT) }
-|	expr "le" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_STR_LE) }
-|	expr "ge" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_STR_GE) }
-|	expr "eq" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_STR_EQ) }
-|	expr "ne" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_STR_NE) }
-|	expr "is" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP_IS) }
+|	expr '-' expr {	$$=$1;  P(*$$, *$3);  O(*$$, OP::OP_SUB) }
+|	expr '+' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_ADD) }
+|	expr '*' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_MUL) }
+|	expr '/' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_DIV) }
+|	expr '%' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_MOD) }
+|	expr '\\' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_INTDIV) }
+|	expr "<<" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_BIN_SL) }
+|	expr ">>" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_BIN_SR) }
+|	expr '&' expr { $$=$1; 	P(*$$, *$3);  O(*$$, OP::OP_BIN_AND) }
+|	expr '|' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_BIN_OR) }
+|	expr "!|" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_BIN_XOR) }
+|	expr "&&" expr { $$=$1;  OA(*$$, OP::OP_NESTED_CODE, $3);  O(*$$, OP::OP_LOG_AND) }
+|	expr "||" expr { $$=$1;  OA(*$$, OP::OP_NESTED_CODE, $3);  O(*$$, OP::OP_LOG_OR) }
+|	expr "!||" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_LOG_XOR) }
+|	expr '<' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_NUM_LT) }
+|	expr '>' expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_NUM_GT) }
+|	expr "<=" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_NUM_LE) }
+|	expr ">=" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_NUM_GE) }
+|	expr "==" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_NUM_EQ) }
+|	expr "!=" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_NUM_NE) }
+|	expr "lt" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_STR_LT) }
+|	expr "gt" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_STR_GT) }
+|	expr "le" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_STR_LE) }
+|	expr "ge" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_STR_GE) }
+|	expr "eq" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_STR_EQ) }
+|	expr "ne" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::OP_STR_NE) }
+|	expr "is" expr { $$=$1;  P(*$$, *$3);  O(*$$, OP::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 */
+	OA(*$$, OP::OP_STRING_POOL, $1); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.get_string() */
 };
@@ -592,7 +679,10 @@ write_string: STRING {
 	change_string_literal_to_write_string_literal(*($$=$1))
 };
 
-void_value: /* empty */ { $$=VL(new VVoid(), 0, 0, 0) };
+void_value: /* empty */ { $$=VL(/*we know that we will not change it*/const_cast<VVoid*>(&vvoid), 0, 0, 0) }
+true_value: "true" { $$ = VL(/*we know that we will not change it*/const_cast<VBool*>(&vtrue), 0, 0, 0) }
+false_value: "false" { $$ = VL(/*we know that we will not change it*/const_cast<VBool*>(&vfalse), 0, 0, 0) }
+
 empty: /* empty */ { $$=N() };
 
 %%
@@ -645,12 +735,13 @@ static int yylex(YYSTYPE *lvalp, void *a
 		c=*(end=(pc.source++));
 //		fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, pc.sp);
 
-		if(c=='\n') {
+		if(c=='\n')
 			pc.pos_next_line();
-		} else
-			pc.pos.col+=c=='\t'?TAB_SIZE:1;
+		else
+			pc.pos_next_c(c);
+//		fprintf(stderr, "\nchar: %c file(%d:%d)", c, pc.pos.line, pc.pos.col);
 
-		if(c=='@' && pc.pos.col==0+1) {
+		if(pc.pos.col==0+1 && c=='@') {
 			if(pc.ls==LS_DEF_SPECIAL_BODY) {
 				// @SPECIAL
 				// ...
@@ -663,7 +754,8 @@ static int yylex(YYSTYPE *lvalp, void *a
 			} else // @ in first column inside some code [when could that be?]
 				result=BAD_METHOD_DECL_START;
 			goto break2;
-		} else if(c=='^') {
+		}
+		if(c=='^') {
 			if(pc.ls==LS_METHOD_AFTER) {
 				// handle after-method situation
 				pop_LS(pc);
@@ -685,7 +777,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 '}':
@@ -694,7 +786,7 @@ default:
 					if(!pc.string_start)
 						pc.string_start=begin_pos;
 					// append piece till ^
-					pc.string.append_strdup(begin, end-begin);
+					pc.string.append_strdup_know_length(begin, end-begin);
 				}
 				// reset piece 'begin' position & line
 				begin=pc.source; // ->punctuation
@@ -710,13 +802,13 @@ default:
 					if(!pc.string_start)
 						pc.string_start=begin_pos;
 					// append piece till ^
-					pc.string.append_strdup(begin, end-begin);
+					pc.string.append_strdup_know_length(begin, end-begin);
 				}
 				// #HH ?
-				if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) {
-					char c=
+				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]];
+						hex_value[(unsigned char)pc.source[2]]);
 					if(c==0) {
 						result=BAD_HEX_LITERAL;
 						goto break2; // wrong hex value[no ^#00 chars allowed]: bail out
@@ -732,7 +824,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;
 			}
@@ -743,7 +842,7 @@ default:
 				if(!pc.string_start)
 					pc.string_start=begin_pos;
 				// append piece till #
-				pc.string.append_strdup(begin, end-begin);
+				pc.string.append_strdup_know_length(begin, end-begin);
 			}
 			// fall into COMMENT lexical state [wait for \n]
 			push_LS(pc, LS_USER_COMMENT);
@@ -782,6 +881,16 @@ default:
 					lexical_brackets_nestage++;
 				break;
 			}
+			if(pc.explicit_result && c)
+				switch(c) {
+				case '\n': case ' ': case '\t':
+					begin=pc.source;
+					begin_pos=pc.pos;
+					continue; // skip it
+				default:
+					result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE;
+					goto break2;
+				}
 			break;
 			
 		// #COMMENT
@@ -888,7 +997,7 @@ default:
 					if(!pc.string_start)
 						pc.string_start=begin_pos;
 					// append piece till #
-					pc.string.append_strdup(begin, end-begin);
+					pc.string.append_strdup_know_length(begin, end-begin);
 				}
 				// fall into COMMENT lexical state [wait for \n]
 				push_LS(pc, LS_EXPRESSION_COMMENT);
@@ -1019,8 +1128,28 @@ default:
 			case 'd':
 				if(end==begin) // right after whitespace
 					if(pc.source[0]=='e' && pc.source[1]=='f') { // def
-						skip_analized=2;
-						result=DEF;
+						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') { // true
+						skip_analized=3;
+						result=LITERAL_TRUE;
+						goto break2;
+					}
+				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') { // false
+						skip_analized=4;
+						result=LITERAL_FALSE;
 						goto break2;
 					}
 				break;
@@ -1100,6 +1229,8 @@ default:
 			case '=': case '!':
 			// common delimiters
 			case ',': case '?': case '#':
+			// mysql column separators
+			case '`':
 			// before call
 			case '^': 
 				pop_LS(pc);
@@ -1235,6 +1366,7 @@ default:
 			case ':': // ':name' or 'class:name'
 			case '^': // ^abc^xxx wrong. bailing out
 			case ']': case '}': case ')': // ^abc]}) wrong. bailing out
+			case ' ': // ^if ( wrong. bailing out
 				RC;
 			}
 			break;
@@ -1281,6 +1413,16 @@ default:
 				lexical_brackets_nestage++;
 				break;
 			}
+			if(pc.explicit_result && c)
+				switch(c) {
+				case '\n': case ' ': case '\t':
+					begin=pc.source;
+					begin_pos=pc.pos;
+					continue; // skip it
+				default:
+					result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE;
+					goto break2;
+				}
 			break;
 
 		case LS_METHOD_AFTER:
@@ -1322,11 +1464,11 @@ break2:
 			if(!pc.string_start)
 				pc.string_start=begin_pos;
 			// append it
-			pc.string.append_strdup(begin, end-begin);
+			pc.string.append_strdup_know_length(begin, end-begin);
 		}
 	}
 	if(!pc.string.is_empty()) { // something accumulated?
-		// create STRING value: array of OP_VALUE+vstring
+		// create STRING value: array of OP_VALUE+origin+vstring
  		*lvalp=VL(
 			new VString(*new String(pc.string, String::L_CLEAN)),
 			pc.file_no, pc.string_start.line, pc.string_start.col);