cvs commit: patches/bison bison-1.875-attribute-1.patch bison-1.875-attribute.patch

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Jun 4 03:37:59 PDT 2004


jim         04/06/04 04:37:59

  Added:       bison    bison-1.875-attribute-1.patch
  Removed:     bison    bison-1.875-attribute.patch
  Log:
  Naming Scheme Update
  
  Revision  Changes    Path
  1.1                  patches/bison/bison-1.875-attribute-1.patch
  
  Index: bison-1.875-attribute-1.patch
  ===================================================================
  Submitted By: LFS Book <lfs-book at linuxfromscratch.org>
  Date: 2003-10-06
  Initial Package Version: 1.875
  Origin: Bison CVS
  Description: Allows compilation of packages that depend on bison.
  --- bison-1.875/data/yacc.c	2002-12-28 03:36:02.000000000 -0500
  +++ bison-1.875a/data/yacc.c	2003-01-22 01:38:32.000000000 -0500
  @@ -1,7 +1,7 @@
   m4_divert(-1)                                                       -*- C -*-
   
   # Yacc compatible skeleton for Bison
  -# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002
  +# Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003
   # Free Software Foundation, Inc.
   
   # This program is free software; you can redistribute it and/or modify
  @@ -134,7 +134,7 @@
   m4_divert(0)dnl
   @output @output_parser_name@
   b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
  -             [1984, 1989, 1990, 2000, 2001, 2002])[
  +             [1984, 1989, 1990, 2000, 2001, 2002, 2003])[
   
   /* As a special exception, when this file is copied by Bison into a
      Bison output file, you may use that output file without restriction.
  @@ -465,7 +465,15 @@
   
   #define YYACCEPT	goto yyacceptlab
   #define YYABORT		goto yyabortlab
  -#define YYERROR		goto yyerrlab1
  +#define YYERROR		]b4_location_if([do				\
  +			  {				\
  +			    yylerrsp = yylsp;		\
  +			    *++yylerrsp = yyloc;	\
  +			    goto yyerrlab1;		\
  +			  }				\
  +			while (0)],
  +			[goto yyerrlab1])[
  +
   
   /* Like YYERROR except do call yyerror.  This remains here temporarily
      to ease the transition to the new meaning of YYERROR, for GCC.
  @@ -1103,29 +1111,13 @@
   
     /* Else will try to reuse lookahead token after shifting the error
        token.  */
  -  goto yyerrlab2;
  +  goto yyerrlab1;
   
   
   /*----------------------------------------------------.
   | yyerrlab1 -- error raised explicitly by an action.  |
   `----------------------------------------------------*/
   yyerrlab1:
  -
  -  /* Suppress GCC warning that yyerrlab1 is unused when no action
  -     invokes YYERROR.  */
  -#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__)
  -  __attribute__ ((__unused__))
  -#endif
  -
  -]b4_location_if([  yylerrsp = yylsp;
  -  *++yylerrsp = yyloc;])[
  -  goto yyerrlab2;
  -
  -
  -/*---------------------------------------------------------------.
  -| yyerrlab2 -- pop states until the error token can be shifted.  |
  -`---------------------------------------------------------------*/
  -yyerrlab2:
     yyerrstatus = 3;	/* Each real token shifted decrements this.  */
   
     for (;;)
  @@ -1204,7 +1196,7 @@
   m4_if(b4_defines_flag, 0, [],
   [@output @output_header_name@
   b4_copyright([Skeleton parser for Yacc-like parsing with Bison],
  -             [1984, 1989, 1990, 2000, 2001, 2002])
  +             [1984, 1989, 1990, 2000, 2001, 2002, 2003])
   
   /* As a special exception, when this file is copied by Bison into a
      Bison output file, you may use that output file without restriction.
  
  
  



More information about the patches mailing list