--- parser3/src/main/compile.tab.C 2003/04/08 12:47:30 1.81.2.13.2.34 +++ parser3/src/main/compile.tab.C 2003/09/01 12:27:27 1.83.2.1 @@ -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.13.2.34 2003/04/08 12:47:30 paf Exp $ + $Id: compile.tab.C,v 1.83.2.1 2003/09/01 12:27:27 paf Exp $ */ /** @@ -57,16 +57,14 @@ -#: in iis make up specialized Pool object for that */ -#define YYSTYPE ArrayOperation* +#define YYSTYPE Array/**/ * #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 #define YYERROR_VERBOSE 1 -#define yyerror(msg) real_yyerror((Parse_control *)pc, msg) +#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" @@ -76,22 +74,19 @@ #include "pa_vvoid.h" #include "pa_vmethod_frame.h" -// defines - #define USE_CONTROL_METHOD_NAME "USE" -// 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 #undef PC -#define PC (*(Parse_control *)pc) -#undef POOL +#define PC (*(parse_control *)pc) #define POOL (*PC.pool) +#undef NEW +#define NEW new(POOL) #ifndef DOXYGEN #ifndef YYSTYPE #define YYSTYPE int @@ -216,22 +211,22 @@ static const short yyrhs[] = { 62, #if YYDEBUG != 0 static const short yyrline[] = { 0, - 121, 129, 131, 131, 132, 134, 134, 136, 208, 208, - 209, 209, 210, 211, 211, 213, 242, 242, 243, 244, - 244, 245, 245, 247, 247, 251, 251, 253, 253, 254, - 254, 255, 255, 255, 259, 266, 267, 267, 268, 269, - 271, 272, 294, 295, 295, 299, 303, 305, 306, 307, - 324, 329, 331, 333, 334, 336, 342, 350, 356, 358, - 359, 361, 367, 368, 368, 372, 378, 381, 384, 397, - 399, 399, 400, 402, 403, 405, 406, 407, 408, 410, - 412, 414, 416, 418, 420, 424, 428, 432, 434, 435, - 437, 446, 446, 448, 448, 449, 450, 458, 463, 465, - 467, 468, 469, 471, 475, 484, 490, 495, 495, 496, - 501, 503, 505, 517, 529, 534, 536, 537, 538, 539, - 540, 542, 543, 544, 545, 546, 547, 548, 549, 551, - 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, 580, 589, 594, 595 + 116, 126, 128, 128, 129, 131, 131, 133, 200, 200, + 201, 201, 202, 203, 203, 205, 234, 234, 235, 236, + 236, 237, 237, 239, 239, 243, 243, 245, 245, 246, + 246, 247, 247, 247, 251, 258, 259, 259, 260, 261, + 263, 264, 286, 287, 287, 291, 295, 297, 298, 299, + 316, 321, 323, 325, 326, 328, 334, 342, 348, 350, + 351, 353, 359, 360, 360, 364, 370, 373, 376, 389, + 391, 391, 392, 394, 395, 397, 398, 399, 400, 402, + 404, 406, 408, 410, 412, 416, 420, 424, 426, 427, + 429, 438, 438, 440, 440, 441, 442, 450, 455, 457, + 459, 460, 461, 463, 467, 476, 482, 487, 487, 488, + 493, 495, 497, 509, 521, 526, 528, 529, 530, 531, + 532, 534, 535, 536, 537, 538, 539, 540, 541, 543, + 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, 572, 581, 586, 587 }; #endif @@ -1038,21 +1033,23 @@ yyreduce: switch (yyn) { case 1: -#line 122 "compile.y" +#line 117 "compile.y" { - Method& method=*new Method(Method::CT_ANY, + Method& method=*NEW Method(POOL, + PC.request->main_method_name, + 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(PC.alias_method(main_method_name), method); + PC.cclass->add_method(PC.request->main_method_name, method); ; break;} case 8: -#line 137 "compile.y" +#line 134 "compile.y" { - const String& command=*LA2S(*yyvsp[-2]); + const String& command=*LA2S(yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; - if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) { + if(strings_code->size()<1*2) { strcpy(PC.error, "@"); strcat(PC.error, command.cstr()); strcat(PC.error, " is empty"); @@ -1065,22 +1062,21 @@ case 8: strcat(PC.error, "'"); YYERROR; } - if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { + if(strings_code->size()==1*2) { // new class' name - const String& name=*LA2S(*strings_code); + const String *name=LA2S(strings_code); // creating the class - VStateless_class* cclass=new VClass; - PC.cclass=cclass; - PC.cclass->set_name(name); + PC.cclass=NEW VClass(POOL); + PC.cclass->set_name(*name); // append to request's classes - PC.request.classes().put(name, cclass); + PC.request->classes().put(*name, PC.cclass); } else { - strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)"); + strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); YYERROR; } } else if(command==USE_CONTROL_METHOD_NAME) { - for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) - PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i)); + for(int i=0; isize(); i+=2) + 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 '"); @@ -1088,26 +1084,22 @@ case 8: strcat(PC.error, "'"); YYERROR; } - if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { - const String& base_name=*LA2S(*strings_code); - if(Value* 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==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; - } - } else { + if(strings_code->size()==1*2) { + const String& base_name=*LA2S(strings_code); + Value *vbase_class=static_cast( + PC.request->classes().get(base_name)); + VStateless_class *base_class=vbase_class?vbase_class->get_class():0; + if(!base_class) { strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } + // @CLASS == @BASE sanity check + if(PC.cclass==base_class) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + YYERROR; + } + PC.cclass->set_base(base_class); } else { strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; @@ -1122,557 +1114,557 @@ case 8: ; break;} case 12: -#line 209 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 201 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 16: -#line 214 "compile.y" +#line 206 "compile.y" { - const String& name=*LA2S(*yyvsp[-5]); + const String *name=LA2S(yyvsp[-5]); YYSTYPE params_names_code=yyvsp[-4]; - ArrayString* params_names=0; - if(int size=params_names_code->count()) { - params_names=new ArrayString; - for(int i=0; isize()) { + params_names=NEW Array(POOL); + for(int i=0; icount()) { - locals_names=new ArrayString; - for(int i=0; isize()) { + locals_names=NEW Array(POOL); + for(int i=0; iadd_method(PC.alias_method(name), method); + PC.cclass->add_method(*name, method); ; break;} case 19: -#line 243 "compile.y" +#line 235 "compile.y" {yyval=yyvsp[-1]; break;} case 23: -#line 245 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +#line 237 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 29: -#line 253 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 245 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 35: -#line 259 "compile.y" +#line 251 "compile.y" { yyval=yyvsp[0]; /* stack: resulting value */ - changetail_or_append(*yyval, + changetail_or_append(yyval, OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, /*or */OP_WRITE_VALUE ); /* value=pop; wcontext.write(value) */ ; break;} case 36: -#line 266 "compile.y" +#line 258 "compile.y" { yyval=yyvsp[0] ; break;} case 39: -#line 268 "compile.y" +#line 260 "compile.y" { yyval=yyvsp[-1] ; break;} case 42: -#line 272 "compile.y" +#line 264 "compile.y" { - yyval=N(); - ArrayOperation* diving_code=yyvsp[0]; - const String* first_name=LA2S(*diving_code); + yyval=N(POOL); + Array *diving_code=yyvsp[0]; + const String *first_name=LA2S(diving_code); // self.xxx... -> xxx... - // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... + // 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, + O(yyval, OP_WITH_SELF); /* stack: starting context */ + P(yyval, diving_code, /* skip over... */ - diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - O(*yyval, OP_WITH_READ); /* stack: starting context */ + O(yyval, OP_WITH_READ); /* stack: starting context */ // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR - // OP_VALUE+origin+string+OP_GET_ELEMENT. -> OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR. - if(PC.in_call_value && diving_code->count()==4) - diving_code->put(4-1, OP_GET_ELEMENT_OR_OPERATOR); - P(*yyval, *diving_code); + // 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 294 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 286 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 45: -#line 295 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 287 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 46: -#line 299 "compile.y" +#line 291 "compile.y" { yyval=yyvsp[-1]; /* stack: context,name */ - P(*yyval, *yyvsp[0]); /* stack: context,name,constructor_value */ + P(yyval, yyvsp[0]); /* stack: context,name,constructor_value */ ; break;} case 50: -#line 307 "compile.y" +#line 299 "compile.y" { - yyval=N(); - ArrayOperation* diving_code=yyvsp[0]; - const String* first_name=LA2S(*diving_code); + yyval=N(POOL); + Array *diving_code=yyvsp[0]; + const String *first_name=LA2S(diving_code); // $self.xxx... -> $xxx... - // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... + // 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, + O(yyval, OP_WITH_SELF); /* stack: starting context */ + P(yyval, diving_code, /* skip over... */ - diving_code->count()>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP_+origin+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); + O(yyval, OP_WITH_ROOT); /* stack: starting context */ + P(yyval, diving_code); } /* diving code; stack: current context */ ; break;} case 51: -#line 324 "compile.y" +#line 316 "compile.y" { - yyval=N(); - O(*yyval, OP_WITH_WRITE); /* stack: starting context */ - P(*yyval, *yyvsp[0]); /* diving code; stack: context,name */ + yyval=N(POOL); + O(yyval, OP_WITH_WRITE); /* stack: starting context */ + P(yyval, yyvsp[0]); /* diving code; stack: context,name */ ; break;} case 52: -#line 329 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 321 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 56: -#line 336 "compile.y" +#line 328 "compile.y" { // stack: context, name yyval=yyvsp[-1]; // stack: context, name, value - O(*yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + O(yyval, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ ; break;} case 57: -#line 342 "compile.y" +#line 334 "compile.y" { - yyval=N(); - O(*yyval, OP_PREPARE_TO_EXPRESSION); + yyval=N(POOL); + O(yyval, OP_PREPARE_TO_EXPRESSION); // stack: context, name - 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) */ + 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 350 "compile.y" +#line 342 "compile.y" { // stack: context, name - yyval=N(); - OA(*yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ + yyval=N(POOL); + OA(yyval, OP_CURLY_CODE__CONSTRUCT, yyvsp[-1]); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ ; break;} case 62: -#line 361 "compile.y" +#line 353 "compile.y" { - yyval=N(); - OA(*yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ + yyval=N(POOL); + OA(yyval, OP_OBJECT_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} case 65: -#line 368 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 360 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 66: -#line 372 "compile.y" +#line 364 "compile.y" { yyval=yyvsp[0]; /* stack: value */ - changetail_or_append(*yyval, + changetail_or_append(yyval, OP_CALL, true, /*->*/ OP_CALL__WRITE, /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ ; break;} case 67: -#line 378 "compile.y" +#line 370 "compile.y" { PC.in_call_value=true; ; break;} case 68: -#line 381 "compile.y" +#line 373 "compile.y" { PC.in_call_value=false; ; break;} case 69: -#line 384 "compile.y" +#line 376 "compile.y" { /* ^field.$method{vasya} */ yyval=yyvsp[-3]; /* with_xxx,diving code; stack: context,method_junction */ YYSTYPE params_code=yyvsp[-1]; - if(params_code->count()==4) { // probably [] case. [OP_VALUE+origin+Void+STORE_PARAM] - if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value? + if(params_code->size()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] + if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? params_code=0; // ^zzz[] case. don't append lone empty param. } /* stack: context, method_junction */ - OA(*yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + OA(yyval, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value ; break;} case 72: -#line 399 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 391 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 76: -#line 405 "compile.y" +#line 397 "compile.y" {yyval=yyvsp[-1]; break;} case 77: -#line 406 "compile.y" +#line 398 "compile.y" {yyval=yyvsp[-1]; break;} case 78: -#line 407 "compile.y" +#line 399 "compile.y" {yyval=yyvsp[-1]; break;} case 80: -#line 410 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +#line 402 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 82: -#line 414 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +#line 406 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 84: -#line 418 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]) ; +#line 410 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]) ; break;} case 85: -#line 420 "compile.y" +#line 412 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP_STORE_PARAM); + O(yyval, OP_STORE_PARAM); ; break;} case 86: -#line 424 "compile.y" +#line 416 "compile.y" { - yyval=N(); - OA(*yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); + yyval=N(POOL); + OA(yyval, OP_EXPR_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 87: -#line 428 "compile.y" +#line 420 "compile.y" { - yyval=N(); - OA(*yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); + yyval=N(POOL); + OA(yyval, OP_CURLY_CODE__STORE_PARAM, yyvsp[0]); ; break;} case 91: -#line 437 "compile.y" +#line 429 "compile.y" { - yyval=N(); - O(*yyval, OP_PREPARE_TO_EXPRESSION); - P(*yyval, *yyvsp[0]); - O(*yyval, OP_WRITE_EXPR_RESULT); + yyval=N(POOL); + O(yyval, OP_PREPARE_TO_EXPRESSION); + P(yyval, yyvsp[0]); + O(yyval, OP_WRITE_EXPR_RESULT); ; break;} case 93: -#line 446 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 438 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 95: -#line 448 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 440 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 97: -#line 450 "compile.y" +#line 442 "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) */ + O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 98: -#line 458 "compile.y" +#line 450 "compile.y" { /* stack: context */ yyval=yyvsp[0]; /* stack: context,name */ - O(*yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O(yyval, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ ; break;} case 104: -#line 471 "compile.y" +#line 463 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP_GET_ELEMENT); + O(yyval, OP_GET_ELEMENT); ; break;} case 105: -#line 475 "compile.y" +#line 467 "compile.y" { - ArrayOperation* code; + Array *code; { - change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); - P(*code, *yyvsp[0]); + change_string_literal_to_write_string_literal(code=yyvsp[-1]); + P(code, yyvsp[0]); } - yyval=N(); - OA(*yyval, OP_STRING_POOL, code); + yyval=N(POOL); + OA(yyval, OP_STRING_POOL, code); ; break;} case 106: -#line 484 "compile.y" +#line 476 "compile.y" { - yyval=N(); - OA(*yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ + yyval=N(POOL); + OA(yyval, OP_OBJECT_POOL, yyvsp[-1]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.value() */ ; break;} case 107: -#line 490 "compile.y" +#line 482 "compile.y" { - yyval=N(); - O(*yyval, OP_WITH_READ); - P(*yyval, *yyvsp[0]); + yyval=N(POOL); + O(yyval, OP_WITH_READ); + P(yyval, yyvsp[0]); ; break;} case 109: -#line 495 "compile.y" -{ yyval=yyvsp[-1]; P(*yyval, *yyvsp[0]) ; +#line 487 "compile.y" +{ yyval=yyvsp[-1]; P(yyval, yyvsp[0]) ; break;} case 110: -#line 496 "compile.y" +#line 488 "compile.y" { yyval=yyvsp[0]; - O(*yyval, OP_GET_ELEMENT__WRITE); + O(yyval, OP_GET_ELEMENT__WRITE); ; break;} case 113: -#line 505 "compile.y" +#line 497 "compile.y" { yyval=yyvsp[-1]; // stack: class name string - if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class - if(VStateless_class* base=PC.cclass->base_class()) { - change_string_literal_value(*yyval, base->name()); + if(*LA2S(yyval) == BASE_NAME) { // pseude 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"); YYERROR; } } - O(*yyval, OP_GET_CLASS); + O(yyval, OP_GET_CLASS); ; break;} case 114: -#line 517 "compile.y" +#line 509 "compile.y" { yyval=yyvsp[-1]; if(!PC.in_call_value) { strcpy(PC.error, ":: not allowed here"); YYERROR; } - O(*yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); + O(yyval, OP_PREPARE_TO_CONSTRUCT_OBJECT); ; break;} case 115: -#line 529 "compile.y" +#line 521 "compile.y" { // see OP_PREPARE_TO_EXPRESSION!! - if((yyval=yyvsp[0])->count()==2) // only one string literal in there? - change_string_literal_to_double_literal(*yyval); // make that string literal Double + 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 538 "compile.y" +#line 530 "compile.y" { yyval = yyvsp[-1]; ; break;} case 120: -#line 539 "compile.y" +#line 531 "compile.y" { yyval = yyvsp[-1]; ; break;} case 121: -#line 540 "compile.y" +#line 532 "compile.y" { yyval = yyvsp[-1]; ; break;} case 122: -#line 542 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_NEG) ; +#line 534 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_NEG) ; break;} case 123: -#line 543 "compile.y" +#line 535 "compile.y" { yyval=yyvsp[0] ; break;} case 124: -#line 544 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_INV) ; +#line 536 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_INV) ; break;} case 125: -#line 545 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_NOT) ; +#line 537 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_NOT) ; break;} case 126: -#line 546 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_DEF) ; +#line 538 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_DEF) ; break;} case 127: -#line 547 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_IN) ; +#line 539 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_IN) ; break;} case 128: -#line 548 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_FEXISTS) ; +#line 540 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_FEXISTS) ; break;} case 129: -#line 549 "compile.y" -{ yyval=yyvsp[0]; O(*yyval, OP_DEXISTS) ; +#line 541 "compile.y" +{ yyval=yyvsp[0]; O(yyval, OP_DEXISTS) ; break;} case 130: -#line 551 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_SUB) ; +#line 543 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_SUB) ; break;} case 131: -#line 552 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_ADD) ; +#line 544 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_ADD) ; break;} case 132: -#line 553 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MUL) ; +#line 545 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MUL) ; break;} case 133: -#line 554 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_DIV) ; +#line 546 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_DIV) ; break;} case 134: -#line 555 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_MOD) ; +#line 547 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_MOD) ; break;} case 135: -#line 556 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_INTDIV) ; +#line 548 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_INTDIV) ; break;} case 136: -#line 557 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SL) ; +#line 549 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SL) ; break;} case 137: -#line 558 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_SR) ; +#line 550 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_SR) ; break;} case 138: -#line 559 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_AND) ; +#line 551 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_AND) ; break;} case 139: -#line 560 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_OR) ; +#line 552 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_OR) ; break;} case 140: -#line 561 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_BIN_XOR) ; +#line 553 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_BIN_XOR) ; break;} case 141: -#line 562 "compile.y" -{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_AND) ; +#line 554 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_AND) ; break;} case 142: -#line 563 "compile.y" -{ yyval=yyvsp[-2]; OA(*yyval, OP_NESTED_CODE, yyvsp[0]); O(*yyval, OP_LOG_OR) ; +#line 555 "compile.y" +{ yyval=yyvsp[-2]; OA(yyval, OP_NESTED_CODE, yyvsp[0]); O(yyval, OP_LOG_OR) ; break;} case 143: -#line 564 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_LOG_XOR) ; +#line 556 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_LOG_XOR) ; break;} case 144: -#line 565 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LT) ; +#line 557 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LT) ; break;} case 145: -#line 566 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GT) ; +#line 558 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GT) ; break;} case 146: -#line 567 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_LE) ; +#line 559 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_LE) ; break;} case 147: -#line 568 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_GE) ; +#line 560 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_GE) ; break;} case 148: -#line 569 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_EQ) ; +#line 561 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_EQ) ; break;} case 149: -#line 570 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_NUM_NE) ; +#line 562 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_NUM_NE) ; break;} case 150: -#line 571 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LT) ; +#line 563 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LT) ; break;} case 151: -#line 572 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GT) ; +#line 564 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GT) ; break;} case 152: -#line 573 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_LE) ; +#line 565 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_LE) ; break;} case 153: -#line 574 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_GE) ; +#line 566 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_GE) ; break;} case 154: -#line 575 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_EQ) ; +#line 567 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_EQ) ; break;} case 155: -#line 576 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_STR_NE) ; +#line 568 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_STR_NE) ; break;} case 156: -#line 577 "compile.y" -{ yyval=yyvsp[-2]; P(*yyval, *yyvsp[0]); O(*yyval, OP_IS) ; +#line 569 "compile.y" +{ yyval=yyvsp[-2]; P(yyval, yyvsp[0]); O(yyval, OP_IS) ; break;} case 157: -#line 580 "compile.y" +#line 572 "compile.y" { - yyval=N(); - OA(*yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ + yyval=N(POOL); + OA(yyval, OP_STRING_POOL, yyvsp[0]); /* stack: empty write context */ /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ ; break;} case 158: -#line 589 "compile.y" +#line 581 "compile.y" { // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE - change_string_literal_to_write_string_literal(*(yyval=yyvsp[0])) + change_string_literal_to_write_string_literal(yyval=yyvsp[0]) ; break;} case 159: -#line 594 "compile.y" -{ yyval=VL(new VVoid(), 0, 0, 0) ; +#line 586 "compile.y" +{ yyval=VL(NEW VVoid(POOL)) ; break;} case 160: -#line 595 "compile.y" -{ yyval=N() ; +#line 587 "compile.y" +{ yyval=N(POOL) ; break;} } /* the action file gets copied in in place of this dollarsign */ @@ -1896,7 +1888,7 @@ yyerrhandle: } return 1; } -#line 597 "compile.y" +#line 589 "compile.y" #endif @@ -1916,64 +1908,55 @@ 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(apc); - - #define lexical_brackets_nestage pc.brackets_nestages[pc.ls_sp] +static int yylex(YYSTYPE *lvalp, void *pc) { + #define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp] #define RC {result=c; goto break2; } - register int c; - int result; + register int c; + int result; - if(pc.pending_state) { - result=pc.pending_state; - pc.pending_state=0; + if(PC.pending_state) { + result=PC.pending_state; + PC.pending_state=0; return result; } - const char *begin=pc.source; - Pos begin_pos=pc.pos; + const char *begin=PC.source; const char *end; + int begin_line=PC.line; int skip_analized=0; while(true) { - c=*(end=(pc.source++)); -// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, pc.sp); + c=*(end=(PC.source++)); +// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp); if(c=='\n') { - pc.pos_next_line(); + PC.line++; + PC.col=0; } else - pc.pos_next_c(c); + PC.col++; - if(c=='@' && pc.pos.col==0+1) { - if(pc.ls==LS_DEF_SPECIAL_BODY) { + if(c=='@' && PC.col==0+1) { + if(PC.ls==LS_DEF_SPECIAL_BODY) { // @SPECIAL // ... // @APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - begin=pc.source; // ->punctuation - begin_pos=pc.pos; + begin=PC.source; // ->punctuation + begin_line=PC.line; // skip over _ after ^ - pc.source++; pc.pos.col++; + PC.source++; PC.col++; // skip analysis = forced literal continue; // converting ^#HH into char(hex(HH)) case '#': if(end!=begin) { - if(!pc.string_start) - pc.string_start=begin_pos; // append piece till ^ - pc.string.append_strdup_know_length(begin, end-begin); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // #HH ? - if(pc.source[0]=='#' && pc.source[1] && pc.source[2]) { - char c= - hex_value[(unsigned char)pc.source[1]]*0x10+ - hex_value[(unsigned char)pc.source[2]]; - if(c==0) { + if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) { + char *hex=(char *)POOL.malloc(1); + hex[0]= + hex_value[(unsigned char)PC.source[1]]*0x10+ + hex_value[(unsigned char)PC.source[2]]; + if(hex[0]==0) { result=BAD_HEX_LITERAL; goto break2; // wrong hex value[no ^#00 chars allowed]: bail out } // append char(hex(HH)) - pc.string.append(c); + PC.string->APPEND_CLEAN(hex, 1, PC.file, begin_line); // skip over ^#HH - pc.source+=3; - pc.pos.col+=3; + PC.source+=3; + PC.col+=3; // reset piece 'begin' position & line - begin=pc.source; // ->after ^#HH - begin_pos=pc.pos; + begin=PC.source; // ->after ^#HH + begin_line=PC.line; // skip analysis = forced literal continue; } @@ -2040,47 +2020,45 @@ default: } } // #comment start skipping - if(c=='#' && pc.pos.col==1) { + if(c=='#' && PC.col==1) { if(end!=begin) { - if(!pc.string_start) - pc.string_start=begin_pos; // append piece till # - pc.string.append_strdup_know_length(begin, end-begin); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // fall into COMMENT lexical state [wait for \n] - push_LS(pc, LS_USER_COMMENT); + push_LS(PC, LS_USER_COMMENT); continue; } - switch(pc.ls) { + switch(PC.ls) { // USER'S = NOT OURS case LS_USER: - case LS_NAME_SQUARE_PART: // name.[here].xxx - if(pc.trim_bof) + case LS_NAME_SQUARE_PART: // name.[here].xxx + if(PC.trim_bof) switch(c) { case '\n': case ' ': case '\t': - begin=pc.source; - begin_pos=pc.pos; + begin=PC.source; + begin_line=PC.line; continue; // skip it default: - pc.trim_bof=false; + PC.trim_bof=false; } switch(c) { case '$': - push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; case ']': - if(pc.ls==LS_NAME_SQUARE_PART) + if(PC.ls==LS_NAME_SQUARE_PART) if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> - pop_LS(pc); // $name.[co<]>de<]!> + pop_LS(PC); // $name.[co<]>de<]!> RC; } break; case '[': // $name.[co<[>de] - if(pc.ls==LS_NAME_SQUARE_PART) + if(PC.ls==LS_NAME_SQUARE_PART) lexical_brackets_nestage++; break; } @@ -2090,10 +2068,10 @@ default: case LS_USER_COMMENT: if(c=='\n') { // skip comment - begin=pc.source; - begin_pos=pc.pos; + begin=PC.source; + begin_line=PC.line; - pop_LS(pc); + pop_LS(PC); continue; } break; @@ -2105,17 +2083,17 @@ default: case '"': case '\'': if( - pc.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || - pc.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { - pop_LS(pc); //"abc". | 'abc'. + PC.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || + PC.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { + pop_LS(PC); //"abc". | 'abc'. RC; } break; case '$': - push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; } break; @@ -2124,10 +2102,10 @@ default: case LS_DEF_NAME: switch(c) { case '[': - pc.ls=LS_DEF_PARAMS; + PC.ls=LS_DEF_PARAMS; RC; case '\n': - pc.ls=LS_DEF_SPECIAL_BODY; + PC.ls=LS_DEF_SPECIAL_BODY; RC; } break; @@ -2140,10 +2118,10 @@ default: case ';': RC; case ']': - pc.ls=*pc.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; + PC.ls=*PC.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; RC; case '\n': // wrong. bailing out - pop_LS(pc); + pop_LS(PC); RC; } break; @@ -2154,17 +2132,17 @@ default: case ';': RC; case ']': - pc.ls=LS_DEF_COMMENT; + PC.ls=LS_DEF_COMMENT; RC; case '\n': // wrong. bailing out - pop_LS(pc); + pop_LS(PC); RC; } break; case LS_DEF_COMMENT: if(c=='\n') { - pop_LS(pc); + pop_LS(PC); RC; } break; @@ -2180,33 +2158,31 @@ default: switch(c) { case ')': if(--lexical_brackets_nestage==0) - if(pc.ls==LS_METHOD_ROUND) // method round param ended - pc.ls=LS_METHOD_AFTER; // look for method end - else // pc.ls==LS_VAR_ROUND // variable constructor ended - pop_LS(pc); // return to normal life + if(PC.ls==LS_METHOD_ROUND) // method round param ended + PC.ls=LS_METHOD_AFTER; // look for method end + else // PC.ls==LS_VAR_ROUND // variable constructor ended + pop_LS(PC); // return to normal life RC; case '#': // comment start skipping if(end!=begin) { - if(!pc.string_start) - pc.string_start=begin_pos; // append piece till # - pc.string.append_strdup_know_length(begin, end-begin); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // fall into COMMENT lexical state [wait for \n] - push_LS(pc, LS_EXPRESSION_COMMENT); + push_LS(PC, LS_EXPRESSION_COMMENT); lexical_brackets_nestage=1; continue; case '$': - push_LS(pc, LS_EXPRESSION_VAR_NAME_WITH_COLON); + push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; case '(': lexical_brackets_nestage++; RC; case '-': - switch(*pc.source) { + switch(*PC.source) { case 'f': // -f skip_analized=1; result=FEXISTS; @@ -2225,17 +2201,17 @@ default: case ';': RC; case '&': case '|': - if(*pc.source==c) { // && || + if(*PC.source==c) { // && || result=c=='&'?LAND:LOR; skip_analized=1; } else result=c; goto break2; case '!': - switch(pc.source[0]) { + switch(PC.source[0]) { case '|': // !| !|| skip_analized=1; - if(pc.source[1]=='|') { + if(PC.source[1]=='|') { skip_analized++; result=LXOR; } else @@ -2249,7 +2225,7 @@ default: RC; case '<': // <<, <=, < - switch(*pc.source) { + switch(*PC.source) { case '<': // <[<] skip_analized=1; result=NSL; break; case '=': // <[=] @@ -2259,7 +2235,7 @@ default: } goto break2; case '>': // >>, >=, > - switch(*pc.source) { + switch(*PC.source) { case '>': // >[>] skip_analized=1; result=NSR; break; case '=': // >[=] @@ -2269,7 +2245,7 @@ default: } goto break2; case '=': // == - switch(*pc.source) { + switch(*PC.source) { case '=': // =[=] skip_analized=1; result=NEQ; break; default: // =[] @@ -2278,15 +2254,15 @@ default: goto break2; case '"': - push_LS(pc, LS_EXPRESSION_STRING_QUOTED); + push_LS(PC, LS_EXPRESSION_STRING_QUOTED); RC; case '\'': - push_LS(pc, LS_EXPRESSION_STRING_APOSTROFED); + push_LS(PC, LS_EXPRESSION_STRING_APOSTROFED); RC; case 'l': case 'g': case 'e': case 'n': if(end==begin) // right after whitespace - if(isspace(pc.source[1])) { - switch(*pc.source) { + if(isspace(PC.source[1])) { + switch(*PC.source) { // case '?': // ok [and bad cases, yacc would bark at them] case 't': // lt gt [et nt] result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR; @@ -2305,8 +2281,8 @@ default: break; case 'i': if(end==begin) // right after whitespace - if(isspace(pc.source[1])) { - switch(pc.source[0]) { + if(isspace(PC.source[1])) { + switch(PC.source[0]) { case 'n': // in skip_analized=1; result=IN; @@ -2320,7 +2296,7 @@ default: break; case 'd': if(end==begin) // right after whitespace - if(pc.source[0]=='e' && pc.source[1]=='f') { // def + if(PC.source[0]=='e' && PC.source[1]=='f') { // def skip_analized=2; result=DEF; goto break2; @@ -2334,8 +2310,8 @@ default: // that's a leading|traling space or after-operator-space // ignoring it // reset piece 'begin' position & line - begin=pc.source; // after whitespace char - begin_pos=pc.pos; + begin=PC.source; // after whitespace char + begin_line=PC.line; continue; } break; @@ -2343,17 +2319,17 @@ default: if(c=='(') lexical_brackets_nestage++; - switch(*pc.source) { + switch(*PC.source) { case '\n': case ')': - if(*pc.source==')') + if(*PC.source==')') if(--lexical_brackets_nestage!=0) continue; // skip comment - begin=pc.source; - begin_pos=pc.pos; + begin=PC.source; + begin_line=PC.line; - pop_LS(pc); + pop_LS(PC); continue; } break; @@ -2364,28 +2340,28 @@ default: 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) { + PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { // name in expr ends also before switch(c) { // expression minus case '-': // expression integer division case '\\': - pop_LS(pc); - pc.ungetc(); + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; goto break2; } } if( - pc.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON || - pc.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { + 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 ':': - pop_LS(pc); - pc.ungetc(); + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; goto break2; } @@ -2404,45 +2380,45 @@ default: case ',': case '?': case '#': // before call case '^': - pop_LS(pc); - pc.ungetc(); + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; goto break2; case '[': // $name.<[>code] - if(pc.pos.col>1/*not first column*/ && ( + if(PC.col>1/*not first column*/ && ( end[-1]=='$'/*was start of get*/ || end[-1]==':'/*was class name delim */ || end[-1]=='.'/*was name delim */ )) { - push_LS(pc, LS_NAME_SQUARE_PART); + push_LS(PC, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; } - pc.ls=LS_VAR_SQUARE; + PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; case '{': if(begin==end) { // ${name}, no need of EON, switching LS - pc.ls=LS_VAR_NAME_CURLY; + PC.ls=LS_VAR_NAME_CURLY; } else { - pc.ls=LS_VAR_CURLY; + PC.ls=LS_VAR_CURLY; lexical_brackets_nestage=1; } RC; case '(': - pc.ls=LS_VAR_ROUND; + PC.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim case '$': // name part subvar case ':': // class<:>name // 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; + 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; } @@ -2452,11 +2428,11 @@ default: switch(c) { case '[': // ${name.<[>code]} - push_LS(pc, LS_NAME_SQUARE_PART); + push_LS(PC, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; case '}': // ${name} finished, restoring LS - pop_LS(pc); + pop_LS(PC); RC; case '.': // name part delim case '$': // name part subvar @@ -2468,14 +2444,14 @@ default: case LS_VAR_SQUARE: switch(c) { case '$': - push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; case ']': if(--lexical_brackets_nestage==0) { - pop_LS(pc); + pop_LS(PC); RC; } break; @@ -2490,14 +2466,14 @@ default: case LS_VAR_CURLY: switch(c) { case '$': - push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; case '}': if(--lexical_brackets_nestage==0) { - pop_LS(pc); + pop_LS(PC); RC; } break; @@ -2512,24 +2488,24 @@ default: switch(c) { case '[': // ^name.<[>code].xxx - if(pc.pos.col>1/*not first column*/ && ( + if(PC.col>1/*not first column*/ && ( end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... end[-1]==':'/*was class name delim */ || end[-1]=='.'/*was name delim */ )) { - push_LS(pc, LS_NAME_SQUARE_PART); + push_LS(PC, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; } - pc.ls=LS_METHOD_SQUARE; + PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; case '{': - pc.ls=LS_METHOD_CURLY; + PC.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; case '(': - pc.ls=LS_METHOD_ROUND; + PC.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim @@ -2544,16 +2520,16 @@ default: case LS_METHOD_SQUARE: switch(c) { case '$': - push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; case ';': // param delim RC; case ']': if(--lexical_brackets_nestage==0) { - pc.ls=LS_METHOD_AFTER; + PC.ls=LS_METHOD_AFTER; RC; } break; @@ -2566,16 +2542,16 @@ default: case LS_METHOD_CURLY: switch(c) { case '$': - push_LS(pc, LS_VAR_NAME_SIMPLE_WITH_COLON); + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); RC; case '^': - push_LS(pc, LS_METHOD_NAME); + push_LS(PC, LS_METHOD_NAME); RC; case ';': // param delim RC; case '}': if(--lexical_brackets_nestage==0) { - pc.ls=LS_METHOD_AFTER; + PC.ls=LS_METHOD_AFTER; RC; } break; @@ -2587,22 +2563,22 @@ default: case LS_METHOD_AFTER: if(c=='[') {/* ][ }[ )[ */ - pc.ls=LS_METHOD_SQUARE; + PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; } if(c=='{') {/* ]{ }{ ){ */ - pc.ls=LS_METHOD_CURLY; + PC.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; } if(c=='(') {/* ]( }( )( */ - pc.ls=LS_METHOD_ROUND; + PC.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; } - pop_LS(pc); - pc.ungetc(); + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; goto break2; } @@ -2620,36 +2596,31 @@ break2: if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME end--; } - if(end!=begin && pc.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? - if(!pc.string_start) - pc.string_start=begin_pos; + if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? // append it - pc.string.append_strdup_know_length(begin, end-begin); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); } } - if(!pc.string.is_empty()) { // something accumulated? - // create STRING value: array of OP_VALUE+origin+vstring - *lvalp=VL( - new VString(*new String(pc.string, String::L_CLEAN)), - pc.file_no, pc.string_start.line, pc.string_start.col); + if(PC.string->size()) { // something accumulated? + // create STRING value: array of OP_VALUE+vstring + *lvalp=VL(NEW VString(*PC.string)); // new pieces storage - pc.string.clear(); - pc.string_start.clear(); + PC.string=NEW String(POOL); // make current result be pending for next call, return STRING for now - pc.pending_state=result; result=STRING; + PC.pending_state=result; result=STRING; } if(skip_analized) { - pc.source+=skip_analized; pc.pos.col+=skip_analized; + PC.source+=skip_analized; PC.col+=skip_analized; } return result; } -static int real_yyerror(Parse_control *pc, char *s) { // Called by yyparse on error +static int real_yyerror(parse_control *pc, char *s) { // Called by yyparse on error strncpy(PC.error, s, MAX_STRING); return 1; } static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", LA2S(*value)->cstr()); + fprintf(file, " \"%s\"", LA2S(value)->cstr()); }