--- parser3/src/main/compile.tab.C	2001/11/05 11:46:26	1.26
+++ parser3/src/main/compile.tab.C	2002/04/09 16:27:26	1.46
@@ -36,9 +36,9 @@
 	Parser: compiler(lexical parser and grammar).
 
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.tab.C,v 1.26 2001/11/05 11:46:26 paf Exp $
+	$Id: compile.tab.C,v 1.46 2002/04/09 16:27:26 paf Exp $
 */
 
 /**
@@ -208,18 +208,18 @@ static const short yyrline[] = { 0,
    191,   191,   192,   193,   193,   195,   224,   224,   225,   226,
    226,   227,   227,   229,   229,   233,   233,   235,   235,   236,
    236,   237,   237,   237,   241,   245,   246,   246,   247,   248,
-   250,   251,   266,   267,   267,   271,   275,   277,   278,   279,
-   294,   299,   301,   303,   304,   306,   312,   318,   324,   326,
-   327,   329,   335,   336,   336,   340,   344,   345,   346,   360,
-   362,   362,   363,   365,   366,   368,   369,   370,   371,   373,
-   375,   377,   379,   381,   383,   387,   391,   395,   397,   398,
-   400,   407,   407,   409,   409,   410,   411,   416,   421,   423,
-   425,   426,   427,   429,   433,   441,   447,   452,   452,   453,
-   458,   460,   462,   466,   478,   482,   484,   485,   486,   487,
-   488,   490,   491,   492,   493,   494,   495,   496,   497,   499,
-   500,   501,   502,   503,   504,   505,   506,   507,   508,   509,
-   510,   511,   512,   513,   514,   515,   516,   517,   518,   519,
-   520,   521,   522,   523,   526,   535,   540,   541
+   250,   251,   273,   274,   274,   278,   282,   284,   285,   286,
+   303,   308,   310,   312,   313,   315,   321,   329,   335,   337,
+   338,   340,   346,   347,   347,   351,   355,   358,   361,   375,
+   377,   377,   378,   380,   381,   383,   384,   385,   386,   388,
+   390,   392,   394,   396,   398,   402,   406,   410,   412,   413,
+   415,   424,   424,   426,   426,   427,   428,   436,   441,   443,
+   445,   446,   447,   449,   453,   461,   467,   472,   472,   473,
+   478,   480,   482,   486,   498,   503,   505,   506,   507,   508,
+   509,   511,   512,   513,   514,   515,   516,   517,   518,   520,
+   521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
+   531,   532,   533,   534,   535,   536,   537,   538,   539,   540,
+   541,   542,   543,   544,   547,   556,   561,   562
 };
 #endif
 
@@ -1157,44 +1157,53 @@ case 42:
 	yyval=N(POOL); 
 	Array *diving_code=yyvsp[0];
 	const String *first_name=LA2S(diving_code);
+	// self.xxx... -> xxx...
+	// OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
 		O(yyval, OP_WITH_SELF); /* stack: starting context */
 		P(yyval, diving_code, 
 			/* skip over... */
-			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
+			diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/);
 	} else {
 		O(yyval, OP_WITH_READ); /* stack: starting context */
+
+		// ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR
+		// OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR.
+		if(PC.in_call_value && diving_code->size()==3)
+			diving_code->put_int(2, OP_GET_ELEMENT_OR_OPERATOR);
 		P(yyval, diving_code);
 	}
 	/* diving code; stack: current context */
 ;
     break;}
 case 43:
-#line 266 "compile.y"
+#line 273 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 45:
-#line 267 "compile.y"
+#line 274 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 46:
-#line 271 "compile.y"
+#line 278 "compile.y"
 {
 	yyval=yyvsp[-1]; /* stack: context,name */
 	P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */
 ;
     break;}
 case 50:
-#line 279 "compile.y"
+#line 286 "compile.y"
 {
 	yyval=N(POOL);
 	Array *diving_code=yyvsp[0];
 	const String *first_name=LA2S(diving_code);
+	// $self.xxx... -> $xxx...
+	// OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
 	if(first_name && *first_name==SELF_ELEMENT_NAME) {
 		O(yyval, OP_WITH_SELF); /* stack: starting context */
 		P(yyval, diving_code, 
 			/* skip over... */
-			diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/);
+			diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/);
 	} else {
 		O(yyval, OP_WITH_ROOT); /* stack: starting context */
 		P(yyval, diving_code);
@@ -1203,7 +1212,7 @@ case 50:
 ;
     break;}
 case 51:
-#line 294 "compile.y"
+#line 303 "compile.y"
 {
 	yyval=N(POOL); 
 	O(yyval, OP_WITH_WRITE); /* stack: starting context */
@@ -1211,11 +1220,11 @@ case 51:
 ;
     break;}
 case 52:
-#line 299 "compile.y"
+#line 308 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 56:
-#line 306 "compile.y"
+#line 315 "compile.y"
 {
 	// stack: context, name
 	yyval=yyvsp[-1]; // stack: context, name, value
@@ -1223,15 +1232,17 @@ case 56:
 ;
     break;}
 case 57:
-#line 312 "compile.y"
+#line 321 "compile.y"
 { 
+	yyval=N(POOL); 
+	O(yyval, OP_PREPARE_TO_EXPRESSION);
 	// stack: context, name
-	yyval=yyvsp[-1]; // stack: context, name, value
+	P(yyval, yyvsp[-1]); // stack: context, name, value
 	O(yyval, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
 ;
     break;}
 case 58:
-#line 318 "compile.y"
+#line 329 "compile.y"
 {
 	// stack: context, name
 	yyval=N(POOL); 
@@ -1239,7 +1250,7 @@ case 58:
 ;
     break;}
 case 62:
-#line 329 "compile.y"
+#line 340 "compile.y"
 {
 	yyval=N(POOL); 
 	O(yyval, OP_CREATE_EWPOOL); /* stack: empty write context */
@@ -1248,26 +1259,30 @@ case 62:
 ;
     break;}
 case 65:
-#line 336 "compile.y"
+#line 347 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 66:
-#line 340 "compile.y"
+#line 351 "compile.y"
 {
 	yyval=yyvsp[0]; /* stack: value */
 	O(yyval, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */
 ;
     break;}
 case 67:
-#line 344 "compile.y"
-{ PC.object_constructor_allowed=true ;
+#line 355 "compile.y"
+{ 
+					PC.in_call_value=true; 
+			;
     break;}
 case 68:
-#line 345 "compile.y"
-{ PC.object_constructor_allowed=false ;
+#line 358 "compile.y"
+{
+				PC.in_call_value=false;
+			;
     break;}
 case 69:
-#line 346 "compile.y"
+#line 361 "compile.y"
 { /* ^field.$method{vasya} */
 	yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */
 	O(yyval, OP_GET_METHOD_FRAME); /* stack: context,method_frame */
@@ -1283,79 +1298,84 @@ case 69:
 ;
     break;}
 case 72:
-#line 362 "compile.y"
+#line 377 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 76:
-#line 368 "compile.y"
+#line 383 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 77:
-#line 369 "compile.y"
+#line 384 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 78:
-#line 370 "compile.y"
+#line 385 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 80:
-#line 373 "compile.y"
+#line 388 "compile.y"
 { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ;
     break;}
 case 82:
-#line 377 "compile.y"
+#line 392 "compile.y"
 { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ;
     break;}
 case 84:
-#line 381 "compile.y"
+#line 396 "compile.y"
 { yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ;
     break;}
 case 85:
-#line 383 "compile.y"
+#line 398 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(yyval, OP_STORE_PARAM);
 ;
     break;}
 case 86:
-#line 387 "compile.y"
+#line 402 "compile.y"
 {
 	yyval=N(POOL); 
 	PEA(yyval, yyvsp[0]);
 ;
     break;}
 case 87:
-#line 391 "compile.y"
+#line 406 "compile.y"
 {
 	yyval=N(POOL); 
 	PCA(yyval, yyvsp[0]);
 ;
     break;}
 case 91:
-#line 400 "compile.y"
+#line 415 "compile.y"
 {
-	yyval=yyvsp[0];
+	yyval=N(POOL); 
+	O(yyval, OP_PREPARE_TO_EXPRESSION);
+	P(yyval, yyvsp[0]);
 	O(yyval, OP_WRITE_EXPR_RESULT);
 ;
     break;}
 case 93:
-#line 407 "compile.y"
+#line 424 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 95:
-#line 409 "compile.y"
+#line 426 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 97:
-#line 411 "compile.y"
+#line 428 "compile.y"
 {
+	// we know that name_advance1 not called from ^xxx context
+	// so we'll not check for operator call possibility as we do in name_advance2
+
 	/* stack: context */
 	yyval=yyvsp[0]; /* stack: context,name */
 	O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */
 ;
     break;}
 case 98:
-#line 416 "compile.y"
+#line 436 "compile.y"
 {
 	/* stack: context */
 	yyval=yyvsp[0]; /* stack: context,name */
@@ -1363,14 +1383,14 @@ case 98:
 ;
     break;}
 case 104:
-#line 429 "compile.y"
+#line 449 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(yyval, OP_GET_ELEMENT);
 ;
     break;}
 case 105:
-#line 433 "compile.y"
+#line 453 "compile.y"
 {
 	yyval=N(POOL); 
 	O(yyval, OP_CREATE_EWPOOL);
@@ -1381,7 +1401,7 @@ case 105:
 ;
     break;}
 case 106:
-#line 441 "compile.y"
+#line 461 "compile.y"
 {
 	yyval=N(POOL); 
 	O(yyval, OP_CREATE_EWPOOL);
@@ -1390,7 +1410,7 @@ case 106:
 ;
     break;}
 case 107:
-#line 447 "compile.y"
+#line 467 "compile.y"
 {
 	yyval=N(POOL); 
 	O(yyval, OP_WITH_READ);
@@ -1398,28 +1418,28 @@ case 107:
 ;
     break;}
 case 109:
-#line 452 "compile.y"
+#line 472 "compile.y"
 { yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ;
     break;}
 case 110:
-#line 453 "compile.y"
+#line 473 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(yyval, OP_GET_ELEMENT__WRITE);
 ;
     break;}
 case 113:
-#line 462 "compile.y"
+#line 482 "compile.y"
 {
 	yyval=yyvsp[-1]; // stack: class name string
 	O(yyval, OP_GET_CLASS);
 ;
     break;}
 case 114:
-#line 466 "compile.y"
+#line 486 "compile.y"
 {
 	yyval=yyvsp[-1];
-	if(!PC.object_constructor_allowed) {
+	if(!PC.in_call_value) {
 		strcpy(PC.error, ":: not allowed here");
 		YYERROR;
 	}
@@ -1427,158 +1447,159 @@ case 114:
 ;
     break;}
 case 115:
-#line 478 "compile.y"
+#line 498 "compile.y"
 {
+	// see OP_PREPARE_TO_EXPRESSION!!
 	if((yyval=yyvsp[0])->size()==2) // only one string literal in there?
 		change_string_literal_to_double_literal(yyval); // make that string literal Double
 ;
     break;}
 case 119:
-#line 486 "compile.y"
+#line 507 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 120:
-#line 487 "compile.y"
+#line 508 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 121:
-#line 488 "compile.y"
+#line 509 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 122:
-#line 490 "compile.y"
+#line 511 "compile.y"
 { yyval=yyvsp[0];  O(yyval, OP_NEG) ;
     break;}
 case 123:
-#line 491 "compile.y"
+#line 512 "compile.y"
 { yyval=yyvsp[0] ;
     break;}
 case 124:
-#line 492 "compile.y"
+#line 513 "compile.y"
 { yyval=yyvsp[0];	 O(yyval, OP_INV) ;
     break;}
 case 125:
-#line 493 "compile.y"
+#line 514 "compile.y"
 { yyval=yyvsp[0];  O(yyval, OP_NOT) ;
     break;}
 case 126:
-#line 494 "compile.y"
+#line 515 "compile.y"
 { yyval=yyvsp[0];  O(yyval, OP_DEF) ;
     break;}
 case 127:
-#line 495 "compile.y"
+#line 516 "compile.y"
 { yyval=yyvsp[0];  O(yyval, OP_IN) ;
     break;}
 case 128:
-#line 496 "compile.y"
+#line 517 "compile.y"
 { yyval=yyvsp[0];  O(yyval, OP_FEXISTS) ;
     break;}
 case 129:
-#line 497 "compile.y"
+#line 518 "compile.y"
 { yyval=yyvsp[0];  O(yyval, OP_DEXISTS) ;
     break;}
 case 130:
-#line 499 "compile.y"
+#line 520 "compile.y"
 {	yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_SUB) ;
     break;}
 case 131:
-#line 500 "compile.y"
+#line 521 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_ADD) ;
     break;}
 case 132:
-#line 501 "compile.y"
+#line 522 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_MUL) ;
     break;}
 case 133:
-#line 502 "compile.y"
+#line 523 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_DIV) ;
     break;}
 case 134:
-#line 503 "compile.y"
+#line 524 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_MOD) ;
     break;}
 case 135:
-#line 504 "compile.y"
+#line 525 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_INTDIV) ;
     break;}
 case 136:
-#line 505 "compile.y"
+#line 526 "compile.y"
 { yyval=yyvsp[-2]; 	P(yyval, yyvsp[0]);  O(yyval, OP_BIN_AND) ;
     break;}
 case 137:
-#line 506 "compile.y"
+#line 527 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_BIN_OR) ;
     break;}
 case 138:
-#line 507 "compile.y"
+#line 528 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_BIN_XOR) ;
     break;}
 case 139:
-#line 508 "compile.y"
-{ yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_LOG_AND) ;
+#line 529 "compile.y"
+{ yyval=yyvsp[-2];  PNC(yyval, yyvsp[0]);  O(yyval, OP_LOG_AND) ;
     break;}
 case 140:
-#line 509 "compile.y"
-{ yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_LOG_OR) ;
+#line 530 "compile.y"
+{ yyval=yyvsp[-2];  PNC(yyval, yyvsp[0]);  O(yyval, OP_LOG_OR) ;
     break;}
 case 141:
-#line 510 "compile.y"
+#line 531 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_LOG_XOR) ;
     break;}
 case 142:
-#line 511 "compile.y"
+#line 532 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_NUM_LT) ;
     break;}
 case 143:
-#line 512 "compile.y"
+#line 533 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_NUM_GT) ;
     break;}
 case 144:
-#line 513 "compile.y"
+#line 534 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_NUM_LE) ;
     break;}
 case 145:
-#line 514 "compile.y"
+#line 535 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_NUM_GE) ;
     break;}
 case 146:
-#line 515 "compile.y"
+#line 536 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_NUM_EQ) ;
     break;}
 case 147:
-#line 516 "compile.y"
+#line 537 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_NUM_NE) ;
     break;}
 case 148:
-#line 517 "compile.y"
+#line 538 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_STR_LT) ;
     break;}
 case 149:
-#line 518 "compile.y"
+#line 539 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_STR_GT) ;
     break;}
 case 150:
-#line 519 "compile.y"
+#line 540 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_STR_LE) ;
     break;}
 case 151:
-#line 520 "compile.y"
+#line 541 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_STR_GE) ;
     break;}
 case 152:
-#line 521 "compile.y"
+#line 542 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_STR_EQ) ;
     break;}
 case 153:
-#line 522 "compile.y"
+#line 543 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_STR_NE) ;
     break;}
 case 154:
-#line 523 "compile.y"
+#line 544 "compile.y"
 { yyval=yyvsp[-2];  P(yyval, yyvsp[0]);  O(yyval, OP_IS) ;
     break;}
 case 155:
-#line 526 "compile.y"
+#line 547 "compile.y"
 {
 	yyval=N(POOL);
 	O(yyval, OP_CREATE_SWPOOL); /* stack: empty write context */
@@ -1587,18 +1608,18 @@ case 155:
 ;
     break;}
 case 156:
-#line 535 "compile.y"
+#line 556 "compile.y"
 {
 	// optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE
 	change_string_literal_to_write_string_literal(yyval=yyvsp[0])
 ;
     break;}
 case 157:
-#line 540 "compile.y"
+#line 561 "compile.y"
 { yyval=VL(NEW VVoid(POOL)) ;
     break;}
 case 158:
-#line 541 "compile.y"
+#line 562 "compile.y"
 { yyval=N(POOL) ;
     break;}
 }
@@ -1823,7 +1844,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 543 "compile.y"
+#line 564 "compile.y"
 
 #endif
 
@@ -1844,7 +1865,7 @@ yyerrhandle:
 */
 
 static int yylex(YYSTYPE *lvalp, void *pc) {
-	#define lexical_brackets_nestage PC.brackets_nestages[PC.sp]
+	#define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp]
 	#define RC {result=c; goto break2; }
 
     register int c;
@@ -1871,10 +1892,16 @@ static int yylex(YYSTYPE *lvalp, void *p
 			PC.col++;
 
 		if(c=='@' && PC.col==0+1) {
+			if(PC.ls==LS_DEF_SPECIAL_BODY) {
+				// @SPECIAL
+				// ...
+				// @<here = 
+				pop_LS(PC); // exiting from LS_DEF_SPECIAL_BODY state
+			} // continuing checks
 			if(PC.ls==LS_USER) {
 				push_LS(PC, LS_DEF_NAME);
 				RC;
-			} else // @ in first column inside some code
+			} else // @ in first column inside some code [when could that be?]
 				result=BAD_METHOD_DECL_START;
 			goto break2;
 		} else if(c=='^')
@@ -1954,6 +1981,7 @@ default:
 			}
 			// fall into COMMENT lexical state [wait for \n]
 			push_LS(PC, LS_COMMENT);
+			continue;
 		}
 		switch(PC.ls) {
 
@@ -2071,19 +2099,8 @@ default:
 			break;
 
 		case LS_DEF_SPECIAL_BODY:
-			//                          @todo in case
-			// ################
-			// @next-method
-			// we are here with c=='@'
-			// which is wrong, and need action
-			if(c=='\n') {
-				switch(*PC.source) {
-				case '@': case 0: // end of special_code
-					pop_LS(PC);
-					break;
-				}
+			if(c=='\n')
 				RC;
-			}
 			break;
 
 		// (EXPRESSION)
@@ -2215,9 +2232,12 @@ default:
 			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 
+				// name in expr ends also before 
 				switch(c) {
+				// expression minus
 				case '-': 
+				// expression integer division
+				case '\\':
 					pop_LS(PC);
 					PC.source--;  if(--PC.col<0) { PC.line--;  PC.col=-1; }
 					result=EON;