pike.git/ src/ language.yacc

2016-01-24

2016-01-24 23:32:32 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• f2dbd21c064b8bfaf86404c91d258522f789e923 (27 lines) (+14/-13) ^{[ Show | Annotate ]}
  Branch: 8.1

Compiler: Renamed push_compiler_frame{0,1} to start_{function,lambda}.

This should make it clearer what the difference is.

371:   %type <n> foreach_lvalues   %type <n> foreach_optional_lvalue    - %type <ptr> push_compiler_frame0 - %type <ptr> push_compiler_frame1 + %type <ptr> start_function + %type <ptr> start_lambda   %%      all: program { YYACCEPT; }
681:    *    * (eg via simple_type).    */ - push_compiler_frame0: /* empty */ + start_function: /* empty */    {    push_compiler_frame(SCOPE_LOCAL);       if(!Pike_compiler->compiler_frame->previous ||    !Pike_compiler->compiler_frame->previous->current_type)    { -  yyerror("Internal compiler error (push_compiler_frame0)."); +  yyerror("Internal compiler error (start_function).");    copy_pike_type(Pike_compiler->compiler_frame->current_type,    mixed_type_string);    }else{
711:    ;      def: modifiers optional_attributes simple_type optional_constant -  TOK_IDENTIFIER push_compiler_frame0 +  TOK_IDENTIFIER start_function    '('    {    $<number>$ = 0;
976:    free_node($<n>11);    }    | modifiers optional_attributes simple_type -  optional_constant TOK_IDENTIFIER push_compiler_frame0 +  optional_constant TOK_IDENTIFIER start_function    error    {   #ifdef PIKE_DEBUG
2067:   /* This variant is used to push the compiler context for    * functions without a declared return type (ie lambdas).    */ - push_compiler_frame1: /* empty */ + start_lambda: /* empty */    {    push_compiler_frame(SCOPE_LOCAL);   
2083:    }    ;    - lambda: TOK_LAMBDA line_number_info implicit_identifier push_compiler_frame1 + lambda: TOK_LAMBDA line_number_info implicit_identifier start_lambda    {    debug_malloc_touch(Pike_compiler->compiler_frame->current_return_type);    if(Pike_compiler->compiler_frame->current_return_type)
2228:   #endif    pop_compiler_frame();    } -  | TOK_LAMBDA line_number_info implicit_identifier push_compiler_frame1 error +  | TOK_LAMBDA line_number_info implicit_identifier start_lambda error    {   #ifdef PIKE_DEBUG    if (Pike_compiler->compiler_frame != $4) {
2246:    }    ;    - local_function: TOK_IDENTIFIER push_compiler_frame0 func_args + local_function: TOK_IDENTIFIER start_function func_args    {    struct pike_string *name;    struct pike_type *type;
2374:    }    }    } -  | TOK_IDENTIFIER push_compiler_frame1 error +  | TOK_IDENTIFIER start_function error    {   #ifdef PIKE_DEBUG    if (Pike_compiler->compiler_frame != $2) {
3376:   optional_block: /* EMPTY */ { $$=0; }    | '{' line_number_info    /* FIXME: Use implicit_identifier to make __func__ point to the lambda? */ -  push_compiler_frame1 +  start_lambda    {    debug_malloc_touch(Pike_compiler->compiler_frame->current_return_type);    if(Pike_compiler->compiler_frame->current_return_type)