--- parser3/src/main/compile.tab.C 2003/01/30 14:59:44 1.81.2.2 +++ parser3/src/main/compile.tab.C 2003/01/31 14:03:53 1.81.2.5 @@ -43,7 +43,7 @@ Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.tab.C,v 1.81.2.2 2003/01/30 14:59:44 paf Exp $ + $Id: compile.tab.C,v 1.81.2.5 2003/01/31 14:03:53 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, 195, 195, - 196, 196, 197, 198, 198, 200, 229, 229, 230, 231, - 231, 232, 232, 234, 234, 238, 238, 240, 240, 241, - 241, 242, 242, 242, 246, 253, 254, 254, 255, 256, - 258, 259, 281, 282, 282, 286, 290, 292, 293, 294, - 311, 316, 318, 320, 321, 323, 329, 337, 343, 345, - 346, 348, 354, 355, 355, 359, 365, 368, 371, 384, - 386, 386, 387, 389, 390, 392, 393, 394, 395, 397, - 399, 401, 403, 405, 407, 411, 415, 419, 421, 422, - 424, 433, 433, 435, 435, 436, 437, 445, 450, 452, - 454, 455, 456, 458, 462, 471, 477, 482, 482, 483, - 488, 490, 492, 504, 516, 521, 523, 524, 525, 526, - 527, 529, 530, 531, 532, 533, 534, 535, 536, 538, - 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, - 549, 550, 551, 552, 553, 554, 555, 556, 557, 558, - 559, 560, 561, 562, 563, 564, 567, 576, 581, 582 + 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 }; #endif @@ -1036,7 +1036,7 @@ case 1: { MethodPtr method(new Method(main_method_name, Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ - ArrayConstStringPtr(0)/*param_names*/, ArrayConstStringPtr(0)/*local_names*/, + ArrayStringPtr(0)/*param_names*/, ArrayStringPtr(0)/*local_names*/, yyvsp[0]/*parser_code*/, 0/*native_code*/)); PC.cclass->add_method(main_method_name, method); ; @@ -1044,7 +1044,7 @@ case 1: case 8: #line 131 "compile.y" { - ConstStringPtr command=LA2S(*yyvsp[-2]); + StringPtr command=LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; if(strings_code->count()<1*2) { strcpy(PC.error, "@"); @@ -1061,7 +1061,7 @@ case 8: } if(strings_code->count()==1*2) { // new class' name - ConstStringPtr name=LA2S(*strings_code); + StringPtr name=LA2S(*strings_code); // creating the class PC.cclass=VStateless_classPtr(new VClass); PC.cclass->set_name(name); @@ -1073,7 +1073,7 @@ case 8: } } else if(*command==USE_CONTROL_METHOD_NAME) { for(int i=0; icount(); i+=2) - PC.request->use_file(PC.request->main_class, LA2S(*strings_code, i)); + PC.request->use_file(*PC.request->main_class, LA2S(*strings_code, i)); } else if(*command==BASE_NAME) { if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a base '"); @@ -1082,14 +1082,20 @@ case 8: YYERROR; } if(strings_code->count()==1*2) { - ConstStringPtr base_name=LA2S(*strings_code); - if(VStateless_classPtr base_class=PC.request->classes().get(base_name)) { + StringPtr base_name=LA2S(*strings_code); + if(ValuePtr base_class_value=PC.request->classes().get(base_name)) { // @CLASS == @BASE sanity check - if(PC.cclass.get()==base_class.get()) { - strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + if(VStateless_class *base_class=base_class_value->get_class()) { + if(PC.cclass.get()==base_class) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + YYERROR; + } + PC.cclass->get_class()->set_base(base_class); + } else { // they asked to derive from a class without methods ['env' & co] + strcpy(PC.error, base_name->cstr()); + strcat(PC.error, ": you can not derive from this class in @"BASE_NAME); YYERROR; } - PC.cclass->set_base(base_class); } else { strcpy(PC.error, base_name->cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); @@ -1109,26 +1115,26 @@ case 8: ; break;} case 12: -#line 196 "compile.y" +#line 202 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 16: -#line 201 "compile.y" +#line 207 "compile.y" { - ConstStringPtr name=LA2S(*yyvsp[-5]); + StringPtr name=LA2S(*yyvsp[-5]); YYSTYPE params_names_code=yyvsp[-4]; - ArrayConstStringPtr params_names; + ArrayStringPtr params_names; if(int size=params_names_code->count()) { - params_names=ArrayConstStringPtr(new ArrayConstString); + params_names=ArrayStringPtr(new ArrayString); for(int i=0; icount()) { - locals_names=ArrayConstStringPtr(new ArrayConstString); + locals_names=ArrayStringPtr(new ArrayString); for(int i=0; i xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { @@ -1198,26 +1204,26 @@ case 42: ; break;} case 43: -#line 281 "compile.y" +#line 287 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 45: -#line 282 "compile.y" +#line 288 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 46: -#line 286 "compile.y" +#line 292 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 294 "compile.y" +#line 300 "compile.y" { yyval=N(); ArrayOperationPtr diving_code=yyvsp[0]; - ConstStringPtr first_name=LA2S(*diving_code); + StringPtr 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) { @@ -1233,7 +1239,7 @@ case 50: ; break;} case 51: -#line 311 "compile.y" +#line 317 "compile.y" { yyval=N(); O(*yyval, OP_WITH_WRITE); /* stack: starting context */ @@ -1241,11 +1247,11 @@ case 51: ; break;} case 52: -#line 316 "compile.y" +#line 322 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 56: -#line 323 "compile.y" +#line 329 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value @@ -1253,7 +1259,7 @@ case 56: ; break;} case 57: -#line 329 "compile.y" +#line 335 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1263,7 +1269,7 @@ case 57: ; break;} case 58: -#line 337 "compile.y" +#line 343 "compile.y" { // stack: context, name yyval=N(); @@ -1271,7 +1277,7 @@ case 58: ; break;} case 62: -#line 348 "compile.y" +#line 354 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1280,11 +1286,11 @@ case 62: ; break;} case 65: -#line 355 "compile.y" +#line 361 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 66: -#line 359 "compile.y" +#line 365 "compile.y" { yyval=yyvsp[0]; /* stack: value */ changetail_or_append(*yyval, @@ -1293,19 +1299,19 @@ case 66: ; break;} case 67: -#line 365 "compile.y" +#line 371 "compile.y" { PC.in_call_value=true; ; break;} case 68: -#line 368 "compile.y" +#line 374 "compile.y" { PC.in_call_value=false; ; break;} case 69: -#line 371 "compile.y" +#line 377 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ @@ -1320,56 +1326,56 @@ case 69: ; break;} case 72: -#line 386 "compile.y" +#line 392 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 76: -#line 392 "compile.y" +#line 398 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 393 "compile.y" +#line 399 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 394 "compile.y" +#line 400 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 397 "compile.y" +#line 403 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 82: -#line 401 "compile.y" +#line 407 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 84: -#line 405 "compile.y" +#line 411 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; break;} case 85: -#line 407 "compile.y" +#line 413 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_STORE_PARAM); ; break;} case 86: -#line 411 "compile.y" +#line 417 "compile.y" { yyval=N(); OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 415 "compile.y" +#line 421 "compile.y" { yyval=N(); OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 424 "compile.y" +#line 430 "compile.y" { yyval=N(); O(*yyval, OP_PREPARE_TO_EXPRESSION); @@ -1378,15 +1384,15 @@ case 91: ; break;} case 93: -#line 433 "compile.y" +#line 439 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 95: -#line 435 "compile.y" +#line 441 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 97: -#line 437 "compile.y" +#line 443 "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 @@ -1397,7 +1403,7 @@ case 97: ; break;} case 98: -#line 445 "compile.y" +#line 451 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ @@ -1405,14 +1411,14 @@ case 98: ; break;} case 104: -#line 458 "compile.y" +#line 464 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 462 "compile.y" +#line 468 "compile.y" { ArrayOperationPtr code; { @@ -1424,7 +1430,7 @@ case 105: ; break;} case 106: -#line 471 "compile.y" +#line 477 "compile.y" { yyval=N(); OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ @@ -1433,7 +1439,7 @@ case 106: ; break;} case 107: -#line 477 "compile.y" +#line 483 "compile.y" { yyval=N(); O(*yyval, OP_WITH_READ); @@ -1441,22 +1447,22 @@ case 107: ; break;} case 109: -#line 482 "compile.y" +#line 488 "compile.y" { yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; break;} case 110: -#line 483 "compile.y" +#line 489 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 492 "compile.y" +#line 498 "compile.y" { yyval=yyvsp[-1]; // stack: class name string if(*LA2S(*yyval) == BASE_NAME) { // pseude BASE class - if(VStateless_classPtr base=PC.cclass->base_class()) { + if(VStateless_class* base=PC.cclass->base_class()) { change_string_literal_value(*yyval, base->name()); } else { strcpy(PC.error, "no base class declared"); @@ -1467,7 +1473,7 @@ case 113: ; break;} case 114: -#line 504 "compile.y" +#line 510 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { @@ -1478,7 +1484,7 @@ case 114: ; break;} case 115: -#line 516 "compile.y" +#line 522 "compile.y" { // see OP_PREPARE_TO_EXPRESSION!! if((yyval=yyvsp[0])->count()==2) // only one string literal in there? @@ -1486,159 +1492,159 @@ case 115: ; break;} case 119: -#line 525 "compile.y" +#line 531 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 526 "compile.y" +#line 532 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 527 "compile.y" +#line 533 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 529 "compile.y" +#line 535 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NEG) ; break;} case 123: -#line 530 "compile.y" +#line 536 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 531 "compile.y" +#line 537 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_INV) ; break;} case 125: -#line 532 "compile.y" +#line 538 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_NOT) ; break;} case 126: -#line 533 "compile.y" +#line 539 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEF) ; break;} case 127: -#line 534 "compile.y" +#line 540 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_IN) ; break;} case 128: -#line 535 "compile.y" +#line 541 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; break;} case 129: -#line 536 "compile.y" +#line 542 "compile.y" { yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; break;} case 130: -#line 538 "compile.y" +#line 544 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; break;} case 131: -#line 539 "compile.y" +#line 545 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; break;} case 132: -#line 540 "compile.y" +#line 546 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; break;} case 133: -#line 541 "compile.y" +#line 547 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; break;} case 134: -#line 542 "compile.y" +#line 548 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; break;} case 135: -#line 543 "compile.y" +#line 549 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; break;} case 136: -#line 544 "compile.y" +#line 550 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; break;} case 137: -#line 545 "compile.y" +#line 551 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; break;} case 138: -#line 546 "compile.y" +#line 552 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; break;} case 139: -#line 547 "compile.y" +#line 553 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; break;} case 140: -#line 548 "compile.y" +#line 554 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; break;} case 141: -#line 549 "compile.y" +#line 555 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; break;} case 142: -#line 550 "compile.y" +#line 556 "compile.y" { yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; break;} case 143: -#line 551 "compile.y" +#line 557 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; break;} case 144: -#line 552 "compile.y" +#line 558 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; break;} case 145: -#line 553 "compile.y" +#line 559 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; break;} case 146: -#line 554 "compile.y" +#line 560 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; break;} case 147: -#line 555 "compile.y" +#line 561 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; break;} case 148: -#line 556 "compile.y" +#line 562 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; break;} case 149: -#line 557 "compile.y" +#line 563 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; break;} case 150: -#line 558 "compile.y" +#line 564 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; break;} case 151: -#line 559 "compile.y" +#line 565 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; break;} case 152: -#line 560 "compile.y" +#line 566 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; break;} case 153: -#line 561 "compile.y" +#line 567 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; break;} case 154: -#line 562 "compile.y" +#line 568 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; break;} case 155: -#line 563 "compile.y" +#line 569 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; break;} case 156: -#line 564 "compile.y" +#line 570 "compile.y" { yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; break;} case 157: -#line 567 "compile.y" +#line 573 "compile.y" { yyval=N(); OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ @@ -1647,18 +1653,18 @@ case 157: ; break;} case 158: -#line 576 "compile.y" +#line 582 "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 581 "compile.y" +#line 587 "compile.y" { yyval=VL(ValuePtr(new VVoid())) ; break;} case 160: -#line 582 "compile.y" +#line 588 "compile.y" { yyval=N() ; break;} } @@ -1883,7 +1889,7 @@ yyerrhandle: } return 1; } -#line 584 "compile.y" +#line 590 "compile.y" #endif