--- parser3/src/main/compile.y	2001/08/20 13:22:05	1.163
+++ parser3/src/main/compile.y	2001/10/05 10:06:28	1.169
@@ -1,12 +1,12 @@
+%{
 /** @file
 	Parser: compiler(lexical parser and grammar).
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+
+	$Id: compile.y,v 1.169 2001/10/05 10:06:28 parser Exp $
 */
-%{
-static char *RCSId="$Id: compile.y,v 1.163 2001/08/20 13:22:05 parser Exp $"; 
 
 /**
 	@todo parser4: 
@@ -423,7 +423,7 @@ name_expr_value:
 	STRING /* subname_is_const */
 |	name_expr_subvar_value /* $subname_is_var_value */
 |	name_expr_with_subvar_value /* xxx$part_of_subname_is_var_value */
-|	name_curly_code_value /* (codes) */
+|	name_square_code_value /* [codes] */
 ;
 name_expr_subvar_value: '$' subvar_ref_name_rdive {
 	$$=$2;
@@ -437,7 +437,7 @@ name_expr_with_subvar_value: STRING subv
 	P($$, $2);
 	O($$, OP_REDUCE_EWPOOL);
 };
-name_curly_code_value: '[' codes ']' {
+name_square_code_value: '[' codes ']' {
 	$$=N(POOL); 
 	O($$, OP_CREATE_EWPOOL);
 	P($$, $2);
@@ -487,6 +487,7 @@ expr:
 |	'(' expr ')' { $$ = $2; }
 /* stack: operand // stack: @operand */
 |	'-' expr %prec NEG { $$=$2;  O($$, OP_NEG) }
+|	'+' expr %prec NEG { $$=$2 }
 |	'~' expr { $$=$2;	 O($$, OP_INV) }
 |	'!' expr { $$=$2;  O($$, OP_NOT) }
 |	"def" expr { $$=$2;  O($$, OP_DEF) }
@@ -575,6 +576,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 	int skip_analized=0;
 	while(true) {
 		c=*(end=(PC.source++));
+//		fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp);
 
 		if(c=='\n') {
 			PC.line++;
@@ -582,9 +584,21 @@ static int yylex(YYSTYPE *lvalp, void *p
 		} else
 			PC.col++;
 
-		if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) 
+		if(c=='^')
+			switch(PC.ls) {
+case LS_EXPRESSION_VAR_NAME_WITH_COLON:
+case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON:
+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_DEF_COMMENT:
+	// no literals in names, please
+	break;
+default:
 			switch(*PC.source) {
-			// escaping: ^^ & co
+			// ^escaping some punctuators
 			case '^': case '$': case ';':
 			case '(': case ')':
 			case '[': case ']':
@@ -595,12 +609,19 @@ static int yylex(YYSTYPE *lvalp, void *p
 					PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line);
 				}
 				// reset piece 'begin' position & line
-				begin=PC.source; // ^
+				end=begin=PC.source; // ^
 				begin_line=PC.line;
-				// skip over ^ and _
-				PC.source++;  PC.col++;
-				// skip analysis = forced literal
-				continue;
+				if(PC.ls==LS_METHOD_AFTER) {
+					pop_LS(PC);
+					result=EON;
+					skip_analized=-1; // return to ^ afterwards to assure it's literality
+					goto break2;
+				} else {
+					// skip over _ after ^
+					PC.source++;  PC.col++;
+					// skip analysis = forced literal
+					continue;
+				}
 
 			// converting ^#HH into char(hex(HH))
 			case '#':
@@ -630,6 +651,8 @@ static int yylex(YYSTYPE *lvalp, void *p
 				}
 				break;
 			}
+			break;
+		}
 		// #comment  start skipping
 		if(c=='#' && PC.col==1) {
 			if(end!=begin) {
@@ -643,6 +666,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 
 		// USER'S = NOT OURS
 		case LS_USER:
+        case LS_NAME_SQUARE_PART: // name.[here].xxx
 			if(PC.trim_bof)
 				switch(c) {
 				case '\n': case ' ': case '\t':
@@ -654,7 +678,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 				}
 			switch(c) {
 			case '$':
-				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);
@@ -665,14 +689,16 @@ static int yylex(YYSTYPE *lvalp, void *p
 					RC;
 				}
 				break;
-			case ']': // $name.(code<)>
-				if(--lexical_brackets_nestage==0) {
-					pop_LS(PC);
-					RC;
-				}
+			case ']':
+				if(PC.ls==LS_NAME_SQUARE_PART)
+					if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?>
+						pop_LS(PC); // $name.[co<]>de<]!>
+						RC;
+					}
 				break;
-			case '[':
-				lexical_brackets_nestage++;
+			case '[': // $name.[co<[>de]
+				if(PC.ls==LS_NAME_SQUARE_PART)
+					lexical_brackets_nestage++;
 				break;
 			}
 			break;
@@ -703,7 +729,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 				}
 				break;
 			case '$':
-				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);
@@ -785,7 +811,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 						pop_LS(PC); // return to normal life
 				RC;
 			case '$':
-				push_LS(PC, LS_EXPRESSION_VAR_NAME);				
+				push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON);				
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);
@@ -895,10 +921,13 @@ static int yylex(YYSTYPE *lvalp, void *p
 			break;
 
 		// VARIABLE GET/PUT/WITH
-		case LS_VAR_NAME_SIMPLE:
-		case LS_EXPRESSION_VAR_NAME:
-		case LS_VAR_NAME_NO_COLON:
-			if(PC.ls==LS_EXPRESSION_VAR_NAME) {
+		case LS_VAR_NAME_SIMPLE_WITH_COLON: 
+		case LS_VAR_NAME_SIMPLE_WITHOUT_COLON:
+		case LS_EXPRESSION_VAR_NAME_WITH_COLON: 
+		case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON:
+			if(
+				PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON ||
+				PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {
 				// name in expr ends also before binary operators 
 				switch(c) {
 				case '-': 
@@ -908,7 +937,9 @@ static int yylex(YYSTYPE *lvalp, void *p
 					goto break2;
 				}
 			}
-			if(PC.ls==LS_VAR_NAME_NO_COLON) {
+			if(
+				PC.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON ||
+				PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) {
 				// name already has ':', stop before next 
 				switch(c) {
 				case ':': 
@@ -943,7 +974,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 					end[-1]==':'/*was class name delim */ ||
 					end[-1]=='.'/*was name delim */
 					)) {
-					push_LS(PC, LS_USER);
+					push_LS(PC, LS_NAME_SQUARE_PART);
 					lexical_brackets_nestage=1;
 					RC;
 				}
@@ -966,7 +997,12 @@ static int yylex(YYSTYPE *lvalp, void *p
 			case '.': // name part delim
 			case '$': // name part subvar
 			case ':': // class<:>name
-				PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':'
+				// go to _WITHOUT_COLON state variant...
+				if(PC.ls==LS_VAR_NAME_SIMPLE_WITH_COLON)
+					PC.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON;
+				else if(PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON)
+					PC.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON;
+				// ...stop before next ':'
 				RC;
 			}
 			break;
@@ -974,8 +1010,8 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_VAR_NAME_CURLY:
 			switch(c) {
 			case '[':
-				// ${name.<[>code)}
-				push_LS(PC, LS_USER);
+				// ${name.<[>code]}
+				push_LS(PC, LS_NAME_SQUARE_PART);
 				lexical_brackets_nestage=1;
 				RC;
 			case '}': // ${name} finished, restoring LS
@@ -991,7 +1027,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_VAR_SQUARE:
 			switch(c) {
 			case '$':
-				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);
@@ -1013,7 +1049,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_VAR_CURLY:
 			switch(c) {
 			case '$':
-				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);
@@ -1034,13 +1070,13 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_METHOD_NAME:
 			switch(c) {
 			case '[':
-				// $name.<[>code)
+				// ^name.<[>code].xxx
 				if(PC.col>1/*not first column*/ && (
 					end[-1]=='^'/*was start of call*/ || // never, ^[ is literal...
 					end[-1]==':'/*was class name delim */ ||
 					end[-1]=='.'/*was name delim */
 					)) {
-					push_LS(PC, LS_USER);
+					push_LS(PC, LS_NAME_SQUARE_PART);
 					lexical_brackets_nestage=1;
 					RC;
 				}
@@ -1065,7 +1101,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_METHOD_SQUARE:
 			switch(c) {
 			case '$':
-				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);
@@ -1087,7 +1123,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 		case LS_METHOD_CURLY:
 			switch(c) {
 			case '$':
-				push_LS(PC, LS_VAR_NAME_SIMPLE);
+				push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON);
 				RC;
 			case '^':
 				push_LS(PC, LS_METHOD_NAME);