--- parser3/src/main/compile.y	2005/08/05 13:01:16	1.213.10.1
+++ parser3/src/main/compile.y	2007/10/25 10:52:48	1.222
@@ -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.213.10.1 2005/08/05 13:01:16 paf Exp $
+	$Id: compile.y,v 1.222 2007/10/25 10:52:48 misha Exp $
 */
 
 /**
@@ -48,6 +48,10 @@ 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
 #define PC  (*(Parse_control *)pc)
@@ -93,6 +97,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 "||"
@@ -211,7 +218,6 @@ maybe_string: empty | STRING;
 
 code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' { 
 	PC.explicit_result=false;
-	const String& name=*LA2S(*$2);
 
 	YYSTYPE params_names_code=$3;
 	ArrayString* params_names=0;
@@ -240,13 +246,17 @@ code_method: '@' STRING bracketed_maybe_
 		0, 0/*min,max numbered_params_count*/, 
 		params_names, locals_names, 
 		0/*to be filled later in next {} */, 0);
-	PC.cclass->add_method(PC.alias_method(name), *method);
+
 	*reinterpret_cast<Method**>(&$$)=method;
 
 	// todo: check [][;result;]
 } maybe_codes {
-	// fill in the code
-	reinterpret_cast<Method*>($7)->parser_code=$8;
+        Method& method=*reinterpret_cast<Method*>($7);
+        // fill in the code
+        method.parser_code=$8;
+        // register in class
+        const String& name=*LA2S(*$2);
+        PC.cclass->add_method(PC.alias_method(name), method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -402,7 +412,7 @@ call_value: '^' {
 	YYSTYPE params_code=$5;
 	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_defined()) // value is VVoid?
+			if(value->is_void()) // value is VVoid?
 				params_code=0; // ^zzz[] case. don't append lone empty param.
 	}
 	/* stack: context, method_junction */
@@ -441,9 +451,20 @@ store_code_param_part: code_param_value
 	$$=$1;
 	O(*$$, 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_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP_VALUE+origin+Double]
+		$$=expr_code; 
+		O(*$$, OP_STORE_PARAM); // no evaluating
+	} else {
+		ArrayOperation* code=N();
+		O(*code, OP_PREPARE_TO_EXPRESSION);
+		P(*code, *expr_code);
+		O(*code, OP_WRITE_EXPR_RESULT);
+		$$=N(); 
+		OA(*$$, OP_EXPR_CODE__STORE_PARAM, code);
+	}
 };
 store_curly_param_part: maybe_codes {
 	$$=N(); 
@@ -454,12 +475,6 @@ code_param_value:
 |	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 */
 
@@ -554,10 +569,12 @@ class_constructor_prefix: class_static_p
 expr_value: expr;
 expr: 
 	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) }
@@ -617,7 +634,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() };
 
 %%
@@ -741,9 +761,9 @@ default:
 				}
 				// #HH ?
 				if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) {
-					char c=
+					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
@@ -1061,6 +1081,22 @@ default:
 						goto break2;
 					}
 				break;
+			case 't':
+				if(end==begin) // right after whitespace
+					if(pc.source[0]=='r' && pc.source[1]=='u' && pc.source[2]=='e') { // def
+						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') { // def
+						skip_analized=4;
+						result=LITERAL_FALSE;
+						goto break2;
+					}
+				break;
 			case ' ': case '\t': case '\n':
 				if(end!=begin) { // there were a string after previous operator?
 					result=0; // return that string
@@ -1137,6 +1173,8 @@ default:
 			case '=': case '!':
 			// common delimiters
 			case ',': case '?': case '#':
+			// mysql column separators
+			case '`':
 			// before call
 			case '^': 
 				pop_LS(pc);