--- parser3/src/main/compile.y 2003/02/04 09:44:27 1.204.2.6 +++ parser3/src/main/compile.y 2003/03/27 10:04:07 1.204.2.8.2.6 @@ -5,7 +5,7 @@ Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.y,v 1.204.2.6 2003/02/04 09:44:27 paf Exp $ + $Id: compile.y,v 1.204.2.8.2.6 2003/03/27 10:04:07 paf Exp $ */ /** @@ -19,7 +19,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 @@ -44,10 +44,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 %} @@ -114,10 +114,10 @@ static int yylex(YYSTYPE *lvalp, void *p %% all: one_big_piece { - 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*/, - $1/*parser_code*/, 0/*native_code*/)); + 0/*param_names*/, 0/*local_names*/, + $1/*parser_code*/, 0/*native_code*/); PC.cclass->add_method(main_method_name, method); } | methods; @@ -129,47 +129,47 @@ method: control_method | code_method; control_method: '@' STRING '\n' maybe_control_strings { - StringPtr command=LA2S(*$2); + const String& command=*LA2S(*$2); YYSTYPE strings_code=$4; 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) { @@ -178,12 +178,12 @@ control_method: '@' STRING '\n' } 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; } @@ -193,7 +193,7 @@ control_method: '@' STRING '\n' } } 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; @@ -206,30 +206,30 @@ maybe_string: empty | STRING; code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' maybe_codes { - StringPtr name=LA2S(*$2); + const String& name=*LA2S(*$2); YYSTYPE params_names_code=$3; - 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); }; @@ -265,8 +265,8 @@ name_without_curly_rdive: | name_without_curly_rdive_class; name_without_curly_rdive_read: name_without_curly_rdive_code { $$=N(); - ArrayOperationPtr diving_code=$1; - StringPtr first_name=LA2S(*diving_code); + ArrayOperation* diving_code=$1; + 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) { @@ -280,7 +280,7 @@ name_without_curly_rdive_read: name_with // ^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(*$$, *diving_code); } /* diving code; stack: current context */ @@ -300,8 +300,8 @@ name_expr_wdive: | name_expr_wdive_class; name_expr_wdive_root: name_expr_dive_code { $$=N(); - ArrayOperationPtr diving_code=$1; - StringPtr first_name=LA2S(*diving_code); + ArrayOperation* diving_code=$1; + 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) { @@ -380,9 +380,9 @@ call_value: '^' { YYSTYPE params_code=$5; 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(*$$, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value @@ -467,7 +467,7 @@ name_expr_subvar_value: '$' subvar_ref_n O(*$$, OP_GET_ELEMENT); }; name_expr_with_subvar_value: STRING subvar_get_writes { - ArrayOperationPtr code; + ArrayOperation* code; { change_string_literal_to_write_string_literal(*(code=$1)); P(*code, *$2); @@ -585,7 +585,7 @@ write_string: STRING { change_string_literal_to_write_string_literal(*($$=$1)) }; -void_value: /* empty */ { $$=VL(ValuePtr(new VVoid())) }; +void_value: /* empty */ { $$=VL(new VVoid()) }; empty: /* empty */ { $$=N() }; %% @@ -676,7 +676,7 @@ default: case '"': case ':': if(end!=begin) { // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append(begin, end-begin); } // reset piece 'begin' position & line begin=PC.source; // ->punctuation @@ -690,20 +690,19 @@ default: case '#': if(end!=begin) { // append piece till ^ - PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + PC.string.append(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; @@ -722,7 +721,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(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_USER_COMMENT); @@ -865,7 +864,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(begin, end-begin); } // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_EXPRESSION_COMMENT); @@ -1297,14 +1296,14 @@ 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(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))); // 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; } @@ -1321,5 +1320,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()); }