--- parser3/src/main/compile.y 2016/07/19 16:35:35 1.282 +++ parser3/src/main/compile.y 2024/11/04 03:53:25 1.299 @@ -2,13 +2,13 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_COMPILE_Y = "$Id: compile.y,v 1.282 2016/07/19 16:35:35 moko Exp $"; +volatile const char * IDENT_COMPILE_Y = "$Id: compile.y,v 1.299 2024/11/04 03:53:25 moko Exp $"; /** @todo parser4: @@ -62,16 +62,19 @@ static const VString vempty; #define POOL (*PC.pool) #ifndef DOXYGEN -#define CLASS_ADD if(PC.class_add()){ \ - strncpy(PC.error, PC.cclass->type(), MAX_STRING/2); \ - strcat(PC.error, " - class is already defined"); \ - YYERROR; \ +#define CLASS_ADD if(!PC.class_add()){ \ + PC.error=pa_strcat(PC.cclass->type(), " - class is already defined"); \ + YYERROR; \ } -#define PC_ERROR(header, value, footer){ \ - strcpy(PC.error, header); \ - strncat(PC.error, value, MAX_STRING/2); \ - strcat(PC.error, footer); \ +#define YYERROR3(header, value, footer) { \ + PC.error=pa_strcat(header, value, footer); \ + YYERROR; \ +} + +#define YYERROR1(value) { \ + PC.error=value; \ + YYERROR; \ } %} @@ -143,7 +146,7 @@ static const VString vempty; %% all: one_big_piece { - Method* method=new Method(Method::CT_ANY, 0, 0 /*min, max numbered_params_count*/, 0 /*param_names*/, 0 /*local_names*/, $1 /*parser_code*/, 0 /*native_code*/); + Method* method=new Method(Method::CT_ANY, 0, 0 /*min, max numbered_params_count*/, 0 /*param_names*/, 0 /*local_names*/, $1 /*parser_code*/, 0 /*native_code*/, PC.cclass->is_vars_local()); PC.cclass->set_method(PC.alias_method(main_method_name), method); } | methods; @@ -157,61 +160,43 @@ control_method: '@' STRING '\n' maybe_control_strings { const String& command=LA2S(*$2)->trim(String::TRIM_END); YYSTYPE strings_code=$4; - if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) { - PC_ERROR("@", command.cstr(), " is empty"); - YYERROR; - } + if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) + YYERROR3("@", command.cstr(), " is empty"); if(command==CLASS_NAME) { if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { CLASS_ADD; // new class' name const String& name=LA2S(*strings_code)->trim(String::TRIM_END); // creating the class - VStateless_class* cclass=new VClass; + VStateless_class* cclass=new VClass(name.cstr(), PC.request.get_used_filespec(PC.file_no)); PC.cclass_new=cclass; - PC.cclass_new->set_type(name.cstr()); PC.append=false; } else { - strcpy(PC.error, "@" CLASS_NAME " must contain only one line with class name (contains more then one)"); - YYERROR; + YYERROR1("@" CLASS_NAME " must contain only one line with class name (contains more than one)"); } } else if(command==USE_CONTROL_METHOD_NAME) { CLASS_ADD; for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE){ - PC.request.use_file(PC.request.main_class, LA2S(*strings_code, i)->trim(String::TRIM_END), - PC.request.get_used_filename(PC.file_no), strings_code->get(i+1).origin); + PC.request.use_file(LA2S(*strings_code, i)->trim(String::TRIM_END), PC.request.get_used_filespec(PC.file_no), strings_code->get(i+1).origin); } } else if(command==BASE_NAME) { - if(PC.append){ - PC_ERROR("can't set base while appending methods to class '", PC.cclass->type(), "'"); - YYERROR; - } + if(PC.append) + YYERROR3("can't set base while appending methods to class '", PC.cclass->type(), "'"); CLASS_ADD; - if(PC.cclass->base_class()) { // already changed from default? - PC_ERROR("class already have a base '", PC.cclass->base_class()->type(), "'"); - YYERROR; - } + if(PC.cclass->base_class()) // already changed from default? + YYERROR3("class already have a base '", PC.cclass->base_class()->type(), "'"); if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { const String& base_name=LA2S(*strings_code)->trim(String::TRIM_END); - if(Value* base_class_value=PC.request.get_class(base_name)) { + if(VStateless_class *base_class=PC.request.get_class(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] - PC_ERROR("'", base_name.cstr(), "': you can not derive from this class in @" BASE_NAME); - YYERROR; - } + if(PC.cclass==base_class) + YYERROR1("@" CLASS_NAME " equals @" BASE_NAME); + PC.cclass->get_class()->set_base(base_class); } else { - PC_ERROR("'", base_name.cstr(), "': undefined class in @" BASE_NAME); - YYERROR; + YYERROR3("'", base_name.cstr(), "': undefined class in @" BASE_NAME); } } else { - strcpy(PC.error, "@" BASE_NAME " must contain sole name"); - YYERROR; + YYERROR1("@" BASE_NAME " must contain sole name"); } } else if(command==OPTIONS_CONTROL_METHOD_NAME) { for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) { @@ -221,30 +206,25 @@ control_method: '@' STRING '\n' } else if(option==Symbols::PARTIAL_SYMBOL){ if(PC.cclass_new){ if(VStateless_class* existed=PC.get_existed_class(PC.cclass_new)){ - if(!PC.reuse_existed_class(existed)){ - PC_ERROR("can't append methods to '", PC.cclass_new->type(), "' - the class wasn't marked as partial"); - YYERROR; - } + if(!PC.reuse_existed_class(existed)) + YYERROR3("can't append methods to '", PC.cclass_new->type(), "' - the class wasn't marked as partial"); } else { // marks the new class as partial. we will be able to add methods here later. PC.cclass_new->set_partial(); } } else { - strcpy(PC.error, "'partial' option should be used straight after @" CLASS_NAME); - YYERROR; + YYERROR1("'partial' option should be used straight after @" CLASS_NAME); } } else if(option==Symbols::STATIC_SYMBOL){ PC.set_methods_call_type(Method::CT_STATIC); } else if(option==Symbols::DYNAMIC_SYMBOL){ PC.set_methods_call_type(Method::CT_DYNAMIC); } else { - PC_ERROR("'", option.cstr(), "' invalid option. valid options are 'partial', 'locals', 'static' and 'dynamic'"); - YYERROR; + YYERROR3("'", option.cstr(), "' invalid option. valid options are 'partial', 'locals', 'static' and 'dynamic'"); } } } else { - PC_ERROR("'", command.cstr(), "' invalid special name. valid names are '" CLASS_NAME "', '" USE_CONTROL_METHOD_NAME "', '" BASE_NAME "' and '" OPTIONS_CONTROL_METHOD_NAME "'."); - YYERROR; + YYERROR3("'", command.cstr(), "' invalid special name. valid names are '" CLASS_NAME "', '" USE_CONTROL_METHOD_NAME "', '" BASE_NAME "' and '" OPTIONS_CONTROL_METHOD_NAME "'."); } }; maybe_control_strings: empty | control_strings; @@ -266,7 +246,8 @@ code_method: '@' STRING bracketed_maybe_ YYSTYPE locals_names_code=$4; ArrayString* locals_names=0; - bool all_vars_local=false; + bool all_vars_local=PC.cclass->is_vars_local(); + if(int size=locals_names_code->count()) { locals_names=new ArrayString; for(int i=0; iis_vars_local()) - all_vars_local=true; Method* method=new Method( //name, @@ -461,17 +440,27 @@ construct: construct_square: '[' { // allow $result_or_other_variable[ letters here any time ] *reinterpret_cast(&$$)=PC.explicit_result; PC.explicit_result=false; -} any_constructor_code_value { + PC.array=false; // no need to save current value as if() is right after PC.array=true; +} any_constructor_code_values { PC.explicit_result=*reinterpret_cast(&$2); } ']' { // stack: context, name - $$=$3; // stack: context, name, value - O(*$$, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + if(!PC.array){ + $$=$3; // stack: context, name, value + O(*$$, OP::OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + } else { + $$ = N(); + OA(*$$, OP::OP_CONSTRUCT_ARRAY, $3); + PC.array=false; + } } ; +any_constructor_code_values: + any_constructor_code_value { $$ = $1; } + | any_constructor_code_values ';' any_constructor_code_value { $$ = $1; P(*$$, *$3); PC.array=true; }; +; construct_round: '(' expr_value ')' { $$=N(); - O(*$$, OP::OP_PREPARE_TO_EXPRESSION); // stack: context, name P(*$$, *$2); // stack: context, name, value O(*$$, OP::OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ @@ -614,7 +603,6 @@ store_expr_param_part: expr_value { $$=expr_code; } else { YYSTYPE code=N(); - O(*code, OP::OP_PREPARE_TO_EXPRESSION); P(*code, *expr_code); O(*code, OP::OP_WRITE_EXPR_RESULT); $$=N(); @@ -717,13 +705,13 @@ class_static_prefix: STRING ':' { if(VStateless_class* base=PC.cclass->base_class()) { change_string_literal_value(*$$, *new String(base->type())); } else { - strcpy(PC.error, "no base class declared"); - YYERROR; + YYERROR1("no base class declared"); } code = OP::OP_VALUE__GET_BASE_CLASS; } else { - Value *base=PC.request.get_class(*LA2S(*$$)); - if(base && PC.cclass->derived_from(*base->get_class())) + // can't use get_class because it will call @autouse[] if the class wasn't loaded + VStateless_class* base=PC.request.classes().get(*LA2S(*$$)); + if(base && PC.cclass->derived_from(*base)) code = OP::OP_VALUE__GET_BASE_CLASS; } // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string @@ -731,10 +719,8 @@ class_static_prefix: STRING ':' { }; class_constructor_prefix: class_static_prefix ':' { $$=$1; - if(!PC.in_call_value) { - strcpy(PC.error, ":: not allowed here"); - YYERROR; - } + if(!PC.in_call_value) + YYERROR1(":: not allowed here"); O(*$$, OP::OP_PREPARE_TO_CONSTRUCT_OBJECT); }; @@ -855,12 +841,12 @@ inline void ungetc(Parse_control& pc, ui } static int yylex(YYSTYPE *lvalp, void *apc) { - register Parse_control& pc=*static_cast(apc); + Parse_control& pc=*static_cast(apc); #define lexical_brackets_nestage pc.brackets_nestages[pc.ls_sp] #define RC {result=c; goto break2; } - register int c; + int c; int result; if(pc.pending_state) { @@ -1626,7 +1612,7 @@ break2: } static int real_yyerror(Parse_control *pc, const char *s) { // Called by yyparse on error - strncpy(PC.error, s, MAX_STRING); + PC.error=pa_strdup(s); return 1; }