Changeset 143763 in webkit


Ignore:
Timestamp:
Feb 22, 2013, 11:44:44 AM (12 years ago)
Author:
kbr@google.com
Message:

Mac OS build broken by new ExpressionParser.cpp
​https://bugs.webkit.org/show_bug.cgi?id=110629

Unreviewed build fix. Regenerated ExpressionParser with Bison 2.3.

  • src/compiler/preprocessor/ExpressionParser.cpp:
Location:
trunk/Source/ThirdParty/ANGLE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r143742 r143763  
     12013-02-22  Kenneth Russell  <kbr@google.com>
     2
     3        Mac OS build broken by new ExpressionParser.cpp
     4        https://bugs.webkit.org/show_bug.cgi?id=110629
     5
     6        Unreviewed build fix. Regenerated ExpressionParser with Bison 2.3.
     7
     8        * src/compiler/preprocessor/ExpressionParser.cpp:
     9
    1102013-02-21  Zhenyao Mo  <zmo@google.com>
    211

  • trunk/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp

    r143742 r143763  
    1 /* A Bison parser, made by GNU Bison 2.4.2.  */
     1/* A Bison parser, made by GNU Bison 2.3.  */
    22
    33/* Skeleton implementation for Bison's Yacc-like parsers in C
    4    
    5       Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
    6    Foundation, Inc.
    7    
    8    This program is free software: you can redistribute it and/or modify
     4
     5   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
     6   Free Software Foundation, Inc.
     7
     8   This program is free software; you can redistribute it and/or modify
    99   it under the terms of the GNU General Public License as published by
    10    the Free Software Foundation, either version 3 of the License, or
    11    (at your option) any later version.
    12    
     10   the Free Software Foundation; either version 2, or (at your option)
     11   any later version.
     12
    1313   This program is distributed in the hope that it will be useful,
    1414   but WITHOUT ANY WARRANTY; without even the implied warranty of
    1515   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1616   GNU General Public License for more details.
    17    
     17
    1818   You should have received a copy of the GNU General Public License
    19    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
     19   along with this program; if not, write to the Free Software
     20   Foundation, Inc., 51 Franklin Street, Fifth Floor,
     21   Boston, MA 02110-1301, USA.  */
    2022
    2123/* As a special exception, you may create a larger work that contains
    … …  
    2830   Bison output files to be licensed under the GNU General Public
    2931   License without this special exception.
    30    
     32
    3133   This special exception was added by the Free Software Foundation in
    3234   version 2.2 of Bison.  */
    … …  
    4648
    4749/* Bison version.  */
    48 #define YYBISON_VERSION "2.4.2"
     50#define YYBISON_VERSION "2.3"
    4951
    5052/* Skeleton name.  */
    … …  
    5456#define YYPURE 1
    5557
    56 /* Push parsers.  */
    57 #define YYPUSH 0
    58 
    59 /* Pull parsers.  */
    60 #define YYPULL 1
    61 
    6258/* Using locations.  */
    6359#define YYLSP_NEEDED 0
    6460
    6561/* Substitute the variable and function names.  */
    66 #define yyparse         ppparse
    67 #define yylex           pplex
    68 #define yyerror         pperror
    69 #define yylval          pplval
    70 #define yychar          ppchar
    71 #define yydebug         ppdebug
    72 #define yynerrs         ppnerrs
    73 
    74 
    75 /* Copy the first part of user declarations.  */
    76 
    77 
    78 //
    79 // Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
    80 // Use of this source code is governed by a BSD-style license that can be
    81 // found in the LICENSE file.
    82 //
    83 
    84 // This file is auto-generated by generate_parser.sh. DO NOT EDIT!
    85 
    86 #if defined(__GNUC__)
    87 // Triggered by the auto-generated pplval variable.
    88 #if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
    89 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
    90 #else
    91 #pragma GCC diagnostic ignored "-Wuninitialized"
    92 #endif
    93 #elif defined(_MSC_VER)
    94 #pragma warning(disable: 4065 4701)
    95 #endif
    96 
    97 #include "ExpressionParser.h"
    98 
    99 #include <cassert>
    100 #include <sstream>
    101 
    102 #include "DiagnosticsBase.h"
    103 #include "Lexer.h"
    104 #include "Token.h"
    105 
    106 #if defined(_MSC_VER)
    107 typedef __int64 YYSTYPE;
    108 #else
    109 #include <stdint.h>
    110 typedef intmax_t YYSTYPE;
    111 #endif  // _MSC_VER
    112 #define YYENABLE_NLS 0
    113 #define YYLTYPE_IS_TRIVIAL 1
    114 #define YYSTYPE_IS_TRIVIAL 1
    115 #define YYSTYPE_IS_DECLARED 1
    116 
    117 namespace {
    118 struct Context
    119 {
    120     pp::Diagnostics* diagnostics;
    121     pp::Lexer* lexer;
    122     pp::Token* token;
    123     int* result;
    124 };
    125 }  // namespace
    126 
    127 
    128 static int yylex(YYSTYPE* lvalp, Context* context);
    129 static void yyerror(Context* context, const char* reason);
    130 
    131 
    132 
    133 /* Enabling traces.  */
    134 #ifndef YYDEBUG
    135 # define YYDEBUG 0
    136 #endif
    137 
    138 /* Enabling verbose error messages.  */
    139 #ifdef YYERROR_VERBOSE
    140 # undef YYERROR_VERBOSE
    141 # define YYERROR_VERBOSE 1
    142 #else
    143 # define YYERROR_VERBOSE 0
    144 #endif
    145 
    146 /* Enabling the token table.  */
    147 #ifndef YYTOKEN_TABLE
    148 # define YYTOKEN_TABLE 0
    149 #endif
     62#define yyparse ppparse
     63#define yylex   pplex
     64#define yyerror pperror
     65#define yylval  pplval
     66#define yychar  ppchar
     67#define yydebug ppdebug
     68#define yynerrs ppnerrs
    15069
    15170
    … …  
    16887   };
    16988#endif
    170 
    171 
     89/* Tokens.  */
     90#define TOK_CONST_INT 258
     91#define TOK_OP_OR 259
     92#define TOK_OP_AND 260
     93#define TOK_OP_NE 261
     94#define TOK_OP_EQ 262
     95#define TOK_OP_GE 263
     96#define TOK_OP_LE 264
     97#define TOK_OP_RIGHT 265
     98#define TOK_OP_LEFT 266
     99#define TOK_UNARY 267
     100
     101
     102
     103
     104/* Copy the first part of user declarations.  */
     105
     106
     107//
     108// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
     109// Use of this source code is governed by a BSD-style license that can be
     110// found in the LICENSE file.
     111//
     112
     113// This file is auto-generated by generate_parser.sh. DO NOT EDIT!
     114
     115#if defined(__GNUC__)
     116// Triggered by the auto-generated pplval variable.
     117#if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
     118#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
     119#else
     120#pragma GCC diagnostic ignored "-Wuninitialized"
     121#endif
     122#elif defined(_MSC_VER)
     123#pragma warning(disable: 4065 4701)
     124#endif
     125
     126#include "ExpressionParser.h"
     127
     128#include <cassert>
     129#include <sstream>
     130
     131#include "DiagnosticsBase.h"
     132#include "Lexer.h"
     133#include "Token.h"
     134
     135#if defined(_MSC_VER)
     136typedef __int64 YYSTYPE;
     137#else
     138#include <stdint.h>
     139typedef intmax_t YYSTYPE;
     140#endif  // _MSC_VER
     141#define YYENABLE_NLS 0
     142#define YYLTYPE_IS_TRIVIAL 1
     143#define YYSTYPE_IS_TRIVIAL 1
     144#define YYSTYPE_IS_DECLARED 1
     145
     146namespace {
     147struct Context
     148{
     149    pp::Diagnostics* diagnostics;
     150    pp::Lexer* lexer;
     151    pp::Token* token;
     152    int* result;
     153};
     154}  // namespace
     155
     156
     157static int yylex(YYSTYPE* lvalp, Context* context);
     158static void yyerror(Context* context, const char* reason);
     159
     160
     161/* Enabling traces.  */
     162#ifndef YYDEBUG
     163# define YYDEBUG 0
     164#endif
     165
     166/* Enabling verbose error messages.  */
     167#ifdef YYERROR_VERBOSE
     168# undef YYERROR_VERBOSE
     169# define YYERROR_VERBOSE 1
     170#else
     171# define YYERROR_VERBOSE 0
     172#endif
     173
     174/* Enabling the token table.  */
     175#ifndef YYTOKEN_TABLE
     176# define YYTOKEN_TABLE 0
     177#endif
    172178
    173179#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
    174180typedef int YYSTYPE;
    175 # define YYSTYPE_IS_TRIVIAL 1
    176181# define yystype YYSTYPE /* obsolescent; will be withdrawn */
    177182# define YYSTYPE_IS_DECLARED 1
    178 #endif
     183# define YYSTYPE_IS_TRIVIAL 1
     184#endif
     185
    179186
    180187
    181188/* Copy the second part of user declarations.  */
    182189
     190
     191/* Line 216 of yacc.c.  */
    183192
    184193
    … …  
    256265     || defined __cplusplus || defined _MSC_VER)
    257266static int
    258 YYID (int yyi)
     267YYID (int i)
    259268#else
    260269static int
    261 YYID (yyi)
    262     int yyi;
    263 #endif
    264 {
    265   return yyi;
     270YYID (i)
     271    int i;
     272#endif
     273{
     274  return i;
    266275}
    267276#endif
    … …  
    344353union yyalloc
    345354{
    346   yytype_int16 yyss_alloc;
    347   YYSTYPE yyvs_alloc;
    348 };
     355  yytype_int16 yyss;
     356  YYSTYPE yyvs;
     357  };
    349358
    350359/* The size of the maximum gap between one aligned stack and the next.  */
    … …  
    380389   stack.  Advance YYPTR to a properly aligned location for the next
    381390   stack.  */
    382 # define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
     391# define YYSTACK_RELOCATE(Stack)                                        \
    383392    do                                                                  \
    384393      {                                                                 \
    385394        YYSIZE_T yynewbytes;                                            \
    386         YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
    387         Stack = &yyptr->Stack_alloc;                                    \
     395        YYCOPY (&yyptr->Stack, Stack, yysize);                          \
     396        Stack = &yyptr->Stack;                                          \
    388397        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
    389398        yyptr += yynewbytes / sizeof (*yyptr);                          \
    … …  
    474483static const yytype_uint8 yyrline[] =
    475484{
    476        0,    90,    90,    97,    98,   101,   104,   107,   110,   113,
    477      116,   119,   122,   125,   128,   131,   134,   137,   140,   143,
    478      156,   169,   172,   175,   178,   181,   184
     485       0,    91,    91,    98,    99,   102,   105,   108,   111,   114,
     486     117,   120,   123,   126,   129,   132,   135,   138,   141,   144,
     487     157,   170,   173,   176,   179,   182,   185
    479488};
    480489#endif
    … …  
    631640/* Like YYERROR except do call yyerror.  This remains here temporarily
    632641   to ease the transition to the new meaning of YYERROR, for GCC.
    633    Once GCC version 2 has supplanted version 1, this can go.  However,
    634    YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
    635    in Bison 2.4.2's NEWS entry, where a plan to phase it out is
    636    discussed.  */
     642   Once GCC version 2 has supplanted version 1, this can go.  */
    637643
    638644#define YYFAIL          goto yyerrlab
    639 #if defined YYFAIL
    640   /* This is here to suppress warnings from the GCC cpp's
    641      -Wunused-macros.  Normally we don't worry about that warning, but
    642      some users do, and we want to make it easy for users to remove
    643      YYFAIL uses, which will produce warnings from Bison 2.5.  */
    644 #endif
    645645
    646646#define YYRECOVERING()  (!!yyerrstatus)
    … …  
    813813     || defined __cplusplus || defined _MSC_VER)
    814814static void
    815 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
     815yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
    816816#else
    817817static void
    818 yy_stack_print (yybottom, yytop)
    819     yytype_int16 *yybottom;
    820     yytype_int16 *yytop;
     818yy_stack_print (bottom, top)
     819    yytype_int16 *bottom;
     820    yytype_int16 *top;
    821821#endif
    822822{
    823823  YYFPRINTF (stderr, "Stack now");
    824   for (; yybottom <= yytop; yybottom++)
    825     {
    826       int yybot = *yybottom;
    827       YYFPRINTF (stderr, " %d", yybot);
    828     }
     824  for (; bottom <= top; ++bottom)
     825    YYFPRINTF (stderr, " %d", *bottom);
    829826  YYFPRINTF (stderr, "\n");
    830827}
    … …  
    861858  for (yyi = 0; yyi < yynrhs; yyi++)
    862859    {
    863       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
     860      fprintf (stderr, "   $%d = ", yyi + 1);
    864861      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
    865862                       &(yyvsp[(yyi + 1) - (yynrhs)])
    866863                                       , context);
    867       YYFPRINTF (stderr, "\n");
     864      fprintf (stderr, "\n");
    868865    }
    869866}
    … …  
    11501147}
    11511148
     1149
     1150
    11521151/* Prevent warnings from -Wmissing-prototypes.  */
     1152
    11531153#ifdef YYPARSE_PARAM
    11541154#if defined __STDC__ || defined __cplusplus
    … …  
    11691169
    11701170
    1171 /*-------------------------.
    1172 | yyparse or yypush_parse.  |
    1173 `-------------------------*/
     1171
     1172/*----------.
     1173| yyparse.  |
     1174`----------*/
    11741175
    11751176#ifdef YYPARSE_PARAM
    … …  
    11951196#endif
    11961197{
    1197 /* The lookahead symbol.  */
     1198  /* The look-ahead symbol.  */
    11981199int yychar;
    11991200
    1200 /* The semantic value of the lookahead symbol.  */
     1201/* The semantic value of the look-ahead symbol.  */
    12011202YYSTYPE yylval;
    12021203
    1203     /* Number of syntax errors so far.  */
    1204     int yynerrs;
    1205 
    1206     int yystate;
    1207     /* Number of tokens to shift before error messages enabled.  */
    1208     int yyerrstatus;
    1209 
    1210     /* The stacks and their tools:
    1211        `yyss': related to states.
    1212        `yyvs': related to semantic values.
    1213 
    1214        Refer to the stacks thru separate pointers, to allow yyoverflow
    1215        to reallocate them elsewhere.  */
    1216 
    1217     /* The state stack.  */
    1218     yytype_int16 yyssa[YYINITDEPTH];
    1219     yytype_int16 *yyss;
    1220     yytype_int16 *yyssp;
    1221 
    1222     /* The semantic value stack.  */
    1223     YYSTYPE yyvsa[YYINITDEPTH];
    1224     YYSTYPE *yyvs;
    1225     YYSTYPE *yyvsp;
    1226 
    1227     YYSIZE_T yystacksize;
    1228 
     1204/* Number of syntax errors so far.  */
     1205int yynerrs;
     1206
     1207  int yystate;
    12291208  int yyn;
    12301209  int yyresult;
    1231   /* Lookahead token as an internal (translated) token number.  */
    1232   int yytoken;
    1233   /* The variables used to return semantic value and location from the
    1234      action routines.  */
    1235   YYSTYPE yyval;
    1236 
     1210  /* Number of tokens to shift before error messages enabled.  */
     1211  int yyerrstatus;
     1212  /* Look-ahead token as an internal (translated) token number.  */
     1213  int yytoken = 0;
    12371214#if YYERROR_VERBOSE
    12381215  /* Buffer for error messages, and its allocated size.  */
    … …  
    12421219#endif
    12431220
     1221  /* Three stacks and their tools:
     1222     `yyss': related to states,
     1223     `yyvs': related to semantic values,
     1224     `yyls': related to locations.
     1225
     1226     Refer to the stacks thru separate pointers, to allow yyoverflow
     1227     to reallocate them elsewhere.  */
     1228
     1229  /* The state stack.  */
     1230  yytype_int16 yyssa[YYINITDEPTH];
     1231  yytype_int16 *yyss = yyssa;
     1232  yytype_int16 *yyssp;
     1233
     1234  /* The semantic value stack.  */
     1235  YYSTYPE yyvsa[YYINITDEPTH];
     1236  YYSTYPE *yyvs = yyvsa;
     1237  YYSTYPE *yyvsp;
     1238
     1239
     1240
    12441241#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
     1242
     1243  YYSIZE_T yystacksize = YYINITDEPTH;
     1244
     1245  /* The variables used to return semantic value and location from the
     1246     action routines.  */
     1247  YYSTYPE yyval;
     1248
    12451249
    12461250  /* The number of symbols on the RHS of the reduced rule.
    … …  
    12481252  int yylen = 0;
    12491253
    1250   yytoken = 0;
    1251   yyss = yyssa;
    1252   yyvs = yyvsa;
    1253   yystacksize = YYINITDEPTH;
    1254 
    12551254  YYDPRINTF ((stderr, "Starting parse\n"));
    12561255
    … …  
    12581257  yyerrstatus = 0;
    12591258  yynerrs = 0;
    1260   yychar = YYEMPTY; /* Cause a token to be read.  */
     1259  yychar = YYEMPTY;             /* Cause a token to be read.  */
    12611260
    12621261  /* Initialize stack pointers.
    … …  
    12641263     so that they stay on the same level as the state stack.
    12651264     The wasted elements are never initialized.  */
     1265
    12661266  yyssp = yyss;
    12671267  yyvsp = yyvs;
    … …  
    12931293        yytype_int16 *yyss1 = yyss;
    12941294
     1295
    12951296        /* Each stack pointer address is followed by the size of the
    12961297           data in use in that stack, in bytes.  This used to be a
    … …  
    13001301                    &yyss1, yysize * sizeof (*yyssp),
    13011302                    &yyvs1, yysize * sizeof (*yyvsp),
     1303
    13021304                    &yystacksize);
    13031305
    … …  
    13221324        if (! yyptr)
    13231325          goto yyexhaustedlab;
    1324         YYSTACK_RELOCATE (yyss_alloc, yyss);
    1325         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
     1326        YYSTACK_RELOCATE (yyss);
     1327        YYSTACK_RELOCATE (yyvs);
     1328
    13261329#  undef YYSTACK_RELOCATE
    13271330        if (yyss1 != yyssa)
    … …  
    13341337      yyvsp = yyvs + yysize - 1;
    13351338
     1339
    13361340      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
    13371341                  (unsigned long int) yystacksize));
    … …  
    13421346
    13431347  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
    1344 
    1345   if (yystate == YYFINAL)
    1346     YYACCEPT;
    13471348
    13481349  goto yybackup;
    … …  
    13541355
    13551356  /* Do appropriate processing given the current state.  Read a
    1356      lookahead token if we need one and don't already have one.  */
    1357 
    1358   /* First try to decide what to do without reference to lookahead token.  */
     1357     look-ahead token if we need one and don't already have one.  */
     1358
     1359  /* First try to decide what to do without reference to look-ahead token.  */
    13591360  yyn = yypact[yystate];
    13601361  if (yyn == YYPACT_NINF)
    13611362    goto yydefault;
    13621363
    1363   /* Not known => get a lookahead token if don't already have one.  */
    1364 
    1365   /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
     1364  /* Not known => get a look-ahead token if don't already have one.  */
     1365
     1366  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
    13661367  if (yychar == YYEMPTY)
    13671368    {
    … …  
    13951396    }
    13961397
     1398  if (yyn == YYFINAL)
     1399    YYACCEPT;
     1400
    13971401  /* Count tokens shifted since error; after three, turn off error
    13981402     status.  */
    … …  
    14001404    yyerrstatus--;
    14011405
    1402   /* Shift the lookahead token.  */
     1406  /* Shift the look-ahead token.  */
    14031407  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
    14041408
    1405   /* Discard the shifted token.  */
    1406   yychar = YYEMPTY;
     1409  /* Discard the shifted token unless it is eof.  */
     1410  if (yychar != YYEOF)
     1411    yychar = YYEMPTY;
    14071412
    14081413  yystate = yyn;
    … …  
    14481453        *(context->result) = static_cast<int>((yyvsp[(1) - (1)]));
    14491454        YYACCEPT;
    1450     }
     1455    ;}
    14511456    break;
    14521457
    … …  
    14551460    {
    14561461        (yyval) = (yyvsp[(1) - (3)]) || (yyvsp[(3) - (3)]);
    1457     }
     1462    ;}
    14581463    break;
    14591464
    … …  
    14621467    {
    14631468        (yyval) = (yyvsp[(1) - (3)]) && (yyvsp[(3) - (3)]);
    1464     }
     1469    ;}
    14651470    break;
    14661471
    … …  
    14691474    {
    14701475        (yyval) = (yyvsp[(1) - (3)]) | (yyvsp[(3) - (3)]);
    1471     }
     1476    ;}
    14721477    break;
    14731478
    … …  
    14761481    {
    14771482        (yyval) = (yyvsp[(1) - (3)]) ^ (yyvsp[(3) - (3)]);
    1478     }
     1483    ;}
    14791484    break;
    14801485
    … …  
    14831488    {
    14841489        (yyval) = (yyvsp[(1) - (3)]) & (yyvsp[(3) - (3)]);
    1485     }
     1490    ;}
    14861491    break;
    14871492
    … …  
    14901495    {
    14911496        (yyval) = (yyvsp[(1) - (3)]) != (yyvsp[(3) - (3)]);
    1492     }
     1497    ;}
    14931498    break;
    14941499
    … …  
    14971502    {
    14981503        (yyval) = (yyvsp[(1) - (3)]) == (yyvsp[(3) - (3)]);
    1499     }
     1504    ;}
    15001505    break;
    15011506
    … …  
    15041509    {
    15051510        (yyval) = (yyvsp[(1) - (3)]) >= (yyvsp[(3) - (3)]);
    1506     }
     1511    ;}
    15071512    break;
    15081513
    … …  
    15111516    {
    15121517        (yyval) = (yyvsp[(1) - (3)]) <= (yyvsp[(3) - (3)]);
    1513     }
     1518    ;}
    15141519    break;
    15151520
    … …  
    15181523    {
    15191524        (yyval) = (yyvsp[(1) - (3)]) > (yyvsp[(3) - (3)]);
    1520     }
     1525    ;}
    15211526    break;
    15221527
    … …  
    15251530    {
    15261531        (yyval) = (yyvsp[(1) - (3)]) < (yyvsp[(3) - (3)]);
    1527     }
     1532    ;}
    15281533    break;
    15291534
    … …  
    15321537    {
    15331538        (yyval) = (yyvsp[(1) - (3)]) >> (yyvsp[(3) - (3)]);
    1534     }
     1539    ;}
    15351540    break;
    15361541
    … …  
    15391544    {
    15401545        (yyval) = (yyvsp[(1) - (3)]) << (yyvsp[(3) - (3)]);
    1541     }
     1546    ;}
    15421547    break;
    15431548
    … …  
    15461551    {
    15471552        (yyval) = (yyvsp[(1) - (3)]) - (yyvsp[(3) - (3)]);
    1548     }
     1553    ;}
    15491554    break;
    15501555
    … …  
    15531558    {
    15541559        (yyval) = (yyvsp[(1) - (3)]) + (yyvsp[(3) - (3)]);
    1555     }
     1560    ;}
    15561561    break;
    15571562
    … …  
    15701575            (yyval) = (yyvsp[(1) - (3)]) % (yyvsp[(3) - (3)]);
    15711576        }
    1572     }
     1577    ;}
    15731578    break;
    15741579
    … …  
    15871592            (yyval) = (yyvsp[(1) - (3)]) / (yyvsp[(3) - (3)]);
    15881593        }
    1589     }
     1594    ;}
    15901595    break;
    15911596
    … …  
    15941599    {
    15951600        (yyval) = (yyvsp[(1) - (3)]) * (yyvsp[(3) - (3)]);
    1596     }
     1601    ;}
    15971602    break;
    15981603
    … …  
    16011606    {
    16021607        (yyval) = ! (yyvsp[(2) - (2)]);
    1603     }
     1608    ;}
    16041609    break;
    16051610
    … …  
    16081613    {
    16091614        (yyval) = ~ (yyvsp[(2) - (2)]);
    1610     }
     1615    ;}
    16111616    break;
    16121617
    … …  
    16151620    {
    16161621        (yyval) = - (yyvsp[(2) - (2)]);
    1617     }
     1622    ;}
    16181623    break;
    16191624
    … …  
    16221627    {
    16231628        (yyval) = + (yyvsp[(2) - (2)]);
    1624     }
     1629    ;}
    16251630    break;
    16261631
    … …  
    16291634    {
    16301635        (yyval) = (yyvsp[(2) - (3)]);
    1631     }
    1632     break;
    1633 
    1634 
     1636    ;}
     1637    break;
     1638
     1639
     1640/* Line 1267 of yacc.c.  */
    16351641
    16361642      default: break;
    … …  
    16431649
    16441650  *++yyvsp = yyval;
     1651
    16451652
    16461653  /* Now `shift' the result of the reduction.  Determine what state
    … …  
    17081715  if (yyerrstatus == 3)
    17091716    {
    1710       /* If just tried and failed to reuse lookahead token after an
     1717      /* If just tried and failed to reuse look-ahead token after an
    17111718         error, discard it.  */
    17121719
    … …  
    17251732    }
    17261733
    1727   /* Else will try to reuse lookahead token after shifting the error
     1734  /* Else will try to reuse look-ahead token after shifting the error
    17281735     token.  */
    17291736  goto yyerrlab1;
    … …  
    17821789    }
    17831790
     1791  if (yyn == YYFINAL)
     1792    YYACCEPT;
     1793
    17841794  *++yyvsp = yylval;
    17851795
    … …  
    18061816  goto yyreturn;
    18071817
    1808 #if !defined(yyoverflow) || YYERROR_VERBOSE
     1818#ifndef yyoverflow
    18091819/*-------------------------------------------------.
    18101820| yyexhaustedlab -- memory exhaustion comes here.  |
    … …  
    18171827
    18181828yyreturn:
    1819   if (yychar != YYEMPTY)
     1829  if (yychar != YYEOF && yychar != YYEMPTY)
    18201830     yydestruct ("Cleanup: discarding lookahead",
    18211831                 yytoken, &yylval, context);
Note: See TracChangeset for help on using the changeset viewer.