From 68855bf2fdb5d7aa456b96e44eef3640efcab5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20=E2=80=98Touky=E2=80=99=20Huet?= Date: Mon, 23 Sep 2013 18:08:23 +0000 Subject: [PATCH] EasyMesh syntax was dead. --- src/easymesh/easymesh-parser.y | 4 +- src/generated/easymesh-parser.cpp | 1089 ++++++++++++++-------------- src/generated/easymesh-parser.h | 65 +- src/generated/easymesh-scanner.cpp | 635 ++++++++-------- 4 files changed, 913 insertions(+), 880 deletions(-) diff --git a/src/easymesh/easymesh-parser.y b/src/easymesh/easymesh-parser.y index f34ee875..47f5c6f7 100644 --- a/src/easymesh/easymesh-parser.y +++ b/src/easymesh/easymesh-parser.y @@ -44,7 +44,7 @@ %start mesh_description -%token T_COLOR T_BGCOLOR +%token T_COLOR T_BCOLOR %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 @@ -152,7 +152,7 @@ transform_command: | T_ROTATEY fv { mc.m_mesh.RotateY($2); } | T_ROTATEZ fv { mc.m_mesh.RotateZ($2); } | T_ROTATE fv fv fv fv { mc.m_mesh.RotateZ($2, vec3($3, $4, $5)); } - | T_ROTATE fv vec3 { mc.m_mesh.RotateZ($2, vec3($3[0], $3[1], $3[2])); } + | T_ROTATE fv v3 { mc.m_mesh.RotateZ($2, vec3($3[0], $3[1], $3[2])); } | T_RADIALJITTER fv { mc.m_mesh.RadialJitter($2); } | T_TAPERX fv fv fv bv { mc.m_mesh.TaperX($2, $3, $4, $5); } | T_TAPERX fv fv fv { mc.m_mesh.TaperX($2, $3, $4); } diff --git a/src/generated/easymesh-parser.cpp b/src/generated/easymesh-parser.cpp index 92d6169f..10fa0f5a 100644 --- a/src/generated/easymesh-parser.cpp +++ b/src/generated/easymesh-parser.cpp @@ -437,882 +437,896 @@ namespace lol { YY_REDUCE_PRINT (yyn); switch (yyn) { - case 7: + case 13: /* Line 677 of lalr1.cc */ -#line 105 "easymesh/easymesh-parser.y" - { mc.m_mesh.OpenBrace(); } - break; - - case 8: - -/* Line 677 of lalr1.cc */ -#line 109 "easymesh/easymesh-parser.y" - { mc.m_mesh.CloseBrace(); } +#line 117 "easymesh/easymesh-parser.y" + { mc.m_mesh.CsgUnion(); } break; case 14: /* Line 677 of lalr1.cc */ -#line 124 "easymesh/easymesh-parser.y" - { mc.m_mesh.SetCurColor(vec4((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } +#line 118 "easymesh/easymesh-parser.y" + { mc.m_mesh.CsgSubstract(); } break; case 15: /* Line 677 of lalr1.cc */ -#line 125 "easymesh/easymesh-parser.y" - { mc.m_mesh.SetCurColor(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])); } +#line 119 "easymesh/easymesh-parser.y" + { mc.m_mesh.CsgSubstractLoss(); } break; case 16: /* Line 677 of lalr1.cc */ -#line 126 "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.SetCurColor(vec4(v) * (1.f / 255.f)); } +#line 120 "easymesh/easymesh-parser.y" + { mc.m_mesh.CsgAnd(); } break; case 17: /* Line 677 of lalr1.cc */ -#line 129 "easymesh/easymesh-parser.y" - { mc.m_mesh.SetCurColor2(vec4((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } +#line 121 "easymesh/easymesh-parser.y" + { mc.m_mesh.CsgXor(); } break; case 18: /* Line 677 of lalr1.cc */ -#line 130 "easymesh/easymesh-parser.y" - { mc.m_mesh.SetCurColor2(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])); } +#line 125 "easymesh/easymesh-parser.y" + { mc.m_mesh.OpenBrace(); } break; case 19: /* Line 677 of lalr1.cc */ -#line 131 "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.SetCurColor2(vec4(v) * (1.f / 255.f)); } +#line 129 "easymesh/easymesh-parser.y" + { mc.m_mesh.CloseBrace(); } break; case 20: /* Line 677 of lalr1.cc */ -#line 137 "easymesh/easymesh-parser.y" - { mc.m_mesh.Chamfer((yysemantic_stack_[(2) - (2)].fval)); } +#line 133 "easymesh/easymesh-parser.y" + { mc.m_mesh.SetCurColor(vec4((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } break; case 21: /* Line 677 of lalr1.cc */ -#line 138 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].fval), 0.f, 0.f)); } +#line 134 "easymesh/easymesh-parser.y" + { mc.m_mesh.SetCurColor(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 22: /* Line 677 of lalr1.cc */ -#line 139 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3(0.f, (yysemantic_stack_[(2) - (2)].fval), 0.f)); } +#line 135 "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.SetCurColor(vec4(v) * (1.f / 255.f)); } break; case 23: /* Line 677 of lalr1.cc */ -#line 140 "easymesh/easymesh-parser.y" - { mc.m_mesh.Translate(vec3(0.f, 0.f, (yysemantic_stack_[(2) - (2)].fval))); } +#line 138 "easymesh/easymesh-parser.y" + { mc.m_mesh.SetCurColor2(vec4((yysemantic_stack_[(5) - (2)].fval), (yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } break; case 24: /* Line 677 of lalr1.cc */ -#line 141 "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 139 "easymesh/easymesh-parser.y" + { mc.m_mesh.SetCurColor2(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 25: /* Line 677 of lalr1.cc */ -#line 142 "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 140 "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.SetCurColor2(vec4(v) * (1.f / 255.f)); } break; case 26: /* Line 677 of lalr1.cc */ -#line 143 "easymesh/easymesh-parser.y" - { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].fval)); } +#line 146 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3((yysemantic_stack_[(2) - (2)].fval), 0.f, 0.f)); } break; case 27: /* Line 677 of lalr1.cc */ -#line 144 "easymesh/easymesh-parser.y" - { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].fval)); } +#line 147 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3(0.f, (yysemantic_stack_[(2) - (2)].fval), 0.f)); } break; case 28: /* Line 677 of lalr1.cc */ -#line 145 "easymesh/easymesh-parser.y" - { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 148 "easymesh/easymesh-parser.y" + { mc.m_mesh.Translate(vec3(0.f, 0.f, (yysemantic_stack_[(2) - (2)].fval))); } break; case 29: /* Line 677 of lalr1.cc */ -#line 146 "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 149 "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 30: /* Line 677 of lalr1.cc */ -#line 147 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 150 "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 31: /* Line 677 of lalr1.cc */ -#line 148 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 151 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateX((yysemantic_stack_[(2) - (2)].fval)); } break; case 32: /* Line 677 of lalr1.cc */ -#line 149 "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 152 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateY((yysemantic_stack_[(2) - (2)].fval)); } break; case 33: /* Line 677 of lalr1.cc */ -#line 150 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 153 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 34: /* Line 677 of lalr1.cc */ -#line 151 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 154 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateZ((yysemantic_stack_[(5) - (2)].fval), vec3((yysemantic_stack_[(5) - (3)].fval), (yysemantic_stack_[(5) - (4)].fval), (yysemantic_stack_[(5) - (5)].fval))); } break; case 35: /* Line 677 of lalr1.cc */ -#line 152 "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 155 "easymesh/easymesh-parser.y" + { mc.m_mesh.RotateZ((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 36: /* Line 677 of lalr1.cc */ -#line 153 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 156 "easymesh/easymesh-parser.y" + { mc.m_mesh.RadialJitter((yysemantic_stack_[(2) - (2)].fval)); } break; case 37: /* Line 677 of lalr1.cc */ -#line 154 "easymesh/easymesh-parser.y" - { mc.m_mesh.TaperZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 157 "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 38: /* Line 677 of lalr1.cc */ -#line 155 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 158 "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 39: /* Line 677 of lalr1.cc */ -#line 156 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistX((yysemantic_stack_[(2) - (2)].fval)); } +#line 159 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 40: /* Line 677 of lalr1.cc */ -#line 157 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 160 "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 41: /* Line 677 of lalr1.cc */ -#line 158 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistY((yysemantic_stack_[(2) - (2)].fval)); } +#line 161 "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 42: /* Line 677 of lalr1.cc */ -#line 159 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 162 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 43: /* Line 677 of lalr1.cc */ -#line 160 "easymesh/easymesh-parser.y" - { mc.m_mesh.TwistZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 163 "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 44: /* Line 677 of lalr1.cc */ -#line 161 "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 164 "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 45: /* Line 677 of lalr1.cc */ -#line 162 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 165 "easymesh/easymesh-parser.y" + { mc.m_mesh.TaperZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 46: /* Line 677 of lalr1.cc */ -#line 163 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 166 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 47: /* Line 677 of lalr1.cc */ -#line 164 "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 167 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistX((yysemantic_stack_[(2) - (2)].fval)); } break; case 48: /* Line 677 of lalr1.cc */ -#line 165 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 168 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 49: /* Line 677 of lalr1.cc */ -#line 166 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 169 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistY((yysemantic_stack_[(2) - (2)].fval)); } break; case 50: /* Line 677 of lalr1.cc */ -#line 167 "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 170 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 51: /* Line 677 of lalr1.cc */ -#line 168 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 171 "easymesh/easymesh-parser.y" + { mc.m_mesh.TwistZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 52: /* Line 677 of lalr1.cc */ -#line 169 "easymesh/easymesh-parser.y" - { mc.m_mesh.ShearZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 172 "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 53: /* Line 677 of lalr1.cc */ -#line 170 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchX((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 173 "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 54: /* Line 677 of lalr1.cc */ -#line 171 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 174 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 55: /* Line 677 of lalr1.cc */ -#line 172 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchY((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 175 "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 56: /* Line 677 of lalr1.cc */ -#line 173 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 176 "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 57: /* Line 677 of lalr1.cc */ -#line 174 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchZ((yysemantic_stack_[(4) - (2)].fval), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 177 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 58: /* Line 677 of lalr1.cc */ -#line 175 "easymesh/easymesh-parser.y" - { mc.m_mesh.StretchZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 178 "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 59: /* Line 677 of lalr1.cc */ -#line 176 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 179 "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 60: /* Line 677 of lalr1.cc */ -#line 177 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXY((yysemantic_stack_[(2) - (2)].fval)); } +#line 180 "easymesh/easymesh-parser.y" + { mc.m_mesh.ShearZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 61: /* Line 677 of lalr1.cc */ -#line 178 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 181 "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 62: /* Line 677 of lalr1.cc */ -#line 179 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendXZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 182 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 63: /* Line 677 of lalr1.cc */ -#line 180 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 183 "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 64: /* Line 677 of lalr1.cc */ -#line 181 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYX((yysemantic_stack_[(2) - (2)].fval)); } +#line 184 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 65: /* Line 677 of lalr1.cc */ -#line 182 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 185 "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 66: /* Line 677 of lalr1.cc */ -#line 183 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendYZ((yysemantic_stack_[(2) - (2)].fval)); } +#line 186 "easymesh/easymesh-parser.y" + { mc.m_mesh.StretchZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 67: /* Line 677 of lalr1.cc */ -#line 184 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 187 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 68: /* Line 677 of lalr1.cc */ -#line 185 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZX((yysemantic_stack_[(2) - (2)].fval)); } +#line 188 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXY((yysemantic_stack_[(2) - (2)].fval)); } break; case 69: /* Line 677 of lalr1.cc */ -#line 186 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } +#line 189 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 70: /* Line 677 of lalr1.cc */ -#line 187 "easymesh/easymesh-parser.y" - { mc.m_mesh.BendZY((yysemantic_stack_[(2) - (2)].fval)); } +#line 190 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendXZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 71: /* Line 677 of lalr1.cc */ -#line 188 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].fval), 1.f, 1.f)); } +#line 191 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 72: /* Line 677 of lalr1.cc */ -#line 189 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3(1.f, (yysemantic_stack_[(2) - (2)].fval), 1.f)); } +#line 192 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYX((yysemantic_stack_[(2) - (2)].fval)); } break; case 73: /* Line 677 of lalr1.cc */ -#line 190 "easymesh/easymesh-parser.y" - { mc.m_mesh.Scale(vec3(1.f, 1.f, (yysemantic_stack_[(2) - (2)].fval))); } +#line 193 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYZ((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 74: /* Line 677 of lalr1.cc */ -#line 191 "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 194 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendYZ((yysemantic_stack_[(2) - (2)].fval)); } break; case 75: /* Line 677 of lalr1.cc */ -#line 192 "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 195 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZX((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 76: /* Line 677 of lalr1.cc */ -#line 193 "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 196 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZX((yysemantic_stack_[(2) - (2)].fval)); } break; case 77: /* Line 677 of lalr1.cc */ -#line 194 "easymesh/easymesh-parser.y" - { mc.m_mesh.MirrorX(); } +#line 197 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZY((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].fval)); } break; case 78: /* Line 677 of lalr1.cc */ -#line 195 "easymesh/easymesh-parser.y" - { mc.m_mesh.MirrorY(); } +#line 198 "easymesh/easymesh-parser.y" + { mc.m_mesh.BendZY((yysemantic_stack_[(2) - (2)].fval)); } break; case 79: /* Line 677 of lalr1.cc */ -#line 196 "easymesh/easymesh-parser.y" - { mc.m_mesh.MirrorZ(); } +#line 199 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3((yysemantic_stack_[(2) - (2)].fval), 1.f, 1.f)); } break; case 80: /* Line 677 of lalr1.cc */ -#line 197 "easymesh/easymesh-parser.y" - { mc.m_mesh.RadialJitter((yysemantic_stack_[(2) - (2)].fval)); } +#line 200 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3(1.f, (yysemantic_stack_[(2) - (2)].fval), 1.f)); } break; case 81: /* Line 677 of lalr1.cc */ -#line 198 "easymesh/easymesh-parser.y" - { mc.m_mesh.SplitTriangles((yysemantic_stack_[(2) - (2)].ival)); } +#line 201 "easymesh/easymesh-parser.y" + { mc.m_mesh.Scale(vec3(1.f, 1.f, (yysemantic_stack_[(2) - (2)].fval))); } break; case 82: /* Line 677 of lalr1.cc */ -#line 199 "easymesh/easymesh-parser.y" - { mc.m_mesh.SmoothMesh((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].ival), (yysemantic_stack_[(4) - (4)].ival)); } +#line 202 "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 83: /* Line 677 of lalr1.cc */ -#line 200 "easymesh/easymesh-parser.y" - { mc.m_mesh.ToggleScaleWinding(); } +#line 203 "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 84: /* Line 677 of lalr1.cc */ -#line 201 "easymesh/easymesh-parser.y" - { mc.m_mesh.CsgUnion(); } +#line 204 "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 85: /* Line 677 of lalr1.cc */ -#line 202 "easymesh/easymesh-parser.y" - { mc.m_mesh.CsgSubstract(); } +#line 205 "easymesh/easymesh-parser.y" + { mc.m_mesh.MirrorX(); } break; case 86: /* Line 677 of lalr1.cc */ -#line 203 "easymesh/easymesh-parser.y" - { mc.m_mesh.CsgSubstractLoss(); } +#line 206 "easymesh/easymesh-parser.y" + { mc.m_mesh.MirrorY(); } break; case 87: /* Line 677 of lalr1.cc */ -#line 204 "easymesh/easymesh-parser.y" - { mc.m_mesh.CsgAnd(); } +#line 207 "easymesh/easymesh-parser.y" + { mc.m_mesh.MirrorZ(); } break; case 88: /* Line 677 of lalr1.cc */ -#line 205 "easymesh/easymesh-parser.y" - { mc.m_mesh.CsgXor(); } +#line 208 "easymesh/easymesh-parser.y" + { mc.m_mesh.Chamfer((yysemantic_stack_[(2) - (2)].fval)); } break; case 89: /* Line 677 of lalr1.cc */ #line 209 "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)); } + { mc.m_mesh.SplitTriangles((yysemantic_stack_[(2) - (2)].ival)); } break; case 90: /* Line 677 of lalr1.cc */ #line 210 "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)); } + { mc.m_mesh.SmoothMesh((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].ival), (yysemantic_stack_[(4) - (4)].ival)); } break; case 91: /* Line 677 of lalr1.cc */ #line 211 "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)); } + { mc.m_mesh.ToggleScaleWinding(); } break; case 92: /* Line 677 of lalr1.cc */ -#line 212 "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 215 "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 93: /* Line 677 of lalr1.cc */ -#line 213 "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 216 "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 94: /* Line 677 of lalr1.cc */ -#line 214 "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 217 "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 95: /* Line 677 of lalr1.cc */ -#line 215 "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 218 "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 96: /* Line 677 of lalr1.cc */ -#line 216 "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 219 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSphere((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } break; case 97: /* Line 677 of lalr1.cc */ -#line 217 "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 220 "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 98: /* Line 677 of lalr1.cc */ -#line 218 "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 221 "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 99: /* Line 677 of lalr1.cc */ -#line 219 "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 222 "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 100: /* Line 677 of lalr1.cc */ -#line 220 "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 223 "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 101: /* Line 677 of lalr1.cc */ -#line 221 "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 224 "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 102: /* Line 677 of lalr1.cc */ -#line 222 "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 225 "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 103: /* Line 677 of lalr1.cc */ -#line 223 "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 226 "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 104: /* Line 677 of lalr1.cc */ -#line 224 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSphere((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } +#line 227 "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 105: /* Line 677 of lalr1.cc */ -#line 225 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendCapsule((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 228 "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 106: /* Line 677 of lalr1.cc */ -#line 226 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendTorus((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 229 "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 107: /* Line 677 of lalr1.cc */ -#line 227 "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 230 "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 108: /* Line 677 of lalr1.cc */ -#line 228 "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 231 "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 109: /* Line 677 of lalr1.cc */ -#line 229 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendStar((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 232 "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 110: /* Line 677 of lalr1.cc */ -#line 230 "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 233 "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 111: /* Line 677 of lalr1.cc */ -#line 231 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendExpandedStar((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].fval)); } +#line 234 "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 112: /* Line 677 of lalr1.cc */ -#line 232 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendDisc((yysemantic_stack_[(4) - (2)].ival), (yysemantic_stack_[(4) - (3)].fval), (yysemantic_stack_[(4) - (4)].bval)); } +#line 235 "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 113: /* Line 677 of lalr1.cc */ -#line 233 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendDisc((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } +#line 236 "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 114: /* Line 677 of lalr1.cc */ -#line 234 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } +#line 237 "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 115: /* Line 677 of lalr1.cc */ -#line 235 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].fval)); } +#line 239 "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 116: /* Line 677 of lalr1.cc */ -#line 236 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } +#line 240 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendDisc((yysemantic_stack_[(3) - (2)].ival), (yysemantic_stack_[(3) - (3)].fval)); } break; case 117: /* Line 677 of lalr1.cc */ -#line 237 "easymesh/easymesh-parser.y" - { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].fval)); } +#line 241 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } break; case 118: /* Line 677 of lalr1.cc */ -#line 238 "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 242 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleTriangle((yysemantic_stack_[(2) - (2)].fval)); } break; case 119: /* Line 677 of lalr1.cc */ -#line 239 "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 243 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(3) - (2)].fval), (yysemantic_stack_[(3) - (3)].bval)); } break; case 120: /* Line 677 of lalr1.cc */ -#line 240 "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 244 "easymesh/easymesh-parser.y" + { mc.m_mesh.AppendSimpleQuad((yysemantic_stack_[(2) - (2)].fval)); } break; case 121: /* Line 677 of lalr1.cc */ #line 245 "easymesh/easymesh-parser.y" - { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); } + { 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 122: /* Line 677 of lalr1.cc */ #line 246 "easymesh/easymesh-parser.y" - { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); } + { 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 123: /* Line 677 of lalr1.cc */ #line 247 "easymesh/easymesh-parser.y" - { (yyval.fval) = (float)(yysemantic_stack_[(1) - (1)].ival); } + { 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 124: /* Line 677 of lalr1.cc */ -#line 248 "easymesh/easymesh-parser.y" - { (yyval.fval) = -(float)(yysemantic_stack_[(2) - (2)].ival); } +#line 252 "easymesh/easymesh-parser.y" + { (yyval.fval) = (yysemantic_stack_[(1) - (1)].fval); } break; case 125: /* Line 677 of lalr1.cc */ -#line 252 "easymesh/easymesh-parser.y" - { (yyval.ival) = (yysemantic_stack_[(1) - (1)].ival); } +#line 253 "easymesh/easymesh-parser.y" + { (yyval.fval) = -(yysemantic_stack_[(2) - (2)].fval); } break; case 126: /* Line 677 of lalr1.cc */ -#line 253 "easymesh/easymesh-parser.y" - { (yyval.ival) = -(yysemantic_stack_[(2) - (2)].ival); } +#line 254 "easymesh/easymesh-parser.y" + { (yyval.fval) = (float)(yysemantic_stack_[(1) - (1)].ival); } break; case 127: /* Line 677 of lalr1.cc */ -#line 254 "easymesh/easymesh-parser.y" - { (yyval.ival) = (int)(yysemantic_stack_[(1) - (1)].fval); } +#line 255 "easymesh/easymesh-parser.y" + { (yyval.fval) = -(float)(yysemantic_stack_[(2) - (2)].ival); } break; case 128: /* Line 677 of lalr1.cc */ -#line 255 "easymesh/easymesh-parser.y" - { (yyval.ival) = -(int)(yysemantic_stack_[(2) - (2)].fval); } +#line 259 "easymesh/easymesh-parser.y" + { (yyval.ival) = (yysemantic_stack_[(1) - (1)].ival); } break; case 129: /* Line 677 of lalr1.cc */ #line 260 "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.ival) = -(yysemantic_stack_[(2) - (2)].ival); } break; case 130: /* Line 677 of lalr1.cc */ #line 261 "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); } + { (yyval.ival) = (int)(yysemantic_stack_[(1) - (1)].fval); } break; case 131: /* Line 677 of lalr1.cc */ -#line 265 "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 262 "easymesh/easymesh-parser.y" + { (yyval.ival) = -(int)(yysemantic_stack_[(2) - (2)].fval); } break; case 132: /* Line 677 of lalr1.cc */ -#line 266 "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 267 "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 133: /* Line 677 of lalr1.cc */ -#line 271 "easymesh/easymesh-parser.y" - { (yyval.bval) = (yysemantic_stack_[(1) - (1)].bval); } +#line 268 "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 134: /* Line 677 of lalr1.cc */ #line 272 "easymesh/easymesh-parser.y" - { (yyval.bval) = !!(yysemantic_stack_[(1) - (1)].ival); } + { (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 135: /* Line 677 of lalr1.cc */ #line 273 "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 136: + +/* Line 677 of lalr1.cc */ +#line 278 "easymesh/easymesh-parser.y" + { (yyval.bval) = (yysemantic_stack_[(1) - (1)].bval); } + break; + + case 137: + +/* Line 677 of lalr1.cc */ +#line 279 "easymesh/easymesh-parser.y" + { (yyval.bval) = !!(yysemantic_stack_[(1) - (1)].ival); } + break; + + case 138: + +/* Line 677 of lalr1.cc */ +#line 280 "easymesh/easymesh-parser.y" { (yyval.bval) = !!(yysemantic_stack_[(1) - (1)].fval); } break; /* Line 677 of lalr1.cc */ -#line 1316 "generated/easymesh-parser.cpp" +#line 1330 "generated/easymesh-parser.cpp" default: break; } @@ -1517,36 +1531,36 @@ namespace lol { /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ - const signed char EasyMeshParser::yypact_ninf_ = -37; + const signed char EasyMeshParser::yypact_ninf_ = -33; const short int EasyMeshParser::yypact_[] = { - 317, 46, 72, -24, -24, -24, -24, -24, -24, -24, - -24, -24, -37, -24, -24, -24, -24, -24, -24, -24, - -24, -24, -37, -24, -24, -24, -24, -24, -24, -24, - -24, -24, -37, 5, 5, -37, -24, 70, 70, -37, - -37, -37, -37, -37, -24, 70, 5, 5, 5, 70, - 70, 70, 70, 70, -24, -24, 70, 70, -37, 10, - 20, 317, 317, 380, -37, -37, -37, -37, -37, -37, - -37, 87, -24, -24, -37, -37, -24, -37, -37, -37, - -24, -24, -24, -24, -24, -24, -37, -37, -37, -24, - -24, -24, -24, -24, -24, -37, -37, -37, -24, -24, - -24, -24, -24, -24, -37, -24, -24, -37, -24, -37, - -37, -37, -37, 87, -37, 70, -37, -24, -24, -24, - -24, -24, -24, -24, -24, -24, -24, -24, -24, -22, - -22, -24, -24, -37, -37, -37, -36, -37, -37, -37, - 87, -37, -37, -11, -24, -24, -24, -37, -24, -24, - -37, -37, -24, -37, -24, -24, -37, -37, -24, -37, - -24, -24, -37, -37, -7, -24, -24, -37, -37, 70, - -24, -24, -37, -24, -37, -24, -37, -37, -24, -24, - -24, -22, -37, -37, -37, -37, -37, -24, -24, -37, - -37, -37, -37, -37, -24, -24, -24, -22, -22, -37, - -22, -22, -37, -22, -22, -37, -37, -24, -37, -37, - -37, -24, -24, -24, -24, -37, -22, -24, -37, -24, - -37, -24, -37, -37, -37, -37, -37, -37, -37, -37, - -33, -22, -37, -37, -37, -22, -37, -24, -12, -37, - -22, -37, -24, -37, -22, -24, -37, -24, -24, -22, - -37 + 353, 74, 89, -24, -24, -24, -24, -24, -24, -24, + -24, -24, -33, -24, -24, -24, -24, -24, -24, -24, + -24, -24, -33, -24, -24, -24, -24, -24, -24, -24, + -24, -24, -33, 6, -24, 6, -33, -24, 2, 2, + -33, -33, -33, -33, -33, -24, 2, 6, 6, 6, + 2, 2, 2, 2, 2, -24, -24, 2, 2, -33, + 10, 20, 353, 417, -33, -33, 353, -33, -33, -33, + -33, -33, -33, 72, -24, -24, -33, -33, -24, -33, + -33, -33, -24, -24, -24, -24, -24, -24, -33, -33, + -33, -24, -24, -24, -24, -24, -24, -33, -33, -33, + -24, -24, -24, -24, -24, -24, -33, -24, -24, -33, + 6, -24, -33, -33, -33, -33, 72, -33, 2, -33, + -24, -24, -24, -24, -24, -24, -24, -24, -24, -24, + -24, -24, -22, -22, -24, -24, -33, -33, -33, -33, + -30, -33, -33, 72, -33, -33, -11, -24, -24, -24, + -33, -24, -24, -33, -33, -24, -33, -24, -24, -33, + -33, -24, -33, -24, -24, -33, -33, -7, -24, -24, + -33, -24, -33, -33, 2, -24, -24, -33, -24, -33, + -24, -33, -33, -24, -24, -24, -22, -33, -33, -33, + -33, -33, -24, -24, -33, -33, -33, -33, -33, -24, + -24, -24, -22, -22, -33, -22, -22, -33, -22, -22, + -33, -33, -24, -33, -24, -33, -33, -24, -24, -24, + -24, -33, -22, -24, -33, -24, -33, -24, -33, -33, + -33, -33, -33, -33, -33, -33, -12, -33, -22, -33, + -33, -33, -22, -33, -24, -10, -33, -22, -33, -24, + -33, -22, -24, -33, -24, -24, -22, -33 }; /* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE @@ -1556,100 +1570,104 @@ namespace lol { EasyMeshParser::yydefact_[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 78, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 79, 0, 0, 83, 0, 0, 0, 84, - 85, 86, 87, 88, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, - 0, 3, 0, 5, 9, 11, 12, 13, 121, 123, - 16, 0, 0, 0, 15, 19, 0, 18, 21, 26, - 0, 39, 0, 0, 60, 62, 71, 22, 27, 0, - 41, 0, 0, 64, 66, 72, 23, 28, 0, 43, - 0, 0, 68, 70, 73, 0, 0, 25, 76, 75, - 80, 127, 125, 0, 81, 0, 20, 0, 95, 97, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, - 117, 0, 0, 1, 2, 4, 0, 10, 121, 123, - 0, 122, 124, 0, 0, 0, 31, 38, 46, 54, - 59, 61, 34, 40, 49, 56, 63, 65, 37, 42, - 52, 58, 67, 69, 0, 0, 0, 128, 126, 0, - 0, 0, 96, 99, 100, 102, 103, 104, 0, 0, - 0, 113, 135, 134, 133, 114, 116, 0, 0, 8, - 6, 122, 124, 131, 0, 0, 0, 30, 45, 53, - 33, 48, 55, 36, 51, 57, 129, 0, 24, 74, - 82, 0, 94, 0, 0, 105, 109, 111, 112, 0, - 106, 0, 14, 17, 29, 44, 32, 47, 35, 50, - 0, 92, 93, 98, 101, 108, 110, 0, 0, 130, - 91, 107, 0, 132, 90, 0, 89, 0, 120, 119, - 118 + 0, 0, 85, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 86, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 87, 0, 0, 0, 91, 0, 0, 0, + 13, 14, 15, 16, 17, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 18, + 0, 0, 3, 5, 7, 12, 0, 9, 10, 11, + 124, 126, 22, 0, 0, 0, 21, 25, 0, 24, + 26, 31, 0, 47, 0, 0, 68, 70, 79, 27, + 32, 0, 49, 0, 0, 72, 74, 80, 28, 33, + 0, 51, 0, 0, 76, 78, 81, 0, 0, 30, + 0, 84, 83, 36, 130, 128, 0, 89, 0, 88, + 0, 101, 103, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 118, 120, 0, 0, 1, 2, 4, 8, + 0, 124, 126, 0, 125, 127, 0, 0, 0, 39, + 46, 54, 62, 67, 69, 42, 48, 57, 64, 71, + 73, 45, 50, 60, 66, 75, 77, 0, 0, 0, + 35, 0, 131, 129, 0, 0, 0, 102, 105, 106, + 108, 109, 96, 0, 0, 0, 116, 138, 137, 136, + 117, 119, 0, 0, 19, 6, 125, 127, 134, 0, + 0, 0, 38, 53, 61, 41, 56, 63, 44, 59, + 65, 132, 0, 29, 0, 82, 90, 0, 100, 0, + 0, 97, 112, 114, 115, 0, 98, 0, 20, 23, + 37, 52, 40, 55, 43, 58, 0, 34, 95, 99, + 104, 107, 111, 113, 0, 0, 133, 94, 110, 0, + 135, 93, 0, 92, 0, 123, 122, 121 }; /* YYPGOTO[NTERM-NUM]. */ const short int EasyMeshParser::yypgoto_[] = { - -37, -37, 2, -37, -37, -37, -37, -30, -37, -37, - -37, -2, 150, 1, 57, 51 + -33, -33, -32, -33, -33, -1, -33, -33, -33, -33, + -33, -33, -2, 181, 1, 64, 54 }; /* YYDEFGOTO[NTERM-NUM]. */ const short int EasyMeshParser::yydefgoto_[] = { - -1, 59, 60, 61, 62, 190, 63, 64, 65, 66, - 67, 73, 114, 107, 74, 185 + -1, 60, 61, 62, 63, 64, 65, 66, 195, 67, + 68, 69, 75, 117, 109, 76, 190 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. */ const signed char EasyMeshParser::yytable_ninf_ = -1; - const unsigned char + const unsigned short int EasyMeshParser::yytable_[] = { - 76, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 133, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 134, 96, 97, 98, 99, 100, 101, 102, 103, 104, - 189, 106, 108, 137, 110, 109, 239, 68, 69, 182, - 183, 184, 116, 71, 118, 120, 122, 119, 121, 123, - 68, 69, 129, 130, 68, 69, 71, 243, 193, 77, - 71, 0, 206, 135, 136, 0, 68, 69, 0, 141, - 143, 144, 71, 105, 145, 0, 0, 0, 146, 147, - 148, 149, 150, 151, 0, 0, 0, 152, 153, 154, - 155, 156, 157, 0, 0, 0, 158, 159, 160, 161, - 162, 163, 0, 164, 165, 0, 166, 68, 69, 0, - 70, 167, 0, 71, 72, 170, 171, 172, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 0, 0, 187, - 188, 111, 112, 68, 69, 0, 75, 113, 191, 71, - 72, 194, 195, 196, 197, 0, 198, 199, 138, 139, - 200, 0, 201, 202, 140, 0, 203, 0, 204, 205, - 0, 0, 207, 208, 209, 0, 0, 0, 211, 212, - 0, 213, 0, 214, 0, 0, 215, 216, 217, 0, - 0, 186, 0, 0, 0, 219, 220, 0, 115, 0, - 0, 0, 221, 222, 223, 117, 0, 0, 0, 124, - 125, 126, 127, 128, 0, 230, 131, 132, 0, 231, - 232, 233, 234, 0, 0, 236, 0, 237, 0, 238, - 0, 142, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 218, 0, 0, 242, 0, 0, 0, 0, - 245, 0, 0, 247, 0, 248, 249, 0, 224, 225, - 0, 226, 227, 0, 228, 229, 0, 0, 0, 0, - 0, 0, 0, 168, 0, 169, 0, 235, 0, 0, + 78, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 136, 89, 90, 91, 92, 93, 94, 95, 96, 97, + 137, 98, 99, 100, 101, 102, 103, 104, 105, 106, + 138, 108, 110, 111, 140, 113, 112, 194, 70, 71, + 187, 188, 189, 119, 73, 121, 123, 125, 122, 124, + 126, 70, 71, 132, 133, 70, 71, 73, 246, 198, + 250, 73, 139, 211, 114, 115, 79, 0, 70, 71, + 116, 144, 146, 147, 73, 107, 148, 0, 0, 0, + 149, 150, 151, 152, 153, 154, 0, 0, 0, 155, + 156, 157, 158, 159, 160, 0, 0, 0, 161, 162, + 163, 164, 165, 166, 0, 167, 168, 0, 169, 171, + 0, 170, 0, 0, 172, 0, 0, 0, 175, 176, + 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, + 0, 0, 192, 193, 141, 142, 70, 71, 0, 72, + 143, 196, 73, 74, 199, 200, 201, 202, 0, 203, + 204, 70, 71, 205, 77, 206, 207, 73, 74, 208, + 0, 209, 210, 0, 0, 212, 213, 214, 0, 215, + 0, 0, 0, 217, 218, 0, 219, 0, 220, 0, + 0, 221, 222, 223, 0, 0, 0, 191, 0, 0, + 225, 226, 0, 0, 0, 0, 0, 227, 228, 229, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 240, 0, 0, 0, 241, 0, 0, 0, - 192, 244, 0, 0, 0, 246, 0, 0, 0, 0, - 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 210, + 236, 0, 237, 0, 0, 238, 239, 240, 241, 0, + 118, 243, 0, 244, 0, 245, 0, 120, 0, 0, + 0, 127, 128, 129, 130, 131, 0, 0, 134, 135, + 224, 0, 249, 0, 0, 0, 0, 252, 0, 0, + 254, 0, 255, 256, 145, 0, 230, 231, 0, 232, + 233, 0, 234, 235, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 242, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 247, 0, 0, 0, 248, 173, 0, 174, + 0, 251, 0, 0, 0, 253, 0, 0, 0, 0, + 257, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 197, 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, 216, 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, 0, 0, 0, 0, 0, 59, 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, 0, 0, 0, - 0, 0, 58, 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 + 51, 52, 53, 54, 55, 56, 57, 58 }; /* YYCHECK. */ @@ -1659,47 +1677,51 @@ namespace lol { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 0, 13, 14, 15, 16, 17, 18, 19, 20, 21, 0, 23, 24, 25, 26, 27, 28, 29, 30, 31, - 66, 33, 34, 63, 36, 34, 69, 61, 62, 61, - 62, 63, 44, 67, 46, 47, 48, 46, 47, 48, - 61, 62, 54, 55, 61, 62, 67, 69, 69, 2, - 67, -1, 69, 61, 62, -1, 61, 62, -1, 71, - 72, 73, 67, 68, 76, -1, -1, -1, 80, 81, - 82, 83, 84, 85, -1, -1, -1, 89, 90, 91, - 92, 93, 94, -1, -1, -1, 98, 99, 100, 101, - 102, 103, -1, 105, 106, -1, 108, 61, 62, -1, - 64, 113, -1, 67, 68, 117, 118, 119, 120, 121, - 122, 123, 124, 125, 126, 127, 128, -1, -1, 131, - 132, 61, 62, 61, 62, -1, 64, 67, 140, 67, - 68, 143, 144, 145, 146, -1, 148, 149, 61, 62, - 152, -1, 154, 155, 67, -1, 158, -1, 160, 161, - -1, -1, 164, 165, 166, -1, -1, -1, 170, 171, - -1, 173, -1, 175, -1, -1, 178, 179, 180, -1, - -1, 130, -1, -1, -1, 187, 188, -1, 38, -1, - -1, -1, 194, 195, 196, 45, -1, -1, -1, 49, - 50, 51, 52, 53, -1, 207, 56, 57, -1, 211, - 212, 213, 214, -1, -1, 217, -1, 219, -1, 221, - -1, 71, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 181, -1, -1, 237, -1, -1, -1, -1, - 242, -1, -1, 245, -1, 247, 248, -1, 197, 198, - -1, 200, 201, -1, 203, 204, -1, -1, -1, -1, - -1, -1, -1, 113, -1, 115, -1, 216, -1, -1, + 62, 33, 34, 35, 66, 37, 35, 67, 62, 63, + 62, 63, 64, 45, 68, 47, 48, 49, 47, 48, + 49, 62, 63, 55, 56, 62, 63, 68, 70, 70, + 70, 68, 63, 70, 62, 63, 2, -1, 62, 63, + 68, 73, 74, 75, 68, 69, 78, -1, -1, -1, + 82, 83, 84, 85, 86, 87, -1, -1, -1, 91, + 92, 93, 94, 95, 96, -1, -1, -1, 100, 101, + 102, 103, 104, 105, -1, 107, 108, -1, 110, 111, + -1, 110, -1, -1, 116, -1, -1, -1, 120, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + -1, -1, 134, 135, 62, 63, 62, 63, -1, 65, + 68, 143, 68, 69, 146, 147, 148, 149, -1, 151, + 152, 62, 63, 155, 65, 157, 158, 68, 69, 161, + -1, 163, 164, -1, -1, 167, 168, 169, -1, 171, + -1, -1, -1, 175, 176, -1, 178, -1, 180, -1, + -1, 183, 184, 185, -1, -1, -1, 133, -1, -1, + 192, 193, -1, -1, -1, -1, -1, 199, 200, 201, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 212, -1, 214, -1, -1, 217, 218, 219, 220, -1, + 39, 223, -1, 225, -1, 227, -1, 46, -1, -1, + -1, 50, 51, 52, 53, 54, -1, -1, 57, 58, + 186, -1, 244, -1, -1, -1, -1, 249, -1, -1, + 252, -1, 254, 255, 73, -1, 202, 203, -1, 205, + 206, -1, 208, 209, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 222, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 238, -1, -1, -1, 242, 116, -1, 118, + -1, 247, -1, -1, -1, 251, -1, -1, -1, -1, + 256, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 143, -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, 231, -1, -1, -1, 235, -1, -1, -1, - 140, 240, -1, -1, -1, 244, -1, -1, -1, -1, - 249, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 169, + -1, -1, -1, -1, -1, 174, 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, -1, -1, -1, -1, -1, 66, 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, -1, -1, -1, - -1, -1, 65, 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 + 53, 54, 55, 56, 57, 58, 59, 60 }; /* STOS_[STATE-NUM] -- The (internal number of the) accessing @@ -1712,27 +1734,27 @@ namespace lol { 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, 65, 71, - 72, 73, 74, 76, 77, 78, 79, 80, 61, 62, - 64, 67, 68, 81, 84, 64, 81, 84, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 68, 81, 83, 81, 83, - 81, 61, 62, 67, 82, 82, 81, 82, 81, 83, - 81, 83, 81, 83, 82, 82, 82, 82, 82, 81, - 81, 82, 82, 0, 0, 72, 72, 77, 61, 62, - 67, 81, 82, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 82, 82, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 61, 62, 63, 85, 85, 81, 81, 66, - 75, 81, 82, 69, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 69, 81, 81, 81, - 82, 81, 81, 81, 81, 81, 81, 81, 85, 81, - 81, 81, 81, 81, 85, 85, 85, 85, 85, 85, - 81, 81, 81, 81, 81, 85, 81, 81, 81, 69, - 85, 85, 81, 69, 85, 81, 85, 81, 81, 81, - 85 + 52, 53, 54, 55, 56, 57, 58, 59, 60, 66, + 72, 73, 74, 75, 76, 77, 78, 80, 81, 82, + 62, 63, 65, 68, 69, 83, 86, 65, 83, 86, + 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, 69, 83, 85, + 83, 83, 85, 83, 62, 63, 68, 84, 84, 83, + 84, 83, 85, 83, 85, 83, 85, 84, 84, 84, + 84, 84, 83, 83, 84, 84, 0, 0, 73, 76, + 73, 62, 63, 68, 83, 84, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 85, 83, 83, 84, 84, 83, 83, 83, 83, 83, + 83, 83, 83, 83, 83, 83, 83, 62, 63, 64, + 87, 87, 83, 83, 67, 79, 83, 84, 70, 83, + 83, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 70, 83, 83, 83, 83, 84, 83, 83, 83, + 83, 83, 83, 83, 87, 83, 83, 83, 83, 83, + 87, 87, 87, 87, 87, 87, 83, 83, 83, 83, + 83, 83, 87, 83, 83, 83, 70, 87, 87, 83, + 70, 87, 83, 87, 83, 83, 83, 87 }; #if YYDEBUG @@ -1747,7 +1769,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, 91, 93, 45, 40, 41 + 315, 316, 317, 318, 319, 320, 91, 93, 45, 40, + 41 }; #endif @@ -1755,40 +1778,40 @@ namespace lol { const unsigned char EasyMeshParser::yyr1_[] = { - 0, 70, 71, 72, 72, 73, 73, 74, 75, 76, - 76, 77, 77, 77, 78, 78, 78, 78, 78, 78, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 79, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 81, 81, 81, 81, 82, 82, 82, 82, 83, - 83, 84, 84, 85, 85, 85 + 0, 71, 72, 73, 73, 74, 74, 75, 75, 76, + 76, 76, 76, 77, 77, 77, 77, 77, 78, 79, + 80, 80, 80, 80, 80, 80, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, + 81, 81, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 83, 83, 83, 83, 84, 84, + 84, 84, 85, 85, 86, 86, 87, 87, 87 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ const unsigned char EasyMeshParser::yyr2_[] = { - 0, 2, 2, 1, 2, 1, 3, 1, 1, 1, - 2, 1, 1, 1, 5, 2, 2, 5, 2, 2, - 2, 2, 2, 2, 4, 2, 2, 2, 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, 1, 1, 1, 1, 1, 8, - 7, 6, 5, 5, 4, 2, 3, 2, 5, 3, - 3, 5, 3, 3, 3, 4, 4, 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 + 0, 2, 2, 1, 2, 1, 3, 1, 2, 1, + 1, 1, 1, 1, 1, 1, 1, 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 }; #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE @@ -1797,23 +1820,24 @@ namespace lol { const char* const EasyMeshParser::yytname_[] = { - "T_END", "error", "$undefined", "T_COLOR", "T_BGCOLOR", "T_TRANSLATEX", + "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_SCALE", "T_TOGGLESCALEWINDING", "T_RADIALJITTER", "T_SPLITTRIANGLE", - "T_SMOOTHMESH", "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_open", "mesh_close", - "mesh_command_list", "mesh_command", "color_command", - "transform_command", "primitive_command", "fv", "iv", "v3", "v4", "bv", 0 + "T_ROTATE", "T_SCALE", "T_TOGGLESCALEWINDING", "T_RADIALJITTER", + "T_SPLITTRIANGLE", "T_SMOOTHMESH", "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", "csg_command", "mesh_open", "mesh_close", + "color_command", "transform_command", "primitive_command", "fv", "iv", + "v3", "v4", "bv", 0 }; #endif @@ -1822,60 +1846,62 @@ namespace lol { const EasyMeshParser::rhs_number_type EasyMeshParser::yyrhs_[] = { - 71, 0, -1, 72, 0, -1, 73, -1, 73, 72, - -1, 76, -1, 74, 72, 75, -1, 65, -1, 66, - -1, 77, -1, 76, 77, -1, 78, -1, 79, -1, - 80, -1, 3, 81, 81, 81, 81, -1, 3, 84, - -1, 3, 64, -1, 4, 81, 81, 81, 81, -1, - 4, 84, -1, 4, 64, -1, 46, 81, -1, 5, - 81, -1, 15, 81, -1, 25, 81, -1, 35, 81, - 81, 81, -1, 35, 83, -1, 6, 81, -1, 16, - 81, -1, 26, 81, -1, 7, 81, 81, 81, 85, - -1, 7, 81, 81, 81, -1, 7, 81, 81, -1, - 17, 81, 81, 81, 85, -1, 17, 81, 81, 81, - -1, 17, 81, 81, -1, 27, 81, 81, 81, 85, - -1, 27, 81, 81, 81, -1, 27, 81, 81, -1, - 8, 81, 81, -1, 8, 81, -1, 18, 81, 81, - -1, 18, 81, -1, 28, 81, 81, -1, 28, 81, - -1, 9, 81, 81, 81, 85, -1, 9, 81, 81, - 81, -1, 9, 81, 81, -1, 19, 81, 81, 81, - 85, -1, 19, 81, 81, 81, -1, 19, 81, 81, - -1, 29, 81, 81, 81, 85, -1, 29, 81, 81, - 81, -1, 29, 81, 81, -1, 10, 81, 81, 81, - -1, 10, 81, 81, -1, 20, 81, 81, 81, -1, - 20, 81, 81, -1, 30, 81, 81, 81, -1, 30, - 81, 81, -1, 11, 81, 81, -1, 11, 81, -1, - 12, 81, 81, -1, 12, 81, -1, 21, 81, 81, - -1, 21, 81, -1, 22, 81, 81, -1, 22, 81, - -1, 31, 81, 81, -1, 31, 81, -1, 32, 81, - 81, -1, 32, 81, -1, 13, 81, -1, 23, 81, - -1, 33, 81, -1, 36, 81, 81, 81, -1, 36, - 83, -1, 36, 81, -1, 14, -1, 24, -1, 34, - -1, 38, 81, -1, 39, 82, -1, 40, 82, 82, - 82, -1, 37, -1, 41, -1, 42, -1, 43, -1, - 44, -1, 45, -1, 47, 82, 81, 81, 81, 85, - 85, 85, -1, 47, 82, 81, 81, 81, 85, 85, - -1, 47, 82, 81, 81, 81, 85, -1, 47, 82, - 81, 81, 81, -1, 48, 81, 81, 81, 81, -1, - 48, 81, 81, 81, -1, 48, 81, -1, 48, 83, - 81, -1, 48, 83, -1, 49, 81, 81, 81, 81, - -1, 49, 81, 81, -1, 49, 83, 81, -1, 50, - 81, 81, 81, 81, -1, 50, 81, 81, -1, 50, - 83, 81, -1, 51, 82, 81, -1, 52, 82, 81, - 81, -1, 59, 82, 81, 81, -1, 53, 82, 81, - 81, 85, 85, -1, 53, 82, 81, 81, 85, -1, - 53, 82, 81, 81, -1, 54, 82, 81, 81, 81, - -1, 54, 82, 81, 81, -1, 55, 82, 81, 85, - -1, 55, 82, 81, -1, 56, 81, 85, -1, 56, - 81, -1, 57, 81, 85, -1, 57, 81, -1, 58, - 82, 81, 81, 81, 81, 81, 81, 81, 81, 85, - -1, 58, 82, 81, 81, 81, 81, 81, 81, 81, - 81, -1, 58, 82, 81, 81, 81, 81, 81, 81, - 81, -1, 61, -1, 67, 81, -1, 62, -1, 67, - 82, -1, 62, -1, 67, 82, -1, 61, -1, 67, - 81, -1, 68, 81, 69, -1, 68, 81, 81, 81, - 69, -1, 68, 81, 69, -1, 68, 81, 81, 81, - 81, 69, -1, 63, -1, 62, -1, 61, -1 + 72, 0, -1, 73, 0, -1, 74, -1, 74, 73, + -1, 75, -1, 78, 73, 79, -1, 76, -1, 75, + 76, -1, 80, -1, 81, -1, 82, -1, 77, -1, + 42, -1, 43, -1, 44, -1, 45, -1, 46, -1, + 66, -1, 67, -1, 3, 83, 83, 83, 83, -1, + 3, 86, -1, 3, 65, -1, 4, 83, 83, 83, + 83, -1, 4, 86, -1, 4, 65, -1, 5, 83, + -1, 15, 83, -1, 25, 83, -1, 35, 83, 83, + 83, -1, 35, 85, -1, 6, 83, -1, 16, 83, + -1, 26, 83, -1, 36, 83, 83, 83, 83, -1, + 36, 83, 85, -1, 39, 83, -1, 7, 83, 83, + 83, 87, -1, 7, 83, 83, 83, -1, 7, 83, + 83, -1, 17, 83, 83, 83, 87, -1, 17, 83, + 83, 83, -1, 17, 83, 83, -1, 27, 83, 83, + 83, 87, -1, 27, 83, 83, 83, -1, 27, 83, + 83, -1, 8, 83, 83, -1, 8, 83, -1, 18, + 83, 83, -1, 18, 83, -1, 28, 83, 83, -1, + 28, 83, -1, 9, 83, 83, 83, 87, -1, 9, + 83, 83, 83, -1, 9, 83, 83, -1, 19, 83, + 83, 83, 87, -1, 19, 83, 83, 83, -1, 19, + 83, 83, -1, 29, 83, 83, 83, 87, -1, 29, + 83, 83, 83, -1, 29, 83, 83, -1, 10, 83, + 83, 83, -1, 10, 83, 83, -1, 20, 83, 83, + 83, -1, 20, 83, 83, -1, 30, 83, 83, 83, + -1, 30, 83, 83, -1, 11, 83, 83, -1, 11, + 83, -1, 12, 83, 83, -1, 12, 83, -1, 21, + 83, 83, -1, 21, 83, -1, 22, 83, 83, -1, + 22, 83, -1, 31, 83, 83, -1, 31, 83, -1, + 32, 83, 83, -1, 32, 83, -1, 13, 83, -1, + 23, 83, -1, 33, 83, -1, 37, 83, 83, 83, + -1, 37, 85, -1, 37, 83, -1, 14, -1, 24, + -1, 34, -1, 47, 83, -1, 40, 84, -1, 41, + 84, 84, 84, -1, 38, -1, 48, 84, 83, 83, + 83, 87, 87, 87, -1, 48, 84, 83, 83, 83, + 87, 87, -1, 48, 84, 83, 83, 83, 87, -1, + 48, 84, 83, 83, 83, -1, 52, 84, 83, -1, + 53, 84, 83, 83, -1, 60, 84, 83, 83, -1, + 49, 83, 83, 83, 83, -1, 49, 83, 83, 83, + -1, 49, 83, -1, 49, 85, 83, -1, 49, 85, + -1, 50, 83, 83, 83, 83, -1, 50, 83, 83, + -1, 50, 85, 83, -1, 51, 83, 83, 83, 83, + -1, 51, 83, 83, -1, 51, 85, 83, -1, 54, + 84, 83, 83, 87, 87, -1, 54, 84, 83, 83, + 87, -1, 54, 84, 83, 83, -1, 55, 84, 83, + 83, 83, -1, 55, 84, 83, 83, -1, 56, 84, + 83, 87, -1, 56, 84, 83, -1, 57, 83, 87, + -1, 57, 83, -1, 58, 83, 87, -1, 58, 83, + -1, 59, 84, 83, 83, 83, 83, 83, 83, 83, + 83, 87, -1, 59, 84, 83, 83, 83, 83, 83, + 83, 83, 83, -1, 59, 84, 83, 83, 83, 83, + 83, 83, 83, -1, 62, -1, 68, 83, -1, 63, + -1, 68, 84, -1, 63, -1, 68, 84, -1, 62, + -1, 68, 83, -1, 69, 83, 70, -1, 69, 83, + 83, 83, 70, -1, 69, 83, 70, -1, 69, 83, + 83, 83, 83, 70, -1, 64, -1, 63, -1, 62, + -1 }; /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in @@ -1883,40 +1909,40 @@ namespace lol { const unsigned short int EasyMeshParser::yyprhs_[] = { - 0, 0, 3, 6, 8, 11, 13, 17, 19, 21, - 23, 26, 28, 30, 32, 38, 41, 44, 50, 53, - 56, 59, 62, 65, 68, 73, 76, 79, 82, 85, - 91, 96, 100, 106, 111, 115, 121, 126, 130, 134, - 137, 141, 144, 148, 151, 157, 162, 166, 172, 177, - 181, 187, 192, 196, 201, 205, 210, 214, 219, 223, - 227, 230, 234, 237, 241, 244, 248, 251, 255, 258, - 262, 265, 268, 271, 274, 279, 282, 285, 287, 289, - 291, 294, 297, 302, 304, 306, 308, 310, 312, 314, - 323, 331, 338, 344, 350, 355, 358, 362, 365, 371, - 375, 379, 385, 389, 393, 397, 402, 407, 414, 420, - 425, 431, 436, 441, 445, 449, 452, 456, 459, 471, - 482, 492, 494, 497, 499, 502, 504, 507, 509, 512, - 516, 522, 526, 533, 535, 537 + 0, 0, 3, 6, 8, 11, 13, 17, 19, 22, + 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, + 44, 50, 53, 56, 62, 65, 68, 71, 74, 77, + 82, 85, 88, 91, 94, 100, 104, 107, 113, 118, + 122, 128, 133, 137, 143, 148, 152, 156, 159, 163, + 166, 170, 173, 179, 184, 188, 194, 199, 203, 209, + 214, 218, 223, 227, 232, 236, 241, 245, 249, 252, + 256, 259, 263, 266, 270, 273, 277, 280, 284, 287, + 290, 293, 296, 301, 304, 307, 309, 311, 313, 316, + 319, 324, 326, 335, 343, 350, 356, 360, 365, 370, + 376, 381, 384, 388, 391, 397, 401, 405, 411, 415, + 419, 426, 432, 437, 443, 448, 453, 457, 461, 464, + 468, 471, 483, 494, 504, 506, 509, 511, 514, 516, + 519, 521, 524, 528, 534, 538, 545, 547, 549 }; /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ const unsigned short int EasyMeshParser::yyrline_[] = { - 0, 91, 91, 95, 96, 100, 101, 105, 109, 113, - 114, 118, 119, 120, 124, 125, 126, 129, 130, 131, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, 170, 171, 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, 209, - 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, - 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, - 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, - 240, 245, 246, 247, 248, 252, 253, 254, 255, 260, - 261, 265, 266, 271, 272, 273 + 0, 91, 91, 95, 96, 100, 101, 105, 106, 110, + 111, 112, 113, 117, 118, 119, 120, 121, 125, 129, + 133, 134, 135, 138, 139, 140, 146, 147, 148, 149, + 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, + 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 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, 215, 216, 217, 218, 219, 220, 221, 222, + 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 239, 240, 241, 242, 243, + 244, 245, 246, 247, 252, 253, 254, 255, 259, 260, + 261, 262, 267, 268, 272, 273, 278, 279, 280 }; // Print the state stack on the debug stream. @@ -1960,12 +1986,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, - 68, 69, 2, 2, 2, 67, 2, 2, 2, 2, + 69, 70, 2, 2, 2, 68, 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, 65, 2, 66, 2, 2, 2, 2, 2, 2, + 2, 66, 2, 67, 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, @@ -1987,7 +2013,8 @@ namespace lol { 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, 63, 64 + 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, + 65 }; if ((unsigned int) t <= yyuser_token_number_max_) return translate_table[t]; @@ -1996,26 +2023,26 @@ namespace lol { } const int EasyMeshParser::yyeof_ = 0; - const int EasyMeshParser::yylast_ = 439; - const int EasyMeshParser::yynnts_ = 16; + const int EasyMeshParser::yylast_ = 477; + const int EasyMeshParser::yynnts_ = 17; const int EasyMeshParser::yyempty_ = -2; - const int EasyMeshParser::yyfinal_ = 133; + const int EasyMeshParser::yyfinal_ = 136; const int EasyMeshParser::yyterror_ = 1; const int EasyMeshParser::yyerrcode_ = 256; - const int EasyMeshParser::yyntokens_ = 70; + const int EasyMeshParser::yyntokens_ = 71; - const unsigned int EasyMeshParser::yyuser_token_number_max_ = 319; + const unsigned int EasyMeshParser::yyuser_token_number_max_ = 320; const EasyMeshParser::token_number_type EasyMeshParser::yyundef_token_ = 2; } // lol /* Line 1053 of lalr1.cc */ -#line 2015 "generated/easymesh-parser.cpp" +#line 2042 "generated/easymesh-parser.cpp" /* Line 1055 of lalr1.cc */ -#line 276 "easymesh/easymesh-parser.y" +#line 283 "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 3b5b1833..eda93f74 100644 --- a/src/generated/easymesh-parser.h +++ b/src/generated/easymesh-parser.h @@ -136,7 +136,7 @@ namespace lol { enum yytokentype { T_END = 0, T_COLOR = 258, - T_BGCOLOR = 259, + T_BCOLOR = 259, T_TRANSLATEX = 260, T_ROTATEX = 261, T_TAPERX = 262, @@ -168,35 +168,36 @@ namespace lol { T_SCALEZ = 288, T_MIRRORZ = 289, T_TRANSLATE = 290, - T_SCALE = 291, - T_TOGGLESCALEWINDING = 292, - T_RADIALJITTER = 293, - T_SPLITTRIANGLE = 294, - T_SMOOTHMESH = 295, - T_CSGUNION = 296, - T_CSGSUBSTRACT = 297, - T_CSGSUBSTRACTLOSS = 298, - T_CSGAND = 299, - T_CSGXOR = 300, - T_CHAMFER = 301, - T_CYLINDER = 302, - T_BOX = 303, - T_SMOOTHCHAMFBOX = 304, - T_FLATCHAMFBOX = 305, - T_SPHERE = 306, - T_CAPSULE = 307, - T_STAR = 308, - T_EXPANDEDSTAR = 309, - T_DISC = 310, - T_TRIANGLE = 311, - T_QUAD = 312, - T_COG = 313, - T_TORUS = 314, - T_ERROR = 315, - F_NUMBER = 316, - I_NUMBER = 317, - BOOLEAN = 318, - COLOR = 319 + T_ROTATE = 291, + T_SCALE = 292, + T_TOGGLESCALEWINDING = 293, + T_RADIALJITTER = 294, + T_SPLITTRIANGLE = 295, + T_SMOOTHMESH = 296, + T_CSGUNION = 297, + T_CSGSUBSTRACT = 298, + T_CSGSUBSTRACTLOSS = 299, + T_CSGAND = 300, + T_CSGXOR = 301, + T_CHAMFER = 302, + T_CYLINDER = 303, + T_BOX = 304, + T_SMOOTHCHAMFBOX = 305, + T_FLATCHAMFBOX = 306, + T_SPHERE = 307, + T_CAPSULE = 308, + T_STAR = 309, + T_EXPANDEDSTAR = 310, + T_DISC = 311, + T_TRIANGLE = 312, + T_QUAD = 313, + T_COG = 314, + T_TORUS = 315, + T_ERROR = 316, + F_NUMBER = 317, + I_NUMBER = 318, + BOOLEAN = 319, + COLOR = 320 }; }; @@ -290,7 +291,7 @@ namespace lol { /// - if positive, shift that token. /// - if negative, reduce the rule which number is the opposite. /// - if zero, do what YYDEFACT says. - static const unsigned char yytable_[]; + static const unsigned short int yytable_[]; static const signed char yytable_ninf_; static const short int yycheck_[]; @@ -370,7 +371,7 @@ namespace lol { } // lol /* Line 34 of lalr1.cc */ -#line 374 "generated/easymesh-parser.h" +#line 375 "generated/easymesh-parser.h" diff --git a/src/generated/easymesh-scanner.cpp b/src/generated/easymesh-scanner.cpp index 13dab9cd..d48bbcb1 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 75 -#define YY_END_OF_BUFFER 76 +#define YY_NUM_RULES 76 +#define YY_END_OF_BUFFER 77 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -339,42 +339,42 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[309] = +static yyconst flex_int16_t yy_accept[307] = { 0, - 0, 0, 76, 74, 73, 72, 74, 68, 69, 74, - 67, 74, 74, 65, 70, 71, 74, 74, 74, 74, - 74, 74, 32, 7, 0, 0, 65, 64, 0, 45, - 46, 49, 0, 0, 52, 53, 56, 0, 0, 3, - 0, 0, 0, 34, 35, 36, 0, 37, 0, 8, - 9, 10, 1, 0, 0, 0, 0, 0, 29, 30, - 31, 0, 0, 0, 0, 4, 5, 6, 0, 0, - 0, 66, 0, 48, 0, 0, 50, 0, 0, 0, - 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 0, 0, 17, 18, 19, 0, 0, - - 0, 0, 20, 21, 22, 0, 11, 12, 13, 0, - 0, 33, 0, 14, 15, 16, 58, 0, 64, 47, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, - 54, 55, 23, 24, 25, 26, 27, 28, 0, 0, - 43, 41, 40, 44, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 39, 0, 38, 0, 0, 0, 62, - 0, 59, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 77, 75, 74, 73, 75, 69, 70, 75, + 68, 75, 75, 66, 71, 72, 75, 75, 75, 75, + 75, 16, 39, 12, 0, 0, 66, 65, 0, 50, + 46, 55, 0, 0, 57, 53, 56, 0, 0, 43, + 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, + 0, 67, 0, 58, 0, 54, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 42, 0, 0, 0, 63, 0, 0, 0, 32, 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, 59, 0, 65, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 52, 51, 47, + 30, 31, 32, 33, 34, 35, 0, 0, 4, 2, + 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 45, 0, 44, 0, 0, 0, 63, 0, 60, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, + 0, 0, 64, 0, 0, 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, + 0, 0, 5, 0, 0, 16, 0, 0, 0, 0, + 0, 0, 61, 0, 0, 55, 0, 0, 0, 0, + 53, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 43, 0, 0, 44, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 60, 0, 0, 49, 0, 0, - 0, 53, 0, 0, 0, 3, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 7, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 40, 0, 0, 0, 1, 0, 0, - 61, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 46, 0, 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, + 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 46, 0, 0, 0, 56, 0, 0, 0, 0, 0, + 0, 0, 2, 0, 0, 0, 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] = @@ -417,85 +417,85 @@ static yyconst flex_int32_t yy_meta[41] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[318] = +static yyconst flex_int16_t yy_base[316] = { 0, - 0, 0, 385, 386, 386, 386, 0, 386, 386, 31, - 32, 372, 372, 35, 386, 386, 30, 33, 22, 365, - 30, 41, 63, 87, 0, 369, 47, 62, 58, 386, - 49, 43, 346, 360, 386, 54, 348, 50, 348, 359, - 352, 347, 340, 386, 386, 386, 352, 386, 336, 386, - 386, 386, 75, 335, 57, 70, 342, 73, 386, 386, - 386, 76, 82, 331, 92, 386, 386, 386, 0, 125, - 106, 386, 336, 386, 120, 335, 386, 347, 346, 339, - 386, 83, 105, 90, 342, 333, 127, 326, 326, 333, - 340, 329, 386, 117, 338, 386, 386, 386, 324, 329, - - 121, 331, 386, 386, 386, 330, 386, 386, 386, 321, - 328, 386, 314, 386, 386, 386, 0, 335, 334, 386, - 315, 130, 319, 305, 315, 305, 122, 118, 316, 386, - 386, 386, 386, 386, 386, 386, 386, 386, 128, 317, - 309, 83, 308, 306, 314, 304, 316, 297, 310, 307, - 299, 295, 292, 386, 291, 386, 290, 291, 289, 386, - 287, 0, 283, 289, 296, 291, 283, 285, 298, 297, - 283, 295, 278, 285, 288, 119, 124, 132, 287, 287, - 386, 288, 280, 271, 386, 270, 275, 280, 135, 281, - 272, 138, 274, 262, 277, 141, 268, 144, 0, 260, - - 268, 273, 274, 255, 269, 258, 254, 250, 268, 251, - 250, 386, 248, 251, 386, 147, 254, 150, 254, 248, - 247, 243, 251, 257, 0, 237, 243, 386, 242, 251, - 234, 386, 234, 238, 245, 386, 230, 235, 238, 233, - 234, 227, 234, 153, 223, 0, 230, 236, 235, 230, - 229, 229, 218, 386, 215, 229, 218, 386, 230, 225, - 386, 224, 223, 222, 225, 222, 213, 222, 203, 212, - 203, 206, 156, 201, 213, 204, 207, 209, 210, 207, - 198, 203, 386, 191, 202, 206, 386, 187, 188, 197, - 192, 183, 199, 188, 188, 193, 196, 182, 189, 180, - - 176, 170, 189, 172, 175, 170, 165, 386, 200, 199, - 196, 198, 197, 151, 147, 84, 73 + 0, 0, 383, 384, 384, 384, 0, 384, 384, 31, + 32, 370, 370, 35, 384, 384, 30, 33, 22, 363, + 30, 41, 63, 87, 0, 367, 47, 62, 58, 384, + 49, 358, 343, 357, 384, 44, 345, 50, 345, 356, + 349, 344, 337, 384, 384, 384, 349, 384, 333, 384, + 384, 384, 60, 332, 71, 65, 339, 74, 384, 384, + 384, 77, 69, 328, 93, 384, 384, 384, 0, 126, + 94, 384, 333, 384, 121, 384, 345, 344, 337, 384, + 83, 90, 98, 340, 331, 112, 324, 324, 331, 338, + 327, 384, 126, 336, 384, 384, 384, 322, 327, 122, + + 329, 384, 384, 384, 328, 384, 384, 384, 319, 326, + 384, 312, 384, 384, 384, 0, 333, 332, 384, 313, + 132, 317, 303, 313, 303, 123, 130, 384, 384, 384, + 384, 384, 384, 384, 384, 384, 126, 316, 308, 125, + 307, 305, 313, 303, 315, 296, 309, 310, 298, 294, + 291, 384, 290, 384, 289, 290, 288, 384, 286, 0, + 282, 288, 295, 290, 282, 284, 297, 296, 282, 287, + 293, 276, 283, 128, 132, 135, 286, 286, 384, 287, + 279, 270, 384, 269, 274, 279, 138, 269, 271, 141, + 273, 261, 276, 144, 267, 147, 0, 259, 267, 272, + + 273, 254, 268, 257, 265, 252, 248, 266, 249, 384, + 247, 250, 384, 150, 253, 153, 253, 250, 246, 242, + 250, 256, 0, 236, 242, 384, 241, 250, 233, 234, + 384, 232, 236, 384, 229, 234, 237, 232, 230, 226, + 233, 156, 222, 0, 229, 235, 234, 229, 228, 230, + 227, 216, 384, 213, 227, 213, 384, 228, 223, 384, + 222, 221, 220, 223, 220, 211, 220, 201, 210, 205, + 159, 200, 212, 203, 206, 208, 209, 206, 197, 202, + 384, 190, 201, 205, 384, 186, 187, 196, 191, 182, + 198, 187, 187, 192, 195, 181, 188, 179, 175, 169, + + 188, 171, 174, 169, 164, 384, 167, 157, 199, 117, + 104, 97, 91, 83, 71 } ; -static yyconst flex_int16_t yy_def[318] = +static yyconst flex_int16_t yy_def[316] = { 0, - 308, 1, 308, 308, 308, 308, 309, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 310, 308, 308, 308, 311, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 312, 308, - 311, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 313, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 314, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 315, 308, - - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 316, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 317, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - - 308, 308, 308, 308, 308, 308, 308, 0, 308, 308, - 308, 308, 308, 308, 308, 308, 308 + 306, 1, 306, 306, 306, 306, 307, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 308, 306, 306, 306, 309, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 310, 306, + 309, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 311, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 312, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 313, 306, 306, 306, + + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 314, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 315, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + + 306, 306, 306, 306, 306, 0, 306, 306, 306, 306, + 306, 306, 306, 306, 306 } ; -static yyconst flex_int16_t yy_nxt[427] = +static yyconst flex_int16_t yy_nxt[425] = { 0, 4, 5, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 4, 4, 15, 16, 17, 18, 19, 4, @@ -503,50 +503,50 @@ static yyconst flex_int16_t yy_nxt[427] = 4, 4, 22, 23, 24, 4, 4, 4, 4, 4, 26, 26, 27, 27, 26, 40, 27, 30, 31, 32, 33, 34, 38, 39, 43, 41, 26, 47, 27, 72, - 72, 35, 75, 36, 37, 73, 48, 44, 45, 46, - 49, 74, 79, 28, 261, 70, 76, 95, 50, 51, - 52, 53, 70, 54, 80, 246, 55, 82, 83, 84, - 56, 92, 93, 57, 96, 97, 98, 58, 110, 99, - - 59, 60, 61, 62, 100, 102, 106, 72, 72, 181, - 103, 104, 105, 107, 108, 109, 113, 111, 182, 63, - 64, 133, 134, 65, 66, 67, 68, 137, 138, 114, - 115, 116, 118, 118, 150, 151, 119, 121, 122, 123, - 124, 125, 135, 141, 136, 155, 164, 173, 225, 171, - 174, 126, 199, 127, 128, 156, 172, 133, 134, 165, - 142, 135, 143, 136, 144, 176, 177, 178, 166, 137, - 138, 219, 59, 60, 61, 96, 97, 98, 107, 108, - 109, 114, 115, 116, 44, 45, 46, 50, 51, 52, - 103, 104, 105, 66, 67, 68, 71, 71, 162, 117, - - 69, 25, 131, 181, 307, 306, 305, 130, 77, 304, - 303, 302, 301, 156, 300, 299, 298, 297, 296, 112, - 48, 295, 294, 293, 292, 291, 290, 289, 288, 287, - 286, 285, 284, 283, 282, 93, 281, 280, 279, 278, - 277, 276, 275, 274, 120, 273, 272, 271, 270, 269, - 268, 267, 266, 265, 264, 263, 262, 260, 259, 258, - 257, 256, 255, 254, 253, 132, 252, 81, 251, 250, - 249, 248, 247, 245, 244, 243, 242, 241, 240, 239, - 238, 237, 236, 235, 234, 233, 232, 231, 35, 230, - 229, 228, 227, 226, 224, 223, 222, 154, 221, 220, - - 218, 217, 216, 215, 214, 213, 212, 211, 210, 209, - 208, 207, 206, 205, 204, 203, 202, 201, 74, 200, - 30, 198, 197, 196, 195, 194, 193, 192, 191, 190, - 189, 188, 187, 186, 185, 184, 183, 180, 179, 175, - 170, 169, 168, 167, 163, 119, 119, 161, 160, 159, - 158, 157, 154, 153, 152, 149, 148, 147, 146, 145, - 140, 139, 132, 131, 130, 129, 120, 112, 101, 94, - 91, 90, 89, 88, 87, 86, 85, 81, 78, 77, - 28, 42, 29, 28, 308, 3, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308 + 72, 35, 78, 36, 37, 73, 48, 44, 45, 46, + 49, 74, 260, 28, 79, 70, 91, 92, 50, 51, + 52, 53, 70, 54, 244, 109, 55, 81, 82, 83, + 56, 94, 223, 57, 98, 72, 72, 58, 197, 99, + + 59, 60, 61, 62, 110, 160, 101, 105, 95, 96, + 97, 102, 103, 104, 106, 107, 108, 112, 116, 63, + 64, 131, 132, 65, 66, 67, 68, 133, 139, 134, + 113, 114, 115, 117, 117, 135, 136, 118, 120, 121, + 122, 123, 124, 148, 149, 140, 153, 141, 162, 142, + 169, 179, 125, 170, 126, 127, 154, 171, 69, 172, + 180, 163, 173, 174, 175, 176, 131, 132, 25, 133, + 164, 134, 135, 136, 217, 59, 60, 61, 95, 96, + 97, 106, 107, 108, 113, 114, 115, 44, 45, 46, + 50, 51, 52, 102, 103, 104, 66, 67, 68, 71, + + 71, 129, 179, 305, 304, 303, 128, 76, 302, 301, + 300, 299, 154, 298, 297, 296, 295, 294, 111, 48, + 293, 292, 291, 290, 289, 288, 287, 286, 285, 284, + 283, 282, 281, 280, 279, 278, 277, 276, 275, 274, + 273, 272, 119, 271, 270, 92, 269, 268, 267, 266, + 130, 265, 264, 263, 262, 261, 259, 258, 257, 256, + 255, 254, 253, 252, 251, 80, 250, 249, 248, 247, + 246, 245, 243, 242, 241, 240, 239, 238, 237, 236, + 235, 234, 233, 232, 231, 230, 229, 35, 228, 227, + 226, 225, 224, 222, 221, 220, 152, 219, 218, 216, + + 215, 214, 213, 212, 211, 210, 209, 208, 207, 206, + 205, 204, 203, 202, 201, 200, 199, 74, 198, 30, + 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, + 186, 185, 184, 183, 182, 181, 178, 177, 168, 167, + 166, 165, 161, 118, 118, 159, 158, 157, 156, 155, + 152, 151, 150, 147, 146, 145, 144, 143, 138, 137, + 130, 129, 128, 119, 111, 100, 93, 90, 89, 88, + 87, 86, 85, 84, 80, 77, 76, 75, 28, 42, + 29, 28, 306, 3, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306 } ; -static yyconst flex_int16_t yy_chk[427] = +static yyconst flex_int16_t yy_chk[425] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -554,47 +554,47 @@ static yyconst flex_int16_t yy_chk[427] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 11, 10, 11, 14, 19, 14, 17, 17, 17, 17, 17, 18, 18, 21, 19, 27, 22, 27, 29, - 29, 17, 32, 17, 17, 31, 22, 21, 21, 21, - 22, 31, 36, 28, 317, 28, 32, 55, 22, 22, - 22, 23, 28, 23, 36, 316, 23, 38, 38, 38, - 23, 53, 53, 23, 55, 55, 55, 23, 63, 56, - - 23, 23, 23, 24, 56, 58, 62, 71, 71, 142, - 58, 58, 58, 62, 62, 62, 65, 63, 142, 24, - 24, 82, 82, 24, 24, 24, 24, 84, 84, 65, - 65, 65, 70, 70, 94, 94, 70, 75, 75, 75, - 75, 75, 83, 87, 83, 101, 122, 128, 315, 127, - 128, 75, 314, 75, 75, 101, 127, 176, 176, 122, - 87, 177, 87, 177, 87, 139, 139, 139, 122, 178, - 178, 189, 189, 189, 189, 192, 192, 192, 196, 196, - 196, 198, 198, 198, 216, 216, 216, 218, 218, 218, - 244, 244, 244, 273, 273, 273, 311, 311, 313, 312, - - 310, 309, 307, 306, 305, 304, 303, 302, 301, 300, - 299, 298, 297, 296, 295, 294, 293, 292, 291, 290, - 289, 288, 286, 285, 284, 282, 281, 280, 279, 278, - 277, 276, 275, 274, 272, 271, 270, 269, 268, 267, - 266, 265, 264, 263, 262, 260, 259, 257, 256, 255, - 253, 252, 251, 250, 249, 248, 247, 245, 243, 242, - 241, 240, 239, 238, 237, 235, 234, 233, 231, 230, - 229, 227, 226, 224, 223, 222, 221, 220, 219, 217, - 214, 213, 211, 210, 209, 208, 207, 206, 205, 204, - 203, 202, 201, 200, 197, 195, 194, 193, 191, 190, - - 188, 187, 186, 184, 183, 182, 180, 179, 175, 174, - 173, 172, 171, 170, 169, 168, 167, 166, 165, 164, - 163, 161, 159, 158, 157, 155, 153, 152, 151, 150, - 149, 148, 147, 146, 145, 144, 143, 141, 140, 129, - 126, 125, 124, 123, 121, 119, 118, 113, 111, 110, - 106, 102, 100, 99, 95, 92, 91, 90, 89, 88, - 86, 85, 80, 79, 78, 76, 73, 64, 57, 54, - 49, 47, 43, 42, 41, 40, 39, 37, 34, 33, - 26, 20, 13, 12, 3, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308 + 29, 17, 36, 17, 17, 31, 22, 21, 21, 21, + 22, 31, 315, 28, 36, 28, 53, 53, 22, 22, + 22, 23, 28, 23, 314, 63, 23, 38, 38, 38, + 23, 55, 313, 23, 56, 71, 71, 23, 312, 56, + + 23, 23, 23, 24, 63, 311, 58, 62, 55, 55, + 55, 58, 58, 58, 62, 62, 62, 65, 310, 24, + 24, 81, 81, 24, 24, 24, 24, 82, 86, 82, + 65, 65, 65, 70, 70, 83, 83, 70, 75, 75, + 75, 75, 75, 93, 93, 86, 100, 86, 121, 86, + 126, 140, 75, 126, 75, 75, 100, 126, 308, 127, + 140, 121, 127, 137, 137, 137, 174, 174, 307, 175, + 121, 175, 176, 176, 187, 187, 187, 187, 190, 190, + 190, 194, 194, 194, 196, 196, 196, 214, 214, 214, + 216, 216, 216, 242, 242, 242, 271, 271, 271, 309, + + 309, 305, 304, 303, 302, 301, 300, 299, 298, 297, + 296, 295, 294, 293, 292, 291, 290, 289, 288, 287, + 286, 284, 283, 282, 280, 279, 278, 277, 276, 275, + 274, 273, 272, 270, 269, 268, 267, 266, 265, 264, + 263, 262, 261, 259, 258, 256, 255, 254, 252, 251, + 250, 249, 248, 247, 246, 245, 243, 241, 240, 239, + 238, 237, 236, 235, 233, 232, 230, 229, 228, 227, + 225, 224, 222, 221, 220, 219, 218, 217, 215, 212, + 211, 209, 208, 207, 206, 205, 204, 203, 202, 201, + 200, 199, 198, 195, 193, 192, 191, 189, 188, 186, + + 185, 184, 182, 181, 180, 178, 177, 173, 172, 171, + 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, + 159, 157, 156, 155, 153, 151, 150, 149, 148, 147, + 146, 145, 144, 143, 142, 141, 139, 138, 125, 124, + 123, 122, 120, 118, 117, 112, 110, 109, 105, 101, + 99, 98, 94, 91, 90, 89, 88, 87, 85, 84, + 79, 78, 77, 73, 64, 57, 54, 49, 47, 43, + 42, 41, 40, 39, 37, 34, 33, 32, 26, 20, + 13, 12, 3, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306 } ; /* The intent behind this definition is that it'll catch @@ -808,13 +808,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 >= 309 ) + if ( yy_current_state >= 307 ) 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 != 308 ); + while ( yy_current_state != 306 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -837,227 +837,227 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP #line 50 "easymesh/easymesh-scanner.l" -{ return token::T_COLOR; } +{ return token::T_CSGUNION; } YY_BREAK case 2: YY_RULE_SETUP #line 51 "easymesh/easymesh-scanner.l" -{ return token::T_BGCOLOR; } +{ return token::T_CSGSUBSTRACT; } YY_BREAK case 3: YY_RULE_SETUP -#line 53 "easymesh/easymesh-scanner.l" -{ return token::T_CHAMFER; } +#line 52 "easymesh/easymesh-scanner.l" +{ return token::T_CSGSUBSTRACTLOSS; } YY_BREAK case 4: YY_RULE_SETUP -#line 54 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATEX; } +#line 53 "easymesh/easymesh-scanner.l" +{ return token::T_CSGAND; } YY_BREAK case 5: YY_RULE_SETUP -#line 55 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATEY; } +#line 54 "easymesh/easymesh-scanner.l" +{ return token::T_CSGXOR; } YY_BREAK case 6: YY_RULE_SETUP #line 56 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATEZ; } +{ return token::T_TOGGLESCALEWINDING; } YY_BREAK case 7: YY_RULE_SETUP #line 57 "easymesh/easymesh-scanner.l" -{ return token::T_TRANSLATE; } +{ return token::T_COLOR; } YY_BREAK case 8: YY_RULE_SETUP #line 58 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATEX; } +{ return token::T_BCOLOR; } YY_BREAK case 9: YY_RULE_SETUP -#line 59 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATEY; } +#line 60 "easymesh/easymesh-scanner.l" +{ return token::T_TRANSLATEX; } YY_BREAK case 10: YY_RULE_SETUP -#line 60 "easymesh/easymesh-scanner.l" -{ return token::T_ROTATEZ; } +#line 61 "easymesh/easymesh-scanner.l" +{ return token::T_TRANSLATEY; } YY_BREAK case 11: YY_RULE_SETUP -#line 61 "easymesh/easymesh-scanner.l" -{ return token::T_TAPERX; } +#line 62 "easymesh/easymesh-scanner.l" +{ return token::T_TRANSLATEZ; } YY_BREAK case 12: YY_RULE_SETUP -#line 62 "easymesh/easymesh-scanner.l" -{ return token::T_TAPERY; } +#line 63 "easymesh/easymesh-scanner.l" +{ return token::T_TRANSLATE; } YY_BREAK case 13: YY_RULE_SETUP -#line 63 "easymesh/easymesh-scanner.l" -{ return token::T_TAPERZ; } +#line 64 "easymesh/easymesh-scanner.l" +{ return token::T_ROTATEX; } YY_BREAK case 14: YY_RULE_SETUP -#line 64 "easymesh/easymesh-scanner.l" -{ return token::T_TWISTX; } +#line 65 "easymesh/easymesh-scanner.l" +{ return token::T_ROTATEY; } YY_BREAK case 15: YY_RULE_SETUP -#line 65 "easymesh/easymesh-scanner.l" -{ return token::T_TWISTY; } +#line 66 "easymesh/easymesh-scanner.l" +{ return token::T_ROTATEZ; } YY_BREAK case 16: YY_RULE_SETUP -#line 66 "easymesh/easymesh-scanner.l" -{ return token::T_TWISTZ; } +#line 67 "easymesh/easymesh-scanner.l" +{ return token::T_ROTATE; } YY_BREAK case 17: YY_RULE_SETUP -#line 67 "easymesh/easymesh-scanner.l" -{ return token::T_SHEARX; } +#line 68 "easymesh/easymesh-scanner.l" +{ return token::T_RADIALJITTER; } YY_BREAK case 18: YY_RULE_SETUP -#line 68 "easymesh/easymesh-scanner.l" -{ return token::T_SHEARY; } +#line 69 "easymesh/easymesh-scanner.l" +{ return token::T_TAPERX; } YY_BREAK case 19: YY_RULE_SETUP -#line 69 "easymesh/easymesh-scanner.l" -{ return token::T_SHEARZ; } +#line 70 "easymesh/easymesh-scanner.l" +{ return token::T_TAPERY; } YY_BREAK case 20: YY_RULE_SETUP -#line 70 "easymesh/easymesh-scanner.l" -{ return token::T_STRETCHX; } +#line 71 "easymesh/easymesh-scanner.l" +{ return token::T_TAPERZ; } YY_BREAK case 21: YY_RULE_SETUP -#line 71 "easymesh/easymesh-scanner.l" -{ return token::T_STRETCHY; } +#line 72 "easymesh/easymesh-scanner.l" +{ return token::T_TWISTX; } YY_BREAK case 22: YY_RULE_SETUP -#line 72 "easymesh/easymesh-scanner.l" -{ return token::T_STRETCHZ; } +#line 73 "easymesh/easymesh-scanner.l" +{ return token::T_TWISTY; } YY_BREAK case 23: YY_RULE_SETUP -#line 73 "easymesh/easymesh-scanner.l" -{ return token::T_BENDXY; } +#line 74 "easymesh/easymesh-scanner.l" +{ return token::T_TWISTZ; } YY_BREAK case 24: YY_RULE_SETUP -#line 74 "easymesh/easymesh-scanner.l" -{ return token::T_BENDXZ; } +#line 75 "easymesh/easymesh-scanner.l" +{ return token::T_SHEARX; } YY_BREAK case 25: YY_RULE_SETUP -#line 75 "easymesh/easymesh-scanner.l" -{ return token::T_BENDYX; } +#line 76 "easymesh/easymesh-scanner.l" +{ return token::T_SHEARY; } YY_BREAK case 26: YY_RULE_SETUP -#line 76 "easymesh/easymesh-scanner.l" -{ return token::T_BENDYZ; } +#line 77 "easymesh/easymesh-scanner.l" +{ return token::T_SHEARZ; } YY_BREAK case 27: YY_RULE_SETUP -#line 77 "easymesh/easymesh-scanner.l" -{ return token::T_BENDZX; } +#line 78 "easymesh/easymesh-scanner.l" +{ return token::T_STRETCHX; } YY_BREAK case 28: YY_RULE_SETUP -#line 78 "easymesh/easymesh-scanner.l" -{ return token::T_BENDZY; } +#line 79 "easymesh/easymesh-scanner.l" +{ return token::T_STRETCHY; } YY_BREAK case 29: YY_RULE_SETUP -#line 79 "easymesh/easymesh-scanner.l" -{ return token::T_SCALEX; } +#line 80 "easymesh/easymesh-scanner.l" +{ return token::T_STRETCHZ; } YY_BREAK case 30: YY_RULE_SETUP -#line 80 "easymesh/easymesh-scanner.l" -{ return token::T_SCALEY; } +#line 81 "easymesh/easymesh-scanner.l" +{ return token::T_BENDXY; } YY_BREAK case 31: YY_RULE_SETUP -#line 81 "easymesh/easymesh-scanner.l" -{ return token::T_SCALEZ; } +#line 82 "easymesh/easymesh-scanner.l" +{ return token::T_BENDXZ; } YY_BREAK case 32: YY_RULE_SETUP -#line 82 "easymesh/easymesh-scanner.l" -{ return token::T_SCALE; } +#line 83 "easymesh/easymesh-scanner.l" +{ return token::T_BENDYX; } YY_BREAK case 33: YY_RULE_SETUP -#line 83 "easymesh/easymesh-scanner.l" -{ return token::T_TOGGLESCALEWINDING; } +#line 84 "easymesh/easymesh-scanner.l" +{ return token::T_BENDYZ; } YY_BREAK case 34: YY_RULE_SETUP -#line 84 "easymesh/easymesh-scanner.l" -{ return token::T_MIRRORX; } +#line 85 "easymesh/easymesh-scanner.l" +{ return token::T_BENDZX; } YY_BREAK case 35: YY_RULE_SETUP -#line 85 "easymesh/easymesh-scanner.l" -{ return token::T_MIRRORY; } +#line 86 "easymesh/easymesh-scanner.l" +{ return token::T_BENDZY; } YY_BREAK case 36: YY_RULE_SETUP -#line 86 "easymesh/easymesh-scanner.l" -{ return token::T_MIRRORZ; } +#line 87 "easymesh/easymesh-scanner.l" +{ return token::T_SCALEX; } YY_BREAK case 37: YY_RULE_SETUP -#line 87 "easymesh/easymesh-scanner.l" -{ return token::T_RADIALJITTER; } +#line 88 "easymesh/easymesh-scanner.l" +{ return token::T_SCALEY; } YY_BREAK case 38: YY_RULE_SETUP -#line 88 "easymesh/easymesh-scanner.l" -{ return token::T_SPLITTRIANGLE; } +#line 89 "easymesh/easymesh-scanner.l" +{ return token::T_SCALEZ; } YY_BREAK case 39: YY_RULE_SETUP -#line 89 "easymesh/easymesh-scanner.l" -{ return token::T_SMOOTHMESH; } +#line 90 "easymesh/easymesh-scanner.l" +{ return token::T_SCALE; } YY_BREAK case 40: YY_RULE_SETUP #line 91 "easymesh/easymesh-scanner.l" -{ return token::T_CSGUNION; } +{ return token::T_MIRRORX; } YY_BREAK case 41: YY_RULE_SETUP #line 92 "easymesh/easymesh-scanner.l" -{ return token::T_CSGSUBSTRACT; } +{ return token::T_MIRRORY; } YY_BREAK case 42: YY_RULE_SETUP #line 93 "easymesh/easymesh-scanner.l" -{ return token::T_CSGSUBSTRACTLOSS; } +{ return token::T_MIRRORZ; } YY_BREAK case 43: YY_RULE_SETUP #line 94 "easymesh/easymesh-scanner.l" -{ return token::T_CSGAND; } +{ return token::T_CHAMFER; } YY_BREAK case 44: YY_RULE_SETUP #line 95 "easymesh/easymesh-scanner.l" -{ return token::T_CSGXOR; } +{ return token::T_SPLITTRIANGLE; } YY_BREAK case 45: YY_RULE_SETUP -#line 97 "easymesh/easymesh-scanner.l" -{ return token::T_BOX; } +#line 96 "easymesh/easymesh-scanner.l" +{ return token::T_SMOOTHMESH; } YY_BREAK case 46: YY_RULE_SETUP @@ -1067,32 +1067,32 @@ YY_RULE_SETUP case 47: YY_RULE_SETUP #line 99 "easymesh/easymesh-scanner.l" -{ return token::T_CAPSULE; } +{ return token::T_SPHERE; } YY_BREAK case 48: YY_RULE_SETUP #line 100 "easymesh/easymesh-scanner.l" -{ return token::T_COG; } +{ return token::T_CAPSULE; } YY_BREAK case 49: YY_RULE_SETUP #line 101 "easymesh/easymesh-scanner.l" -{ return token::T_DISC; } +{ return token::T_TORUS; } YY_BREAK case 50: YY_RULE_SETUP #line 102 "easymesh/easymesh-scanner.l" -{ return token::T_EXPANDEDSTAR; } +{ return token::T_BOX; } YY_BREAK case 51: YY_RULE_SETUP #line 103 "easymesh/easymesh-scanner.l" -{ return token::T_FLATCHAMFBOX; } +{ return token::T_SMOOTHCHAMFBOX; } YY_BREAK case 52: YY_RULE_SETUP #line 104 "easymesh/easymesh-scanner.l" -{ return token::T_QUAD; } +{ return token::T_FLATCHAMFBOX; } YY_BREAK case 53: YY_RULE_SETUP @@ -1102,12 +1102,12 @@ YY_RULE_SETUP case 54: YY_RULE_SETUP #line 106 "easymesh/easymesh-scanner.l" -{ return token::T_SMOOTHCHAMFBOX; } +{ return token::T_EXPANDEDSTAR; } YY_BREAK case 55: YY_RULE_SETUP #line 107 "easymesh/easymesh-scanner.l" -{ return token::T_SPHERE; } +{ return token::T_DISC; } YY_BREAK case 56: YY_RULE_SETUP @@ -1117,13 +1117,18 @@ YY_RULE_SETUP case 57: YY_RULE_SETUP #line 109 "easymesh/easymesh-scanner.l" -{ return token::T_TORUS; } +{ return token::T_QUAD; } + YY_BREAK +case 58: +YY_RULE_SETUP +#line 110 "easymesh/easymesh-scanner.l" +{ return token::T_COG; } YY_BREAK /* ======= BASE DATA TYPES ========================================= */ /* COLOR */ -case 58: +case 59: YY_RULE_SETUP -#line 113 "easymesh/easymesh-scanner.l" +#line 114 "easymesh/easymesh-scanner.l" { uint32_t tmp = std::strtol(yytext + 1, nullptr, 16); yylval->u32val = 0x11000000u * (tmp >> 8) @@ -1132,9 +1137,9 @@ YY_RULE_SETUP | 0x000000ffu; return token::COLOR; } YY_BREAK -case 59: +case 60: YY_RULE_SETUP -#line 120 "easymesh/easymesh-scanner.l" +#line 121 "easymesh/easymesh-scanner.l" { uint32_t tmp = std::strtol(yytext + 1, nullptr, 16); yylval->u32val = 0x11000000u * (tmp >> 12) @@ -1143,102 +1148,102 @@ YY_RULE_SETUP | 0x00000011u * (tmp & 0xf); return token::COLOR; } YY_BREAK -case 60: +case 61: YY_RULE_SETUP -#line 127 "easymesh/easymesh-scanner.l" +#line 128 "easymesh/easymesh-scanner.l" { yylval->u32val = 0xffu | 0x100u * (uint32_t)std::strtol(yytext + 1, nullptr, 16); return token::COLOR; } YY_BREAK -case 61: +case 62: YY_RULE_SETUP -#line 131 "easymesh/easymesh-scanner.l" +#line 132 "easymesh/easymesh-scanner.l" { yylval->u32val = (uint32_t)std::strtol(yytext + 1, nullptr, 16); return token::COLOR; } YY_BREAK /* ======= BASE DATA TYPES ========================================= */ /* BOOL */ -case 62: +case 63: YY_RULE_SETUP -#line 137 "easymesh/easymesh-scanner.l" +#line 138 "easymesh/easymesh-scanner.l" { yylval->bval = true; return token::BOOLEAN; } YY_BREAK -case 63: +case 64: YY_RULE_SETUP -#line 138 "easymesh/easymesh-scanner.l" +#line 139 "easymesh/easymesh-scanner.l" { yylval->bval = false; return token::BOOLEAN; } YY_BREAK /* FLOAT */ -case 64: +case 65: YY_RULE_SETUP -#line 140 "easymesh/easymesh-scanner.l" +#line 141 "easymesh/easymesh-scanner.l" { yylval->fval = (float)std::atof(yytext); return token::F_NUMBER; } YY_BREAK /* INT */ -case 65: +case 66: YY_RULE_SETUP -#line 143 "easymesh/easymesh-scanner.l" +#line 144 "easymesh/easymesh-scanner.l" { yylval->ival = std::atoi(yytext); return token::I_NUMBER; } YY_BREAK /* ======= COMMENTS ======= */ -case 66: -/* rule 66 can match eol */ +case 67: +/* rule 67 can match eol */ YY_RULE_SETUP -#line 147 "easymesh/easymesh-scanner.l" +#line 148 "easymesh/easymesh-scanner.l" { /* ignore this */ } YY_BREAK /* Semantics tokens */ -case 67: -YY_RULE_SETUP -#line 150 "easymesh/easymesh-scanner.l" -{ return token_type('-'); } - YY_BREAK case 68: YY_RULE_SETUP #line 151 "easymesh/easymesh-scanner.l" -{ return token_type('('); } +{ return token_type('-'); } YY_BREAK case 69: YY_RULE_SETUP #line 152 "easymesh/easymesh-scanner.l" -{ return token_type(')'); } +{ 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" -{ /* ignore this */ } +{ return token_type(']'); } YY_BREAK case 73: -/* rule 73 can match eol */ YY_RULE_SETUP #line 156 "easymesh/easymesh-scanner.l" { /* ignore this */ } YY_BREAK case 74: +/* rule 74 can match eol */ YY_RULE_SETUP #line 157 "easymesh/easymesh-scanner.l" -{ return token::T_ERROR; } +{ /* ignore this */ } YY_BREAK case 75: YY_RULE_SETUP -#line 159 "easymesh/easymesh-scanner.l" +#line 158 "easymesh/easymesh-scanner.l" +{ return token::T_ERROR; } + YY_BREAK +case 76: +YY_RULE_SETUP +#line 160 "easymesh/easymesh-scanner.l" ECHO; YY_BREAK -#line 1242 "generated/easymesh-scanner.cpp" +#line 1247 "generated/easymesh-scanner.cpp" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -1620,7 +1625,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 >= 309 ) + if ( yy_current_state >= 307 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1648,11 +1653,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 >= 309 ) + if ( yy_current_state >= 307 ) 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 == 308); + yy_is_jam = (yy_current_state == 306); return yy_is_jam ? 0 : yy_current_state; } @@ -2139,7 +2144,7 @@ void EasyMeshfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 159 "easymesh/easymesh-scanner.l" +#line 160 "easymesh/easymesh-scanner.l"