--- parser3/src/main/compile.y 2010/09/21 06:01:25 1.259 +++ parser3/src/main/compile.y 2015/10/21 21:45:25 1.273 @@ -2,12 +2,14 @@ /** @file Parser: compiler(lexical parser and grammar). - Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.y,v 1.259 2010/09/21 06:01:25 misha Exp $ + */ +volatile const char * IDENT_COMPILE_Y = "$Id: compile.y,v 1.273 2015/10/21 21:45:25 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,7 +37,6 @@ #include "pa_vobject.h" #include "pa_vdouble.h" #include "pa_globals.h" -#include "pa_vvoid.h" #include "pa_vmethod_frame.h" // defines @@ -48,23 +49,32 @@ // 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()){ \ + strncpy(PC.error, PC.cclass->name().cstr(), MAX_STRING/2); \ + strcat(PC.error, " - class is already defined"); \ + YYERROR; \ +} + %} -%pure_parser +%pure-parser +%lex-param {Parse_control* pc} +%parse-param {Parse_control* pc} %token EON %token STRING @@ -145,7 +155,7 @@ 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, "@"); @@ -155,19 +165,24 @@ control_method: '@' STRING '\n' } 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; 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)"); + strcpy(PC.error, "@" CLASS_NAME " must contain only one line with class name (contains more then one)"); YYERROR; } } 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), PC.request.get_used_filename(PC.file_no)); + 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); + } } else if(command==BASE_NAME) { if(PC.append){ strcpy(PC.error, "can't set base while appending methods to class '"); @@ -175,7 +190,7 @@ control_method: '@' STRING '\n' strcat(PC.error, "'"); YYERROR; } - PC.class_add(); + 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); @@ -183,32 +198,32 @@ control_method: '@' STRING '\n' YYERROR; } if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) { - const String& base_name=*LA2S(*strings_code); + const String& base_name=LA2S(*strings_code)->trim(String::TRIM_END); if(Value* base_class_value=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); + 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); + strcat(PC.error, ": you can not derive from this class in @" BASE_NAME); YYERROR; } } else { strcpy(PC.error, base_name.cstr()); - strcat(PC.error, ": undefined class in @"BASE_NAME); + strcat(PC.error, ": undefined class in @" BASE_NAME); YYERROR; } } else { - strcpy(PC.error, "@"BASE_NAME" must contain sole name"); + strcpy(PC.error, "@" BASE_NAME " must contain sole name"); YYERROR; } } else if(command==OPTIONS_CONTROL_METHOD_NAME) { for(size_t i=0; icount(); i+=OPERATIONS_PER_OPVALUE) { - const String& option=*LA2S(*strings_code, i); + const String& option=LA2S(*strings_code, i)->trim(String::TRIM_END); if(option==OPTION_ALL_VARS_LOCAL_NAME){ PC.set_all_vars_local(); } else if(option==OPTION_PARTIAL_CLASS){ @@ -225,7 +240,7 @@ control_method: '@' STRING '\n' PC.cclass_new->set_partial(); } } else { - strcpy(PC.error, "'"OPTION_PARTIAL_CLASS"' option should be used straight after @"CLASS_NAME); + strcpy(PC.error, "'" OPTION_PARTIAL_CLASS "' option should be used straight after @" CLASS_NAME); YYERROR; } } else if(option==method_call_type_static){ @@ -236,8 +251,8 @@ control_method: '@' STRING '\n' strcpy(PC.error, "'"); strncat(PC.error, option.cstr(), MAX_STRING/2); strcat(PC.error, "' invalid option. valid options are " - "'"OPTION_PARTIAL_CLASS"', '"OPTION_ALL_VARS_LOCAL_NAME"'" - ", '"METHOD_CALL_TYPE_STATIC"' and '"METHOD_CALL_TYPE_DYNAMIC"'" + "'" OPTION_PARTIAL_CLASS "', '" OPTION_ALL_VARS_LOCAL_NAME "'" + ", '" METHOD_CALL_TYPE_STATIC "' and '" METHOD_CALL_TYPE_DYNAMIC "'" ); YYERROR; } @@ -246,7 +261,7 @@ control_method: '@' STRING '\n' 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"'."); + "'" CLASS_NAME "', '" USE_CONTROL_METHOD_NAME "', '" BASE_NAME "' and '" OPTIONS_CONTROL_METHOD_NAME "'."); YYERROR; } }; @@ -256,7 +271,7 @@ 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; @@ -328,33 +343,40 @@ get: get_value { #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT if( count!=3 - || !maybe_change_first_opcode(*code, OP::OP_VALUE__GET_ELEMENT, /*=>*/OP::OP_VALUE__GET_ELEMENT__WRITE) + || !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) + || !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) + || !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) + || !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, + 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) */ } @@ -505,7 +527,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] */ ; @@ -521,14 +543,15 @@ codes__excluding_sole_str_literal: actio /* call */ call: call_value { + size_t count=$1->count(); #ifdef OPTIMIZE_BYTECODE_CUT_REM_OPERATOR - if((*$1).count()) + if(count) #endif { $$=$1; /* stack: value */ - if(!maybe_change_first_opcode(*$$, OP::OP_CONSTRUCT_OBJECT, /*=>*/OP::OP_CONSTRUCT_OBJECT__WRITE)) - changetail_or_append(*$$, - OP::OP_CALL, true, /*=>*/ OP::OP_CALL__WRITE, + 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) */ } }; @@ -553,8 +576,9 @@ call_value: '^' { 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 */ @@ -564,9 +588,13 @@ call_value: '^' { && (*var_code)[0].code==OP::OP_VALUE__GET_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 ){ - yyval=N(); + $$=N(); O(*$$, OP::OP_CONSTRUCT_OBJECT); P(*$$, *var_code, 1/*offset*/, 2/*limit*/); // class name P(*$$, *var_code, 5/*offset*/, 2/*limit*/); // constructor name @@ -579,7 +607,21 @@ call_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_param: @@ -629,7 +671,7 @@ 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] */ ; @@ -646,12 +688,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 ; @@ -681,9 +731,14 @@ name_square_code_value: '[' { PC.explicit_result=*reinterpret_cast(&$2); } ']' { $$=N(); +#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(); @@ -711,7 +766,7 @@ class_static_prefix: STRING ':' { } } // 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); + change_first(*$$, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS); }; class_constructor_prefix: class_static_prefix ':' { $$=$1; @@ -784,7 +839,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 { @@ -805,7 +860,7 @@ write_string: STRING { 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); } +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); } @@ -1038,8 +1093,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; } @@ -1112,11 +1167,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) { @@ -1607,7 +1663,7 @@ break2: return result; } -static int real_yyerror(Parse_control *pc, char *s) { // Called by yyparse on error +static int real_yyerror(Parse_control *pc, const char *s) { // Called by yyparse on error strncpy(PC.error, s, MAX_STRING); return 1; }