--- parser3/src/main/compile.tab.C 2003/02/04 09:44:27 1.81.2.7 +++ parser3/src/main/compile.tab.C 2003/04/02 14:16:18 1.81.2.13.2.20 @@ -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.7 2003/02/04 09:44:27 paf Exp $ + $Id: compile.tab.C,v 1.81.2.13.2.20 2003/04/02 14:16:18 paf Exp $ */ /** @@ -57,7 +57,7 @@ -#: in iis make up specialized Pool object for that */ -#define YYSTYPE ArrayOperationPtr +#define YYSTYPE ArrayOperation* #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 @@ -82,10 +82,10 @@ static int yylex(YYSTYPE *lvalp, void *p // local convinient inplace typecast & var +#undef PC #define PC (*(parse_control *)pc) +#undef POOL #define POOL (*PC.pool) -#undef NEW -#define NEW new(POOL) #ifndef DOXYGEN #ifndef YYSTYPE #define YYSTYPE int @@ -489,7 +489,7 @@ static const short yycheck[] = { 0, #define YYPURE 1 /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ -#line 3 "/usr/lib/bison.simple" +#line 3 "/usr/share/bison.simple" /* This file comes from bison-1.28. */ /* Skeleton output parser for bison, @@ -703,7 +703,7 @@ __yy_memcpy (char *to, char *from, unsig #endif #endif -#line 217 "/usr/lib/bison.simple" +#line 217 "/usr/share/bison.simple" /* The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. @@ -1034,57 +1034,57 @@ yyreduce: case 1: #line 116 "compile.y" { - MethodPtr method(new Method(main_method_name, Method::CT_ANY, + Method& method=*new Method(/*main_method_name, */Method::CT_ANY, 0, 0, /*min, max numbered_params_count*/ - ArrayStringPtr(0)/*param_names*/, ArrayStringPtr(0)/*local_names*/, - yyvsp[0]/*parser_code*/, 0/*native_code*/)); + 0/*param_names*/, 0/*local_names*/, + yyvsp[0]/*parser_code*/, 0/*native_code*/); PC.cclass->add_method(main_method_name, method); ; break;} case 8: #line 131 "compile.y" { - StringPtr command=LA2S(*yyvsp[-2]); + const String& command=*LA2S(*yyvsp[-2]); YYSTYPE strings_code=yyvsp[0]; if(strings_code->count()<1*2) { strcpy(PC.error, "@"); - strcat(PC.error, command->cstr()); + strcat(PC.error, command.cstr()); strcat(PC.error, " is empty"); YYERROR; } - if(*command==CLASS_NAME) { + if(command==CLASS_NAME) { if(PC.cclass->base_class()) { // already changed from default? strcpy(PC.error, "class already have a name '"); - strncat(PC.error, PC.cclass->name()->cstr(), 100); + strncat(PC.error, PC.cclass->name().cstr(), 100); strcat(PC.error, "'"); YYERROR; } if(strings_code->count()==1*2) { // new class' name - StringPtr name=LA2S(*strings_code); + const String& name=*LA2S(*strings_code); // creating the class - VStateless_classPtr cclass(new VClass); - PC.cclass=cclass.get(); + VStateless_class* cclass=new VClass; + PC.cclass=cclass; PC.cclass->set_name(name); // append to request's classes - PC.request->classes().put(name, cclass); + PC.request.classes().put(name, cclass); } else { strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); YYERROR; } - } 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)); - } else if(*command==BASE_NAME) { + } else if(command==USE_CONTROL_METHOD_NAME) { + for(size_t i=0; icount(); 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 '"); - strncat(PC.error, PC.cclass->base_class()->name()->cstr(), 100); + strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100); strcat(PC.error, "'"); YYERROR; } if(strings_code->count()==1*2) { - StringPtr base_name=LA2S(*strings_code); - if(ValuePtr base_class_value=PC.request->classes().get(base_name)) { + 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) { @@ -1093,12 +1093,12 @@ case 8: } 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()); + strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": you can not derive from this class in @"BASE_NAME); YYERROR; } } else { - strcpy(PC.error, base_name->cstr()); + strcpy(PC.error, base_name.cstr()); strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } @@ -1108,7 +1108,7 @@ case 8: } } else { strcpy(PC.error, "'"); - strncat(PC.error, command->cstr(), MAX_STRING/2); + strncat(PC.error, command.cstr(), MAX_STRING/2); strcat(PC.error, "' invalid special name. valid names are " "'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'"); YYERROR; @@ -1122,30 +1122,30 @@ case 12: case 16: #line 208 "compile.y" { - StringPtr name=LA2S(*yyvsp[-5]); + const String& name=*LA2S(*yyvsp[-5]); YYSTYPE params_names_code=yyvsp[-4]; - ArrayStringPtr params_names; + ArrayString* params_names=0; if(int size=params_names_code->count()) { - params_names=ArrayStringPtr(new ArrayString); + params_names=new ArrayString; for(int i=0; icount()) { - locals_names=ArrayStringPtr(new ArrayString); + locals_names=new ArrayString; for(int i=0; iadd_method(name, method); ; break;} @@ -1183,8 +1183,8 @@ case 42: #line 266 "compile.y" { yyval=N(); - ArrayOperationPtr diving_code=yyvsp[0]; - StringPtr first_name=LA2S(*diving_code); + ArrayOperation* diving_code=yyvsp[0]; + const String* first_name=LA2S(*diving_code); // self.xxx... -> xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { @@ -1198,7 +1198,7 @@ case 42: // ^if ELEMENT -> ^if ELEMENT_OR_OPERATOR // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+OP_GET_ELEMENT_OR_OPERATOR. if(PC.in_call_value && diving_code->count()==3) - (*diving_code)[2].code=OP_GET_ELEMENT_OR_OPERATOR; + diving_code->put(2, OP_GET_ELEMENT_OR_OPERATOR); P(*yyval, *diving_code); } /* diving code; stack: current context */ @@ -1223,8 +1223,8 @@ case 50: #line 301 "compile.y" { yyval=N(); - ArrayOperationPtr diving_code=yyvsp[0]; - StringPtr first_name=LA2S(*diving_code); + ArrayOperation* diving_code=yyvsp[0]; + const String* first_name=LA2S(*diving_code); // $self.xxx... -> $xxx... // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { @@ -1318,9 +1318,9 @@ case 69: YYSTYPE params_code=yyvsp[-1]; if(params_code->count()==3) { // probably [] case. [OP_VALUE + Void + STORE_PARAM] - if(ValuePtr value=LA2V(*params_code)) // it is OP_VALUE + value? + if(Value* value=LA2V(*params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? - params_code=YYSTYPE(0); // ^zzz[] case. don't append lone empty param. + 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 @@ -1421,7 +1421,7 @@ case 104: case 105: #line 469 "compile.y" { - ArrayOperationPtr code; + ArrayOperation* code; { change_string_literal_to_write_string_literal(*(code=yyvsp[-1])); P(*code, *yyvsp[0]); @@ -1462,7 +1462,7 @@ case 113: #line 499 "compile.y" { yyval=yyvsp[-1]; // stack: class name string - if(*LA2S(*yyval) == BASE_NAME) { // pseude BASE class + if(*LA2S(*yyval) == BASE_NAME) { // pseudo BASE class if(VStateless_class* base=PC.cclass->base_class()) { change_string_literal_value(*yyval, base->name()); } else { @@ -1662,7 +1662,7 @@ case 158: break;} case 159: #line 588 "compile.y" -{ yyval=VL(ValuePtr(new VVoid())) ; +{ yyval=VL(new VVoid(), 0, 0, 0) ; break;} case 160: #line 589 "compile.y" @@ -1670,7 +1670,7 @@ case 160: break;} } /* the action file gets copied in in place of this dollarsign */ -#line 543 "/usr/lib/bison.simple" +#line 543 "/usr/share/bison.simple" yyvsp -= yylen; yyssp -= yylen; @@ -1979,7 +1979,7 @@ default: case '"': case ':': if(end!=begin) { // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append_strdup(begin, end-begin); } // reset piece 'begin' position & line begin=PC.source; // ->punctuation @@ -1993,20 +1993,19 @@ default: case '#': if(end!=begin) { // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append_strdup(begin, end-begin); } // #HH ? if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) { - char *hex=(char *)POOL.malloc(1); - hex[0]= + char c= hex_value[(unsigned char)PC.source[1]]*0x10+ hex_value[(unsigned char)PC.source[2]]; - if(hex[0]==0) { + if(c==0) { result=BAD_HEX_LITERAL; goto break2; // wrong hex value[no ^#00 chars allowed]: bail out } // append char(hex(HH)) - PC.string->APPEND_CLEAN(hex, 1, PC.file, begin_line); + PC.string.append(c); // skip over ^#HH PC.source+=3; PC.col+=3; @@ -2025,7 +2024,7 @@ default: if(c=='#' && PC.col==1) { if(end!=begin) { // append piece till # - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append_strdup(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_USER_COMMENT); @@ -2168,7 +2167,7 @@ default: case '#': // comment start skipping if(end!=begin) { // append piece till # - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append_strdup(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_EXPRESSION_COMMENT); @@ -2600,14 +2599,16 @@ break2: } if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? // append it - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); + PC.string.append_strdup(begin, end-begin); } } - if(PC.string->size()) { // something accumulated? + if(!PC.string.is_empty()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(ValuePtr(new VString(PC.string))); + *lvalp=VL( + new VString(*new String(PC.string, String::L_CLEAN)), + PC.file_no, PC.line, PC.col); // new pieces storage - PC.string=StringPtr(new String); + PC.string.clear(); // make current result be pending for next call, return STRING for now PC.pending_state=result; result=STRING; } @@ -2624,5 +2625,5 @@ static int real_yyerror(parse_control *p static void yyprint(FILE *file, int type, YYSTYPE value) { if(type==STRING) - fprintf(file, " \"%s\"", LA2S(*value)->cstr().get()); + fprintf(file, " \"%s\"", LA2S(*value)->cstr()); }