--- parser3/src/main/compile.y 2009/04/17 12:00:08 1.232 +++ parser3/src/main/compile.y 2009/05/24 07:32:40 1.243 @@ -2,10 +2,10 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.y,v 1.232 2009/04/17 12:00:08 misha Exp $ + $Id: compile.y,v 1.243 2009/05/24 07:32:40 misha Exp $ */ /** @@ -44,6 +44,7 @@ #define OPTIONS_CONTROL_METHOD_NAME "OPTIONS" #define OPTION_ALL_VARS_LOCAL_NAME "locals" #define OPTION_PARTIAL_CLASS "partial" +#define REM_OPERATOR_NAME "rem" // forwards @@ -316,11 +317,41 @@ action: get | put | call; /* get */ get: get_value { - $$=$1; /* stack: resulting value */ - changetail_or_append(*$$, - OP::OP_GET_ELEMENT, false, /*->*/OP::OP_GET_ELEMENT__WRITE, - /*or */OP::OP_WRITE_VALUE - ); /* value=pop; wcontext.write(value) */ + $$=N(); + YYSTYPE code=$1; +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + if(!maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE)) +#endif + { + size_t count=code->count(); + size_t len=6; + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + if( + count==len + && maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_ELEMENT, OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_OBJECT_ELEMENT__WRITE) + ){ + //P(*$$, *code, 0/*offset*/, count-1/*limit*/); // someday skip last OP_GET_ELEMENT + //break; + } else +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + if( + count==len + && maybe_change_first_opcode(*code, OP::OP_GET_OBJECT_VAR_ELEMENT, OP::OP_GET_ELEMENT, /*=>*/OP::OP_GET_OBJECT_VAR_ELEMENT__WRITE) + ){ + //P(*$$, *code, 0/*offset*/, count-1/*limit*/); // someday skip last OP_GET_ELEMENT + //break; + } else +#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) */ + } + P(*$$, *code); }; get_value: '$' get_name_value { $$=$2 }; get_name_value: name_without_curly_rdive EON | name_in_curly_rdive; @@ -330,24 +361,53 @@ name_without_curly_rdive: | name_without_curly_rdive_class; name_without_curly_rdive_read: name_without_curly_rdive_code { $$=N(); - ArrayOperation* diving_code=$1; + YYSTYPE diving_code=$1; const String* first_name=LA2S(*diving_code); - // self.xxx... -> xxx... + size_t count=diving_code->count(); + // self.xxx... => xxx... // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { - O(*yyval, OP::OP_WITH_SELF); /* stack: starting context */ - P(*yyval, *diving_code, + O(*$$, OP::OP_WITH_SELF); /* stack: starting context */ + P(*$$, *diving_code, /* skip over... */ - diving_code->count()>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); - } else { - O(*yyval, OP::OP_WITH_READ); /* stack: starting context */ + count>=4?4/*OP_VALUE+origin+string+OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/); + } - // ^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::OP_GET_ELEMENT_OR_OPERATOR); +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT + else if(maybe_make_get_object_element(*$$, *diving_code, count)){ + // optimisation for $object.field + ^object.method[ + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT + else if(maybe_make_get_object_var_element(*$$, *diving_code, count)){ + // optimisation for $object.$var + } +#endif + +#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT + else if(count==4){ // optimization + O(*$$, + (PC.in_call_value) + ? OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR // ^object[ : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT_OR_OPERATOR+origin+string + : OP::OP_VALUE__GET_ELEMENT // $object : OP_VALUE+origin+string+OP_GET_ELEMENT => OP_VALUE__GET_ELEMENT+origin+string + ); + P(*$$, *diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value + } else { + O(*$$, OP::OP_WITH_READ); /* stack: starting context */ + P(*$$, *diving_code); + } +#else + else { + O(*$$, OP::OP_WITH_READ); /* stack: starting context */ + + // ^if OP_ELEMENT => ^if OP_ELEMENT_OR_OPERATOR + // optimized OP_VALUE+origin+string+OP_GET_ELEMENT. => OP_VALUE+origin+string+OP_GET_ELEMENT_OR_OPERATOR. + if(PC.in_call_value && count==4) + diving_code->put(count-1, OP::OP_GET_ELEMENT_OR_OPERATOR); P(*$$, *diving_code); } +#endif /* diving code; stack: current context */ }; name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P(*$$, *$2) }; @@ -356,8 +416,19 @@ name_without_curly_rdive_code: name_adva /* put */ put: '$' name_expr_wdive construct { - $$=$2; /* stack: context,name */ - P(*$$, *$3); /* stack: context,name,constructor_value */ + $$=N(); +#if defined(OPTIMIZE_BYTECODE_CONSTRUCT) || defined(OPTIMIZE_BYTECODE_CALL_CONSTRUCT) + if(maybe_make_root_or_write_construct(*$$, *$2, *$3)){ + // $a(1), $.a(1), $a[b], $.a[b] + // $a($b), $.a($b), $a[$b], $.a[$b] + // $a($b.c), $.a($b.c), $a[$b.c], $.a[$b.c] + // $a($b.$c), $.a($b.$c), $a[$b.$c], $.a[$b.$c] + } else +#endif + { + P(*$$, *$2); /* stack: context,name */ + P(*$$, *$3); /* stack: context,name,constructor_value */ + } }; name_expr_wdive: name_expr_wdive_root @@ -365,10 +436,10 @@ name_expr_wdive: | name_expr_wdive_class; name_expr_wdive_root: name_expr_dive_code { $$=N(); - ArrayOperation* diving_code=$1; + YYSTYPE diving_code=$1; const String* first_name=LA2S(*diving_code); - // $self.xxx... -> $xxx... - // OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... + // $self.xxx... => $xxx... + // OP_VALUE+origin+string+OP_GET_ELEMENT+... => OP_WITH_SELF+... if(first_name && *first_name==SELF_ELEMENT_NAME) { O(*$$, OP::OP_WITH_SELF); /* stack: starting context */ P(*$$, *diving_code, @@ -434,10 +505,15 @@ codes__excluding_sole_str_literal: actio /* call */ call: call_value { - $$=$1; /* stack: value */ - changetail_or_append(*$$, - OP::OP_CALL, true, /*->*/ OP::OP_CALL__WRITE, - /*or */OP::OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ +#ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR + if((*$1).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) */ + } }; call_value: '^' { PC.in_call_value=true; @@ -446,16 +522,28 @@ call_value: '^' { PC.in_call_value=false; } store_params EON { /* ^field.$method{vasya} */ - $$=$3; /* with_xxx,diving code; stack: context,method_junction */ - - YYSTYPE params_code=$5; - if(params_code->count()==4) { // probably [] case. [OP::OP_VALUE+origin+Void+STORE_PARAM] - 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. - } - /* stack: context, method_junction */ - OA(*$$, OP::OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value +#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){ + $$=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. + } + /* 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; @@ -488,16 +576,14 @@ store_curly_param_parts: ; store_code_param_part: code_param_value { $$=$1; - O(*$$, OP::OP_STORE_PARAM); }; store_expr_param_part: expr_value { YYSTYPE expr_code=$1; if(expr_code->count()==3 - && (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double] + && (*expr_code)[0].code==OP::OP_VALUE) { // optimizing (double/bool/incidently 'string' too) case. [OP::OP_VALUE+origin+Double]. no evaluating $$=expr_code; - O(*$$, OP::OP_STORE_PARAM); // no evaluating } else { - ArrayOperation* code=N(); + YYSTYPE code=N(); O(*code, OP::OP_PREPARE_TO_EXPRESSION); P(*code, *expr_code); O(*code, OP::OP_WRITE_EXPR_RESULT); @@ -547,7 +633,7 @@ name_expr_subvar_value: '$' subvar_ref_n O(*$$, OP::OP_GET_ELEMENT); }; name_expr_with_subvar_value: STRING subvar_get_writes { - ArrayOperation* code; + YYSTYPE code; { change_string_literal_to_write_string_literal(*(code=$1)); P(*code, *$2); @@ -591,7 +677,12 @@ class_static_prefix: STRING ':' { YYERROR; } } +#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, true/*assert if top opcode != OP_VALUE*/) +#else O(*$$, OP::OP_GET_CLASS); +#endif }; class_constructor_prefix: class_static_prefix ':' { $$=$1; @@ -655,13 +746,25 @@ expr: ; double_or_STRING: STRING { - // optimized from OP_STRING->OP_VALUE for doubles + // optimized OP_STRING => OP_VALUE for doubles maybe_change_string_literal_to_double_literal(*($$=$1)); }; string_inside_quotes_value: maybe_codes { +#ifdef OPTIMIZE_BYTECODE_STRING_POOL + // it brakes ^if(" 09 "){...} + YYSTYPE code=$1; + $$=N(); + if(code->count()==3 && maybe_change_first_opcode(*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 { + OA(*$$, OP::OP_STRING_POOL, code); /* stack: empty write context */ + } +#else $$=N(); OA(*$$, OP::OP_STRING_POOL, $1); /* stack: empty write context */ +#endif /* some code that writes to that context */ /* context=pop; stack: context.get_string() */ }; @@ -669,7 +772,7 @@ string_inside_quotes_value: maybe_codes /* basics */ write_string: STRING { - // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE + // optimized OP_STRING+OP_WRITE_VALUE => OP_STRING__WRITE change_string_literal_to_write_string_literal(*($$=$1)) };