--- parser3/src/main/compile.y	2002/04/15 08:13:09	1.184
+++ parser3/src/main/compile.y	2002/10/15 08:31:56	1.199
@@ -5,7 +5,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.184 2002/04/15 08:13:09 paf Exp $
+	$Id: compile.y,v 1.199 2002/10/15 08:31:56 paf Exp $
 */
 
 /**
@@ -60,15 +60,20 @@ static int yylex(YYSTYPE *lvalp, void *p
 %token BAD_STRING_COMPARISON_OPERATOR
 %token BAD_HEX_LITERAL
 %token BAD_METHOD_DECL_START
+%token BAD_METHOD_PARAMETER_NAME_CHARACTER
+%token BAD_MATH_OPERATOR_CHARACTER
 
 %token LAND "&&"
 %token LOR "||"
-%token LXOR "##"
+%token LXOR "!||"
+%token NXOR "!|"
 
 %token NLE "<="
 %token NGE ">="
 %token NEQ "=="
 %token NNE "!="
+%token NSL "<<"
+%token NSR ">>"
 
 %token SLT "lt"
 %token SGT "gt"
@@ -84,7 +89,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 %token IS "is"
 
 /* logical */
-%left "##"
+%left "!||"
 %left "||"
 %left "&&"
 %left '<' '>' "<=" ">="   "lt" "gt" "le" "ge"
@@ -93,10 +98,12 @@ static int yylex(YYSTYPE *lvalp, void *p
 %left '!'
 
 /* bitwise */
-%left '#'
+%left "!|"
 %left '|'
 %left '&' 
 %left '~'
+%left ">>"
+%left "<<" 
 
 /* numerical */
 %left '-' '+'
@@ -104,15 +111,15 @@ static int yylex(YYSTYPE *lvalp, void *p
 %left NEG     /* negation: unary - */
 
 %%
-all: 
+all:
 	one_big_piece {
 	Method& method=*NEW Method(POOL, 
-		*main_method_name, 
+		PC.request->main_method_name, 
 		Method::CT_ANY,
 		0, 0, /*min, max numbered_params_count*/
 		0/*param_names*/, 0/*local_names*/, 
 		$1/*parser_code*/, 0/*native_code*/);
-	PC.cclass->add_method(*main_method_name, method);
+	PC.cclass->add_method(PC.request->main_method_name, method);
 }
 |	methods;
 
@@ -132,7 +139,7 @@ control_method: '@' STRING '\n'
 		YYERROR;
 	}
 	if(command==CLASS_NAME) {
-		if(PC.cclass->base()) { // already changed from default?
+		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, "'");
@@ -152,29 +159,30 @@ control_method: '@' STRING '\n'
 		}
 	} else if(command==USE_CONTROL_METHOD_NAME) {
 		for(int i=0; i<strings_code->size(); i+=2) 
-			PC.request->use_file(*LA2S(strings_code, i));
+			PC.request->use_file(PC.request->main_class, *LA2S(strings_code, i));
 	} else if(command==BASE_NAME) {
-		if(PC.cclass->base()) { // already changed from default?
+		if(PC.cclass->base_class()) { // already changed from default?
 			strcpy(PC.error, "class already have a base '");
-			strncat(PC.error, PC.cclass->base()->name().cstr(), 100);
+			strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100);
 			strcat(PC.error, "'");
 			YYERROR;
 		}
 		if(strings_code->size()==1*2) {
 			const String& base_name=*LA2S(strings_code);
-			VClass *base=static_cast<VClass *>(
+			Value *vbase_class=static_cast<VClass *>(
 				PC.request->classes().get(base_name));
-			if(!base) {
+			VStateless_class *base_class=vbase_class?vbase_class->get_class():0;
+			if(!base_class) {
 				strcpy(PC.error, base_name.cstr());
 				strcat(PC.error, ": undefined class in @"BASE_NAME);
 				YYERROR;
 			}
 			// @CLASS == @BASE sanity check
-			if(PC.cclass==base) {
+			if(PC.cclass==base_class) {
 				strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME);
 				YYERROR;
 			}
-			PC.cclass->set_base(*base);
+			PC.cclass->set_base(base_class);
 		} else {
 			strcpy(PC.error, "@"BASE_NAME" must contain sole name");
 			YYERROR;
@@ -241,8 +249,8 @@ action: get | put | call;
 get: get_value {
 	$$=$1; /* stack: resulting value */ 
 	changetail_or_append($$, 
-		OP_GET_ELEMENT, OP_GET_ELEMENT__WRITE,
-		OP_WRITE_VALUE
+		OP_GET_ELEMENT, false,  /*->*/OP_GET_ELEMENT__WRITE,
+		/*or */OP_WRITE_VALUE
 		); /* value=pop; wcontext.write(value) */
 };
 get_value: '$' get_name_value { $$=$2 };
@@ -265,10 +273,14 @@ name_without_curly_rdive_read: name_with
 	} else {
 		O($$, 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->size()==3)
-			diving_code->put_int(2, OP_GET_ELEMENT_OR_OPERATOR);
+		// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+...OR_OPERATOR/OR_JUNCTION_EXP.
+		if(diving_code->size()==3) // ELEMENT without .SUBELEMENT
+			diving_code->put_int(2, 
+				PC.in_call_value?
+					OP_GET_ELEMENT_OR_OPERATOR// possibly ^if  [search for operator]
+					:OP_GET_ELEMENT_OR_JUNCTION_EXPAND // possibly $junction [if junction, expand it]
+			);
+		
 		P($$, diving_code);
 	}
 	/* diving code; stack: current context */
@@ -332,7 +344,7 @@ construct_round: '(' expr_value ')' {
 construct_curly: '{' maybe_codes '}' {
 	// stack: context, name
 	$$=N(POOL); 
-	CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
+	OA($$, OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
 };
 
 any_constructor_code_value: 
@@ -342,7 +354,7 @@ any_constructor_code_value:
 ;
 constructor_code_value: constructor_code {
 	$$=N(POOL); 
-	PJP($$, $1); /* stack: empty write context */
+	OA($$, OP_OBJECT_POOL, $1); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 };
@@ -353,7 +365,9 @@ codes__excluding_sole_str_literal: actio
 
 call: call_value {
 	$$=$1; /* stack: value */
-	O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
+	changetail_or_append($$, 
+		OP_CALL, true,  /*->*/ OP_CALL__WRITE,
+		/*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 };
 call_value: '^' { 
 					PC.in_call_value=true; 
@@ -363,16 +377,15 @@ call_value: '^' {
 			} 
 			store_params EON { /* ^field.$method{vasya} */
 	$$=$3; /* with_xxx,diving code; stack: context,method_junction */
-	O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
 
 	YYSTYPE params_code=$5;
-	if(params_code->size()==3) // probably [] case. [OP_VALUE + Void + STORE_PARAM]
+	if(params_code->size()==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?
 				params_code=0; // ^zzz[] case. don't append lone empty param.
-	if(params_code)
-		P($$, params_code); // filling method_frame.store_params
-	O($$, OP_CALL); // method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value
+	}
+	/* stack: context, method_junction */
+	OA($$, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value
 };
 
 call_name: name_without_curly_rdive;
@@ -404,11 +417,11 @@ store_code_param_part: code_param_value
 };
 store_expr_param_part: write_expr_value {
 	$$=N(POOL); 
-	PEA($$, $1);
+	OA($$, OP_EXPR_CODE__STORE_PARAM, $1);
 };
 store_curly_param_part: maybe_codes {
 	$$=N(POOL); 
-	PCA($$, $1);
+	OA($$, OP_CURLY_CODE__STORE_PARAM, $1);
 };
 code_param_value:
 	void_value /* optimized [;...] case */
@@ -460,11 +473,11 @@ name_expr_with_subvar_value: STRING subv
 		P(code, $2);
 	}
 	$$=N(POOL); 
-	PSP($$, code);
+	OA($$, OP_STRING_POOL, code);
 };
 name_square_code_value: '[' codes ']' {
 	$$=N(POOL); 
-	PJP($$, $2); /* stack: empty write context */
+	OA($$, OP_OBJECT_POOL, $2); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.value() */
 };
@@ -485,6 +498,14 @@ class_prefix:
 ;
 class_static_prefix: STRING ':' {
 	$$=$1; // stack: class name string
+	if(*LA2S($$) == BASE_NAME) { // pseude BASE class
+		if(VStateless_class *base=PC.cclass->base_class()) {
+			change_string_literal_value($$, base->name());
+		} else {
+			strcpy(PC.error, "no base class declared");
+			YYERROR;
+		}
+	}
 	O($$, OP_GET_CLASS);
 };
 class_constructor_prefix: class_static_prefix ':' {
@@ -527,12 +548,14 @@ expr:
 |	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;  PNC($$, $3);  O($$, OP_LOG_AND) }
-|	expr "||" expr { $$=$1;  PNC($$, $3);  O($$, OP_LOG_OR) }
-|	expr "##" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_XOR) }
+|	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) }
@@ -550,7 +573,7 @@ expr:
 
 string_inside_quotes_value: maybe_codes {
 	$$=N(POOL);
-	PSP($$, $1); /* stack: empty write context */
+	OA($$, OP_STRING_POOL, $1); /* stack: empty write context */
 	/* some code that writes to that context */
 	/* context=pop; stack: context.get_string() */
 };
@@ -632,7 +655,7 @@ case LS_VAR_NAME_SIMPLE_WITH_COLON:
 case LS_VAR_NAME_SIMPLE_WITHOUT_COLON:
 case LS_VAR_NAME_CURLY:
 case LS_METHOD_NAME:
-case LS_COMMENT:
+case LS_USER_COMMENT:
 case LS_DEF_COMMENT:
 	// no literals in names, please
 	break;
@@ -700,7 +723,7 @@ default:
 				PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line);
 			}
 			// fall into COMMENT lexical state [wait for \n]
-			push_LS(PC, LS_COMMENT);
+			push_LS(PC, LS_USER_COMMENT);
 			continue;
 		}
 		switch(PC.ls) {
@@ -739,7 +762,7 @@ default:
 			break;
 			
 		// #COMMENT
-		case LS_COMMENT:
+		case LS_USER_COMMENT:
 			if(c=='\n') {
 				// skip comment
 				begin=PC.source;
@@ -786,6 +809,9 @@ default:
 
 		case LS_DEF_PARAMS:
 			switch(c) {
+			case '$': // common error
+				result=BAD_METHOD_PARAMETER_NAME_CHARACTER;
+				goto break2;
 			case ';':
 				RC;
 			case ']':
@@ -834,6 +860,15 @@ default:
 					else // PC.ls==LS_VAR_ROUND // variable constructor ended
 						pop_LS(PC); // return to normal life
 				RC;
+			case '#': // comment start skipping
+				if(end!=begin) {
+					// append piece till #
+					PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line);
+				}
+				// fall into COMMENT lexical state [wait for \n]
+				push_LS(PC, LS_EXPRESSION_COMMENT);
+				lexical_brackets_nestage=1;
+				continue;
 			case '$':
 				push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON);				
 				RC;
@@ -853,7 +888,7 @@ default:
 					skip_analized=1;
 					result=DEXISTS;
 					goto break2;
-				default:
+				default: // minus
 					result=c;
 					goto break2;
 				}
@@ -862,25 +897,59 @@ default:
 			case '~':
 			case ';':
 				RC;
-			case '&': case '|':  case '#':
+			case '&': case '|':
 				if(*PC.source==c) { // && ||
-					result=c=='#'?LXOR:c=='&'?LAND:LOR;
+					result=c=='&'?LAND:LOR;
 					skip_analized=1;
 				} else
 					result=c;
 				goto break2;
-			case '<': case '>': case '=': case '!': 
-				if(*PC.source=='=') { // <= >= == !=
+			case '!':
+				switch(PC.source[0]) { 
+				case '|': // !| !||
 					skip_analized=1;
-					switch(c) {
-					case '<': result=NLE; break;
-					case '>': result=NGE; break;
-					case '=': result=NEQ; break;
-					case '!': result=NNE; break;
-					}
-				} else
-					result=c;
+					if(PC.source[1]=='|') {
+						skip_analized++;
+						result=LXOR;
+					} else
+						result=NXOR;
+					goto break2;
+				case '=': // !=
+					skip_analized=1;
+					result=NNE; 
+					goto break2;
+				}
+				RC;
+
+			case '<': // <<, <=, <
+				switch(*PC.source) {
+				case '<': // <[<]
+					skip_analized=1; result=NSL; break;
+				case '=': // <[=]
+					skip_analized=1; result=NLE; break;
+				default: // <[]
+					result=c; break;
+				}
+				goto break2;
+			case '>': // >>, >=, >
+				switch(*PC.source) {
+				case '>': // >[>]
+					skip_analized=1; result=NSR; break;
+				case '=': // >[=]
+					skip_analized=1; result=NGE; break;
+				default: // >[]
+					result=c; break;
+				}
 				goto break2;
+			case '=': // ==
+				switch(*PC.source) {
+				case '=': // =[=]
+					skip_analized=1; result=NEQ; break;
+				default: // =[]
+					result=c; break; // not used now
+				}
+				goto break2;
+
 			case '"':
 				push_LS(PC, LS_EXPRESSION_STRING_QUOTED);
 				RC;
@@ -943,6 +1012,24 @@ default:
 				continue;
 			}
 			break;
+		case LS_EXPRESSION_COMMENT:
+			if(c=='(')
+				lexical_brackets_nestage++;
+			
+			switch(*PC.source) {
+			case '\n': case ')':
+				if(*PC.source==')')
+					if(--lexical_brackets_nestage!=0)
+						continue;
+
+				// skip comment
+				begin=PC.source;
+				begin_line=PC.line;
+
+				pop_LS(PC);
+				continue;
+			}
+			break;
 
 		// VARIABLE GET/PUT/WITH
 		case LS_VAR_NAME_SIMPLE_WITH_COLON: 
@@ -987,7 +1074,7 @@ default:
 			case '&': case '|': 
 			case '=': case '!':
 			// common delimiters
-			case ',': case '?':
+			case ',': case '?': case '#':
 			// before call
 			case '^': 
 				pop_LS(PC);
@@ -1206,7 +1293,7 @@ break2:
 			if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME
 				end--;
 		}
-		if(end!=begin && PC.ls!=LS_COMMENT) { // last piece still alive and not comment?
+		if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment?
 			// append it
 			PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/);
 		}