--- parser3/src/main/compile.y 2009/06/07 22:37:31 1.248 +++ parser3/src/main/compile.y 2024/12/01 15:19:59 1.300 @@ -2,12 +2,14 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2009 ArtLebedev Group (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 - $Id: compile.y,v 1.248 2009/06/07 22:37:31 misha Exp $ + */ +volatile const char * IDENT_COMPILE_Y = "$Id: compile.y,v 1.300 2024/12/01 15:19:59 moko Exp $"; + /** @todo parser4: - cache compiled code from request to request. to do that... @@ -20,12 +22,12 @@ */ #define YYSTYPE ArrayOperation* -#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_VERBOSE 1 +#define yyerror(pc, msg) real_yyerror(pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) +#define YYMALLOC pa_malloc +#define YYFREE pa_free // includes @@ -35,36 +37,51 @@ #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_globals.h" -#include "pa_vvoid.h" #include "pa_vmethod_frame.h" // defines +#define CLASS_NAME "CLASS" #define USE_CONTROL_METHOD_NAME "USE" #define OPTIONS_CONTROL_METHOD_NAME "OPTIONS" -#define OPTION_ALL_VARS_LOCAL_NAME "locals" -#define OPTION_PARTIAL_CLASS "partial" -#define REM_OPERATOR_NAME "rem" // forwards -static int real_yyerror(Parse_control* pc, char* s); +static int real_yyerror(Parse_control* pc, const char* s); static void yyprint(FILE* file, int type, YYSTYPE value); static int yylex(YYSTYPE* lvalp, void* pc); static const VBool vfalse(false); static const VBool vtrue(true); -static const VVoid vvoid; +static const VString vempty; // local convinient inplace typecast & var #undef PC -#define PC (*(Parse_control *)pc) +#define PC (*pc) #undef POOL #define POOL (*PC.pool) #ifndef DOXYGEN + +#define CLASS_ADD if(!PC.class_add()){ \ + PC.error=pa_strcat(PC.cclass->type(), " - class is already defined"); \ + YYERROR; \ +} + +#define YYERROR3(header, value, footer) { \ + PC.error=pa_strcat(header, value, footer); \ + YYERROR; \ +} + +#define YYERROR1(value) { \ + PC.error=value; \ + YYERROR; \ +} + %} -%pure_parser +%pure-parser +%lex-param {Parse_control* pc} +%parse-param {Parse_control* pc} %token EON %token STRING @@ -74,7 +91,6 @@ static const VVoid vvoid; %token BAD_HEX_LITERAL %token BAD_METHOD_DECL_START %token BAD_METHOD_PARAMETER_NAME_CHARACTER -%token BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE %token LAND "&&" %token LOR "||" @@ -130,11 +146,8 @@ static const VVoid vvoid; %% 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*/); - PC.cclass->add_method(PC.alias_method(main_method_name), method); + 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; @@ -145,112 +158,82 @@ method: control_method | code_method; control_method: '@' STRING '\n' maybe_control_strings { - const String& command=*LA2S(*$2); + const String& command=LA2S(*$2)->trim(String::TRIM_END); YYSTYPE strings_code=$4; - if(strings_code->count()<1*OPERATIONS_PER_OPVALUE) { - strcpy(PC.error, "@"); - strcat(PC.error, command.cstr()); - strcat(PC.error, " 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); + 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_name(name); + 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) { - for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) - PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i)); - } else if(command==BASE_NAME) { - if(PC.append){ - strcpy(PC.error, "can't set base while appending methods to class '"); - strncat(PC.error, PC.cclass->name().cstr(), MAX_STRING/2); - strcat(PC.error, "'"); - YYERROR; - } - PC.class_add(); - 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(), MAX_STRING/2); - strcat(PC.error, "'"); - YYERROR; + CLASS_ADD; + for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE){ + 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) + YYERROR3("can't set base while appending methods to class '", PC.cclass->type(), "'"); + CLASS_ADD; + 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); - if(Value* base_class_value=PC.request.classes().get(base_name)) { + const String& base_name=LA2S(*strings_code)->trim(String::TRIM_END); + 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] - strcpy(PC.error, base_name.cstr()); - strcat(PC.error, ": 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 { - strcpy(PC.error, base_name.cstr()); - strcat(PC.error, ": 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) { - const String& option=*LA2S(*strings_code, i); - if(option==OPTION_ALL_VARS_LOCAL_NAME){ + const String& option=LA2S(*strings_code, i)->trim(String::TRIM_END); + if(option==Symbols::LOCALS_SYMBOL){ PC.set_all_vars_local(); - } else if(option==OPTION_PARTIAL_CLASS){ + } 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)){ - strcpy(PC.error, "can't append methods to '"); - strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2); - strcat(PC.error, "' - 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 { - // mark new class as partial. we can add methods to it later. + // marks the new class as partial. we will be able to add methods here later. PC.cclass_new->set_partial(); } } else { - strcpy(PC.error, "'"OPTION_PARTIAL_CLASS"' 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 { - strcpy(PC.error, "'"); - strncat(PC.error, option.cstr(), MAX_STRING/2); - strcat(PC.error, "' invalid option. valid options are " - "'"OPTION_PARTIAL_CLASS"' and '"OPTION_ALL_VARS_LOCAL_NAME"'"); - YYERROR; + YYERROR3("'", option.cstr(), "' invalid option. valid options are 'partial', 'locals', 'static' and 'dynamic'"); } } } else { - strcpy(PC.error, "'"); - strncat(PC.error, command.cstr(), MAX_STRING/2); - strcat(PC.error, "' 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; -control_strings: control_string | control_strings control_string { $$=$1; P(*$$, *$2) }; +control_strings: control_string | control_strings control_string { $$=$1; P(*$$, *$2); }; control_string: maybe_string '\n'; maybe_string: empty | STRING; code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' { - PC.class_add(); + CLASS_ADD; PC.explicit_result=false; YYSTYPE params_names_code=$3; @@ -263,46 +246,43 @@ 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, - Method::CT_ANY, + GetMethodCallType(PC, *$2), 0, 0/*min,max numbered_params_count*/, params_names, locals_names, 0/*to be filled later in next {} */, 0, all_vars_local); *reinterpret_cast(&$$)=method; - - // todo: check [][;result;] } maybe_codes { - Method& method=*reinterpret_cast($7); + Method* method=reinterpret_cast($7); // fill in the code - method.parser_code=$8; + method->parser_code=$8; // register in class const String& name=*LA2S(*$2); - PC.cclass->add_method(PC.alias_method(name), method); + PC.cclass->set_method(PC.alias_method(name), method); }; maybe_bracketed_strings: empty | bracketed_maybe_strings; -bracketed_maybe_strings: '[' maybe_strings ']' {$$=$2}; +bracketed_maybe_strings: '[' maybe_strings ']' {$$=$2;}; maybe_strings: empty | strings; -strings: STRING | strings ';' STRING { $$=$1; P(*$$, *$3) }; +strings: STRING | strings ';' STRING { $$=$1; P(*$$, *$3); }; maybe_comment: empty | STRING; @@ -310,7 +290,7 @@ maybe_comment: empty | STRING; maybe_codes: empty | codes; -codes: code | codes code { $$=$1; P(*$$, *$2) }; +codes: code | codes code { $$=$1; P(*$$, *$2); }; code: write_string | action; action: get | put | call; @@ -322,44 +302,34 @@ get: get_value { size_t count=code->count(); #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - if( - count!=3 - || !maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE) - ) + if(count!=3 || !change_first(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT - if( - count!=3 - || !maybe_change_first_opcode(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE) - ) + if(count!=3 || !change_first(*code, OP::OP_WITH_SELF__VALUE__GET_ELEMENT, /*=>*/OP::OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT - if( - count!=5 - || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) - ) + if(count!=5 || !change_first(*code, OP::OP_GET_OBJECT_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) ) #endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT - if( - count!=5 - || !maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) - ) + if(count!=5 || !change_first(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) ) +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL + if(!change(*code, count-1/* last */, OP::OP_GET_ELEMENT__SPECIAL, /*=>*/OP::OP_GET_ELEMENT__SPECIAL__WRITE) ) #endif + { - changetail_or_append(*code, - OP::OP_GET_ELEMENT, false, /*=>*/OP::OP_GET_ELEMENT__WRITE, - /*or */OP::OP_WRITE_VALUE - ); /* value=pop; wcontext.write(value) */ + change_or_append(*code, count-1 /* last */, OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_ELEMENT__WRITE, /*or */OP::OP_WRITE_VALUE ); /* value=pop; wcontext.write(value) */ } P(*$$, *code); }; -get_value: '$' get_name_value { $$=$2 }; +get_value: '$' get_name_value { $$=$2; }; get_name_value: name_without_curly_rdive EON | name_in_curly_rdive; -name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 }; +name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2; }; name_without_curly_rdive: name_without_curly_rdive_read | name_without_curly_rdive_class; @@ -385,11 +355,7 @@ name_without_curly_rdive_read: name_with #endif #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - if( - count>=4 - && (*diving_code)[0].code==OP::OP_VALUE - && (*diving_code)[3].code==OP::OP_GET_ELEMENT - ){ + if(count>=4 && (*diving_code)[0].code==OP::OP_VALUE && (*diving_code)[3].code==OP::OP_GET_ELEMENT ){ // optimization O(*$$, (PC.in_call_value && count==4) @@ -416,8 +382,8 @@ name_without_curly_rdive_read: name_with #endif /* diving code; stack: current context */ }; -name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P(*$$, *$2) }; -name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P(*$$, *$2) }; +name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P(*$$, *$2); }; +name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P(*$$, *$2); }; /* put */ @@ -446,11 +412,7 @@ name_expr_wdive_root: name_expr_dive_cod // $self. } else #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT - if( - count>=4 - && (*diving_code)[0].code==OP::OP_VALUE - && (*diving_code)[3].code==OP::OP_GET_ELEMENT - ){ + if(count>=4 && (*diving_code)[0].code==OP::OP_VALUE && (*diving_code)[3].code==OP::OP_GET_ELEMENT ){ O(*$$, OP::OP_WITH_ROOT__VALUE__GET_ELEMENT); P(*$$, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value if(count>4) @@ -468,7 +430,7 @@ name_expr_wdive_write: '.' name_expr_div O(*$$, OP::OP_WITH_WRITE); /* stack: starting context */ P(*$$, *$2); /* diving code; stack: context,name */ }; -name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P(*$$, *$2) }; +name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P(*$$, *$2); }; construct: construct_square @@ -478,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) */ @@ -501,7 +473,7 @@ construct_curly: '{' maybe_codes '}' { }; any_constructor_code_value: - void_value /* optimized $var[] case */ + empty_value /* optimized $var[] case */ | STRING /* optimized $var[STRING] case */ | constructor_code_value /* $var[something complex] */ ; @@ -512,55 +484,90 @@ constructor_code_value: constructor_code /* context=pop; stack: context.value() */ }; constructor_code: codes__excluding_sole_str_literal; -codes__excluding_sole_str_literal: action | code codes { $$=$1; P(*$$, *$2) }; +codes__excluding_sole_str_literal: action | code codes { $$=$1; P(*$$, *$2); }; /* call */ call: call_value { + size_t count=$1->count(); #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR - if((*$1).count()) + if(count) #endif { $$=$1; /* stack: value */ - changetail_or_append(*$$, - OP::OP_CALL, true, /*=>*/ OP::OP_CALL__WRITE, - /*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ + if(!change_first(*$$, OP::OP_CONSTRUCT_OBJECT, /*=>*/ OP::OP_CONSTRUCT_OBJECT__WRITE)) + change_or_append(*$$, count-2 /* second last */, OP::OP_CALL, /*=>*/ OP::OP_CALL__WRITE, /*or */ OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ } }; call_value: '^' { - PC.in_call_value=true; - } - call_name { - PC.in_call_value=false; - } - store_params EON { /* ^field.$method{vasya} */ + PC.in_call_value=true; +} +call_name { + PC.in_call_value=false; +} +store_params EON { /* ^field.$method{vasya} */ #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT const String* operator_name=LA2S(*$3, 0, OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR); #else const String* operator_name=LA2S(*$3, 1); #endif - if(operator_name && *operator_name == REM_OPERATOR_NAME){ + if(operator_name && SYMBOLS_EQ(*operator_name,REM_SYMBOL)){ $$=N(); } else #endif { - $$=$3; /* with_xxx,diving code; stack: context,method_junction */ - YYSTYPE params_code=$5; if(params_code->count()==3) { // probably [] case. [OP::OP_VALUE+origin+Void] if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value? - if(value->is_void()) // value is VVoid? - params_code=0; // ^zzz[] case. don't append lone empty param. + if(const String * string=value->get_string()) + if(string->is_empty()) // value is empty string? + params_code=0; // ^zzz[] case. don't append lone empty param. } /* stack: context, method_junction */ - OA(*$$, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + + YYSTYPE var_code=$3; + if( + var_code->count()==8 + && ( (*var_code)[0].code==OP::OP_VALUE__GET_CLASS || (*var_code)[0].code==OP::OP_VALUE__GET_BASE_CLASS ) + && (*var_code)[3].code==OP::OP_PREPARE_TO_CONSTRUCT_OBJECT + && (*var_code)[4].code==OP::OP_VALUE +#ifdef FEATURE_GET_ELEMENT4CALL + && (*var_code)[7].code==OP::OP_GET_ELEMENT4CALL +#else + && (*var_code)[7].code==OP::OP_GET_ELEMENT +#endif + ){ + $$=N(); + O(*$$, OP::OP_CONSTRUCT_OBJECT); + P(*$$, *var_code, 1/*offset*/, 2/*limit*/); // class name + P(*$$, *var_code, 5/*offset*/, 2/*limit*/); // constructor name + OA(*$$, params_code); + } else + { + $$=var_code; /* with_xxx,diving code; stack: context,method_junction */ + OA(*$$, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value + } } }; -call_name: name_without_curly_rdive; +call_name: name_without_curly_rdive { +#ifdef FEATURE_GET_ELEMENT4CALL + size_t count=$1->count(); + if(count){ + $$=$1; +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + !(count==5 && change_first(*$$, OP::OP_GET_OBJECT_ELEMENT, OP::OP_GET_OBJECT_ELEMENT4CALL)) && +#endif +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + !(count==5 && change_first(*$$, OP::OP_GET_OBJECT_VAR_ELEMENT, OP::OP_GET_OBJECT_VAR_ELEMENT4CALL)) && +#endif + !change(*$$, count-1, OP::OP_GET_ELEMENT, OP::OP_GET_ELEMENT4CALL); + } +#endif +}; -store_params: store_param | store_params store_param { $$=$1; P(*$$, *$2) }; +store_params: store_param | store_params store_param { $$=$1; P(*$$, *$2); }; store_param: store_square_param | store_round_param @@ -571,20 +578,20 @@ store_square_param: '[' { *reinterpret_cast(&$$)=PC.explicit_result; PC.explicit_result=false; } store_code_param_parts { PC.explicit_result=*reinterpret_cast(&$2); -} ']' {$$=$3}; -store_round_param: '(' store_expr_param_parts ')' {$$=$2}; -store_curly_param: '{' store_curly_param_parts '}' {$$=$2}; +} ']' {$$=$3;}; +store_round_param: '(' store_expr_param_parts ')' {$$=$2;}; +store_curly_param: '{' store_curly_param_parts '}' {$$=$2;}; store_code_param_parts: store_code_param_part -| store_code_param_parts ';' store_code_param_part { $$=$1; P(*$$, *$3) } +| store_code_param_parts ';' store_code_param_part { $$=$1; P(*$$, *$3); } ; store_expr_param_parts: store_expr_param_part -| store_expr_param_parts ';' store_expr_param_part { $$=$1; P(*$$, *$3) } +| store_expr_param_parts ';' store_expr_param_part { $$=$1; P(*$$, *$3); } ; store_curly_param_parts: store_curly_param_part -| store_curly_param_parts ';' store_curly_param_part { $$=$1; P(*$$, *$3) } +| store_curly_param_parts ';' store_curly_param_part { $$=$1; P(*$$, *$3); } ; store_code_param_part: code_param_value { $$=$1; @@ -596,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(); @@ -608,16 +614,16 @@ store_curly_param_part: maybe_codes { OA(*$$, OP::OP_CURLY_CODE__STORE_PARAM, $1); }; code_param_value: - void_value /* optimized [;...] case */ + empty_value /* optimized [;...] case */ | STRING /* optimized [STRING] case */ | constructor_code_value /* [something complex] */ ; /* name */ -name_expr_dive_code: name_expr_value | name_path name_expr_value { $$=$1; P(*$$, *$2) }; +name_expr_dive_code: name_expr_value | name_path name_expr_value { $$=$1; P(*$$, *$2); }; -name_path: name_step | name_path name_step { $$=$1; P(*$$, *$2) }; +name_path: name_step | name_path name_step { $$=$1; P(*$$, *$2); }; name_step: name_advance1 '.'; name_advance1: name_expr_value { // we know that name_advance1 not called from ^xxx context @@ -625,12 +631,20 @@ name_advance1: name_expr_value { /* stack: context */ $$=$1; /* stack: context,name */ +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL + O(*$$, is_special_element(*$$) ? OP::OP_GET_ELEMENT__SPECIAL : OP::OP_GET_ELEMENT); +#else O(*$$, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ +#endif }; name_advance2: name_expr_value { /* stack: context */ $$=$1; /* stack: context,name */ +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL + O(*$$, is_special_element(*$$) ? OP::OP_GET_ELEMENT__SPECIAL : OP::OP_GET_ELEMENT); +#else O(*$$, OP::OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ +#endif } | STRING BOGUS ; @@ -660,16 +674,21 @@ name_square_code_value: '[' { PC.explicit_result=*reinterpret_cast(&$2); } ']' { $$=N(); - OA(*$$, OP::OP_OBJECT_POOL, $3); /* stack: empty write context */ - /* some code that writes to that context */ - /* context=pop; stack: context.value() */ +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL + if(!maybe_append_simple_diving_code(*$$, *$3)) +#endif + { + OA(*$$, OP::OP_OBJECT_POOL, $3); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ + } }; subvar_ref_name_rdive: STRING { $$=N(); O(*$$, OP::OP_WITH_READ); P(*$$, *$1); }; -subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P(*$$, *$2) }; +subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P(*$$, *$2); }; subvar__get_write: '$' subvar_ref_name_rdive { $$=$2; O(*$$, OP::OP_GET_ELEMENT__WRITE); @@ -681,27 +700,27 @@ class_prefix: ; class_static_prefix: STRING ':' { $$=$1; // stack: class name string + OP::OPCODE code = OP::OP_VALUE__GET_CLASS; if(*LA2S(*$$) == BASE_NAME) { // pseudo BASE class if(VStateless_class* base=PC.cclass->base_class()) { - change_string_literal_value(*$$, base->name()); + 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 { + // 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; } -#ifdef OPTIMIZE_BYTECODE_GET_CLASS // optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string - maybe_change_first_opcode(*$$, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS) -#else - O(*$$, OP::OP_GET_CLASS); -#endif + change_first(*$$, OP::OP_VALUE, code); }; 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); }; @@ -715,46 +734,46 @@ expr: | false_value | get_value | call_value -| '"' string_inside_quotes_value '"' { $$ = $2 } -| '\'' string_inside_quotes_value '\'' { $$ = $2 } +| '"' string_inside_quotes_value '"' { $$ = $2; } +| '\'' string_inside_quotes_value '\'' { $$ = $2; } | '(' expr ')' { $$ = $2; } /* stack: operand // stack: @operand */ -| '-' expr %prec NUNARY { $$=$2; O(*$$, OP::OP_NEG) } -| '+' expr %prec NUNARY { $$=$2 } -| '~' expr { $$=$2; O(*$$, OP::OP_INV) } -| '!' expr { $$=$2; O(*$$, OP::OP_NOT) } -| "def" expr { $$=$2; O(*$$, OP::OP_DEF) } -| "in" expr { $$=$2; O(*$$, OP::OP_IN) } -| "-f" expr { $$=$2; O(*$$, OP::OP_FEXISTS) } -| "-d" expr { $$=$2; O(*$$, OP::OP_DEXISTS) } +| '-' expr %prec NUNARY { $$=$2; O(*$$, OP::OP_NEG); } +| '+' expr %prec NUNARY { $$=$2; } +| '~' expr { $$=$2; O(*$$, OP::OP_INV); } +| '!' expr { $$=$2; O(*$$, OP::OP_NOT); } +| "def" expr { $$=$2; O(*$$, OP::OP_DEF); } +| "in" expr { $$=$2; O(*$$, OP::OP_IN); } +| "-f" expr { $$=$2; O(*$$, OP::OP_FEXISTS); } +| "-d" expr { $$=$2; O(*$$, OP::OP_DEXISTS); } /* stack: a,b // stack: a@b */ -| expr '-' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_SUB) } -| expr '+' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_ADD) } -| expr '*' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_MUL) } -| expr '/' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_DIV) } -| expr '%' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_MOD) } -| expr '\\' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_INTDIV) } -| expr "<<" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_SL) } -| expr ">>" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_SR) } -| expr '&' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_AND) } -| expr '|' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_OR) } -| expr "!|" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_XOR) } -| expr "&&" expr { $$=$1; OA(*$$, OP::OP_NESTED_CODE, $3); O(*$$, OP::OP_LOG_AND) } -| expr "||" expr { $$=$1; OA(*$$, OP::OP_NESTED_CODE, $3); O(*$$, OP::OP_LOG_OR) } -| expr "!||" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_LOG_XOR) } -| expr '<' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_LT) } -| expr '>' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_GT) } -| expr "<=" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_LE) } -| expr ">=" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_GE) } -| expr "==" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_EQ) } -| expr "!=" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_NE) } -| expr "lt" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_LT) } -| expr "gt" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_GT) } -| expr "le" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_LE) } -| expr "ge" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_GE) } -| expr "eq" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_EQ) } -| expr "ne" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_NE) } -| expr "is" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_IS) } +| expr '-' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_SUB); } +| expr '+' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_ADD); } +| expr '*' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_MUL); } +| expr '/' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_DIV); } +| expr '%' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_MOD); } +| expr '\\' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_INTDIV); } +| expr "<<" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_SL); } +| expr ">>" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_SR); } +| expr '&' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_AND); } +| expr '|' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_OR); } +| expr "!|" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_BIN_XOR); } +| expr "&&" expr { $$=$1; OA(*$$, OP::OP_NESTED_CODE, $3); O(*$$, OP::OP_LOG_AND); } +| expr "||" expr { $$=$1; OA(*$$, OP::OP_NESTED_CODE, $3); O(*$$, OP::OP_LOG_OR); } +| expr "!||" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_LOG_XOR); } +| expr '<' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_LT); } +| expr '>' expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_GT); } +| expr "<=" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_LE); } +| expr ">=" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_GE); } +| expr "==" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_EQ); } +| expr "!=" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_NUM_NE); } +| expr "lt" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_LT); } +| expr "gt" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_GT); } +| expr "le" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_LE); } +| expr "ge" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_GE); } +| expr "eq" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_EQ); } +| expr "ne" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_STR_NE); } +| expr "is" expr { $$=$1; P(*$$, *$3); O(*$$, OP::OP_IS); } ; double_or_STRING: STRING { @@ -767,7 +786,7 @@ string_inside_quotes_value: maybe_codes // it brakes ^if(" 09 "){...} YYSTYPE code=$1; $$=N(); - if(code->count()==3 && maybe_change_first_opcode(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){ + if(code->count()==3 && change_first(*code, OP::OP_STRING__WRITE, OP::OP_VALUE)){ // optimized OP_STRING__WRITE+origin+value => OP_VALUE+origin+value without starting OP_STRING_POOL P(*$$, *code); } else { @@ -785,14 +804,14 @@ string_inside_quotes_value: maybe_codes write_string: STRING { // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE - change_string_literal_to_write_string_literal(*($$=$1)) + change_string_literal_to_write_string_literal(*($$=$1)); }; -void_value: /* empty */ { $$=VL(/*we know that we will not change it*/const_cast(&vvoid), 0, 0, 0) } -true_value: "true" { $$ = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0) } -false_value: "false" { $$ = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0) } +empty_value: /* empty */ { $$=VL(/*we know that we will not change it*/const_cast(&vempty), 0, 0, 0); } +true_value: "true" { $$ = VL(/*we know that we will not change it*/const_cast(&vtrue), 0, 0, 0); } +false_value: "false" { $$ = VL(/*we know that we will not change it*/const_cast(&vfalse), 0, 0, 0); } -empty: /* empty */ { $$=N() }; +empty: /* empty */ { $$=N(); }; %% #endif @@ -822,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) { @@ -992,13 +1011,12 @@ default: } if(pc.explicit_result && c) switch(c) { + default: + pc.string.append(c); case '\n': case ' ': case '\t': begin=pc.source; begin_pos=pc.pos; - continue; // skip it - default: - result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE; - goto break2; + continue; } break; @@ -1021,8 +1039,8 @@ default: case '"': case '\'': if( - pc.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || - pc.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { + (pc.ls == LS_EXPRESSION_STRING_QUOTED && c=='"') || + (pc.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') ) { pop_LS(pc); //"abc". | 'abc'. RC; } @@ -1095,11 +1113,12 @@ default: case LS_METHOD_ROUND: switch(c) { case ')': - if(--lexical_brackets_nestage==0) + 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 + } RC; case '#': // comment start skipping if(end!=begin) { @@ -1333,7 +1352,7 @@ default: case ']': case '}': case ')': case '"': case '\'': case '<': case '>': // these stand for HTML brackets AND expression binary ops - case '+': case '*': case '/': case '%': + case '+': case '*': case '/': case '\\': case '%': case '&': case '|': case '=': case '!': // common delimiters @@ -1348,11 +1367,11 @@ default: goto break2; case '[': // $name.<[>code] - if(pc.pos.col>1/*not first column*/ && ( + if( end[-1]=='$'/*was start of get*/ || end[-1]==':'/*was class name delim */ || end[-1]=='.'/*was name delim */ - )) { + ) { push_LS(pc, LS_NAME_SQUARE_PART); lexical_brackets_nestage=1; RC; @@ -1361,7 +1380,7 @@ default: lexical_brackets_nestage=1; RC; case '{': - if(begin==end) { // ${name}, no need of EON, switching LS + if(end[-1]=='$') { // ${name}, no need of EON, switching LS, not begin==end as $[a]{$b} will fit pc.ls=LS_VAR_NAME_CURLY; } else { pc.ls=LS_VAR_CURLY; @@ -1524,13 +1543,12 @@ default: } if(pc.explicit_result && c) switch(c) { + default: + pc.string.append(c); case '\n': case ' ': case '\t': begin=pc.source; begin_pos=pc.pos; - continue; // skip it - default: - result=BAD_NONWHITESPACE_CHARACTER_IN_EXPLICIT_RESULT_MODE; - goto break2; + continue; } break; @@ -1539,17 +1557,17 @@ default: pc.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; - } + } if(c=='{') {/* ]{ }{ ){ */ pc.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; - } + } if(c=='(') {/* ]( }( )( */ pc.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; - } + } pop_LS(pc); pc.ungetc(); result=EON; @@ -1563,12 +1581,9 @@ default: break2: if(end!=begin) { // there is last piece? - if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF? - // strip last \n - end--; - if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME + if(c=='@' || c==0) // we are before LS_DEF_NAME or EOF? + while(end!=begin && end[-1]=='\n') // trim all empty lines before LS_DEF_NAME and EOF 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; @@ -1578,9 +1593,12 @@ break2: } 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); +#ifdef SYMBOLS_CACHING + Value *lookup=symbols->get(pc.string); +#else + Value *lookup=0; +#endif + *lvalp=VL(lookup ? lookup : new VString(*new String(pc.string, String::L_CLEAN)), pc.file_no, pc.string_start.line, pc.string_start.col); // new pieces storage pc.string.clear(); pc.string_start.clear(); @@ -1593,9 +1611,9 @@ break2: return result; } -static int real_yyerror(Parse_control *pc, char *s) { // Called by yyparse on error - strncpy(PC.error, s, MAX_STRING); - return 1; +static int real_yyerror(Parse_control *pc, const char *s) { // Called by yyparse on error + PC.error=pa_strdup(s); + return 1; } static void yyprint(FILE *file, int type, YYSTYPE value) {