--- parser3/src/main/compile.y	2003/04/04 06:33:27	1.204.2.8.2.15
+++ parser3/src/main/compile.y	2005/12/16 14:04:20	1.219
@@ -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.15 2003/04/04 06:33:27 paf Exp $
+	$Id: compile.y,v 1.219 2005/12/16 14:04:20 paf Exp $
 */
 
 /**
@@ -41,7 +41,6 @@
 // defines
 
 #define USE_CONTROL_METHOD_NAME "USE"
-#define TAB_SIZE 8
 
 // forwards
 
@@ -49,6 +48,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 +70,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 +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,8 +216,8 @@ 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 {
+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;
@@ -227,17 +232,28 @@ code_method: '@' STRING bracketed_maybe_
 	ArrayString* locals_names=0;
 	if(int size=locals_names_code->count()) {
 		locals_names=new ArrayString;
-		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE)
-			*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
+				*locals_names+=local_name;
+		}
 	}
 
-	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);
+	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;
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -334,9 +350,14 @@ 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
+	$$=$3; // stack: context, name, value
 	O(*$$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
 ;
@@ -388,7 +409,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 */
@@ -403,7 +424,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:
@@ -422,9 +448,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(); 
@@ -435,12 +472,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 */
 
@@ -482,9 +513,14 @@ name_expr_with_subvar_value: STRING subv
 	$$=N(); 
 	OA(*$$, 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_OBJECT_POOL, $3); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 };
@@ -527,17 +563,15 @@ class_constructor_prefix: class_static_p
 
 /* 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) }
@@ -578,6 +612,11 @@ expr:
 |	expr "is" expr { $$=$1;  P(*$$, *$3);  O(*$$, 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 */
@@ -592,7 +631,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 +687,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 +706,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);
@@ -694,7 +738,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 +754,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=
+					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
@@ -743,7 +787,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 +826,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 +942,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);
@@ -1024,6 +1078,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
@@ -1235,6 +1305,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 +1352,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,7 +1403,7 @@ 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?