--- parser3/src/main/compile.y	2001/02/25 09:03:17	1.40
+++ parser3/src/main/compile.y	2001/03/06 12:22:58	1.49
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.40 2001/02/25 09:03:17 paf Exp $
+  $Id: compile.y,v 1.49 2001/03/06 12:22:58 paf Exp $
 */
 
 %{
@@ -83,22 +83,25 @@ control_method: '@' STRING '\n'
 				file->APPEND_CONST(".p");
 				PC->request->use(file->cstr(), 0);
 			}
-		} else if(name==PARENTS_NAME) {
-			for(int i=0; i<strings_code->size(); i+=2) {
-				String& parent_name=*SLA2S(strings_code, i);
-				VClass *parent=static_cast<VClass *>(
-					PC->request->classes().get(parent_name));
-				if(!parent) {
-					strcpy(PC->error, parent_name.cstr());
-					strcat(PC->error, ": undefined class in @"PARENTS_NAME);
+		} else if(name==BASE_NAME) {
+			if(strings_code->size()==1*2) {
+				String& base_name=*SLA2S(strings_code);
+				VClass *base=static_cast<VClass *>(
+					PC->request->classes().get(base_name));
+				if(!base) {
+					strcpy(PC->error, base_name.cstr());
+					strcat(PC->error, ": undefined class in @"BASE_NAME);
 					YYERROR;
 				}
-				PC->vclass->add_parent(*parent);
+				PC->vclass->set_base(*base);
+			} else {
+				strcpy(PC->error, "@"BASE_NAME" must contain sole name");
+				YYERROR;
 			}
 		} else {
 			strcpy(PC->error, name.cstr());
 			strcat(PC->error, ": invalid special name. valid names are "
-				CLASS_NAME", "USES_NAME" and "PARENTS_NAME);
+				CLASS_NAME", "USES_NAME" and "BASE_NAME);
 			YYERROR;
 		}
 	}
@@ -145,15 +148,16 @@ action: get | put | with | call;
 
 /* get */
 
-get: '$' any_name {
+get: '$' get_name {
 	$$=$2; /* stack: resulting value */
 	OP($$, OP_WRITE); /* value=pop; write(value) */
 };
-
-any_name: name_without_curly_rdive EON | name_in_curly_rdive;
-
+get_name: name_without_curly_rdive EON | name_in_curly_rdive;
 name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 };
-name_without_curly_rdive: name_without_curly_rdive_read | name_without_curly_rdive_root;
+name_without_curly_rdive: 
+	name_without_curly_rdive_read 
+|	name_without_curly_rdive_root
+|	name_without_curly_rdive_class;
 name_without_curly_rdive_read: name_without_curly_rdive_code {
 	$$=N(POOL); 
 	Array *diving_code=$1;
@@ -174,18 +178,22 @@ name_without_curly_rdive_root: ':' name_
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: current context */
 };
+name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P($$, $2) };
 name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) };
 
 /* put */
 
-put: '$' name_expr_wdive '(' constructor_value ')' {
+put: '$' name_expr_wdive '[' constructor_value ']' {
 	$$=$2; /* stack: context,name */
 	P($$, $4); /* stack: context,name,constructor_value */
 	OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 };
-name_expr_wdive: name_expr_wdive_write | name_expr_wdive_root;
+name_expr_wdive: 
+	name_expr_wdive_write
+|	name_expr_wdive_root
+|	name_expr_wdive_class;
 name_expr_wdive_write: name_expr_dive_code {
-	$$=N(POOL); 
+	$$=N(POOL);
 	Array *diving_code=$1;
 	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
@@ -204,13 +212,9 @@ name_expr_wdive_root: ':' name_expr_dive
 	OP($$, OP_WITH_ROOT); /* stack: starting context */
 	P($$, $2); /* diving code; stack: context,name */
 };
+name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
 constructor_value: 
-	constructor_one_param_value
-|	constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
-;
-
-constructor_one_param_value: 
 	empty_value /* optimized $var() case */
 |	STRING /* optimized $var(STRING) case */
 |	complex_constructor_param_value /* $var(something complex) */
@@ -224,51 +228,20 @@ complex_constructor_param_value: complex
 complex_constructor_param_body: codes__excluding_sole_str_literal;
 codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) };
 
-constructor_two_params_value: STRING ';' constructor_one_param_value {
-	char *operator_or_fmt=SLA2S($1)->cstr();
-	$$=N(POOL);
-	P($$, $1); /* stack: ncontext name operator_or_fmt */
-	P($$, $3); /* stack: ncontext name operator_or_fmt expr */
-	switch(operator_or_fmt[0]) {
-	case '=': case '%':
-		OP($$, OP_EXPRESSION_EVAL);
-		break;
-	case '+': case '-': case '*': case '/':
-		OP($$, OP_MODIFY_EVAL);
-		break;
-	default:
-		strcpy(PC->error, "invalid modification operator");
-		YYERROR;
-	}
-	/* stack: ncontext name value */
-};
-
 /* call */
 
 call: '^' call_name store_params EON { /* ^field.$method{vasya} */
-	$$=$2; /* with_xxx,diving code; stack: context,method_name */
+	$$=$2; /* with_xxx,diving code; stack: context,method_junction */
 	OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
 	P($$, $3); /* filling method_frame.store_params */
 	OP($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */
 };
 
-call_name: name_without_curly_rdive | class_method_name;
-
-class_method_name: STRING ':' name_advance1 {
-	String& name=*SLA2S($1);
-	VClass *vclass=static_cast<VClass *>(PC->request->classes().get(name));
-	if(!vclass) {
-		strcpy(PC->error, name.cstr());
-		strcat(PC->error, ": undefined class in call");
-		YYERROR;
-	}
-	$$=CL(vclass);
-	P($$, $3);
-};
+call_name: name_without_curly_rdive;
 
 store_params: store_param | store_params store_param { $$=$1; P($$, $2) };
 store_param: store_round_param | store_curly_param;
-store_round_param: '(' store_param_parts ')' {$$=$2};
+store_round_param: '[' store_param_parts ']' {$$=$2};
 store_param_parts:
 	store_param_part
 |	store_param_parts ';' store_param_part { $$=$1; P($$, $3) }
@@ -342,6 +315,19 @@ subvar__get_write: '$' subvar_ref_name_r
 	OP($$, OP_GET_ELEMENT__WRITE);
 };
 
+class_prefix: STRING ':' {
+	String& name=*SLA2S($1);
+	VClass *vclass=static_cast<VClass *>(PC->request->classes().get(name));
+	if(!vclass) {
+		strcpy(PC->error, "'");
+		strcat(PC->error, name.cstr());
+		strcat(PC->error, "' class is undefined in call");
+		YYERROR;
+	}
+	//TODO: убрать зависимость от статических @USE, сделать имя, а не ссылку
+	$$=CL(vclass); // vclass
+};
+
 
 /* with */
 
@@ -387,6 +373,7 @@ empty: /* empty */ { $$=N(POOL) };
 
 int yylex(YYSTYPE *lvalp, void *pc) {
 	#define lexical_brackets_nestage PC->brackets_nestages[PC->sp]
+	#define RC {result=c; goto break2; }
 
     register int c;
     int result;
@@ -409,13 +396,13 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 		} else
 			PC->col++;
 
-		// escaping: ^^ ^$ ^; ^) ^} ^( ^{
-		if(c=='^') {
-			char next_c=*PC->source;
-
-			if(next_c=='^' || next_c=='$' || next_c==';' ||
-				next_c=='(' || next_c==')' ||
-				next_c=='{' || next_c=='}') {
+		// escaping: ^^ ^$ ^; ^) ^} ^( ^{ ^"
+		if(c=='^') 
+			switch(*PC->source) {
+			case '^': case '$': case ';':
+			case '[': case ']':
+			case '{': case '}':
+			case '"':
 				if(end!=begin) {
 					// append piece till ^
 					PC->string->APPEND(begin, end-begin, PC->file, begin_line);
@@ -428,261 +415,309 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 				// skip analysis = forced literal
 				continue;
 			}
-		}
 		switch(PC->ls) {
 
 		// USER'S = NOT OURS
 		case LS_USER:
-			if(c=='$') {
+			switch(c) {
+			case '$':
 				push_LS(PC, LS_VAR_NAME_SIMPLE);
-				result=c;
-				goto break2;
-			}
-			if(c=='^') {
+				RC;
+			case '^':
 				push_LS(PC, LS_METHOD_NAME);
-				result=c;
-				goto break2;
-			}
-			if(c=='@' && PC->col==0+1) {
-				result=c;
-				push_LS(PC, LS_DEF_NAME);
-				goto break2;
+				RC;
+			case '@':
+				if(PC->col==0+1) {
+					push_LS(PC, LS_DEF_NAME);
+					RC;
+				}
+				break;
 			}
+			break;
 			
+		// STRING IN EXPRESSION
+		case LS_EXPRESSION_STRING:
+			switch(c) {
+			case '"':
+				pop_LS(PC); //"abc".
+				RC;
+			case '$':
+				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				RC;
+			case '^':
+				push_LS(PC, LS_METHOD_NAME);
+				RC;
+			}
 			break;
 
 		// METHOD DEFINITION
 		case LS_DEF_NAME:
-			if(c=='[') {
-				result=c;
+			switch(c) {
+			case '[':
 				PC->ls=LS_DEF_PARAMS;
-				goto break2;
-			}
-			if(c=='\n') {
-				result=c;
-				PC->ls=LS_SPEC_CODE;
-				goto break2;
+				RC;
+			case '\n':
+				PC->ls=LS_DEF_SPECIAL_BODY;
+				RC;
 			}
 			break;
+
 		case LS_DEF_PARAMS:
-			if(c==';') {
-				result=c;
-				goto break2;
-			}
-			if(c==']') {
-				result=c;
+			switch(c) {
+			case ';':
+				RC;
+			case ']':
 				PC->ls=*PC->source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT;
-				goto break2;
-			}
-			if(c=='\n') { // wrong. bailing out
-				result=c;
+				RC;
+			case '\n': // wrong. bailing out
 				pop_LS(PC);
-				goto break2;
+				RC;
 			}
 			break;
+
 		case LS_DEF_LOCALS:
-			if(c=='[' || c==';') {
-				result=c;
-				goto break2;
-			}
-			if(c==']') {
-				result=c;
+			switch(c) {
+			case '[':
+			case ';':
+				RC;
+			case ']':
 				PC->ls=LS_DEF_COMMENT;
-				goto break2;
-			}
-			if(c=='\n') { // wrong. bailing out
-				result=c;
+				RC;
+			case '\n': // wrong. bailing out
 				pop_LS(PC);
-				goto break2;
+				RC;
 			}
 			break;
+
 		case LS_DEF_COMMENT:
 			if(c=='\n') {
-				result=c;
 				pop_LS(PC);
-				goto break2;
+				RC;
 			}
 			break;
 
-		case LS_SPEC_CODE:
+		case LS_DEF_SPECIAL_BODY:
 			if(c=='\n') {
-				result=c;
-				if(*PC->source=='@' || *PC->source==0) // end of special_code
+				switch(*PC->source) {
+				case '@': case 0: // end of special_code
 					pop_LS(PC);
-				goto break2;
+					break;
+				}
+				RC;
+			}
+			break;
+
+		// (EXPRESSION)
+		case LS_EXPRESSION_BODY:
+			switch(c) {
+			case ')':
+				if(--lexical_brackets_nestage==0)
+					pop_LS(PC); //(EXPRESSION).
+				RC;
+			case '$':
+				push_LS(PC, LS_VAR_NAME_IN_EXPRESSION);				
+				RC;
+			case '^':
+				push_LS(PC, LS_METHOD_NAME);
+				RC;
+			case '(':
+				lexical_brackets_nestage++;
+				RC;
+			case '+': case '-': case '*': case '/': case '%': 
+			case '&': case '|': 
+			case '<': case '>': case '=': case '!':
+			case ';':
+				RC;
+			case '"':
+				push_LS(PC, LS_EXPRESSION_STRING);
+				RC;
+				break;
+			case ' ': case '\t': case '\n':
+				if(end!=begin) {
+					// append piece till whitespace
+					PC->string->APPEND(begin, end-begin, PC->file, begin_line);
+				}
+				// skip over whitespace
+				PC->source++;
+				// reset piece 'start' position & line
+				begin=PC->source; // ^
+				begin_line=PC->line;
+				continue;
 			}
 			break;
 
 		// VARIABLE GET/PUT/WITH
 		case LS_VAR_NAME_SIMPLE:
-			if(c==0 || 
-				c==' '|| c=='\t' || c=='\n' || 
-				c==')' || c=='}') {
+		case LS_VAR_NAME_IN_EXPRESSION:
+			if(PC->ls==LS_VAR_NAME_IN_EXPRESSION) {
+				// name in expression ends also before binary operators 
+				switch(c) {
+				case '+': case '-': case '*': case '/': case '%': 
+				case '&': case '|': 
+				case '<': case '>': case '=': case '!':
+					pop_LS(PC);
+					PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
+					result=EON;
+					goto break2;
+				}
+			}
+			switch(c) {
+			case 0:
+			case ' ': case '\t': case '\n':
+			case ';':
+			case ']': case '}':
 				pop_LS(PC);
 				PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 				result=EON;
 				goto break2;
-			}
-			if(begin==end && c=='{') { /* ${name}, no need of EON, switching LS */
-				PC->ls=LS_VAR_NAME_CURLY; 
-				result=c;
-				goto break2;
-			}
-			if(c=='(') {
-				PC->ls=LS_VAR_ROUND;
+			case '[':
+				PC->ls=LS_VAR_SQUARE;
 				lexical_brackets_nestage=1;
-				result=c;
-				goto break2;
-			}
-			if(c=='{') {
-				PC->ls=LS_VAR_CURLY;
+				RC;
+			case '{':
+				if(begin==end) { // ${name}, no need of EON, switching LS
+					PC->ls=LS_VAR_NAME_CURLY; 
+				} else {
+					PC->ls=LS_VAR_CURLY;
+					lexical_brackets_nestage=1;
+				}
+				
+				RC;
+			case '(':
+				PC->ls=LS_EXPRESSION_BODY;
 				lexical_brackets_nestage=1;
-				result=c;
-				goto break2;
-			}
-			if(c=='.'/* name part delim */ || 
-				c=='$'/* name part subvar */ ||
-				c==':'/* ':name' or 'class:name' */) {
-				result=c;
-				goto break2;
+				RC;
+			case '.': // name part delim
+			case '$': // name part subvar
+			case ':': // ':name' or 'class:name'
+				RC;
 			}
 			break;
+
 		case LS_VAR_NAME_CURLY:
-			if(c=='}') {  /* ${name} finished, restoring LS */
+			switch(c) {
+			case '}': // ${name} finished, restoring LS
 				pop_LS(PC);
-				result=c;
-				goto break2;
-			}
-			if(c=='.'/* name part delim */ || 
-				c=='$'/*name part subvar*/ ||
-				c==':'/* ':name' or 'class:name' */) {
-				result=c;
-				goto break2;
+				RC;
+			case '.': // name part delim
+			case '$': // name part subvar
+			case ':': // ':name' or 'class:name'
+				RC;
 			}
 			break;
-		case LS_VAR_ROUND:
-			if(c=='$') {
+
+		case LS_VAR_SQUARE:
+			switch(c) {
+			case '$':
 				push_LS(PC, LS_VAR_NAME_SIMPLE);
-				result=c;
-				goto break2;
-			}
-			if(c=='^') {
+				RC;
+			case '^':
 				push_LS(PC, LS_METHOD_NAME);
-				result=c;
-				goto break2;
-			}
-			if(c==')') {
+				RC;
+			case ']':
 				if(--lexical_brackets_nestage==0) {
 					pop_LS(PC);
-					result=c;
-					goto break2;
+					RC;
 				}
-			}
-			if(c==';'/* operator_or_fmt;value delim */) {
-				result=c;
-				goto break2;
-			}
-			if(c=='(')
+				break;
+			case ';': // operator_or_fmt;value delim
+				RC;
+			case '[':
 				lexical_brackets_nestage++;
+				break;
+			}
 			break;
+
 		case LS_VAR_CURLY:
-			if(c=='$') {
+			switch(c) {
+			case '$':
 				push_LS(PC, LS_VAR_NAME_SIMPLE);
-				result=c;
-				goto break2;
-			}
-			if(c=='^') {
+				RC;
+			case '^':
 				push_LS(PC, LS_METHOD_NAME);
-				result=c;
-				goto break2;
-			}
-			if(c=='}')
+				RC;
+			case '}':
 				if(--lexical_brackets_nestage==0) {
 					pop_LS(PC);
-					result=c;
-					goto break2;
+					RC;
 				}
-			if(c=='{')
+				break;
+			case '{':
 				lexical_brackets_nestage++;
+				break;
+			}
 			break;
 
 		// METHOD CALL
 		case LS_METHOD_NAME:
-			if(c=='(') {
-				PC->ls=LS_METHOD_ROUND;
+			switch(c) {
+			case '[':
+				PC->ls=LS_METHOD_SQUARE;
 				lexical_brackets_nestage=1;
-				result=c;
-				goto break2;
-			}
-			if(c=='{') {
+				RC;
+			case '{':
 				PC->ls=LS_METHOD_CURLY;
 				lexical_brackets_nestage=1;
-				result=c;
-				goto break2;
-			}
-			if(c=='.'/* name part delim */ || 
-				c=='$'/* name part subvar */ ||
-				c==':'/* ':name' or 'class:name' */) {
-				result=c;
-				goto break2;
+				RC;
+			case '.': // name part delim 
+			case '$': // name part subvar
+			case ':': // ':name' or 'class:name'
+				RC;
 			}
 			break;
-		case LS_METHOD_ROUND:
-			if(c=='$') {
+
+		case LS_METHOD_SQUARE:
+			switch(c) {
+			case '$':
 				push_LS(PC, LS_VAR_NAME_SIMPLE);
-				result=c;
-				goto break2;
-			}
-			if(c=='^') {
+				RC;
+			case '^':
 				push_LS(PC, LS_METHOD_NAME);
-				result=c;
-				goto break2;
-			}
-			if(c==';'/* param delim */) {
-				result=c;
-				goto break2;
-			}
-			if(c==')')
+				RC;
+			case ';': // param delim
+				RC;
+			case ']':
 				if(--lexical_brackets_nestage==0) {
 					PC->ls=LS_METHOD_AFTER;
-					result=c;
-					goto break2;
+					RC;
 				}
-			if(c=='(')
+				break;
+			case '[':
 				lexical_brackets_nestage++;
+				break;
+			}
 			break;
+
 		case LS_METHOD_CURLY:
-			if(c=='$') {
+			switch(c) {
+			case '$':
 				push_LS(PC, LS_VAR_NAME_SIMPLE);
-				result=c;
-				goto break2;
-			}
-			if(c=='^') {
+				RC;
+			case '^':
 				push_LS(PC, LS_METHOD_NAME);
-				result=c;
-				goto break2;
-			}
-			if(c=='}')
+				RC;
+			case '}':
 				if(--lexical_brackets_nestage==0) {
 					PC->ls=LS_METHOD_AFTER;
-					result=c;
-					goto break2;
+					RC;
 				}
-			if(c=='{')
+				break;
+			case '{':
 				lexical_brackets_nestage++;
+				break;
+			}
 			break;
+
 		case LS_METHOD_AFTER:
-			if(c=='(') {/* )( }( */
-				PC->ls=LS_METHOD_ROUND;
+			if(c=='[') {/* )( }( */
+				PC->ls=LS_METHOD_SQUARE;
 				lexical_brackets_nestage=1;
-				result=c;
-				goto break2;
+				RC;
 			}					   
 			if(c=='{') {/* ){ }{ */
 				PC->ls=LS_METHOD_CURLY;
 				lexical_brackets_nestage=1;
-				result=c;
-				goto break2;
+				RC;
 			}					   
 			pop_LS(PC);
 			PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
@@ -708,7 +743,7 @@ break2:
 			PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
 		}
 		// create STRING value: array of OP_VALUE+vstring
-		*lvalp=SL(NEW VString(PC->string));
+		*lvalp=SL(NEW VString(*PC->string));
 		// new pieces storage
 		PC->string=NEW String(POOL);
 		// go!
@@ -720,7 +755,7 @@ int real_yyerror(parse_control *pc, char
      {
        //fprintf(stderr, "[%s]\n", s);
 
-	   s[MAX_STRING-1]=0; strcpy(pc->error, s);
+	   strncpy(pc->error, s, MAX_STRING); // TODO: перепроверить с треклятым последним байтом
 	   return 1;
      }