From 6e996f41aa7670c9150f0b8a9ebb7140d96fbbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20=E2=80=98Touky=E2=80=99=20Huet?= Date: Sat, 5 Oct 2013 10:58:35 +0000 Subject: [PATCH] EZMesh : Added SCVert command --- src/easymesh/easymesh-parser.y | 7 +- src/easymesh/easymesh-scanner.l | 5 +- src/generated/easymesh-parser.cpp | 1112 ++++++++++++++-------------- src/generated/easymesh-parser.h | 127 ++-- src/generated/easymesh-scanner.cpp | 589 +++++++-------- test/data/mesh-buffer.txt | 13 +- test/easymeshdictionnary.js | 5 +- 7 files changed, 955 insertions(+), 903 deletions(-) diff --git a/src/easymesh/easymesh-parser.y b/src/easymesh/easymesh-parser.y index 3d55335a..e0e051f4 100644 --- a/src/easymesh/easymesh-parser.y +++ b/src/easymesh/easymesh-parser.y @@ -45,7 +45,7 @@ %start mesh_description -%token T_COLOR T_BCOLOR +%token T_COLOR T_BCOLOR T_VCOLOR %token T_TRANSLATEX T_ROTATEX T_TAPERX T_TWISTX T_SHEARX T_STRETCHX T_BENDXY T_BENDXZ T_SCALEX T_MIRRORX %token T_TRANSLATEY T_ROTATEY T_TAPERY T_TWISTY T_SHEARY T_STRETCHY T_BENDYX T_BENDYZ T_SCALEY T_MIRRORY @@ -147,6 +147,11 @@ color_command: | T_BCOLOR COLOR { uint32_t x = $2; ivec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff); mc.m_mesh.SetCurColor2(vec4(v) * (1.f / 255.f)); } + | T_VCOLOR fv fv fv fv { mc.m_mesh.SetVertColor(vec4($2, $3, $4, $5)); } + | T_VCOLOR v4 { mc.m_mesh.SetVertColor(vec4($2[0], $2[1], $2[2], $2[3])); } + | T_VCOLOR COLOR { uint32_t x = $2; + ivec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff); + mc.m_mesh.SetVertColor(vec4(v) * (1.f / 255.f)); } ; transform_command: diff --git a/src/easymesh/easymesh-scanner.l b/src/easymesh/easymesh-scanner.l index 3073c40e..cc373a61 100644 --- a/src/easymesh/easymesh-scanner.l +++ b/src/easymesh/easymesh-scanner.l @@ -48,14 +48,15 @@ typedef lol::EasyMeshParser::token_type token_type; %} (csgu|csgunion) { return token::T_CSGUNION; } -(csgs|CsgSub) { return token::T_CSGSUBSTRACT; } -(csgsl|CsgSubL) { return token::T_CSGSUBSTRACTLOSS; } +(csgs|CsgSub) { return token::T_CSGSUBSTRACT; } +(csgsl|CsgSubL) { return token::T_CSGSUBSTRACTLOSS; } (csga|csgand) { return token::T_CSGAND; } (csgx|csgxor) { return token::T_CSGXOR; } (tsw|scalewinding) { return token::T_TOGGLESCALEWINDING; } (sc|setcolor) { return token::T_COLOR; } (scb|setbcolor) { return token::T_BCOLOR; } +(scv|setcolorvert) { return token::T_VCOLOR; } (tx|translatex) { return token::T_TRANSLATEX; } (ty|translatey) { return token::T_TRANSLATEY; } diff --git a/src/generated/easymesh-parser.cpp b/src/generated/easymesh-parser.cpp index 25e12a74..dcc01bf4 100644 --- a/src/generated/easymesh-parser.cpp +++ b/src/generated/easymesh-parser.cpp @@ -542,798 +542,821 @@ namespace lol { case 28: /* Line 677 of lalr1.cc */ -#line 153 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].fval), 0.f, 0.f)); } +#line 150 "easymesh/easymesh-parser.y" + { mc.m_mesh.SetVertColor(vec4((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } break; case 29: /* Line 677 of lalr1.cc */ -#line 154 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3(0.f, (yysemantic_stack_[(2) - (2)].fval), 0.f)); } +#line 151 "easymesh/easymesh-parser.y" + { mc.m_mesh.SetVertColor(vec4((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2], (yysemantic_stack_[(2) - (2)].vval)[3])); } break; case 30: /* Line 677 of lalr1.cc */ -#line 155 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3(0.f, 0.f, (yysemantic_stack_[(2) - (2)].fval))); } +#line 152 "easymesh/easymesh-parser.y" + { uint32_t x = (yysemantic_stack_[(2) - (2)].u32val); + ivec4 v(x >> 24, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff); + mc.m_mesh.SetVertColor(vec4(v) * (1.f / 255.f)); } break; case 31: /* Line 677 of lalr1.cc */ -#line 156 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval))); } +#line 158 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].fval), 0.f, 0.f)); } break; case 32: /* Line 677 of lalr1.cc */ -#line 157 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2])); } +#line 159 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3(0.f, (yysemantic_stack_[(2) - (2)].fval), 0.f)); } break; case 33: /* Line 677 of lalr1.cc */ -#line 158 "easymesh/easymesh-parser.y" - { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].fval)); } +#line 160 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3(0.f, 0.f, (yysemantic_stack_[(2) - (2)].fval))); } break; case 34: /* Line 677 of lalr1.cc */ -#line 159 "easymesh/easymesh-parser.y" - { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].fval)); } +#line 161 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval))); } break; case 35: /* Line 677 of lalr1.cc */ -#line 160 "easymesh/easymesh-parser.y" - { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 162 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2])); } break; case 36: /* Line 677 of lalr1.cc */ -#line 161 "easymesh/easymesh-parser.y" - { mc.m_mesh.Rotate((yysemantic_stack_[(5) - (2)].fval), vec3((yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } +#line 163 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].fval)); } break; case 37: /* Line 677 of lalr1.cc */ -#line 162 "easymesh/easymesh-parser.y" - { mc.m_mesh.Rotate((yysemantic_stack_[(3) - (2)].fval), vec3((yysemantic_stack_[(3) - (3)].vval)[0], (yysemantic_stack_[(3) - (3)].vval)[1], (yysemantic_stack_[(3) - (3)].vval)[2])); } +#line 164 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].fval)); } break; case 38: /* Line 677 of lalr1.cc */ -#line 163 "easymesh/easymesh-parser.y" - { mc.m_mesh.RadialJitter((yysemantic_stack_[(2) - (2)].fval)); } +#line 165 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 39: /* Line 677 of lalr1.cc */ -#line 164 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperX((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 166 "easymesh/easymesh-parser.y" + { mc.m_mesh.Rotate((yysemantic_stack_[(5) - (2)].fval), vec3((yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } break; case 40: /* Line 677 of lalr1.cc */ -#line 165 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 167 "easymesh/easymesh-parser.y" + { mc.m_mesh.Rotate((yysemantic_stack_[(3) - (2)].fval), vec3((yysemantic_stack_[(3) - (3)].vval)[0], (yysemantic_stack_[(3) - (3)].vval)[1], (yysemantic_stack_[(3) - (3)].vval)[2])); } break; case 41: /* Line 677 of lalr1.cc */ -#line 166 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 168 "easymesh/easymesh-parser.y" + { mc.m_mesh.RadialJitter((yysemantic_stack_[(2) - (2)].fval)); } break; case 42: /* Line 677 of lalr1.cc */ -#line 167 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperY((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 169 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperX((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 43: /* Line 677 of lalr1.cc */ -#line 168 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 170 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 44: /* Line 677 of lalr1.cc */ -#line 169 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 171 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 45: /* Line 677 of lalr1.cc */ -#line 170 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperZ((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 172 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperY((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 46: /* Line 677 of lalr1.cc */ -#line 171 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 173 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 47: /* Line 677 of lalr1.cc */ -#line 172 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 174 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 48: /* Line 677 of lalr1.cc */ -#line 173 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 175 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperZ((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 49: /* Line 677 of lalr1.cc */ -#line 174 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistX((yysemantic_stack_[(2) - (2)].fval)); } +#line 176 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 50: /* Line 677 of lalr1.cc */ -#line 175 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 177 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 51: /* Line 677 of lalr1.cc */ -#line 176 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistY((yysemantic_stack_[(2) - (2)].fval)); } +#line 178 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 52: /* Line 677 of lalr1.cc */ -#line 177 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 179 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistX((yysemantic_stack_[(2) - (2)].fval)); } break; case 53: /* Line 677 of lalr1.cc */ -#line 178 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 180 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 54: /* Line 677 of lalr1.cc */ -#line 179 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearX((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 181 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistY((yysemantic_stack_[(2) - (2)].fval)); } break; case 55: /* Line 677 of lalr1.cc */ -#line 180 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 182 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 56: /* Line 677 of lalr1.cc */ -#line 181 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 183 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 57: /* Line 677 of lalr1.cc */ -#line 182 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearY((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 184 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearX((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 58: /* Line 677 of lalr1.cc */ -#line 183 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 185 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 59: /* Line 677 of lalr1.cc */ -#line 184 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 186 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 60: /* Line 677 of lalr1.cc */ -#line 185 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearZ((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 187 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearY((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 61: /* Line 677 of lalr1.cc */ -#line 186 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 188 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 62: /* Line 677 of lalr1.cc */ -#line 187 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 189 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 63: /* Line 677 of lalr1.cc */ -#line 188 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 190 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearZ((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 64: /* Line 677 of lalr1.cc */ -#line 189 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 191 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 65: /* Line 677 of lalr1.cc */ -#line 190 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 192 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 66: /* Line 677 of lalr1.cc */ -#line 191 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 193 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 67: /* Line 677 of lalr1.cc */ -#line 192 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 194 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 68: /* Line 677 of lalr1.cc */ -#line 193 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 195 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 69: /* Line 677 of lalr1.cc */ -#line 194 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 196 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 70: /* Line 677 of lalr1.cc */ -#line 195 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXY((yysemantic_stack_[(2) - (2)].fval)); } +#line 197 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 71: /* Line 677 of lalr1.cc */ -#line 196 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 198 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 72: /* Line 677 of lalr1.cc */ -#line 197 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 199 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 73: /* Line 677 of lalr1.cc */ -#line 198 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 200 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXY((yysemantic_stack_[(2) - (2)].fval)); } break; case 74: /* Line 677 of lalr1.cc */ -#line 199 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYX((yysemantic_stack_[(2) - (2)].fval)); } +#line 201 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 75: /* Line 677 of lalr1.cc */ -#line 200 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 202 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 76: /* Line 677 of lalr1.cc */ -#line 201 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 203 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 77: /* Line 677 of lalr1.cc */ -#line 202 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 204 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYX((yysemantic_stack_[(2) - (2)].fval)); } break; case 78: /* Line 677 of lalr1.cc */ -#line 203 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZX((yysemantic_stack_[(2) - (2)].fval)); } +#line 205 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 79: /* Line 677 of lalr1.cc */ -#line 204 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 206 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 80: /* Line 677 of lalr1.cc */ -#line 205 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZY((yysemantic_stack_[(2) - (2)].fval)); } +#line 207 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 81: /* Line 677 of lalr1.cc */ -#line 206 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].fval), 1.f, 1.f)); } +#line 208 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZX((yysemantic_stack_[(2) - (2)].fval)); } break; case 82: /* Line 677 of lalr1.cc */ -#line 207 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3(1.f, (yysemantic_stack_[(2) - (2)].fval), 1.f)); } +#line 209 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 83: /* Line 677 of lalr1.cc */ -#line 208 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3(1.f, 1.f, (yysemantic_stack_[(2) - (2)].fval))); } +#line 210 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZY((yysemantic_stack_[(2) - (2)].fval)); } break; case 84: /* Line 677 of lalr1.cc */ -#line 209 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval))); } +#line 211 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].fval), 1.f, 1.f)); } break; case 85: /* Line 677 of lalr1.cc */ -#line 210 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2])); } +#line 212 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3(1.f, (yysemantic_stack_[(2) - (2)].fval), 1.f)); } break; case 86: /* Line 677 of lalr1.cc */ -#line 211 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval))); } +#line 213 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3(1.f, 1.f, (yysemantic_stack_[(2) - (2)].fval))); } break; case 87: /* Line 677 of lalr1.cc */ -#line 212 "easymesh/easymesh-parser.y" - { mc.m_mesh.MirrorX(); } +#line 214 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval))); } break; case 88: /* Line 677 of lalr1.cc */ -#line 213 "easymesh/easymesh-parser.y" - { mc.m_mesh.MirrorY(); } +#line 215 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2])); } break; case 89: /* Line 677 of lalr1.cc */ -#line 214 "easymesh/easymesh-parser.y" - { mc.m_mesh.MirrorZ(); } +#line 216 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval))); } break; case 90: /* Line 677 of lalr1.cc */ -#line 215 "easymesh/easymesh-parser.y" - { mc.m_mesh.Chamfer((yysemantic_stack_[(2) - (2)].fval)); } +#line 217 "easymesh/easymesh-parser.y" + { mc.m_mesh.MirrorX(); } break; case 91: /* Line 677 of lalr1.cc */ -#line 216 "easymesh/easymesh-parser.y" - { mc.m_mesh.SplitTriangles((yysemantic_stack_[(2) - (2)].ival)); } +#line 218 "easymesh/easymesh-parser.y" + { mc.m_mesh.MirrorY(); } break; case 92: /* Line 677 of lalr1.cc */ -#line 217 "easymesh/easymesh-parser.y" - { mc.m_mesh.SmoothMesh((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].ival), (yysemantic_stack_[(4) - (4)].ival)); } +#line 219 "easymesh/easymesh-parser.y" + { mc.m_mesh.MirrorZ(); } break; case 93: /* Line 677 of lalr1.cc */ -#line 218 "easymesh/easymesh-parser.y" - { mc.m_mesh.ToggleScaleWinding(); } +#line 220 "easymesh/easymesh-parser.y" + { mc.m_mesh.Chamfer((yysemantic_stack_[(2) - (2)].fval)); } break; case 94: /* Line 677 of lalr1.cc */ -#line 222 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCylinder((yysemantic_stack_[(8) - (2)].ival), (yysemantic_stack_[(8) - (3)].fval), (yysemantic_stack_[(8) - (4)].fval), (yysemantic_stack_[(8) - (5)].fval), (yysemantic_stack_[(8) - (6)].bval), (yysemantic_stack_[(8) - (7)].bval), (yysemantic_stack_[(8) - (8)].bval)); } +#line 221 "easymesh/easymesh-parser.y" + { mc.m_mesh.SplitTriangles((yysemantic_stack_[(2) - (2)].ival)); } break; case 95: /* Line 677 of lalr1.cc */ -#line 223 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCylinder((yysemantic_stack_[(7) - (2)].ival), (yysemantic_stack_[(7) - (3)].fval), (yysemantic_stack_[(7) - (4)].fval), (yysemantic_stack_[(7) - (5)].fval), (yysemantic_stack_[(7) - (6)].bval), (yysemantic_stack_[(7) - (7)].bval)); } +#line 222 "easymesh/easymesh-parser.y" + { mc.m_mesh.SmoothMesh((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].ival), (yysemantic_stack_[(4) - (4)].ival)); } break; case 96: /* Line 677 of lalr1.cc */ -#line 224 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCylinder((yysemantic_stack_[(6) - (2)].ival), (yysemantic_stack_[(6) - (3)].fval), (yysemantic_stack_[(6) - (4)].fval), (yysemantic_stack_[(6) - (5)].fval), (yysemantic_stack_[(6) - (6)].bval)); } +#line 223 "easymesh/easymesh-parser.y" + { mc.m_mesh.ToggleScaleWinding(); } break; case 97: /* Line 677 of lalr1.cc */ -#line 225 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCylinder((yysemantic_stack_[(5) - (2)].ival), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval)); } +#line 227 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCylinder((yysemantic_stack_[(8) - (2)].ival), (yysemantic_stack_[(8) - (3)].fval), (yysemantic_stack_[(8) - (4)].fval), (yysemantic_stack_[(8) - (5)].fval), (yysemantic_stack_[(8) - (6)].bval), (yysemantic_stack_[(8) - (7)].bval), (yysemantic_stack_[(8) - (8)].bval)); } break; case 98: /* Line 677 of lalr1.cc */ -#line 226 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSphere((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } +#line 228 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCylinder((yysemantic_stack_[(7) - (2)].ival), (yysemantic_stack_[(7) - (3)].fval), (yysemantic_stack_[(7) - (4)].fval), (yysemantic_stack_[(7) - (5)].fval), (yysemantic_stack_[(7) - (6)].bval), (yysemantic_stack_[(7) - (7)].bval)); } break; case 99: /* Line 677 of lalr1.cc */ -#line 227 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCapsule((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 229 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCylinder((yysemantic_stack_[(6) - (2)].ival), (yysemantic_stack_[(6) - (3)].fval), (yysemantic_stack_[(6) - (4)].fval), (yysemantic_stack_[(6) - (5)].fval), (yysemantic_stack_[(6) - (6)].bval)); } break; case 100: /* Line 677 of lalr1.cc */ -#line 228 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendTorus((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 230 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCylinder((yysemantic_stack_[(5) - (2)].ival), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval)); } break; case 101: /* Line 677 of lalr1.cc */ -#line 229 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval)), (yysemantic_stack_[(5) - (5)].fval)); } +#line 231 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSphere((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } break; case 102: /* Line 677 of lalr1.cc */ -#line 230 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval))); } +#line 232 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCapsule((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 103: /* Line 677 of lalr1.cc */ -#line 231 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval))); } +#line 233 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendTorus((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 104: /* Line 677 of lalr1.cc */ -#line 232 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(3) - (2)].vval)[0], (yysemantic_stack_[(3) - (2)].vval)[1], (yysemantic_stack_[(3) - (2)].vval)[2]), (yysemantic_stack_[(3) - (3)].fval)); } +#line 234 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval)), (yysemantic_stack_[(5) - (5)].fval)); } break; case 105: /* Line 677 of lalr1.cc */ -#line 233 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2])); } +#line 235 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval))); } break; case 106: /* Line 677 of lalr1.cc */ -#line 234 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval)), (yysemantic_stack_[(5) - (5)].fval)); } +#line 236 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval), (yysemantic_stack_[(2) - (2)].fval))); } break; case 107: /* Line 677 of lalr1.cc */ -#line 235 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval)), (yysemantic_stack_[(3) - (3)].fval)); } +#line 237 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(3) - (2)].vval)[0], (yysemantic_stack_[(3) - (2)].vval)[1], (yysemantic_stack_[(3) - (2)].vval)[2]), (yysemantic_stack_[(3) - (3)].fval)); } break; case 108: /* Line 677 of lalr1.cc */ -#line 236 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(3) - (2)].vval)[0], (yysemantic_stack_[(3) - (2)].vval)[1], (yysemantic_stack_[(3) - (2)].vval)[2]), (yysemantic_stack_[(3) - (3)].fval)); } +#line 238 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendBox(vec3((yysemantic_stack_[(2) - (2)].vval)[0], (yysemantic_stack_[(2) - (2)].vval)[1], (yysemantic_stack_[(2) - (2)].vval)[2])); } break; case 109: /* Line 677 of lalr1.cc */ -#line 237 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval)), (yysemantic_stack_[(5) - (5)].fval)); } +#line 239 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval)), (yysemantic_stack_[(5) - (5)].fval)); } break; case 110: /* Line 677 of lalr1.cc */ -#line 238 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval)), (yysemantic_stack_[(3) - (3)].fval)); } +#line 240 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval)), (yysemantic_stack_[(3) - (3)].fval)); } break; case 111: /* Line 677 of lalr1.cc */ -#line 239 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(3) - (2)].vval)[0], (yysemantic_stack_[(3) - (2)].vval)[1], (yysemantic_stack_[(3) - (2)].vval)[2]), (yysemantic_stack_[(3) - (3)].fval)); } +#line 241 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSmoothChamfBox(vec3((yysemantic_stack_[(3) - (2)].vval)[0], (yysemantic_stack_[(3) - (2)].vval)[1], (yysemantic_stack_[(3) - (2)].vval)[2]), (yysemantic_stack_[(3) - (3)].fval)); } break; case 112: /* Line 677 of lalr1.cc */ -#line 240 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendStar((yysemantic_stack_[(6) - (2)].ival), (yysemantic_stack_[(6) - (3)].fval), (yysemantic_stack_[(6) - (4)].fval), (yysemantic_stack_[(6) - (5)].bval), (yysemantic_stack_[(6) - (6)].bval)); } +#line 242 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval)), (yysemantic_stack_[(5) - (5)].fval)); } break; case 113: /* Line 677 of lalr1.cc */ -#line 241 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendStar((yysemantic_stack_[(5) - (2)].ival), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } +#line 243 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (2)].fval)), (yysemantic_stack_[(3) - (3)].fval)); } break; case 114: /* Line 677 of lalr1.cc */ -#line 242 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendStar((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 244 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendFlatChamfBox(vec3((yysemantic_stack_[(3) - (2)].vval)[0], (yysemantic_stack_[(3) - (2)].vval)[1], (yysemantic_stack_[(3) - (2)].vval)[2]), (yysemantic_stack_[(3) - (3)].fval)); } break; case 115: /* Line 677 of lalr1.cc */ -#line 243 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendExpandedStar((yysemantic_stack_[(5) - (2)].ival), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval)); } +#line 245 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendStar((yysemantic_stack_[(6) - (2)].ival), (yysemantic_stack_[(6) - (3)].fval), (yysemantic_stack_[(6) - (4)].fval), (yysemantic_stack_[(6) - (5)].bval), (yysemantic_stack_[(6) - (6)].bval)); } break; case 116: /* Line 677 of lalr1.cc */ -#line 244 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendExpandedStar((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 246 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendStar((yysemantic_stack_[(5) - (2)].ival), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].bval)); } break; case 117: /* Line 677 of lalr1.cc */ -#line 245 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendDisc((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].bval)); } +#line 247 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendStar((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 118: /* Line 677 of lalr1.cc */ -#line 246 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendDisc((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } +#line 248 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendExpandedStar((yysemantic_stack_[(5) - (2)].ival), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval)); } break; case 119: /* Line 677 of lalr1.cc */ -#line 247 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } +#line 249 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendExpandedStar((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } break; case 120: /* Line 677 of lalr1.cc */ -#line 248 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].fval)); } +#line 250 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendDisc((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].bval)); } break; case 121: /* Line 677 of lalr1.cc */ -#line 249 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } +#line 251 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendDisc((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } break; case 122: /* Line 677 of lalr1.cc */ -#line 250 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].fval)); } +#line 252 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } break; case 123: /* Line 677 of lalr1.cc */ -#line 251 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCog((yysemantic_stack_[(11) - (2)].ival), (yysemantic_stack_[(11) - (3)].fval), (yysemantic_stack_[(11) - (4)].fval), (yysemantic_stack_[(11) - (5)].fval), (yysemantic_stack_[(11) - (6)].fval), (yysemantic_stack_[(11) - (7)].fval), (yysemantic_stack_[(11) - (8)].fval), (yysemantic_stack_[(11) - (9)].fval), (yysemantic_stack_[(11) - (10)].fval), (yysemantic_stack_[(11) - (11)].bval)); } +#line 253 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].fval)); } break; case 124: /* Line 677 of lalr1.cc */ -#line 252 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCog((yysemantic_stack_[(10) - (2)].ival), (yysemantic_stack_[(10) - (3)].fval), (yysemantic_stack_[(10) - (4)].fval), (yysemantic_stack_[(10) - (5)].fval), (yysemantic_stack_[(10) - (6)].fval), (yysemantic_stack_[(10) - (7)].fval), (yysemantic_stack_[(10) - (8)].fval), (yysemantic_stack_[(10) - (9)].fval), (yysemantic_stack_[(10) - (10)].fval)); } +#line 254 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } break; case 125: /* Line 677 of lalr1.cc */ -#line 253 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCog((yysemantic_stack_[(9) - (2)].ival), (yysemantic_stack_[(9) - (3)].fval), (yysemantic_stack_[(9) - (4)].fval), (yysemantic_stack_[(9) - (5)].fval), (yysemantic_stack_[(9) - (6)].fval), (yysemantic_stack_[(9) - (7)].fval), (yysemantic_stack_[(9) - (8)].fval), (yysemantic_stack_[(9) - (9)].fval)); } +#line 255 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].fval)); } break; case 126: /* Line 677 of lalr1.cc */ -#line 258 "easymesh/easymesh-parser.y" - { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); } +#line 256 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCog((yysemantic_stack_[(11) - (2)].ival), (yysemantic_stack_[(11) - (3)].fval), (yysemantic_stack_[(11) - (4)].fval), (yysemantic_stack_[(11) - (5)].fval), (yysemantic_stack_[(11) - (6)].fval), (yysemantic_stack_[(11) - (7)].fval), (yysemantic_stack_[(11) - (8)].fval), (yysemantic_stack_[(11) - (9)].fval), (yysemantic_stack_[(11) - (10)].fval), (yysemantic_stack_[(11) - (11)].bval)); } break; case 127: /* Line 677 of lalr1.cc */ -#line 259 "easymesh/easymesh-parser.y" - { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); } +#line 257 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCog((yysemantic_stack_[(10) - (2)].ival), (yysemantic_stack_[(10) - (3)].fval), (yysemantic_stack_[(10) - (4)].fval), (yysemantic_stack_[(10) - (5)].fval), (yysemantic_stack_[(10) - (6)].fval), (yysemantic_stack_[(10) - (7)].fval), (yysemantic_stack_[(10) - (8)].fval), (yysemantic_stack_[(10) - (9)].fval), (yysemantic_stack_[(10) - (10)].fval)); } break; case 128: /* Line 677 of lalr1.cc */ -#line 260 "easymesh/easymesh-parser.y" - { (yyval.fval) = (float)(yysemantic_stack_[(1) - (1)].ival); } +#line 258 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendCog((yysemantic_stack_[(9) - (2)].ival), (yysemantic_stack_[(9) - (3)].fval), (yysemantic_stack_[(9) - (4)].fval), (yysemantic_stack_[(9) - (5)].fval), (yysemantic_stack_[(9) - (6)].fval), (yysemantic_stack_[(9) - (7)].fval), (yysemantic_stack_[(9) - (8)].fval), (yysemantic_stack_[(9) - (9)].fval)); } break; case 129: /* Line 677 of lalr1.cc */ -#line 261 "easymesh/easymesh-parser.y" - { (yyval.fval) = -(float)(yysemantic_stack_[(2) - (2)].ival); } +#line 263 "easymesh/easymesh-parser.y" + { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); } break; case 130: /* Line 677 of lalr1.cc */ -#line 265 "easymesh/easymesh-parser.y" - { (yyval.ival) = (yysemantic_stack_[(1) - (1)].ival); } +#line 264 "easymesh/easymesh-parser.y" + { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); } break; case 131: /* Line 677 of lalr1.cc */ -#line 266 "easymesh/easymesh-parser.y" - { (yyval.ival) = -(yysemantic_stack_[(2) - (2)].ival); } +#line 265 "easymesh/easymesh-parser.y" + { (yyval.fval) = (float)(yysemantic_stack_[(1) - (1)].ival); } break; case 132: /* Line 677 of lalr1.cc */ -#line 267 "easymesh/easymesh-parser.y" - { (yyval.ival) = (int)(yysemantic_stack_[(1) - (1)].fval); } +#line 266 "easymesh/easymesh-parser.y" + { (yyval.fval) = -(float)(yysemantic_stack_[(2) - (2)].ival); } break; case 133: /* Line 677 of lalr1.cc */ -#line 268 "easymesh/easymesh-parser.y" - { (yyval.ival) = -(int)(yysemantic_stack_[(2) - (2)].fval); } +#line 270 "easymesh/easymesh-parser.y" + { (yyval.ival) = (yysemantic_stack_[(1) - (1)].ival); } break; case 134: /* Line 677 of lalr1.cc */ -#line 273 "easymesh/easymesh-parser.y" - { (yyval.vval)[0] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[2] = (yysemantic_stack_[(3) - (2)].fval); } +#line 271 "easymesh/easymesh-parser.y" + { (yyval.ival) = -(yysemantic_stack_[(2) - (2)].ival); } break; case 135: /* Line 677 of lalr1.cc */ -#line 274 "easymesh/easymesh-parser.y" - { (yyval.vval)[0] = (yysemantic_stack_[(5) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(5) - (3)].fval); (yyval.vval)[2] = (yysemantic_stack_[(5) - (4)].fval); } +#line 272 "easymesh/easymesh-parser.y" + { (yyval.ival) = (int)(yysemantic_stack_[(1) - (1)].fval); } break; case 136: /* Line 677 of lalr1.cc */ -#line 278 "easymesh/easymesh-parser.y" - { (yyval.vval)[0] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[2] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[3] = (yysemantic_stack_[(3) - (2)].fval); } +#line 273 "easymesh/easymesh-parser.y" + { (yyval.ival) = -(int)(yysemantic_stack_[(2) - (2)].fval); } break; case 137: /* Line 677 of lalr1.cc */ -#line 279 "easymesh/easymesh-parser.y" - { (yyval.vval)[0] = (yysemantic_stack_[(6) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(6) - (3)].fval); (yyval.vval)[2] = (yysemantic_stack_[(6) - (4)].fval); (yyval.vval)[3] = (yysemantic_stack_[(6) - (5)].fval); } +#line 278 "easymesh/easymesh-parser.y" + { (yyval.vval)[0] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[2] = (yysemantic_stack_[(3) - (2)].fval); } break; case 138: +/* Line 677 of lalr1.cc */ +#line 279 "easymesh/easymesh-parser.y" + { (yyval.vval)[0] = (yysemantic_stack_[(5) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(5) - (3)].fval); (yyval.vval)[2] = (yysemantic_stack_[(5) - (4)].fval); } + break; + + case 139: + +/* Line 677 of lalr1.cc */ +#line 283 "easymesh/easymesh-parser.y" + { (yyval.vval)[0] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[2] = (yysemantic_stack_[(3) - (2)].fval); (yyval.vval)[3] = (yysemantic_stack_[(3) - (2)].fval); } + break; + + case 140: + /* Line 677 of lalr1.cc */ #line 284 "easymesh/easymesh-parser.y" + { (yyval.vval)[0] = (yysemantic_stack_[(6) - (2)].fval); (yyval.vval)[1] = (yysemantic_stack_[(6) - (3)].fval); (yyval.vval)[2] = (yysemantic_stack_[(6) - (4)].fval); (yyval.vval)[3] = (yysemantic_stack_[(6) - (5)].fval); } + break; + + case 141: + +/* Line 677 of lalr1.cc */ +#line 289 "easymesh/easymesh-parser.y" { (yyval.bval) = (yysemantic_stack_[(1) - (1)].bval); } break; - case 139: + case 142: /* Line 677 of lalr1.cc */ -#line 285 "easymesh/easymesh-parser.y" +#line 290 "easymesh/easymesh-parser.y" { (yyval.bval) = !!(yysemantic_stack_[(1) - (1)].ival); } break; - case 140: + case 143: /* Line 677 of lalr1.cc */ -#line 286 "easymesh/easymesh-parser.y" +#line 291 "easymesh/easymesh-parser.y" { (yyval.bval) = !!(yysemantic_stack_[(1) - (1)].fval); } break; /* Line 677 of lalr1.cc */ -#line 1337 "generated/easymesh-parser.cpp" +#line 1360 "generated/easymesh-parser.cpp" default: break; } @@ -1538,38 +1561,39 @@ namespace lol { /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ - const signed char EasyMeshParser::yypact_ninf_ = -118; + const signed char EasyMeshParser::yypact_ninf_ = -112; const short int EasyMeshParser::yypact_[] = { - 353, -1, 78, 3, 3, 3, 3, 3, 3, 3, - 3, 3, -118, 3, 3, 3, 3, 3, 3, 3, - 3, 3, -118, 3, 3, 3, 3, 3, 3, 3, - 3, 3, -118, 7, 3, 7, -118, 3, 82, 82, - -118, -57, -57, -57, -57, -57, 3, 82, 7, 7, - 7, 82, 82, 82, 82, 82, 3, 3, 82, 82, - -118, 20, 30, 353, -118, 418, -118, -33, 353, -118, - -118, -118, -118, -118, -118, 96, 3, 3, -118, -118, - 3, -118, -118, -118, 3, 3, 3, 3, 3, 3, - -118, -118, -118, 3, 3, 3, 3, 3, 3, -118, - -118, -118, 3, 3, 3, 3, 3, 3, -118, 3, - 3, -118, 7, 3, -118, -118, -118, -118, 96, -118, - 82, 353, 353, 353, 353, 353, -118, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, -24, - -24, 3, 3, -118, -118, -118, -118, 353, -12, -118, - -118, 96, -118, -118, -26, 3, 3, 3, -118, 3, - 3, -118, -118, 3, -118, 3, 3, -118, -118, 3, - -118, 3, 3, -118, -118, -11, 3, 3, -118, 3, - -118, -118, 82, -7, 11, 12, 13, 21, 3, 3, - -118, 3, -118, 3, -118, -118, 3, 3, 3, -24, - -118, -118, -118, -118, -118, 3, 3, -12, -118, -118, - -118, -118, -118, 3, 3, 3, -24, -24, -118, -24, - -24, -118, -24, -24, -118, -118, 3, -118, 3, -118, - -118, -118, -118, -118, -118, -118, 3, 3, 3, 3, - -118, -24, 3, -118, 3, -118, -118, 3, -118, -118, - -118, -118, -118, -118, -118, -118, -29, -118, -24, -118, - -118, -118, -24, -118, 3, -14, -118, -24, -118, 3, - -118, -24, 3, -118, 3, 3, -24, -118 + 390, -1, 13, 81, 3, 3, 3, 3, 3, 3, + 3, 3, 3, -112, 3, 3, 3, 3, 3, 3, + 3, 3, 3, -112, 3, 3, 3, 3, 3, 3, + 3, 3, 3, -112, 100, 3, 100, -112, 3, 85, + 85, -112, -57, -57, -57, -57, -57, 3, 85, 100, + 100, 100, 85, 85, 85, 85, 85, 3, 3, 85, + 85, -112, 21, 31, 390, -112, 456, -112, -33, 390, + -112, -112, -112, -112, -112, -112, 119, 3, 3, -112, + -112, 3, -112, -112, 3, -112, -112, -112, 3, 3, + 3, 3, 3, 3, -112, -112, -112, 3, 3, 3, + 3, 3, 3, -112, -112, -112, 3, 3, 3, 3, + 3, 3, -112, 3, 3, -112, 100, 3, -112, -112, + -112, -112, 119, -112, 85, 390, 390, 390, 390, 390, + -112, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, -24, -24, 3, 3, -112, -112, -112, + -112, 390, -7, -112, -112, 119, -112, -112, -26, 3, + 3, 3, 3, -112, 3, 3, -112, -112, 3, -112, + 3, 3, -112, -112, 3, -112, 3, 3, -112, -112, + -11, 3, 3, -112, 3, -112, -112, 85, 2, 12, + 16, 23, 24, 3, 3, -112, 3, -112, 3, -112, + -112, 3, 3, 3, -24, -112, -112, -112, -112, -112, + 3, 3, -7, -112, -112, -112, -112, -112, 3, 3, + 3, 3, -24, -24, -112, -24, -24, -112, -24, -24, + -112, -112, 3, -112, 3, -112, -112, -112, -112, -112, + -112, -112, 3, 3, 3, 3, -112, -24, 3, -112, + 3, -112, -112, 3, -112, -112, -112, -112, -112, -112, + -112, -112, -112, -29, -112, -24, -112, -112, -112, -24, + -112, 3, 0, -112, -24, -112, 3, -112, -24, 3, + -112, 3, 3, -24, -112 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -1579,49 +1603,50 @@ namespace lol { EasyMeshParser::yydefact_[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 88, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 89, 0, 0, 0, 93, 0, 0, 0, - 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 90, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 91, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 92, 0, 0, 0, 96, 0, 0, + 0, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 20, 0, 0, 3, 5, 7, 12, 0, 0, 9, - 10, 11, 126, 128, 24, 0, 0, 0, 23, 27, - 0, 26, 28, 33, 0, 49, 0, 0, 70, 72, - 81, 29, 34, 0, 51, 0, 0, 74, 76, 82, - 30, 35, 0, 53, 0, 0, 78, 80, 83, 0, - 0, 32, 0, 86, 85, 38, 132, 130, 0, 91, - 0, 0, 0, 0, 0, 0, 90, 0, 103, 105, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 120, - 122, 0, 0, 1, 2, 4, 8, 0, 0, 126, - 128, 0, 127, 129, 0, 0, 0, 41, 48, 56, - 64, 69, 71, 44, 50, 59, 66, 73, 75, 47, - 52, 62, 68, 77, 79, 0, 0, 0, 37, 0, - 133, 131, 0, 0, 0, 0, 0, 0, 0, 0, - 104, 107, 108, 110, 111, 98, 0, 0, 0, 118, - 140, 139, 138, 119, 121, 0, 0, 0, 21, 6, - 127, 129, 136, 0, 0, 0, 40, 55, 63, 43, - 58, 65, 46, 61, 67, 134, 0, 31, 0, 84, - 92, 14, 15, 16, 17, 18, 0, 102, 0, 0, - 99, 114, 116, 117, 0, 100, 13, 0, 22, 25, - 39, 54, 42, 57, 45, 60, 0, 36, 97, 101, - 106, 109, 113, 115, 0, 0, 135, 96, 112, 0, - 137, 95, 0, 94, 0, 125, 124, 123 + 0, 20, 0, 0, 3, 5, 7, 12, 0, 0, + 9, 10, 11, 129, 131, 24, 0, 0, 0, 23, + 27, 0, 26, 30, 0, 29, 31, 36, 0, 52, + 0, 0, 73, 75, 84, 32, 37, 0, 54, 0, + 0, 77, 79, 85, 33, 38, 0, 56, 0, 0, + 81, 83, 86, 0, 0, 35, 0, 89, 88, 41, + 135, 133, 0, 94, 0, 0, 0, 0, 0, 0, + 93, 0, 106, 108, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 123, 125, 0, 0, 1, 2, 4, + 8, 0, 0, 129, 131, 0, 130, 132, 0, 0, + 0, 0, 44, 51, 59, 67, 72, 74, 47, 53, + 62, 69, 76, 78, 50, 55, 65, 71, 80, 82, + 0, 0, 0, 40, 0, 136, 134, 0, 0, 0, + 0, 0, 0, 0, 0, 107, 110, 111, 113, 114, + 101, 0, 0, 0, 121, 143, 142, 141, 122, 124, + 0, 0, 0, 21, 6, 130, 132, 139, 0, 0, + 0, 0, 43, 58, 66, 46, 61, 68, 49, 64, + 70, 137, 0, 34, 0, 87, 95, 14, 15, 16, + 17, 18, 0, 105, 0, 0, 102, 117, 119, 120, + 0, 103, 13, 0, 22, 25, 28, 42, 57, 45, + 60, 48, 63, 0, 39, 100, 104, 109, 112, 116, + 118, 0, 0, 138, 99, 115, 0, 140, 98, 0, + 97, 0, 128, 127, 126 }; /* YYPGOTO[NTERM-NUM]. */ const short int EasyMeshParser::yypgoto_[] = { - -118, -118, -4, -118, 23, -118, -118, -118, 137, -117, - -118, -118, -118, -2, 163, 1, 95, 79 + -112, -112, -4, -112, 28, -112, -112, -112, 160, -111, + -112, -112, -112, -2, 205, 1, 55, 63 }; /* YYDEFGOTO[NTERM-NUM]. */ const short int EasyMeshParser::yydefgoto_[] = { - -1, 61, 62, 63, 64, 65, 66, 67, 68, 209, - 69, 70, 71, 77, 119, 111, 78, 203 + -1, 62, 63, 64, 65, 66, 67, 68, 69, 214, + 70, 71, 72, 78, 123, 115, 79, 208 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1631,54 +1656,58 @@ namespace lol { const unsigned short int EasyMeshParser::yytable_[] = { - 80, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 60, 91, 92, 93, 94, 95, 96, 97, 98, 99, - 143, 100, 101, 102, 103, 104, 105, 106, 107, 108, - 144, 110, 112, 113, 147, 115, 114, 72, 73, 200, - 201, 202, 266, 75, 126, 212, 128, 130, 132, 129, - 131, 133, 72, 73, 139, 140, 208, 270, 75, 145, - 225, 231, 72, 73, 148, 74, 72, 73, 75, 76, - 72, 73, 75, 152, 154, 155, 75, 109, 156, 232, - 233, 234, 157, 158, 159, 160, 161, 162, 146, 235, - 246, 163, 164, 165, 166, 167, 168, 81, 0, 0, - 169, 170, 171, 172, 173, 174, 0, 175, 176, 0, - 177, 179, 0, 178, 0, 0, 180, 183, 184, 185, - 186, 187, 0, 0, 0, 188, 189, 190, 191, 192, - 193, 194, 195, 196, 197, 198, 199, 0, 0, 205, - 206, 72, 73, 207, 79, 116, 117, 75, 76, 210, - 0, 118, 213, 214, 215, 216, 0, 217, 218, 149, - 150, 219, 0, 220, 221, 151, 0, 222, 0, 223, - 224, 0, 0, 226, 227, 228, 0, 229, 121, 122, - 123, 124, 125, 0, 0, 0, 236, 237, 0, 238, - 0, 239, 0, 0, 240, 241, 242, 0, 0, 0, - 0, 0, 120, 244, 245, 0, 0, 0, 0, 0, - 127, 247, 248, 249, 134, 135, 136, 137, 138, 204, - 0, 141, 142, 0, 256, 0, 257, 0, 0, 0, - 0, 0, 0, 0, 258, 259, 260, 261, 153, 0, - 263, 0, 264, 0, 0, 265, 0, 0, 0, 0, + 81, 84, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 61, 95, 96, 97, 98, 99, 100, 101, 102, + 103, 147, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 148, 114, 116, 117, 151, 119, 118, 73, 74, + 205, 206, 207, 273, 76, 130, 217, 132, 134, 136, + 133, 135, 137, 73, 74, 143, 144, 82, 85, 76, + 149, 231, 213, 73, 74, 152, 75, 73, 74, 76, + 77, 237, 277, 76, 156, 158, 159, 73, 74, 160, + 80, 238, 161, 76, 77, 239, 162, 163, 164, 165, + 166, 167, 240, 241, 150, 168, 169, 170, 171, 172, + 173, 252, 0, 0, 174, 175, 176, 177, 178, 179, + 0, 180, 181, 0, 182, 184, 0, 183, 0, 0, + 185, 188, 189, 190, 191, 192, 0, 0, 0, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, + 204, 0, 0, 210, 211, 73, 74, 212, 83, 120, + 121, 76, 77, 215, 0, 122, 218, 219, 220, 221, + 222, 0, 223, 224, 73, 74, 225, 0, 226, 227, + 76, 113, 228, 0, 229, 230, 0, 0, 232, 233, + 234, 0, 235, 153, 154, 0, 0, 0, 0, 155, + 0, 242, 243, 0, 244, 0, 245, 0, 0, 246, + 247, 248, 125, 126, 127, 128, 129, 209, 250, 251, + 0, 0, 0, 0, 0, 0, 253, 254, 255, 256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 269, 0, 0, 0, 0, 272, 0, 0, - 274, 0, 275, 276, 0, 0, 0, 0, 243, 0, - 0, 181, 0, 182, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 250, 251, 0, 252, 253, - 0, 254, 255, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 211, 0, 0, 0, 0, 0, - 262, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 267, 0, 0, - 0, 268, 0, 0, 0, 230, 271, 0, 0, 0, - 273, 0, 0, 0, 0, 277, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 0, 0, 0, 0, 0, - 60, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59 + 263, 0, 264, 0, 0, 0, 0, 0, 0, 0, + 265, 266, 267, 268, 0, 124, 270, 0, 271, 0, + 0, 272, 0, 131, 0, 0, 0, 138, 139, 140, + 141, 142, 0, 0, 145, 146, 0, 249, 0, 276, + 0, 0, 0, 0, 279, 0, 0, 281, 0, 282, + 283, 157, 0, 0, 0, 257, 258, 0, 259, 260, + 0, 261, 262, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 269, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 186, 274, 187, + 0, 0, 275, 0, 0, 0, 0, 278, 0, 0, + 0, 280, 0, 0, 0, 0, 284, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 216, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 236, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 0, 0, 0, 0, 0, 61, 1, + 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 52, 53, 54, 55, 56, 57, 58, 59, 60 }; /* YYCHECK. */ @@ -1686,53 +1715,57 @@ namespace lol { EasyMeshParser::yycheck_[] = { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 67, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 0, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 0, 33, 34, 35, 67, 37, 35, 63, 64, 63, - 64, 65, 71, 69, 46, 71, 48, 49, 50, 48, - 49, 50, 63, 64, 56, 57, 68, 71, 69, 63, - 71, 68, 63, 64, 68, 66, 63, 64, 69, 70, - 63, 64, 69, 75, 76, 77, 69, 70, 80, 68, - 68, 68, 84, 85, 86, 87, 88, 89, 65, 68, - 207, 93, 94, 95, 96, 97, 98, 2, -1, -1, - 102, 103, 104, 105, 106, 107, -1, 109, 110, -1, - 112, 113, -1, 112, -1, -1, 118, 121, 122, 123, - 124, 125, -1, -1, -1, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, -1, -1, 141, - 142, 63, 64, 147, 66, 63, 64, 69, 70, 151, - -1, 69, 154, 155, 156, 157, -1, 159, 160, 63, - 64, 163, -1, 165, 166, 69, -1, 169, -1, 171, - 172, -1, -1, 175, 176, 177, -1, 179, 41, 42, - 43, 44, 45, -1, -1, -1, 188, 189, -1, 191, - -1, 193, -1, -1, 196, 197, 198, -1, -1, -1, - -1, -1, 39, 205, 206, -1, -1, -1, -1, -1, - 47, 213, 214, 215, 51, 52, 53, 54, 55, 140, - -1, 58, 59, -1, 226, -1, 228, -1, -1, -1, - -1, -1, -1, -1, 236, 237, 238, 239, 75, -1, - 242, -1, 244, -1, -1, 247, -1, -1, -1, -1, + 12, 68, 14, 15, 16, 17, 18, 19, 20, 21, + 22, 0, 24, 25, 26, 27, 28, 29, 30, 31, + 32, 0, 34, 35, 36, 68, 38, 36, 64, 65, + 64, 65, 66, 72, 70, 47, 72, 49, 50, 51, + 49, 50, 51, 64, 65, 57, 58, 2, 3, 70, + 64, 72, 69, 64, 65, 69, 67, 64, 65, 70, + 71, 69, 72, 70, 76, 77, 78, 64, 65, 81, + 67, 69, 84, 70, 71, 69, 88, 89, 90, 91, + 92, 93, 69, 69, 66, 97, 98, 99, 100, 101, + 102, 212, -1, -1, 106, 107, 108, 109, 110, 111, + -1, 113, 114, -1, 116, 117, -1, 116, -1, -1, + 122, 125, 126, 127, 128, 129, -1, -1, -1, 131, + 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, + 142, -1, -1, 145, 146, 64, 65, 151, 67, 64, + 65, 70, 71, 155, -1, 70, 158, 159, 160, 161, + 162, -1, 164, 165, 64, 65, 168, -1, 170, 171, + 70, 71, 174, -1, 176, 177, -1, -1, 180, 181, + 182, -1, 184, 64, 65, -1, -1, -1, -1, 70, + -1, 193, 194, -1, 196, -1, 198, -1, -1, 201, + 202, 203, 42, 43, 44, 45, 46, 144, 210, 211, + -1, -1, -1, -1, -1, -1, 218, 219, 220, 221, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 264, -1, -1, -1, -1, 269, -1, -1, - 272, -1, 274, 275, -1, -1, -1, -1, 199, -1, - -1, 118, -1, 120, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 216, 217, -1, 219, 220, - -1, 222, 223, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 151, -1, -1, -1, -1, -1, - 241, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 258, -1, -1, - -1, 262, -1, -1, -1, 182, 267, -1, -1, -1, - 271, -1, -1, -1, -1, 276, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, - 67, 3, 4, 5, 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61 + 232, -1, 234, -1, -1, -1, -1, -1, -1, -1, + 242, 243, 244, 245, -1, 40, 248, -1, 250, -1, + -1, 253, -1, 48, -1, -1, -1, 52, 53, 54, + 55, 56, -1, -1, 59, 60, -1, 204, -1, 271, + -1, -1, -1, -1, 276, -1, -1, 279, -1, 281, + 282, 76, -1, -1, -1, 222, 223, -1, 225, 226, + -1, 228, 229, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 247, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 122, 265, 124, + -1, -1, 269, -1, -1, -1, -1, 274, -1, -1, + -1, 278, -1, -1, -1, -1, 283, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 155, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 187, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, -1, -1, -1, -1, -1, 68, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, + 54, 55, 56, 57, 58, 59, 60, 61, 62 }; /* STOS_[STATE-NUM] -- The (internal number of the) accessing @@ -1746,28 +1779,29 @@ namespace lol { 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 67, 73, 74, 75, 76, 77, 78, 79, 80, 82, - 83, 84, 63, 64, 66, 69, 70, 85, 88, 66, - 85, 88, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 70, - 85, 87, 85, 85, 87, 85, 63, 64, 69, 86, - 86, 80, 80, 80, 80, 80, 85, 86, 85, 87, - 85, 87, 85, 87, 86, 86, 86, 86, 86, 85, - 85, 86, 86, 0, 0, 74, 76, 67, 74, 63, - 64, 69, 85, 86, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 87, 85, - 85, 86, 86, 74, 74, 74, 74, 74, 85, 85, - 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, - 63, 64, 65, 89, 89, 85, 85, 74, 68, 81, - 85, 86, 71, 85, 85, 85, 85, 85, 85, 85, - 85, 85, 85, 85, 85, 71, 85, 85, 85, 85, - 86, 68, 68, 68, 68, 68, 85, 85, 85, 85, - 85, 85, 85, 89, 85, 85, 81, 85, 85, 85, - 89, 89, 89, 89, 89, 89, 85, 85, 85, 85, - 85, 85, 89, 85, 85, 85, 71, 89, 89, 85, - 71, 89, 85, 89, 85, 85, 85, 89 + 62, 68, 74, 75, 76, 77, 78, 79, 80, 81, + 83, 84, 85, 64, 65, 67, 70, 71, 86, 89, + 67, 86, 89, 67, 86, 89, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 71, 86, 88, 86, 86, 88, 86, + 64, 65, 70, 87, 87, 81, 81, 81, 81, 81, + 86, 87, 86, 88, 86, 88, 86, 88, 87, 87, + 87, 87, 87, 86, 86, 87, 87, 0, 0, 75, + 77, 68, 75, 64, 65, 70, 86, 87, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 88, 86, 86, 87, 87, 75, 75, + 75, 75, 75, 86, 86, 86, 86, 86, 86, 86, + 86, 86, 86, 86, 86, 64, 65, 66, 90, 90, + 86, 86, 75, 69, 82, 86, 87, 72, 86, 86, + 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, + 86, 72, 86, 86, 86, 86, 87, 69, 69, 69, + 69, 69, 86, 86, 86, 86, 86, 86, 86, 90, + 86, 86, 82, 86, 86, 86, 86, 90, 90, 90, + 90, 90, 90, 86, 86, 86, 86, 86, 86, 90, + 86, 86, 86, 72, 90, 90, 86, 72, 90, 86, + 90, 86, 86, 86, 90 }; #if YYDEBUG @@ -1782,8 +1816,8 @@ namespace lol { 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, 91, 93, 45, - 40, 41 + 315, 316, 317, 318, 319, 320, 321, 322, 91, 93, + 45, 40, 41 }; #endif @@ -1791,21 +1825,21 @@ namespace lol { const unsigned char EasyMeshParser::yyr1_[] = { - 0, 72, 73, 74, 74, 75, 75, 76, 76, 77, - 77, 77, 77, 77, 78, 78, 78, 78, 78, 79, - 80, 81, 82, 82, 82, 82, 82, 82, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 84, 84, 84, 84, 84, 84, + 0, 73, 74, 75, 75, 76, 76, 77, 77, 78, + 78, 78, 78, 78, 79, 79, 79, 79, 79, 80, + 81, 82, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, + 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, 84, - 84, 84, 84, 84, 84, 84, 85, 85, 85, 85, - 86, 86, 86, 86, 87, 87, 88, 88, 89, 89, - 89 + 84, 84, 84, 84, 84, 84, 84, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 85, + 85, 85, 85, 85, 85, 85, 85, 85, 85, 86, + 86, 86, 86, 87, 87, 87, 87, 88, 88, 89, + 89, 90, 90, 90 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -1814,19 +1848,19 @@ namespace lol { { 0, 2, 2, 1, 2, 1, 3, 1, 2, 1, 1, 1, 1, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 5, 2, 2, 5, 2, 2, 2, 2, - 2, 4, 2, 2, 2, 2, 5, 3, 2, 5, - 4, 3, 5, 4, 3, 5, 4, 3, 3, 2, - 3, 2, 3, 2, 5, 4, 3, 5, 4, 3, - 5, 4, 3, 4, 3, 4, 3, 4, 3, 3, - 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, - 2, 2, 2, 2, 4, 2, 2, 1, 1, 1, - 2, 2, 4, 1, 8, 7, 6, 5, 3, 4, - 4, 5, 4, 2, 3, 2, 5, 3, 3, 5, - 3, 3, 6, 5, 4, 5, 4, 4, 3, 3, - 2, 3, 2, 11, 10, 9, 1, 2, 1, 2, - 1, 2, 1, 2, 3, 5, 3, 6, 1, 1, - 1 + 1, 1, 5, 2, 2, 5, 2, 2, 5, 2, + 2, 2, 2, 2, 4, 2, 2, 2, 2, 5, + 3, 2, 5, 4, 3, 5, 4, 3, 5, 4, + 3, 3, 2, 3, 2, 3, 2, 5, 4, 3, + 5, 4, 3, 5, 4, 3, 4, 3, 4, 3, + 4, 3, 3, 2, 3, 2, 3, 2, 3, 2, + 3, 2, 3, 2, 2, 2, 2, 4, 2, 2, + 1, 1, 1, 2, 2, 4, 1, 8, 7, 6, + 5, 3, 4, 4, 5, 4, 2, 3, 2, 5, + 3, 3, 5, 3, 3, 6, 5, 4, 5, 4, + 4, 3, 3, 2, 3, 2, 11, 10, 9, 1, + 2, 1, 2, 1, 2, 1, 2, 3, 5, 3, + 6, 1, 1, 1 }; #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE @@ -1835,24 +1869,25 @@ namespace lol { const char* const EasyMeshParser::yytname_[] = { - "T_END", "error", "$undefined", "T_COLOR", "T_BCOLOR", "T_TRANSLATEX", - "T_ROTATEX", "T_TAPERX", "T_TWISTX", "T_SHEARX", "T_STRETCHX", - "T_BENDXY", "T_BENDXZ", "T_SCALEX", "T_MIRRORX", "T_TRANSLATEY", - "T_ROTATEY", "T_TAPERY", "T_TWISTY", "T_SHEARY", "T_STRETCHY", - "T_BENDYX", "T_BENDYZ", "T_SCALEY", "T_MIRRORY", "T_TRANSLATEZ", - "T_ROTATEZ", "T_TAPERZ", "T_TWISTZ", "T_SHEARZ", "T_STRETCHZ", - "T_BENDZX", "T_BENDZY", "T_SCALEZ", "T_MIRRORZ", "T_TRANSLATE", - "T_ROTATE", "T_SCALE", "T_TOGGLESCALEWINDING", "T_RADIALJITTER", - "T_SPLITTRIANGLE", "T_SMOOTHMESH", "T_DUPLICATE", "T_CSGUNION", - "T_CSGSUBSTRACT", "T_CSGSUBSTRACTLOSS", "T_CSGAND", "T_CSGXOR", - "T_CHAMFER", "T_CYLINDER", "T_BOX", "T_SMOOTHCHAMFBOX", "T_FLATCHAMFBOX", - "T_SPHERE", "T_CAPSULE", "T_STAR", "T_EXPANDEDSTAR", "T_DISC", - "T_TRIANGLE", "T_QUAD", "T_COG", "T_TORUS", "T_ERROR", "F_NUMBER", - "I_NUMBER", "BOOLEAN", "COLOR", "'['", "']'", "'-'", "'('", "')'", - "$accept", "mesh_description", "mesh_expression_list", "mesh_expression", - "mesh_command_list", "mesh_command", "post_brace_command", - "pre_brace_command", "mesh_open", "mesh_close", "color_command", - "transform_command", "primitive_command", "fv", "iv", "v3", "v4", "bv", 0 + "T_END", "error", "$undefined", "T_COLOR", "T_BCOLOR", "T_VCOLOR", + "T_TRANSLATEX", "T_ROTATEX", "T_TAPERX", "T_TWISTX", "T_SHEARX", + "T_STRETCHX", "T_BENDXY", "T_BENDXZ", "T_SCALEX", "T_MIRRORX", + "T_TRANSLATEY", "T_ROTATEY", "T_TAPERY", "T_TWISTY", "T_SHEARY", + "T_STRETCHY", "T_BENDYX", "T_BENDYZ", "T_SCALEY", "T_MIRRORY", + "T_TRANSLATEZ", "T_ROTATEZ", "T_TAPERZ", "T_TWISTZ", "T_SHEARZ", + "T_STRETCHZ", "T_BENDZX", "T_BENDZY", "T_SCALEZ", "T_MIRRORZ", + "T_TRANSLATE", "T_ROTATE", "T_SCALE", "T_TOGGLESCALEWINDING", + "T_RADIALJITTER", "T_SPLITTRIANGLE", "T_SMOOTHMESH", "T_DUPLICATE", + "T_CSGUNION", "T_CSGSUBSTRACT", "T_CSGSUBSTRACTLOSS", "T_CSGAND", + "T_CSGXOR", "T_CHAMFER", "T_CYLINDER", "T_BOX", "T_SMOOTHCHAMFBOX", + "T_FLATCHAMFBOX", "T_SPHERE", "T_CAPSULE", "T_STAR", "T_EXPANDEDSTAR", + "T_DISC", "T_TRIANGLE", "T_QUAD", "T_COG", "T_TORUS", "T_ERROR", + "F_NUMBER", "I_NUMBER", "BOOLEAN", "COLOR", "'['", "']'", "'-'", "'('", + "')'", "$accept", "mesh_description", "mesh_expression_list", + "mesh_expression", "mesh_command_list", "mesh_command", + "post_brace_command", "pre_brace_command", "mesh_open", "mesh_close", + "color_command", "transform_command", "primitive_command", "fv", "iv", + "v3", "v4", "bv", 0 }; #endif @@ -1861,64 +1896,65 @@ namespace lol { const EasyMeshParser::rhs_number_type EasyMeshParser::yyrhs_[] = { - 73, 0, -1, 74, 0, -1, 75, -1, 75, 74, - -1, 76, -1, 80, 74, 81, -1, 77, -1, 77, - 76, -1, 82, -1, 83, -1, 84, -1, 78, -1, - 79, 67, 74, 81, -1, 43, 80, 74, 68, -1, - 44, 80, 74, 68, -1, 45, 80, 74, 68, -1, - 46, 80, 74, 68, -1, 47, 80, 74, 68, -1, - 42, -1, 67, -1, 68, -1, 3, 85, 85, 85, - 85, -1, 3, 88, -1, 3, 66, -1, 4, 85, - 85, 85, 85, -1, 4, 88, -1, 4, 66, -1, - 5, 85, -1, 15, 85, -1, 25, 85, -1, 35, - 85, 85, 85, -1, 35, 87, -1, 6, 85, -1, - 16, 85, -1, 26, 85, -1, 36, 85, 85, 85, - 85, -1, 36, 85, 87, -1, 39, 85, -1, 7, - 85, 85, 85, 89, -1, 7, 85, 85, 85, -1, - 7, 85, 85, -1, 17, 85, 85, 85, 89, -1, - 17, 85, 85, 85, -1, 17, 85, 85, -1, 27, - 85, 85, 85, 89, -1, 27, 85, 85, 85, -1, - 27, 85, 85, -1, 8, 85, 85, -1, 8, 85, - -1, 18, 85, 85, -1, 18, 85, -1, 28, 85, - 85, -1, 28, 85, -1, 9, 85, 85, 85, 89, - -1, 9, 85, 85, 85, -1, 9, 85, 85, -1, - 19, 85, 85, 85, 89, -1, 19, 85, 85, 85, - -1, 19, 85, 85, -1, 29, 85, 85, 85, 89, - -1, 29, 85, 85, 85, -1, 29, 85, 85, -1, - 10, 85, 85, 85, -1, 10, 85, 85, -1, 20, - 85, 85, 85, -1, 20, 85, 85, -1, 30, 85, - 85, 85, -1, 30, 85, 85, -1, 11, 85, 85, - -1, 11, 85, -1, 12, 85, 85, -1, 12, 85, - -1, 21, 85, 85, -1, 21, 85, -1, 22, 85, - 85, -1, 22, 85, -1, 31, 85, 85, -1, 31, - 85, -1, 32, 85, 85, -1, 32, 85, -1, 13, - 85, -1, 23, 85, -1, 33, 85, -1, 37, 85, - 85, 85, -1, 37, 87, -1, 37, 85, -1, 14, - -1, 24, -1, 34, -1, 48, 85, -1, 40, 86, - -1, 41, 86, 86, 86, -1, 38, -1, 49, 86, - 85, 85, 85, 89, 89, 89, -1, 49, 86, 85, - 85, 85, 89, 89, -1, 49, 86, 85, 85, 85, - 89, -1, 49, 86, 85, 85, 85, -1, 53, 86, - 85, -1, 54, 86, 85, 85, -1, 61, 86, 85, - 85, -1, 50, 85, 85, 85, 85, -1, 50, 85, - 85, 85, -1, 50, 85, -1, 50, 87, 85, -1, - 50, 87, -1, 51, 85, 85, 85, 85, -1, 51, - 85, 85, -1, 51, 87, 85, -1, 52, 85, 85, - 85, 85, -1, 52, 85, 85, -1, 52, 87, 85, - -1, 55, 86, 85, 85, 89, 89, -1, 55, 86, - 85, 85, 89, -1, 55, 86, 85, 85, -1, 56, - 86, 85, 85, 85, -1, 56, 86, 85, 85, -1, - 57, 86, 85, 89, -1, 57, 86, 85, -1, 58, - 85, 89, -1, 58, 85, -1, 59, 85, 89, -1, - 59, 85, -1, 60, 86, 85, 85, 85, 85, 85, - 85, 85, 85, 89, -1, 60, 86, 85, 85, 85, - 85, 85, 85, 85, 85, -1, 60, 86, 85, 85, - 85, 85, 85, 85, 85, -1, 63, -1, 69, 85, - -1, 64, -1, 69, 86, -1, 64, -1, 69, 86, - -1, 63, -1, 69, 85, -1, 70, 85, 71, -1, - 70, 85, 85, 85, 71, -1, 70, 85, 71, -1, - 70, 85, 85, 85, 85, 71, -1, 65, -1, 64, - -1, 63, -1 + 74, 0, -1, 75, 0, -1, 76, -1, 76, 75, + -1, 77, -1, 81, 75, 82, -1, 78, -1, 78, + 77, -1, 83, -1, 84, -1, 85, -1, 79, -1, + 80, 68, 75, 82, -1, 44, 81, 75, 69, -1, + 45, 81, 75, 69, -1, 46, 81, 75, 69, -1, + 47, 81, 75, 69, -1, 48, 81, 75, 69, -1, + 43, -1, 68, -1, 69, -1, 3, 86, 86, 86, + 86, -1, 3, 89, -1, 3, 67, -1, 4, 86, + 86, 86, 86, -1, 4, 89, -1, 4, 67, -1, + 5, 86, 86, 86, 86, -1, 5, 89, -1, 5, + 67, -1, 6, 86, -1, 16, 86, -1, 26, 86, + -1, 36, 86, 86, 86, -1, 36, 88, -1, 7, + 86, -1, 17, 86, -1, 27, 86, -1, 37, 86, + 86, 86, 86, -1, 37, 86, 88, -1, 40, 86, + -1, 8, 86, 86, 86, 90, -1, 8, 86, 86, + 86, -1, 8, 86, 86, -1, 18, 86, 86, 86, + 90, -1, 18, 86, 86, 86, -1, 18, 86, 86, + -1, 28, 86, 86, 86, 90, -1, 28, 86, 86, + 86, -1, 28, 86, 86, -1, 9, 86, 86, -1, + 9, 86, -1, 19, 86, 86, -1, 19, 86, -1, + 29, 86, 86, -1, 29, 86, -1, 10, 86, 86, + 86, 90, -1, 10, 86, 86, 86, -1, 10, 86, + 86, -1, 20, 86, 86, 86, 90, -1, 20, 86, + 86, 86, -1, 20, 86, 86, -1, 30, 86, 86, + 86, 90, -1, 30, 86, 86, 86, -1, 30, 86, + 86, -1, 11, 86, 86, 86, -1, 11, 86, 86, + -1, 21, 86, 86, 86, -1, 21, 86, 86, -1, + 31, 86, 86, 86, -1, 31, 86, 86, -1, 12, + 86, 86, -1, 12, 86, -1, 13, 86, 86, -1, + 13, 86, -1, 22, 86, 86, -1, 22, 86, -1, + 23, 86, 86, -1, 23, 86, -1, 32, 86, 86, + -1, 32, 86, -1, 33, 86, 86, -1, 33, 86, + -1, 14, 86, -1, 24, 86, -1, 34, 86, -1, + 38, 86, 86, 86, -1, 38, 88, -1, 38, 86, + -1, 15, -1, 25, -1, 35, -1, 49, 86, -1, + 41, 87, -1, 42, 87, 87, 87, -1, 39, -1, + 50, 87, 86, 86, 86, 90, 90, 90, -1, 50, + 87, 86, 86, 86, 90, 90, -1, 50, 87, 86, + 86, 86, 90, -1, 50, 87, 86, 86, 86, -1, + 54, 87, 86, -1, 55, 87, 86, 86, -1, 62, + 87, 86, 86, -1, 51, 86, 86, 86, 86, -1, + 51, 86, 86, 86, -1, 51, 86, -1, 51, 88, + 86, -1, 51, 88, -1, 52, 86, 86, 86, 86, + -1, 52, 86, 86, -1, 52, 88, 86, -1, 53, + 86, 86, 86, 86, -1, 53, 86, 86, -1, 53, + 88, 86, -1, 56, 87, 86, 86, 90, 90, -1, + 56, 87, 86, 86, 90, -1, 56, 87, 86, 86, + -1, 57, 87, 86, 86, 86, -1, 57, 87, 86, + 86, -1, 58, 87, 86, 90, -1, 58, 87, 86, + -1, 59, 86, 90, -1, 59, 86, -1, 60, 86, + 90, -1, 60, 86, -1, 61, 87, 86, 86, 86, + 86, 86, 86, 86, 86, 90, -1, 61, 87, 86, + 86, 86, 86, 86, 86, 86, 86, -1, 61, 87, + 86, 86, 86, 86, 86, 86, 86, -1, 64, -1, + 70, 86, -1, 65, -1, 70, 87, -1, 65, -1, + 70, 87, -1, 64, -1, 70, 86, -1, 71, 86, + 72, -1, 71, 86, 86, 86, 72, -1, 71, 86, + 72, -1, 71, 86, 86, 86, 86, 72, -1, 66, + -1, 65, -1, 64, -1 }; /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in @@ -1928,19 +1964,19 @@ namespace lol { { 0, 0, 3, 6, 8, 11, 13, 17, 19, 22, 24, 26, 28, 30, 35, 40, 45, 50, 55, 60, - 62, 64, 66, 72, 75, 78, 84, 87, 90, 93, - 96, 99, 104, 107, 110, 113, 116, 122, 126, 129, - 135, 140, 144, 150, 155, 159, 165, 170, 174, 178, - 181, 185, 188, 192, 195, 201, 206, 210, 216, 221, - 225, 231, 236, 240, 245, 249, 254, 258, 263, 267, - 271, 274, 278, 281, 285, 288, 292, 295, 299, 302, - 306, 309, 312, 315, 318, 323, 326, 329, 331, 333, - 335, 338, 341, 346, 348, 357, 365, 372, 378, 382, - 387, 392, 398, 403, 406, 410, 413, 419, 423, 427, - 433, 437, 441, 448, 454, 459, 465, 470, 475, 479, - 483, 486, 490, 493, 505, 516, 526, 528, 531, 533, - 536, 538, 541, 543, 546, 550, 556, 560, 567, 569, - 571 + 62, 64, 66, 72, 75, 78, 84, 87, 90, 96, + 99, 102, 105, 108, 111, 116, 119, 122, 125, 128, + 134, 138, 141, 147, 152, 156, 162, 167, 171, 177, + 182, 186, 190, 193, 197, 200, 204, 207, 213, 218, + 222, 228, 233, 237, 243, 248, 252, 257, 261, 266, + 270, 275, 279, 283, 286, 290, 293, 297, 300, 304, + 307, 311, 314, 318, 321, 324, 327, 330, 335, 338, + 341, 343, 345, 347, 350, 353, 358, 360, 369, 377, + 384, 390, 394, 399, 404, 410, 415, 418, 422, 425, + 431, 435, 439, 445, 449, 453, 460, 466, 471, 477, + 482, 487, 491, 495, 498, 502, 505, 517, 528, 538, + 540, 543, 545, 548, 550, 553, 555, 558, 562, 568, + 572, 579, 581, 583 }; /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ @@ -1949,19 +1985,19 @@ namespace lol { { 0, 93, 93, 97, 98, 102, 103, 107, 108, 112, 113, 114, 115, 116, 120, 121, 122, 123, 124, 128, - 132, 136, 140, 141, 142, 145, 146, 147, 153, 154, - 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, - 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, - 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 218, 222, 223, 224, 225, 226, 227, - 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 250, 251, 252, 253, 258, 259, 260, 261, - 265, 266, 267, 268, 273, 274, 278, 279, 284, 285, - 286 + 132, 136, 140, 141, 142, 145, 146, 147, 150, 151, + 152, 158, 159, 160, 161, 162, 163, 164, 165, 166, + 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, + 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, + 217, 218, 219, 220, 221, 222, 223, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, + 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, + 250, 251, 252, 253, 254, 255, 256, 257, 258, 263, + 264, 265, 266, 270, 271, 272, 273, 278, 279, 283, + 284, 289, 290, 291 }; // Print the state stack on the debug stream. @@ -2005,12 +2041,12 @@ namespace lol { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 70, 71, 2, 2, 2, 69, 2, 2, 2, 2, + 71, 72, 2, 2, 2, 70, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 67, 2, 68, 2, 2, 2, 2, 2, 2, + 2, 68, 2, 69, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -2033,7 +2069,7 @@ namespace lol { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66 + 65, 66, 67 }; if ((unsigned int) t <= yyuser_token_number_max_) return translate_table[t]; @@ -2042,26 +2078,26 @@ namespace lol { } const int EasyMeshParser::yyeof_ = 0; - const int EasyMeshParser::yylast_ = 479; + const int EasyMeshParser::yylast_ = 518; const int EasyMeshParser::yynnts_ = 18; const int EasyMeshParser::yyempty_ = -2; - const int EasyMeshParser::yyfinal_ = 143; + const int EasyMeshParser::yyfinal_ = 147; const int EasyMeshParser::yyterror_ = 1; const int EasyMeshParser::yyerrcode_ = 256; - const int EasyMeshParser::yyntokens_ = 72; + const int EasyMeshParser::yyntokens_ = 73; - const unsigned int EasyMeshParser::yyuser_token_number_max_ = 321; + const unsigned int EasyMeshParser::yyuser_token_number_max_ = 322; const EasyMeshParser::token_number_type EasyMeshParser::yyundef_token_ = 2; } // lol /* Line 1053 of lalr1.cc */ -#line 2061 "generated/easymesh-parser.cpp" +#line 2097 "generated/easymesh-parser.cpp" /* Line 1055 of lalr1.cc */ -#line 289 "easymesh/easymesh-parser.y" +#line 294 "easymesh/easymesh-parser.y" void lol::EasyMeshParser::error(const EasyMeshParser::location_type& l, diff --git a/src/generated/easymesh-parser.h b/src/generated/easymesh-parser.h index de064e6e..ea037a50 100644 --- a/src/generated/easymesh-parser.h +++ b/src/generated/easymesh-parser.h @@ -138,68 +138,69 @@ namespace lol { T_END = 0, T_COLOR = 258, T_BCOLOR = 259, - T_TRANSLATEX = 260, - T_ROTATEX = 261, - T_TAPERX = 262, - T_TWISTX = 263, - T_SHEARX = 264, - T_STRETCHX = 265, - T_BENDXY = 266, - T_BENDXZ = 267, - T_SCALEX = 268, - T_MIRRORX = 269, - T_TRANSLATEY = 270, - T_ROTATEY = 271, - T_TAPERY = 272, - T_TWISTY = 273, - T_SHEARY = 274, - T_STRETCHY = 275, - T_BENDYX = 276, - T_BENDYZ = 277, - T_SCALEY = 278, - T_MIRRORY = 279, - T_TRANSLATEZ = 280, - T_ROTATEZ = 281, - T_TAPERZ = 282, - T_TWISTZ = 283, - T_SHEARZ = 284, - T_STRETCHZ = 285, - T_BENDZX = 286, - T_BENDZY = 287, - T_SCALEZ = 288, - T_MIRRORZ = 289, - T_TRANSLATE = 290, - T_ROTATE = 291, - T_SCALE = 292, - T_TOGGLESCALEWINDING = 293, - T_RADIALJITTER = 294, - T_SPLITTRIANGLE = 295, - T_SMOOTHMESH = 296, - T_DUPLICATE = 297, - T_CSGUNION = 298, - T_CSGSUBSTRACT = 299, - T_CSGSUBSTRACTLOSS = 300, - T_CSGAND = 301, - T_CSGXOR = 302, - T_CHAMFER = 303, - T_CYLINDER = 304, - T_BOX = 305, - T_SMOOTHCHAMFBOX = 306, - T_FLATCHAMFBOX = 307, - T_SPHERE = 308, - T_CAPSULE = 309, - T_STAR = 310, - T_EXPANDEDSTAR = 311, - T_DISC = 312, - T_TRIANGLE = 313, - T_QUAD = 314, - T_COG = 315, - T_TORUS = 316, - T_ERROR = 317, - F_NUMBER = 318, - I_NUMBER = 319, - BOOLEAN = 320, - COLOR = 321 + T_VCOLOR = 260, + T_TRANSLATEX = 261, + T_ROTATEX = 262, + T_TAPERX = 263, + T_TWISTX = 264, + T_SHEARX = 265, + T_STRETCHX = 266, + T_BENDXY = 267, + T_BENDXZ = 268, + T_SCALEX = 269, + T_MIRRORX = 270, + T_TRANSLATEY = 271, + T_ROTATEY = 272, + T_TAPERY = 273, + T_TWISTY = 274, + T_SHEARY = 275, + T_STRETCHY = 276, + T_BENDYX = 277, + T_BENDYZ = 278, + T_SCALEY = 279, + T_MIRRORY = 280, + T_TRANSLATEZ = 281, + T_ROTATEZ = 282, + T_TAPERZ = 283, + T_TWISTZ = 284, + T_SHEARZ = 285, + T_STRETCHZ = 286, + T_BENDZX = 287, + T_BENDZY = 288, + T_SCALEZ = 289, + T_MIRRORZ = 290, + T_TRANSLATE = 291, + T_ROTATE = 292, + T_SCALE = 293, + T_TOGGLESCALEWINDING = 294, + T_RADIALJITTER = 295, + T_SPLITTRIANGLE = 296, + T_SMOOTHMESH = 297, + T_DUPLICATE = 298, + T_CSGUNION = 299, + T_CSGSUBSTRACT = 300, + T_CSGSUBSTRACTLOSS = 301, + T_CSGAND = 302, + T_CSGXOR = 303, + T_CHAMFER = 304, + T_CYLINDER = 305, + T_BOX = 306, + T_SMOOTHCHAMFBOX = 307, + T_FLATCHAMFBOX = 308, + T_SPHERE = 309, + T_CAPSULE = 310, + T_STAR = 311, + T_EXPANDEDSTAR = 312, + T_DISC = 313, + T_TRIANGLE = 314, + T_QUAD = 315, + T_COG = 316, + T_TORUS = 317, + T_ERROR = 318, + F_NUMBER = 319, + I_NUMBER = 320, + BOOLEAN = 321, + COLOR = 322 }; }; @@ -373,7 +374,7 @@ namespace lol { } // lol /* Line 34 of lalr1.cc */ -#line 377 "generated/easymesh-parser.h" +#line 378 "generated/easymesh-parser.h" diff --git a/src/generated/easymesh-scanner.cpp b/src/generated/easymesh-scanner.cpp index c7ea9c08..c65e2ad7 100644 --- a/src/generated/easymesh-scanner.cpp +++ b/src/generated/easymesh-scanner.cpp @@ -330,8 +330,8 @@ typedef unsigned char YY_CHAR; *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 79 -#define YY_END_OF_BUFFER 80 +#define YY_NUM_RULES 80 +#define YY_END_OF_BUFFER 81 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -339,43 +339,43 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[312] = +static yyconst flex_int16_t yy_accept[316] = { 0, - 0, 0, 80, 78, 77, 76, 78, 70, 71, 78, - 69, 78, 78, 67, 78, 74, 75, 78, 78, 78, - 78, 78, 78, 16, 39, 12, 72, 73, 0, 0, - 67, 66, 68, 0, 51, 47, 56, 0, 0, 58, - 54, 57, 0, 0, 43, 0, 0, 0, 0, 40, - 41, 42, 0, 17, 0, 13, 14, 15, 7, 0, - 0, 0, 0, 0, 36, 37, 38, 0, 0, 0, - 0, 9, 10, 11, 0, 0, 68, 0, 0, 59, - 0, 55, 0, 0, 0, 50, 0, 0, 0, 0, - 0, 0, 46, 0, 0, 0, 0, 0, 8, 0, - - 0, 24, 25, 26, 0, 0, 0, 0, 27, 28, - 29, 0, 18, 19, 20, 0, 0, 6, 0, 21, - 22, 23, 60, 0, 66, 0, 49, 0, 0, 0, - 0, 0, 0, 0, 0, 53, 52, 48, 30, 31, - 32, 33, 34, 35, 0, 0, 4, 2, 1, 5, + 0, 0, 81, 79, 78, 77, 79, 71, 72, 79, + 70, 79, 79, 68, 79, 75, 76, 79, 79, 79, + 79, 79, 79, 17, 40, 13, 73, 74, 0, 0, + 68, 67, 69, 0, 52, 48, 57, 0, 0, 59, + 55, 58, 0, 0, 44, 0, 0, 0, 0, 41, + 42, 43, 0, 18, 0, 14, 15, 16, 7, 0, + 0, 0, 0, 0, 37, 38, 39, 0, 0, 0, + 0, 10, 11, 12, 0, 0, 69, 0, 0, 60, + 0, 56, 0, 0, 0, 51, 0, 0, 0, 0, + 0, 0, 47, 0, 0, 0, 0, 0, 8, 9, + + 0, 0, 25, 26, 27, 0, 0, 0, 0, 28, + 29, 30, 0, 19, 20, 21, 0, 0, 6, 0, + 22, 23, 24, 61, 0, 67, 0, 50, 0, 0, + 0, 0, 0, 0, 0, 0, 54, 53, 49, 31, + 32, 33, 34, 35, 36, 0, 0, 4, 2, 1, + 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 46, 0, 45, 0, 0, 0, 65, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 45, 0, 44, 0, 0, 0, 64, 0, 61, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 65, 0, 0, 0, 39, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 66, 0, 0, 0, 40, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 0, 5, 0, 0, 0, 16, 0, 0, 0, - 0, 0, 0, 62, 0, 0, 56, 0, 0, 0, - 0, 54, 0, 0, 43, 0, 0, 0, 0, 0, + 0, 4, 0, 5, 0, 0, 0, 17, 0, 0, + 0, 0, 0, 0, 63, 0, 0, 57, 0, 0, + 0, 0, 55, 0, 0, 44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, 0, 7, 0, 0, - 63, 0, 0, 0, 0, 0, 0, 46, 0, 0, - 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, - 47, 0, 0, 0, 57, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 7, 0, + 0, 64, 0, 0, 0, 0, 0, 0, 47, 0, + 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 48, 0, 0, 0, 58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0 + 0, 0, 0, 0, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -392,8 +392,8 @@ static yyconst flex_int32_t yy_ec[256] = 17, 1, 18, 1, 1, 1, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 1, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 1, 39, 40, - 41, 42, 43, 1, 44, 1, 1, 1, 1, 1, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 1, 45, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -410,193 +410,197 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[45] = +static yyconst flex_int32_t yy_meta[46] = { 0, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1 + 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[321] = +static yyconst flex_int16_t yy_base[325] = { 0, - 0, 0, 385, 386, 386, 386, 0, 386, 386, 36, - 37, 373, 373, 40, 346, 386, 386, 32, 35, 24, - 343, 361, 32, 43, 65, 89, 386, 386, 0, 368, - 52, 53, 0, 353, 386, 62, 355, 340, 354, 386, - 44, 342, 38, 342, 353, 346, 337, 340, 333, 386, - 386, 386, 345, 386, 329, 386, 386, 386, 70, 328, - 59, 60, 335, 69, 386, 386, 386, 79, 75, 324, - 76, 386, 386, 386, 0, 115, 0, 346, 328, 386, - 112, 386, 340, 339, 332, 386, 73, 97, 100, 335, - 326, 119, 326, 318, 318, 325, 332, 321, 386, 122, - - 330, 386, 386, 386, 316, 321, 117, 323, 386, 386, - 386, 322, 386, 386, 386, 313, 320, 386, 306, 386, - 386, 386, 0, 330, 329, 301, 386, 306, 126, 310, - 296, 306, 296, 123, 61, 386, 386, 386, 386, 386, - 386, 386, 386, 386, 110, 309, 301, 302, 299, 297, - 301, 304, 294, 306, 287, 300, 301, 289, 285, 282, - 386, 281, 386, 280, 281, 279, 386, 277, 0, 293, - 272, 278, 285, 280, 272, 274, 287, 286, 272, 277, - 283, 266, 273, 120, 123, 128, 276, 276, 386, 270, - 261, 274, 386, 259, 264, 269, 131, 259, 261, 134, - - 263, 251, 266, 137, 257, 140, 0, 270, 248, 256, - 261, 262, 243, 257, 246, 254, 241, 237, 255, 238, - 386, 240, 386, 252, 143, 242, 146, 242, 239, 235, - 231, 239, 245, 0, 225, 231, 386, 230, 239, 222, - 223, 386, 221, 225, 386, 224, 217, 226, 221, 219, - 215, 222, 149, 211, 0, 218, 224, 223, 218, 217, - 219, 216, 386, 217, 202, 216, 202, 386, 217, 212, - 386, 211, 210, 209, 212, 209, 200, 386, 191, 200, - 195, 152, 190, 202, 193, 196, 198, 197, 188, 193, - 386, 181, 192, 196, 386, 179, 188, 183, 174, 190, - - 179, 185, 188, 174, 181, 169, 163, 182, 169, 160, - 386, 196, 195, 194, 193, 163, 161, 144, 124, 67 + 0, 0, 391, 392, 392, 392, 0, 392, 392, 37, + 38, 379, 379, 41, 352, 392, 392, 33, 36, 25, + 349, 367, 33, 45, 68, 93, 392, 392, 0, 374, + 54, 57, 0, 359, 392, 47, 361, 346, 360, 392, + 57, 348, 40, 348, 359, 352, 343, 346, 339, 392, + 392, 392, 351, 392, 335, 392, 392, 392, 65, 334, + 72, 60, 341, 65, 392, 392, 392, 83, 80, 329, + 96, 392, 392, 392, 0, 133, 0, 352, 334, 392, + 125, 392, 346, 345, 338, 392, 60, 76, 79, 341, + 332, 131, 332, 324, 324, 331, 338, 327, 392, 392, + + 110, 336, 392, 392, 392, 322, 327, 95, 329, 392, + 392, 392, 328, 392, 392, 392, 319, 326, 392, 312, + 392, 392, 392, 0, 336, 335, 307, 392, 312, 123, + 316, 301, 312, 302, 121, 61, 392, 392, 392, 392, + 392, 392, 392, 392, 392, 132, 315, 307, 308, 305, + 303, 307, 310, 300, 312, 293, 306, 307, 295, 291, + 288, 392, 287, 392, 286, 287, 285, 392, 283, 0, + 299, 277, 284, 291, 286, 278, 280, 293, 292, 278, + 283, 289, 272, 279, 110, 123, 115, 282, 282, 392, + 276, 267, 280, 392, 265, 270, 275, 136, 265, 267, + + 139, 269, 257, 272, 142, 263, 145, 0, 276, 254, + 262, 267, 268, 249, 263, 252, 260, 247, 243, 261, + 244, 392, 246, 392, 258, 148, 248, 151, 248, 245, + 241, 237, 245, 251, 0, 231, 237, 392, 236, 245, + 228, 229, 392, 227, 231, 392, 230, 223, 232, 227, + 225, 221, 228, 154, 217, 0, 224, 230, 229, 224, + 223, 225, 222, 392, 223, 208, 222, 208, 203, 222, + 217, 392, 216, 215, 214, 217, 214, 205, 392, 196, + 205, 208, 199, 157, 194, 206, 197, 200, 202, 201, + 192, 187, 196, 392, 184, 195, 199, 392, 182, 191, + + 178, 185, 176, 192, 181, 187, 190, 176, 183, 171, + 164, 184, 170, 130, 392, 167, 165, 200, 160, 157, + 140, 124, 76, 59 } ; -static yyconst flex_int16_t yy_def[321] = +static yyconst flex_int16_t yy_def[325] = { 0, - 311, 1, 311, 311, 311, 311, 312, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 313, 311, - 311, 311, 314, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 315, 311, 314, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 316, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 317, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - - 311, 311, 311, 311, 311, 311, 318, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 319, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 320, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 0, 311, 311, 311, 311, 311, 311, 311, 311, 311 + 315, 1, 315, 315, 315, 315, 316, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 317, 315, + 315, 315, 318, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 319, 315, 318, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 320, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 321, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + + 315, 315, 315, 315, 315, 315, 315, 322, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 323, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 324, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 0, 315, 315, 315, 315, 315, + 315, 315, 315, 315 } ; -static yyconst flex_int16_t yy_nxt[431] = +static yyconst flex_int16_t yy_nxt[438] = { 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 4, 15, 4, 4, 4, 16, 17, 18, 19, 20, 21, 4, 22, 4, 4, 4, 4, 4, 23, 4, 4, 4, 4, 24, 25, 26, 4, 4, 4, - 4, 4, 27, 28, 30, 30, 31, 31, 30, 45, - 31, 35, 36, 37, 38, 39, 43, 44, 49, 46, - 30, 53, 31, 32, 84, 40, 76, 41, 42, 271, - 54, 50, 51, 52, 55, 76, 85, 87, 88, 89, - 79, 101, 56, 57, 58, 59, 80, 60, 98, 99, - 61, 105, 182, 116, 62, 183, 106, 63, 102, 103, - - 104, 64, 119, 108, 65, 66, 67, 68, 109, 110, - 111, 112, 117, 139, 140, 120, 121, 122, 113, 114, - 115, 124, 124, 69, 70, 125, 255, 71, 72, 73, - 74, 128, 129, 130, 131, 132, 141, 147, 142, 143, - 144, 157, 158, 162, 172, 133, 234, 134, 135, 184, - 185, 186, 179, 163, 148, 180, 149, 173, 150, 181, - 139, 140, 141, 207, 142, 169, 174, 143, 144, 228, - 65, 66, 67, 102, 103, 104, 113, 114, 115, 120, - 121, 122, 50, 51, 52, 56, 57, 58, 109, 110, - 111, 72, 73, 74, 77, 123, 77, 75, 29, 137, - - 310, 309, 136, 82, 308, 307, 306, 163, 305, 304, - 303, 302, 118, 54, 301, 300, 299, 298, 297, 296, - 295, 294, 293, 292, 291, 290, 289, 288, 287, 286, - 285, 284, 283, 127, 282, 281, 99, 280, 279, 278, - 277, 138, 276, 275, 274, 273, 272, 270, 269, 268, - 267, 266, 265, 264, 263, 262, 86, 261, 260, 259, - 258, 257, 256, 254, 253, 252, 251, 250, 249, 248, - 247, 246, 245, 244, 243, 242, 241, 240, 40, 239, - 238, 237, 236, 235, 189, 233, 232, 231, 161, 230, - 229, 227, 226, 225, 224, 223, 222, 221, 220, 219, - - 218, 217, 216, 215, 214, 213, 212, 211, 210, 80, - 209, 35, 208, 206, 205, 204, 203, 202, 201, 200, - 199, 198, 197, 196, 195, 194, 193, 192, 191, 190, - 189, 188, 187, 178, 177, 176, 175, 171, 170, 125, - 125, 168, 167, 166, 165, 164, 161, 160, 159, 156, - 155, 154, 153, 152, 151, 146, 145, 138, 137, 136, - 127, 126, 118, 107, 100, 97, 96, 95, 94, 93, - 92, 91, 90, 86, 83, 82, 81, 78, 32, 48, - 47, 34, 33, 32, 311, 3, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311 + 4, 4, 4, 27, 28, 30, 30, 31, 31, 30, + 45, 31, 35, 36, 37, 38, 39, 43, 44, 49, + 46, 272, 30, 53, 31, 79, 40, 32, 41, 42, + 76, 80, 54, 50, 51, 52, 55, 84, 256, 76, + 87, 88, 89, 98, 99, 56, 57, 58, 59, 85, + 60, 106, 183, 61, 102, 184, 107, 62, 117, 109, + + 63, 140, 141, 100, 64, 110, 111, 112, 65, 66, + 67, 68, 103, 104, 105, 113, 142, 118, 143, 144, + 145, 163, 120, 114, 115, 116, 235, 69, 70, 158, + 159, 164, 71, 72, 73, 74, 121, 122, 123, 125, + 125, 173, 208, 126, 129, 130, 131, 132, 133, 148, + 180, 140, 141, 181, 174, 144, 145, 182, 134, 170, + 135, 136, 124, 142, 175, 143, 149, 75, 150, 29, + 138, 151, 185, 186, 187, 229, 65, 66, 67, 103, + 104, 105, 114, 115, 116, 121, 122, 123, 50, 51, + 52, 56, 57, 58, 110, 111, 112, 72, 73, 74, + + 77, 314, 77, 313, 137, 82, 312, 311, 310, 164, + 309, 308, 307, 306, 100, 119, 54, 305, 304, 303, + 302, 301, 300, 299, 298, 297, 296, 295, 294, 293, + 292, 291, 290, 289, 288, 287, 286, 285, 128, 284, + 283, 282, 99, 281, 280, 279, 278, 139, 277, 276, + 275, 274, 273, 271, 270, 269, 268, 267, 266, 265, + 264, 263, 86, 262, 261, 260, 259, 258, 257, 255, + 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, + 244, 243, 242, 241, 40, 240, 239, 238, 237, 236, + 190, 234, 233, 232, 162, 231, 230, 228, 227, 226, + + 225, 224, 223, 222, 221, 220, 219, 218, 217, 216, + 215, 214, 213, 212, 211, 80, 210, 35, 209, 207, + 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, + 196, 195, 194, 193, 192, 191, 190, 189, 188, 179, + 178, 177, 176, 172, 171, 126, 126, 169, 168, 167, + 166, 165, 162, 161, 160, 157, 156, 155, 154, 153, + 152, 147, 146, 139, 138, 137, 128, 127, 119, 108, + 101, 97, 96, 95, 94, 93, 92, 91, 90, 86, + 83, 82, 81, 78, 32, 48, 47, 34, 33, 32, + 315, 3, 315, 315, 315, 315, 315, 315, 315, 315, + + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315 } ; -static yyconst flex_int16_t yy_chk[431] = +static yyconst flex_int16_t yy_chk[438] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 10, 11, 10, 11, 14, 20, - 14, 18, 18, 18, 18, 18, 19, 19, 23, 20, - 31, 24, 31, 32, 41, 18, 32, 18, 18, 320, - 24, 23, 23, 23, 24, 32, 41, 43, 43, 43, - 36, 61, 24, 24, 24, 25, 36, 25, 59, 59, - 25, 62, 135, 69, 25, 135, 62, 25, 61, 61, - - 61, 25, 71, 64, 25, 25, 25, 26, 64, 64, - 64, 68, 69, 87, 87, 71, 71, 71, 68, 68, - 68, 76, 76, 26, 26, 76, 319, 26, 26, 26, - 26, 81, 81, 81, 81, 81, 88, 92, 88, 89, - 89, 100, 100, 107, 129, 81, 318, 81, 81, 145, - 145, 145, 134, 107, 92, 134, 92, 129, 92, 134, - 184, 184, 185, 317, 185, 316, 129, 186, 186, 197, - 197, 197, 197, 200, 200, 200, 204, 204, 204, 206, - 206, 206, 225, 225, 225, 227, 227, 227, 253, 253, - 253, 282, 282, 282, 314, 315, 314, 313, 312, 310, - - 309, 308, 307, 306, 305, 304, 303, 302, 301, 300, - 299, 298, 297, 296, 294, 293, 292, 290, 289, 288, - 287, 286, 285, 284, 283, 281, 280, 279, 277, 276, - 275, 274, 273, 272, 270, 269, 267, 266, 265, 264, - 262, 261, 260, 259, 258, 257, 256, 254, 252, 251, - 250, 249, 248, 247, 246, 244, 243, 241, 240, 239, - 238, 236, 235, 233, 232, 231, 230, 229, 228, 226, - 224, 222, 220, 219, 218, 217, 216, 215, 214, 213, - 212, 211, 210, 209, 208, 205, 203, 202, 201, 199, - 198, 196, 195, 194, 192, 191, 190, 188, 187, 183, - - 182, 181, 180, 179, 178, 177, 176, 175, 174, 173, - 172, 171, 170, 168, 166, 165, 164, 162, 160, 159, - 158, 157, 156, 155, 154, 153, 152, 151, 150, 149, - 148, 147, 146, 133, 132, 131, 130, 128, 126, 125, - 124, 119, 117, 116, 112, 108, 106, 105, 101, 98, - 97, 96, 95, 94, 93, 91, 90, 85, 84, 83, - 79, 78, 70, 63, 60, 55, 53, 49, 48, 47, - 46, 45, 44, 42, 39, 38, 37, 34, 30, 22, - 21, 15, 13, 12, 3, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 311, 311, 311, 311, 311, 311, 311, 311, 311, 311 + 1, 1, 1, 1, 1, 10, 11, 10, 11, 14, + 20, 14, 18, 18, 18, 18, 18, 19, 19, 23, + 20, 324, 31, 24, 31, 36, 18, 32, 18, 18, + 32, 36, 24, 23, 23, 23, 24, 41, 323, 32, + 43, 43, 43, 59, 59, 24, 24, 24, 25, 41, + 25, 62, 136, 25, 61, 136, 62, 25, 69, 64, + + 25, 87, 87, 59, 25, 64, 64, 64, 25, 25, + 25, 26, 61, 61, 61, 68, 88, 69, 88, 89, + 89, 108, 71, 68, 68, 68, 322, 26, 26, 101, + 101, 108, 26, 26, 26, 26, 71, 71, 71, 76, + 76, 130, 321, 76, 81, 81, 81, 81, 81, 92, + 135, 185, 185, 135, 130, 187, 187, 135, 81, 320, + 81, 81, 319, 186, 130, 186, 92, 317, 92, 316, + 314, 92, 146, 146, 146, 198, 198, 198, 198, 201, + 201, 201, 205, 205, 205, 207, 207, 207, 226, 226, + 226, 228, 228, 228, 254, 254, 254, 284, 284, 284, + + 318, 313, 318, 312, 311, 310, 309, 308, 307, 306, + 305, 304, 303, 302, 301, 300, 299, 297, 296, 295, + 293, 292, 291, 290, 289, 288, 287, 286, 285, 283, + 282, 281, 280, 278, 277, 276, 275, 274, 273, 271, + 270, 269, 268, 267, 266, 265, 263, 262, 261, 260, + 259, 258, 257, 255, 253, 252, 251, 250, 249, 248, + 247, 245, 244, 242, 241, 240, 239, 237, 236, 234, + 233, 232, 231, 230, 229, 227, 225, 223, 221, 220, + 219, 218, 217, 216, 215, 214, 213, 212, 211, 210, + 209, 206, 204, 203, 202, 200, 199, 197, 196, 195, + + 193, 192, 191, 189, 188, 184, 183, 182, 181, 180, + 179, 178, 177, 176, 175, 174, 173, 172, 171, 169, + 167, 166, 165, 163, 161, 160, 159, 158, 157, 156, + 155, 154, 153, 152, 151, 150, 149, 148, 147, 134, + 133, 132, 131, 129, 127, 126, 125, 120, 118, 117, + 113, 109, 107, 106, 102, 98, 97, 96, 95, 94, + 93, 91, 90, 85, 84, 83, 79, 78, 70, 63, + 60, 55, 53, 49, 48, 47, 46, 45, 44, 42, + 39, 38, 37, 34, 30, 22, 21, 15, 13, 12, + 3, 315, 315, 315, 315, 315, 315, 315, 315, 315, + + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315 } ; /* The intent behind this definition is that it'll catch @@ -645,7 +649,7 @@ typedef lol::EasyMeshParser::token_type token_type; #define yyterminate() return token::T_END #define YY_NO_UNISTD_H #define YY_USER_ACTION yylloc->columns(yyleng); -#line 649 "generated/easymesh-scanner.cpp" +#line 653 "generated/easymesh-scanner.cpp" #define INITIAL 0 @@ -757,7 +761,7 @@ YY_DECL yylloc->step(); -#line 761 "generated/easymesh-scanner.cpp" +#line 765 "generated/easymesh-scanner.cpp" if ( !(yy_init) ) { @@ -810,13 +814,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 312 ) + if ( yy_current_state >= 316 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 311 ); + while ( yy_current_state != 315 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -878,264 +882,269 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 60 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATEX; } +#line 59 "easymesh/easymesh-scanner.l" +{ return token::T_VCOLOR; } YY_BREAK case 10: YY_RULE_SETUP #line 61 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATEY; } +{ return token::T_TRANSLATEX; } YY_BREAK case 11: YY_RULE_SETUP #line 62 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATEZ; } +{ return token::T_TRANSLATEY; } YY_BREAK case 12: YY_RULE_SETUP #line 63 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATE; } +{ return token::T_TRANSLATEZ; } YY_BREAK case 13: YY_RULE_SETUP #line 64 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATEX; } +{ return token::T_TRANSLATE; } YY_BREAK case 14: YY_RULE_SETUP #line 65 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATEY; } +{ return token::T_ROTATEX; } YY_BREAK case 15: YY_RULE_SETUP #line 66 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATEZ; } +{ return token::T_ROTATEY; } YY_BREAK case 16: YY_RULE_SETUP #line 67 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATE; } +{ return token::T_ROTATEZ; } YY_BREAK case 17: YY_RULE_SETUP #line 68 "easymesh/easymesh-scanner.l" -{ return token::T_RADIALJITTER; } +{ return token::T_ROTATE; } YY_BREAK case 18: YY_RULE_SETUP #line 69 "easymesh/easymesh-scanner.l" -{ return token::T_TAPERX; } +{ return token::T_RADIALJITTER; } YY_BREAK case 19: YY_RULE_SETUP #line 70 "easymesh/easymesh-scanner.l" -{ return token::T_TAPERY; } +{ return token::T_TAPERX; } YY_BREAK case 20: YY_RULE_SETUP #line 71 "easymesh/easymesh-scanner.l" -{ return token::T_TAPERZ; } +{ return token::T_TAPERY; } YY_BREAK case 21: YY_RULE_SETUP #line 72 "easymesh/easymesh-scanner.l" -{ return token::T_TWISTX; } +{ return token::T_TAPERZ; } YY_BREAK case 22: YY_RULE_SETUP #line 73 "easymesh/easymesh-scanner.l" -{ return token::T_TWISTY; } +{ return token::T_TWISTX; } YY_BREAK case 23: YY_RULE_SETUP #line 74 "easymesh/easymesh-scanner.l" -{ return token::T_TWISTZ; } +{ return token::T_TWISTY; } YY_BREAK case 24: YY_RULE_SETUP #line 75 "easymesh/easymesh-scanner.l" -{ return token::T_SHEARX; } +{ return token::T_TWISTZ; } YY_BREAK case 25: YY_RULE_SETUP #line 76 "easymesh/easymesh-scanner.l" -{ return token::T_SHEARY; } +{ return token::T_SHEARX; } YY_BREAK case 26: YY_RULE_SETUP #line 77 "easymesh/easymesh-scanner.l" -{ return token::T_SHEARZ; } +{ return token::T_SHEARY; } YY_BREAK case 27: YY_RULE_SETUP #line 78 "easymesh/easymesh-scanner.l" -{ return token::T_STRETCHX; } +{ return token::T_SHEARZ; } YY_BREAK case 28: YY_RULE_SETUP #line 79 "easymesh/easymesh-scanner.l" -{ return token::T_STRETCHY; } +{ return token::T_STRETCHX; } YY_BREAK case 29: YY_RULE_SETUP #line 80 "easymesh/easymesh-scanner.l" -{ return token::T_STRETCHZ; } +{ return token::T_STRETCHY; } YY_BREAK case 30: YY_RULE_SETUP #line 81 "easymesh/easymesh-scanner.l" -{ return token::T_BENDXY; } +{ return token::T_STRETCHZ; } YY_BREAK case 31: YY_RULE_SETUP #line 82 "easymesh/easymesh-scanner.l" -{ return token::T_BENDXZ; } +{ return token::T_BENDXY; } YY_BREAK case 32: YY_RULE_SETUP #line 83 "easymesh/easymesh-scanner.l" -{ return token::T_BENDYX; } +{ return token::T_BENDXZ; } YY_BREAK case 33: YY_RULE_SETUP #line 84 "easymesh/easymesh-scanner.l" -{ return token::T_BENDYZ; } +{ return token::T_BENDYX; } YY_BREAK case 34: YY_RULE_SETUP #line 85 "easymesh/easymesh-scanner.l" -{ return token::T_BENDZX; } +{ return token::T_BENDYZ; } YY_BREAK case 35: YY_RULE_SETUP #line 86 "easymesh/easymesh-scanner.l" -{ return token::T_BENDZY; } +{ return token::T_BENDZX; } YY_BREAK case 36: YY_RULE_SETUP #line 87 "easymesh/easymesh-scanner.l" -{ return token::T_SCALEX; } +{ return token::T_BENDZY; } YY_BREAK case 37: YY_RULE_SETUP #line 88 "easymesh/easymesh-scanner.l" -{ return token::T_SCALEY; } +{ return token::T_SCALEX; } YY_BREAK case 38: YY_RULE_SETUP #line 89 "easymesh/easymesh-scanner.l" -{ return token::T_SCALEZ; } +{ return token::T_SCALEY; } YY_BREAK case 39: YY_RULE_SETUP #line 90 "easymesh/easymesh-scanner.l" -{ return token::T_SCALE; } +{ return token::T_SCALEZ; } YY_BREAK case 40: YY_RULE_SETUP #line 91 "easymesh/easymesh-scanner.l" -{ return token::T_MIRRORX; } +{ return token::T_SCALE; } YY_BREAK case 41: YY_RULE_SETUP #line 92 "easymesh/easymesh-scanner.l" -{ return token::T_MIRRORY; } +{ return token::T_MIRRORX; } YY_BREAK case 42: YY_RULE_SETUP #line 93 "easymesh/easymesh-scanner.l" -{ return token::T_MIRRORZ; } +{ return token::T_MIRRORY; } YY_BREAK case 43: YY_RULE_SETUP #line 94 "easymesh/easymesh-scanner.l" -{ return token::T_CHAMFER; } +{ return token::T_MIRRORZ; } YY_BREAK case 44: YY_RULE_SETUP #line 95 "easymesh/easymesh-scanner.l" -{ return token::T_SPLITTRIANGLE; } +{ return token::T_CHAMFER; } YY_BREAK case 45: YY_RULE_SETUP #line 96 "easymesh/easymesh-scanner.l" -{ return token::T_SMOOTHMESH; } +{ return token::T_SPLITTRIANGLE; } YY_BREAK case 46: YY_RULE_SETUP #line 97 "easymesh/easymesh-scanner.l" -{ return token::T_DUPLICATE; } +{ return token::T_SMOOTHMESH; } YY_BREAK case 47: YY_RULE_SETUP -#line 99 "easymesh/easymesh-scanner.l" -{ return token::T_CYLINDER; } +#line 98 "easymesh/easymesh-scanner.l" +{ return token::T_DUPLICATE; } YY_BREAK case 48: YY_RULE_SETUP #line 100 "easymesh/easymesh-scanner.l" -{ return token::T_SPHERE; } +{ return token::T_CYLINDER; } YY_BREAK case 49: YY_RULE_SETUP #line 101 "easymesh/easymesh-scanner.l" -{ return token::T_CAPSULE; } +{ return token::T_SPHERE; } YY_BREAK case 50: YY_RULE_SETUP #line 102 "easymesh/easymesh-scanner.l" -{ return token::T_TORUS; } +{ return token::T_CAPSULE; } YY_BREAK case 51: YY_RULE_SETUP #line 103 "easymesh/easymesh-scanner.l" -{ return token::T_BOX; } +{ return token::T_TORUS; } YY_BREAK case 52: YY_RULE_SETUP #line 104 "easymesh/easymesh-scanner.l" -{ return token::T_SMOOTHCHAMFBOX; } +{ return token::T_BOX; } YY_BREAK case 53: YY_RULE_SETUP #line 105 "easymesh/easymesh-scanner.l" -{ return token::T_FLATCHAMFBOX; } +{ return token::T_SMOOTHCHAMFBOX; } YY_BREAK case 54: YY_RULE_SETUP #line 106 "easymesh/easymesh-scanner.l" -{ return token::T_STAR; } +{ return token::T_FLATCHAMFBOX; } YY_BREAK case 55: YY_RULE_SETUP #line 107 "easymesh/easymesh-scanner.l" -{ return token::T_EXPANDEDSTAR; } +{ return token::T_STAR; } YY_BREAK case 56: YY_RULE_SETUP #line 108 "easymesh/easymesh-scanner.l" -{ return token::T_DISC; } +{ return token::T_EXPANDEDSTAR; } YY_BREAK case 57: YY_RULE_SETUP #line 109 "easymesh/easymesh-scanner.l" -{ return token::T_TRIANGLE; } +{ return token::T_DISC; } YY_BREAK case 58: YY_RULE_SETUP #line 110 "easymesh/easymesh-scanner.l" -{ return token::T_QUAD; } +{ return token::T_TRIANGLE; } YY_BREAK case 59: YY_RULE_SETUP #line 111 "easymesh/easymesh-scanner.l" +{ return token::T_QUAD; } + YY_BREAK +case 60: +YY_RULE_SETUP +#line 112 "easymesh/easymesh-scanner.l" { return token::T_COG; } YY_BREAK /* ======= BASE COLOR TYPES ========================================= */ /* COLOR */ -case 60: +case 61: YY_RULE_SETUP -#line 115 "easymesh/easymesh-scanner.l" +#line 116 "easymesh/easymesh-scanner.l" { uint32_t tmp = std::strtol(yytext + 1, nullptr, 16); yylval->u32val = 0x11000000u * (tmp >> 8) @@ -1144,9 +1153,9 @@ YY_RULE_SETUP | 0x000000ffu; return token::COLOR; } YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 122 "easymesh/easymesh-scanner.l" +#line 123 "easymesh/easymesh-scanner.l" { uint32_t tmp = std::strtol(yytext + 1, nullptr, 16); yylval->u32val = 0x11000000u * (tmp >> 12) @@ -1155,111 +1164,111 @@ YY_RULE_SETUP | 0x00000011u * (tmp & 0xf); return token::COLOR; } YY_BREAK -case 62: +case 63: YY_RULE_SETUP -#line 129 "easymesh/easymesh-scanner.l" +#line 130 "easymesh/easymesh-scanner.l" { yylval->u32val = 0xffu | 0x100u * (uint32_t)std::strtol(yytext + 1, nullptr, 16); return token::COLOR; } YY_BREAK -case 63: +case 64: YY_RULE_SETUP -#line 133 "easymesh/easymesh-scanner.l" +#line 134 "easymesh/easymesh-scanner.l" { yylval->u32val = (uint32_t)std::strtol(yytext + 1, nullptr, 16); return token::COLOR; } YY_BREAK /* ======= BASE DATA TYPES ========================================= */ /* BOOL */ -case 64: +case 65: YY_RULE_SETUP -#line 139 "easymesh/easymesh-scanner.l" +#line 140 "easymesh/easymesh-scanner.l" { yylval->bval = true; return token::BOOLEAN; } YY_BREAK -case 65: +case 66: YY_RULE_SETUP -#line 140 "easymesh/easymesh-scanner.l" +#line 141 "easymesh/easymesh-scanner.l" { yylval->bval = false; return token::BOOLEAN; } YY_BREAK /* FLOAT */ -case 66: +case 67: YY_RULE_SETUP -#line 142 "easymesh/easymesh-scanner.l" +#line 143 "easymesh/easymesh-scanner.l" { yylval->fval = (float)std::atof(yytext); return token::F_NUMBER; } YY_BREAK /* INT */ -case 67: +case 68: YY_RULE_SETUP -#line 145 "easymesh/easymesh-scanner.l" +#line 146 "easymesh/easymesh-scanner.l" { yylval->ival = std::atoi(yytext); return token::I_NUMBER; } YY_BREAK /* ======= COMMENTS ======= */ -case 68: +case 69: YY_RULE_SETUP -#line 149 "easymesh/easymesh-scanner.l" +#line 150 "easymesh/easymesh-scanner.l" { /* ignore this */ } YY_BREAK /* Semantics tokens */ -case 69: -YY_RULE_SETUP -#line 152 "easymesh/easymesh-scanner.l" -{ return token_type('-'); } - YY_BREAK case 70: YY_RULE_SETUP #line 153 "easymesh/easymesh-scanner.l" -{ return token_type('('); } +{ return token_type('-'); } YY_BREAK case 71: YY_RULE_SETUP #line 154 "easymesh/easymesh-scanner.l" -{ return token_type(')'); } +{ return token_type('('); } YY_BREAK case 72: YY_RULE_SETUP #line 155 "easymesh/easymesh-scanner.l" -{ return token_type('{'); } +{ return token_type(')'); } YY_BREAK case 73: YY_RULE_SETUP #line 156 "easymesh/easymesh-scanner.l" -{ return token_type('}'); } +{ return token_type('{'); } YY_BREAK case 74: YY_RULE_SETUP #line 157 "easymesh/easymesh-scanner.l" -{ return token_type('['); } +{ return token_type('}'); } YY_BREAK case 75: YY_RULE_SETUP #line 158 "easymesh/easymesh-scanner.l" -{ return token_type(']'); } +{ return token_type('['); } YY_BREAK case 76: YY_RULE_SETUP #line 159 "easymesh/easymesh-scanner.l" -{ /* ignore this */ } +{ return token_type(']'); } YY_BREAK case 77: -/* rule 77 can match eol */ YY_RULE_SETUP #line 160 "easymesh/easymesh-scanner.l" { /* ignore this */ } YY_BREAK case 78: +/* rule 78 can match eol */ YY_RULE_SETUP #line 161 "easymesh/easymesh-scanner.l" -{ return token::T_ERROR; } +{ /* ignore this */ } YY_BREAK case 79: YY_RULE_SETUP -#line 163 "easymesh/easymesh-scanner.l" +#line 162 "easymesh/easymesh-scanner.l" +{ return token::T_ERROR; } + YY_BREAK +case 80: +YY_RULE_SETUP +#line 164 "easymesh/easymesh-scanner.l" ECHO; YY_BREAK -#line 1263 "generated/easymesh-scanner.cpp" +#line 1272 "generated/easymesh-scanner.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1641,7 +1650,7 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 312 ) + if ( yy_current_state >= 316 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1669,11 +1678,11 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 312 ) + if ( yy_current_state >= 316 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 311); + yy_is_jam = (yy_current_state == 315); return yy_is_jam ? 0 : yy_current_state; } @@ -2160,7 +2169,7 @@ void EasyMeshfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 163 "easymesh/easymesh-scanner.l" +#line 164 "easymesh/easymesh-scanner.l" diff --git a/test/data/mesh-buffer.txt b/test/data/mesh-buffer.txt index bab27e1b..7edd840e 100644 --- a/test/data/mesh-buffer.txt +++ b/test/data/mesh-buffer.txt @@ -1,6 +1,6 @@ addlight 0.0 position (1 -1 1) color #fff addlight 0.0 position (-1 -1 -1) color #fff -clearcolor #f00 +clearcolor #000 //addlight 0.0 position (1 0 1) color #0ff //addlight 0.0 position (-0.2 -1 -0.5) color (.0 .2 .5 1) @@ -8,16 +8,15 @@ clearcolor #f00 custom setmesh " -[sc#0f0 scb#0f0 ac 3 .5 .4 0 ty .25 [ad 3 .4 sy -1] ty .5 ac 3 1 .1 .1 ty .5 dup [ rz 90 ry 90 dup [ ry 90 ] ] ] - +[sc#0f0 scb#0f0 ac 3 .5 .4 0 ty .25 [ad 3 .4 sy -1] ty .5 ac 3 1 .1 .1 ty .5 dup [ rz 90 ry 90 scv#00f dup [ ry 90 scv#f00 ] ] ] +[sc#fff ab .1] //[sc#f00 scb#f00 ac 3 .5 .4 0 ty .25 [ad 3 .4 sy -1] ty .5 ac 3 1 .1 .1 ty .5 rz -90] //[sc#00f scb#00f ac 3 .5 .4 0 ty .25 [ad 3 .4 sy -1] ty .5 ac 3 1 .1 .1 ty .5 rx 90] -//[sc#fff ab .1] -[sc#f00 ab .2 tx 1] -[sc#0f0 ab .2 ty 1] -[sc#00f ab .2 tz 1] +//[sc#f00 ab .2 tx 1] +//[sc#0f0 ab .2 ty 1] +//[sc#00f ab .2 tz 1] //sc#0f0 ab 2 ty 1.5 ab 2 //sc#00f ab 2 ty 1.5 ab 2 diff --git a/test/easymeshdictionnary.js b/test/easymeshdictionnary.js index 07dfb024..395200bb 100644 --- a/test/easymeshdictionnary.js +++ b/test/easymeshdictionnary.js @@ -1,7 +1,7 @@ //------------------------------------------------------------------------- //Command vars operations //------------------------------------------------------------------------- -CmdVar("[ ]", ["Opens a new context,\nevery operations between the braces\nwill only be done to the vertices added\nsince the start of this context."]); +CmdVar("[ ]", ["Opens a new scope,\nevery operations between the braces\nwill only be done to the vertices added\nsince the start of this scope."]); CmdVar("float", ["Fraction value", "0.0"]); CmdVar("int", ["No decimal value", "0"]); CmdVar("bool", ["Boolean value", "true/false", "1/0"]); @@ -24,7 +24,8 @@ CmdType(["csgx", "csgxor"], "Performs a Xor operation as (m0_Outside/m0_Inside- //------------------------------------------------------------------------- CmdType(["tsw", "scalewinding"], "When activated, on negative-scaling,\nnormal-vector correction will not occur"); CmdType(["sc", "setcolor"], "Set A color", [CmdArg("color", "color")]); -CmdType(["scb", "setbgcolor"], "Set B color", [CmdArg("color", "color")]); +CmdType(["scb", "setcolorb"], "Set B color", [CmdArg("color", "color")]); +CmdType(["scv", "setcolorv"], "Set the color of all vertices in this scope", [CmdArg("color", "color")]); //------------------------------------------------------------------------- //Mesh transform operations