--- parser3/src/main/compile.tab.C	2003/01/31 14:03:53	1.81.2.5
+++ parser3/src/main/compile.tab.C	2003/01/31 16:05:58	1.81.2.6
@@ -43,7 +43,7 @@
 	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.tab.C,v 1.81.2.5 2003/01/31 14:03:53 paf Exp $
+	$Id: compile.tab.C,v 1.81.2.6 2003/01/31 16:05:58 paf Exp $
 */
 
 /**
@@ -210,22 +210,22 @@ static const short yyrhs[] = {    62,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   115,   123,   125,   125,   126,   128,   128,   130,   201,   201,
-   202,   202,   203,   204,   204,   206,   235,   235,   236,   237,
-   237,   238,   238,   240,   240,   244,   244,   246,   246,   247,
-   247,   248,   248,   248,   252,   259,   260,   260,   261,   262,
-   264,   265,   287,   288,   288,   292,   296,   298,   299,   300,
-   317,   322,   324,   326,   327,   329,   335,   343,   349,   351,
-   352,   354,   360,   361,   361,   365,   371,   374,   377,   390,
-   392,   392,   393,   395,   396,   398,   399,   400,   401,   403,
-   405,   407,   409,   411,   413,   417,   421,   425,   427,   428,
-   430,   439,   439,   441,   441,   442,   443,   451,   456,   458,
-   460,   461,   462,   464,   468,   477,   483,   488,   488,   489,
-   494,   496,   498,   510,   522,   527,   529,   530,   531,   532,
-   533,   535,   536,   537,   538,   539,   540,   541,   542,   544,
-   545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
-   555,   556,   557,   558,   559,   560,   561,   562,   563,   564,
-   565,   566,   567,   568,   569,   570,   573,   582,   587,   588
+   115,   123,   125,   125,   126,   128,   128,   130,   202,   202,
+   203,   203,   204,   205,   205,   207,   236,   236,   237,   238,
+   238,   239,   239,   241,   241,   245,   245,   247,   247,   248,
+   248,   249,   249,   249,   253,   260,   261,   261,   262,   263,
+   265,   266,   288,   289,   289,   293,   297,   299,   300,   301,
+   318,   323,   325,   327,   328,   330,   336,   344,   350,   352,
+   353,   355,   361,   362,   362,   366,   372,   375,   378,   391,
+   393,   393,   394,   396,   397,   399,   400,   401,   402,   404,
+   406,   408,   410,   412,   414,   418,   422,   426,   428,   429,
+   431,   440,   440,   442,   442,   443,   444,   452,   457,   459,
+   461,   462,   463,   465,   469,   478,   484,   489,   489,   490,
+   495,   497,   499,   511,   523,   528,   530,   531,   532,   533,
+   534,   536,   537,   538,   539,   540,   541,   542,   543,   545,
+   546,   547,   548,   549,   550,   551,   552,   553,   554,   555,
+   556,   557,   558,   559,   560,   561,   562,   563,   564,   565,
+   566,   567,   568,   569,   570,   571,   574,   583,   588,   589
 };
 #endif
 
@@ -1063,10 +1063,11 @@ case 8:
 			// new class' name
 			StringPtr name=LA2S(*strings_code);
 			// creating the class
-			PC.cclass=VStateless_classPtr(new VClass);
+			VStateless_classPtr cclass(new VClass);
+			PC.cclass=cclass.get();
 			PC.cclass->set_name(name);
 			// append to request's classes
-			PC.request->classes().put(name, PC.cclass);
+			PC.request->classes().put(name, cclass);
 		} else {
 			strcpy(PC.error, "@"CLASS_NAME" must contain sole name");
 			YYERROR;
@@ -1086,7 +1087,7 @@ case 8:
 			if(ValuePtr base_class_value=PC.request->classes().get(base_name)) {
 				// @CLASS == @BASE sanity check
 				if(VStateless_class *base_class=base_class_value->get_class()) {
-					if(PC.cclass.get()==base_class) {
+					if(PC.cclass==base_class) {
 						strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME);
 						YYERROR;
 					}
@@ -1115,11 +1116,11 @@ case 8:
 ;
     break;}
 case 12:
-#line 202 "compile.y"
+#line 203 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 16:
-#line 207 "compile.y"
+#line 208 "compile.y"
 {
 	StringPtr name=LA2S(*yyvsp[-5]);
 
@@ -1149,19 +1150,19 @@ case 16:
 ;
     break;}
 case 19:
-#line 236 "compile.y"
+#line 237 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 23:
-#line 238 "compile.y"
+#line 239 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 29:
-#line 246 "compile.y"
+#line 247 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 35:
-#line 252 "compile.y"
+#line 253 "compile.y"
 {
 	yyval=yyvsp[0]; /* stack: resulting value */ 
 	changetail_or_append(*yyval, 
@@ -1171,15 +1172,15 @@ case 35:
 ;
     break;}
 case 36:
-#line 259 "compile.y"
+#line 260 "compile.y"
 { yyval=yyvsp[0] ;
     break;}
 case 39:
-#line 261 "compile.y"
+#line 262 "compile.y"
 { yyval=yyvsp[-1] ;
     break;}
 case 42:
-#line 265 "compile.y"
+#line 266 "compile.y"
 {
 	yyval=N(); 
 	ArrayOperationPtr diving_code=yyvsp[0];
@@ -1204,22 +1205,22 @@ case 42:
 ;
     break;}
 case 43:
-#line 287 "compile.y"
+#line 288 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 45:
-#line 288 "compile.y"
+#line 289 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 46:
-#line 292 "compile.y"
+#line 293 "compile.y"
 {
 	yyval=yyvsp[-1]; /* stack: context,name */
 	P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */
 ;
     break;}
 case 50:
-#line 300 "compile.y"
+#line 301 "compile.y"
 {
 	yyval=N();
 	ArrayOperationPtr diving_code=yyvsp[0];
@@ -1239,7 +1240,7 @@ case 50:
 ;
     break;}
 case 51:
-#line 317 "compile.y"
+#line 318 "compile.y"
 {
 	yyval=N(); 
 	O(*yyval, OP_WITH_WRITE); /* stack: starting context */
@@ -1247,11 +1248,11 @@ case 51:
 ;
     break;}
 case 52:
-#line 322 "compile.y"
+#line 323 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 56:
-#line 329 "compile.y"
+#line 330 "compile.y"
 {
 	// stack: context, name
 	yyval=yyvsp[-1]; // stack: context, name, value
@@ -1259,7 +1260,7 @@ case 56:
 ;
     break;}
 case 57:
-#line 335 "compile.y"
+#line 336 "compile.y"
 { 
 	yyval=N(); 
 	O(*yyval, OP_PREPARE_TO_EXPRESSION);
@@ -1269,7 +1270,7 @@ case 57:
 ;
     break;}
 case 58:
-#line 343 "compile.y"
+#line 344 "compile.y"
 {
 	// stack: context, name
 	yyval=N(); 
@@ -1277,7 +1278,7 @@ case 58:
 ;
     break;}
 case 62:
-#line 354 "compile.y"
+#line 355 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */
@@ -1286,11 +1287,11 @@ case 62:
 ;
     break;}
 case 65:
-#line 361 "compile.y"
+#line 362 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 66:
-#line 365 "compile.y"
+#line 366 "compile.y"
 {
 	yyval=yyvsp[0]; /* stack: value */
 	changetail_or_append(*yyval, 
@@ -1299,19 +1300,19 @@ case 66:
 ;
     break;}
 case 67:
-#line 371 "compile.y"
+#line 372 "compile.y"
 { 
 					PC.in_call_value=true; 
 			;
     break;}
 case 68:
-#line 374 "compile.y"
+#line 375 "compile.y"
 {
 				PC.in_call_value=false;
 			;
     break;}
 case 69:
-#line 377 "compile.y"
+#line 378 "compile.y"
 { /* ^field.$method{vasya} */
 	yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */
 
@@ -1326,56 +1327,56 @@ case 69:
 ;
     break;}
 case 72:
-#line 392 "compile.y"
+#line 393 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 76:
-#line 398 "compile.y"
+#line 399 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 77:
-#line 399 "compile.y"
+#line 400 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 78:
-#line 400 "compile.y"
+#line 401 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 80:
-#line 403 "compile.y"
+#line 404 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 82:
-#line 407 "compile.y"
+#line 408 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 84:
-#line 411 "compile.y"
+#line 412 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 85:
-#line 413 "compile.y"
+#line 414 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(*yyval, OP_STORE_PARAM);
 ;
     break;}
 case 86:
-#line 417 "compile.y"
+#line 418 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]);
 ;
     break;}
 case 87:
-#line 421 "compile.y"
+#line 422 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]);
 ;
     break;}
 case 91:
-#line 430 "compile.y"
+#line 431 "compile.y"
 {
 	yyval=N(); 
 	O(*yyval, OP_PREPARE_TO_EXPRESSION);
@@ -1384,15 +1385,15 @@ case 91:
 ;
     break;}
 case 93:
-#line 439 "compile.y"
+#line 440 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 95:
-#line 441 "compile.y"
+#line 442 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 97:
-#line 443 "compile.y"
+#line 444 "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
@@ -1403,7 +1404,7 @@ case 97:
 ;
     break;}
 case 98:
-#line 451 "compile.y"
+#line 452 "compile.y"
 {
 	/* stack: context */
 	yyval=yyvsp[0]; /* stack: context,name */
@@ -1411,14 +1412,14 @@ case 98:
 ;
     break;}
 case 104:
-#line 464 "compile.y"
+#line 465 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(*yyval, OP_GET_ELEMENT);
 ;
     break;}
 case 105:
-#line 468 "compile.y"
+#line 469 "compile.y"
 {
 	ArrayOperationPtr code;
 	{
@@ -1430,7 +1431,7 @@ case 105:
 ;
     break;}
 case 106:
-#line 477 "compile.y"
+#line 478 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */
@@ -1439,7 +1440,7 @@ case 106:
 ;
     break;}
 case 107:
-#line 483 "compile.y"
+#line 484 "compile.y"
 {
 	yyval=N(); 
 	O(*yyval, OP_WITH_READ);
@@ -1447,18 +1448,18 @@ case 107:
 ;
     break;}
 case 109:
-#line 488 "compile.y"
+#line 489 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 110:
-#line 489 "compile.y"
+#line 490 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(*yyval, OP_GET_ELEMENT__WRITE);
 ;
     break;}
 case 113:
-#line 498 "compile.y"
+#line 499 "compile.y"
 {
 	yyval=yyvsp[-1]; // stack: class name string
 	if(*LA2S(*yyval) == BASE_NAME) { // pseude BASE class
@@ -1473,7 +1474,7 @@ case 113:
 ;
     break;}
 case 114:
-#line 510 "compile.y"
+#line 511 "compile.y"
 {
 	yyval=yyvsp[-1];
 	if(!PC.in_call_value) {
@@ -1484,7 +1485,7 @@ case 114:
 ;
     break;}
 case 115:
-#line 522 "compile.y"
+#line 523 "compile.y"
 {
 	// see OP_PREPARE_TO_EXPRESSION!!
 	if((yyval=yyvsp[0])->count()==2) // only one string literal in there?
@@ -1492,159 +1493,159 @@ case 115:
 ;
     break;}
 case 119:
-#line 531 "compile.y"
+#line 532 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 120:
-#line 532 "compile.y"
+#line 533 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 121:
-#line 533 "compile.y"
+#line 534 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 122:
-#line 535 "compile.y"
+#line 536 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_NEG) ;
     break;}
 case 123:
-#line 536 "compile.y"
+#line 537 "compile.y"
 { yyval=yyvsp[0] ;
     break;}
 case 124:
-#line 537 "compile.y"
+#line 538 "compile.y"
 { yyval=yyvsp[0];	 O(*yyval, OP_INV) ;
     break;}
 case 125:
-#line 538 "compile.y"
+#line 539 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_NOT) ;
     break;}
 case 126:
-#line 539 "compile.y"
+#line 540 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_DEF) ;
     break;}
 case 127:
-#line 540 "compile.y"
+#line 541 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_IN) ;
     break;}
 case 128:
-#line 541 "compile.y"
+#line 542 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_FEXISTS) ;
     break;}
 case 129:
-#line 542 "compile.y"
+#line 543 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_DEXISTS) ;
     break;}
 case 130:
-#line 544 "compile.y"
+#line 545 "compile.y"
 {	yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_SUB) ;
     break;}
 case 131:
-#line 545 "compile.y"
+#line 546 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_ADD) ;
     break;}
 case 132:
-#line 546 "compile.y"
+#line 547 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MUL) ;
     break;}
 case 133:
-#line 547 "compile.y"
+#line 548 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_DIV) ;
     break;}
 case 134:
-#line 548 "compile.y"
+#line 549 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MOD) ;
     break;}
 case 135:
-#line 549 "compile.y"
+#line 550 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_INTDIV) ;
     break;}
 case 136:
-#line 550 "compile.y"
+#line 551 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SL) ;
     break;}
 case 137:
-#line 551 "compile.y"
+#line 552 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SR) ;
     break;}
 case 138:
-#line 552 "compile.y"
+#line 553 "compile.y"
 { yyval=yyvsp[-2]; 	P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_AND) ;
     break;}
 case 139:
-#line 553 "compile.y"
+#line 554 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_OR) ;
     break;}
 case 140:
-#line 554 "compile.y"
+#line 555 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_XOR) ;
     break;}
 case 141:
-#line 555 "compile.y"
+#line 556 "compile.y"
 { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_AND) ;
     break;}
 case 142:
-#line 556 "compile.y"
+#line 557 "compile.y"
 { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_OR) ;
     break;}
 case 143:
-#line 557 "compile.y"
+#line 558 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_LOG_XOR) ;
     break;}
 case 144:
-#line 558 "compile.y"
+#line 559 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LT) ;
     break;}
 case 145:
-#line 559 "compile.y"
+#line 560 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GT) ;
     break;}
 case 146:
-#line 560 "compile.y"
+#line 561 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LE) ;
     break;}
 case 147:
-#line 561 "compile.y"
+#line 562 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GE) ;
     break;}
 case 148:
-#line 562 "compile.y"
+#line 563 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_EQ) ;
     break;}
 case 149:
-#line 563 "compile.y"
+#line 564 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_NE) ;
     break;}
 case 150:
-#line 564 "compile.y"
+#line 565 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LT) ;
     break;}
 case 151:
-#line 565 "compile.y"
+#line 566 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GT) ;
     break;}
 case 152:
-#line 566 "compile.y"
+#line 567 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LE) ;
     break;}
 case 153:
-#line 567 "compile.y"
+#line 568 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GE) ;
     break;}
 case 154:
-#line 568 "compile.y"
+#line 569 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_EQ) ;
     break;}
 case 155:
-#line 569 "compile.y"
+#line 570 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_NE) ;
     break;}
 case 156:
-#line 570 "compile.y"
+#line 571 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_IS) ;
     break;}
 case 157:
-#line 573 "compile.y"
+#line 574 "compile.y"
 {
 	yyval=N();
 	OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
@@ -1653,18 +1654,18 @@ case 157:
 ;
     break;}
 case 158:
-#line 582 "compile.y"
+#line 583 "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 159:
-#line 587 "compile.y"
+#line 588 "compile.y"
 { yyval=VL(ValuePtr(new VVoid())) ;
     break;}
 case 160:
-#line 588 "compile.y"
+#line 589 "compile.y"
 { yyval=N() ;
     break;}
 }
@@ -1889,7 +1890,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 590 "compile.y"
+#line 591 "compile.y"
 
 #endif