Ignore:
Timestamp:
Feb 2, 2013, 4:25:31 PM (7 years ago)
Author:
sam
Message:

build: fix all vector/scalar type mismatches such as "vec2 * double"
instead of "vec2 * float".

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/generated/easymesh-parser.h

    r2226 r2318  
    1 /* A Bison parser, made by GNU Bison 2.4.2.  */
     1/* A Bison parser, made by GNU Bison 2.5.  */
    22
    33/* Skeleton interface for Bison LALR(1) parsers in C++
    44   
    5       Copyright (C) 2002-2010 Free Software Foundation, Inc.
     5      Copyright (C) 2002-2011 Free Software Foundation, Inc.
    66   
    77   This program is free software: you can redistribute it and/or modify
     
    4141#include <iostream>
    4242#include "stack.hh"
    43 
    44 
    45 namespace lol {
    46 
    47 /* Line 34 of lalr1.cc  */
    48 #line 49 "generated/easymesh-parser.h"
    49   class position;
    50   class location;
    51 
    52 } // lol
    53 
    54 /* Line 34 of lalr1.cc  */
    55 #line 56 "generated/easymesh-parser.h"
    56 
    5743#include "location.hh"
    5844
     
    7561#endif
    7662
    77 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    78    If N is 0, then set CURRENT to the empty location which ends
    79    the previous symbol: RHS[0] (always defined).  */
    80 
    81 #ifndef YYLLOC_DEFAULT
    82 # define YYLLOC_DEFAULT(Current, Rhs, N)                \
    83 do {                                                    \
    84   if (N)                                                \
    85     {                                                   \
    86       (Current).begin = (Rhs)[1].begin;                 \
    87       (Current).end   = (Rhs)[N].end;                   \
    88     }                                                   \
    89   else                                                  \
    90     {                                                   \
    91       (Current).begin = (Current).end = (Rhs)[0].end;   \
    92     }                                                   \
    93 } while (false)
    94 #endif
    95 
    9663
    9764namespace lol {
    9865
    99 /* Line 34 of lalr1.cc  */
    100 #line 101 "generated/easymesh-parser.h"
     66/* Line 35 of lalr1.cc  */
     67#line 68 "generated/easymesh-parser.h"
    10168
    10269  /// A Bison parser.
     
    10976    {
    11077
    111 /* Line 34 of lalr1.cc  */
     78/* Line 35 of lalr1.cc  */
    11279#line 36 "easymesh/easymesh-parser.y"
    11380
     
    11986
    12087
    121 /* Line 34 of lalr1.cc  */
    122 #line 123 "generated/easymesh-parser.h"
     88/* Line 35 of lalr1.cc  */
     89#line 90 "generated/easymesh-parser.h"
    12390    };
    12491#else
     
    153120     T_SCALE = 276,
    154121     T_TOGGLESCALEWINDING = 277,
    155      T_CSGUNION = 278,
    156      T_CSGSUBSTRACT = 279,
    157      T_CSGAND = 280,
    158      T_CSGXOR = 281,
    159      T_CHAMFER = 282,
    160      T_CYLINDER = 283,
    161      T_BOX = 284,
    162      T_SMOOTHCHAMFBOX = 285,
    163      T_FLATCHAMFBOX = 286,
    164      T_SPHERE = 287,
    165      T_CAPSULE = 288,
    166      T_STAR = 289,
    167      T_EXPANDEDSTAR = 290,
    168      T_DISC = 291,
    169      T_TRIANGLE = 292,
    170      T_QUAD = 293,
    171      T_COG = 294,
    172      T_TORUS = 295,
    173      T_ERROR = 296,
    174      NUMBER = 297,
    175      COLOR = 298
     122     T_RADIALJITTER = 278,
     123     T_CSGUNION = 279,
     124     T_CSGSUBSTRACT = 280,
     125     T_CSGAND = 281,
     126     T_CSGXOR = 282,
     127     T_CHAMFER = 283,
     128     T_CYLINDER = 284,
     129     T_BOX = 285,
     130     T_SMOOTHCHAMFBOX = 286,
     131     T_FLATCHAMFBOX = 287,
     132     T_SPHERE = 288,
     133     T_CAPSULE = 289,
     134     T_STAR = 290,
     135     T_EXPANDEDSTAR = 291,
     136     T_DISC = 292,
     137     T_TRIANGLE = 293,
     138     T_QUAD = 294,
     139     T_COG = 295,
     140     T_TORUS = 296,
     141     T_ERROR = 297,
     142     NUMBER = 298,
     143     COLOR = 299
    176144   };
    177145
     
    247215    location_stack_type yylocation_stack_;
    248216
     217    /// Whether the given \c yypact_ value indicates a defaulted state.
     218    /// \param yyvalue   the value to check
     219    static bool yy_pact_value_is_default_ (int yyvalue);
     220
     221    /// Whether the given \c yytable_ value indicates a syntax error.
     222    /// \param yyvalue   the value to check
     223    static bool yy_table_value_is_error_ (int yyvalue);
     224
    249225    /// Internal symbol numbers.
    250226    typedef unsigned char token_number_type;
     
    254230    static const signed char yypact_ninf_;
    255231
    256     /// For a state, default rule to reduce.
     232    /// For a state, default reduction number.
    257233    /// Unless\a  yytable_ specifies something else to do.
    258234    /// Zero means the default is an error.
     
    285261#endif
    286262
    287 #if YYERROR_VERBOSE
    288263    /// Convert the symbol name \a n to a form suitable for a diagnostic.
    289     virtual std::string yytnamerr_ (const char *n);
    290 #endif
     264    static std::string yytnamerr_ (const char *n);
    291265
    292266#if YYDEBUG
     
    346320} // lol
    347321
    348 /* Line 34 of lalr1.cc  */
    349 #line 350 "generated/easymesh-parser.h"
     322/* Line 35 of lalr1.cc  */
     323#line 324 "generated/easymesh-parser.h"
    350324
    351325
Note: See TracChangeset for help on using the changeset viewer.