--- parser3/src/main/compile.y	2003/04/04 06:33:27	1.204.2.8.2.15
+++ parser3/src/main/compile.y	2004/04/06 09:01:21	1.209
@@ -5,7 +5,7 @@
 	Copyright (c) 2001, 2003 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.209 2004/04/06 09:01:21 paf Exp $
 */
 
 /**
@@ -41,7 +41,6 @@
 // defines
 
 #define USE_CONTROL_METHOD_NAME "USE"
-#define TAB_SIZE 8
 
 // forwards
 
@@ -49,7 +48,6 @@ static int real_yyerror(Parse_control* p
 static void yyprint(FILE* file, int type, YYSTYPE value);
 static int yylex(YYSTYPE* lvalp, void* pc);
 
-
 // local convinient inplace typecast & var
 #undef PC
 #define PC  (*(Parse_control *)pc)
@@ -68,7 +66,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 "||"
@@ -211,8 +209,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 +225,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;
@@ -645,12 +654,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 +673,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 +705,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,7 +721,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);
 				}
 				// #HH ?
 				if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) {
@@ -743,7 +754,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 +793,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 +909,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);
@@ -1235,6 +1256,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 +1303,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 +1354,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?