Changeset 2779Tweet

Timestamp:

Jun 24, 2013, 12:53:25 AM (7 years ago)

Author:

sam

Message:

base: disable exceptions in Bison-generated parsers.

Location:

trunk/src

Files:

• easymesh/easymesh-parser.y (modified) (1 diff)
• generated/easymesh-parser.cpp (modified) (33 diffs)
• generated/easymesh-parser.h (modified) (9 diffs)
• generated/easymesh-scanner.cpp (modified) (4 diffs)
• generated/location.hh (modified) (9 diffs)
• generated/lolfx-parser.cpp (modified) (24 diffs)
• generated/lolfx-parser.h (modified) (9 diffs)
• generated/position.hh (modified) (9 diffs)
• generated/stack.hh (modified) (7 diffs)
• gpu/lolfx-parser.y (modified) (1 diff)

trunk/src/easymesh/easymesh-parser.y

@@ -21 +21 @@
 #include <string>
 
+/* HACK: workaround for Bison who insists on using exceptions */
+#define try if (true)
+#define catch(...) if (false)
+#define throw (void)0
 %}
 

trunk/src/generated/easymesh-parser.cpp

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -35 +35 @@
 
 /* First part of user declarations.  */
-
-/* Line 293 of lalr1.cc  */
+/* Line 283 of lalr1.cc  */
 #line 1 "easymesh/easymesh-parser.y"
 
@@ -60 +59 @@
 #include <string>
 
-
-
-/* Line 293 of lalr1.cc  */
-#line 66 "generated/easymesh-parser.cpp"
+/* HACK: workaround for Bison who insists on using exceptions */
+#define try if (true)
+#define catch(...) if (false)
+#define throw (void)0
+
+/* Line 283 of lalr1.cc  */
+#line 68 "generated/easymesh-parser.cpp"
 
 
@@ -69 +71 @@
 
 /* User implementation prologue.  */
-
-/* Line 299 of lalr1.cc  */
-#line 66 "easymesh/easymesh-parser.y"
+/* Line 289 of lalr1.cc  */
+#line 70 "easymesh/easymesh-parser.y"
 
 #include "easymesh/easymesh-compiler.h"
@@ -78 +79 @@
 #define yylex mc.m_lexer->lex
 
-
-/* Line 299 of lalr1.cc  */
+/* Line 289 of lalr1.cc  */
 #line 83 "generated/easymesh-parser.cpp"
+
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
 
 #ifndef YY_
@@ -94 +103 @@
 #endif
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
- do                                                                    \
-   if (N)                                                              \
-     {                                                                 \
-       (Current).begin = YYRHSLOC (Rhs, 1).begin;                      \
-       (Current).end   = YYRHSLOC (Rhs, N).end;                        \
-     }                                                                 \
-   else                                                                \
-     {                                                                 \
-       (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;        \
-     }                                                                 \
- while (false)
-#endif
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
 
 /* Suppress unused-variable warnings by "using" E.  */
@@ -148 +158 @@
 
 # define YYCDEBUG if (false) std::cerr
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_REDUCE_PRINT(Rule)
-# define YY_STACK_PRINT()
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) YYUSE(Type)
+# define YY_REDUCE_PRINT(Rule)        static_cast<void>(0)
+# define YY_STACK_PRINT()             static_cast<void>(0)
 
 #endif /* !YYDEBUG */
@@ -164 +174 @@
 
 namespace lol {
-
-/* Line 382 of lalr1.cc  */
-#line 169 "generated/easymesh-parser.cpp"
+/* Line 357 of lalr1.cc  */
+#line 178 "generated/easymesh-parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
@@ -232 +241 @@
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
-    switch (yytype)
-      {
-         default:
-          break;
-      }
+    std::ostream& yyo = debug_stream ();
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
+    YYUSE (yytype);
   }
 
@@ -260 +268 @@
     YYUSE (yyvaluep);
 
-    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-    switch (yytype)
-      {
-  
-        default:
-          break;
-      }
+    if (yymsg)
+      YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+    YYUSE (yytype);
   }
 
@@ -324 +328 @@
     int yytoken = 0;
 
-    /* State.  */
+    // State.
     int yyn;
     int yylen = 0;
     int yystate = 0;
 
-    /* Error handling.  */
+    // Error handling.
     int yynerrs_ = 0;
     int yyerrstatus_ = 0;
 
     /// Semantic value of the lookahead.
-    semantic_type yylval;
+    static semantic_type yyval_default;
+    semantic_type yylval = yyval_default;
     /// Location of the lookahead.
     location_type yylloc;
@@ -347 +352 @@
     int yyresult;
 
+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
+    try
+      {
     YYCDEBUG << "Starting parse" << std::endl;
 
@@ -354 +363 @@
        location values to have been already stored, initialize these
        stacks with a primary value.  */
-    yystate_stack_ = state_stack_type (0);
-    yysemantic_stack_ = semantic_stack_type (0);
-    yylocation_stack_ = location_stack_type (0);
+    yystate_stack_.clear ();
+    yysemantic_stack_.clear ();
+    yylocation_stack_.clear ();
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yylloc);
@@ -382 +391 @@
     if (yychar == yyempty_)
       {
-        YYCDEBUG << "Reading a token: ";
-        yychar = yylex (&yylval, &yylloc);
+        YYCDEBUG << "Reading a token: ";
+        yychar = yylex (&yylval, &yylloc);
       }
-
 
     /* Convert token to internal form.  */
@@ -457 +465 @@
       yyval = yysemantic_stack_[0];
 
+    // Compute the default @$.
     {
       slice<location_type, location_stack_type> slice (yylocation_stack_, yylen);
       YYLLOC_DEFAULT (yyloc, slice, yylen);
     }
+
+    // Perform the reduction.
     YY_REDUCE_PRINT (yyn);
     switch (yyn)
       {
-          case 7:
-
-/* Line 690 of lalr1.cc  */
-#line 90 "easymesh/easymesh-parser.y"
+          case 7:
+/* Line 664 of lalr1.cc  */
+#line 94 "easymesh/easymesh-parser.y"
     { mc.m_mesh.OpenBrace(); }
     break;
 
   case 8:
-
-/* Line 690 of lalr1.cc  */
-#line 94 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 98 "easymesh/easymesh-parser.y"
     { mc.m_mesh.CloseBrace(); }
     break;
 
   case 14:
-
-/* Line 690 of lalr1.cc  */
-#line 109 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 113 "easymesh/easymesh-parser.y"
     { mc.m_mesh.SetCurColor(vec4((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
     break;
 
   case 15:
-
-/* Line 690 of lalr1.cc  */
-#line 110 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 114 "easymesh/easymesh-parser.y"
     { uint32_t x = (yysemantic_stack_[(2) - (2)].u32val);
                       vec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);
@@ -495 +502 @@
 
   case 16:
-
-/* Line 690 of lalr1.cc  */
-#line 113 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 117 "easymesh/easymesh-parser.y"
     { mc.m_mesh.SetCurColor2(vec4((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3)); }
     break;
 
   case 17:
-
-/* Line 690 of lalr1.cc  */
-#line 114 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 118 "easymesh/easymesh-parser.y"
     { uint32_t x = (yysemantic_stack_[(2) - (2)].u32val);
                       vec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);
@@ -511 +516 @@
 
   case 18:
-
-/* Line 690 of lalr1.cc  */
-#line 120 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 124 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Chamfer((yysemantic_stack_[(2) - (2)].args).f0); }
     break;
 
   case 19:
-
-/* Line 690 of lalr1.cc  */
-#line 121 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 125 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, 0, 0)); }
     break;
 
   case 20:
-
-/* Line 690 of lalr1.cc  */
-#line 122 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 126 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Translate(vec3(0, (yysemantic_stack_[(2) - (2)].args).f0, 0)); }
     break;
 
   case 21:
-
-/* Line 690 of lalr1.cc  */
-#line 123 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 127 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Translate(vec3(0, 0, (yysemantic_stack_[(2) - (2)].args).f0)); }
     break;
 
   case 22:
-
-/* Line 690 of lalr1.cc  */
-#line 124 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 128 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
     break;
 
   case 23:
-
-/* Line 690 of lalr1.cc  */
-#line 125 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 129 "easymesh/easymesh-parser.y"
     { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].args).f0); }
     break;
 
   case 24:
-
-/* Line 690 of lalr1.cc  */
-#line 126 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 130 "easymesh/easymesh-parser.y"
     { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].args).f0); }
     break;
 
   case 25:
-
-/* Line 690 of lalr1.cc  */
-#line 127 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 131 "easymesh/easymesh-parser.y"
     { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].args).f0); }
     break;
 
   case 26:
-
-/* Line 690 of lalr1.cc  */
-#line 128 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 132 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TaperX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 27:
-
-/* Line 690 of lalr1.cc  */
-#line 129 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 133 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TaperX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     break;
 
   case 28:
-
-/* Line 690 of lalr1.cc  */
-#line 130 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 134 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TaperY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 29:
-
-/* Line 690 of lalr1.cc  */
-#line 131 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 135 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TaperY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     break;
 
   case 30:
-
-/* Line 690 of lalr1.cc  */
-#line 132 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 136 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TaperZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 31:
-
-/* Line 690 of lalr1.cc  */
-#line 133 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 137 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TaperZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     break;
 
   case 32:
-
-/* Line 690 of lalr1.cc  */
-#line 134 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 138 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TwistX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 33:
-
-/* Line 690 of lalr1.cc  */
-#line 135 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 139 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TwistY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 34:
-
-/* Line 690 of lalr1.cc  */
-#line 136 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 140 "easymesh/easymesh-parser.y"
     { mc.m_mesh.TwistZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 35:
-
-/* Line 690 of lalr1.cc  */
-#line 137 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 141 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ShearX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 36:
-
-/* Line 690 of lalr1.cc  */
-#line 138 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 142 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ShearX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     break;
 
   case 37:
-
-/* Line 690 of lalr1.cc  */
-#line 139 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 143 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ShearY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 38:
-
-/* Line 690 of lalr1.cc  */
-#line 140 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 144 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ShearY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     break;
 
   case 39:
-
-/* Line 690 of lalr1.cc  */
-#line 141 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 145 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ShearZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 40:
-
-/* Line 690 of lalr1.cc  */
-#line 142 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 146 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ShearZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
     break;
 
   case 41:
-
-/* Line 690 of lalr1.cc  */
-#line 143 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 147 "easymesh/easymesh-parser.y"
     { mc.m_mesh.StretchX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 42:
-
-/* Line 690 of lalr1.cc  */
-#line 144 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 148 "easymesh/easymesh-parser.y"
     { mc.m_mesh.StretchY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 43:
-
-/* Line 690 of lalr1.cc  */
-#line 145 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 149 "easymesh/easymesh-parser.y"
     { mc.m_mesh.StretchZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 44:
-
-/* Line 690 of lalr1.cc  */
-#line 146 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 150 "easymesh/easymesh-parser.y"
     { mc.m_mesh.BendXY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 45:
-
-/* Line 690 of lalr1.cc  */
-#line 147 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 151 "easymesh/easymesh-parser.y"
     { mc.m_mesh.BendXZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 46:
-
-/* Line 690 of lalr1.cc  */
-#line 148 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 152 "easymesh/easymesh-parser.y"
     { mc.m_mesh.BendYX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 47:
-
-/* Line 690 of lalr1.cc  */
-#line 149 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 153 "easymesh/easymesh-parser.y"
     { mc.m_mesh.BendYZ((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 48:
-
-/* Line 690 of lalr1.cc  */
-#line 150 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 154 "easymesh/easymesh-parser.y"
     { mc.m_mesh.BendZX((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 49:
-
-/* Line 690 of lalr1.cc  */
-#line 151 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 155 "easymesh/easymesh-parser.y"
     { mc.m_mesh.BendZY((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 50:
-
-/* Line 690 of lalr1.cc  */
-#line 152 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 156 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, 1.0, 1.0)); }
     break;
 
   case 51:
-
-/* Line 690 of lalr1.cc  */
-#line 153 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 157 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Scale(vec3(1.0, (yysemantic_stack_[(2) - (2)].args).f0, 1.0)); }
     break;
 
   case 52:
-
-/* Line 690 of lalr1.cc  */
-#line 154 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 158 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Scale(vec3(1.0, 1.0, (yysemantic_stack_[(2) - (2)].args).f0)); }
     break;
 
   case 53:
-
-/* Line 690 of lalr1.cc  */
-#line 155 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 159 "easymesh/easymesh-parser.y"
     { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
     break;
 
   case 54:
-
-/* Line 690 of lalr1.cc  */
-#line 156 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 160 "easymesh/easymesh-parser.y"
     { mc.m_mesh.MirrorX(); }
     break;
 
   case 55:
-
-/* Line 690 of lalr1.cc  */
-#line 157 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 161 "easymesh/easymesh-parser.y"
     { mc.m_mesh.MirrorY(); }
     break;
 
   case 56:
-
-/* Line 690 of lalr1.cc  */
-#line 158 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 162 "easymesh/easymesh-parser.y"
     { mc.m_mesh.MirrorZ(); }
     break;
 
   case 57:
-
-/* Line 690 of lalr1.cc  */
-#line 159 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 163 "easymesh/easymesh-parser.y"
     { mc.m_mesh.RadialJitter((yysemantic_stack_[(2) - (2)].args).f0); }
     break;
 
   case 58:
-
-/* Line 690 of lalr1.cc  */
-#line 160 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 164 "easymesh/easymesh-parser.y"
     { mc.m_mesh.SplitTriangles((yysemantic_stack_[(2) - (2)].args).f0); }
     break;
 
   case 59:
-
-/* Line 690 of lalr1.cc  */
-#line 161 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 165 "easymesh/easymesh-parser.y"
     { mc.m_mesh.SmoothMesh((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 60:
-
-/* Line 690 of lalr1.cc  */
-#line 162 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 166 "easymesh/easymesh-parser.y"
     { mc.m_mesh.ToggleScaleWinding(); }
     break;
 
   case 61:
-
-/* Line 690 of lalr1.cc  */
-#line 163 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 167 "easymesh/easymesh-parser.y"
     { mc.m_mesh.CsgUnion(); }
     break;
 
   case 62:
-
-/* Line 690 of lalr1.cc  */
-#line 164 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 168 "easymesh/easymesh-parser.y"
     { mc.m_mesh.CsgSubstract(); }
     break;
 
   case 63:
-
-/* Line 690 of lalr1.cc  */
-#line 165 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 169 "easymesh/easymesh-parser.y"
     { mc.m_mesh.CsgSubstractLoss(); }
     break;
 
   case 64:
-
-/* Line 690 of lalr1.cc  */
-#line 166 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 170 "easymesh/easymesh-parser.y"
     { mc.m_mesh.CsgAnd(); }
     break;
 
   case 65:
-
-/* Line 690 of lalr1.cc  */
-#line 167 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 171 "easymesh/easymesh-parser.y"
     { mc.m_mesh.CsgXor(); }
     break;
 
   case 66:
-
-/* Line 690 of lalr1.cc  */
-#line 171 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 175 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendCylinder((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
                                                  (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3,
@@ -856 +812 @@
 
   case 67:
-
-/* Line 690 of lalr1.cc  */
-#line 174 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 178 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendCylinder((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
                                                  (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3,
@@ -865 +820 @@
 
   case 68:
-
-/* Line 690 of lalr1.cc  */
-#line 177 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 181 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2)); }
     break;
 
   case 69:
-
-/* Line 690 of lalr1.cc  */
-#line 178 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 182 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
                                                             (yysemantic_stack_[(2) - (2)].args).f2), (yysemantic_stack_[(2) - (2)].args).f3); }
@@ -880 +833 @@
 
   case 70:
-
-/* Line 690 of lalr1.cc  */
-#line 180 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 184 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
                                                           (yysemantic_stack_[(2) - (2)].args).f2), (yysemantic_stack_[(2) - (2)].args).f3); }
@@ -888 +840 @@
 
   case 71:
-
-/* Line 690 of lalr1.cc  */
-#line 182 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 186 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendSphere((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 72:
-
-/* Line 690 of lalr1.cc  */
-#line 183 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 187 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendCapsule((yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 73:
-
-/* Line 690 of lalr1.cc  */
-#line 184 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 188 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendTorus((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 74:
-
-/* Line 690 of lalr1.cc  */
-#line 185 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 189 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendStar((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (yysemantic_stack_[(2) - (2)].args).f2,
                                              (int)(yysemantic_stack_[(2) - (2)].args).f3, (int)(yysemantic_stack_[(2) - (2)].args).f4); }
@@ -917 +865 @@
 
   case 75:
-
-/* Line 690 of lalr1.cc  */
-#line 187 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 191 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendExpandedStar((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
                                                      (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3); }
@@ -925 +872 @@
 
   case 76:
-
-/* Line 690 of lalr1.cc  */
-#line 189 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 193 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendDisc((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1, (int)(yysemantic_stack_[(2) - (2)].args).f2); }
     break;
 
   case 77:
-
-/* Line 690 of lalr1.cc  */
-#line 190 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 194 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 78:
-
-/* Line 690 of lalr1.cc  */
-#line 191 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 195 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].args).f0, (int)(yysemantic_stack_[(2) - (2)].args).f1); }
     break;
 
   case 79:
-
-/* Line 690 of lalr1.cc  */
-#line 192 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 196 "easymesh/easymesh-parser.y"
     { mc.m_mesh.AppendCog((int)(yysemantic_stack_[(2) - (2)].args).f0, (yysemantic_stack_[(2) - (2)].args).f1,
                                  (yysemantic_stack_[(2) - (2)].args).f2, (yysemantic_stack_[(2) - (2)].args).f3, (yysemantic_stack_[(2) - (2)].args).f4, (yysemantic_stack_[(2) - (2)].args).f5, (yysemantic_stack_[(2) - (2)].args).f6,
@@ -955 +898 @@
 
   case 80:
-
-/* Line 690 of lalr1.cc  */
-#line 197 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 201 "easymesh/easymesh-parser.y"
     { (yyval.args).f0 = (yysemantic_stack_[(1) - (1)].fval); }
     break;
 
   case 81:
-
-/* Line 690 of lalr1.cc  */
-#line 198 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 202 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f1 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 82:
-
-/* Line 690 of lalr1.cc  */
-#line 199 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 203 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f2 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 83:
-
-/* Line 690 of lalr1.cc  */
-#line 200 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 204 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f3 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 84:
-
-/* Line 690 of lalr1.cc  */
-#line 201 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 205 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f4 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 85:
-
-/* Line 690 of lalr1.cc  */
-#line 202 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 206 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f5 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 86:
-
-/* Line 690 of lalr1.cc  */
-#line 203 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 207 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f6 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 87:
-
-/* Line 690 of lalr1.cc  */
-#line 204 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 208 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f7 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 88:
-
-/* Line 690 of lalr1.cc  */
-#line 205 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 209 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f8 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 89:
-
-/* Line 690 of lalr1.cc  */
-#line 206 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 210 "easymesh/easymesh-parser.y"
     { (yyval.args) = (yysemantic_stack_[(2) - (1)].args); (yyval.args).f9 = (yysemantic_stack_[(2) - (2)].fval); }
     break;
 
   case 90:
-
-/* Line 690 of lalr1.cc  */
-#line 209 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 213 "easymesh/easymesh-parser.y"
     { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); }
     break;
 
   case 91:
-
-/* Line 690 of lalr1.cc  */
-#line 210 "easymesh/easymesh-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 214 "easymesh/easymesh-parser.y"
     { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); }
     break;
 
 
-
-/* Line 690 of lalr1.cc  */
-#line 1044 "generated/easymesh-parser.cpp"
-        default:
-          break;
+/* Line 664 of lalr1.cc  */
+#line 974 "generated/easymesh-parser.cpp"
+      default:
+        break;
       }
+
     /* User semantic actions sometimes alter yychar, and that requires
        that yytoken be updated with the new translation.  We take the
@@ -1095 +1026 @@
     if (yyerrstatus_ == 3)
       {
-        /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-        if (yychar <= yyeof_)
-          {
-          /* Return failure if at end of input.  */
-          if (yychar == yyeof_)
-            YYABORT;
-          }
-        else
-          {
-            yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);
-            yychar = yyempty_;
-          }
+        /* If just tried and failed to reuse lookahead token after an
+           error, discard it.  */
+        if (yychar <= yyeof_)
+          {
+            /* Return failure if at end of input.  */
+            if (yychar == yyeof_)
+              YYABORT;
+          }
+        else
+          {
+            yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);
+            yychar = yyempty_;
+          }
       }
 
@@ -1157 +1087 @@
         /* Pop the current state because it cannot handle the error token.  */
         if (yystate_stack_.height () == 1)
-        YYABORT;
+          YYABORT;
 
         yyerror_range[1] = yylocation_stack_[0];
@@ -1205 +1135 @@
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
-    while (yystate_stack_.height () != 1)
+    while (1 < yystate_stack_.height ())
       {
-        yydestruct_ ("Cleanup: popping",
-                   yystos_[yystate_stack_[0]],
-                   &yysemantic_stack_[0],
-                   &yylocation_stack_[0]);
-        yypop_ ();
+        yydestruct_ ("Cleanup: popping",
+                     yystos_[yystate_stack_[0]],
+                     &yysemantic_stack_[0],
+                     &yylocation_stack_[0]);
+        yypop_ ();
       }
 
     return yyresult;
+    }
+    catch (...)
+      {
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
+        // Do not try to display the values of the reclaimed symbols,
+        // as their printer might throw an exception.
+        if (yychar != yyempty_)
+          {
+            /* Make sure we have latest lookahead translation.  See
+               comments at user semantic actions for why this is
+               necessary.  */
+            yytoken = yytranslate_ (yychar);
+            yydestruct_ (YY_NULL, yytoken, &yylval, &yylloc);
+          }
+
+        while (1 < yystate_stack_.height ())
+          {
+            yydestruct_ (YY_NULL,
+                         yystos_[yystate_stack_[0]],
+                         &yysemantic_stack_[0],
+                         &yylocation_stack_[0]);
+            yypop_ ();
+          }
+        throw;
+      }
   }
 
@@ -1283 +1239 @@
       }
 
-    char const* yyformat = 0;
+    char const* yyformat = YY_NULL;
     switch (yycount)
       {
@@ -1521 +1477 @@
   };
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+
   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
@@ -1544 +1500 @@
   "color_command", "transform_command", "primitive_command", "args1",
   "args2", "args3", "args4", "args5", "args6", "args7", "args8", "args9",
-  "args10", "number", 0
+  "args10", "number", YY_NULL
   };
-#endif
 
 #if YYDEBUG
@@ -1602 +1557 @@
   EasyMeshParser::yyrline_[] =
   {
-         0,    76,    76,    80,    81,    85,    86,    90,    94,    98,
-      99,   103,   104,   105,   109,   110,   113,   114,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   171,   174,   177,   178,
-     180,   182,   183,   184,   185,   187,   189,   190,   191,   192,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     209,   210
+         0,    80,    80,    84,    85,    89,    90,    94,    98,   102,
+     103,   107,   108,   109,   113,   114,   117,   118,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
+     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
+     156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   175,   178,   181,   182,
+     184,   186,   187,   188,   189,   191,   193,   194,   195,   196,
+     201,   202,   203,   204,   205,   206,   207,   208,   209,   210,
+     213,   214
   };
 
@@ -1704 +1659 @@
 
 } // lol
-
+/* Line 1135 of lalr1.cc  */
+#line 1663 "generated/easymesh-parser.cpp"
 /* Line 1136 of lalr1.cc  */
-#line 1709 "generated/easymesh-parser.cpp"
-
-
-/* Line 1138 of lalr1.cc  */
-#line 213 "easymesh/easymesh-parser.y"
+#line 217 "easymesh/easymesh-parser.y"
 
 
@@ -1719 +1671 @@
 }
 
-

trunk/src/generated/easymesh-parser.h

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Skeleton interface for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -31 +31 @@
    version 2.2 of Bison.  */
 
+/**
+ ** \file generated/easymesh-parser.h
+ ** Define the lol::parser class.
+ */
+
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 
-#ifndef PARSER_HEADER_H
-# define PARSER_HEADER_H
+#ifndef YY_LOL_GENERATED_EASYMESH_PARSER_H_INCLUDED
+# define YY_LOL_GENERATED_EASYMESH_PARSER_H_INCLUDED
 
 
@@ -48 +53 @@
 #endif
 
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
 
 namespace lol {
-
-/* Line 35 of lalr1.cc  */
-#line 68 "generated/easymesh-parser.h"
+/* Line 33 of lalr1.cc  */
+#line 59 "generated/easymesh-parser.h"
 
   /// A Bison parser.
@@ -75 +66 @@
     union semantic_type
     {
-
-/* Line 35 of lalr1.cc  */
-#line 36 "easymesh/easymesh-parser.y"
+/* Line 33 of lalr1.cc  */
+#line 40 "easymesh/easymesh-parser.y"
 
     float fval;
@@ -85 +75 @@
 
 
-
-/* Line 35 of lalr1.cc  */
-#line 90 "generated/easymesh-parser.h"
+/* Line 33 of lalr1.cc  */
+#line 79 "generated/easymesh-parser.h"
     };
 #else
@@ -189 +178 @@
 
   private:
+    /// This class is not copyable.
+    EasyMeshParser (const EasyMeshParser&);
+    EasyMeshParser& operator= (const EasyMeshParser&);
+
     /// Report a syntax error.
     /// \param loc    where the syntax error is found.
@@ -272 +265 @@
     static const unsigned char yyr1_[];
     /// For a rule, its RHS length.
-    static const unsigned char yyr2_[];
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+    static const unsigned char yyr2_[]; 
+
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
+
+
     /// For a symbol, its name in clear.
     static const char* const yytname_[];
-#endif
-
-    /// Convert the symbol name \a n to a form suitable for a diagnostic.
-    static std::string yytnamerr_ (const char *n);
-
 #if YYDEBUG
     /// A type to store symbol numbers and -1.
@@ -308 +299 @@
     /// \brief Reclaim the memory associated to a symbol.
     /// \param yymsg        Why this token is reclaimed.
+    ///                     If null, do not display the symbol, just free it.
     /// \param yytype       The symbol type.
     /// \param yyvaluep     Its semantic value.
@@ -337 +329 @@
 
 } // lol
-
-/* Line 35 of lalr1.cc  */
-#line 342 "generated/easymesh-parser.h"
-
-
-
-#endif /* ! defined PARSER_HEADER_H */
+/* Line 33 of lalr1.cc  */
+#line 333 "generated/easymesh-parser.h"
+
+
+
+#endif /* !YY_LOL_GENERATED_EASYMESH_PARSER_H_INCLUDED  */

trunk/src/generated/easymesh-scanner.cpp

@@ -1004 +1004 @@
 #line 112 "easymesh/easymesh-scanner.l"
 {
-        uint32_t tmp = std::strtol(yytext + 1, NULL, 16);
+        uint32_t tmp = std::strtol(yytext + 1, nullptr, 16);
         yylval->u32val = 0x11000000u * (tmp >> 8)
                        | 0x00110000u * ((tmp >> 4) & 0xf)
@@ -1015 +1015 @@
 #line 119 "easymesh/easymesh-scanner.l"
 {
-        uint32_t tmp = std::strtol(yytext + 1, NULL, 16);
+        uint32_t tmp = std::strtol(yytext + 1, nullptr, 16);
         yylval->u32val = 0x11000000u * (tmp >> 12)
                        | 0x00110000u * ((tmp >> 8) & 0xf)
@@ -1027 +1027 @@
 {
         yylval->u32val = 0xffu
-                       | 0x100u * (uint32_t)std::strtol(yytext + 1, NULL, 16);
+                       | 0x100u * (uint32_t)std::strtol(yytext + 1, nullptr, 16);
         return token::COLOR; }
         YY_BREAK
@@ -1034 +1034 @@
 #line 130 "easymesh/easymesh-scanner.l"
 {
-        yylval->u32val = (uint32_t)std::strtol(yytext + 1, NULL, 16);
+        yylval->u32val = (uint32_t)std::strtol(yytext + 1, nullptr, 16);
         return token::COLOR; }
         YY_BREAK

trunk/src/generated/location.hh

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Locations for Bison parsers in C++
    
-      Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -32 +32 @@
 
 /**
- ** \file location.hh
+ ** \file generated/location.hh
  ** Define the lol::location class.
  */
 
-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+#ifndef YY_LOL_GENERATED_LOCATION_HH_INCLUDED
+# define YY_LOL_GENERATED_LOCATION_HH_INCLUDED
 
-# include <iostream>
-# include <string>
 # include "position.hh"
 
 
 namespace lol {
-
-/* Line 162 of location.cc  */
-#line 50 "generated/location.hh"
+/* Line 166 of location.cc  */
+#line 47 "generated/location.hh"
 
   /// Abstract a location.
@@ -54 +51 @@
   public:
 
-    /// Construct a location.
-    location ()
-      : begin (), end ()
+    /// Construct a location from \a b to \a e.
+    location (const position& b, const position& e)
+      : begin (b)
+      , end (e)
+    {
+    }
+
+    /// Construct a 0-width location in \a p.
+    explicit location (const position& p = position ())
+      : begin (p)
+      , end (p)
+    {
+    }
+
+    /// Construct a 0-width location in \a f, \a l, \a c.
+    explicit location (std::string* f,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : begin (f, l, c)
+      , end (f, l, c)
     {
     }
@@ -62 +76 @@
 
     /// Initialization.
-    inline void initialize (std::string* fn)
+    void initialize (std::string* f = YY_NULL,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
     {
-      begin.initialize (fn);
+      begin.initialize (f, l, c);
       end = begin;
     }
@@ -72 +88 @@
   public:
     /// Reset initial location to final location.
-    inline void step ()
+    void step ()
     {
       begin = end;
@@ -78 +94 @@
 
     /// Extend the current location to the COUNT next columns.
-    inline void columns (unsigned int count = 1)
+    void columns (unsigned int count = 1)
     {
       end += count;
@@ -84 +100 @@
 
     /// Extend the current location to the COUNT next lines.
-    inline void lines (unsigned int count = 1)
+    void lines (unsigned int count = 1)
     {
       end.lines (count);
@@ -141 +157 @@
    ** Avoid duplicate information.
    */
-  inline std::ostream& operator<< (std::ostream& ostr, const location& loc)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const location& loc)
   {
     position last = loc.end - 1;
@@ -158 +176 @@
 
 } // lol
+/* Line 296 of location.cc  */
+#line 180 "generated/location.hh"
 
-/* Line 271 of location.cc  */
-#line 163 "generated/location.hh"
-
-#endif // not BISON_LOCATION_HH
+#endif /* !YY_LOL_GENERATED_LOCATION_HH_INCLUDED  */

trunk/src/generated/lolfx-parser.cpp

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -35 +35 @@
 
 /* First part of user declarations.  */
-
-/* Line 293 of lalr1.cc  */
+/* Line 283 of lalr1.cc  */
 #line 1 "gpu/lolfx-parser.y"
 
@@ -57 +56 @@
 #include <string>
 
-
-
-/* Line 293 of lalr1.cc  */
-#line 63 "generated/lolfx-parser.cpp"
+/* HACK: workaround for Bison who insists on using exceptions */
+#define try if (true)
+#define catch(...) if (false)
+#define throw (void)0
+
+/* Line 283 of lalr1.cc  */
+#line 65 "generated/lolfx-parser.cpp"
 
 
@@ -66 +68 @@
 
 /* User implementation prologue.  */
-
-/* Line 299 of lalr1.cc  */
-#line 241 "gpu/lolfx-parser.y"
+/* Line 289 of lalr1.cc  */
+#line 245 "gpu/lolfx-parser.y"
 
 #include "gpu/lolfx-compiler.h"
@@ -75 +76 @@
 #define yylex mc.m_lexer->lex
 
-
-/* Line 299 of lalr1.cc  */
+/* Line 289 of lalr1.cc  */
 #line 80 "generated/lolfx-parser.cpp"
+
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
 
 #ifndef YY_
@@ -91 +100 @@
 #endif
 
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
- do                                                                    \
-   if (N)                                                              \
-     {                                                                 \
-       (Current).begin = YYRHSLOC (Rhs, 1).begin;                      \
-       (Current).end   = YYRHSLOC (Rhs, N).end;                        \
-     }                                                                 \
-   else                                                                \
-     {                                                                 \
-       (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;        \
-     }                                                                 \
- while (false)
-#endif
+# ifndef YYLLOC_DEFAULT
+#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+    do                                                                  \
+      if (N)                                                            \
+        {                                                               \
+          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
+          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
+        }                                                               \
+    while (/*CONSTCOND*/ false)
+# endif
+
 
 /* Suppress unused-variable warnings by "using" E.  */
@@ -145 +155 @@
 
 # define YYCDEBUG if (false) std::cerr
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_REDUCE_PRINT(Rule)
-# define YY_STACK_PRINT()
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) YYUSE(Type)
+# define YY_REDUCE_PRINT(Rule)        static_cast<void>(0)
+# define YY_STACK_PRINT()             static_cast<void>(0)
 
 #endif /* !YYDEBUG */
@@ -161 +171 @@
 
 namespace lol {
-
-/* Line 382 of lalr1.cc  */
-#line 166 "generated/lolfx-parser.cpp"
+/* Line 357 of lalr1.cc  */
+#line 175 "generated/lolfx-parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
@@ -229 +238 @@
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
-    switch (yytype)
-      {
-         default:
-          break;
-      }
+    std::ostream& yyo = debug_stream ();
+    std::ostream& yyoutput = yyo;
+    YYUSE (yyoutput);
+    YYUSE (yytype);
   }
 
@@ -257 +265 @@
     YYUSE (yyvaluep);
 
-    YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-    switch (yytype)
-      {
-  
-        default:
-          break;
-      }
+    if (yymsg)
+      YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+    YYUSE (yytype);
   }
 
@@ -321 +325 @@
     int yytoken = 0;
 
-    /* State.  */
+    // State.
     int yyn;
     int yylen = 0;
     int yystate = 0;
 
-    /* Error handling.  */
+    // Error handling.
     int yynerrs_ = 0;
     int yyerrstatus_ = 0;
 
     /// Semantic value of the lookahead.
-    semantic_type yylval;
+    static semantic_type yyval_default;
+    semantic_type yylval = yyval_default;
     /// Location of the lookahead.
     location_type yylloc;
@@ -344 +349 @@
     int yyresult;
 
+    // FIXME: This shoud be completely indented.  It is not yet to
+    // avoid gratuitous conflicts when merging into the master branch.
+    try
+      {
     YYCDEBUG << "Starting parse" << std::endl;
 
@@ -351 +360 @@
        location values to have been already stored, initialize these
        stacks with a primary value.  */
-    yystate_stack_ = state_stack_type (0);
-    yysemantic_stack_ = semantic_stack_type (0);
-    yylocation_stack_ = location_stack_type (0);
+    yystate_stack_.clear ();
+    yysemantic_stack_.clear ();
+    yylocation_stack_.clear ();
     yysemantic_stack_.push (yylval);
     yylocation_stack_.push (yylloc);
@@ -379 +388 @@
     if (yychar == yyempty_)
       {
-        YYCDEBUG << "Reading a token: ";
-        yychar = yylex (&yylval, &yylloc);
+        YYCDEBUG << "Reading a token: ";
+        yychar = yylex (&yylval, &yylloc);
       }
-
 
     /* Convert token to internal form.  */
@@ -454 +462 @@
       yyval = yysemantic_stack_[0];
 
+    // Compute the default @$.
     {
       slice<location_type, location_stack_type> slice (yylocation_stack_, yylen);
       YYLLOC_DEFAULT (yyloc, slice, yylen);
     }
+
+    // Perform the reduction.
     YY_REDUCE_PRINT (yyn);
     switch (yyn)
       {
-          case 202:
-
-/* Line 690 of lalr1.cc  */
-#line 728 "gpu/lolfx-parser.y"
+          case 202:
+/* Line 664 of lalr1.cc  */
+#line 732 "gpu/lolfx-parser.y"
     { std::cout << "New tech " << std::endl; }
     break;
 
   case 203:
-
-/* Line 690 of lalr1.cc  */
-#line 736 "gpu/lolfx-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 740 "gpu/lolfx-parser.y"
     { std::cout << "New name " << (yysemantic_stack_[(1) - (1)].sval) << std::endl; }
     break;
 
   case 204:
-
-/* Line 690 of lalr1.cc  */
-#line 737 "gpu/lolfx-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 741 "gpu/lolfx-parser.y"
     { std::cout << "New name " << (yysemantic_stack_[(1) - (1)].sval) << std::endl; }
     break;
 
   case 207:
-
-/* Line 690 of lalr1.cc  */
-#line 750 "gpu/lolfx-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 754 "gpu/lolfx-parser.y"
     { std::cout << "New pass " << std::endl; }
     break;
 
   case 226:
-
-/* Line 690 of lalr1.cc  */
-#line 786 "gpu/lolfx-parser.y"
+/* Line 664 of lalr1.cc  */
+#line 790 "gpu/lolfx-parser.y"
     { std::cout << "new shader" << std::endl; }
     break;
 
 
-
-/* Line 690 of lalr1.cc  */
-#line 502 "generated/lolfx-parser.cpp"
-        default:
-          break;
+/* Line 664 of lalr1.cc  */
+#line 507 "generated/lolfx-parser.cpp"
+      default:
+        break;
       }
+
     /* User semantic actions sometimes alter yychar, and that requires
        that yytoken be updated with the new translation.  We take the
@@ -553 +559 @@
     if (yyerrstatus_ == 3)
       {
-        /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-        if (yychar <= yyeof_)
-          {
-          /* Return failure if at end of input.  */
-          if (yychar == yyeof_)
-            YYABORT;
-          }
-        else
-          {
-            yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);
-            yychar = yyempty_;
-          }
+        /* If just tried and failed to reuse lookahead token after an
+           error, discard it.  */
+        if (yychar <= yyeof_)
+          {
+            /* Return failure if at end of input.  */
+            if (yychar == yyeof_)
+              YYABORT;
+          }
+        else
+          {
+            yydestruct_ ("Error: discarding", yytoken, &yylval, &yylloc);
+            yychar = yyempty_;
+          }
       }
 
@@ -615 +620 @@
         /* Pop the current state because it cannot handle the error token.  */
         if (yystate_stack_.height () == 1)
-        YYABORT;
+          YYABORT;
 
         yyerror_range[1] = yylocation_stack_[0];
@@ -663 +668 @@
        this YYABORT or YYACCEPT.  */
     yypop_ (yylen);
-    while (yystate_stack_.height () != 1)
+    while (1 < yystate_stack_.height ())
       {
-        yydestruct_ ("Cleanup: popping",
-                   yystos_[yystate_stack_[0]],
-                   &yysemantic_stack_[0],
-                   &yylocation_stack_[0]);
-        yypop_ ();
+        yydestruct_ ("Cleanup: popping",
+                     yystos_[yystate_stack_[0]],
+                     &yysemantic_stack_[0],
+                     &yylocation_stack_[0]);
+        yypop_ ();
       }
 
     return yyresult;
+    }
+    catch (...)
+      {
+        YYCDEBUG << "Exception caught: cleaning lookahead and stack"
+                 << std::endl;
+        // Do not try to display the values of the reclaimed symbols,
+        // as their printer might throw an exception.
+        if (yychar != yyempty_)
+          {
+            /* Make sure we have latest lookahead translation.  See
+               comments at user semantic actions for why this is
+               necessary.  */
+            yytoken = yytranslate_ (yychar);
+            yydestruct_ (YY_NULL, yytoken, &yylval, &yylloc);
+          }
+
+        while (1 < yystate_stack_.height ())
+          {
+            yydestruct_ (YY_NULL,
+                         yystos_[yystate_stack_[0]],
+                         &yysemantic_stack_[0],
+                         &yylocation_stack_[0]);
+            yypop_ ();
+          }
+        throw;
+      }
   }
 
@@ -741 +772 @@
       }
 
-    char const* yyformat = 0;
+    char const* yyformat = YY_NULL;
     switch (yycount)
       {
@@ -3360 +3391 @@
   };
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+
   /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
      First, the terminals, then, starting at \a yyntokens_, nonterminals.  */
@@ -3513 +3544 @@
   "glsl_conditionopt", "glsl_for_rest_statement", "glsl_jump_statement",
   "glsl_translation_unit", "glsl_external_declaration",
-  "glsl_function_definition", 0
+  "glsl_function_definition", YY_NULL
   };
-#endif
 
 #if YYDEBUG
@@ -3712 +3742 @@
   LolFxParser::yyrline_[] =
   {
-         0,   255,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
-     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
-     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
-     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
-     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-     339,   340,   341,   342,   343,   344,   345,   508,   509,   510,
-     511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
-     521,   522,   523,   524,   525,   526,   527,   528,   529,   530,
-     531,   532,   533,   534,   535,   536,   537,   538,   539,   540,
-     541,   542,   543,   544,   545,   546,   547,   548,   549,   550,
-     551,   552,   553,   554,   555,   556,   557,   558,   559,   560,
-     561,   562,   563,   564,   565,   566,   567,   568,   569,   570,
-     571,   572,   573,   574,   575,   576,   577,   578,   579,   580,
-     581,   582,   583,   584,   585,   586,   587,   588,   589,   590,
-     591,   592,   593,   594,   595,   596,   597,   598,   599,   600,
-     601,   602,   603,   604,   605,   606,   607,   608,   609,   610,
-     611,   612,   613,   614,   615,   616,   617,   618,   619,   620,
-     621,   622,   623,   624,   625,   626,   627,   710,   714,   715,
-     719,   720,   728,   736,   737,   745,   746,   750,   754,   755,
-     760,   761,   762,   763,   764,   765,   766,   767,   768,   769,
-     770,   771,   772,   773,   774,   782,   786,   790,   791,   795,
-     803,   807,   808,   809,   810,   811,   812,   816,   817,   818,
-     819,   820,   821,   825,   829,   833,   834,   838,   839,   843,
-     844,   848,   849,   853,   857,   858,   859,   863,   864,   865,
-     866,   870,   871,   872,   873,   877,   878,   879,   880,   884,
-     885,   886,   890,   891,   892,   896,   897,   898,   899,   900,
-     904,   905,   906,   910,   911,   915,   916,   920,   921,   925,
-     926,   930,   931,   935,   936,   940,   941,   945,   946,   950,
-     951,   952,   953,   954,   955,   956,   957,   958,   959,   960,
-     964,   965,   969,   973,   974,   975,   976,   977,   978,   979,
-     980,   984,   988,   989,   993,   994,   998,  1002,  1003,  1007,
-    1008,  1012,  1013,  1014,  1015,  1019,  1020,  1023,  1025,  1026,
-    1027,  1028,  1029,  1033,  1037,  1038,  1039,  1040,  1041,  1042,
-    1043,  1047,  1048,  1049,  1050,  1051,  1052,  1053,  1054,  1058,
-    1059,  1063,  1067,  1068,  1069,  1073,  1077,  1078,  1082,  1083,
-    1087,  1091,  1092,  1093,  1094,  1095,  1096,  1097,  1098,  1102,
-    1103,  1104,  1105,  1106,  1107,  1108,  1109,  1110,  1111,  1112,
-    1113,  1117,  1118,  1122,  1123,  1124,  1127,  1128,  1132,  1133,
-    1134,  1135,  1136,  1137,  1138,  1139,  1140,  1141,  1142,  1143,
-    1144,  1148,  1149,  1150,  1154,  1155,  1159,  1160,  1164,  1165,
-    1169,  1170,  1174,  1175,  1176,  1180,  1184,  1188,  1189,  1193,
-    1194,  1195,  1196,  1197,  1198,  1199,  1203,  1204,  1208,  1209,
-    1213,  1214,  1218,  1219,  1223,  1224,  1228,  1232,  1233,  1237,
-    1238,  1242,  1245,  1247,  1251,  1252,  1256,  1257,  1258,  1262,
-    1263,  1267,  1268,  1272,  1273,  1277,  1278,  1279,  1280,  1281,
-    1285,  1286,  1290,  1291,  1295
+         0,   259,   275,   276,   277,   278,   279,   280,   281,   282,
+     283,   284,   285,   286,   287,   288,   289,   290,   291,   292,
+     293,   294,   295,   296,   297,   298,   299,   300,   301,   302,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,   317,   318,   319,   320,   321,   322,
+     323,   324,   325,   326,   327,   328,   329,   330,   331,   332,
+     333,   334,   335,   336,   337,   338,   339,   340,   341,   342,
+     343,   344,   345,   346,   347,   348,   349,   512,   513,   514,
+     515,   516,   517,   518,   519,   520,   521,   522,   523,   524,
+     525,   526,   527,   528,   529,   530,   531,   532,   533,   534,
+     535,   536,   537,   538,   539,   540,   541,   542,   543,   544,
+     545,   546,   547,   548,   549,   550,   551,   552,   553,   554,
+     555,   556,   557,   558,   559,   560,   561,   562,   563,   564,
+     565,   566,   567,   568,   569,   570,   571,   572,   573,   574,
+     575,   576,   577,   578,   579,   580,   581,   582,   583,   584,
+     585,   586,   587,   588,   589,   590,   591,   592,   593,   594,
+     595,   596,   597,   598,   599,   600,   601,   602,   603,   604,
+     605,   606,   607,   608,   609,   610,   611,   612,   613,   614,
+     615,   616,   617,   618,   619,   620,   621,   622,   623,   624,
+     625,   626,   627,   628,   629,   630,   631,   714,   718,   719,
+     723,   724,   732,   740,   741,   749,   750,   754,   758,   759,
+     764,   765,   766,   767,   768,   769,   770,   771,   772,   773,
+     774,   775,   776,   777,   778,   786,   790,   794,   795,   799,
+     807,   811,   812,   813,   814,   815,   816,   820,   821,   822,
+     823,   824,   825,   829,   833,   837,   838,   842,   843,   847,
+     848,   852,   853,   857,   861,   862,   863,   867,   868,   869,
+     870,   874,   875,   876,   877,   881,   882,   883,   884,   888,
+     889,   890,   894,   895,   896,   900,   901,   902,   903,   904,
+     908,   909,   910,   914,   915,   919,   920,   924,   925,   929,
+     930,   934,   935,   939,   940,   944,   945,   949,   950,   954,
+     955,   956,   957,   958,   959,   960,   961,   962,   963,   964,
+     968,   969,   973,   977,   978,   979,   980,   981,   982,   983,
+     984,   988,   992,   993,   997,   998,  1002,  1006,  1007,  1011,
+    1012,  1016,  1017,  1018,  1019,  1023,  1024,  1027,  1029,  1030,
+    1031,  1032,  1033,  1037,  1041,  1042,  1043,  1044,  1045,  1046,
+    1047,  1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,  1062,
+    1063,  1067,  1071,  1072,  1073,  1077,  1081,  1082,  1086,  1087,
+    1091,  1095,  1096,  1097,  1098,  1099,  1100,  1101,  1102,  1106,
+    1107,  1108,  1109,  1110,  1111,  1112,  1113,  1114,  1115,  1116,
+    1117,  1121,  1122,  1126,  1127,  1128,  1131,  1132,  1136,  1137,
+    1138,  1139,  1140,  1141,  1142,  1143,  1144,  1145,  1146,  1147,
+    1148,  1152,  1153,  1154,  1158,  1159,  1163,  1164,  1168,  1169,
+    1173,  1174,  1178,  1179,  1180,  1184,  1188,  1192,  1193,  1197,
+    1198,  1199,  1200,  1201,  1202,  1203,  1207,  1208,  1212,  1213,
+    1217,  1218,  1222,  1223,  1227,  1228,  1232,  1236,  1237,  1241,
+    1242,  1246,  1249,  1251,  1255,  1256,  1260,  1261,  1262,  1266,
+    1267,  1271,  1272,  1276,  1277,  1281,  1282,  1283,  1284,  1285,
+    1289,  1290,  1294,  1295,  1299
   };
 
@@ -3890 +3920 @@
 
 } // lol
-
+/* Line 1135 of lalr1.cc  */
+#line 3924 "generated/lolfx-parser.cpp"
 /* Line 1136 of lalr1.cc  */
-#line 3895 "generated/lolfx-parser.cpp"
-
-
-/* Line 1138 of lalr1.cc  */
-#line 1298 "gpu/lolfx-parser.y"
+#line 1302 "gpu/lolfx-parser.y"
 
 
@@ -3905 +3932 @@
 }
 
-

trunk/src/generated/lolfx-parser.h

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Skeleton interface for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -31 +31 @@
    version 2.2 of Bison.  */
 
+/**
+ ** \file generated/lolfx-parser.h
+ ** Define the lol::parser class.
+ */
+
 /* C++ LALR(1) parser skeleton written by Akim Demaille.  */
 
-#ifndef PARSER_HEADER_H
-# define PARSER_HEADER_H
+#ifndef YY_LOL_GENERATED_LOLFX_PARSER_H_INCLUDED
+# define YY_LOL_GENERATED_LOLFX_PARSER_H_INCLUDED
 
 
@@ -48 +53 @@
 #endif
 
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 1
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
-
 
 namespace lol {
-
-/* Line 35 of lalr1.cc  */
-#line 68 "generated/lolfx-parser.h"
+/* Line 33 of lalr1.cc  */
+#line 59 "generated/lolfx-parser.h"
 
   /// A Bison parser.
@@ -75 +66 @@
     union semantic_type
     {
-
-/* Line 35 of lalr1.cc  */
-#line 34 "gpu/lolfx-parser.y"
+/* Line 33 of lalr1.cc  */
+#line 38 "gpu/lolfx-parser.y"
 
     int ival;
@@ -85 +75 @@
 
 
-
-/* Line 35 of lalr1.cc  */
-#line 90 "generated/lolfx-parser.h"
+/* Line 33 of lalr1.cc  */
+#line 79 "generated/lolfx-parser.h"
     };
 #else
@@ -564 +553 @@
 
   private:
+    /// This class is not copyable.
+    LolFxParser (const LolFxParser&);
+    LolFxParser& operator= (const LolFxParser&);
+
     /// Report a syntax error.
     /// \param loc    where the syntax error is found.
@@ -647 +640 @@
     static const unsigned short int yyr1_[];
     /// For a rule, its RHS length.
-    static const unsigned char yyr2_[];
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+    static const unsigned char yyr2_[]; 
+
+    /// Convert the symbol name \a n to a form suitable for a diagnostic.
+    static std::string yytnamerr_ (const char *n);
+
+
     /// For a symbol, its name in clear.
     static const char* const yytname_[];
-#endif
-
-    /// Convert the symbol name \a n to a form suitable for a diagnostic.
-    static std::string yytnamerr_ (const char *n);
-
 #if YYDEBUG
     /// A type to store symbol numbers and -1.
@@ -683 +674 @@
     /// \brief Reclaim the memory associated to a symbol.
     /// \param yymsg        Why this token is reclaimed.
+    ///                     If null, do not display the symbol, just free it.
     /// \param yytype       The symbol type.
     /// \param yyvaluep     Its semantic value.
@@ -712 +704 @@
 
 } // lol
-
-/* Line 35 of lalr1.cc  */
-#line 717 "generated/lolfx-parser.h"
-
-
-
-#endif /* ! defined PARSER_HEADER_H */
+/* Line 33 of lalr1.cc  */
+#line 708 "generated/lolfx-parser.h"
+
+
+
+#endif /* !YY_LOL_GENERATED_LOLFX_PARSER_H_INCLUDED  */

trunk/src/generated/position.hh

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Positions for Bison parsers in C++
    
-      Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -32 +32 @@
 
 /**
- ** \file position.hh
+ ** \file generated/position.hh
  ** Define the lol::position class.
  */
 
-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+#ifndef YY_LOL_GENERATED_POSITION_HH_INCLUDED
+# define YY_LOL_GENERATED_POSITION_HH_INCLUDED
 
+# include <algorithm> // std::max
 # include <iostream>
 # include <string>
-# include <algorithm>
+
+# ifndef YY_NULL
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULL nullptr
+#  else
+#   define YY_NULL 0
+#  endif
+# endif
 
 
 namespace lol {
-
-/* Line 37 of location.cc  */
-#line 50 "generated/position.hh"
+/* Line 36 of location.cc  */
+#line 57 "generated/position.hh"
   /// Abstract a position.
   class position
@@ -54 +61 @@
 
     /// Construct a position.
-    position ()
-      : filename (0), line (1), column (1)
+    explicit position (std::string* f = YY_NULL,
+                       unsigned int l = 1u,
+                       unsigned int c = 1u)
+      : filename (f)
+      , line (l)
+      , column (c)
     {
     }
@@ -61 +72 @@
 
     /// Initialization.
-    inline void initialize (std::string* fn)
+    void initialize (std::string* fn = YY_NULL,
+                     unsigned int l = 1u,
+                     unsigned int c = 1u)
     {
       filename = fn;
-      line = 1;
-      column = 1;
+      line = l;
+      column = c;
     }
 
     /** \name Line and Column related manipulators
      ** \{ */
-  public:
     /// (line related) Advance to the COUNT next lines.
-    inline void lines (int count = 1)
+    void lines (int count = 1)
     {
-      column = 1;
+      column = 1u;
       line += count;
     }
 
     /// (column related) Advance to the COUNT next columns.
-    inline void columns (int count = 1)
+    void columns (int count = 1)
     {
       column = std::max (1u, column + count);
@@ -85 +97 @@
     /** \} */
 
-  public:
     /// File name to which this position refers.
     std::string* filename;
@@ -95 +106 @@
 
   /// Add and assign a position.
-  inline const position&
+  inline position&
   operator+= (position& res, const int width)
   {
@@ -111 +122 @@
 
   /// Add and assign a position.
-  inline const position&
+  inline position&
   operator-= (position& res, const int width)
   {
@@ -146 +157 @@
    ** \param pos a reference to the position to redirect
    */
-  inline std::ostream&
-  operator<< (std::ostream& ostr, const position& pos)
+  template <typename YYChar>
+  inline std::basic_ostream<YYChar>&
+  operator<< (std::basic_ostream<YYChar>& ostr, const position& pos)
   {
     if (pos.filename)
@@ -156 +168 @@
 
 } // lol
-
-/* Line 144 of location.cc  */
-#line 161 "generated/position.hh"
-#endif // not BISON_POSITION_HH
+/* Line 148 of location.cc  */
+#line 172 "generated/position.hh"
+#endif /* !YY_LOL_GENERATED_POSITION_HH_INCLUDED  */

trunk/src/generated/stack.hh

@@ -1 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
+/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
 
 /* Stack handling for Bison parsers in C++
    
-      Copyright (C) 2002-2011 Free Software Foundation, Inc.
+      Copyright (C) 2002-2013 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
@@ -31 +31 @@
    version 2.2 of Bison.  */
 
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
+/**
+ ** \file generated/stack.hh
+ ** Define the lol::stack class.
+ */
 
-#include <deque>
+#ifndef YY_LOL_GENERATED_STACK_HH_INCLUDED
+# define YY_LOL_GENERATED_STACK_HH_INCLUDED
+
+# include <deque>
 
 
 namespace lol {
-
-/* Line 1149 of lalr1.cc  */
-#line 43 "generated/stack.hh"
+/* Line 34 of stack.hh  */
+#line 47 "generated/stack.hh"
   template <class T, class S = std::deque<T> >
   class stack
   {
   public:
-
     // Hide our reversed order.
     typedef typename S::reverse_iterator iterator;
@@ -84 +87 @@
     {
       for (; n; --n)
-        seq_.pop_front ();
+        seq_.pop_front ();
+    }
+
+    void
+    clear ()
+    {
+      seq_.clear ();
     }
 
@@ -98 +107 @@
 
   private:
-
+    stack (const stack&);
+    stack& operator= (const stack&);
     S seq_;
   };
@@ -107 +117 @@
   {
   public:
-
-    slice (const S& stack,
-           unsigned int range) : stack_ (stack),
-                                 range_ (range)
+    slice (const S& stack, unsigned int range)
+      : stack_ (stack)
+      , range_ (range)
     {
     }
@@ -122 +131 @@
 
   private:
-
     const S& stack_;
     unsigned int range_;
@@ -128 +136 @@
 
 } // lol
+/* Line 124 of stack.hh  */
+#line 140 "generated/stack.hh"
 
-/* Line 1235 of lalr1.cc  */
-#line 133 "generated/stack.hh"
-
-#endif // not BISON_STACK_HH[]dnl
-
+#endif /* !YY_LOL_GENERATED_STACK_HH_INCLUDED  */

trunk/src/gpu/lolfx-parser.y

@@ -18 +18 @@
 #include <string>
 
+/* HACK: workaround for Bison who insists on using exceptions */
+#define try if (true)
+#define catch(...) if (false)
+#define throw (void)0
 %}