Branch: Tag:

2005-10-14

2005-10-14 08:43:04 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Reverted broken bison fix.
Improved compat with Pike 0.6.

Rev: src/language.yacc:1.360

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: language.yacc,v 1.359 2005/10/13 14:47:33 mast Exp $ + || $Id: language.yacc,v 1.360 2005/10/14 08:43:04 grubba Exp $   */      %pure_parser
194:   #include <stdio.h>   int yylex(YYSTYPE *yylval);   /* Bison is stupid, and tries to optimize for space... */ - #ifdef BISON_SHORT_EXPANSION - #define short BISON_SHORT_EXPANSION - #endif + #ifdef YYBISON + #define short int + #endif /* YYBISON */      %}   
730:    int e;    /* construct the function type */    push_finished_type(Pike_compiler->compiler_frame->current_type); -  if ($3 && (Pike_compiler->compiler_pass == 2)) { +  if ($3 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while(--$3>=0) push_type(T_ARRAY);
1211:   full_type: type4    | full_type '*'    { -  if (Pike_compiler->compiler_pass == 2) { +  if (Pike_compiler->compiler_pass == 2 && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    push_type(T_ARRAY);
1222:      type: type '*'    { -  if (Pike_compiler->compiler_pass == 2) { +  if (Pike_compiler->compiler_pass == 2 && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    push_type(T_ARRAY);
1232:      type7: type7 '*'    { -  if (Pike_compiler->compiler_pass == 2) { +  if (Pike_compiler->compiler_pass == 2 && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    push_type(T_ARRAY);
1586:    {    struct pike_type *type;    push_finished_type(Pike_compiler->compiler_frame->current_type); -  if ($1 && (Pike_compiler->compiler_pass == 2)) { +  if ($1 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while($1--) push_type(T_ARRAY);
1601:    {    struct pike_type *type;    push_finished_type(Pike_compiler->compiler_frame->current_type); -  if ($1 && (Pike_compiler->compiler_pass == 2)) { +  if ($1 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while($1--) push_type(T_ARRAY);
1642:    {    int id;    push_finished_type($<n>0->u.sval.u.type); -  if ($1 && (Pike_compiler->compiler_pass == 2)) { +  if ($1 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while($1--) push_type(T_ARRAY);
1658:    {    int id;    push_finished_type($<n>0->u.sval.u.type); -  if ($1 && (Pike_compiler->compiler_pass == 2)) { +  if ($1 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while($1--) push_type(T_ARRAY);
2160:    debug_malloc_touch(Pike_compiler->compiler_frame->current_return_type);       push_finished_type($<n>0->u.sval.u.type); -  if ($1 && (Pike_compiler->compiler_pass == 2)) { +  if ($1 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while($1--) push_type(T_ARRAY);
2295:    }       push_finished_type(Pike_compiler->compiler_frame->current_type); -  if ($3 && (Pike_compiler->compiler_pass == 2)) { +  if ($3 && (Pike_compiler->compiler_pass == 2) && !TEST_COMPAT (0, 6)) {    yywarning("The *-syntax in types is obsolete. Use array instead.");    }    while($3--) push_type(T_ARRAY);