--- parser3/src/main/compile.y 2001/02/22 08:16:31 1.14 +++ parser3/src/main/compile.y 2001/02/24 09:31:34 1.32 @@ -1,3 +1,7 @@ +/* + $Id: compile.y,v 1.32 2001/02/24 09:31:34 paf Exp $ +*/ + %{ #define YYSTYPE Array/**/ * #define YYPARSE_PARAM pc @@ -22,7 +26,9 @@ int yylex(YYSTYPE *lvalp, void *pc); // local convinient inplace typecast & var #define PC ((parse_control *)pc) -#define pool *PC->pool +#define POOL *PC->pool +#undef NEW +#define NEW new(POOL) %} %pure_parser @@ -35,11 +41,11 @@ int yylex(YYSTYPE *lvalp, void *pc); all: one_big_piece { - String& name_main=*new(pool) String(pool); + String& name_main=*NEW String(POOL); name_main.APPEND_CONST(MAIN_METHOD_NAME); - Array& param_names=*new(pool) Array(pool); - Array& local_names=*new(pool) Array(pool); - Method *method=new(pool) Method(pool, name_main, param_names, local_names, *$1); + Array& param_names=*NEW Array(POOL); + Array& local_names=*NEW Array(POOL); + Method *method=NEW Method(POOL, name_main, param_names, local_names, *$1); *PC->methods+=method; } | methods; @@ -52,16 +58,16 @@ method: '@' STRING bracketed_maybe_strin const String *name=LA2S($2); YYSTYPE params_names_code=$3; - Array& params_names=*new(pool) Array(pool); + Array& params_names=*NEW Array(POOL); for(int i=0; isize(); i+=2) params_names+=LA2S(params_names_code, i); YYSTYPE locals_names_code=$4; - Array& locals_names=*new(pool) Array(pool); + Array& locals_names=*NEW Array(POOL); for(int i=0; isize(); i+=2) locals_names+=LA2S(locals_names_code, i); - Method *method=new(pool) Method(pool, *name, params_names, locals_names, *$7); + Method *method=NEW Method(POOL, *name, params_names, locals_names, *$7); *PC->methods+=method; }; @@ -87,64 +93,86 @@ action: get | put | with | call; get: '$' any_name { $$=$2; /* stack: resulting value */ - OP($$, OP_WRITE_VALUE); /* value=pop; write(value) */ + OP($$, OP_WRITE); /* value=pop; write(value) */ }; any_name: name_without_curly_rdive EON | name_in_curly_rdive; name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 }; -name_without_curly_rdive: name_rdive { - /* - TODO: подсмотреть в $1, и если там в первом элементе первая буква ":" - то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT - TODO: подсмотреть в $1, и если там первым элементом self, - то выкинуть его и делать не OP_WITH_READ, а WITH_SELF - */ - $$=N(pool); OP($$, OP_WITH_READ); /* stack: starting context */ - P($$, $1); /* diving code; stack: current context */ +name_without_curly_rdive: name_without_curly_rdive_read | name_without_curly_rdive_root; +name_without_curly_rdive_read: name_without_curly_rdive_code { + $$=N(POOL); + Array *diving_code=$1; + String *first_name=LA2S(diving_code); + if(first_name && *first_name==SELF_NAME) { + OP($$, OP_WITH_SELF); /* stack: starting context */ + P($$, diving_code, + /* skip over... */ + diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + } else { + OP($$, OP_WITH_READ); /* stack: starting context */ + P($$, diving_code); + } + /* diving code; stack: current context */ }; -name_rdive: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) }; +name_without_curly_rdive_root: ':' name_without_curly_rdive_code { + $$=N(POOL); + OP($$, OP_WITH_ROOT); /* stack: starting context */ + P($$, $2); /* diving code; stack: current context */ +}; +name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) }; /* put */ -put: '$' name_expr_dive '(' constructor_value ')' { -/* - TODO: подсмотреть в $3, и если там в первом элементе первая буква ":" - то выкинуть её и делать не OP_WITH_OP_WRITE, а WITH_ROOT - TODO: подсмотреть в $3, и если там первым элементом self, - то выкинуть его и делать не OP_WITH_OP_WRITE, а WITH_SELF - если ничего не осталось - $self(xxx) - обругать -*/ - $$=N(pool); - OP($$, OP_WITH_WRITE); /* stack: starting context */ - P($$, $2); /* diving code; stack: context,name */ +put: '$' name_expr_wdive '(' constructor_value ')' { + $$=$2; /* stack: context,name */ P($$, $4); /* stack: context,name,constructor_value */ OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */ }; +name_expr_wdive: name_expr_wdive_write | name_expr_wdive_root; +name_expr_wdive_write: name_expr_dive_code { + $$=N(POOL); + Array *diving_code=$1; + String *first_name=LA2S(diving_code); + if(first_name && *first_name==SELF_NAME) { + OP($$, OP_WITH_SELF); /* stack: starting context */ + P($$, diving_code, + /* skip over... */ + diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + } else { + OP($$, OP_WITH_WRITE); /* stack: starting context */ + P($$, diving_code); + } + /* diving code; stack: current context */ +}; +name_expr_wdive_root: ':' name_expr_dive_code { + $$=N(POOL); + OP($$, OP_WITH_ROOT); /* stack: starting context */ + P($$, $2); /* diving code; stack: context,name */ +}; + constructor_value: constructor_one_param_value | constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */ ; + constructor_one_param_value: empty_value /* optimized $var() case */ | STRING /* optimized $var(STRING) case */ | complex_constructor_param_value /* $var(something complex) */ ; -empty_value: empty; complex_constructor_param_value: complex_constructor_param_body { - $$=N(pool); + $$=N(POOL); OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */ P($$, $1); /* some codes to that context */ OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ }; -complex_constructor_param_body: - codes__excluding_sole_str_literal -| codes__str__followed_by__excluding_sole_str_literal -; +complex_constructor_param_body: codes__excluding_sole_str_literal; +codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) }; + constructor_two_params_value: STRING ';' constructor_one_param_value { char *operator_or_fmt=LA2S($1)->cstr(); - $$=N(pool); + $$=N(POOL); P($$, $1); /* stack: ncontext name operator_or_fmt */ P($$, $3); /* stack: ncontext name operator_or_fmt expr */ switch(operator_or_fmt[0]) { @@ -161,28 +189,10 @@ constructor_two_params_value: STRING ';' /* stack: ncontext name value */ }; - /* call */ -call: '^' name_expr_dive store_params EON { /* ^field.$method{vasya} */ -/* - TODO: подсмотреть в $3, и если там в первом элементе первая буква ":" - то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT - TODO: подсмотреть в $3, и если там первым элементом self, - то выкинуть его и делать не OP_WITH_READ, а WITH_SELF - TODO: - если первым в $3 идёт result - то - выкинуть его - если там ещё что-то осталось, - то - не OP_WITH_READ, а WITH_RESULT - иначе // ^result(value) - обругать безобразие -*/ - $$=N(pool); - OP($$, OP_WITH_READ); /* stack: starting context */ - P($$, $2); /* diving code; stack: context,method_name */ +call: '^' name_without_curly_rdive store_params EON { /* ^field.$method{vasya} */ + $$=$2; /* with_xxx,diving code; stack: context,method_name */ OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ P($$, $3); /* filling method_frame.store_params */ OP($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */ @@ -191,22 +201,30 @@ call: '^' name_expr_dive store_params EO store_params: store_param | store_params store_param { $$=$1; P($$, $2) }; store_param: store_round_param | store_curly_param; store_round_param: '(' store_param_parts ')' {$$=$2}; -store_param_parts: store_param_part | store_param_parts ';' store_param_part { $$=$1; P($$, $3) }; -store_param_part: constructor_one_param_value { +store_param_parts: + store_param_part +| store_param_parts ';' store_param_part { $$=$1; P($$, $3) } +; +store_curly_param: '{' maybe_codes '}' { + $$=N(POOL); + PCA($$, $2); + OP($$, OP_STORE_PARAM); +}; +store_param_part: + empty /* optimized $var() case */ +| STRING { /* optimized $var(STRING) case */ $$=$1; OP($$, OP_STORE_PARAM); } -store_curly_param: '{' maybe_codes '}' { - $$=N(pool); - OP($$, OP_CODE_ARRAY); - AA($$, $2); - OP($$, OP_CREATE_JUNCTION); +| complex_constructor_param_value { /* $var(something complex) */ + $$=$1; OP($$, OP_STORE_PARAM); -}; +} +; /* name */ -name_expr_dive: 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_step: name_advance1 '.'; @@ -232,25 +250,28 @@ name_expr_subvar_value: '$' subvar_ref_n OP($$, OP_GET_ELEMENT); }; name_expr_with_subvar_value: STRING subvar_get_writes { - $$=N(pool); + $$=N(POOL); OP($$, OP_CREATE_EWPOOL); P($$, $1); - OP($$, OP_WRITE_STRING); + OP($$, OP_WRITE); P($$, $2); OP($$, OP_REDUCE_EWPOOL); }; -subvar_ref_name_rdive: STRING { -/* - TODO: подсмотреть в $1, и если там в первом элементе первая буква ":" - то выкинуть её и делать не OP_WITH_READ, а WITH_ROOT -*/ - $$=N(pool); OP($$, OP_WITH_READ); +subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root; +subvar_ref_name_rdive_read: STRING { + $$=N(POOL); + OP($$, OP_WITH_READ); P($$, $1); }; +subvar_ref_name_rdive_root: ':' STRING { + $$=N(POOL); + OP($$, OP_WITH_ROOT); + 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; - OP($$, OP_GET_ELEMENT__WRITE_VALUE); + OP($$, OP_GET_ELEMENT__WRITE); }; @@ -261,32 +282,22 @@ with: '$' name_without_curly_rdive '{' c OP($$, OP_CREATE_RWPOOL); P($$, $4); OP($$, OP_REDUCE_RWPOOL); - OP($$, OP_WRITE_VALUE); + OP($$, OP_WRITE); }; -/* codes_in_brackets */ +/* basics */ -codes__str__followed_by__excluding_sole_str_literal: - write_str_literal codes__excluding_sole_str_literal { - $$=$1; - P($$, $2); -} -; -codes__excluding_sole_str_literal: - action -| codes__excluding_sole_str_literal write_str_literal { - $$=$1; - P($$, $2); -} -; write_str_literal: STRING { - $$=$1; - OP($$, OP_WRITE_STRING); + if(LA2S($1)->size()) { + $$=$1; + OP($$, OP_WRITE); + } else { + // optimized case of special end of macro. see yylex + $$=N(POOL); + } }; - -/* */ - -empty: /* empty */ { $$=N(pool) }; +empty_value: /* empty */ { $$=L(NEW VString(POOL)) }; +empty: /* empty */ { $$=N(POOL) }; %% @@ -429,7 +440,7 @@ int yylex(YYSTYPE *lvalp, void *pc) { c==' '|| c=='\t' || c=='\n' || c==')' || c=='}') { pop_LS(PC); - PC->source--; PC->col--; + PC->source--; if(--PC->col<0) { PC->line--; PC->col=-1; } result=EON; goto break2; } @@ -438,6 +449,10 @@ int yylex(YYSTYPE *lvalp, void *pc) { result=c; goto break2; } + if(c==':') { + result=c; + goto break2; + } if(c=='(') { PC->ls=LS_VAR_ROUND; lexical_brackets_nestage=1; @@ -456,6 +471,10 @@ int yylex(YYSTYPE *lvalp, void *pc) { } break; case LS_VAR_NAME_CURLY: + if(c==':') { + result=c; + goto break2; + } if(c=='}') { /* ${name} finished, restoring LS */ pop_LS(PC); result=c; @@ -589,13 +608,12 @@ int yylex(YYSTYPE *lvalp, void *pc) { goto break2; } pop_LS(PC); - PC->source--; PC->col--; + PC->source--; if(--PC->col<0) { PC->line--; PC->col=-1; } result=EON; goto break2; } if(c==0) { result=-1; - PC->source--; PC->col--; break; } } @@ -608,12 +626,14 @@ break2: // strip last \n before LS_DEF_NAME or EOF if((c=='@' || c==0) && end[-1]=='\n') end--; - // append last piece - PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/); - // create STRING value: array of OP_STRING+string - *lvalp=L(PC->string); + if(end!=begin) { + // append last piece + PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/); + } + // create STRING value: array of OP_VALUE+vstring + *lvalp=L(NEW VString(PC->string)); // new pieces storage - PC->string=new(pool) String(pool); + PC->string=NEW String(POOL); // go! return STRING; } @@ -621,7 +641,7 @@ break2: int real_yyerror(parse_control *pc, char *s) /* Called by yyparse on error */ { - fprintf(stderr, "[%s]\n", s); + //fprintf(stderr, "[%s]\n", s); s[MAX_STRING-1]=0; strcpy(pc->error, s); return 1;