--- parser3/src/main/compile.y	2001/09/12 09:52:53	1.165.4.1
+++ parser3/src/main/compile.y	2001/09/24 14:34:25	1.167
@@ -6,7 +6,7 @@
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
 %{
-static char *RCSId="$Id: compile.y,v 1.165.4.1 2001/09/12 09:52:53 parser Exp $"; 
+static char *RCSId="$Id: compile.y,v 1.167 2001/09/24 14:34:25 parser Exp $"; 
 
 /**
 	@todo parser4: 
@@ -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) }
@@ -663,7 +664,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);
@@ -714,7 +715,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);
@@ -796,7 +797,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);
@@ -906,10 +907,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 '-': 
@@ -919,7 +923,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 ':': 
@@ -977,7 +983,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;
@@ -1002,7 +1013,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);
@@ -1024,7 +1035,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);
@@ -1076,7 +1087,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);
@@ -1098,7 +1109,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);