--- parser3/src/main/compile.y	2001/02/24 09:00:11	1.31
+++ parser3/src/main/compile.y	2001/03/06 15:30:49	1.56
@@ -1,5 +1,5 @@
 /*
-  $Id: compile.y,v 1.31 2001/02/24 09:00:11 paf Exp $
+  $Id: compile.y,v 1.56 2001/03/06 15:30:49 paf Exp $
 */
 
 %{
@@ -18,6 +18,11 @@
 #include "compile_tools.h"
 #include "pa_value.h"
 #include "pa_request.h"
+#include "pa_vobject.h"
+#include "pa_vdouble.h"
+
+#define SELF_NAME "self"
+#define USES_NAME "USES"
 
 int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -37,6 +42,16 @@ int yylex(YYSTYPE *lvalp, void *pc);
 %token STRING
 %token BOGUS
 
+/* numerical */
+%left '-' '+'
+%left '*' '/'
+%left NEG     /* negation: unary - */
+/* bitwise */
+%left INV     /* invertion: unary ~ */
+
+/* logical */
+%left NOT     /* not: unary ! */
+
 %%
 
 all:
@@ -45,30 +60,83 @@ all:
 	name_main.APPEND_CONST(MAIN_METHOD_NAME);
 	Array& param_names=*NEW Array(POOL);
 	Array& local_names=*NEW Array(POOL);
-	Method *method=NEW Method(POOL, name_main, param_names, local_names, *$1);
-	*PC->methods+=method;
+	Method& method=*NEW Method(POOL, name_main, param_names, local_names, *$1);
+	PC->vclass->add_method(name_main, method);
 }
 |	methods;
 
 methods: method | methods method;
 one_big_piece: maybe_codes;
 
-method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' 
+method: control_method | code_method;
+
+control_method: '@' STRING '\n' 
+				control_strings {
+	String& name=*SLA2S($2);
+	YYSTYPE strings_code=$4;
+	if(strings_code->size()<1*2) {
+		strcpy(PC->error, "@");
+		strcat(PC->error, name.cstr());
+		strcat(PC->error, " is empty");
+		YYERROR;
+	}
+	if(name==CLASS_NAME) {
+		if(strings_code->size()==1*2) 
+			PC->vclass->set_name(*SLA2S(strings_code));
+		else {
+			strcpy(PC->error, "@"CLASS_NAME" must contain sole name");
+			YYERROR;
+		}
+	} else {
+		if(name==USES_NAME) {
+			for(int i=0; i<strings_code->size(); i+=2) {
+				String *file=SLA2S(strings_code, i);
+				file->APPEND_CONST(".p");
+				PC->request->use(file->cstr(), 0);
+			}
+		} 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->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 "BASE_NAME);
+			YYERROR;
+		}
+	}
+};
+control_strings: control_string | control_strings control_string { $$=$1; P($$, $2) };
+control_string: maybe_string '\n';
+maybe_string: empty | STRING;
+
+code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' 
 			maybe_codes {
-	const String *name=LA2S($2);
+	const String *name=SLA2S($2);
 
 	YYSTYPE params_names_code=$3;
 	Array& params_names=*NEW Array(POOL);
 	for(int i=0; i<params_names_code->size(); i+=2)
-		params_names+=LA2S(params_names_code, i);
+		params_names+=SLA2S(params_names_code, i);
 
 	YYSTYPE locals_names_code=$4;
 	Array& locals_names=*NEW Array(POOL);
 	for(int i=0; i<locals_names_code->size(); i+=2)
-		locals_names+=LA2S(locals_names_code, i);
+		locals_names+=SLA2S(locals_names_code, i);
 
-	Method *method=NEW Method(POOL, *name, params_names, locals_names, *$7);
-	*PC->methods+=method;
+	Method& method=*NEW Method(POOL, *name, params_names, locals_names, *$7);
+	PC->vclass->add_method(*name, method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -91,131 +159,124 @@ action: get | put | with | call;
 
 /* get */
 
-get: '$' any_name {
+get: '$' get_name {
 	$$=$2; /* stack: resulting value */
-	OP($$, OP_WRITE); /* value=pop; write(value) */
+	O($$, 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;
-	String *first_name=LA2S(diving_code);
+	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
-		OP($$, OP_WITH_SELF); /* stack: starting context */
+		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
 			/* skip over... */
 			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
 	} else {
-		OP($$, OP_WITH_READ); /* stack: starting context */
+		O($$, OP_WITH_READ); /* stack: starting context */
 		P($$, diving_code);
 	}
 	/* diving code; stack: current context */
 };
 name_without_curly_rdive_root: ':' name_without_curly_rdive_code {
 	$$=N(POOL); 
-	OP($$, OP_WITH_ROOT); /* stack: starting context */
+	O($$, 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) */
+	P($$, $3); /* stack: context,name,constructor_value */
+	O($$, 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=LA2S(diving_code);
+	String *first_name=SLA2S(diving_code);
 	if(first_name && *first_name==SELF_NAME) {
-		OP($$, OP_WITH_SELF); /* stack: starting context */
+		O($$, OP_WITH_SELF); /* stack: starting context */
 		P($$, diving_code, 
 			/* skip over... */
 			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
 	} else {
-		OP($$, OP_WITH_WRITE); /* stack: starting context */
+		O($$, OP_WITH_WRITE); /* stack: starting context */
 		P($$, diving_code);
 	}
 	/* diving code; stack: current context */
 };
 name_expr_wdive_root: ':' name_expr_dive_code {
 	$$=N(POOL); 
-	OP($$, OP_WITH_ROOT); /* stack: starting context */
+	O($$, 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: 
-	store_constructor_one_param_value
-|	store_constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */
+	'[' any_constructor_code_value ']' { $$=$2 }
+|	'(' any_expr ')' { $$=$2 }
 ;
-
-store_constructor_one_param_value: 
-	empty /* optimized $var() case */
-|	STRING { /* optimized $var(STRING) case */
-	$$=$1;
-	OP($$, OP_STORE_PARAM);
-}
-|	complex_constructor_param_value { /* $var(something complex) */
-	$$=$1;
-	OP($$, OP_STORE_PARAM);
-}
+any_constructor_code_value: 
+	empty_string_value /* optimized $var[] case */
+|	STRING /* optimized $var[STRING] case */
+|	constructor_code_value /* $var[something complex] */
 ;
-complex_constructor_param_value: complex_constructor_param_body {
+constructor_code_value: constructor_code {
 	$$=N(POOL); 
-	OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */
+	O($$, OP_CREATE_EWPOOL); /* stack: empty write context */
 	P($$, $1); /* some codes to that context */
-	OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
+	O($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */
 };
-complex_constructor_param_body: codes__excluding_sole_str_literal;
+constructor_code: codes__excluding_sole_str_literal;
 codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) };
 
-store_constructor_two_params_value: STRING ';' store_constructor_one_param_value {
-	char *operator_or_fmt=LA2S($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: '^' name_without_curly_rdive store_params EON { /* ^field.$method{vasya} */
-	$$=$2; /* with_xxx,diving code; stack: context,method_name */
-	OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
+call: '^' call_name store_params EON { /* ^field.$method{vasya} */
+	$$=$2; /* with_xxx,diving code; stack: context,method_junction */
+	O($$, 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) */
+	O($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */
 };
 
+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_constructor_one_param_value
-|	store_param_parts ';' store_constructor_one_param_value { $$=$1; P($$, $3) }
+	store_param_part
+|	store_param_parts ';' store_param_part { $$=$1; P($$, $3) }
 ;
 store_curly_param: '{' maybe_codes '}' {
 	$$=N(POOL); 
 	PCA($$, $2);
-	OP($$, OP_STORE_PARAM);
+	O($$, OP_STORE_PARAM);
 };
+store_param_part: 
+	empty /* optimized () case */
+|	STRING { /* optimized (STRING) case */
+	$$=$1;
+	O($$, OP_STORE_PARAM);
+}
+|	constructor_code_value { /* (something complex) */
+	$$=$1;
+	O($$, OP_STORE_PARAM);
+}
+;
 
 /* name */
 
@@ -226,12 +287,12 @@ name_step: name_advance1 '.';
 name_advance1: name_expr_value {
 	/* stack: context */
 	$$=$1; /* stack: context,name */
-	OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 };
 name_advance2: name_expr_value {
 	/* stack: context */
 	$$=$1; /* stack: context,name */
-	OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
+	O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 }
 |	STRING BOGUS
 ;
@@ -242,31 +303,44 @@ name_expr_value:
 ;
 name_expr_subvar_value: '$' subvar_ref_name_rdive {
 	$$=$2;
-	OP($$, OP_GET_ELEMENT);
+	O($$, OP_GET_ELEMENT);
 };
 name_expr_with_subvar_value: STRING subvar_get_writes {
 	$$=N(POOL); 
-	OP($$, OP_CREATE_EWPOOL);
+	O($$, OP_CREATE_EWPOOL);
 	P($$, $1);
-	OP($$, OP_WRITE);
+	O($$, OP_WRITE);
 	P($$, $2);
-	OP($$, OP_REDUCE_EWPOOL);
+	O($$, OP_REDUCE_EWPOOL);
 };
 subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root;
 subvar_ref_name_rdive_read: STRING {
 	$$=N(POOL); 
-	OP($$, OP_WITH_READ);
+	O($$, OP_WITH_READ);
 	P($$, $1);
 };
 subvar_ref_name_rdive_root: ':' STRING {
 	$$=N(POOL); 
-	OP($$, OP_WITH_ROOT);
+	O($$, OP_WITH_ROOT);
 	P($$, $2);
 };
 subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) };
 subvar__get_write: '$' subvar_ref_name_rdive {
 	$$=$2;
-	OP($$, OP_GET_ELEMENT__WRITE);
+	O($$, 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
 };
 
 
@@ -274,23 +348,82 @@ subvar__get_write: '$' subvar_ref_name_r
 
 with: '$' name_without_curly_rdive '{' codes '}' {
 	$$=$2;
-	OP($$, OP_CREATE_RWPOOL);
+	O($$, OP_CREATE_RWPOOL);
 	P($$, $4);
-	OP($$, OP_REDUCE_RWPOOL);
-	OP($$, OP_WRITE);
+	O($$, OP_REDUCE_RWPOOL);
+	O($$, OP_WRITE);
 };
 
+/* expr */
+
+any_expr:
+	empty_double_value /* optimized $var() case */
+|	expr /* $var(something) */
+;
+expr: 
+	number
+|	expr '+' expr {
+	$$=$1; // stack: first operand
+	P($$, $3); // stack: first,second operands
+	O($$, OP_ADD); // value=first+second; stack: value
+}
+|	expr '-' expr {
+	$$=$1; // stack: first operand
+	P($$, $3); // stack: first,second operands
+	O($$, OP_SUB); // value=first-second; stack: value
+}
+|	expr '*' expr {
+	$$=$1; // stack: first operand
+	P($$, $3); // stack: first,second operands
+	O($$, OP_MUL); // value=first*second; stack: value
+}
+|	expr '/' expr {
+	$$=$1; // stack: first operand
+	P($$, $3); // stack: first,second operands
+	O($$, OP_DIV); // value=first/second; stack: value
+}
+|	'-' expr %prec NEG {
+	$$=$2; // stack: operand
+	O($$, OP_NEG); // value=-operand; stack: value
+}
+|	'~' expr %prec INV {
+	$$=$2; // stack: operand
+	O($$, OP_INV); // value=~operand; stack: value
+}
+|	'!' expr %prec NOT {
+	$$=$2; // stack: operand
+	O($$, OP_NOT); // value=!operand; stack: value
+}
+|	'(' expr ')' { $$ = $2; }
+;
+
+
+/*
+complex_expr_value: complex_expr {
+	$$=N(POOL); 
+	O($$, OP_CREATE_SWPOOL); /* stack: empty write context * /
+	P($$, $1); /* some codes to that context * /
+	O($$, OP_REDUCE_SWPOOL); /* context=pop; stack: context.get_string() * /
+};
+*/
+
 /* basics */
 
 write_str_literal: STRING {
-	if(LA2S($1)->size()) {
+	if(SLA2S($1)->size()) {
 		$$=$1;
-		OP($$, OP_WRITE);
+		O($$, OP_WRITE);
 	} else {
 		// optimized case of special end of macro. see yylex
 		$$=N(POOL);
 	}
 };
+number: STRING {
+	change_string_literal_to_double_literal($$=$1);
+};
+
+empty_double_value: /* empty */ { $$=VL(NEW VDouble(POOL)) };
+empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) };
 empty: /* empty */ { $$=N(POOL) };
 
 %%
@@ -313,6 +446,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;
@@ -326,7 +460,7 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 	char *begin=PC->source;
 	char *end;
 	int begin_line=PC->line;
-	while(1) {
+	while(true) {
 		c=*(end=(PC->source++));
 
 		if(c=='\n') {
@@ -335,280 +469,346 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 		} else
 			PC->col++;
 
-		/* escaping: ^^ ^$ ^; ^) ^} ^( ^{ */
-		if(c=='^') {
-			char pending_c=*PC->source;
-
-			if(pending_c=='^' || pending_c=='$' || pending_c==';' ||
-				pending_c=='(' || pending_c==')' ||
-				pending_c=='{' || pending_c=='}') {
-				/* append piece till ^ */
-				PC->string->APPEND(begin, end-begin, PC->file, begin_line);
-				/* reset piece 'start' position & line */
-				begin=PC->source/*^*/;
+		// 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);
+				}
+				// reset piece 'start' position & line
+				begin=PC->source; // ^
 				begin_line=PC->line;
-				/* skip over ^ and _ */
-				PC->source+=2;
-				/* skip analysis = forced literal */
+				// skip over ^ and _
+				PC->source++;  PC->col++;
+				// 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') { // wrong. bailing out
-				result=c;
-				pop_LS(PC);
-				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_DEF_SPECIAL_BODY:
+			if(c=='\n') {
+				switch(*PC->source) {
+				case '@': case 0: // end of special_code
+					pop_LS(PC);
+					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 '=': 
+			case ';':
+				RC;
+			case '"':
+				push_LS(PC, LS_EXPRESSION_STRING);
+				RC;
+			case 'l': case 'g': case 'e': case 'n':
+				if(end==begin) // right after whitespace
+					switch(char next_c=*PC->source) {
+//					case '?': // ok [and bad cases, yacc would bark at them]
+					case 't': // lt gt [et nt]
+					case 'e': // le ge ne [ee]
+					case 'q': // eq [lq gq nq]
+						PC->source++;  PC->col++;
+						PC->pending_state=next_c;
+						return c;
+					}
+				break;
+			case ' ': case '\t': case '\n':
+				if(end!=begin) {
+					// append piece till whitespace
+					PC->string->APPEND(begin, end-begin, PC->file, begin_line);
+				}
+				// reset piece 'start' position & line
+				begin=PC->source; // after whitespace
+				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 expr 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--;	PC->col--;
+				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==':') {
-				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 */) {
-				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==':') {
-				result=c;
-				goto break2;
-			}
-			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*/) {
-				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 */) {
-				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--;  PC->col--;
+			PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 			result=EON;
 			goto break2;
 		}
 		if(c==0) {
 			result=-1;
-//			PC->source--;  PC->col--;
 			break;
 		}
 	}
@@ -626,7 +826,7 @@ break2:
 			PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/);
 		}
 		// create STRING value: array of OP_VALUE+vstring
-		*lvalp=L(NEW VString(PC->string));
+		*lvalp=VL(NEW VString(*PC->string));
 		// new pieces storage
 		PC->string=NEW String(POOL);
 		// go!
@@ -638,7 +838,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;
      }
 
@@ -649,6 +849,6 @@ static void
           YYSTYPE value)
      {
        if(type==STRING)
-         fprintf(file, " \"%s\"", LA2S(value)->cstr());
+         fprintf(file, " \"%s\"", SLA2S(value)->cstr());
      }