--- parser3/src/main/compile.tab.C	2003/04/02 16:05:19	1.81.2.13.2.21
+++ parser3/src/main/compile.tab.C	2003/04/03 12:40:52	1.81.2.13.2.27
@@ -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.13.2.21 2003/04/02 16:05:19 paf Exp $
+	$Id: compile.tab.C,v 1.81.2.13.2.27 2003/04/03 12:40:52 paf Exp $
 */
 
 /**
@@ -65,6 +65,8 @@
 #define yyerror(msg)  real_yyerror((Parse_control *)pc, msg)
 #define YYPRINT(file, type, value)  yyprint(file, type, value)
 
+// includes
+
 #include "compile_tools.h"
 #include "pa_value.h"
 #include "pa_request.h"
@@ -74,11 +76,16 @@
 #include "pa_vvoid.h"
 #include "pa_vmethod_frame.h"
 
+// defines
+
 #define USE_CONTROL_METHOD_NAME "USE"
+#define TAB_SIZE 8
+
+// forwards
 
-static int real_yyerror(Parse_control *pc, char *s);
-static void yyprint(FILE *file, int type, YYSTYPE value);
-static int yylex(YYSTYPE *lvalp, void *pc);
+static int real_yyerror(Parse_control* pc, char* s);
+static void yyprint(FILE* file, int type, YYSTYPE value);
+static int yylex(YYSTYPE* lvalp, void* pc);
 
 
 // local convinient inplace typecast & var
@@ -210,22 +217,22 @@ static const short yyrhs[] = {    62,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   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
+   122,   130,   132,   132,   133,   135,   135,   137,   209,   209,
+   210,   210,   211,   212,   212,   214,   243,   243,   244,   245,
+   245,   246,   246,   248,   248,   252,   252,   254,   254,   255,
+   255,   256,   256,   256,   260,   267,   268,   268,   269,   270,
+   272,   273,   295,   296,   296,   300,   304,   306,   307,   308,
+   325,   330,   332,   334,   335,   337,   343,   351,   357,   359,
+   360,   362,   368,   369,   369,   373,   379,   382,   385,   398,
+   400,   400,   401,   403,   404,   406,   407,   408,   409,   411,
+   413,   415,   417,   419,   421,   425,   429,   433,   435,   436,
+   438,   447,   447,   449,   449,   450,   451,   459,   464,   466,
+   468,   469,   470,   472,   476,   485,   491,   496,   496,   497,
+   502,   504,   506,   518,   530,   535,   537,   538,   539,   540,
+   541,   543,   544,   545,   546,   547,   548,   549,   550,   552,
+   553,   554,   555,   556,   557,   558,   559,   560,   561,   562,
+   563,   564,   565,   566,   567,   568,   569,   570,   571,   572,
+   573,   574,   575,   576,   577,   578,   581,   590,   595,   596
 };
 #endif
 
@@ -1032,17 +1039,17 @@ yyreduce:
   switch (yyn) {
 
 case 1:
-#line 116 "compile.y"
+#line 123 "compile.y"
 {
-	Method& method=*new Method(/*main_method_name, */Method::CT_ANY,
+	Method& method=*new Method(Method::CT_ANY,
 		0, 0, /*min, max numbered_params_count*/
 		0/*param_names*/, 0/*local_names*/, 
 		yyvsp[0]/*parser_code*/, 0/*native_code*/);
-	PC.cclass->add_method(main_method_name, method);
+	PC.cclass->add_method(PC.alias_method(main_method_name), method);
 ;
     break;}
 case 8:
-#line 131 "compile.y"
+#line 138 "compile.y"
 {
 	const String& command=*LA2S(*yyvsp[-2]);
 	YYSTYPE strings_code=yyvsp[0];
@@ -1116,11 +1123,11 @@ case 8:
 ;
     break;}
 case 12:
-#line 203 "compile.y"
+#line 210 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 16:
-#line 208 "compile.y"
+#line 215 "compile.y"
 {
 	const String& name=*LA2S(*yyvsp[-5]);
 
@@ -1146,23 +1153,23 @@ case 16:
 		0, 0/*min,max numbered_params_count*/, 
 		params_names, locals_names, 
 		yyvsp[0], 0);
-	PC.cclass->add_method(name, method);
+	PC.cclass->add_method(PC.alias_method(name), method);
 ;
     break;}
 case 19:
-#line 237 "compile.y"
+#line 244 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 23:
-#line 239 "compile.y"
+#line 246 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 29:
-#line 247 "compile.y"
+#line 254 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 35:
-#line 253 "compile.y"
+#line 260 "compile.y"
 {
 	yyval=yyvsp[0]; /* stack: resulting value */ 
 	changetail_or_append(*yyval, 
@@ -1172,15 +1179,15 @@ case 35:
 ;
     break;}
 case 36:
-#line 260 "compile.y"
+#line 267 "compile.y"
 { yyval=yyvsp[0] ;
     break;}
 case 39:
-#line 262 "compile.y"
+#line 269 "compile.y"
 { yyval=yyvsp[-1] ;
     break;}
 case 42:
-#line 266 "compile.y"
+#line 273 "compile.y"
 {
 	yyval=N(); 
 	ArrayOperation* diving_code=yyvsp[0];
@@ -1205,22 +1212,22 @@ case 42:
 ;
     break;}
 case 43:
-#line 288 "compile.y"
+#line 295 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 45:
-#line 289 "compile.y"
+#line 296 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 46:
-#line 293 "compile.y"
+#line 300 "compile.y"
 {
 	yyval=yyvsp[-1]; /* stack: context,name */
 	P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */
 ;
     break;}
 case 50:
-#line 301 "compile.y"
+#line 308 "compile.y"
 {
 	yyval=N();
 	ArrayOperation* diving_code=yyvsp[0];
@@ -1240,7 +1247,7 @@ case 50:
 ;
     break;}
 case 51:
-#line 318 "compile.y"
+#line 325 "compile.y"
 {
 	yyval=N(); 
 	O(*yyval, OP_WITH_WRITE); /* stack: starting context */
@@ -1248,11 +1255,11 @@ case 51:
 ;
     break;}
 case 52:
-#line 323 "compile.y"
+#line 330 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 56:
-#line 330 "compile.y"
+#line 337 "compile.y"
 {
 	// stack: context, name
 	yyval=yyvsp[-1]; // stack: context, name, value
@@ -1260,7 +1267,7 @@ case 56:
 ;
     break;}
 case 57:
-#line 336 "compile.y"
+#line 343 "compile.y"
 { 
 	yyval=N(); 
 	O(*yyval, OP_PREPARE_TO_EXPRESSION);
@@ -1270,7 +1277,7 @@ case 57:
 ;
     break;}
 case 58:
-#line 344 "compile.y"
+#line 351 "compile.y"
 {
 	// stack: context, name
 	yyval=N(); 
@@ -1278,7 +1285,7 @@ case 58:
 ;
     break;}
 case 62:
-#line 355 "compile.y"
+#line 362 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */
@@ -1287,11 +1294,11 @@ case 62:
 ;
     break;}
 case 65:
-#line 362 "compile.y"
+#line 369 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 66:
-#line 366 "compile.y"
+#line 373 "compile.y"
 {
 	yyval=yyvsp[0]; /* stack: value */
 	changetail_or_append(*yyval, 
@@ -1300,19 +1307,19 @@ case 66:
 ;
     break;}
 case 67:
-#line 372 "compile.y"
+#line 379 "compile.y"
 { 
 					PC.in_call_value=true; 
 			;
     break;}
 case 68:
-#line 375 "compile.y"
+#line 382 "compile.y"
 {
 				PC.in_call_value=false;
 			;
     break;}
 case 69:
-#line 378 "compile.y"
+#line 385 "compile.y"
 { /* ^field.$method{vasya} */
 	yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */
 
@@ -1327,56 +1334,56 @@ case 69:
 ;
     break;}
 case 72:
-#line 393 "compile.y"
+#line 400 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 76:
-#line 399 "compile.y"
+#line 406 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 77:
-#line 400 "compile.y"
+#line 407 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 78:
-#line 401 "compile.y"
+#line 408 "compile.y"
 {yyval=yyvsp[-1];
     break;}
 case 80:
-#line 404 "compile.y"
+#line 411 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 82:
-#line 408 "compile.y"
+#line 415 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 84:
-#line 412 "compile.y"
+#line 419 "compile.y"
 { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 85:
-#line 414 "compile.y"
+#line 421 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(*yyval, OP_STORE_PARAM);
 ;
     break;}
 case 86:
-#line 418 "compile.y"
+#line 425 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]);
 ;
     break;}
 case 87:
-#line 422 "compile.y"
+#line 429 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]);
 ;
     break;}
 case 91:
-#line 431 "compile.y"
+#line 438 "compile.y"
 {
 	yyval=N(); 
 	O(*yyval, OP_PREPARE_TO_EXPRESSION);
@@ -1385,15 +1392,15 @@ case 91:
 ;
     break;}
 case 93:
-#line 440 "compile.y"
+#line 447 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 95:
-#line 442 "compile.y"
+#line 449 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 97:
-#line 444 "compile.y"
+#line 451 "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
@@ -1404,7 +1411,7 @@ case 97:
 ;
     break;}
 case 98:
-#line 452 "compile.y"
+#line 459 "compile.y"
 {
 	/* stack: context */
 	yyval=yyvsp[0]; /* stack: context,name */
@@ -1412,14 +1419,14 @@ case 98:
 ;
     break;}
 case 104:
-#line 465 "compile.y"
+#line 472 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(*yyval, OP_GET_ELEMENT);
 ;
     break;}
 case 105:
-#line 469 "compile.y"
+#line 476 "compile.y"
 {
 	ArrayOperation* code;
 	{
@@ -1431,7 +1438,7 @@ case 105:
 ;
     break;}
 case 106:
-#line 478 "compile.y"
+#line 485 "compile.y"
 {
 	yyval=N(); 
 	OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */
@@ -1440,7 +1447,7 @@ case 106:
 ;
     break;}
 case 107:
-#line 484 "compile.y"
+#line 491 "compile.y"
 {
 	yyval=N(); 
 	O(*yyval, OP_WITH_READ);
@@ -1448,18 +1455,18 @@ case 107:
 ;
     break;}
 case 109:
-#line 489 "compile.y"
+#line 496 "compile.y"
 { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ;
     break;}
 case 110:
-#line 490 "compile.y"
+#line 497 "compile.y"
 {
 	yyval=yyvsp[0];
 	O(*yyval, OP_GET_ELEMENT__WRITE);
 ;
     break;}
 case 113:
-#line 499 "compile.y"
+#line 506 "compile.y"
 {
 	yyval=yyvsp[-1]; // stack: class name string
 	if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class
@@ -1474,7 +1481,7 @@ case 113:
 ;
     break;}
 case 114:
-#line 511 "compile.y"
+#line 518 "compile.y"
 {
 	yyval=yyvsp[-1];
 	if(!PC.in_call_value) {
@@ -1485,7 +1492,7 @@ case 114:
 ;
     break;}
 case 115:
-#line 523 "compile.y"
+#line 530 "compile.y"
 {
 	// see OP_PREPARE_TO_EXPRESSION!!
 	if((yyval=yyvsp[0])->count()==2) // only one string literal in there?
@@ -1493,159 +1500,159 @@ case 115:
 ;
     break;}
 case 119:
-#line 532 "compile.y"
+#line 539 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 120:
-#line 533 "compile.y"
+#line 540 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 121:
-#line 534 "compile.y"
+#line 541 "compile.y"
 { yyval = yyvsp[-1]; ;
     break;}
 case 122:
-#line 536 "compile.y"
+#line 543 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_NEG) ;
     break;}
 case 123:
-#line 537 "compile.y"
+#line 544 "compile.y"
 { yyval=yyvsp[0] ;
     break;}
 case 124:
-#line 538 "compile.y"
+#line 545 "compile.y"
 { yyval=yyvsp[0];	 O(*yyval, OP_INV) ;
     break;}
 case 125:
-#line 539 "compile.y"
+#line 546 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_NOT) ;
     break;}
 case 126:
-#line 540 "compile.y"
+#line 547 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_DEF) ;
     break;}
 case 127:
-#line 541 "compile.y"
+#line 548 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_IN) ;
     break;}
 case 128:
-#line 542 "compile.y"
+#line 549 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_FEXISTS) ;
     break;}
 case 129:
-#line 543 "compile.y"
+#line 550 "compile.y"
 { yyval=yyvsp[0];  O(*yyval, OP_DEXISTS) ;
     break;}
 case 130:
-#line 545 "compile.y"
+#line 552 "compile.y"
 {	yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_SUB) ;
     break;}
 case 131:
-#line 546 "compile.y"
+#line 553 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_ADD) ;
     break;}
 case 132:
-#line 547 "compile.y"
+#line 554 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MUL) ;
     break;}
 case 133:
-#line 548 "compile.y"
+#line 555 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_DIV) ;
     break;}
 case 134:
-#line 549 "compile.y"
+#line 556 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_MOD) ;
     break;}
 case 135:
-#line 550 "compile.y"
+#line 557 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_INTDIV) ;
     break;}
 case 136:
-#line 551 "compile.y"
+#line 558 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SL) ;
     break;}
 case 137:
-#line 552 "compile.y"
+#line 559 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_SR) ;
     break;}
 case 138:
-#line 553 "compile.y"
+#line 560 "compile.y"
 { yyval=yyvsp[-2]; 	P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_AND) ;
     break;}
 case 139:
-#line 554 "compile.y"
+#line 561 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_OR) ;
     break;}
 case 140:
-#line 555 "compile.y"
+#line 562 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_BIN_XOR) ;
     break;}
 case 141:
-#line 556 "compile.y"
+#line 563 "compile.y"
 { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_AND) ;
     break;}
 case 142:
-#line 557 "compile.y"
+#line 564 "compile.y"
 { yyval=yyvsp[-2];  OA(*yyval, OP_NESTED_CODE, yyvsp[0]);  O(*yyval, OP_LOG_OR) ;
     break;}
 case 143:
-#line 558 "compile.y"
+#line 565 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_LOG_XOR) ;
     break;}
 case 144:
-#line 559 "compile.y"
+#line 566 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LT) ;
     break;}
 case 145:
-#line 560 "compile.y"
+#line 567 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GT) ;
     break;}
 case 146:
-#line 561 "compile.y"
+#line 568 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_LE) ;
     break;}
 case 147:
-#line 562 "compile.y"
+#line 569 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_GE) ;
     break;}
 case 148:
-#line 563 "compile.y"
+#line 570 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_EQ) ;
     break;}
 case 149:
-#line 564 "compile.y"
+#line 571 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_NUM_NE) ;
     break;}
 case 150:
-#line 565 "compile.y"
+#line 572 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LT) ;
     break;}
 case 151:
-#line 566 "compile.y"
+#line 573 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GT) ;
     break;}
 case 152:
-#line 567 "compile.y"
+#line 574 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_LE) ;
     break;}
 case 153:
-#line 568 "compile.y"
+#line 575 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_GE) ;
     break;}
 case 154:
-#line 569 "compile.y"
+#line 576 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_EQ) ;
     break;}
 case 155:
-#line 570 "compile.y"
+#line 577 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_STR_NE) ;
     break;}
 case 156:
-#line 571 "compile.y"
+#line 578 "compile.y"
 { yyval=yyvsp[-2];  P(*yyval, *yyvsp[0]);  O(*yyval, OP_IS) ;
     break;}
 case 157:
-#line 574 "compile.y"
+#line 581 "compile.y"
 {
 	yyval=N();
 	OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */
@@ -1654,18 +1661,18 @@ case 157:
 ;
     break;}
 case 158:
-#line 583 "compile.y"
+#line 590 "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 588 "compile.y"
+#line 595 "compile.y"
 { yyval=VL(new VVoid(), 0, 0, 0) ;
     break;}
 case 160:
-#line 589 "compile.y"
+#line 596 "compile.y"
 { yyval=N() ;
     break;}
 }
@@ -1890,7 +1897,7 @@ yyerrhandle:
     }
   return 1;
 }
-#line 591 "compile.y"
+#line 598 "compile.y"
 
 #endif
 
@@ -1910,6 +1917,14 @@ yyerrhandle:
 		4:[^({]=pop
 */
 
+inline void ungetc(Parse_control& pc, uint last_line_end_col) {
+	pc.source--;
+	if(pc.pos.col==0) {
+		--pc.pos.line; pc.pos.col=last_line_end_col;
+	} else
+		--pc.pos.col;
+
+}
 static int yylex(YYSTYPE *lvalp, void *apc) {
 	register Parse_control& pc=*static_cast<Parse_control*>(apc);
 
@@ -1934,10 +1949,9 @@ static int yylex(YYSTYPE *lvalp, void *a
 //		fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, pc.sp);
 
 		if(c=='\n') {
-			pc.pos.line++;
-			pc.pos.col=0;
+			pc.pos_next_line();
 		} else
-			pc.pos.col++;
+			pc.pos.col+=c=='\t'?TAB_SIZE:1;
 
 		if(c=='@' && pc.pos.col==0+1) {
 			if(pc.ls==LS_DEF_SPECIAL_BODY) {
@@ -2042,7 +2056,7 @@ default:
 
 		// USER'S = NOT OURS
 		case LS_USER:
-        case LS_NAME_SQUARE_PART: // name.[here].xxx
+		case LS_NAME_SQUARE_PART: // name.[here].xxx
 			if(pc.trim_bof)
 				switch(c) {
 				case '\n': case ' ': case '\t':
@@ -2360,7 +2374,7 @@ default:
 				// expression integer division
 				case '\\':
 					pop_LS(pc);
-					pc.source--;  if(--pc.pos.col<0) { pc.pos.line--;  pc.pos.col=-1; }
+					pc.ungetc();
 					result=EON;
 					goto break2;
 				}
@@ -2372,7 +2386,7 @@ default:
 				switch(c) {
 				case ':': 
 					pop_LS(pc);
-					pc.source--;  if(--pc.pos.col<0) { pc.pos.line--;  pc.pos.col=-1; }
+					pc.ungetc();
 					result=EON;
 					goto break2;
 				}
@@ -2392,7 +2406,7 @@ default:
 			// before call
 			case '^': 
 				pop_LS(pc);
-				pc.source--;  if(--pc.pos.col<0) { pc.pos.line--;  pc.pos.col=-1; }
+				pc.ungetc();
 				result=EON;
 				goto break2;
 			case '[':
@@ -2589,7 +2603,7 @@ default:
 				RC;
 			}					   
 			pop_LS(pc);
-			pc.source--;  if(--pc.pos.col<0) { pc.pos.line--;  pc.pos.col=-1; }
+			pc.ungetc();
 			result=EON;
 			goto break2;
 		}