--- parser3/src/main/compile.y	2001/09/12 09:52:53	1.165.4.1
+++ parser3/src/main/compile.y	2002/01/11 16:53:04	1.173.14.1
@@ -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.173.14.1 2002/01/11 16:53:04 paf Exp $
 */
-%{
-static char *RCSId="$Id: compile.y,v 1.165.4.1 2001/09/12 09:52:53 parser Exp $"; 
 
 /**
 	@todo parser4: 
@@ -59,6 +59,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 
 %token BAD_STRING_COMPARISON_OPERATOR
 %token BAD_HEX_LITERAL
+%token BAD_METHOD_DECL_START
 
 %token LAND "&&"
 %token LOR "||"
@@ -99,7 +100,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 
 /* numerical */
 %left '-' '+'
-%left '*' '/' '%'
+%left '*' '/' '%' '\\'
 %left NEG     /* negation: unary - */
 
 %%
@@ -487,6 +488,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) }
@@ -499,11 +501,12 @@ expr:
 |	expr '*' expr { $$=$1;  P($$, $3);  O($$, OP_MUL) }
 |	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_AND) }
 |	expr '|' expr { $$=$1;  P($$, $3);  O($$, OP_BIN_OR) }
 |	expr '#' expr { $$=$1;  P($$, $3);  O($$, OP_BIN_XOR) }
-|	expr "&&" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_AND) }
-|	expr "||" expr { $$=$1;  P($$, $3);  O($$, OP_LOG_OR) }
+|	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_NUM_LT) }
 |	expr '>' expr { $$=$1;  P($$, $3);  O($$, OP_NUM_GT) }
@@ -583,14 +586,33 @@ static int yylex(YYSTYPE *lvalp, void *p
 		} else
 			PC.col++;
 
-		if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) 
+		if(c=='@' && PC.col==0+1) {
+			if(PC.ls==LS_USER) {
+				push_LS(PC, LS_DEF_NAME);
+				RC;
+			} else // @ in first column inside some code
+				result=BAD_METHOD_DECL_START;
+			goto break2;
+		} else 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 some punctuators
 			case '^': case '$': case ';':
 			case '(': case ')':
 			case '[': case ']':
 			case '{': case '}':
-			case '"': 
+			case '"':  case ':':
 				if(end!=begin) {
 					// append piece till ^
 					PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line);
@@ -638,6 +660,8 @@ static int yylex(YYSTYPE *lvalp, void *p
 				}
 				break;
 			}
+			break;
+		}
 		// #comment  start skipping
 		if(c=='#' && PC.col==1) {
 			if(end!=begin) {
@@ -663,17 +687,11 @@ 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);
 				RC;
-			case '@':
-				if(PC.col==0+1) {
-					push_LS(PC, LS_DEF_NAME);
-					RC;
-				}
-				break;
 			case ']':
 				if(PC.ls==LS_NAME_SQUARE_PART)
 					if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?>
@@ -714,7 +732,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 +814,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);
@@ -819,7 +837,7 @@ static int yylex(YYSTYPE *lvalp, void *p
 					goto break2;
 				}
 				goto break2;
-			case '+': case '*': case '/': case '%': 
+			case '+': case '*': case '/': case '%': case '\\':
 			case '~':
 			case ';':
 				RC;
@@ -906,10 +924,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 +940,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 +1000,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 +1030,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 +1052,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);
@@ -1069,6 +1097,8 @@ static int yylex(YYSTYPE *lvalp, void *p
 			case '.': // name part delim 
 			case '$': // name part subvar
 			case ':': // ':name' or 'class:name'
+			case '^': // ^abc^xxx wrong. bailing out
+			case ']': case '}': case ')': // ^abc]}) wrong. bailing out
 				RC;
 			}
 			break;
@@ -1076,7 +1106,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 +1128,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);