pike.git/ src/ language.yacc

1998-05-20

1998-05-20 02:14:29 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• 4142a6380e57d3b88b39cb9064b4fa15adf2b297 (31 lines) (+16/-15) ^{[ Show | Annotate ]}
  Branch: 7.9

bugfix in compiler type composer

Rev: src/language.yacc:1.97
Rev: src/pike_types.c:1.43
Rev: src/pike_types.h:1.13
Rev: src/testsuite.in:1.111

179:   /* This is the grammar definition of Pike. */      #include "global.h" - RCSID("$Id: language.yacc,v 1.96 1998/05/12 23:51:25 hubbe Exp $"); + RCSID("$Id: language.yacc,v 1.97 1998/05/20 02:14:28 hubbe Exp $");   #ifdef HAVE_MEMORY_H   #include <memory.h>   #endif
575:       if(compiler_frame->current_return_type)    free_string(compiler_frame->current_return_type); -  compiler_frame->current_return_type=pop_type(); +  compiler_frame->current_return_type=compiler_pop_type();       push_finished_type(compiler_frame->current_return_type);   
597:    push_type(T_FUNCTION);       { -  struct pike_string *s=pop_type(); +  struct pike_string *s=compiler_pop_type();    $<n>$=mkstrnode(s);    free_string(s);    }
639:    | modifiers type_or_error optional_stars bad_identifier    '(' arguments ')' block_or_semi    { -  free_string(pop_type()); +  free_string(compiler_pop_type());    }    | modifiers type_or_error name_list ';' {}    | inheritance {}
698:    my_yyerror("Variable '%s' appears twice in argument list.",    $3->u.sval.u.string->str);    -  add_local_name($3->u.sval.u.string, pop_type()); +  add_local_name($3->u.sval.u.string, compiler_pop_type());    free_node($3);    }    ;
745:      cast: '(' type ')'    { -  struct pike_string *s=pop_type(); +  struct pike_string *s=compiler_pop_type();    $$=mkstrnode(s);    free_string(s);    }
763:      simple_type: type4    { -  struct pike_string *s=pop_type(); +  struct pike_string *s=compiler_pop_type();    $$=mkstrnode(s);    free_string(s);    }
771:      simple_type2: type2    { -  struct pike_string *s=pop_type(); +  struct pike_string *s=compiler_pop_type();    $$=mkstrnode(s);    free_string(s);    }
779:      simple_identifier_type: identifier_type    { -  struct pike_string *s=pop_type(); +  struct pike_string *s=compiler_pop_type();    $$=mkstrnode(s);    free_string(s);    }
926:    struct pike_string *type;    push_finished_type(compiler_frame->current_type);    while($1--) push_type(T_ARRAY); -  type=pop_type(); +  type=compiler_pop_type();    define_variable($2->u.sval.u.string, type, current_modifiers);    free_string(type);    free_node($2);
937:    struct pike_string *type;    push_finished_type(compiler_frame->current_type);    while($1--) push_type(T_ARRAY); -  type=pop_type(); +  type=compiler_pop_type();    $<number>$=define_variable($2->u.sval.u.string, type, current_modifiers);    free_string(type);    }
964:    {    push_finished_type($<n>0->u.sval.u.string);    while($1--) push_type(T_ARRAY); -  add_local_name($2->u.sval.u.string, pop_type()); +  add_local_name($2->u.sval.u.string, compiler_pop_type());    $$=mknode(F_ASSIGN,mkintnode(0),mklocalnode(islocal($2->u.sval.u.string)));    free_node($2);    }
973:    {    push_finished_type($<n>0->u.sval.u.string);    while($1--) push_type(T_ARRAY); -  add_local_name($2->u.sval.u.string, pop_type()); +  add_local_name($2->u.sval.u.string, compiler_pop_type());    $$=mknode(F_ASSIGN,$4,mklocalnode(islocal($2->u.sval.u.string)));    free_node($2);    }
1132:       push_type(T_FUNCTION);    -  type=pop_type(); +  type=compiler_pop_type();       sprintf(buf,"__lambda_%ld_%ld",    (long)new_program->id,
1838:    | '[' low_lvalue_list ']' { $$=mknode(F_ARRAY_LVALUE, $2,0); }    | type6 F_IDENTIFIER    { -  add_local_name($2->u.sval.u.string,pop_type()); +  add_local_name($2->u.sval.u.string,compiler_pop_type());    $$=mklocalnode(islocal($2->u.sval.u.string));    free_node($2);    }