pike.git/ src/ language.yacc

2019-08-25

2019-08-25 14:39:40 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• b3c52fead76bea30c39d32c71887efaee418b2e3 (50 lines) (+39/-11) ^{[ Show | Annotate ]}
  Branch: master

Compiler: Make sure that generator variables are propagated.

Mark all variables in a generator as USED_IN_SCOPE so that
they actually get propagated to the generator.

Also: Save the generator state variable in compiler_frame, so
that it is easily accessible from the code-generator.

821:       /* Entry point variable. */    add_ref(int_type_string); +  Pike_compiler->compiler_frame->generator_local =    add_local_name(empty_pike_string, int_type_string, 0); -  +  +  for (e = 0; e <= Pike_compiler->compiler_frame->generator_local; e++) { +  Pike_compiler->compiler_frame->variable[e].flags |= +  LOCAL_VAR_IS_USED | LOCAL_VAR_USED_IN_SCOPE;    }    -  +  Pike_compiler->compiler_frame->lexical_scope |= SCOPE_SCOPE_USED; +  } +     e = $<number>8 + $9 - 1;    if(Pike_compiler->varargs &&    (!$<number>8 || (Pike_compiler->num_create_args >= 0)))
902:    yywarning("Extern declared function definition.");    }    +  if ($1 & ID_GENERATOR) { +  struct pike_type *generator_type; +  +  ref_push_string($5->u.sval.u.string); +  push_constant_text("\0generator"); +  if (Pike_compiler->compiler_pass == COMPILER_PASS_LAST && +  Pike_compiler->compiler_frame->current_return_type->type == PIKE_T_AUTO) { +  /* Change "auto" return type to actual return type. */ +  push_finished_type(Pike_compiler->compiler_frame->current_return_type->car); +  } else { +  push_finished_type(Pike_compiler->compiler_frame->current_return_type); +  } +  push_type(T_VOID); +  push_type(T_MANY); +  +  generator_type = compiler_pop_type(); +  f = dooptcode(Pike_sp[-1].u.string, $12, generator_type, +  ID_PROTECTED|ID_PRIVATE); +  pop_stack(); +  +  Pike_compiler->compiler_frame->generator_local = -1; +  free_type(Pike_compiler->compiler_frame->current_return_type); +  Pike_compiler->compiler_frame->current_return_type = generator_type; +  $12 = mknode(F_RETURN, mkgeneratornode(f), NULL); +  } +     for(e=0; e<$<number>8+$9; e++)    {    if((e >= $<number>8) &&
945:    }    }    -  if ($1 & ID_GENERATOR) { -  $12 = mknode(F_GENERATOR, $12, NULL); -  } -  +     {    int l = $12->line_number;    struct pike_string *f = $12->current_file;
971:    /* Change "auto" return type to actual return type. */    push_finished_type(Pike_compiler->compiler_frame->current_return_type->car);    -  if ($1 & ID_GENERATOR) { -  push_type(T_VOID); -  push_type(T_MANY); -  } -  +     e = $<number>8 + $9 - 1;    if(Pike_compiler->varargs &&    (!$<number>8 || (Pike_compiler->num_create_args >= 0)))
4791:    copy_shared_string(frame->variable[var].file,    THIS_COMPILATION->lex.current_file);    -  if (pike_types_le(void_type_string, type)) { +  if (frame->generator_local != -1) { +  frame->variable[var].flags = LOCAL_VAR_IS_USED | LOCAL_VAR_USED_IN_SCOPE; +  } else if (pike_types_le(void_type_string, type)) {    /* Don't warn about unused voidable variables. */    frame->variable[var].flags = LOCAL_VAR_IS_USED;    } else {