[gmsh] 01/06: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jan 11 18:01:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 324ebcec13d0cf439ad75aaa2ee79f5902d34745
Merge: 8486549 ca93886
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jan 3 00:23:51 2016 +0100
Merge.
CMakeLists.txt | 91 +-
Common/CommandLine.cpp | 3 +-
Common/CreateFile.cpp | 9 +-
Common/Gmsh.cpp | 5 +
Common/GmshConfig.h.in | 3 +-
Common/GmshDefines.h | 2 +
Common/GmshMessage.cpp | 1 +
Common/Hash.h | 4 +-
Common/OS.cpp | 43 +
Common/OS.h | 3 +-
Common/onelab.h | 5 +-
Fltk/FlGui.cpp | 4 +
Fltk/extraDialogs.cpp | 1 +
Fltk/fileDialogs.cpp | 254 +-
Fltk/fileDialogs.h | 2 +
Fltk/graphicWindow.cpp | 18 +-
Fltk/graphicWindow.h | 1 +
Fltk/onelabGroup.cpp | 27 +-
Geo/Chain.cpp | 6 +-
Geo/Chain.h | 14 +-
Geo/GEntity.h | 5 +
Geo/GFace.cpp | 15 +-
Geo/GFace.h | 15 +-
Geo/GModel.cpp | 17 +-
Geo/GModel.h | 12 +-
Geo/GModelIO_GEO.cpp | 75 +-
Geo/GModelIO_MSH.cpp | 289 +-
Geo/GModelIO_MSH2.cpp | 20 +-
Geo/GModelIO_OCC.cpp | 2 +-
Geo/GVertex.h | 2 -
Geo/Geo.cpp | 79 +-
Geo/Geo.h | 6 +-
Geo/Homology.cpp | 2 +-
Geo/OCCFace.cpp | 14 +-
Geo/OCCRegion.cpp | 12 +-
Geo/STensor3.h | 8 +-
Graphics/drawPost.cpp | 6 +-
Graphics/gl2ps.cpp | 77 +-
Graphics/gl2ps.h | 6 +-
Mesh/BackgroundMeshTools.cpp | 15 +-
Mesh/Field.cpp | 97 +-
Mesh/HighOrder.cpp | 2 +
Mesh/meshGEdge.cpp | 6 +-
Mesh/meshGFace.cpp | 2 +-
Mesh/periodical.cpp | 77 +-
Numeric/CondNumBasis.cpp | 5 +-
Numeric/FuncSpaceData.cpp | 30 +-
Numeric/FuncSpaceData.h | 31 +-
Numeric/GaussQuadratureHex.cpp | 5 +-
Numeric/GaussQuadraturePyr.cpp | 2 +-
Numeric/GaussQuadratureQuad.cpp | 5 +-
Parser/Gmsh.l | 169 +-
Parser/Gmsh.tab.cpp | 15047 ++++++-------------
Parser/Gmsh.tab.hpp | 341 +-
Parser/Gmsh.y | 172 +-
Parser/Gmsh.yy.cpp | 3227 ++--
Plugin/CMakeLists.txt | 3 +-
Plugin/CVTRemesh.cpp | 326 +
Plugin/CVTRemesh.h | 31 +
Plugin/Crack.cpp | 94 +-
.../{ModifyComponent.cpp => ModifyComponents.cpp} | 126 +-
Plugin/{ModifyComponent.h => ModifyComponents.h} | 14 +-
Plugin/NewView.cpp | 12 +-
Plugin/PluginManager.cpp | 12 +-
Post/CMakeLists.txt | 2 +-
Post/PView.cpp | 7 +-
Post/PView.h | 36 +-
Post/PViewData.cpp | 32 +
Post/PViewData.h | 14 +
Post/PViewDataGModel.cpp | 5 +-
Post/PViewIO.cpp | 17 +
Post/PViewX3D.cpp | 738 +
Post/PViewX3D.h | 65 +
Post/adaptiveData.cpp | 1202 +-
Post/adaptiveData.h | 285 +-
Solver/linearSystemPETSc.cpp | 24 +
Solver/linearSystemPETSc.hpp | 27 +-
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 2 +
contrib/MeshOptimizer/CMakeLists.txt | 20 +
contrib/MeshOptimizer/MeshOpt.cpp | 110 +-
contrib/MeshOptimizer/MeshOpt.h | 8 +-
contrib/MeshOptimizer/MeshOptCommon.cpp | 215 +-
contrib/MeshOptimizer/MeshOptCommon.h | 32 +-
contrib/MeshOptimizer/MeshOptObjectiveFunction.cpp | 24 +-
contrib/MeshOptimizer/MeshOptObjectiveFunction.h | 2 +
contrib/MeshOptimizer/MeshOptimizer.cpp | 237 +-
contrib/MeshOptimizer/MeshOptimizerConfig.h.in | 6 +
contrib/MeshOptimizer/doc/mesh_optimization.tex | 2 +-
.../MeshQualityOptimizer/MeshQualityOptimizer.cpp | 3 +
.../MeshQualityOptimizer/MeshQualityOptimizer.h | 4 +-
contrib/Revoropt/include/Revoropt/CVT/.gitignore | 7 +
contrib/Revoropt/include/Revoropt/CVT/computer.hpp | 560 +
.../Revoropt/include/Revoropt/CVT/minimizer.hpp | 292 +
contrib/Revoropt/include/Revoropt/Mesh/all_def.hpp | 21 +
contrib/Revoropt/include/Revoropt/Mesh/all_fwd.hpp | 21 +
.../include/Revoropt/Mesh/assembler_def.hpp | 16 +
.../include/Revoropt/Mesh/assembler_fwd.hpp | 305 +
.../Revoropt/include/Revoropt/Mesh/base_def.hpp | 66 +
.../Revoropt/include/Revoropt/Mesh/base_fwd.hpp | 677 +
.../Revoropt/include/Revoropt/Mesh/builder_def.hpp | 373 +
.../Revoropt/include/Revoropt/Mesh/builder_fwd.hpp | 348 +
.../include/Revoropt/Mesh/connectivity_def.hpp | 268 +
.../include/Revoropt/Mesh/connectivity_fwd.hpp | 446 +
.../Revoropt/include/Revoropt/Mesh/debug_def.hpp | 42 +
.../Revoropt/include/Revoropt/Mesh/debug_fwd.hpp | 22 +
.../Revoropt/include/Revoropt/Mesh/export_def.hpp | 139 +
.../Revoropt/include/Revoropt/Mesh/export_fwd.hpp | 32 +
.../Revoropt/include/Revoropt/Mesh/import_def.hpp | 85 +
.../Revoropt/include/Revoropt/Mesh/import_fwd.hpp | 24 +
.../Revoropt/include/Revoropt/Mesh/measure_def.hpp | 402 +
.../Revoropt/include/Revoropt/Mesh/measure_fwd.hpp | 94 +
.../Revoropt/include/Revoropt/Mesh/normals_def.hpp | 439 +
.../Revoropt/include/Revoropt/Mesh/normals_fwd.hpp | 58 +
.../include/Revoropt/Mesh/sampling_def.hpp | 97 +
.../include/Revoropt/Mesh/sampling_fwd.hpp | 27 +
.../include/Revoropt/Mesh/splitting_def.hpp | 1076 ++
.../include/Revoropt/Mesh/splitting_fwd.hpp | 273 +
.../include/Revoropt/Mesh/statistics_def.hpp | 149 +
.../include/Revoropt/Mesh/statistics_fwd.hpp | 46 +
.../include/Revoropt/Mesh/subdivision_def.hpp | 318 +
.../include/Revoropt/Mesh/subdivision_fwd.hpp | 216 +
.../Revoropt/include/Revoropt/Mesh/wrapper_def.hpp | 100 +
.../Revoropt/include/Revoropt/Mesh/wrapper_fwd.hpp | 662 +
.../include/Revoropt/Neighbours/aabox_def.hpp | 529 +
.../include/Revoropt/Neighbours/aabox_fwd.hpp | 206 +
.../Revoropt/Neighbours/neighbourhood_def.hpp | 228 +
.../Revoropt/Neighbours/neighbourhood_fwd.hpp | 130 +
contrib/Revoropt/include/Revoropt/RVD/.gitignore | 1 +
contrib/Revoropt/include/Revoropt/RVD/action.hpp | 132 +
.../Revoropt/include/Revoropt/RVD/ann_backend.hpp | 84 +
contrib/Revoropt/include/Revoropt/RVD/clipper.hpp | 87 +
.../include/Revoropt/RVD/flann_backend.hpp | 83 +
.../Revoropt/include/Revoropt/RVD/nn_clipper.hpp | 632 +
contrib/Revoropt/include/Revoropt/RVD/polygon.hpp | 519 +
contrib/Revoropt/include/Revoropt/RVD/rdt.hpp | 91 +
contrib/Revoropt/include/Revoropt/RVD/rvd.hpp | 364 +
.../Revoropt/include/Revoropt/Solver/.gitignore | 1 +
.../Revoropt/include/Revoropt/Solver/alglib_cg.hpp | 225 +
.../include/Revoropt/Solver/alglib_lbfgs.hpp | 227 +
contrib/Revoropt/include/Revoropt/Solver/lbfgs.hpp | 205 +
contrib/Revoropt/include/Revoropt/Tools/.gitignore | 1 +
contrib/Revoropt/include/Revoropt/Tools/color.hpp | 73 +
.../include/Revoropt/Tools/combinatorics.hpp | 201 +
.../Revoropt/include/Revoropt/Tools/command_line.h | 60 +
.../include/Revoropt/Tools/container_wrapper.hpp | 1227 ++
.../include/Revoropt/Tools/disjoint_sets_def.hpp | 115 +
.../include/Revoropt/Tools/disjoint_sets_fwd.hpp | 65 +
.../include/Revoropt/Tools/eigen_helpers.hpp | 70 +
.../include/Revoropt/Tools/group_vector.hpp | 98 +
contrib/Revoropt/include/Revoropt/Tools/hash.hpp | 67 +
.../include/Revoropt/Tools/intersections_def.hpp | 687 +
.../include/Revoropt/Tools/intersections_fwd.hpp | 76 +
.../include/Revoropt/Tools/measure_def.hpp | 597 +
.../include/Revoropt/Tools/measure_fwd.hpp | 92 +
contrib/Revoropt/include/Revoropt/Tools/meta.hpp | 221 +
.../include/Revoropt/Tools/normals_def.hpp | 60 +
.../include/Revoropt/Tools/normals_fwd.hpp | 30 +
contrib/Revoropt/include/Revoropt/VSDM/.gitignore | 2 +
.../Revoropt/include/Revoropt/VSDM/minimizer.hpp | 290 +
contrib/Revoropt/include/Revoropt/VSDM/regul.hpp | 167 +
contrib/Revoropt/include/Revoropt/VSDM/sampler.hpp | 263 +
contrib/mobile/Android/AndroidManifest.xml | 57 +-
contrib/mobile/Android/res/layout/model.xml | 13 +-
contrib/mobile/Android/res/values/strings.xml | 6 -
.../Android/src/org/geuz/onelab/AboutActivity.java | 2 +
.../Android/src/org/geuz/onelab/GLESRender.java | 2 +
.../mobile/Android/src/org/geuz/onelab/Gmsh.java | 8 +-
.../Android/src/org/geuz/onelab/MainActivity.java | 16 +-
.../mobile/Android/src/org/geuz/onelab/Model.java | 8 +
.../src/org/geuz/onelab/ModelArrayAdapter.java | 25 +-
.../Android/src/org/geuz/onelab/ModelFragment.java | 5 +-
.../Android/src/org/geuz/onelab/ModelList.java | 67 +-
.../src/org/geuz/onelab/OptionsActivity.java | 2 +
.../org/geuz/onelab/OptionsDisplayFragment.java | 2 +
.../src/org/geuz/onelab/OptionsFragment.java | 2 +
.../src/org/geuz/onelab/OptionsModelFragment.java | 16 +-
.../geuz/onelab/OptionsPostProcessingFragment.java | 2 +
.../Android/src/org/geuz/onelab/Parameter.java | 36 +-
.../src/org/geuz/onelab/ParameterNumber.java | 4 +-
.../src/org/geuz/onelab/ParameterString.java | 2 +
.../org/geuz/onelab/PostProcessingActivity.java | 2 +
.../src/org/geuz/onelab/SeparatedListView.java | 1 -
.../Android/src/org/geuz/onelab/SplashScreen.java | 123 +-
contrib/mobile/CMakeLists.txt | 227 +-
contrib/mobile/README.txt | 7 +-
.../mobile/{androidGModel.cpp => androidUtils.cpp} | 4 +-
contrib/mobile/{androidGModel.h => androidUtils.h} | 13 +-
contrib/mobile/drawContext.cpp | 2 +-
contrib/mobile/drawContext.h | 50 +-
contrib/mobile/drawString.h | 4 +-
.../mobile/iOS/Onelab.xcodeproj/project.pbxproj | 36 +-
contrib/mobile/iOS/Onelab/AppDelegate.mm | 12 +
contrib/mobile/iOS/Onelab/EAGLView.mm | 23 +-
.../AppIcon.appiconset/icon_app_ipad.png | Bin 1915 -> 3504 bytes
.../AppIcon.appiconset/icon_app_ipad_retina.png | Bin 4144 -> 10916 bytes
.../AppIcon.appiconset/icon_app_iphone_retina.png | Bin 3193 -> 7210 bytes
.../LaunchImage.launchimage/Contents.json | 29 +-
.../LaunchImage.launchimage/splash1024x768.png | Bin 6927 -> 9285 bytes
.../LaunchImage.launchimage/splash1242x2208.png | Bin 0 -> 25175 bytes
.../LaunchImage.launchimage/splash1334x750.png | Bin 0 -> 10065 bytes
.../LaunchImage.launchimage/splash1536x2048.png | Bin 23429 -> 26662 bytes
.../LaunchImage.launchimage/splash2048x1536.png | Bin 22482 -> 25800 bytes
.../LaunchImage.launchimage/splash2208x1242.png | Bin 0 -> 23178 bytes
.../LaunchImage.launchimage/splash640x1136.png | Bin 7008 -> 9672 bytes
.../LaunchImage.launchimage/splash640x960.png | Bin 6328 -> 8836 bytes
.../LaunchImage.launchimage/splash750x1334.png | Bin 0 -> 11289 bytes
.../LaunchImage.launchimage/splash768x1024.png | Bin 7117 -> 9730 bytes
.../AppIcon.appiconset/Contents.json | 56 +
.../AppIcon.appiconset/icon_app_ipad.png | Bin 0 -> 9873 bytes
.../AppIcon.appiconset/icon_app_ipad_retina.png | Bin 0 -> 13539 bytes
.../AppIcon.appiconset/icon_app_iphone_retina.png | Bin 0 -> 12040 bytes
.../LaunchImage.launchimage/Contents.json | 29 +-
.../LaunchImage.launchimage/splash1024x768.png | Bin 0 -> 9207 bytes
.../LaunchImage.launchimage/splash1242x2208.png | Bin 0 -> 11139 bytes
.../LaunchImage.launchimage/splash1334x750.png | Bin 0 -> 9449 bytes
.../LaunchImage.launchimage/splash1536x2048.png | Bin 0 -> 11649 bytes
.../LaunchImage.launchimage/splash2048x1536.png | Bin 0 -> 11790 bytes
.../LaunchImage.launchimage/splash2208x1242.png | Bin 0 -> 11421 bytes
.../LaunchImage.launchimage/splash640x1136.png | Bin 0 -> 8995 bytes
.../LaunchImage.launchimage/splash640x960.png | Bin 0 -> 8853 bytes
.../LaunchImage.launchimage/splash750x1334.png | Bin 0 -> 9296 bytes
.../LaunchImage.launchimage/splash768x1024.png | Bin 0 -> 9128 bytes
contrib/mobile/iOS/Onelab/Model.h | 2 +
contrib/mobile/iOS/Onelab/Model.mm | 5 +
contrib/mobile/iOS/Onelab/ModelListController.h | 2 +-
contrib/mobile/iOS/Onelab/ModelListController.mm | 20 +-
contrib/mobile/iOS/Onelab/ModelViewController.mm | 45 +-
contrib/mobile/iOS/Onelab/Onelab-Info.plist | 44 +-
contrib/mobile/iOS/Onelab/OptionsViewController.mm | 25 +-
contrib/mobile/iOS/Onelab/Parameter.mm | 109 +-
.../mobile/iOS/Onelab/ParametersViewController.h | 6 +-
.../mobile/iOS/Onelab/ParametersViewController.mm | 139 +-
.../iOS/Onelab/PostProcessingViewController.mm | 15 +-
contrib/mobile/iOS/Onelab/Utils.h | 4 +-
contrib/mobile/iOS/Onelab/Utils.mm | 25 +
.../iOS/Onelab/en.lproj/iPadStoryboard.storyboard | 116 +-
.../en.lproj/iPhoneiPodStoryboard.storyboard | 126 +-
contrib/mobile/{iosGModel.cpp => iosUtils.cpp} | 2 +-
contrib/mobile/{iosGModel.h => iosUtils.h} | 4 +-
contrib/mobile/movePosition.h | 50 -
contrib/mobile/utils/Android.cmake | 4 +-
.../{onelab_android_build.sh => android_build.sh} | 124 +-
...slapack_makefile => f2cblaslapack_ios_makefile} | 7 +-
contrib/mobile/utils/iOS.cmake | 9 +-
contrib/mobile/utils/ios_build.sh | 68 +
contrib/mobile/utils/iossimulator_build.sh | 68 +
contrib/mobile/utils/make_icon_ios.sh | 42 +-
...-linux.py => petsc_reconfigure_android_real.py} | 31 +-
...own-darwin.py => petsc_reconfigure_ios_real.py} | 18 +-
.../utils/petsc_reconfigure_iossimulator_real.py | 22 +
contrib/zipper/CMakeLists.txt | 15 +
contrib/zipper/MiniZip_info.txt | 74 +
contrib/zipper/crypt.h | 131 +
contrib/zipper/example.cpp | 69 +
contrib/zipper/ioapi.c | 235 +
contrib/zipper/ioapi.h | 202 +
contrib/zipper/iowin32.c | 389 +
contrib/zipper/iowin32.h | 28 +
contrib/zipper/unzip.c | 2125 +++
contrib/zipper/unzip.h | 437 +
contrib/zipper/unzipper.cpp | 182 +
contrib/zipper/unzipper.h | 44 +
contrib/zipper/zip.c | 2004 +++
contrib/zipper/zip.h | 362 +
contrib/zipper/zipper.cpp | 146 +
contrib/zipper/zipper.h | 39 +
doc/VERSIONS.txt | 9 +-
doc/gmsh.html | 226 +-
doc/texinfo/gmsh.texi | 131 +-
doc/texinfo/opt_plugin.texi | 51 +-
doc/texinfo/shortcuts.texi | 4 +-
tutorial/t3.geo | 2 +-
tutorial/t4.geo | 2 +-
tutorial/t6.geo | 17 +
utils/icons/gmsh.xcf | Bin 1074968 -> 879724 bytes
utils/icons/gmsh_128x128.png | Bin 0 -> 6703 bytes
utils/icons/gmsh_256x256.png | Bin 0 -> 16168 bytes
utils/icons/gmsh_mobile_1024x1024.png | Bin 0 -> 524433 bytes
utils/icons/gmsh_mobile_master.png | Bin 79737 -> 0 bytes
wrappers/gmshpy/gmshGeo.i | 3 +
280 files changed, 34161 insertions(+), 14826 deletions(-)
diff --cc Parser/Gmsh.tab.cpp
index c27c7d9,02eaa65..f25f53d
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@@ -743,18 -401,10 +754,18 @@@ extern int gmsh_yydebug
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+<<<<<<< HEAD
+typedef union YYSTYPE
+<<<<<<< HEAD
+#line 100 "Gmsh.y"
+=======
+>>>>>>> upstream/2.9.3+dfsg1
+=======
union YYSTYPE
+>>>>>>> upstream/2.10.1+dfsg1
{
- #line 105 "Gmsh.y" /* yacc.c:355 */
+ #line 109 "Gmsh.y" /* yacc.c:355 */
char *c;
int i;
@@@ -763,14 -413,8 +774,14 @@@
double v[5];
Shape s;
List_T *l;
+<<<<<<< HEAD
+}
+/* Line 193 of yacc.c. */
+#line 545 "Gmsh.tab.cpp"
+ YYSTYPE;
+=======
- #line 407 "Gmsh.tab.cpp" /* yacc.c:355 */
+ #line 418 "Gmsh.tab.cpp" /* yacc.c:355 */
};
typedef union YYSTYPE YYSTYPE;
@@@ -1156,765 -737,10 +1109,766 @@@ static const yytype_uint8 yytranslate[
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
+<<<<<<< HEAD
+<<<<<<< HEAD
+ 155, 156, 157, 159, 160, 161, 162, 165, 166, 173,
+ 174, 175
+=======
+ 155, 156, 157, 158, 159, 160, 161, 163, 164, 165,
+ 166, 169, 170, 177, 178, 179
+>>>>>>> upstream/2.9.3+dfsg1
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+ YYRHS. */
+static const yytype_uint16 yyprhs[] =
+{
+ 0, 0, 3, 5, 8, 9, 12, 14, 16, 18,
+ 20, 22, 24, 26, 28, 30, 32, 34, 36, 38,
+ 40, 42, 44, 47, 53, 59, 67, 75, 83, 93,
+ 100, 107, 114, 123, 124, 127, 130, 133, 136, 139,
+ 141, 145, 147, 151, 152, 153, 164, 166, 170, 171,
+ 185, 187, 191, 192, 208, 217, 232, 233, 240, 242,
+ 244, 246, 248, 250, 252, 254, 256, 258, 260, 262,
+<<<<<<< HEAD
+ 268, 274, 279, 286, 294, 302, 310, 320, 330, 334,
+ 341, 348, 353, 360, 370, 377, 387, 393, 402, 411,
+ 423, 430, 440, 446, 454, 464, 474, 486, 494, 504,
+ 514, 515, 517, 518, 522, 528, 529, 539, 545, 546,
+ 556, 557, 561, 565, 571, 572, 575, 579, 585, 589,
+ 590, 593, 597, 601, 607, 609, 611, 612, 618, 619,
+ 622, 630, 631, 641, 648, 656, 661, 669, 678, 687,
+ 695, 703, 715, 724, 733, 734, 744, 753, 763, 767,
+ 772, 783, 791, 799, 808, 817, 830, 831, 841, 850,
+ 858, 867, 868, 878, 884, 896, 902, 912, 922, 927,
+ 937, 947, 949, 951, 952, 955, 962, 969, 976, 983,
+ 992, 1003, 1018, 1035, 1048, 1057, 1066, 1073, 1088, 1093,
+ 1100, 1107, 1111, 1116, 1122, 1129, 1133, 1137, 1142, 1148,
+ 1153, 1159, 1163, 1171, 1179, 1183, 1191, 1195, 1198, 1201,
+ 1204, 1207, 1223, 1226, 1229, 1232, 1235, 1238, 1255, 1259,
+ 1266, 1275, 1284, 1295, 1297, 1300, 1302, 1306, 1311, 1313,
+ 1319, 1331, 1345, 1346, 1354, 1355, 1369, 1370, 1386, 1387,
+ 1394, 1403, 1412, 1421, 1434, 1447, 1460, 1475, 1490, 1505,
+ 1506, 1519, 1520, 1533, 1534, 1547, 1548, 1565, 1566, 1583,
+ 1584, 1601, 1602, 1621, 1622, 1641, 1642, 1661, 1663, 1666,
+ 1672, 1680, 1690, 1693, 1696, 1699, 1703, 1706, 1710, 1713,
+ 1717, 1720, 1724, 1734, 1741, 1742, 1746, 1747, 1749, 1750,
+ 1753, 1754, 1757, 1765, 1772, 1781, 1787, 1791, 1799, 1805,
+ 1810, 1817, 1824, 1837, 1848, 1859, 1870, 1881, 1892, 1897,
+ 1902, 1907, 1912, 1917, 1920, 1924, 1931, 1933, 1935, 1937,
+ 1940, 1946, 1954, 1965, 1967, 1971, 1974, 1977, 1980, 1984,
+ 1988, 1992, 1996, 2000, 2004, 2008, 2012, 2016, 2020, 2024,
+ 2028, 2032, 2036, 2042, 2047, 2052, 2057, 2062, 2067, 2072,
+ 2077, 2082, 2087, 2092, 2099, 2104, 2109, 2114, 2119, 2124,
+ 2129, 2134, 2141, 2148, 2155, 2160, 2162, 2164, 2166, 2168,
+ 2170, 2172, 2174, 2176, 2178, 2180, 2181, 2188, 2190, 2195,
+ 2200, 2205, 2210, 2215, 2218, 2224, 2230, 2234, 2241, 2246,
+ 2254, 2261, 2268, 2275, 2280, 2282, 2285, 2288, 2292, 2296,
+ 2308, 2318, 2326, 2334, 2336, 2340, 2342, 2344, 2347, 2351,
+ 2356, 2362, 2364, 2366, 2369, 2373, 2377, 2383, 2388, 2391,
+ 2394, 2397, 2400, 2406, 2412, 2418, 2424, 2426, 2428, 2432,
+ 2437, 2444, 2446, 2448, 2452, 2456, 2466, 2474, 2476, 2482,
+ 2486, 2493, 2495, 2499, 2501, 2503, 2507, 2514, 2516, 2518,
+ 2520, 2525, 2532, 2539, 2544, 2549, 2558, 2563, 2568, 2575,
+ 2576, 2583, 2585, 2589, 2595, 2601, 2603
+=======
+ 268, 274, 279, 286, 293, 301, 309, 317, 327, 337,
+ 341, 348, 355, 360, 367, 377, 384, 394, 400, 409,
+ 418, 430, 437, 447, 453, 461, 471, 481, 493, 501,
+ 511, 521, 522, 524, 525, 529, 535, 536, 546, 552,
+ 553, 563, 564, 568, 572, 578, 579, 582, 586, 592,
+ 596, 597, 600, 604, 608, 614, 616, 618, 620, 622,
+ 624, 626, 628, 630, 631, 637, 638, 641, 649, 658,
+ 665, 673, 678, 686, 695, 704, 712, 720, 732, 741,
+ 750, 759, 768, 778, 782, 787, 798, 806, 814, 823,
+ 832, 845, 854, 863, 871, 880, 889, 895, 907, 913,
+ 923, 933, 938, 948, 958, 960, 962, 963, 966, 973,
+ 980, 987, 994, 1003, 1014, 1029, 1046, 1059, 1068, 1077,
+ 1084, 1099, 1104, 1111, 1118, 1122, 1127, 1133, 1140, 1144,
+ 1148, 1153, 1159, 1164, 1170, 1174, 1180, 1188, 1196, 1200,
+ 1208, 1212, 1215, 1218, 1221, 1224, 1240, 1243, 1246, 1249,
+ 1252, 1255, 1272, 1276, 1283, 1292, 1301, 1312, 1314, 1317,
+ 1319, 1323, 1328, 1330, 1336, 1348, 1362, 1363, 1371, 1372,
+ 1386, 1387, 1403, 1404, 1411, 1420, 1429, 1438, 1451, 1464,
+ 1477, 1492, 1507, 1522, 1523, 1536, 1537, 1550, 1551, 1564,
+ 1565, 1582, 1583, 1600, 1601, 1618, 1619, 1638, 1639, 1658,
+ 1659, 1678, 1680, 1683, 1689, 1697, 1707, 1710, 1713, 1716,
+ 1720, 1723, 1727, 1730, 1734, 1737, 1741, 1751, 1758, 1759,
+ 1763, 1764, 1766, 1767, 1770, 1771, 1774, 1775, 1778, 1786,
+ 1793, 1802, 1808, 1812, 1820, 1826, 1831, 1838, 1845, 1859,
+ 1870, 1881, 1892, 1903, 1914, 1919, 1924, 1929, 1934, 1939,
+ 1942, 1946, 1953, 1955, 1957, 1959, 1962, 1968, 1976, 1987,
+ 1989, 1993, 1996, 1999, 2002, 2006, 2010, 2014, 2018, 2022,
+ 2026, 2030, 2034, 2038, 2042, 2046, 2050, 2054, 2058, 2064,
+ 2069, 2074, 2079, 2084, 2089, 2094, 2099, 2104, 2109, 2114,
+ 2121, 2126, 2131, 2136, 2141, 2146, 2151, 2156, 2163, 2170,
+ 2177, 2182, 2184, 2186, 2188, 2190, 2192, 2194, 2196, 2198,
+ 2200, 2202, 2203, 2210, 2212, 2217, 2222, 2227, 2232, 2237,
+ 2240, 2246, 2252, 2256, 2263, 2268, 2276, 2283, 2290, 2297,
+ 2304, 2309, 2311, 2314, 2317, 2321, 2325, 2337, 2347, 2355,
+ 2363, 2365, 2369, 2371, 2373, 2376, 2380, 2385, 2391, 2393,
+ 2395, 2398, 2402, 2406, 2412, 2417, 2420, 2423, 2426, 2429,
+ 2433, 2437, 2441, 2445, 2451, 2457, 2463, 2469, 2486, 2503,
+ 2520, 2537, 2539, 2541, 2545, 2549, 2554, 2561, 2568, 2570,
+ 2572, 2576, 2580, 2590, 2598, 2600, 2606, 2610, 2617, 2619,
+ 2623, 2625, 2627, 2631, 2638, 2640, 2642, 2644, 2649, 2656,
+ 2661, 2666, 2671, 2680, 2685, 2694, 2699, 2706, 2711, 2712,
+ 2719, 2721, 2725, 2731, 2737, 2739
+>>>>>>> upstream/2.9.3+dfsg1
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const yytype_int16 yyrhs[] =
+{
+<<<<<<< HEAD
+ 188, 0, -1, 189, -1, 1, 6, -1, -1, 189,
+ 190, -1, 193, -1, 192, -1, 213, -1, 227, -1,
+ 232, -1, 236, -1, 237, -1, 238, -1, 241, -1,
+ 261, -1, 262, -1, 240, -1, 239, -1, 235, -1,
+ 264, -1, 164, -1, 164, 164, -1, 37, 177, 278,
+ 178, 6, -1, 38, 177, 278, 178, 6, -1, 37,
+ 177, 278, 178, 191, 278, 6, -1, 37, 177, 278,
+ 183, 274, 178, 6, -1, 38, 177, 278, 183, 274,
+ 178, 6, -1, 37, 177, 278, 183, 274, 178, 191,
+ 278, 6, -1, 4, 278, 184, 194, 185, 6, -1,
+ 108, 4, 179, 265, 180, 6, -1, 109, 4, 179,
+ 265, 180, 6, -1, 110, 4, 179, 265, 183, 265,
+ 180, 6, -1, -1, 194, 197, -1, 194, 201, -1,
+ 194, 204, -1, 194, 206, -1, 194, 207, -1, 265,
+ -1, 195, 183, 265, -1, 265, -1, 196, 183, 265,
+ -1, -1, -1, 4, 198, 177, 195, 178, 199, 184,
+ 196, 185, 6, -1, 278, -1, 200, 183, 278, -1,
+ -1, 117, 177, 265, 183, 265, 183, 265, 178, 202,
+ 184, 200, 185, 6, -1, 278, -1, 203, 183, 278,
+ -1, -1, 118, 177, 265, 183, 265, 183, 265, 183,
+ 265, 178, 205, 184, 203, 185, 6, -1, 119, 184,
+ 270, 185, 184, 270, 185, 6, -1, 119, 184, 270,
+ 185, 184, 270, 185, 184, 270, 185, 184, 270, 185,
+ 6, -1, -1, 120, 208, 184, 196, 185, 6, -1,
+ 7, -1, 157, -1, 156, -1, 155, -1, 154, -1,
+ 175, -1, 174, -1, 177, -1, 179, -1, 178, -1,
+ 180, -1, 60, 179, 215, 180, 6, -1, 61, 179,
+ 218, 180, 6, -1, 283, 209, 271, 6, -1, 4,
+ 179, 180, 209, 271, 6, -1, 4, 179, 265, 180,
+ 209, 265, 6, -1, 4, 177, 265, 178, 209, 265,
+ 6, -1, 282, 179, 265, 180, 209, 265, 6, -1,
+ 4, 211, 184, 274, 185, 212, 209, 271, 6, -1,
+ 282, 177, 184, 274, 185, 178, 209, 271, 6, -1,
+ 283, 210, 6, -1, 4, 179, 265, 180, 210, 6,
+ -1, 282, 179, 265, 180, 210, 6, -1, 283, 7,
+ 279, 6, -1, 4, 181, 4, 7, 279, 6, -1,
+ 4, 179, 265, 180, 181, 4, 7, 279, 6, -1,
+ 4, 181, 4, 209, 265, 6, -1, 4, 179, 265,
+ 180, 181, 4, 209, 265, 6, -1, 4, 181, 4,
+ 210, 6, -1, 4, 179, 265, 180, 181, 4, 210,
+ 6, -1, 4, 181, 127, 181, 4, 7, 275, 6,
+ -1, 4, 179, 265, 180, 181, 127, 181, 4, 7,
+ 275, 6, -1, 4, 181, 128, 7, 276, 6, -1,
+ 4, 179, 265, 180, 181, 128, 7, 276, 6, -1,
+ 4, 136, 7, 265, 6, -1, 136, 179, 265, 180,
+ 7, 4, 6, -1, 136, 179, 265, 180, 181, 4,
+ 7, 265, 6, -1, 136, 179, 265, 180, 181, 4,
+ 7, 279, 6, -1, 136, 179, 265, 180, 181, 4,
+ 7, 184, 274, 185, 6, -1, 136, 179, 265, 180,
+ 181, 4, 6, -1, 88, 177, 4, 178, 181, 4,
+ 7, 265, 6, -1, 88, 177, 4, 178, 181, 4,
+ 7, 279, 6, -1, -1, 183, -1, -1, 215, 214,
+ 283, -1, 215, 214, 283, 7, 265, -1, -1, 215,
+ 214, 283, 7, 184, 265, 216, 220, 185, -1, 215,
+ 214, 283, 7, 279, -1, -1, 215, 214, 283, 7,
+ 184, 279, 217, 222, 185, -1, -1, 218, 214, 278,
+ -1, 265, 7, 279, -1, 219, 183, 265, 7, 279,
+ -1, -1, 220, 221, -1, 183, 4, 271, -1, 183,
+ 4, 184, 219, 185, -1, 183, 4, 279, -1, -1,
+ 222, 223, -1, 183, 4, 265, -1, 183, 4, 279,
+ -1, 183, 4, 184, 281, 185, -1, 265, -1, 279,
+ -1, -1, 130, 68, 184, 265, 185, -1, -1, 80,
+ 268, -1, 64, 177, 265, 178, 7, 268, 6, -1,
+ -1, 84, 64, 228, 177, 224, 178, 7, 271, 6,
+ -1, 73, 74, 271, 7, 265, 6, -1, 67, 177,
+ 265, 178, 7, 271, 6, -1, 89, 67, 271, 6,
+ -1, 71, 177, 265, 178, 7, 271, 6, -1, 65,
+ 177, 265, 178, 7, 271, 226, 6, -1, 66, 177,
+ 265, 178, 7, 271, 226, 6, -1, 122, 177, 265,
+ 178, 7, 271, 6, -1, 123, 177, 265, 178, 7,
+ 271, 6, -1, 124, 177, 265, 178, 7, 271, 126,
+ 271, 125, 265, 6, -1, 67, 4, 177, 265, 178,
+ 7, 271, 6, -1, 85, 67, 177, 265, 178, 7,
+ 271, 6, -1, -1, 84, 67, 229, 177, 224, 178,
+ 7, 271, 6, -1, 80, 70, 177, 265, 178, 7,
+ 271, 6, -1, 81, 70, 177, 265, 178, 7, 271,
+ 225, 6, -1, 12, 13, 6, -1, 13, 70, 265,
+ 6, -1, 75, 70, 177, 265, 178, 7, 5, 5,
+ 5, 6, -1, 68, 177, 265, 178, 7, 271, 6,
+ -1, 69, 177, 265, 178, 7, 271, 6, -1, 70,
+ 4, 177, 265, 178, 7, 271, 6, -1, 85, 70,
+ 177, 265, 178, 7, 271, 6, -1, 85, 70, 177,
+ 265, 178, 7, 271, 4, 184, 270, 185, 6, -1,
+ -1, 84, 70, 230, 177, 224, 178, 7, 271, 6,
+ -1, 83, 72, 177, 265, 178, 7, 271, 6, -1,
+ 72, 177, 265, 178, 7, 271, 6, -1, 85, 72,
+ 177, 265, 178, 7, 271, 6, -1, -1, 84, 72,
+ 231, 177, 224, 178, 7, 271, 6, -1, 92, 268,
+ 184, 233, 185, -1, 91, 184, 268, 183, 268, 183,
+ 265, 185, 184, 233, 185, -1, 93, 268, 184, 233,
+ 185, -1, 94, 184, 268, 183, 265, 185, 184, 233,
+ 185, -1, 94, 184, 268, 183, 268, 185, 184, 233,
+ 185, -1, 4, 184, 233, 185, -1, 102, 67, 184,
+ 274, 185, 70, 184, 265, 185, -1, 99, 67, 177,
+ 265, 178, 184, 274, 185, 6, -1, 234, -1, 232,
+ -1, -1, 234, 227, -1, 234, 64, 184, 274, 185,
+ 6, -1, 234, 67, 184, 274, 185, 6, -1, 234,
+ 70, 184, 274, 185, 6, -1, 234, 72, 184, 274,
+ 185, 6, -1, 96, 80, 177, 265, 178, 7, 271,
+ 6, -1, 96, 64, 177, 265, 178, 7, 184, 270,
+ 185, 6, -1, 96, 80, 177, 265, 178, 7, 184,
+ 268, 183, 268, 183, 274, 185, 6, -1, 96, 80,
+ 177, 265, 178, 7, 184, 268, 183, 268, 183, 268,
+ 183, 274, 185, 6, -1, 96, 68, 177, 265, 178,
+ 7, 184, 268, 183, 274, 185, 6, -1, 96, 4,
+ 177, 265, 178, 7, 271, 6, -1, 96, 4, 177,
+ 265, 178, 7, 5, 6, -1, 96, 4, 184, 265,
+ 185, 6, -1, 96, 4, 177, 265, 178, 7, 184,
+ 268, 183, 268, 183, 274, 185, 6, -1, 100, 184,
+ 234, 185, -1, 100, 136, 179, 265, 180, 6, -1,
+ 100, 4, 179, 265, 180, 6, -1, 100, 4, 6,
+ -1, 100, 4, 4, 6, -1, 127, 275, 184, 234,
+ 185, -1, 90, 127, 275, 184, 234, 185, -1, 140,
+ 5, 6, -1, 141, 5, 6, -1, 140, 184, 234,
+ 185, -1, 90, 140, 184, 234, 185, -1, 141, 184,
+ 234, 185, -1, 90, 141, 184, 234, 185, -1, 4,
+ 279, 6, -1, 4, 4, 179, 265, 180, 278, 6,
+ -1, 4, 4, 4, 179, 265, 180, 6, -1, 4,
+ 265, 6, -1, 88, 177, 4, 178, 181, 4, 6,
+ -1, 121, 4, 6, -1, 134, 6, -1, 135, 6,
+ -1, 53, 6, -1, 48, 6, -1, 48, 184, 265,
+ 183, 265, 183, 265, 183, 265, 183, 265, 183, 265,
+ 185, 6, -1, 49, 6, -1, 50, 6, -1, 57,
+ 6, -1, 58, 6, -1, 77, 6, -1, 78, 184,
+ 274, 185, 184, 274, 185, 184, 270, 185, 184, 265,
+ 183, 265, 185, 6, -1, 148, 265, 6, -1, 129,
+ 177, 265, 8, 265, 178, -1, 129, 177, 265, 8,
+ 265, 8, 265, 178, -1, 129, 4, 130, 184, 265,
+ 8, 265, 185, -1, 129, 4, 130, 184, 265, 8,
+ 265, 8, 265, 185, -1, 131, -1, 139, 4, -1,
+ 137, -1, 138, 4, 6, -1, 132, 177, 265, 178,
+ -1, 133, -1, 95, 268, 184, 234, 185, -1, 95,
+ 184, 268, 183, 268, 183, 265, 185, 184, 234, 185,
+ -1, 95, 184, 268, 183, 268, 183, 268, 183, 265,
+ 185, 184, 234, 185, -1, -1, 95, 268, 184, 234,
+ 242, 255, 185, -1, -1, 95, 184, 268, 183, 268,
+ 183, 265, 185, 184, 234, 243, 255, 185, -1, -1,
+ 95, 184, 268, 183, 268, 183, 268, 183, 265, 185,
+ 184, 234, 244, 255, 185, -1, -1, 95, 184, 234,
+ 245, 255, 185, -1, 95, 64, 184, 265, 183, 268,
+ 185, 6, -1, 95, 67, 184, 265, 183, 268, 185,
+ 6, -1, 95, 70, 184, 265, 183, 268, 185, 6,
+ -1, 95, 64, 184, 265, 183, 268, 183, 268, 183,
+ 265, 185, 6, -1, 95, 67, 184, 265, 183, 268,
+ 183, 268, 183, 265, 185, 6, -1, 95, 70, 184,
+ 265, 183, 268, 183, 268, 183, 265, 185, 6, -1,
+ 95, 64, 184, 265, 183, 268, 183, 268, 183, 268,
+ 183, 265, 185, 6, -1, 95, 67, 184, 265, 183,
+ 268, 183, 268, 183, 268, 183, 265, 185, 6, -1,
+ 95, 70, 184, 265, 183, 268, 183, 268, 183, 268,
+ 183, 265, 185, 6, -1, -1, 95, 64, 184, 265,
+ 183, 268, 185, 246, 184, 255, 185, 6, -1, -1,
+ 95, 67, 184, 265, 183, 268, 185, 247, 184, 255,
+ 185, 6, -1, -1, 95, 70, 184, 265, 183, 268,
+ 185, 248, 184, 255, 185, 6, -1, -1, 95, 64,
+ 184, 265, 183, 268, 183, 268, 183, 265, 185, 249,
+ 184, 255, 185, 6, -1, -1, 95, 67, 184, 265,
+ 183, 268, 183, 268, 183, 265, 185, 250, 184, 255,
+ 185, 6, -1, -1, 95, 70, 184, 265, 183, 268,
+ 183, 268, 183, 265, 185, 251, 184, 255, 185, 6,
+ -1, -1, 95, 64, 184, 265, 183, 268, 183, 268,
+ 183, 268, 183, 265, 185, 252, 184, 255, 185, 6,
+ -1, -1, 95, 67, 184, 265, 183, 268, 183, 268,
+ 183, 268, 183, 265, 185, 253, 184, 255, 185, 6,
+ -1, -1, 95, 70, 184, 265, 183, 268, 183, 268,
+ 183, 268, 183, 265, 185, 254, 184, 255, 185, 6,
+ -1, 256, -1, 255, 256, -1, 105, 184, 265, 185,
+ 6, -1, 105, 184, 271, 183, 271, 185, 6, -1,
+ 105, 184, 271, 183, 271, 183, 271, 185, 6, -1,
+ 106, 6, -1, 97, 6, -1, 113, 6, -1, 113,
+ 115, 6, -1, 114, 6, -1, 114, 115, 6, -1,
+ 111, 6, -1, 111, 115, 6, -1, 112, 6, -1,
+ 112, 115, 6, -1, 107, 177, 265, 178, 7, 271,
+ 87, 265, 6, -1, 87, 4, 179, 265, 180, 6,
+ -1, -1, 87, 4, 265, -1, -1, 4, -1, -1,
+ 7, 271, -1, -1, 7, 265, -1, 82, 67, 272,
+ 7, 265, 257, 6, -1, 82, 70, 272, 259, 258,
+ 6, -1, 76, 70, 184, 265, 185, 7, 271, 6,
+ -1, 82, 72, 272, 259, 6, -1, 116, 272, 6,
+ -1, 103, 70, 184, 274, 185, 265, 6, -1, 97,
+ 70, 272, 260, 6, -1, 97, 72, 272, 6, -1,
+ 98, 70, 271, 7, 265, 6, -1, 86, 67, 271,
+ 7, 271, 6, -1, 86, 70, 265, 184, 274, 185,
+ 7, 265, 184, 274, 185, 6, -1, 64, 184, 274,
+ 185, 130, 70, 184, 265, 185, 6, -1, 67, 184,
+ 274, 185, 130, 70, 184, 265, 185, 6, -1, 64,
+ 184, 274, 185, 130, 72, 184, 265, 185, 6, -1,
+ 67, 184, 274, 185, 130, 72, 184, 265, 185, 6,
+ -1, 70, 184, 274, 185, 130, 72, 184, 265, 185,
+ 6, -1, 104, 70, 272, 6, -1, 104, 67, 272,
+ 6, -1, 79, 64, 272, 6, -1, 79, 67, 272,
+ 6, -1, 79, 70, 272, 6, -1, 101, 6, -1,
+ 101, 4, 6, -1, 101, 64, 184, 274, 185, 6,
+ -1, 145, -1, 146, -1, 147, -1, 263, 6, -1,
+ 263, 184, 271, 185, 6, -1, 263, 184, 271, 183,
+ 271, 185, 6, -1, 263, 177, 271, 178, 184, 271,
+ 183, 271, 185, 6, -1, 266, -1, 177, 265, 178,
+ -1, 168, 265, -1, 167, 265, -1, 172, 265, -1,
+ 265, 168, 265, -1, 265, 167, 265, -1, 265, 169,
+ 265, -1, 265, 170, 265, -1, 265, 171, 265, -1,
+ 265, 176, 265, -1, 265, 163, 265, -1, 265, 164,
+ 265, -1, 265, 166, 265, -1, 265, 165, 265, -1,
+ 265, 162, 265, -1, 265, 161, 265, -1, 265, 160,
+ 265, -1, 265, 159, 265, -1, 265, 158, 265, 8,
+ 265, -1, 14, 211, 265, 212, -1, 15, 211, 265,
+ 212, -1, 16, 211, 265, 212, -1, 17, 211, 265,
+ 212, -1, 18, 211, 265, 212, -1, 19, 211, 265,
+ 212, -1, 20, 211, 265, 212, -1, 21, 211, 265,
+ 212, -1, 22, 211, 265, 212, -1, 24, 211, 265,
+ 212, -1, 25, 211, 265, 183, 265, 212, -1, 26,
+ 211, 265, 212, -1, 27, 211, 265, 212, -1, 28,
+ 211, 265, 212, -1, 29, 211, 265, 212, -1, 30,
+ 211, 265, 212, -1, 31, 211, 265, 212, -1, 32,
+ 211, 265, 212, -1, 33, 211, 265, 183, 265, 212,
+ -1, 34, 211, 265, 183, 265, 212, -1, 35, 211,
+ 265, 183, 265, 212, -1, 23, 211, 265, 212, -1,
+ 3, -1, 9, -1, 10, -1, 11, -1, 151, -1,
+ 152, -1, 153, -1, 54, -1, 55, -1, 56, -1,
+ -1, 62, 211, 265, 267, 220, 212, -1, 283, -1,
+ 4, 179, 265, 180, -1, 282, 179, 265, 180, -1,
+ 149, 177, 283, 178, -1, 150, 177, 279, 178, -1,
+ 182, 283, 179, 180, -1, 283, 210, -1, 4, 179,
+ 265, 180, 210, -1, 282, 179, 265, 180, 210, -1,
+ 4, 181, 4, -1, 4, 179, 265, 180, 181, 4,
+ -1, 4, 181, 4, 210, -1, 4, 179, 265, 180,
+ 181, 4, 210, -1, 142, 177, 278, 183, 265, 178,
+ -1, 45, 177, 278, 183, 278, 178, -1, 46, 177,
+ 278, 183, 278, 178, -1, 47, 177, 281, 178, -1,
+ 269, -1, 168, 268, -1, 167, 268, -1, 268, 168,
+ 268, -1, 268, 167, 268, -1, 184, 265, 183, 265,
+ 183, 265, 183, 265, 183, 265, 185, -1, 184, 265,
+ 183, 265, 183, 265, 183, 265, 185, -1, 184, 265,
+ 183, 265, 183, 265, 185, -1, 177, 265, 183, 265,
+ 183, 265, 178, -1, 271, -1, 270, 183, 271, -1,
+ 265, -1, 273, -1, 184, 185, -1, 184, 274, 185,
+ -1, 168, 184, 274, 185, -1, 265, 169, 184, 274,
+ 185, -1, 271, -1, 5, -1, 168, 273, -1, 265,
+ 169, 273, -1, 265, 8, 265, -1, 265, 8, 265,
+ 8, 265, -1, 64, 184, 265, 185, -1, 64, 5,
+ -1, 67, 5, -1, 70, 5, -1, 72, 5, -1,
+ 84, 64, 184, 274, 185, -1, 84, 67, 184, 274,
+ 185, -1, 84, 70, 184, 274, 185, -1, 84, 72,
+ 184, 274, 185, -1, 232, -1, 241, -1, 4, 211,
+ 212, -1, 36, 179, 4, 180, -1, 4, 211, 184,
+ 274, 185, 212, -1, 265, -1, 273, -1, 274, 183,
+ 265, -1, 274, 183, 273, -1, 184, 265, 183, 265,
+ 183, 265, 183, 265, 185, -1, 184, 265, 183, 265,
+ 183, 265, 185, -1, 4, -1, 4, 181, 127, 181,
+ 4, -1, 184, 277, 185, -1, 4, 179, 265, 180,
+ 181, 128, -1, 275, -1, 277, 183, 275, -1, 279,
+ -1, 283, -1, 4, 181, 4, -1, 4, 179, 265,
+ 180, 181, 4, -1, 5, -1, 51, -1, 52, -1,
+ 143, 177, 278, 178, -1, 144, 177, 278, 183, 278,
+ 178, -1, 41, 211, 278, 183, 278, 212, -1, 42,
+ 177, 278, 178, -1, 43, 177, 278, 178, -1, 44,
+ 177, 278, 183, 278, 183, 278, 178, -1, 39, 211,
+ 281, 212, -1, 40, 211, 278, 212, -1, 40, 211,
+ 278, 183, 274, 212, -1, -1, 63, 211, 279, 280,
+ 222, 212, -1, 278, -1, 281, 183, 278, -1, 4,
+ 186, 184, 265, 185, -1, 282, 186, 184, 265, 185,
+ -1, 4, -1, 282, -1
+=======
+ 192, 0, -1, 193, -1, 1, 6, -1, -1, 193,
+ 194, -1, 197, -1, 196, -1, 217, -1, 234, -1,
+ 235, -1, 239, -1, 240, -1, 241, -1, 244, -1,
+ 265, -1, 266, -1, 243, -1, 242, -1, 238, -1,
+ 268, -1, 168, -1, 168, 168, -1, 37, 181, 282,
+ 182, 6, -1, 38, 181, 282, 182, 6, -1, 37,
+ 181, 282, 182, 195, 282, 6, -1, 37, 181, 282,
+ 187, 278, 182, 6, -1, 38, 181, 282, 187, 278,
+ 182, 6, -1, 37, 181, 282, 187, 278, 182, 195,
+ 282, 6, -1, 4, 282, 188, 198, 189, 6, -1,
+ 112, 4, 183, 269, 184, 6, -1, 113, 4, 183,
+ 269, 184, 6, -1, 114, 4, 183, 269, 187, 269,
+ 184, 6, -1, -1, 198, 201, -1, 198, 205, -1,
+ 198, 208, -1, 198, 210, -1, 198, 211, -1, 269,
+ -1, 199, 187, 269, -1, 269, -1, 200, 187, 269,
+ -1, -1, -1, 4, 202, 181, 199, 182, 203, 188,
+ 200, 189, 6, -1, 282, -1, 204, 187, 282, -1,
+ -1, 121, 181, 269, 187, 269, 187, 269, 182, 206,
+ 188, 204, 189, 6, -1, 282, -1, 207, 187, 282,
+ -1, -1, 122, 181, 269, 187, 269, 187, 269, 187,
+ 269, 182, 209, 188, 207, 189, 6, -1, 123, 188,
+ 274, 189, 188, 274, 189, 6, -1, 123, 188, 274,
+ 189, 188, 274, 189, 188, 274, 189, 188, 274, 189,
+ 6, -1, -1, 124, 212, 188, 200, 189, 6, -1,
+ 7, -1, 161, -1, 160, -1, 159, -1, 158, -1,
+ 179, -1, 178, -1, 181, -1, 183, -1, 182, -1,
+ 184, -1, 64, 183, 219, 184, 6, -1, 65, 183,
+ 222, 184, 6, -1, 287, 213, 275, 6, -1, 4,
+ 183, 184, 213, 275, 6, -1, 286, 183, 184, 213,
+ 275, 6, -1, 4, 183, 269, 184, 213, 269, 6,
+ -1, 4, 181, 269, 182, 213, 269, 6, -1, 286,
+ 183, 269, 184, 213, 269, 6, -1, 4, 215, 188,
+ 278, 189, 216, 213, 275, 6, -1, 286, 215, 188,
+ 278, 189, 216, 213, 275, 6, -1, 287, 214, 6,
+ -1, 4, 183, 269, 184, 214, 6, -1, 286, 183,
+ 269, 184, 214, 6, -1, 287, 7, 283, 6, -1,
+ 4, 185, 4, 7, 283, 6, -1, 4, 183, 269,
+ 184, 185, 4, 7, 283, 6, -1, 4, 185, 4,
+ 213, 269, 6, -1, 4, 183, 269, 184, 185, 4,
+ 213, 269, 6, -1, 4, 185, 4, 214, 6, -1,
+ 4, 183, 269, 184, 185, 4, 214, 6, -1, 4,
+ 185, 131, 185, 4, 7, 279, 6, -1, 4, 183,
+ 269, 184, 185, 131, 185, 4, 7, 279, 6, -1,
+ 4, 185, 132, 7, 280, 6, -1, 4, 183, 269,
+ 184, 185, 132, 7, 280, 6, -1, 4, 140, 7,
+ 269, 6, -1, 140, 183, 269, 184, 7, 4, 6,
+ -1, 140, 183, 269, 184, 185, 4, 7, 269, 6,
+ -1, 140, 183, 269, 184, 185, 4, 7, 283, 6,
+ -1, 140, 183, 269, 184, 185, 4, 7, 188, 278,
+ 189, 6, -1, 140, 183, 269, 184, 185, 4, 6,
+ -1, 92, 181, 4, 182, 185, 4, 7, 269, 6,
+ -1, 92, 181, 4, 182, 185, 4, 7, 283, 6,
+ -1, -1, 187, -1, -1, 219, 218, 287, -1, 219,
+ 218, 287, 7, 269, -1, -1, 219, 218, 287, 7,
+ 188, 269, 220, 224, 189, -1, 219, 218, 287, 7,
+ 283, -1, -1, 219, 218, 287, 7, 188, 283, 221,
+ 226, 189, -1, -1, 222, 218, 282, -1, 269, 7,
+ 283, -1, 223, 187, 269, 7, 283, -1, -1, 224,
+ 225, -1, 187, 4, 275, -1, 187, 4, 188, 223,
+ 189, -1, 187, 4, 283, -1, -1, 226, 227, -1,
+ 187, 4, 269, -1, 187, 4, 283, -1, 187, 4,
+ 188, 285, 189, -1, 269, -1, 283, -1, 269, -1,
+ 283, -1, 269, -1, 283, -1, 269, -1, 283, -1,
+ -1, 134, 72, 188, 269, 189, -1, -1, 84, 272,
+ -1, 68, 181, 269, 182, 7, 272, 6, -1, 88,
+ 68, 181, 228, 182, 213, 275, 6, -1, 77, 78,
+ 275, 7, 269, 6, -1, 71, 181, 269, 182, 7,
+ 275, 6, -1, 93, 71, 275, 6, -1, 75, 181,
+ 269, 182, 7, 275, 6, -1, 69, 181, 269, 182,
+ 7, 275, 233, 6, -1, 70, 181, 269, 182, 7,
+ 275, 233, 6, -1, 126, 181, 269, 182, 7, 275,
+ 6, -1, 127, 181, 269, 182, 7, 275, 6, -1,
+ 128, 181, 269, 182, 7, 275, 130, 275, 129, 269,
+ 6, -1, 71, 4, 181, 269, 182, 7, 275, 6,
+ -1, 89, 71, 181, 269, 182, 7, 275, 6, -1,
+ 88, 71, 181, 229, 182, 213, 275, 6, -1, 84,
+ 74, 181, 269, 182, 7, 275, 6, -1, 85, 74,
+ 181, 269, 182, 7, 275, 232, 6, -1, 12, 13,
+ 6, -1, 13, 74, 269, 6, -1, 79, 74, 181,
+ 269, 182, 7, 5, 5, 5, 6, -1, 72, 181,
+ 269, 182, 7, 275, 6, -1, 73, 181, 269, 182,
+ 7, 275, 6, -1, 74, 4, 181, 269, 182, 7,
+ 275, 6, -1, 89, 74, 181, 269, 182, 7, 275,
+ 6, -1, 89, 74, 181, 269, 182, 7, 275, 4,
+ 188, 274, 189, 6, -1, 88, 74, 181, 230, 182,
+ 213, 275, 6, -1, 87, 76, 181, 269, 182, 7,
+ 275, 6, -1, 76, 181, 269, 182, 7, 275, 6,
+ -1, 89, 76, 181, 269, 182, 7, 275, 6, -1,
+ 88, 76, 181, 231, 182, 213, 275, 6, -1, 96,
+ 272, 188, 236, 189, -1, 95, 188, 272, 187, 272,
+ 187, 269, 189, 188, 236, 189, -1, 97, 272, 188,
+ 236, 189, -1, 98, 188, 272, 187, 269, 189, 188,
+ 236, 189, -1, 98, 188, 272, 187, 272, 189, 188,
+ 236, 189, -1, 4, 188, 236, 189, -1, 106, 71,
+ 188, 278, 189, 74, 188, 269, 189, -1, 103, 71,
+ 181, 269, 182, 188, 278, 189, 6, -1, 237, -1,
+ 235, -1, -1, 237, 234, -1, 237, 68, 188, 278,
+ 189, 6, -1, 237, 71, 188, 278, 189, 6, -1,
+ 237, 74, 188, 278, 189, 6, -1, 237, 76, 188,
+ 278, 189, 6, -1, 100, 84, 181, 269, 182, 7,
+ 275, 6, -1, 100, 68, 181, 269, 182, 7, 188,
+ 274, 189, 6, -1, 100, 84, 181, 269, 182, 7,
+ 188, 272, 187, 272, 187, 278, 189, 6, -1, 100,
+ 84, 181, 269, 182, 7, 188, 272, 187, 272, 187,
+ 272, 187, 278, 189, 6, -1, 100, 72, 181, 269,
+ 182, 7, 188, 272, 187, 278, 189, 6, -1, 100,
+ 4, 181, 269, 182, 7, 275, 6, -1, 100, 4,
+ 181, 269, 182, 7, 5, 6, -1, 100, 4, 188,
+ 269, 189, 6, -1, 100, 4, 181, 269, 182, 7,
+ 188, 272, 187, 272, 187, 278, 189, 6, -1, 104,
+ 188, 237, 189, -1, 104, 140, 183, 269, 184, 6,
+ -1, 104, 4, 183, 269, 184, 6, -1, 104, 4,
+ 6, -1, 104, 4, 4, 6, -1, 131, 279, 188,
+ 237, 189, -1, 94, 131, 279, 188, 237, 189, -1,
+ 144, 5, 6, -1, 145, 5, 6, -1, 144, 188,
+ 237, 189, -1, 94, 144, 188, 237, 189, -1, 145,
+ 188, 237, 189, -1, 94, 145, 188, 237, 189, -1,
+ 4, 283, 6, -1, 57, 181, 285, 182, 6, -1,
+ 4, 4, 183, 269, 184, 282, 6, -1, 4, 4,
+ 4, 183, 269, 184, 6, -1, 4, 269, 6, -1,
+ 92, 181, 4, 182, 185, 4, 6, -1, 125, 4,
+ 6, -1, 138, 6, -1, 139, 6, -1, 55, 6,
+ -1, 50, 6, -1, 50, 188, 269, 187, 269, 187,
+ 269, 187, 269, 187, 269, 187, 269, 189, 6, -1,
+ 51, 6, -1, 52, 6, -1, 61, 6, -1, 62,
+ 6, -1, 81, 6, -1, 82, 188, 278, 189, 188,
+ 278, 189, 188, 274, 189, 188, 269, 187, 269, 189,
+ 6, -1, 152, 269, 6, -1, 133, 181, 269, 8,
+ 269, 182, -1, 133, 181, 269, 8, 269, 8, 269,
+ 182, -1, 133, 4, 134, 188, 269, 8, 269, 189,
+ -1, 133, 4, 134, 188, 269, 8, 269, 8, 269,
+ 189, -1, 135, -1, 143, 4, -1, 141, -1, 142,
+ 287, 6, -1, 136, 181, 269, 182, -1, 137, -1,
+ 99, 272, 188, 237, 189, -1, 99, 188, 272, 187,
+ 272, 187, 269, 189, 188, 237, 189, -1, 99, 188,
+ 272, 187, 272, 187, 272, 187, 269, 189, 188, 237,
+ 189, -1, -1, 99, 272, 188, 237, 245, 258, 189,
+ -1, -1, 99, 188, 272, 187, 272, 187, 269, 189,
+ 188, 237, 246, 258, 189, -1, -1, 99, 188, 272,
+ 187, 272, 187, 272, 187, 269, 189, 188, 237, 247,
+ 258, 189, -1, -1, 99, 188, 237, 248, 258, 189,
+ -1, 99, 68, 188, 269, 187, 272, 189, 6, -1,
+ 99, 71, 188, 269, 187, 272, 189, 6, -1, 99,
+ 74, 188, 269, 187, 272, 189, 6, -1, 99, 68,
+ 188, 269, 187, 272, 187, 272, 187, 269, 189, 6,
+ -1, 99, 71, 188, 269, 187, 272, 187, 272, 187,
+ 269, 189, 6, -1, 99, 74, 188, 269, 187, 272,
+ 187, 272, 187, 269, 189, 6, -1, 99, 68, 188,
+ 269, 187, 272, 187, 272, 187, 272, 187, 269, 189,
+ 6, -1, 99, 71, 188, 269, 187, 272, 187, 272,
+ 187, 272, 187, 269, 189, 6, -1, 99, 74, 188,
+ 269, 187, 272, 187, 272, 187, 272, 187, 269, 189,
+ 6, -1, -1, 99, 68, 188, 269, 187, 272, 189,
+ 249, 188, 258, 189, 6, -1, -1, 99, 71, 188,
+ 269, 187, 272, 189, 250, 188, 258, 189, 6, -1,
+ -1, 99, 74, 188, 269, 187, 272, 189, 251, 188,
+ 258, 189, 6, -1, -1, 99, 68, 188, 269, 187,
+ 272, 187, 272, 187, 269, 189, 252, 188, 258, 189,
+ 6, -1, -1, 99, 71, 188, 269, 187, 272, 187,
+ 272, 187, 269, 189, 253, 188, 258, 189, 6, -1,
+ -1, 99, 74, 188, 269, 187, 272, 187, 272, 187,
+ 269, 189, 254, 188, 258, 189, 6, -1, -1, 99,
+ 68, 188, 269, 187, 272, 187, 272, 187, 272, 187,
+ 269, 189, 255, 188, 258, 189, 6, -1, -1, 99,
+ 71, 188, 269, 187, 272, 187, 272, 187, 272, 187,
+ 269, 189, 256, 188, 258, 189, 6, -1, -1, 99,
+ 74, 188, 269, 187, 272, 187, 272, 187, 272, 187,
+ 269, 189, 257, 188, 258, 189, 6, -1, 259, -1,
+ 258, 259, -1, 109, 188, 269, 189, 6, -1, 109,
+ 188, 275, 187, 275, 189, 6, -1, 109, 188, 275,
+ 187, 275, 187, 275, 189, 6, -1, 110, 6, -1,
+ 101, 6, -1, 117, 6, -1, 117, 119, 6, -1,
+ 118, 6, -1, 118, 119, 6, -1, 115, 6, -1,
+ 115, 119, 6, -1, 116, 6, -1, 116, 119, 6,
+ -1, 111, 181, 269, 182, 7, 275, 91, 269, 6,
+ -1, 91, 4, 183, 269, 184, 6, -1, -1, 91,
+ 4, 269, -1, -1, 4, -1, -1, 7, 275, -1,
+ -1, 7, 269, -1, -1, 91, 275, -1, 86, 71,
+ 276, 7, 269, 260, 6, -1, 86, 74, 276, 262,
+ 261, 6, -1, 80, 74, 188, 269, 189, 7, 275,
+ 6, -1, 86, 76, 276, 262, 6, -1, 120, 276,
+ 6, -1, 107, 74, 188, 278, 189, 269, 6, -1,
+ 101, 74, 276, 263, 6, -1, 101, 76, 276, 6,
+ -1, 102, 74, 275, 7, 269, 6, -1, 90, 71,
+ 275, 7, 275, 6, -1, 90, 74, 269, 188, 278,
+ 189, 7, 269, 188, 278, 189, 264, 6, -1, 68,
+ 188, 278, 189, 134, 74, 188, 269, 189, 6, -1,
+ 71, 188, 278, 189, 134, 74, 188, 269, 189, 6,
+ -1, 68, 188, 278, 189, 134, 76, 188, 269, 189,
+ 6, -1, 71, 188, 278, 189, 134, 76, 188, 269,
+ 189, 6, -1, 74, 188, 278, 189, 134, 76, 188,
+ 269, 189, 6, -1, 108, 74, 276, 6, -1, 108,
+ 71, 276, 6, -1, 83, 68, 276, 6, -1, 83,
+ 71, 276, 6, -1, 83, 74, 276, 6, -1, 105,
+ 6, -1, 105, 4, 6, -1, 105, 68, 188, 278,
+ 189, 6, -1, 149, -1, 150, -1, 151, -1, 267,
+ 6, -1, 267, 188, 275, 189, 6, -1, 267, 188,
+ 275, 187, 275, 189, 6, -1, 267, 181, 275, 182,
+ 188, 275, 187, 275, 189, 6, -1, 270, -1, 181,
+ 269, 182, -1, 172, 269, -1, 171, 269, -1, 176,
+ 269, -1, 269, 172, 269, -1, 269, 171, 269, -1,
+ 269, 173, 269, -1, 269, 174, 269, -1, 269, 175,
+ 269, -1, 269, 180, 269, -1, 269, 167, 269, -1,
+ 269, 168, 269, -1, 269, 170, 269, -1, 269, 169,
+ 269, -1, 269, 166, 269, -1, 269, 165, 269, -1,
+ 269, 164, 269, -1, 269, 163, 269, -1, 269, 162,
+ 269, 8, 269, -1, 14, 215, 269, 216, -1, 15,
+ 215, 269, 216, -1, 16, 215, 269, 216, -1, 17,
+ 215, 269, 216, -1, 18, 215, 269, 216, -1, 19,
+ 215, 269, 216, -1, 20, 215, 269, 216, -1, 21,
+ 215, 269, 216, -1, 22, 215, 269, 216, -1, 24,
+ 215, 269, 216, -1, 25, 215, 269, 187, 269, 216,
+ -1, 26, 215, 269, 216, -1, 27, 215, 269, 216,
+ -1, 28, 215, 269, 216, -1, 29, 215, 269, 216,
+ -1, 30, 215, 269, 216, -1, 31, 215, 269, 216,
+ -1, 32, 215, 269, 216, -1, 33, 215, 269, 187,
+ 269, 216, -1, 34, 215, 269, 187, 269, 216, -1,
+ 35, 215, 269, 187, 269, 216, -1, 23, 215, 269,
+ 216, -1, 3, -1, 9, -1, 10, -1, 11, -1,
+ 155, -1, 156, -1, 157, -1, 58, -1, 59, -1,
+ 60, -1, -1, 66, 215, 269, 271, 224, 216, -1,
+ 287, -1, 4, 183, 269, 184, -1, 286, 183, 269,
+ 184, -1, 153, 181, 287, 182, -1, 154, 181, 283,
+ 182, -1, 186, 287, 183, 184, -1, 287, 214, -1,
+ 4, 183, 269, 184, 214, -1, 286, 183, 269, 184,
+ 214, -1, 4, 185, 4, -1, 4, 183, 269, 184,
+ 185, 4, -1, 4, 185, 4, 214, -1, 4, 183,
+ 269, 184, 185, 4, 214, -1, 146, 181, 282, 187,
+ 269, 182, -1, 45, 181, 275, 187, 275, 182, -1,
+ 46, 181, 282, 187, 282, 182, -1, 47, 181, 282,
+ 187, 282, 182, -1, 49, 181, 285, 182, -1, 273,
+ -1, 172, 272, -1, 171, 272, -1, 272, 172, 272,
+ -1, 272, 171, 272, -1, 188, 269, 187, 269, 187,
+ 269, 187, 269, 187, 269, 189, -1, 188, 269, 187,
+ 269, 187, 269, 187, 269, 189, -1, 188, 269, 187,
+ 269, 187, 269, 189, -1, 181, 269, 187, 269, 187,
+ 269, 182, -1, 275, -1, 274, 187, 275, -1, 269,
+ -1, 277, -1, 188, 189, -1, 188, 278, 189, -1,
+ 172, 188, 278, 189, -1, 269, 173, 188, 278, 189,
+ -1, 275, -1, 5, -1, 172, 277, -1, 269, 173,
+ 277, -1, 269, 8, 269, -1, 269, 8, 269, 8,
+ 269, -1, 68, 188, 269, 189, -1, 68, 5, -1,
+ 71, 5, -1, 74, 5, -1, 76, 5, -1, 88,
+ 68, 5, -1, 88, 71, 5, -1, 88, 74, 5,
+ -1, 88, 76, 5, -1, 88, 68, 188, 278, 189,
+ -1, 88, 71, 188, 278, 189, -1, 88, 74, 188,
+ 278, 189, -1, 88, 76, 188, 278, 189, -1, 68,
+ 134, 50, 188, 269, 187, 269, 187, 269, 187, 269,
+ 187, 269, 187, 269, 189, -1, 71, 134, 50, 188,
+ 269, 187, 269, 187, 269, 187, 269, 187, 269, 187,
+ 269, 189, -1, 74, 134, 50, 188, 269, 187, 269,
+ 187, 269, 187, 269, 187, 269, 187, 269, 189, -1,
+ 76, 134, 50, 188, 269, 187, 269, 187, 269, 187,
+ 269, 187, 269, 187, 269, 189, -1, 235, -1, 244,
+ -1, 4, 215, 216, -1, 286, 215, 216, -1, 36,
+ 183, 287, 184, -1, 4, 215, 188, 278, 189, 216,
+ -1, 286, 215, 188, 278, 189, 216, -1, 269, -1,
+ 277, -1, 278, 187, 269, -1, 278, 187, 277, -1,
+ 188, 269, 187, 269, 187, 269, 187, 269, 189, -1,
+ 188, 269, 187, 269, 187, 269, 189, -1, 4, -1,
+ 4, 185, 131, 185, 4, -1, 188, 281, 189, -1,
+ 4, 183, 269, 184, 185, 132, -1, 279, -1, 281,
+ 187, 279, -1, 283, -1, 287, -1, 4, 185, 4,
+ -1, 4, 183, 269, 184, 185, 4, -1, 5, -1,
+ 53, -1, 56, -1, 147, 181, 282, 182, -1, 148,
+ 181, 282, 187, 282, 182, -1, 41, 215, 285, 216,
+ -1, 42, 181, 282, 182, -1, 43, 181, 282, 182,
+ -1, 44, 181, 282, 187, 282, 187, 282, 182, -1,
+ 39, 215, 285, 216, -1, 48, 215, 269, 187, 283,
+ 187, 283, 216, -1, 40, 215, 282, 216, -1, 40,
+ 215, 282, 187, 278, 216, -1, 54, 215, 282, 216,
+ -1, -1, 67, 215, 283, 284, 226, 216, -1, 282,
+ -1, 285, 187, 282, -1, 4, 190, 188, 269, 189,
+ -1, 286, 190, 188, 269, 189, -1, 4, -1, 286,
+ -1
+>>>>>>> upstream/2.9.3+dfsg1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const yytype_uint16 yyrline[] =
+{
+<<<<<<< HEAD
+ 0, 182, 182, 183, 188, 190, 194, 195, 196, 197,
+ 198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
+ 208, 212, 216, 223, 228, 233, 247, 260, 273, 301,
+ 315, 328, 341, 360, 365, 366, 367, 368, 369, 373,
+ 375, 380, 382, 388, 492, 387, 510, 517, 528, 527,
+ 545, 552, 563, 562, 579, 596, 619, 618, 632, 633,
+ 634, 635, 636, 640, 641, 647, 647, 648, 648, 654,
+ 655, 656, 717, 746, 751, 756, 761, 768, 775, 790,
+ 795, 800, 809, 815, 824, 842, 860, 869, 881, 886,
+ 894, 914, 937, 948, 956, 978, 1001, 1027, 1048, 1060,
+ 1074, 1074, 1076, 1078, 1087, 1097, 1096, 1108, 1118, 1117,
+ 1131, 1133, 1141, 1147, 1154, 1155, 1159, 1170, 1185, 1195,
+ 1196, 1201, 1209, 1218, 1236, 1240, 1251, 1254, 1267, 1270,
+ 1280, 1304, 1303, 1323, 1345, 1363, 1384, 1402, 1432, 1462,
+ 1480, 1498, 1525, 1543, 1562, 1561, 1584, 1602, 1641, 1647,
+ 1653, 1660, 1685, 1710, 1727, 1746, 1781, 1780, 1804, 1822,
+ 1839, 1856, 1855, 1881, 1886, 1891, 1896, 1901, 1906, 1929,
+ 1935, 1946, 1947, 1952, 1955, 1959, 1982, 2005, 2028, 2056,
+ 2077, 2103, 2124, 2146, 2166, 2278, 2297, 2335, 2444, 2453,
+ 2459, 2474, 2502, 2519, 2528, 2542, 2548, 2554, 2563, 2572,
+ 2581, 2595, 2648, 2665, 2680, 2699, 2711, 2735, 2739, 2744,
+ 2751, 2757, 2762, 2768, 2776, 2780, 2784, 2789, 2844, 2857,
+ 2874, 2891, 2912, 2933, 2968, 2976, 2982, 2989, 2993, 3002,
+ 3010, 3018, 3027, 3026, 3041, 3040, 3055, 3054, 3069, 3068,
+ 3082, 3089, 3096, 3103, 3110, 3117, 3124, 3131, 3138, 3146,
+ 3145, 3159, 3158, 3172, 3171, 3185, 3184, 3198, 3197, 3211,
+ 3210, 3224, 3223, 3237, 3236, 3250, 3249, 3266, 3269, 3275,
+ 3287, 3307, 3331, 3335, 3339, 3343, 3347, 3353, 3359, 3363,
+ 3367, 3371, 3375, 3394, 3407, 3410, 3426, 3429, 3446, 3449,
+ 3455, 3458, 3465, 3521, 3591, 3596, 3663, 3699, 3707, 3750,
+ 3789, 3809, 3836, 3876, 3899, 3922, 3926, 3930, 3953, 3992,
+ 4031, 4052, 4073, 4100, 4104, 4114, 4149, 4150, 4151, 4155,
+ 4161, 4173, 4191, 4219, 4220, 4221, 4222, 4223, 4224, 4225,
+ 4226, 4227, 4234, 4235, 4236, 4237, 4238, 4239, 4240, 4241,
+ 4242, 4243, 4244, 4245, 4246, 4247, 4248, 4249, 4250, 4251,
+ 4252, 4253, 4254, 4255, 4256, 4257, 4258, 4259, 4260, 4261,
+ 4262, 4263, 4264, 4265, 4266, 4275, 4276, 4277, 4278, 4279,
+ 4280, 4281, 4282, 4283, 4284, 4289, 4288, 4296, 4313, 4331,
+ 4349, 4354, 4360, 4372, 4389, 4407, 4428, 4433, 4438, 4448,
+ 4458, 4463, 4472, 4477, 4504, 4508, 4512, 4516, 4520, 4527,
+ 4531, 4535, 4539, 4546, 4551, 4558, 4563, 4567, 4572, 4576,
+ 4584, 4595, 4599, 4611, 4619, 4627, 4634, 4644, 4664, 4668,
+ 4672, 4676, 4680, 4709, 4738, 4767, 4796, 4806, 4816, 4828,
+ 4840, 4861, 4866, 4870, 4874, 4886, 4890, 4902, 4909, 4919,
+ 4923, 4938, 4943, 4950, 4954, 4967, 4975, 4986, 4990, 4998,
+ 5004, 5012, 5020, 5028, 5042, 5056, 5068, 5084, 5088, 5108,
+ 5107, 5120, 5125, 5131, 5140, 5153, 5156
+=======
+ 0, 183, 183, 184, 189, 191, 195, 196, 197, 198,
+ 199, 200, 201, 202, 203, 204, 205, 206, 207, 208,
+ 209, 213, 217, 224, 229, 234, 248, 261, 274, 302,
+ 316, 329, 342, 361, 366, 367, 368, 369, 370, 374,
+ 376, 381, 383, 389, 493, 388, 511, 518, 529, 528,
+ 546, 553, 564, 563, 580, 597, 620, 619, 633, 634,
+ 635, 636, 637, 641, 642, 648, 648, 649, 649, 655,
+ 656, 657, 718, 747, 776, 781, 786, 791, 798, 805,
+ 820, 825, 830, 839, 845, 854, 872, 890, 899, 911,
+ 916, 924, 944, 967, 978, 986, 1008, 1031, 1057, 1078,
+ 1090, 1104, 1104, 1106, 1108, 1117, 1127, 1126, 1138, 1148,
+ 1147, 1161, 1163, 1171, 1177, 1184, 1185, 1189, 1200, 1215,
+ 1225, 1226, 1231, 1239, 1248, 1266, 1270, 1279, 1283, 1292,
+ 1296, 1305, 1309, 1319, 1322, 1335, 1338, 1348, 1371, 1403,
+ 1426, 1444, 1465, 1483, 1513, 1543, 1561, 1579, 1606, 1624,
+ 1642, 1677, 1695, 1734, 1740, 1746, 1753, 1778, 1803, 1820,
+ 1839, 1873, 1909, 1927, 1944, 1960, 1997, 2002, 2007, 2012,
+ 2017, 2022, 2045, 2051, 2062, 2063, 2068, 2071, 2075, 2098,
+ 2121, 2144, 2172, 2193, 2219, 2240, 2262, 2282, 2394, 2413,
+ 2451, 2560, 2569, 2575, 2590, 2618, 2635, 2644, 2658, 2664,
+ 2670, 2679, 2688, 2697, 2711, 2767, 2785, 2802, 2817, 2836,
+ 2848, 2872, 2876, 2881, 2888, 2894, 2899, 2905, 2913, 2917,
+ 2921, 2926, 2981, 2994, 3011, 3028, 3049, 3070, 3105, 3113,
+ 3119, 3126, 3130, 3139, 3147, 3155, 3164, 3163, 3178, 3177,
+ 3192, 3191, 3206, 3205, 3219, 3226, 3233, 3240, 3247, 3254,
+ 3261, 3268, 3275, 3283, 3282, 3296, 3295, 3309, 3308, 3322,
+ 3321, 3335, 3334, 3348, 3347, 3361, 3360, 3374, 3373, 3387,
+ 3386, 3403, 3406, 3412, 3424, 3444, 3468, 3472, 3476, 3480,
+ 3484, 3490, 3496, 3500, 3504, 3508, 3512, 3531, 3544, 3547,
+ 3563, 3566, 3583, 3586, 3592, 3595, 3602, 3605, 3612, 3668,
+ 3738, 3743, 3810, 3846, 3854, 3897, 3936, 3956, 3983, 4032,
+ 4060, 4088, 4092, 4096, 4124, 4163, 4202, 4223, 4244, 4271,
+ 4275, 4285, 4320, 4321, 4322, 4326, 4332, 4344, 4362, 4390,
+ 4391, 4392, 4393, 4394, 4395, 4396, 4397, 4398, 4405, 4406,
+ 4407, 4408, 4409, 4410, 4411, 4412, 4413, 4414, 4415, 4416,
+ 4417, 4418, 4419, 4420, 4421, 4422, 4423, 4424, 4425, 4426,
+ 4427, 4428, 4429, 4430, 4431, 4432, 4433, 4434, 4435, 4436,
+ 4437, 4446, 4447, 4448, 4449, 4450, 4451, 4452, 4453, 4454,
+ 4455, 4460, 4459, 4467, 4484, 4502, 4520, 4525, 4531, 4543,
+ 4560, 4578, 4599, 4604, 4609, 4619, 4629, 4634, 4645, 4654,
+ 4659, 4686, 4690, 4694, 4698, 4702, 4709, 4713, 4717, 4721,
+ 4728, 4733, 4740, 4745, 4749, 4754, 4758, 4766, 4777, 4781,
+ 4793, 4801, 4809, 4816, 4826, 4855, 4859, 4863, 4867, 4871,
+ 4875, 4879, 4883, 4887, 4916, 4945, 4974, 5003, 5016, 5029,
+ 5042, 5055, 5065, 5075, 5087, 5099, 5111, 5129, 5150, 5155,
+ 5159, 5163, 5175, 5179, 5191, 5198, 5208, 5212, 5227, 5232,
+ 5239, 5243, 5256, 5264, 5275, 5279, 5287, 5293, 5301, 5309,
+ 5324, 5338, 5352, 5364, 5380, 5391, 5395, 5414, 5422, 5421,
+ 5434, 5439, 5445, 5454, 5467, 5470
+>>>>>>> upstream/2.9.3+dfsg1
+=======
155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
- 165, 166, 167, 168, 169, 171, 172, 173, 174, 176,
- 178, 185, 186, 187
+ 165, 166, 167, 168, 169, 170, 171, 172, 173, 174,
+ 175, 176, 178, 179, 180, 181, 183, 185, 192, 193,
+ 194
};
#if YYDEBUG
@@@ -2128,130 -889,12 +2018,131 @@@ static const yytype_uint16 yytoknum[]
375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
385, 386, 387, 388, 389, 390, 391, 392, 393, 394,
395, 396, 397, 398, 399, 400, 401, 402, 403, 404,
+<<<<<<< HEAD
+ 405, 406, 407, 408, 409, 410, 411, 412, 63, 413,
+ 414, 415, 416, 60, 62, 417, 418, 43, 45, 42,
+ 47, 37, 33, 419, 420, 421, 94, 40, 41, 91,
+ 93, 46, 35, 44, 123, 125, 126
+=======
405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
+<<<<<<< HEAD
+ 415, 416, 63, 417, 418, 419, 420, 60, 62, 421,
+ 422, 43, 45, 42, 47, 37, 33, 423, 424, 425,
+ 94, 40, 41, 91, 93, 46, 35, 44, 123, 125,
+ 126
+>>>>>>> upstream/2.9.3+dfsg1
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint16 yyr1[] =
+{
+<<<<<<< HEAD
+ 0, 187, 188, 188, 189, 189, 190, 190, 190, 190,
+ 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
+ 190, 191, 191, 192, 192, 192, 192, 192, 192, 193,
+ 193, 193, 193, 194, 194, 194, 194, 194, 194, 195,
+ 195, 196, 196, 198, 199, 197, 200, 200, 202, 201,
+ 203, 203, 205, 204, 206, 206, 208, 207, 209, 209,
+ 209, 209, 209, 210, 210, 211, 211, 212, 212, 213,
+ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
+ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
+ 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,
+ 214, 214, 215, 215, 215, 216, 215, 215, 217, 215,
+ 218, 218, 219, 219, 220, 220, 221, 221, 221, 222,
+ 222, 223, 223, 223, 224, 224, 225, 225, 226, 226,
+ 227, 228, 227, 227, 227, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 229, 227, 227, 227, 227, 227,
+ 227, 227, 227, 227, 227, 227, 230, 227, 227, 227,
+ 227, 231, 227, 232, 232, 232, 232, 232, 232, 232,
+ 232, 233, 233, 234, 234, 234, 234, 234, 234, 235,
+ 235, 235, 235, 235, 235, 235, 235, 235, 236, 236,
+ 236, 236, 236, 237, 237, 238, 238, 238, 238, 238,
+ 238, 239, 239, 239, 239, 239, 239, 239, 239, 239,
+ 239, 239, 239, 239, 239, 239, 239, 239, 239, 240,
+ 240, 240, 240, 240, 240, 240, 240, 240, 240, 241,
+ 241, 241, 242, 241, 243, 241, 244, 241, 245, 241,
+ 241, 241, 241, 241, 241, 241, 241, 241, 241, 246,
+ 241, 247, 241, 248, 241, 249, 241, 250, 241, 251,
+ 241, 252, 241, 253, 241, 254, 241, 255, 255, 256,
+ 256, 256, 256, 256, 256, 256, 256, 256, 256, 256,
+ 256, 256, 256, 256, 257, 257, 258, 258, 259, 259,
+ 260, 260, 261, 261, 261, 261, 261, 261, 261, 261,
+ 261, 261, 261, 261, 261, 261, 261, 261, 261, 261,
+ 261, 261, 261, 262, 262, 262, 263, 263, 263, 264,
+ 264, 264, 264, 265, 265, 265, 265, 265, 265, 265,
+ 265, 265, 265, 265, 265, 265, 265, 265, 265, 265,
+ 265, 265, 265, 265, 265, 265, 265, 265, 265, 265,
+ 265, 265, 265, 265, 265, 265, 265, 265, 265, 265,
+ 265, 265, 265, 265, 265, 266, 266, 266, 266, 266,
+ 266, 266, 266, 266, 266, 267, 266, 266, 266, 266,
+ 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
+ 266, 266, 266, 266, 268, 268, 268, 268, 268, 269,
+ 269, 269, 269, 270, 270, 271, 271, 271, 271, 271,
+ 271, 272, 272, 273, 273, 273, 273, 273, 273, 273,
+ 273, 273, 273, 273, 273, 273, 273, 273, 273, 273,
+ 273, 274, 274, 274, 274, 275, 275, 275, 275, 276,
+ 276, 277, 277, 278, 278, 278, 278, 279, 279, 279,
+ 279, 279, 279, 279, 279, 279, 279, 279, 279, 280,
+ 279, 281, 281, 282, 282, 283, 283
+=======
+ 0, 191, 192, 192, 193, 193, 194, 194, 194, 194,
+ 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
+ 194, 195, 195, 196, 196, 196, 196, 196, 196, 197,
+ 197, 197, 197, 198, 198, 198, 198, 198, 198, 199,
+ 199, 200, 200, 202, 203, 201, 204, 204, 206, 205,
+ 207, 207, 209, 208, 210, 210, 212, 211, 213, 213,
+ 213, 213, 213, 214, 214, 215, 215, 216, 216, 217,
+ 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
+ 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
+ 217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
+ 217, 218, 218, 219, 219, 219, 220, 219, 219, 221,
+ 219, 222, 222, 223, 223, 224, 224, 225, 225, 225,
+ 226, 226, 227, 227, 227, 228, 228, 229, 229, 230,
+ 230, 231, 231, 232, 232, 233, 233, 234, 234, 234,
+ 234, 234, 234, 234, 234, 234, 234, 234, 234, 234,
+ 234, 234, 234, 234, 234, 234, 234, 234, 234, 234,
+ 234, 234, 234, 234, 234, 234, 235, 235, 235, 235,
+ 235, 235, 235, 235, 236, 236, 237, 237, 237, 237,
+ 237, 237, 238, 238, 238, 238, 238, 238, 238, 238,
+ 238, 239, 239, 239, 239, 239, 240, 240, 241, 241,
+ 241, 241, 241, 241, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 242, 242, 242, 242, 242, 242, 242,
+ 242, 242, 242, 243, 243, 243, 243, 243, 243, 243,
+ 243, 243, 243, 244, 244, 244, 245, 244, 246, 244,
+ 247, 244, 248, 244, 244, 244, 244, 244, 244, 244,
+ 244, 244, 244, 249, 244, 250, 244, 251, 244, 252,
+ 244, 253, 244, 254, 244, 255, 244, 256, 244, 257,
+ 244, 258, 258, 259, 259, 259, 259, 259, 259, 259,
+ 259, 259, 259, 259, 259, 259, 259, 259, 260, 260,
+ 261, 261, 262, 262, 263, 263, 264, 264, 265, 265,
+ 265, 265, 265, 265, 265, 265, 265, 265, 265, 265,
+ 265, 265, 265, 265, 265, 265, 265, 265, 265, 266,
+ 266, 266, 267, 267, 267, 268, 268, 268, 268, 269,
+ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,
+ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,
+ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,
+ 269, 269, 269, 269, 269, 269, 269, 269, 269, 269,
+ 269, 270, 270, 270, 270, 270, 270, 270, 270, 270,
+ 270, 271, 270, 270, 270, 270, 270, 270, 270, 270,
+ 270, 270, 270, 270, 270, 270, 270, 270, 270, 270,
+ 270, 272, 272, 272, 272, 272, 273, 273, 273, 273,
+ 274, 274, 275, 275, 275, 275, 275, 275, 276, 276,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 277, 277,
+ 277, 277, 277, 277, 277, 277, 277, 277, 278, 278,
+ 278, 278, 279, 279, 279, 279, 280, 280, 281, 281,
+ 282, 282, 282, 282, 283, 283, 283, 283, 283, 283,
+ 283, 283, 283, 283, 283, 283, 283, 283, 284, 283,
+ 285, 285, 286, 286, 287, 287
+>>>>>>> upstream/2.9.3+dfsg1
+};
+=======
415, 416, 417, 418, 419, 420, 421, 422, 423, 424,
- 63, 425, 426, 427, 428, 60, 429, 62, 430, 43,
- 45, 42, 47, 37, 33, 431, 432, 433, 94, 40,
- 41, 91, 93, 46, 35, 44, 123, 125, 126
+ 425, 426, 427, 428, 429, 430, 431, 63, 432, 433,
+ 434, 435, 60, 436, 62, 437, 43, 45, 42, 47,
+ 37, 33, 438, 439, 440, 94, 40, 41, 91, 93,
+ 46, 35, 44, 123, 125, 126
};
# endif
@@@ -2600,183 -1107,37 +2355,38 @@@ static const yytype_uint16 yydefact[]
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 240, 0, 245, 0, 0, 0, 242, 0,
- 0, 0, 0, 340, 341, 342, 0, 0, 5, 7,
- 6, 8, 9, 10, 20, 11, 12, 13, 14, 19,
- 18, 15, 16, 17, 0, 21, 511, 0, 389, 510,
- 487, 390, 391, 392, 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,
- <<<<<<< HEAD
- 0, 0, 465, 0, 466, 378, 379, 380, 0, 0,
- 0, 0, 0, 0, 0, 0, 375, 376, 377, 0,
- 0, 0, 65, 66, 0, 0, 176, 0, 0, 0,
- 329, 0, 460, 485, 383, 0, 0, 0, 0, 214,
- 0, 216, 217, 213, 0, 218, 219, 103, 111, 0,
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- 0, 0, 0, 0, 0, 0, 0, 488, 0, 503,
- 490, 396, 397, 398, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 393, 394, 395, 489, 0, 0, 0,
- 66, 67, 0, 0, 187, 0, 0, 0, 347, 0,
- 483, 511, 402, 0, 0, 0, 0, 227, 0, 229,
- 230, 225, 226, 0, 231, 232, 109, 117, 66, 67,
- >>>>>>> upstream/2.10.1+dfsg1
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 233, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 326, 325,
- 327, 0, 0, 0, 0, 0, 0, 465, 466, 0,
- 0, 172, 0, 171, 0, 0, 204, 0, 0, 0,
+ 0, 0, 239, 0, 0, 247, 248, 0, 0, 0,
+ 242, 0, 0, 0, 0, 343, 344, 345, 0, 0,
+ 5, 7, 6, 8, 9, 10, 20, 11, 12, 13,
+ 14, 19, 18, 15, 16, 17, 0, 21, 519, 0,
+ 392, 518, 491, 393, 395, 396, 394, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- <<<<<<< HEAD
- 0, 0, 33, 201, 0, 383, 148, 0, 465, 0,
- 443, 444, 0, 0, 100, 100, 0, 0, 431, 432,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- <<<<<<< HEAD
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 288, 288, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 173, 173, 0,
- 396, 395, 0, 0, 0, 0, 173, 173, 0, 0,
- 0, 0, 0, 0, 0, 238, 0, 173, 0, 0,
- 0, 0, 0, 290, 0, 0, 0, 0, 191, 0,
- 0, 0, 314, 0, 0, 0, 0, 0, 0, 0,
- 0, 66, 0, 0, 0, 418, 0, 419, 420, 421,
- 0, 0, 0, 0, 0, 325, 413, 0, 407, 0,
- 0, 0, 296, 206, 0, 0, 0, 0, 0, 173,
- 0, 0, 0, 0, 226, 195, 0, 196, 0, 0,
- 218, 0, 0, 0, 0, 0, 0, 0, 78, 0,
- 0, 386, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 493, 0, 511, 495, 400, 401, 402,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 397,
+ 398, 399, 494, 0, 0, 0, 0, 66, 67, 0,
+ 0, 187, 0, 0, 0, 350, 0, 487, 519, 406,
+ 0, 0, 0, 0, 227, 0, 229, 230, 225, 226,
+ 0, 231, 232, 109, 117, 66, 67, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 461, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 375, 459, 0, 0, 0, 0,
- 0, 0, 324, 58, 0, 0, 58, 0, 0, 0,
- 0, 0, 168, 0, 0, 0, 0, 174, 0, 0,
- 0, 341, 340, 339, 338, 334, 335, 337, 336, 329,
- 328, 330, 331, 332, 333, 0, 0, 149, 0, 0,
- 0, 0, 0, 0, 0, 0, 101, 0, 0, 0,
+ 0, 0, 0, 0, 0, 233, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 310,
- 311, 312, 0, 0, 0, 0, 286, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 135,
- 173, 0, 0, 0, 0, 0, 398, 397, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 232, 0, 0,
- 0, 0, 0, 0, 0, 299, 0, 0, 192, 0,
- 0, 188, 0, 0, 0, 309, 308, 0, 0, 0,
- 0, 386, 67, 68, 0, 428, 0, 0, 0, 0,
- 0, 0, 0, 324, 408, 415, 0, 330, 414, 0,
- 0, 0, 0, 0, 0, 0, 0, 227, 0, 197,
- 199, 0, 0, 0, 0, 0, 0, 81, 71, 0,
- 378, 388, 343, 344, 345, 346, 347, 348, 349, 350,
- 351, 364, 352, 0, 354, 355, 356, 357, 358, 359,
- 360, 0, 0, 0, 0, 456, 0, 457, 0, 453,
- 454, 0, 0, 0, 393, 114, 119, 92, 0, 450,
- 0, 380, 381, 0, 0, 0, 0, 0, 0, 0,
- 86, 0, 0, 0, 0, 382, 0, 0, 0, 0,
- 463, 0, 0, 43, 0, 0, 0, 56, 0, 34,
- 35, 36, 37, 38, 379, 0, 445, 23, 21, 0,
- 0, 24, 0, 0, 69, 103, 70, 111, 0, 433,
- 434, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 284,
- 289, 287, 0, 295, 0, 0, 124, 125, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 198, 200,
- 0, 0, 0, 163, 165, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 267, 0, 229, 0, 0, 0, 0, 0, 0, 291,
- 298, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 378, 0, 429, 417, 0, 0, 0, 0, 409,
- 0, 0, 0, 0, 0, 0, 0, 193, 0, 0,
- 0, 0, 0, 0, 320, 0, 0, 0, 464, 0,
- 0, 384, 0, 0, 0, 0, 0, 462, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 72, 0,
- 0, 0, 0, 79, 82, 84, 0, 0, 441, 0,
- 90, 0, 0, 0, 0, 0, 342, 0, 0, 0,
- 0, 0, 29, 385, 0, 22, 0, 0, 0, 0,
- 0, 0, 0, 0, 128, 128, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 133, 0, 0, 0,
- 0, 0, 0, 0, 293, 0, 0, 0, 0, 0,
- 0, 0, 0, 301, 0, 0, 194, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 273, 0, 272, 0,
- 278, 0, 280, 0, 274, 0, 276, 0, 239, 268,
- 0, 0, 0, 186, 0, 0, 0, 300, 0, 190,
- 189, 315, 0, 0, 30, 31, 0, 0, 0, 422,
- 423, 424, 425, 416, 410, 0, 0, 0, 438, 0,
- 0, 0, 219, 0, 0, 0, 0, 0, 0, 80,
- 203, 387, 202, 353, 361, 362, 363, 458, 452, 0,
- 391, 392, 0, 376, 115, 0, 460, 120, 390, 451,
- 74, 58, 0, 0, 0, 0, 73, 0, 0, 0,
- 439, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 403, 0, 0, 25, 26, 0, 27, 0, 0, 104,
- 107, 130, 0, 0, 0, 0, 0, 0, 134, 0,
- 0, 151, 152, 0, 0, 136, 159, 0, 0, 0,
- 0, 126, 0, 292, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 205, 0, 0, 0, 0, 173, 173,
- 0, 249, 0, 251, 0, 253, 0, 405, 0, 0,
- 279, 281, 275, 277, 0, 0, 233, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 297, 0, 387, 430,
- 139, 140, 0, 0, 0, 0, 93, 97, 0, 0,
- 321, 0, 75, 389, 0, 0, 0, 0, 0, 87,
- 0, 0, 88, 0, 442, 175, 176, 177, 178, 0,
- 0, 39, 0, 0, 0, 0, 0, 41, 446, 0,
- 0, 105, 108, 0, 0, 129, 137, 138, 142, 0,
- 0, 153, 0, 0, 294, 0, 146, 0, 0, 285,
- 158, 0, 0, 0, 0, 143, 0, 154, 160, 0,
- 0, 0, 0, 402, 0, 401, 0, 0, 0, 240,
- 0, 0, 241, 0, 0, 242, 0, 0, 0, 0,
- 0, 0, 0, 185, 0, 0, 184, 0, 0, 0,
- 179, 0, 0, 32, 0, 0, 436, 0, 221, 220,
- 0, 0, 0, 0, 0, 455, 0, 116, 118, 0,
- 121, 122, 83, 85, 0, 91, 0, 76, 44, 0,
- 0, 0, 404, 0, 0, 0, 28, 0, 114, 119,
- 0, 0, 0, 0, 0, 0, 0, 0, 147, 132,
- 145, 157, 162, 0, 0, 98, 99, 173, 0, 166,
- 167, 0, 0, 0, 0, 0, 0, 0, 269, 0,
- 0, 173, 0, 0, 0, 0, 0, 170, 169, 0,
- 0, 0, 0, 94, 95, 0, 77, 0, 431, 0,
- 0, 440, 0, 40, 0, 0, 0, 42, 57, 0,
- 0, 0, 303, 305, 304, 306, 307, 150, 0, 0,
- 0, 0, 0, 0, 400, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 283, 0, 0, 0, 234, 0,
- 0, 180, 0, 0, 0, 435, 222, 0, 322, 0,
- 117, 0, 123, 89, 0, 0, 0, 0, 0, 106,
- 109, 0, 0, 0, 0, 164, 0, 255, 0, 0,
- 257, 0, 0, 259, 0, 0, 0, 270, 0, 230,
- 0, 173, 0, 0, 0, 141, 96, 0, 112, 0,
- 48, 0, 54, 0, 0, 0, 127, 155, 302, 399,
- 243, 0, 0, 250, 244, 0, 0, 252, 245, 0,
- 0, 254, 0, 0, 0, 236, 0, 183, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 261, 0,
- 263, 0, 265, 271, 282, 235, 231, 0, 0, 0,
- 0, 113, 45, 0, 52, 0, 0, 0, 0, 246,
- 0, 0, 247, 0, 0, 248, 0, 0, 187, 0,
- 181, 0, 46, 0, 0, 211, 0, 0, 0, 0,
- 0, 0, 0, 237, 0, 0, 0, 0, 0, 217,
- 256, 0, 258, 0, 260, 0, 182, 47, 49, 0,
- 50, 0, 0, 0, 0, 0, 0, 55, 262, 264,
- 266, 51, 53
- =======
- 0, 0, 0, 0, 0, 0, 401, 0, 0, 0,
- 0, 0, 176, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 176, 0, 319, 0, 0, 0,
- 0, 0, 0, 0, 0, 484, 419, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 441, 442, 412, 418,
- 0, 413, 485, 383, 0, 0, 0, 0, 454, 0,
- 0, 0, 0, 0, 211, 212, 0, 484, 485, 0,
- 228, 0, 176, 0, 176, 484, 0, 325, 0, 0,
- 65, 66, 0, 0, 58, 62, 61, 60, 59, 64,
- 63, 0, 0, 0, 0, 0, 66, 0, 0, 0,
- =======
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 424,
- 0, 0, 0, 0, 0, 187, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 510, 0, 187, 511, 0,
- 0, 337, 0, 0, 0, 0, 0, 0, 0, 0,
- 510, 442, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 464, 465, 435, 441, 0, 436, 511, 402, 0,
- 0, 0, 0, 477, 0, 0, 0, 0, 0, 223,
- 224, 0, 510, 0, 241, 0, 187, 0, 187, 510,
- 0, 0, 343, 0, 0, 66, 67, 0, 0, 59,
+ 0, 0, 0, 0, 0, 0, 428, 0, 0, 0,
+ 0, 0, 187, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 518, 0, 187, 519, 0, 0, 340, 0,
+ 0, 0, 0, 0, 0, 0, 0, 518, 446, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 468, 469,
+ 439, 445, 0, 440, 519, 406, 0, 0, 0, 0,
+ 481, 0, 0, 0, 0, 0, 0, 223, 224, 0,
+ 518, 0, 0, 240, 241, 0, 187, 0, 187, 518,
+ 0, 0, 346, 0, 0, 66, 67, 0, 0, 59,
60, 61, 62, 63, 64, 65, 0, 0, 0, 0,
+>>>>>>> upstream/2.10.1+dfsg1
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,
@@@ -3402,1544 -1307,722 +2556,723 @@@ static const yytype_int16 yypgoto[]
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- <<<<<<< HEAD
- <<<<<<< HEAD
- -1191, -1191, -1191, -1191, 745, -1191, -1191, -1191, -1191, 279,
- -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191,
- -1191, -1191, -352, -72, 4949, -477, -1191, 1344, -1191, -1191,
- -1191, -1191, -1191, 386, -1191, 391, -1191, -296, -1191, 743,
- 1742, -1191, -1191, -1191, -1191, 3, -449, -235, -1191, -1191,
- -1191, -1191, -1191, -1191, 1748, -1191, -1191, -1191, -1191, -1191,
- -1191, -1191, -1191, -1191, -1191, -1191, -1191, -1191, -892, -884,
- -1191, -1191, 1319, -1191, -1191, -1191, -1191, -1191, 747, -1191,
- -1191, 204, -1191, -1190, 1260, -109, 1011, -58, -204, 641,
- -1191, 35, 107, -1191, -348, 14, -3
- =======
- -1266, -1266, -1266, -1266, 690, -1266, -1266, -1266, -1266, 198,
- -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266, -1266,
- -1266, -1266, -338, -73, 1229, -460, -1266, 1318, -1266, -1266,
- -1266, -1266, -1266, 312, -1266, 313, -1266, -1266, -1266, -1266,
- -1266, -1266, 686, 1735, 11, -459, -226, -1266, -1266, -1266,
- -1266, -1266, -1266, 1739, -1266, -1266, -1266, -1266, -1266, -1266,
- -1266, -1266, -1266, -1266, -1266, -1266, -1266, -942, -881, -1266,
- -1266, 1314, -1266, -1266, -1266, -1266, -1266, -1266, 1529, -1266,
- -1266, 0, -1266, -1265, 2159, 287, 997, 101, -225, 562,
- -1266, 20, 7, -1266, -344, -3, 76
- >>>>>>> upstream/2.9.3+dfsg1
+ -1, 2, 3, 90, 935, 91, 92, 683, 1403, 1409,
+ 924, 1111, 1575, 1776, 925, 1725, 1816, 926, 1778, 927,
+ 928, 1115, 346, 437, 183, 416, 93, 698, 448, 1519,
+ 1520, 449, 1570, 1086, 1255, 1087, 1258, 732, 735, 738,
+ 741, 1431, 1298, 663, 298, 410, 411, 96, 97, 98,
+ 99, 100, 101, 102, 299, 1016, 1671, 1742, 767, 1455,
+ 1458, 1461, 1700, 1704, 1708, 1761, 1764, 1767, 1012, 1013,
+ 1150, 972, 729, 776, 1597, 104, 105, 106, 107, 300,
+ 185, 886, 498, 256, 1280, 301, 302, 303, 561, 312,
+ 908, 1102, 446, 442, 887, 447, 188, 305
};
- /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- <<<<<<< HEAD
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
- #define YYTABLE_NINF -447
+ /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule whose
+ number is the opposite. If YYTABLE_NINF, syntax error. */
++>>>>>>> upstream/2.10.1+dfsg1
static const yytype_int16 yytable[] =
{
- 101, 573, 465, 170, 314, 188, 88, 678, 679, 813,
- 584, 1061, 587, 247, 481, 1059, 188, 100, 446, 193,
- 1317, 282, 802, 193, 171, 293, 295, 495, 184, 313,
- 1151, 1050, 175, 1502, 4, 185, 299, 827, 364, 1144,
- 477, 167, 478, 285, 940, 969, 234, 5, 1052, 235,
- 239, 1054, 236, 310, 311, 1056, 250, 394, 251, 526,
- 243, 528, 244, -444, 304, 752, 753, 754, 755, 756,
- 757, 758, 759, 760, 761, 762, 172, 764, 765, 766,
- 767, 768, 769, 770, 317, 1366, 318, 583, 775, 777,
- 454, 455, 620, 426, 427, 428, 173, 621, 431, 432,
- 433, 454, 455, 510, 454, 455, 1190, 632, 1191, 633,
- 240, 454, 455, 168, 241, 207, 252, 1192, 208, 1193,
- 209, 456, 814, 815, 816, 817, 242, 410, 218, 1041,
- 174, 219, 415, 370, 473, 474, 419, 454, 455, 255,
- 1051, 583, 256, 425, 1327, 248, 486, 487, 177, 226,
- 227, 454, 455, 1194, 632, 1195, 638, 1053, 369, 228,
- 1055, 365, 366, 1416, 1057, 371, 237, 673, 970, 971,
- 401, 401, 310, 311, 712, 368, 713, 1059, 189, 315,
- 714, 316, -445, 1430, 178, 190, 163, 368, 368, 189,
- 818, 454, 455, 249, 179, 828, 807, 828, 1002, 194,
- 1003, 283, 803, 808, 294, 296, 496, 300, 399, 402,
- 176, 1503, 671, 672, 301, 479, 286, 1008, 941, 1009,
- 44, 45, 46, 47, 305, 454, 455, 222, 52, 180,
- 793, 55, 687, 796, 306, 307, 308, 309, 310, 311,
- 223, 224, 457, 376, 388, 389, 390, 181, -446, 230,
- 232, 391, 238, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 511, 389, 390, 468, 226, 227,
- 182, 391, 586, 302, 469, 303, 454, 455, 228, 184,
- 1308, 632, 304, 642, 734, 229, 806, 183, 306, 307,
- 308, 309, 588, 467, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 310, 311,
- 454, 455, 391, 1534, 197, 795, 529, 599, 492, 454,
- 455, 1328, 632, 163, 648, 196, 680, 386, 387, 388,
- 389, 390, 809, 186, 985, 686, 391, 198, 401, 401,
- 401, 401, 401, 401, 401, 401, 401, 1461, 510, 622,
- 401, 401, 401, 580, 623, 368, 368, 368, 368, 368,
- 368, 368, 368, 368, 868, 869, 870, 368, 368, 368,
- 368, 306, 307, 308, 309, 310, 311, 566, 567, 568,
- 569, 570, 571, 572, 1588, 632, 187, 724, 577, 578,
- 579, 310, 311, 946, 199, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 712,
- 191, 713, 536, 391, 774, 398, 104, 454, 455, 306,
- 307, 308, 309, 1183, 1184, 702, 703, 704, 211, 449,
- 450, 212, 192, 1037, 213, 877, 214, 458, 784, 310,
- 311, 466, 618, 774, 619, 195, 722, 583, 196, 163,
- 130, 131, 132, 133, 134, 135, 454, 455, 575, 371,
- 371, 200, 139, 140, 581, 7, 8, 454, 455, 751,
- 625, 201, 1060, 626, 145, 744, 1103, 1104, 1105, 1106,
- 205, 1107, 1108, 1312, 310, 311, 1113, 1116, 454, 455,
- 1437, 1077, 1440, 712, 1443, 713, 454, 455, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 631,
- 389, 390, 1381, 797, 454, 455, 391, 593, 20, 21,
- 594, 23, 24, 595, 26, 596, 28, 742, 29, 743,
- 1383, 398, 104, 34, 35, 206, 37, 38, 39, 632,
- 202, 811, 42, 203, 454, 455, 204, 1121, 454, 455,
- 1227, 1228, 997, 1059, 148, 149, 1059, 632, 628, 1059,
- 1385, 626, 210, 830, 1393, 832, 130, 131, 132, 133,
- 134, 135, 632, 1091, 915, 63, 64, 65, 139, 140,
- 220, 632, 712, 916, 713, 310, 311, 776, 454, 455,
- 145, 632, 950, 917, 306, 307, 308, 309, 1524, 978,
- 221, 1219, 215, 890, 1395, 216, 712, 217, 713, 875,
- 632, 632, 929, 891, 310, 311, 225, 1122, 454, 455,
- 998, 892, 893, 894, 835, 632, 401, 895, 896, 897,
- 898, 233, 1348, 1135, 1396, 454, 455, 1349, 701, 751,
- 1059, 368, 632, 368, 945, 1558, 632, 1561, 1034, 1564,
- 632, 1478, 1078, 454, 455, 1567, 922, 245, 676, 677,
- 925, 926, 927, 928, 837, 632, 450, 1079, 931, 1481,
- 148, 149, 246, 947, 1059, 454, 455, 1059, 951, 632,
- 1059, 1080, 253, 1059, 454, 455, 1591, 712, 1593, 713,
- 1595, 1484, 1112, 798, 306, 307, 308, 309, 254, 279,
- 1492, 1058, 280, 454, 455, 454, 455, 1059, 712, 1059,
- 713, 1059, 257, 1115, 310, 311, 258, 259, 958, 1494,
- 632, 1549, 1081, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 281, 278, 1296,
- 1297, 391, 632, 1092, 1082, 1231, 287, 401, 981, 982,
- 983, 984, 993, 165, 317, 632, 491, 1084, 492, 288,
- 1286, 162, 1287, 163, 368, 289, 867, 867, 867, 867,
- 344, 401, 1127, 290, 1129, 401, 1130, 291, 401, 401,
- 401, 292, 632, 500, 1131, 952, 501, 401, 368, 502,
- 345, 503, 368, 346, 347, 368, 368, 368, 1019, 7,
- 8, 1530, 348, 632, 368, 1132, 632, 349, 1133, 957,
- 632, 352, 1134, 959, 353, 354, 960, 961, 962, 632,
- 890, 1169, 1254, 355, 1255, 966, 401, 356, 357, 298,
- 891, 632, 1354, 1321, 1355, 1254, 367, 1394, 892, 893,
- 894, 530, 374, 368, 895, 896, 897, 898, 1254, 951,
- 1428, 593, 20, 21, 594, 23, 24, 595, 26, 596,
- 28, 1445, 29, 1446, 996, 375, 392, 34, 35, 890,
- 37, 38, 39, 632, 393, 1457, 42, 880, 1459, 891,
- 1460, 774, 396, 1462, 886, 424, 413, 892, 893, 894,
- 901, 418, 482, 895, 896, 897, 898, 1123, 1254, 1112,
- 1467, 1469, 358, 359, 360, 361, 363, 444, 423, 63,
- 64, 65, 1115, 1254, 1470, 1473, 429, 430, 1206, 397,
- 632, 480, 1474, 403, 632, 1244, 1493, 1354, 1432, 1531,
- 447, 406, 408, 411, 412, 434, 414, 408, 416, 417,
- 439, 408, 420, 421, 632, 632, 1548, 1550, 408, 1254,
- 488, 1555, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 443, 1479, 440, 632,
- 391, 1584, 739, 448, 441, 452, 453, 459, 1585, 1254,
- 1586, 1601, 460, 1605, 453, 1606, 461, 470, 471, 472,
- 476, 1409, 483, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 484, 485, 489,
- 1214, 391, 490, 494, 497, 505, 507, 408, 498, 499,
- 517, 890, 512, 513, 519, 520, 514, 515, 516, 1233,
- 518, 891, 524, 521, 522, 525, 527, 523, 533, 892,
- 893, 894, 1001, 535, 538, 895, 896, 897, 898, 539,
- 534, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 541, 391, 540, 589, 391, 590, 542, 543, 544, 545,
- 546, 547, 548, 549, 550, 551, 552, 553, 554, 555,
- 556, 557, 558, 559, 560, 561, 562, 563, 163, 591,
- 890, 1042, 1043, 1044, 304, 162, 645, 574, 592, 576,
- 891, 649, 650, 651, 659, 654, 401, 1150, 892, 893,
- 894, 655, 660, 661, 895, 896, 897, 898, 662, 1482,
- 666, 598, 408, 368, 600, 601, 602, 603, 604, 605,
- 606, 607, 608, 609, 610, 611, 612, 613, 614, 668,
- 1410, 616, 401, 669, 1234, 693, 1233, 670, 695, 718,
- 696, 698, 705, 706, 505, 711, 1448, 716, 719, 368,
- 636, 720, 721, 732, 735, 641, 741, 747, 617, 748,
- 646, 647, 778, 779, 780, 781, 652, 653, 800, 801,
- 1259, 658, 782, 783, 788, 789, 663, 664, 665, 790,
- 791, 371, 371, 792, 826, 831, 409, 834, 805, 836,
- 841, 409, 838, 842, 843, 409, 681, 682, 683, 358,
- 359, 684, 409, 845, 846, 688, 689, 690, 691, 692,
- 847, 848, 850, 697, 851, 852, 699, 700, 1237, 856,
- 408, 408, 408, 861, 876, 707, 708, 709, 710, 863,
- 7, 8, 890, 717, 883, 884, 910, 923, 932, 933,
- 934, 408, 891, 935, 944, 1262, 1525, 725, 727, 942,
- 892, 893, 894, 968, 1205, 973, 895, 896, 897, 898,
- 974, 980, 1402, 976, 990, 992, 710, 988, 977, 506,
- 408, 409, 746, 989, 995, 1000, 749, 1006, 1012, 1017,
- 1018, 1291, 593, 20, 21, 594, 23, 24, 595, 26,
- 596, 28, 1013, 29, 1020, 1021, 1024, 1026, 34, 35,
- 1025, 37, 38, 39, 1027, 1030, 1431, 42, 1028, 1029,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 799, 1332, 401, 1452, 391, 1031,
- 1485, 1032, 1338, 1341, 1033, 1035, 1045, 1049, 1047, 1046,
- 63, 64, 65, 368, 1048, 1068, 1062, 890, 1265, 1063,
- 1072, 1064, 1065, 1066, 1069, 825, 1070, 891, 408, 1071,
- 408, 833, 1074, 1075, 1088, 892, 893, 894, 727, 839,
- 371, 895, 896, 897, 898, 1093, 409, 1094, 1096, 1097,
- 1099, 1100, 853, 1101, 1298, 1109, 1301, 1102, 1304, 1110,
- 1111, 859, 1119, 1125, 1124, 1143, 866, 866, 866, 866,
- 1141, 1136, 1315, 740, 408, 1318, 1319, 1142, 506, 1146,
- 1154, 881, 882, 1152, 1158, 1172, 1161, 885, 1153, 1159,
- 1160, 1162, 1165, 1164, 1526, 1166, 1529, 1167, 1175, 1173,
- 909, 1176, 1177, 911, 1178, 1182, 1188, 1189, 1200, 1201,
- 1196, 1202, 1203, 787, 1218, 1545, 1210, 422, 1211, 1215,
- 1220, 408, 1221, 1222, 1226, 408, 408, 408, 408, 1229,
- 1230, 1235, 1236, 408, 1240, 1239, 1258, 1242, 442, 1245,
- 936, 445, 938, 939, 1246, 1247, 1248, 1266, 1267, 1268,
- 1271, 1569, 975, 1273, 409, 409, 409, 1274, 1275, 1276,
- 1280, 1277, 1285, 1288, 1299, 475, 890, 1302, 1305, 1309,
- 953, 1313, 1316, 1320, 1323, 409, 891, 1335, 954, 955,
- 956, 1342, 728, 408, 892, 893, 894, 1344, 1345, 1347,
- 895, 896, 897, 898, 1353, 965, 1356, 1365, 1346, 1368,
- 967, 1369, 1367, 972, 409, 1370, 1371, 1372, 1373, 1376,
- 401, 1388, 1377, 408, 408, 408, 408, 1016, 1379, 986,
- 531, 532, 1380, 1382, 1384, 1390, 1386, 368, 1498, 1397,
- 1391, 1404, 537, 1399, 1406, 1405, 1418, 1411, 1422, 1423,
- 1424, 1425, 401, 1426, 401, 1436, 1427, 1439, 1572, 1442,
- 1429, 1444, 1451, 1458, 1463, 1464, 1471, 1450, 1487, 368,
- 1453, 368, 401, 408, 1577, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 368,
- 1597, 1475, 1600, 391, 1488, 1491, 1496, 1507, 7, 8,
- 1508, 1510, 409, 1513, 409, 1514, 1517, 1551, 1518, 1521,
- 1611, 1527, 728, 840, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 1543, 1552,
- 1522, 1537, 391, 1559, 1073, 1562, 1565, 1076, 1568, 1067,
- 1570, 1539, 1575, 1541, 1553, 1589, 1574, 1083, 409, 1578,
- 593, 20, 21, 594, 23, 24, 595, 26, 596, 28,
- 1590, 29, 1592, 1098, 1120, 1580, 34, 35, 1528, 37,
- 38, 39, 7, 8, 1594, 42, 1596, 1598, 1582, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 1607, 1128, 409, 1587, 391, 1608, 409,
- 409, 409, 409, 1609, 1610, 1137, 1138, 409, 63, 64,
- 65, 1612, 1145, 1499, 1420, 87, 1147, 1149, 1156, 629,
- 1421, 95, 657, 0, 593, 20, 21, 594, 23, 24,
- 595, 26, 596, 28, 0, 29, 1241, 0, 0, 0,
- 34, 35, 0, 37, 38, 39, 0, 0, 0, 42,
- 0, 0, 0, 0, 1185, 1186, 1187, 409, 0, 0,
- 0, 0, 0, 0, 1197, 0, 1199, 0, 0, 0,
- 0, 878, 0, 0, 0, 0, 0, 1204, 0, 0,
- 0, 0, 63, 64, 65, 408, 0, 409, 409, 409,
- 409, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 1223, 1224, 1225, 391,
- 0, 0, 0, 0, 794, 0, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 0, 409, 0, 1238,
- 0, 0, 0, 0, 0, 879, 0, 0, 0, 0,
- 0, 7, 8, 1251, 0, 0, 0, 0, 1257, 0,
- 0, 0, 0, 0, 0, 1261, 0, 0, 890, 1263,
- 1264, 0, 0, 0, 0, 0, 1269, 1270, 891, 0,
- 0, 1272, 0, 0, 0, 860, 892, 893, 894, 1279,
- 0, 0, 895, 896, 897, 898, 874, 0, 0, 1289,
- 104, 1290, 0, 593, 20, 21, 594, 23, 24, 595,
- 26, 596, 28, 1307, 29, 0, 0, 0, 0, 34,
- 35, 0, 37, 38, 39, 408, 0, 0, 42, 408,
- 890, 0, 1322, 0, 130, 131, 132, 133, 134, 135,
- 891, 0, 0, 0, 0, 1331, 139, 140, 892, 893,
- 894, 0, 0, 1340, 895, 896, 897, 898, 145, 0,
- 0, 63, 64, 65, 0, 0, 1579, 0, 0, 1350,
- 1351, 0, 943, 0, 102, 297, 0, 1357, 0, 0,
- 105, 106, 107, 0, 0, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 0, 0, 0,
- 0, 1378, 0, 0, 0, 0, 136, 137, 138, 0,
- 0, 0, 0, 0, 902, 141, 142, 143, 1581, 1392,
- 0, 505, 0, 144, 0, 0, 890, 0, 148, 149,
- 0, 0, 1400, 0, 1401, 0, 891, 408, 0, 409,
- 0, 0, 0, 1408, 892, 893, 894, 0, 0, 0,
- 895, 896, 897, 898, 0, 0, 1413, 0, 0, 890,
- 1126, 1417, 1004, 1005, 0, 1007, 0, 1010, 1011, 891,
- 0, 1014, 1015, 0, 0, 0, 0, 892, 893, 894,
- 0, 408, 0, 895, 896, 897, 898, 0, 1435, 0,
- 1438, 0, 1441, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 408, 147, 0, 0, 1454, 0, 0, 0,
- 150, 151, 152, 153, 154, 0, 0, 0, 0, 0,
- 0, 1465, 1466, 0, 1583, 0, 1468, 0, 462, 463,
- 0, 0, 0, 157, 0, 0, 1472, 0, 464, 0,
- 1476, 0, 0, 161, 0, 229, 0, 0, 0, 890,
- 0, 0, 1085, 1086, 1087, 0, 0, 1602, 0, 891,
- 0, 0, 1095, 0, 0, 0, 1497, 892, 893, 894,
- 0, 1257, 0, 895, 896, 897, 898, 0, 1505, 409,
- 0, 0, 0, 409, 0, 1512, 0, 0, 1516, 0,
- 0, 1520, 0, 0, 0, 1523, 0, 0, 0, 408,
- 0, 408, 0, 0, 0, 0, 0, 0, 1533, 0,
- 1140, 1535, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 1157, 0, 0, 0,
- 391, 0, 1163, 0, 0, 0, 0, 0, 1168, 890,
- 1170, 1171, 0, 1557, 0, 1174, 0, 1603, 0, 891,
- 1179, 1180, 1181, 0, 0, 0, 408, 892, 893, 894,
- 0, 0, 0, 895, 896, 897, 898, 1198, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 1209, 0, 391, 506, 1213, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 102, 297, 0,
- 0, 409, 0, 105, 106, 107, 0, 409, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 510, 0, 0, 0, 0, 0, 0, 1604, 0, 136,
- 137, 138, 0, 0, 0, 409, 0, 0, 141, 142,
- 143, 0, 0, 0, 0, 1249, 144, 102, 297, 0,
- 0, 0, 0, 105, 106, 107, 409, 0, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 0, 0, 0, 0, 0, 1281, 1282, 1283, 1284, 136,
- 137, 138, 0, 0, 0, 0, 0, 0, 141, 142,
- 143, 0, 0, 0, 0, 0, 144, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 1140, 0, 391, 0, 0, 0, 147, 0, 0, 0,
- 0, 0, 1324, 150, 151, 152, 153, 154, 0, 1333,
- 0, 1334, 0, 0, 0, 1337, 0, 0, 0, 1216,
- 0, 155, 156, 409, 0, 409, 157, 0, 0, 0,
- 0, 269, 0, 0, 1352, 0, 161, 0, 1232, 0,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 511, 389, 390, 0, 1140, 147, 1343, 391, 0,
- 0, 0, 0, 150, 151, 152, 153, 154, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 409, 155, 156, 0, 0, 0, 157, 0, 0, 1389,
- 0, 269, 0, 0, 362, 0, 161, 0, 102, 103,
- 104, 0, 0, 0, 105, 106, 107, 0, 0, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 0, 1140, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 0, 0, 0, 139, 140, 0, 141,
- 142, 143, 0, 1140, 0, 0, 0, 144, 145, 0,
+ 108, 493, 625, 1472, 627, 524, 347, 512, 207, 208,
+ 95, 760, 761, 543, 320, 638, 1058, 933, 272, 527,
+ 1388, 4, 218, 1294, 653, 546, 348, 186, 918, 413,
+ 548, 414, 1285, 310, 906, 415, 667, 218, 1182, 325,
+ 327, 209, 213, 213, 5, 550, 802, 804, 210, 255,
+ 257, 1193, 263, 191, 275, 806, 808, 192, 332, 194,
+ 1687, 277, 304, 278, 259, 1191, 193, 260, 187, 313,
+ 261, 583, 1184, 585, 1186, 247, 1527, 205, 275, 206,
+ 1188, 501, 502, 1694, 501, 502, 251, 252, 1594, 1595,
+ 248, 249, 1696, 190, 1596, 338, 253, 1335, 109, 1336,
+ 1337, 189, 1338, 254, 352, 353, 354, 355, 356, 357,
+ 358, 359, 360, 361, 362, 363, 364, 365, 366, 367,
+ 368, 369, 370, 371, 372, 373, 374, 375, 376, 689,
+ 666, 501, 502, 279, 690, 383, 384, 385, 386, 339,
+ 404, 388, 200, 321, 324, 666, 1092, 389, 390, 1173,
+ 196, 544, 276, 395, 919, 920, 921, 922, 344, 345,
+ 1183, 243, 1579, 547, 244, 273, 501, 502, 549, -488,
+ 1389, 335, 652, 336, 251, 252, 322, 275, 1593, 666,
+ 337, 89, 755, 551, 253, 89, 344, 345, 409, 275,
+ 275, 262, 501, 502, 1185, 934, 1187, 275, 268, 525,
+ 269, 1262, 1189, 501, 502, 275, 182, 304, 762, 1059,
+ 934, 545, 304, 441, 444, 841, 304, 274, 349, 304,
+ 350, 219, 351, 304, 304, 304, 304, 182, 923, 304,
+ 304, 304, 311, 907, 214, 214, 912, 326, 328, 753,
+ 754, 215, 911, 304, 803, 805, 1191, 197, 333, 282,
+ 496, 497, 283, 807, 809, 334, 195, 1688, 505, 769,
+ 562, 314, 513, 501, 502, 304, 304, 304, 203, 450,
+ 897, 900, 501, 502, 541, 407, 405, 406, 264, 304,
+ 304, 198, 1093, 1094, 501, 502, 515, 443, 443, 1328,
+ 1329, 567, 304, 516, 304, 443, 340, 341, 342, 343,
+ 1339, 654, 1340, 451, 199, 340, 341, 342, 343, 344,
+ 345, 340, 341, 342, 343, 344, 345, 501, 502, 824,
+ -489, 344, 345, 899, 344, 345, 501, 502, 275, 1209,
+ 304, 304, 832, 1129, 503, 1130, 1727, 595, 340, 341,
+ 342, 343, 768, 304, 1228, 340, 341, 342, 343, 209,
+ 265, 349, 588, 586, 266, 540, 910, 344, 345, 696,
+ 182, 705, 697, 706, 344, 345, 267, 340, 341, 342,
+ 343, 275, 275, 275, 275, 275, 275, 304, 275, 275,
+ 201, 275, 275, 275, 275, 275, 344, 345, 202, 275,
+ 275, 275, 275, 275, 657, 275, 626, 221, 628, 629,
+ 630, 596, 632, 633, 913, 635, 636, 637, 204, 639,
+ 344, 345, 304, 643, 644, 645, 646, 236, 1377, 1378,
+ 237, -490, 413, 238, 414, 239, 443, 1799, 594, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 563, 430, 431, 501, 502, 501, 502, 432, 501, 502,
+ 304, 705, 641, 711, 501, 502, 1463, 1064, 1066, 648,
+ 504, 1169, 408, 211, 699, 514, 435, 697, 436, 443,
+ 443, 443, 443, 443, 443, 337, 443, 443, 212, 443,
+ 443, 443, 443, 443, 216, 304, 304, 443, 443, 443,
+ 443, 647, 217, 649, 413, 220, 414, 990, 1486, 847,
+ 794, 758, 759, 427, 428, 429, 430, 431, 221, 497,
+ 409, 409, 432, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 430, 431, 304, 304, 304,
+ 1003, 432, 227, 1229, 222, 228, 501, 502, 229, 275,
+ 795, 1004, 223, 734, 737, 740, 743, 898, 901, 1005,
+ 1006, 1007, 1192, 304, 691, 1008, 1009, 1010, 1011, 692,
+ 304, 48, 49, 50, 51, 224, 818, 501, 502, 226,
+ 56, 501, 502, 59, 501, 502, 1607, 694, 1610, 565,
+ 1613, 566, 695, 1467, 501, 502, 552, 1540, 337, 553,
+ 1542, 304, 554, 232, 555, 1153, 233, 1155, 234, 1157,
+ 1544, 1159, 848, 849, 850, 851, 852, 853, 854, 855,
+ 856, 857, 858, 225, 860, 861, 862, 863, 864, 865,
+ 866, 1003, 230, 231, 870, 872, 873, 501, 502, 705,
+ 235, 715, 1004, 245, 881, 882, 883, 796, 885, 884,
+ 1005, 1006, 1007, 1552, 695, 893, 1008, 1009, 1010, 1011,
+ 538, 687, 539, 688, 540, 246, 909, 181, 182, 182,
+ 1191, 1101, 250, 1191, 304, 258, 1191, 418, 419, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 429, 430,
+ 431, 891, 501, 502, 271, 432, 892, 304, 240, 304,
+ 847, 241, 275, 242, 1487, 275, 270, 275, 1554, 501,
+ 502, 304, 304, 501, 502, 1122, 1713, 501, 502, 280,
+ 705, 1003, 1263, 281, 902, 1555, 941, 501, 502, 1659,
+ 284, 945, 1004, 1662, 1123, 304, 1190, 285, 1276, 705,
+ 1005, 1006, 1007, 1665, 1065, 1067, 1008, 1009, 1010, 1011,
+ 501, 502, 1072, 1074, 501, 502, 304, 501, 502, 501,
+ 502, 705, 705, 721, 812, 993, 1673, 501, 502, 1003,
+ 1675, 286, 999, 1730, 947, 1731, 1191, 1759, 1014, 1762,
+ 1004, 1765, 835, 1744, 836, 306, 307, 1768, 1005, 1006,
+ 1007, 501, 502, 308, 1008, 1009, 1010, 1011, 1598, 1599,
+ 443, 304, 309, 943, 1596, 443, 315, 1782, 1509, 413,
+ 304, 414, 304, 1510, 304, 817, 304, 501, 502, 316,
+ 317, 304, 1191, 318, 304, 1191, 1351, 413, 1191, 414,
+ 1804, 1191, 1806, 1783, 1808, 319, 1117, 1118, 429, 430,
+ 431, 331, 304, 417, 413, 432, 414, 377, 304, 695,
+ 378, 1451, 1452, 275, 413, 413, 414, 414, 379, 871,
+ 705, 380, 381, 1268, 7, 8, 391, 1191, 1383, 1191,
+ 1003, 1191, 382, 705, 1660, 915, 387, 1075, 304, 392,
+ 705, 1004, 986, 275, 304, 275, 275, 393, 394, 1005,
+ 1006, 1007, 705, 396, 987, 1008, 1009, 1010, 1011, 275,
+ 413, 413, 414, 414, 397, 1253, 1256, 1081, 412, 1083,
+ 1084, 705, 705, 1028, 1029, 398, 433, 304, 304, 304,
+ 304, 434, 470, 1089, 1108, 705, 459, 1030, 659, 24,
+ 25, 660, 27, 28, 661, 30, 662, 32, 705, 33,
+ 1046, 1074, 275, 464, 38, 39, 469, 41, 42, 43,
+ 438, 443, 1085, 46, 475, 1126, 1127, 476, 1128, 304,
+ 304, 705, 304, 1069, 304, 304, 1121, 488, 304, 304,
+ 1135, 491, 1136, 304, 705, 1663, 1166, 705, 705, 1210,
+ 1215, 443, 480, 443, 443, 494, 481, 67, 68, 69,
+ 705, 705, 1216, 1217, 705, 482, 1218, 443, 483, 1264,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 484,
+ 1174, 1175, 1176, 432, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 705, 705,
+ 1220, 1221, 432, 1270, 1397, 1271, 705, 705, 1272, 1273,
+ 443, 705, 485, 1274, 1003, 705, 705, 1275, 1312, 1407,
+ 1439, 1408, 1440, 486, 1602, 1004, 783, 304, 304, 304,
+ 487, 440, 112, 1005, 1006, 1007, 495, 526, 304, 1008,
+ 1009, 1010, 1011, 705, 1515, 1476, 1516, 705, 1238, 1531,
+ 705, 1407, 1532, 1553, 506, 1243, 1244, 1245, 1246, 1247,
+ 507, 1407, 1615, 1591, 1616, 1254, 1257, 139, 140, 141,
+ 142, 143, 144, 705, 517, 1631, 148, 149, 150, 151,
+ 7, 8, 508, 518, 153, 154, 155, 337, 1633, 156,
+ 1634, 304, 695, 1407, 1636, 1641, 1253, 1256, 1643, 1644,
+ 161, 1407, 705, 1647, 1655, 519, 705, 1572, 1674, 1515,
+ 304, 1724, 705, 705, 1743, 1745, 304, 523, 1384, 1666,
+ 528, 1407, 304, 1754, 304, 304, 705, 529, 1791, 304,
+ 304, 1796, 304, 1797, 304, 1407, 304, 1818, 304, 304,
+ 304, 1828, 535, 1829, 659, 24, 25, 660, 27, 28,
+ 661, 30, 662, 32, 530, 33, 304, 531, 532, 536,
+ 38, 39, 537, 41, 42, 43, 542, 1291, 564, 46,
+ 568, 304, 1350, 572, 574, 304, 575, 304, 580, 182,
+ 581, 582, 584, 593, 598, 164, 165, 599, 602, 1364,
+ 1003, 432, 655, 656, 181, 718, 172, 658, 89, 173,
+ 1369, 1004, 701, 67, 68, 69, 702, 722, 723, 1005,
+ 1006, 1007, 724, 752, 727, 1008, 1009, 1010, 1011, 344,
+ 345, 728, 750, 751, 777, 275, 775, 1073, 472, 473,
+ 474, 778, 780, 477, 478, 479, 787, 788, 793, 1573,
+ 1384, 797, 822, 799, 800, 801, 825, 833, 834, 1385,
+ 842, 843, 874, 304, 875, 876, 877, 890, 878, 894,
+ 879, 889, 895, 275, 904, 896, 304, 905, 932, 520,
+ 521, 937, 830, 940, 942, 1618, 686, 1418, 944, 951,
+ 948, 952, 953, 533, 534, 955, 956, 1412, 957, 958,
+ 960, 961, 962, 966, 1386, 1740, 971, 973, 975, 976,
+ 977, 978, 304, 304, 1390, 979, 980, 981, 982, 989,
+ 7, 8, 1023, 1053, 1036, 1453, 996, 1456, 1050, 1459,
+ 409, 409, 997, 443, 1051, 1037, 1039, 1003, 1040, 1041,
+ 304, 1415, 304, 1470, 304, 1052, 1473, 1474, 1004, 1063,
+ 1061, 1091, 1096, 1097, 1100, 1099, 1005, 1006, 1007, 304,
+ 1103, 1109, 1008, 1009, 1010, 1011, 304, 1112, 1114, 1113,
+ 304, 443, 1116, 1120, 304, 1495, 1125, 1133, 1139, 888,
+ 1140, 1446, 1144, 1145, 659, 24, 25, 660, 27, 28,
+ 661, 30, 662, 32, 304, 33, 1147, 1148, 1098, 1151,
+ 38, 39, 1152, 41, 42, 43, 1161, 1714, 1162, 46,
+ 1163, 1164, 1165, 1167, 1177, 304, 1179, 1178, 1181, 1180,
+ 1248, 1194, 1195, 1200, 7, 8, 1196, 1197, 1198, 1201,
+ 1491, 1202, 1203, 1204, 1206, 1207, 1225, 1230, 1231, 1498,
+ 1501, 1502, 1784, 67, 68, 69, 1233, 1235, 1237, 1239,
+ 1240, 304, 1241, 1242, 1249, 1250, 304, 418, 419, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 429, 430,
+ 431, 1252, 1265, 1251, 1266, 432, 304, 1284, 1260, 1283,
+ 1287, 1292, 1277, 304, 1293, 1301, 275, 1304, 659, 24,
+ 25, 660, 27, 28, 661, 30, 662, 32, 1297, 33,
+ 1282, 304, 1295, 1296, 38, 39, 1302, 41, 42, 43,
+ 1303, 1305, 831, 46, 1307, 1308, 1309, 304, 1310, 1315,
+ 304, 1325, 1316, 1326, 1327, 1333, 7, 8, 1334, 1341,
+ 1606, 1345, 1609, 409, 1612, 1346, 304, 1347, 1348, 1355,
+ 1356, 304, 1620, 1360, 184, 1623, 1363, 67, 68, 69,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 1370, 1371, 1372, 1376, 432, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 304, 443, 1649, 1379, 432, 1380, 1653,
+ 659, 24, 25, 660, 27, 28, 661, 30, 662, 32,
+ 1387, 33, 304, 1392, 1393, 1395, 38, 39, 1398, 41,
+ 42, 43, 1399, 7, 8, 46, 991, 1400, 1401, 1411,
+ 1419, 1428, 1420, 1421, 1424, 1426, 330, 1427, 1429, 1430,
+ 1433, 1434, 1435, 1436, 1437, 1438, 1441, 1454, 1693, 1457,
+ 1460, 1464, 1695, 1468, 1471, 1475, 1478, 1143, 1494, 67,
+ 68, 69, 1503, 1507, 1505, 1506, 1508, 1514, 1528, 1517,
+ 304, 1526, 304, 1529, 1530, 1717, 1535, 1536, 1547, 1538,
+ 1539, 1541, 1543, 1545, 1549, 304, 1550, 659, 24, 25,
+ 660, 27, 28, 661, 30, 662, 32, 1683, 33, 1556,
+ 1562, 1567, 1568, 38, 39, 1569, 41, 42, 43, 1581,
+ 1585, 1574, 46, 1586, 1587, 1588, 1589, 1590, 1614, 1592,
+ 1621, 1632, 399, 400, 401, 402, 403, 1637, 992, 1651,
+ 1757, 1758, 1638, 1645, 1648, 1652, 1654, 1656, 1668, 439,
+ 1672, 304, 1681, 445, 1669, 1692, 67, 68, 69, 275,
+ 1697, 1699, 1702, 1703, 1706, 1707, 1710, 452, 454, 457,
+ 458, 1003, 460, 454, 462, 463, 1716, 454, 466, 467,
+ 1711, 1738, 1004, 1777, 454, 1732, 304, 1734, 1736, 1751,
+ 1005, 1006, 1007, 1752, 1760, 1750, 1008, 1009, 1010, 1011,
+ 1763, 1766, 490, 275, 1769, 275, 1771, 1779, 1780, 1785,
+ 1787, 499, 500, 1789, 1798, 7, 8, 1800, 1803, 1805,
+ 500, 1807, 1809, 1815, 1830, 1015, 1831, 1814, 1832, 1817,
+ 1833, 1834, 1835, 1837, 1286, 275, 1684, 700, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 1583, 557, 559, 454, 432, 443, 1584, 1836,
+ 1299, 94, 103, 730, 1600, 569, 570, 571, 1394, 573,
+ 0, 0, 576, 577, 578, 0, 1786, 579, 0, 659,
+ 24, 25, 660, 27, 28, 661, 30, 662, 32, 0,
+ 33, 0, 0, 591, 592, 38, 39, 0, 41, 42,
+ 43, 443, 0, 443, 46, 0, 0, 600, 601, 0,
+ 603, 604, 605, 606, 607, 608, 609, 610, 611, 612,
+ 613, 614, 615, 616, 617, 618, 619, 620, 621, 622,
+ 623, 624, 0, 443, 0, 0, 0, 0, 67, 68,
+ 69, 634, 0, 0, 0, 0, 0, 640, 0, 642,
+ 0, 456, 0, 0, 1199, 0, 461, 0, 0, 0,
+ 465, 0, 0, 0, 0, 0, 0, 471, 0, 0,
+ 664, 0, 0, 454, 0, 0, 668, 669, 670, 671,
+ 672, 673, 674, 675, 676, 677, 678, 679, 680, 681,
+ 682, 0, 0, 684, 685, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1003, 0, 0, 1055, 0, 0,
+ 0, 557, 0, 0, 0, 1004, 0, 709, 0, 0,
+ 0, 0, 714, 1005, 1006, 1007, 0, 719, 720, 1008,
+ 1009, 1010, 1011, 725, 726, 0, 0, 0, 731, 733,
+ 736, 739, 742, 744, 745, 746, 454, 454, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 0,
+ 0, 0, 0, 432, 763, 764, 765, 399, 400, 766,
+ 0, 0, 0, 770, 771, 772, 773, 774, 0, 0,
+ 0, 779, 0, 781, 782, 0, 0, 0, 454, 454,
+ 454, 1003, 0, 789, 790, 791, 600, 792, 0, 0,
+ 0, 0, 1004, 798, 0, 0, 0, 0, 0, 1788,
+ 1005, 1006, 1007, 0, 454, 0, 1008, 1009, 1010, 1011,
+ 813, 815, 0, 684, 685, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 1003,
+ 0, 0, 0, 432, 792, 0, 0, 0, 0, 0,
+ 1004, 839, 454, 0, 0, 0, 665, 844, 1005, 1006,
+ 1007, 0, 110, 329, 1008, 1009, 1010, 1011, 113, 114,
+ 115, 0, 0, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 1790, 0, 0, 0,
+ 0, 0, 0, 0, 0, 145, 146, 147, 0, 0,
+ 0, 903, 152, 0, 1261, 0, 0, 0, 0, 0,
+ 0, 0, 0, 157, 158, 159, 0, 0, 0, 747,
+ 748, 160, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1821, 931, 0, 0, 454, 0,
+ 454, 939, 0, 0, 0, 0, 0, 0, 0, 946,
+ 0, 0, 815, 949, 0, 0, 0, 0, 1003, 0,
+ 0, 784, 785, 786, 0, 0, 963, 0, 0, 1004,
+ 0, 0, 0, 0, 0, 969, 0, 1005, 1006, 1007,
+ 0, 0, 0, 1008, 1009, 1010, 1011, 810, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 454, 0, 0,
+ 0, 0, 0, 0, 994, 995, 163, 0, 0, 166,
+ 998, 0, 0, 167, 168, 169, 170, 171, 0, 0,
+ 89, 0, 0, 1022, 0, 840, 1024, 0, 0, 0,
+ 0, 0, 0, 0, 0, 174, 175, 0, 0, 0,
+ 176, 0, 454, 468, 0, 296, 0, 0, 0, 0,
+ 180, 454, 489, 454, 0, 454, 0, 454, 0, 0,
+ 0, 0, 454, 1822, 0, 454, 0, 492, 0, 0,
+ 0, 1054, 0, 1056, 1057, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 0,
+ 1267, 522, 0, 432, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 0, 1076, 0, 0,
+ 432, 0, 0, 1003, 0, 1077, 1078, 1079, 0, 454,
+ 0, 936, 0, 938, 1004, 0, 0, 7, 8, 0,
+ 0, 0, 1005, 1006, 1007, 0, 0, 1088, 1008, 1009,
+ 1010, 1011, 0, 0, 0, 1090, 0, 0, 1095, 0,
+ 0, 1361, 0, 0, 589, 590, 0, 0, 454, 454,
+ 454, 454, 0, 0, 0, 1110, 0, 597, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1447, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 0, 0, 0, 391, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 1486, 0, 391, 0, 0,
- 0, 146, 0, 0, 0, 0, 0, 147, 148, 149,
- 0, 0, 0, 0, 150, 151, 152, 153, 154, 0,
+ 988, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 659, 24, 25, 660, 27, 28, 661, 30, 662,
+ 32, 631, 33, 0, 0, 0, 0, 38, 39, 0,
+ 41, 42, 43, 0, 454, 0, 46, 0, 1823, 0,
+ 0, 0, 0, 0, 1154, 1035, 1156, 0, 1158, 0,
+ 1160, 0, 0, 0, 1042, 0, 1043, 0, 1044, 0,
+ 1045, 0, 0, 0, 0, 1048, 0, 0, 1049, 0,
+ 67, 68, 69, 0, 0, 0, 0, 0, 0, 0,
+ 0, 418, 419, 420, 421, 422, 423, 424, 425, 426,
+ 427, 428, 429, 430, 431, 0, 0, 0, 1205, 432,
+ 0, 1208, 0, 0, 0, 1211, 0, 1212, 1213, 1214,
+ 0, 0, 0, 0, 0, 1219, 0, 0, 0, 0,
+ 0, 0, 1080, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1234, 0, 1236, 0, 0, 0, 1381, 1060,
+ 7, 8, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 0, 0, 0, 0,
+ 432, 1104, 1105, 1106, 1107, 0, 0, 0, 1269, 455,
+ 0, 0, 0, 0, 455, 0, 0, 0, 455, 0,
+ 1278, 1279, 0, 0, 0, 455, 0, 0, 0, 0,
+ 0, 0, 1288, 1290, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 659, 24, 25, 660, 27, 28,
+ 661, 30, 662, 32, 0, 33, 0, 1146, 7, 8,
+ 38, 39, 0, 41, 42, 43, 0, 0, 0, 46,
+ 0, 0, 0, 0, 0, 0, 0, 1330, 1331, 1332,
+ 0, 0, 0, 0, 0, 0, 0, 1342, 0, 1344,
+ 0, 0, 0, 0, 558, 0, 455, 0, 0, 0,
+ 1349, 0, 0, 67, 68, 69, 0, 0, 454, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 155, 156, 0, 0, 0, 157, 0, 0,
- 0, 0, 158, 0, 159, 0, 160, 161, 0, 162,
- 0, 163, 0, 1140, 102, 260, 0, 0, 0, 0,
- 105, 106, 107, 0, 0, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 262, 0, 0,
- 0, 0, 0, 0, 0, 0, 136, 137, 138, 0,
- 0, 0, 0, 7, 8, 141, 142, 143, 0, 0,
- 0, 0, 0, 144, 0, 263, 0, 0, 264, 0,
- 0, 265, 0, 266, 1140, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 267, 0, 0, 0, 0,
- 0, 0, 44, 45, 46, 47, 48, 0, 0, 0,
- 52, 0, 0, 55, 0, 593, 20, 21, 594, 23,
- 24, 595, 26, 596, 28, 0, 29, 0, 0, 0,
- 0, 34, 35, 0, 37, 38, 39, 0, 0, 0,
- 42, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 147, 0, 0, 0, 0, 0, 0,
- 150, 151, 152, 153, 154, 0, 0, 0, 0, 0,
- 0, 0, 0, 63, 64, 65, 0, 0, 462, 1314,
- 0, 0, 0, 157, 0, 0, 0, 0, 464, 0,
- 0, 102, 260, 161, 0, 229, 508, 105, 106, 107,
- 0, 0, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 262, 0, 0, 0, 0, 0,
- 0, 0, 0, 136, 137, 138, 937, 0, 0, 0,
- 0, 0, 141, 142, 143, 0, 0, 7, 8, 0,
- 144, 0, 263, 0, 0, 264, 0, 0, 265, 0,
- 266, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 267, 0, 0, 0, 0, 0, 0, 44,
- 45, 46, 47, 48, 0, 0, 0, 52, 0, 0,
- 55, 0, 0, 0, 0, 0, 0, 0, 0, 593,
- 20, 21, 594, 23, 24, 595, 26, 596, 28, 0,
- 29, 0, 0, 0, 0, 34, 35, 0, 37, 38,
- 39, 0, 1375, 0, 42, 0, 0, 0, 0, 0,
- 147, 0, 0, 0, 0, 0, 0, 150, 151, 152,
- 153, 154, 1403, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 155, 407, 63, 64, 65,
- 157, 0, 0, 0, 0, 269, 0, 0, 0, 0,
- 161, 0, 0, 508, 102, 260, 104, 0, 0, 0,
- 105, 106, 107, 0, 0, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 262, 0, 0,
- 130, 131, 132, 133, 134, 135, 136, 137, 138, 0,
- 1036, 0, 139, 140, 0, 141, 142, 143, 0, 0,
- 0, 0, 0, 144, 145, 263, 0, 0, 264, 0,
- 0, 265, 0, 266, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 267, 0, 0, 0, 0,
- 0, 0, 44, 45, 46, 47, 48, 0, 0, 0,
- 52, 0, 0, 55, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 0, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 147, 148, 149, 0, 0, 0, 0,
- 150, 151, 152, 153, 154, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 155, 268,
- 0, 0, 0, 157, 0, 0, 0, 0, 269, 0,
- 102, 260, 261, 161, 0, 1336, 105, 106, 107, 0,
- 0, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 262, 0, 0, 0, 0, 0, 0,
- 0, 0, 136, 137, 138, 0, 0, 0, 7, 8,
- 0, 141, 142, 143, 0, 0, 0, 0, 0, 144,
- 0, 263, 0, 0, 264, 0, 0, 265, 0, 266,
+ 0, 0, 659, 24, 25, 660, 27, 28, 661, 30,
+ 662, 32, 0, 33, 1373, 1374, 1375, 0, 38, 39,
+ 0, 41, 42, 43, 0, 0, 0, 46, 916, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 1382, 0, 0, 0, 432, 0, 0,
+ 0, 1391, 1168, 0, 0, 0, 0, 0, 0, 0,
+ 0, 67, 68, 69, 0, 1404, 0, 0, 0, 0,
+ 1410, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1416, 1417, 0, 0, 0, 0, 970,
+ 1422, 1423, 0, 0, 455, 1425, 0, 0, 0, 0,
+ 0, 0, 0, 1432, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 454, 454, 1444, 0, 1445, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1462,
+ 1670, 0, 558, 0, 0, 0, 0, 0, 0, 0,
+ 0, 454, 0, 0, 0, 454, 0, 0, 1477, 0,
+ 0, 0, 0, 1479, 1480, 1481, 1482, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1490, 455, 455, 0,
+ 0, 1359, 0, 0, 0, 0, 1500, 0, 0, 0,
+ 0, 7, 8, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1511, 1512, 0, 1062, 0, 0, 0,
+ 0, 1518, 1070, 0, 0, 0, 0, 0, 0, 455,
+ 455, 455, 0, 0, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 562, 0,
+ 0, 0, 432, 0, 0, 455, 0, 1537, 1082, 0,
+ 0, 0, 816, 0, 0, 659, 24, 25, 660, 27,
+ 28, 661, 30, 662, 32, 1551, 33, 557, 0, 0,
+ 0, 38, 39, 0, 41, 42, 43, 0, 0, 0,
+ 46, 0, 1563, 455, 1564, 0, 0, 454, 0, 0,
+ 0, 0, 0, 0, 1571, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1442, 1443, 1576, 0,
+ 0, 0, 0, 1580, 67, 68, 69, 0, 0, 0,
+ 0, 0, 0, 1131, 1132, 0, 1134, 0, 1137, 1138,
+ 0, 454, 1141, 1142, 0, 0, 0, 0, 1605, 0,
+ 1608, 0, 1611, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 454, 0, 0, 0, 1624, 1625, 1626, 1627,
+ 1628, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1639, 1640, 0, 0, 455,
+ 1642, 455, 0, 1741, 0, 0, 0, 0, 0, 0,
+ 1646, 0, 0, 816, 950, 0, 0, 0, 0, 0,
+ 0, 1657, 0, 0, 0, 0, 0, 418, 419, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 563, 430,
+ 431, 1222, 1223, 1224, 0, 432, 0, 0, 0, 0,
+ 0, 1682, 1232, 1504, 0, 0, 1410, 0, 455, 0,
+ 0, 0, 0, 1690, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1534, 0, 0, 0, 0, 1701, 0, 0,
+ 1705, 0, 0, 1709, 0, 0, 0, 1712, 0, 0,
+ 1565, 454, 0, 454, 1719, 1720, 1721, 1722, 0, 0,
+ 0, 0, 0, 455, 1726, 1281, 0, 1728, 0, 0,
+ 0, 0, 455, 0, 455, 0, 455, 0, 455, 0,
+ 0, 0, 0, 455, 1300, 0, 455, 0, 0, 0,
+ 1306, 0, 0, 0, 1601, 0, 1311, 0, 1313, 1314,
+ 0, 0, 0, 1317, 1318, 0, 1319, 1756, 1320, 0,
+ 1321, 0, 1322, 1323, 1324, 1622, 0, 0, 0, 0,
+ 0, 0, 454, 0, 1772, 1773, 1774, 1775, 0, 0,
+ 1343, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 455, 0, 0, 0, 0, 1354, 0, 0, 0, 1358,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 267, 0, 0, 0, 0, 0, 0, 44, 45,
- 46, 47, 48, 0, 0, 0, 52, 0, 0, 55,
- 593, 20, 21, 594, 23, 24, 595, 26, 596, 28,
- 0, 29, 0, 0, 0, 0, 34, 35, 0, 37,
- 38, 39, 0, 0, 0, 42, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 147,
- 0, 0, 0, 0, 0, 0, 150, 151, 152, 153,
- 154, 0, 0, 0, 0, 0, 0, 0, 63, 64,
- 65, 0, 0, 0, 155, 268, 0, 0, 0, 157,
- 0, 0, 0, 0, 269, 0, 102, 260, 1207, 161,
- 0, 270, 105, 106, 107, 0, 0, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 262,
- 0, 0, 0, 0, 0, 0, 0, 0, 136, 137,
- 138, 1489, 0, 0, 7, 8, 0, 141, 142, 143,
- 0, 0, 0, 0, 0, 144, 0, 263, 0, 0,
- 264, 0, 0, 265, 0, 266, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 267, 0, 0,
- 0, 0, 0, 0, 44, 45, 46, 47, 48, 0,
- 0, 0, 52, 0, 0, 55, 593, 20, 21, 594,
- 23, 24, 595, 26, 596, 28, 0, 29, 0, 0,
- 0, 0, 34, 35, 0, 37, 38, 39, 0, 0,
- 1495, 42, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 147, 0, 0, 0, 1544,
- 0, 0, 150, 151, 152, 153, 154, 0, 0, 0,
- 0, 0, 0, 0, 63, 64, 65, 0, 0, 0,
- 155, 268, 0, 0, 0, 157, 0, 0, 0, 0,
- 269, 0, 102, 260, 0, 161, 0, 1208, 105, 106,
- 107, 0, 0, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 262, 0, 0, 0, 0,
- 0, 0, 0, 0, 136, 137, 138, 1546, 0, 0,
- 0, 0, 0, 141, 142, 143, 0, 0, 0, 0,
- 0, 144, 0, 263, 0, 0, 264, 0, 0, 265,
- 0, 266, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 267, 0, 0, 0, 0, 0, 0,
- 44, 45, 46, 47, 48, 0, 0, 0, 52, 0,
- 0, 55, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 0, 0, 0, 0,
- 391, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 510, 0, 0, 0, 391,
- 0, 147, 0, 0, 0, 0, 0, 0, 150, 151,
- 152, 153, 154, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 155, 268, 0, 0,
- 0, 157, 0, 0, 0, 0, 269, 0, 102, 260,
- 0, 161, 0, 270, 105, 106, 107, 0, 0, 108,
- 109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
+ 1801, 1802, 0, 0, 0, 0, 0, 0, 1566, 0,
+ 1810, 1811, 1812, 1813, 0, 0, 0, 0, 0, 455,
+ 455, 455, 455, 0, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 0, 0,
+ 0, 0, 432, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 430, 431, 0, 0, 0,
+ 0, 432, 0, 0, 0, 0, 0, 1402, 0, 0,
+ 0, 0, 0, 0, 1715, 455, 1718, 0, 0, 0,
+ 1414, 110, 111, 112, 0, 0, 0, 113, 114, 115,
+ 0, 0, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, 135, 136, 137, 138, 1680, 0, 0, 139, 140,
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 0, 0, 0, 153, 154, 155, 0, 0,
+ 156, 0, 157, 158, 159, 1770, 1281, 0, 0, 0,
+ 160, 161, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1483, 112, 0, 0, 0, 0, 0,
+ 1492, 0, 0, 0, 1493, 0, 0, 0, 1497, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 0, 0, 0, 0, 432, 1513, 139,
+ 140, 141, 142, 143, 144, 0, 0, 0, 148, 149,
+ 150, 151, 0, 0, 0, 0, 153, 154, 155, 1281,
+ 0, 156, 0, 0, 0, 0, 0, 0, 0, 162,
+ 0, 0, 161, 0, 0, 163, 164, 165, 166, 0,
+ 0, 0, 167, 168, 169, 170, 171, 172, 0, 89,
+ 173, 0, 0, 0, 0, 1548, 0, 0, 0, 0,
+ 0, 0, 0, 0, 174, 175, 0, 0, 0, 176,
+ 0, 0, 0, 0, 177, 0, 178, 0, 179, 180,
+ 0, 181, 0, 182, 0, 0, 418, 419, 420, 421,
+ 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 0, 0, 0, 0, 432, 1281, 0, 0, 0, 455,
+ 0, 0, 0, 0, 0, 0, 0, 164, 165, 0,
+ 0, 1281, 0, 0, 0, 0, 0, 0, 172, 0,
+ 0, 173, 0, 0, 1739, 0, 110, 287, 0, 0,
+ 1617, 0, 113, 114, 115, 0, 0, 116, 117, 118,
119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 262, 0, 0, 0, 0, 0, 0, 0, 0,
- 136, 137, 138, 0, 0, 0, 0, 0, 0, 141,
- 142, 143, 0, 0, 0, 0, 0, 144, 0, 263,
- 0, 0, 264, 0, 0, 265, 0, 266, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 267,
- 0, 0, 0, 0, 0, 0, 44, 45, 46, 47,
- 48, 0, 0, 0, 52, 0, 0, 55, 0, 0,
- 0, 0, 0, 0, 0, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 631, 389, 390, 0,
- 0, 0, 0, 391, 736, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 147, 0, 0,
- 0, 0, 0, 812, 150, 151, 152, 153, 154, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 155, 407, 0, 0, 0, 157, 0, 0,
- 0, 0, 269, 0, 102, 260, 0, 161, 0, 504,
- 105, 106, 107, 0, 0, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 262, 0, 0,
- 0, 0, 0, 0, 0, 0, 136, 137, 138, 0,
- 0, 0, 0, 0, 0, 141, 142, 143, 0, 0,
- 0, 0, 0, 144, 0, 263, 0, 0, 264, 0,
- 0, 265, 0, 266, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 267, 0, 0, 0, 0,
- 0, 0, 44, 45, 46, 47, 48, 0, 0, 0,
- 52, 0, 0, 55, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 930, 0, 0,
- 0, 391, 0, 147, 0, 0, 0, 0, 0, 0,
- 150, 151, 152, 153, 154, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 155, 407,
- 0, 0, 0, 157, 0, 0, 0, 0, 269, 0,
- 102, 260, 0, 161, 0, 726, 105, 106, 107, 0,
- 0, 108, 109, 110, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 262, 0, 0, 0, 0, 0, 0,
- 0, 0, 136, 137, 138, 0, 0, 0, 0, 0,
- 0, 141, 142, 143, 0, 0, 0, 0, 0, 144,
- 0, 263, 0, 0, 264, 0, 0, 265, 0, 266,
+ 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
+ 289, 1635, 562, 0, 0, 0, 0, 0, 0, 145,
+ 146, 147, 0, 0, 0, 0, 152, 1650, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 157, 158, 159,
+ 0, 0, 0, 7, 8, 160, 1667, 0, 0, 290,
+ 0, 1723, 291, 0, 0, 292, 0, 293, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 294,
+ 0, 0, 0, 0, 455, 455, 48, 49, 50, 51,
+ 52, 0, 0, 0, 0, 56, 0, 0, 59, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 267, 0, 0, 0, 0, 0, 0, 44, 45,
- 46, 47, 48, 0, 0, 0, 52, 0, 0, 55,
- 0, 0, 0, 0, 0, 0, 0, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 1090, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 147,
- 0, 0, 0, 0, 0, 0, 150, 151, 152, 153,
- 154, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 155, 268, 0, 0, 0, 157,
- 0, 0, 0, 0, 269, 0, 102, 260, 0, 161,
- 0, 1212, 105, 106, 107, 0, 0, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 262,
- 0, 0, 0, 0, 0, 0, 0, 0, 136, 137,
- 138, 0, 0, 0, 1022, 0, 0, 141, 142, 143,
- 0, 0, 0, 0, 0, 144, 0, 263, 0, 0,
- 264, 0, 0, 265, 0, 266, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 267, 0, 0,
- 0, 0, 0, 0, 44, 45, 46, 47, 48, 0,
- 0, 0, 52, 0, 0, 55, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 147, 0, 0, 0, 0,
- 0, 0, 150, 151, 152, 153, 154, 0, 0, 0,
+ 0, 0, 455, 0, 0, 0, 455, 659, 24, 25,
+ 660, 27, 28, 661, 30, 662, 32, 0, 33, 1281,
+ 0, 0, 0, 38, 39, 0, 41, 42, 43, 0,
+ 163, 0, 46, 166, 0, 0, 0, 167, 168, 169,
+ 170, 171, 0, 0, 89, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 509,
+ 1469, 0, 0, 432, 176, 0, 67, 68, 69, 511,
+ 0, 0, 0, 0, 180, 0, 254, 560, 0, 562,
+ 0, 418, 419, 420, 421, 422, 423, 424, 425, 426,
+ 427, 428, 704, 430, 431, 0, 0, 0, 826, 432,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 462, 1314, 0, 0, 0, 157, 0, 0, 0, 0,
- 464, 0, 102, 297, 104, 161, 0, 229, 105, 106,
- 107, 0, 0, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 0, 0, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 0, 0, 0,
- 139, 140, 0, 141, 142, 143, 0, 102, 297, 104,
- 0, 144, 145, 105, 106, 107, 0, 0, 108, 109,
- 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 1281, 0, 0, 0, 0, 0, 0, 0, 558, 0,
+ 0, 418, 419, 420, 421, 422, 423, 424, 425, 426,
+ 427, 428, 429, 430, 431, 110, 287, 0, 455, 432,
+ 0, 113, 114, 115, 0, 455, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 0, 0, 0, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 0, 0, 0, 139, 140, 0, 141, 142,
- 143, 0, 0, 0, 0, 0, 144, 145, 0, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 147, 148, 149, 1294, 0, 1295, 0, 150, 151,
- 152, 153, 154, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 155, 156, 0, 0,
- 0, 157, 0, 0, 0, 0, 269, 0, 0, 0,
- 0, 161, 0, 1148, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 147, 148, 149, 0,
- 0, 0, 0, 150, 151, 152, 153, 154, 0, 0,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 289,
+ 0, 0, 0, 0, 0, 0, 0, 0, 145, 146,
+ 147, 0, 455, 0, 0, 152, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 157, 158, 159, 0,
+ 0, 0, 0, 455, 160, 0, 0, 0, 290, 0,
+ 0, 291, 0, 0, 292, 0, 293, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 48, 49, 50, 51, 52,
+ 0, 0, 0, 0, 56, 0, 0, 59, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 704,
+ 430, 431, 0, 0, 0, 0, 432, 418, 419, 420,
+ 421, 422, 423, 424, 425, 426, 427, 428, 429, 430,
+ 431, 0, 0, 0, 917, 432, 0, 0, 0, 163,
+ 0, 0, 166, 0, 0, 0, 167, 168, 169, 170,
+ 171, 0, 0, 89, 1047, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 174, 453,
+ 0, 0, 455, 176, 455, 0, 0, 0, 296, 0,
+ 0, 0, 0, 180, 0, 0, 560, 0, 0, 0,
+ 110, 287, 112, 0, 0, 0, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 289, 0, 0, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 0, 0, 455, 153, 154, 155, 0, 0, 156,
+ 0, 157, 158, 159, 0, 0, 0, 0, 0, 160,
+ 161, 0, 0, 290, 0, 0, 291, 0, 0, 292,
+ 0, 293, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
+ 48, 49, 50, 51, 52, 0, 0, 0, 0, 56,
+ 0, 0, 59, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 430, 431, 0, 0, 0,
+ 0, 432, 0, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 430, 431, 1227, 0, 0,
+ 0, 432, 0, 0, 163, 164, 165, 166, 0, 0,
+ 0, 167, 168, 169, 170, 171, 172, 0, 89, 173,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 155, 156, 0, 0, 0, 157, 0, 0, 0,
- 0, 269, 0, 102, 297, 104, 161, 0, 1330, 105,
- 106, 107, 0, 0, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 0, 0, 0, 130,
- 131, 132, 133, 134, 135, 136, 137, 138, 0, 0,
- 0, 139, 140, 0, 141, 142, 143, 0, 0, 0,
- 0, 0, 144, 145, 0, 0, 102, 260, 0, 0,
- 0, 0, 105, 106, 107, 0, 0, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 262,
- 0, 0, 0, 0, 0, 0, 0, 0, 136, 137,
- 138, 0, 0, 0, 0, 0, 0, 141, 142, 143,
- 0, 0, 0, 0, 0, 144, 0, 263, 0, 0,
- 264, 0, 0, 265, 0, 266, 0, 0, 0, 0,
- 0, 0, 147, 148, 149, 0, 0, 267, 0, 150,
- 151, 152, 153, 154, 44, 45, 46, 47, 48, 0,
- 0, 0, 52, 0, 0, 55, 0, 155, 156, 0,
- 0, 0, 157, 0, 0, 0, 0, 269, 0, 0,
- 0, 0, 161, 0, 1339, 0, 0, 0, 0, 0,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 147, 0, 0, 391, 0,
- 0, 0, 150, 151, 152, 153, 154, 810, 0, 0,
+ 0, 0, 0, 174, 295, 0, 0, 0, 176, 0,
+ 0, 0, 0, 296, 0, 110, 287, 112, 180, 0,
+ 297, 113, 114, 115, 0, 0, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 289,
+ 0, 0, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 0, 0, 0, 153,
+ 154, 155, 0, 0, 156, 0, 157, 158, 159, 0,
+ 0, 0, 0, 0, 160, 161, 0, 0, 290, 0,
+ 0, 291, 0, 0, 292, 0, 293, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 48, 49, 50, 51, 52,
+ 0, 0, 0, 0, 56, 0, 0, 59, 0, 0,
+ 0, 0, 0, 0, 0, 0, 418, 419, 420, 421,
+ 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 0, 0, 0, 0, 432, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 163,
+ 164, 165, 166, 432, 0, 0, 167, 168, 169, 170,
+ 171, 172, 914, 89, 173, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 174, 295,
+ 0, 0, 0, 176, 0, 0, 0, 0, 296, 0,
+ 110, 329, 112, 180, 0, 1496, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 0, 0, 0, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 0, 0, 0, 153, 154, 155, 0, 0, 156,
+ 0, 157, 158, 159, 0, 110, 329, 112, 0, 160,
+ 161, 113, 114, 115, 0, 0, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 0,
+ 0, 0, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 152, 0, 0, 0, 153,
+ 154, 155, 0, 0, 156, 0, 157, 158, 159, 0,
+ 0, 0, 0, 0, 160, 161, 0, 0, 0, 0,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 163, 164, 165, 166, 432, 0,
+ 0, 167, 168, 169, 170, 171, 172, 965, 89, 173,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 155, 407, 0, 0, 0, 157, 102, 297, 104, 0,
- 269, 0, 105, 106, 107, 161, 0, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 0,
- 0, 0, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 0, 0, 0, 139, 140, 0, 141, 142, 143,
- 0, 0, 0, 0, 0, 144, 145, 319, 320, 321,
- 322, 323, 324, 325, 326, 327, 328, 329, 330, 331,
- 332, 333, 334, 335, 336, 337, 338, 339, 340, 341,
- 342, 343, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 350, 351, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 1325, 0, 1326, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 147, 148, 149, 0, 0,
- 0, 0, 150, 151, 152, 153, 154, 0, 0, 0,
- -4, 1, 0, 0, -4, 0, 0, 0, 0, 0,
- 155, 156, -4, -4, 0, 157, 0, 0, 0, 0,
- 269, 0, 0, 0, 0, 161, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -4, -4, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -4, -4,
- -4, 0, 0, -4, 0, 0, 0, -4, -4, 493,
- -4, -4, 0, 0, -4, -4, -4, -4, -4, -4,
- -4, -4, -4, -4, 0, -4, -4, -4, -4, -4,
- -4, -4, -4, -4, -4, -4, -4, 0, -4, -4,
- -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
- -4, -4, -4, -4, -4, 0, 0, 0, -4, -4,
- -4, 0, 0, 0, 0, 0, -4, 6, 0, 0,
- 0, -4, -4, -4, -4, 7, 8, -4, 0, -4,
- 0, -4, -4, -4, -4, -4, -4, -4, -4, -4,
- -4, -4, 0, 0, 0, -4, -4, -4, -4, 0,
- 9, 10, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 11, 12, 13, 0, 0, 14, 0, 0, 0,
- 15, 16, 0, 17, 18, 0, 0, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 0, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
- 0, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 7, 8,
- 0, 58, 59, 60, 0, 0, 0, 0, 0, 61,
- 0, 0, 0, 0, 62, 63, 64, 65, 0, 0,
- 66, 0, 67, 0, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 0, 0, 0, 79, 80,
- 81, 82, 0, 0, 0, 0, 0, 0, 0, 0,
- 593, 20, 21, 594, 23, 24, 595, 26, 596, 28,
- 0, 29, 0, 0, 0, 0, 34, 35, 0, 37,
- 38, 39, 0, 0, 0, 42, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 0, 0, 0, 0,
- 0, 1433, 0, 1434, 0, 0, 0, 0, 63, 64,
- 65, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 0, 0, 855, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 0, 905, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 0, 0, 924, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 0, 0, 948, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 0, 0,
- 1040, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 0, 0, 1292, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 0, 1311, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 0, 0, 1360, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 0, 0, 1361, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 0, 0,
- 1362, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 0, 0, 1363, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 0, 1364, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 0, 0, 1398, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 0, 0, 1449, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 0, 0,
- 1455, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 0, 0, 1456, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 0, 1477, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 0, 0, 1480, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 0, 0, 1483, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 0, 0,
- 1506, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 0, 0, 1509, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 0, 1538, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 0, 0, 1540, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 0, 0, 1542, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 0, 0,
- 1556, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 0, 0, 1576, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 0, 667, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 0, 0, 0, 0,
- 0, 0, 1374, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 723, 0, 0, 0, 0, 674, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 624, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 674, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 675, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 733, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 763, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 771, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 772, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 773, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 887, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 888, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 889, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 920, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 999, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 1038, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 1039, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 1089, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 1252, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 1253, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 1260, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 1414, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 0, 0, 0, 1415, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 0, 0, 0,
- 1419, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 0, 0, 0, 1501, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 0,
- 0, 0, 1504, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 0, 0, 0, 1536, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 712,
- 0, 713, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 0, 0, 0, 0,
- 391, 0, 0, 0, 585, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 738, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
- 389, 390, 0, 0, 0, 0, 391, 0, 0, 0,
- 745, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 750, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 0, 0, 0, 824, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 0, 0, 913,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 0, 0, 0, 391, 0,
- 0, 0, 914, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 0, 0, 918, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 0, 0, 919, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 0,
- 0, 921, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 0, 0, 0, 0,
- 391, 0, 0, 0, 949, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 0, 0, 994, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
- 389, 390, 0, 0, 0, 0, 391, 0, 0, 0,
- 1217, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 0, 0, 1243, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 0, 0, 0, 1387, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 582, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
- 389, 390, 0, 0, 0, 0, 391, 0, 630, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 634,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 0, 0, 0, 391, 0,
- 635, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 637, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 0, 0, 0, 0,
- 391, 0, 639, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 640, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 0, 643, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 644, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 723, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 729, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
- 389, 390, 0, 0, 0, 0, 391, 0, 730, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 731,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 0, 0, 0, 391, 0,
- 737, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 844, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 0, 0, 0, 0,
- 391, 0, 849, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 854, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 0, 857, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 858, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 864, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 871, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
- 389, 390, 0, 0, 0, 0, 391, 0, 872, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 873,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 0, 0, 0, 391, 0,
- 904, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391,
- 0, 906, 377, 378, 379, 380, 381, 382, 383, 384,
- 385, 386, 387, 388, 389, 390, 0, 0, 0, 0,
- 391, 0, 907, 377, 378, 379, 380, 381, 382, 383,
- 384, 385, 386, 387, 388, 389, 390, 0, 0, 0,
- 0, 391, 0, 908, 377, 378, 379, 380, 381, 382,
- 383, 384, 385, 386, 387, 388, 389, 390, 0, 0,
- 0, 0, 391, 0, 912, 377, 378, 379, 380, 381,
- 382, 383, 384, 385, 386, 387, 388, 389, 390, 0,
- 0, 0, 0, 391, 0, 1118, 377, 378, 379, 380,
- 381, 382, 383, 384, 385, 386, 387, 388, 389, 390,
- 0, 0, 0, 0, 391, 0, 1293, 377, 378, 379,
- 380, 381, 382, 383, 384, 385, 386, 387, 388, 389,
- 390, 0, 0, 0, 0, 391, 0, 1310, 377, 378,
- 379, 380, 381, 382, 383, 384, 385, 386, 387, 388,
- 389, 390, 0, 0, 0, 0, 391, 0, 1329, 377,
- 378, 379, 380, 381, 382, 383, 384, 385, 386, 387,
- 388, 389, 390, 0, 0, 0, 0, 391, 0, 1500,
- 377, 378, 379, 380, 381, 382, 383, 384, 385, 386,
- 387, 388, 389, 390, 0, 0, 0, 0, 391, 0,
- 1554, 377, 378, 379, 380, 381, 382, 383, 384, 385,
- 386, 387, 388, 389, 390, 0, 0, 0, 0, 391
- =======
- number is the opposite. If YYTABLE_NINF, syntax error. */
- #define YYTABLE_NINF -464
- =======
- -1, 2, 3, 88, 909, 89, 90, 663, 1377, 1383,
- 898, 1085, 1549, 1750, 899, 1699, 1790, 900, 1752, 901,
- 902, 1089, 336, 423, 176, 402, 91, 678, 434, 1493,
- 1494, 435, 1544, 1060, 1229, 1061, 1232, 712, 715, 718,
- 721, 1405, 1272, 643, 291, 396, 397, 94, 95, 96,
- 97, 98, 99, 100, 292, 990, 1645, 1716, 747, 1429,
- 1432, 1435, 1674, 1678, 1682, 1735, 1738, 1741, 986, 987,
- 1124, 946, 709, 756, 1571, 102, 103, 104, 105, 293,
- 178, 861, 484, 249, 1254, 294, 295, 296, 547, 305,
- 882, 1076, 432, 428, 862, 433, 181, 298
- };
-
- /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule whose
- number is the opposite. If YYTABLE_NINF, syntax error. */
- >>>>>>> upstream/2.10.1+dfsg1
- static const yytype_int16 yytable[] =
- {
- 106, 93, 479, 206, 609, 498, 611, 337, 633, 510,
- 740, 741, 265, 1032, 619, 907, 180, 513, 1446, 211,
- 647, 303, 390, 306, 1362, 183, 257, 179, 1167, 206,
- 187, 202, 200, 201, 880, 1661, 184, 211, 203, 892,
- 1156, 532, 529, 315, 534, 107, 536, 220, 182, 317,
- 221, 782, 338, 222, 268, 1158, 784, 487, 488, 4,
- 786, 788, 297, 1160, 1165, 669, 567, 1259, 569, 1162,
- 670, 322, 325, 1309, 326, 1310, 268, 487, 488, 334,
- 335, 327, 1268, 270, 198, 271, 199, 487, 488, 1668,
- -484, 1501, 1670, 1311, 258, 1312, 487, 488, 259, 269,
- 185, 244, 245, 248, 250, 1147, 256, 487, 488, 646,
- 260, 246, 1313, 501, 1314, 334, 335, 328, 247, 5,
- 502, 313, 329, 1183, 489, 342, 343, 344, 345, 346,
- 347, 348, 349, 350, 351, 352, 353, 354, 355, 356,
- 357, 358, 359, 360, 361, 362, 363, 364, 365, 366,
- 667, 272, 668, 266, 391, 392, 373, 175, 1157, 375,
- 202, 893, 894, 895, 896, 376, 377, 884, 1363, 186,
- 268, 382, 395, 1159, 1066, 533, 530, 1553, 535, 189,
- 537, 1161, 268, 268, 214, 193, 908, 1163, 207, 190,
- 268, 887, 421, 1567, 422, 208, 511, 819, 268, 1033,
- 297, 327, 191, 175, 267, 297, 427, 430, 307, 297,
- 436, 212, 297, 304, 207, 393, 297, 297, 297, 297,
- 188, 885, 297, 297, 297, 1662, 881, 429, 429, 886,
- 733, 734, 897, 531, 316, 429, 297, 339, 908, 340,
- 318, 341, 783, 437, 192, 1165, 175, 785, 871, 874,
- 749, 787, 789, 194, 323, 487, 488, 195, 297, 297,
- 297, 324, 487, 488, 196, 487, 488, 646, 330, 331,
- 332, 333, 297, 297, 204, 334, 335, 487, 488, 487,
- 488, 330, 331, 332, 333, 297, -485, 297, 487, 488,
- 634, 527, 426, 110, 490, 548, 500, 482, 483, 240,
- 334, 335, 487, 488, 735, 491, 1067, 1068, 553, 499,
- 804, 236, 241, 242, 237, 334, 335, 197, 742, 579,
- 297, 297, 811, 205, 487, 488, -486, 136, 137, 138,
- 139, 140, 141, 297, 487, 488, 145, 1460, 209, 580,
- 748, 147, 148, 149, 487, 488, 150, 551, 210, 552,
- 1143, 1701, 334, 335, 487, 488, 327, 155, 487, 488,
- 1166, 268, 268, 268, 268, 268, 268, 297, 268, 268,
- 1441, 268, 268, 632, 1514, 213, 268, 268, 268, 268,
- 268, 487, 488, 487, 488, 215, 610, 622, 612, 613,
- 614, 216, 616, 617, 629, 214, 620, 1516, 297, 1518,
- 624, 625, 626, 627, 637, 217, 429, 429, 429, 429,
- 429, 429, 252, 429, 429, 253, 429, 429, 254, 487,
- 488, 429, 429, 429, 429, 628, 330, 331, 332, 333,
- 218, 487, 488, 1038, 1040, 1526, 297, 219, 487, 488,
- 158, 159, 1773, 223, 646, 334, 335, 1528, 1236, 415,
- 416, 417, 166, 873, 1529, 224, 418, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 549, 416,
- 417, 297, 297, 334, 335, 418, 228, 714, 717, 720,
- 723, 1047, 964, 548, 1437, 238, 825, 395, 395, 413,
- 414, 415, 416, 417, 275, 1302, 1303, 276, 418, 404,
- 405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
- 415, 416, 417, 297, 297, 297, 243, 418, 775, 244,
- 245, 487, 488, 1351, 1352, 268, 1461, 487, 488, 246,
- 872, 875, 330, 331, 332, 333, 255, 1633, 239, 297,
- 671, 738, 739, 1636, 798, 672, 297, 487, 488, 483,
- 251, 334, 335, 1581, 261, 1584, 262, 1587, 487, 488,
- 487, 488, 399, 1639, 400, 1202, 263, 1127, 401, 1129,
- 776, 1131, 674, 1133, 1647, 297, 1649, 675, 826, 827,
- 828, 829, 830, 831, 832, 833, 834, 835, 836, 264,
- 838, 839, 840, 841, 842, 843, 844, 685, 273, 686,
- 848, 850, 851, 330, 331, 332, 333, 330, 331, 332,
- 333, 860, 859, 977, 394, 487, 488, 675, 868, 487,
- 488, 274, 334, 335, 978, 866, 334, 335, 883, 277,
- 867, 1704, 979, 980, 981, 1705, 487, 488, 982, 983,
- 984, 985, 876, 1075, 297, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 549, 416, 417, 1165,
- 487, 488, 1165, 418, 685, 1165, 691, 297, 278, 297,
- 487, 488, 268, 825, 279, 268, 1718, 268, 487, 488,
- 299, 297, 297, 1687, 1237, 399, 1756, 400, 309, 339,
- 675, 570, 921, 526, 1757, 524, 915, 525, 175, 526,
- 1250, 919, 174, 676, 175, 297, 677, 1568, 1569, 48,
- 49, 50, 51, 1570, 1096, 1039, 1041, 429, 56, 685,
- 917, 59, 429, 1046, 1048, 300, 297, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 685, 977, 695, 1733, 418, 1736, 1203, 1739, 229,
- 1572, 1573, 230, 978, 1742, 231, 1570, 232, 399, 301,
- 400, 979, 980, 981, 578, 1165, 302, 982, 983, 984,
- 985, 297, 399, 538, 400, 685, 539, 701, 774, 540,
- 297, 541, 297, 685, 297, 792, 297, 225, 403, 967,
- 226, 297, 227, 308, 297, 233, 973, 1778, 234, 1780,
- 235, 1782, 988, 1091, 1092, 679, 310, 399, 677, 400,
- 297, 1165, 977, 797, 1165, 311, 297, 1165, 312, 314,
- 1165, 268, 399, 978, 400, 367, 368, 849, 1425, 1426,
- 1357, 979, 980, 981, 369, 1242, 1097, 982, 983, 984,
- 985, 685, 1483, 571, 1164, 1049, 297, 1484, 813, 370,
- 814, 268, 297, 268, 268, 371, 1165, 399, 1165, 400,
- 1165, 399, 685, 400, 268, 399, 429, 400, 1059, 399,
- 1227, 400, 372, 374, 1230, 1055, 378, 1057, 1058, 420,
- 1082, 297, 297, 297, 297, 685, 379, 889, 1063, 685,
- 685, 960, 961, 685, 424, 1002, 429, 380, 429, 429,
- 685, 685, 1003, 1004, 381, 685, 268, 1020, 1048, 429,
- 383, 1100, 1101, 685, 1325, 1043, 1103, 1109, 1104, 1110,
- 685, 384, 1140, 297, 297, 685, 297, 1184, 297, 297,
- 1095, 398, 297, 297, 685, 445, 1189, 297, 685, 685,
- 1190, 1191, 458, 459, 460, 419, 450, 463, 464, 465,
- 455, 429, 404, 405, 406, 407, 408, 409, 410, 411,
- 412, 413, 414, 415, 416, 417, 1238, 685, 461, 1192,
- 418, 666, 1413, 685, 1414, 1194, 1102, 456, 462, 685,
- 442, 1195, 466, 506, 507, 447, 1244, 467, 1245, 451,
- 685, 685, 1246, 1247, 512, 468, 457, 519, 520, 685,
- 685, 1248, 1249, 685, 477, 1286, 1371, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 297, 297, 297, 1381, 418, 1382, 474, 1148, 1149,
- 1150, 1576, 297, 469, 1212, 685, 1489, 1450, 1490, 470,
- 327, 1217, 1218, 1219, 1220, 1221, 685, 471, 1505, 108,
- 319, 1228, 1231, 472, 473, 111, 112, 113, 480, 481,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 685, 514, 1506, 297, 1381, 1381, 1527, 1565,
- 492, 142, 143, 144, 1589, 146, 1590, 685, 1607, 1605,
- 1608, 675, 503, 1610, 297, 493, 151, 152, 153, 1265,
- 297, 494, 504, 1546, 154, 1358, 297, 505, 297, 297,
- 1381, 509, 1615, 297, 297, 1227, 297, 1617, 297, 1230,
- 297, 1618, 297, 297, 297, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 1381,
- 297, 1621, 685, 418, 1629, 685, 1489, 1648, 1698, 685,
- 515, 1717, 685, 977, 1719, 297, 1609, 548, 1381, 297,
- 1728, 297, 516, 517, 978, 1338, 518, 685, 645, 1765,
- 521, 550, 979, 980, 981, 1770, 1343, 1771, 982, 983,
- 984, 985, 1381, 1802, 1792, 1803, 522, 157, 523, 528,
- 160, 554, 558, 561, 175, 161, 162, 163, 164, 165,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 268,
- 1324, 560, 565, 418, 566, 167, 168, 568, 577, 582,
- 169, 583, 586, 418, 635, 289, 1360, 1358, 636, 174,
- 173, 1547, 475, 1359, 638, 681, 1364, 297, 682, 698,
- 977, 727, 728, 702, 703, 704, 730, 268, 707, 708,
- 297, 978, 731, 732, 429, 1634, 755, 757, 760, 979,
- 980, 981, 758, 1389, 1592, 982, 983, 984, 985, 767,
- 768, 1386, 773, 777, 779, 780, 781, 802, 805, 977,
- 812, 820, 821, 764, 765, 766, 297, 297, 852, 853,
- 978, 854, 429, 865, 869, 395, 395, 855, 979, 980,
- 981, 856, 857, 1420, 982, 983, 984, 985, 864, 790,
- 870, 878, 879, 863, 297, 1392, 297, 906, 297, 404,
- 405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
- 684, 416, 417, 297, 7, 8, 911, 418, 914, 977,
- 297, 1469, 1637, 916, 297, 818, 918, 940, 297, 922,
- 978, 925, 1465, 1427, 926, 1430, 927, 1433, 979, 980,
- 981, 1472, 1475, 1476, 982, 983, 984, 985, 297, 929,
- 930, 1444, 931, 932, 1447, 1448, 935, 936, 945, 934,
- 949, 1640, 947, 950, 951, 953, 1688, 952, 954, 297,
- 955, 956, 963, 997, 639, 24, 25, 640, 27, 28,
- 641, 30, 642, 32, 970, 33, 971, 977, 1010, 1024,
- 38, 39, 1025, 41, 42, 43, 1011, 1026, 978, 46,
- 1037, 1065, 1027, 1013, 1014, 297, 979, 980, 981, 1015,
- 297, 1035, 982, 983, 984, 985, 1070, 910, 1071, 912,
- 1073, 1714, 1077, 1083, 1074, 1086, 1087, 1090, 1094, 1099,
- 297, 1107, 1113, 67, 68, 69, 1072, 297, 1088, 1114,
- 268, 1118, 1119, 7, 8, 1121, 1122, 1125, 1153, 1126,
- 1135, 1136, 1137, 1138, 1139, 297, 1141, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 297, 1151, 1152, 297, 418, 962, 1154, 395, 1155,
- 1168, 1169, 1174, 1170, 1171, 429, 1172, 1175, 1176, 1758,
- 297, 1177, 1178, 177, 1180, 297, 1181, 1199, 1204, 763,
- 1205, 1207, 1215, 639, 24, 25, 640, 27, 28, 641,
- 30, 642, 32, 1209, 33, 1211, 1213, 1214, 1216, 38,
- 39, 1009, 41, 42, 43, 1222, 1223, 1224, 46, 1225,
- 1016, 1234, 1017, 1226, 1018, 1240, 1019, 297, 1580, 1256,
- 1583, 1022, 1586, 1258, 1023, 1239, 1251, 1261, 1257, 1266,
- 1594, 1267, 1271, 1597, 1269, 1275, 297, 977, 1270, 1276,
- 1277, 1278, 67, 68, 69, 1279, 1281, 1282, 978, 1283,
- 1284, 1289, 1290, 320, 321, 1299, 979, 980, 981, 1300,
- 1117, 1319, 982, 983, 984, 985, 1301, 1307, 1308, 1657,
- 1315, 1320, 1321, 1623, 1322, 1337, 1054, 1627, 1329, 1330,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 297, 1334, 297, 1344, 418, 1345,
- 1350, 1346, 1353, 1354, 1361, 1366, 1367, 1369, 809, 297,
- 1372, 1078, 1079, 1080, 1081, 1373, 1374, 1375, 1385, 1393,
- 1400, 977, 1394, 1395, 1398, 1401, 1667, 1402, 1403, 1407,
- 1669, 1408, 978, 1404, 385, 386, 387, 388, 389, 1760,
- 979, 980, 981, 1409, 1410, 1411, 982, 983, 984, 985,
- 1412, 425, 1415, 1691, 1428, 431, 1431, 1724, 1434, 1438,
- 1442, 1445, 1449, 1452, 1477, 297, 1479, 1120, 1480, 438,
- 440, 443, 444, 268, 446, 440, 448, 449, 1468, 440,
- 452, 453, 1173, 1482, 1491, 1500, 440, 1503, 1481, 1488,
- 1509, 1521, 1504, 1510, 1523, 1512, 1502, 1751, 1513, 1515,
- 297, 1517, 1519, 1524, 476, 1530, 1536, 1541, 1731, 1732,
- 1542, 1543, 1548, 485, 486, 1555, 1559, 268, 429, 268,
- 1560, 1561, 486, 1762, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 415, 416, 417, 1562, 1563,
- 1564, 1788, 418, 1791, 1566, 1588, 1595, 1606, 1611, 268,
- 1625, 1628, 1612, 1619, 1622, 543, 545, 440, 1626, 1642,
- 1630, 977, 429, 1643, 429, 1646, 1655, 555, 556, 557,
- 1666, 559, 978, 1810, 562, 563, 1671, 1673, 564, 1676,
- 979, 980, 981, 1677, 1680, 1681, 982, 983, 984, 985,
- 1684, 1690, 575, 576, 429, 1685, 1712, 1725, 1734, 1706,
- 1737, 1708, 1710, 1726, 1740, 1743, 584, 585, 1745, 587,
- 588, 589, 590, 591, 592, 593, 594, 595, 596, 597,
- 598, 599, 600, 601, 602, 603, 604, 605, 606, 607,
- 608, 1753, 1754, 1774, 1777, 1779, 1759, 1761, 1763, 1772,
- 618, 1781, 1783, 621, 1789, 623, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
- 1804, 1805, 1806, 1764, 418, 644, 1807, 1808, 440, 1809,
- 1811, 648, 649, 650, 651, 652, 653, 654, 655, 656,
- 657, 658, 659, 660, 661, 662, 1658, 680, 664, 665,
- 1557, 1260, 1558, 92, 101, 710, 0, 1368, 1574, 977,
- 0, 1333, 1273, 0, 0, 0, 543, 0, 0, 0,
- 978, 0, 689, 0, 0, 0, 0, 694, 979, 980,
- 981, 0, 699, 700, 982, 983, 984, 985, 705, 706,
- 0, 0, 0, 711, 713, 716, 719, 722, 724, 725,
- 726, 440, 440, 0, 0, 0, 0, 0, 0, 0,
- 0, 1235, 0, 0, 0, 0, 0, 0, 0, 743,
- 744, 745, 385, 386, 746, 0, 0, 0, 750, 751,
- 752, 753, 754, 0, 0, 0, 759, 0, 761, 762,
- 0, 0, 0, 440, 440, 440, 0, 0, 769, 770,
- 771, 584, 772, 7, 8, 0, 0, 0, 778, 0,
- 0, 1795, 0, 0, 0, 0, 0, 0, 0, 440,
- 0, 0, 0, 0, 0, 793, 795, 0, 664, 665,
- 0, 0, 7, 8, 0, 0, 1416, 1417, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 772, 0, 0,
- 0, 0, 0, 0, 817, 440, 0, 0, 0, 0,
- 822, 0, 0, 639, 24, 25, 640, 27, 28, 641,
- 30, 642, 32, 0, 33, 0, 0, 0, 0, 38,
- 39, 0, 41, 42, 43, 0, 0, 0, 46, 0,
- 0, 0, 639, 24, 25, 640, 27, 28, 641, 30,
- 642, 32, 0, 33, 0, 0, 0, 0, 38, 39,
- 877, 41, 42, 43, 0, 0, 0, 46, 0, 0,
- 0, 1241, 67, 68, 69, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 0,
- 0, 0, 0, 418, 905, 977, 0, 440, 0, 440,
- 913, 67, 68, 69, 0, 0, 978, 0, 920, 110,
- 0, 795, 923, 1335, 979, 980, 981, 0, 0, 0,
- 982, 983, 984, 985, 0, 937, 0, 0, 0, 0,
- 0, 0, 0, 0, 943, 0, 0, 0, 810, 0,
- 0, 0, 0, 136, 137, 138, 139, 140, 141, 0,
- 1539, 0, 145, 0, 0, 0, 440, 147, 148, 149,
- 0, 0, 150, 968, 969, 441, 0, 965, 0, 972,
- 441, 0, 0, 155, 441, 0, 0, 0, 0, 0,
- 0, 441, 996, 0, 0, 998, 0, 0, 0, 0,
- 0, 0, 0, 0, 1575, 0, 0, 1796, 0, 0,
- 0, 440, 0, 0, 0, 0, 0, 0, 0, 0,
- 440, 0, 440, 0, 440, 1596, 440, 0, 0, 0,
- 1355, 440, 0, 0, 440, 0, 0, 0, 0, 0,
- 1028, 0, 1030, 1031, 0, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 0,
- 544, 0, 441, 418, 0, 0, 158, 159, 0, 0,
- 0, 0, 0, 0, 1050, 0, 0, 0, 166, 0,
- 0, 0, 1051, 1052, 1053, 0, 440, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 1062, 0, 0, 0, 418, 0, 0, 1064, 0,
- 454, 1069, 0, 426, 110, 0, 0, 0, 0, 0,
- 0, 440, 440, 440, 440, 0, 0, 1356, 1084, 0,
- 0, 0, 0, 0, 478, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1689, 0, 1692, 0, 136, 137,
- 138, 139, 140, 141, 0, 977, 0, 145, 508, 0,
- 0, 0, 147, 148, 149, 0, 978, 150, 0, 0,
- 0, 0, 0, 441, 979, 980, 981, 440, 155, 0,
- 982, 983, 984, 985, 0, 0, 0, 1128, 0, 1130,
- 0, 1132, 0, 1134, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 415, 416, 417, 0, 0,
- 0, 544, 418, 0, 0, 1744, 0, 0, 573, 574,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 581, 0, 0, 0, 418, 0, 0, 0, 0,
- 0, 1179, 0, 0, 1182, 0, 441, 441, 1185, 1478,
- 1186, 1187, 1188, 0, 0, 0, 0, 1797, 1193, 0,
- 0, 158, 159, 0, 0, 615, 0, 0, 0, 0,
- 0, 0, 0, 166, 0, 1208, 0, 1210, 7, 8,
- 0, 0, 0, 0, 0, 0, 0, 0, 441, 441,
- 441, 404, 405, 406, 407, 408, 409, 410, 411, 412,
- 413, 414, 415, 416, 417, 0, 0, 0, 0, 418,
- 0, 1243, 0, 0, 441, 0, 0, 0, 0, 0,
- 0, 796, 0, 1252, 1253, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1262, 1264, 0, 639, 24,
- 25, 640, 27, 28, 641, 30, 642, 32, 0, 33,
- 441, 0, 0, 0, 38, 39, 0, 41, 42, 43,
- 0, 0, 0, 46, 0, 0, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
- 1304, 1305, 1306, 0, 418, 0, 0, 0, 0, 0,
- 1316, 1423, 1318, 1424, 0, 0, 0, 67, 68, 69,
- 0, 0, 0, 1323, 7, 8, 0, 0, 0, 0,
- 0, 440, 0, 404, 405, 406, 407, 408, 409, 410,
- 411, 412, 413, 414, 415, 416, 417, 0, 0, 0,
- 0, 418, 0, 0, 0, 0, 0, 1347, 1348, 1349,
- 0, 0, 441, 0, 441, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 796, 924, 0, 0,
- 0, 1508, 0, 966, 639, 24, 25, 640, 27, 28,
- 641, 30, 642, 32, 1365, 33, 0, 0, 0, 0,
- 38, 39, 0, 41, 42, 43, 0, 0, 1378, 46,
- 0, 0, 0, 1384, 0, 0, 0, 1540, 0, 0,
- 0, 441, 0, 0, 0, 0, 1390, 1391, 0, 0,
- 0, 0, 0, 1396, 1397, 0, 0, 1654, 1399, 0,
- 0, 0, 0, 67, 68, 69, 1406, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 440, 440, 1418, 0,
- 1419, 0, 890, 0, 0, 0, 441, 0, 0, 0,
- 0, 0, 1436, 0, 0, 441, 0, 441, 0, 441,
- 0, 441, 0, 1713, 440, 0, 441, 0, 440, 441,
- 0, 1451, 0, 0, 0, 0, 1453, 1454, 1455, 1456,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1464,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1474,
- 0, 0, 0, 944, 0, 0, 0, 0, 0, 0,
- 0, 1697, 0, 0, 0, 0, 1485, 1486, 0, 0,
- 0, 441, 0, 0, 1492, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 0,
- 0, 0, 0, 418, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 441, 441, 441, 441,
- 1511, 404, 405, 406, 407, 408, 409, 410, 411, 412,
- 413, 414, 415, 416, 417, 0, 0, 0, 1525, 418,
- 543, 404, 405, 406, 407, 408, 409, 410, 411, 412,
- 413, 414, 415, 416, 417, 1537, 0, 1538, 0, 418,
- 440, 0, 0, 0, 0, 0, 0, 1545, 1036, 0,
- 0, 0, 441, 0, 1044, 0, 0, 0, 0, 0,
- 0, 1550, 0, 0, 0, 0, 1554, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 0, 548, 0, 440, 418, 0, 0, 0, 0,
- 1056, 1579, 0, 1582, 0, 1585, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 440, 0, 0, 0, 1598,
- 1599, 1600, 1601, 1602, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 415, 416, 417, 1613, 1614,
- 0, 0, 418, 1616, 0, 0, 0, 0, 0, 806,
- 0, 0, 0, 1620, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1631, 0, 0, 0, 0, 0,
- 0, 1105, 1106, 0, 1108, 0, 1111, 1112, 0, 0,
- 1115, 1116, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 1656, 0, 0, 0, 418, 1384,
- 0, 0, 0, 0, 0, 0, 1664, 0, 0, 0,
+ 0, 0, 0, 174, 175, 0, 0, 0, 176, 0,
+ 0, 0, 0, 296, 0, 0, 0, 0, 180, 0,
+ 1289, 0, 0, 0, 0, 418, 419, 420, 421, 422,
+ 423, 424, 425, 426, 427, 428, 429, 430, 431, 163,
+ 164, 165, 166, 432, 0, 0, 167, 168, 169, 170,
+ 171, 172, 1018, 89, 173, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 174, 175,
+ 0, 0, 0, 176, 0, 0, 0, 0, 296, 0,
+ 110, 329, 112, 180, 1149, 1489, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 0, 0, 0, 139, 140, 141,
+ 142, 143, 144, 145, 146, 147, 148, 149, 150, 151,
+ 152, 0, 0, 0, 153, 154, 155, 0, 0, 156,
+ 0, 157, 158, 159, 0, 0, 0, 0, 0, 160,
+ 161, 0, 0, 0, 0, 0, 320, 112, 0, 0,
+ 0, 0, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 0, 0, 0, 0,
+ 432, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 139, 140, 141, 142, 143, 144, 0, 0,
+ 0, 148, 149, 150, 151, 0, 0, 0, 0, 153,
+ 154, 155, 0, 0, 156, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 161, 0, 0, 0, 0,
+ 0, 0, 0, 0, 163, 164, 165, 166, 0, 0,
+ 0, 167, 168, 169, 170, 171, 172, 0, 89, 173,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1675, 891, 0, 1679, 0, 0, 1683, 0, 0, 0,
- 1686, 0, 0, 0, 440, 0, 440, 1693, 1694, 1695,
- 1696, 0, 0, 0, 0, 0, 0, 1700, 0, 0,
- 1702, 0, 0, 0, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 684, 416, 417, 1021, 1196,
- 1197, 1198, 418, 0, 0, 0, 0, 0, 0, 0,
- 1206, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1730, 0, 1201, 0, 0, 0, 441, 0, 0, 0,
- 0, 0, 0, 0, 0, 440, 0, 1746, 1747, 1748,
- 1749, 404, 405, 406, 407, 408, 409, 410, 411, 412,
- 413, 414, 415, 416, 417, 0, 0, 0, 0, 418,
- 0, 0, 0, 1255, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1775, 1776, 0, 0, 0, 0, 0,
- 0, 0, 1274, 1784, 1785, 1786, 1787, 0, 1280, 0,
- 0, 0, 0, 0, 1285, 0, 1287, 1288, 0, 0,
- 0, 1291, 1292, 0, 1293, 0, 1294, 0, 1295, 0,
- 1296, 1297, 1298, 404, 405, 406, 407, 408, 409, 410,
- 411, 412, 413, 414, 415, 416, 417, 0, 1317, 1123,
- 0, 418, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1328, 0, 0, 0, 1332, 0, 0,
- 0, 441, 441, 0, 0, 0, 0, 0, 0, 0,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 0, 0, 0, 418, 441,
- 0, 0, 0, 441, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 415, 416, 417, 0, 0,
- 0, 0, 418, 0, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 415, 416, 417, 0, 0,
- 0, 0, 418, 0, 0, 1376, 0, 0, 0, 0,
- 0, 0, 0, 108, 109, 110, 0, 0, 1388, 111,
- 112, 113, 0, 0, 114, 115, 116, 117, 118, 119,
+ 0, 0, 0, 174, 175, 0, 0, 0, 176, 0,
+ 0, 0, 0, 296, 0, 110, 287, 288, 180, 0,
+ 1499, 113, 114, 115, 0, 0, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 0, 0, 0, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 0, 7, 8, 147, 148, 149, 0, 0, 150, 0,
- 151, 152, 153, 0, 0, 544, 0, 0, 154, 155,
- 0, 0, 0, 0, 1255, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 441, 0, 0, 0, 0,
- 0, 1457, 441, 0, 0, 0, 0, 0, 1466, 0,
- 0, 0, 1467, 0, 0, 0, 1471, 0, 0, 0,
- 0, 639, 24, 25, 640, 27, 28, 641, 30, 642,
- 32, 0, 33, 0, 0, 0, 1487, 38, 39, 441,
- 41, 42, 43, 0, 0, 0, 46, 0, 0, 0,
- 0, 0, 0, 0, 0, 156, 0, 1255, 0, 0,
- 441, 157, 158, 159, 160, 0, 0, 0, 0, 161,
- 162, 163, 164, 165, 166, 0, 0, 0, 0, 0,
- 67, 68, 69, 0, 0, 0, 0, 0, 0, 167,
- 168, 0, 0, 1522, 169, 0, 0, 0, 0, 170,
- 0, 171, 0, 172, 173, 0, 174, 0, 175, 0,
- 108, 319, 0, 0, 0, 0, 111, 112, 113, 0,
- 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 1255, 0, 0, 989, 0, 0, 0,
- 0, 0, 142, 143, 144, 0, 146, 0, 0, 1255,
- 0, 0, 0, 0, 0, 0, 0, 151, 152, 153,
- 0, 0, 0, 0, 0, 154, 108, 280, 1591, 441,
- 0, 441, 111, 112, 113, 0, 0, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 282,
- 0, 0, 0, 0, 0, 0, 0, 0, 142, 143,
- 144, 0, 146, 0, 0, 1624, 0, 0, 0, 0,
- 0, 0, 0, 151, 152, 153, 0, 0, 0, 0,
- 0, 154, 0, 0, 1641, 283, 0, 0, 284, 0,
- 441, 285, 0, 286, 0, 0, 0, 0, 157, 0,
- 0, 160, 0, 0, 0, 287, 161, 162, 163, 164,
- 165, 0, 48, 49, 50, 51, 52, 0, 0, 0,
- 0, 56, 0, 0, 59, 0, 495, 496, 0, 0,
- 0, 169, 0, 0, 0, 0, 497, 0, 0, 0,
- 0, 173, 0, 247, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1255, 0, 0,
- 0, 0, 0, 0, 157, 0, 0, 160, 0, 0,
- 0, 0, 161, 162, 163, 164, 165, 0, 404, 405,
- 406, 407, 408, 409, 410, 411, 412, 413, 414, 415,
- 416, 417, 495, 1443, 0, 0, 418, 169, 0, 0,
- 0, 0, 497, 1458, 0, 1459, 0, 173, 0, 247,
- 546, 108, 280, 0, 0, 0, 0, 111, 112, 113,
- 0, 0, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 282, 0, 0, 0, 1255, 0,
- 0, 0, 0, 142, 143, 144, 0, 146, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 151, 152,
- 153, 0, 0, 0, 0, 0, 154, 0, 0, 0,
- 283, 0, 0, 284, 0, 0, 285, 0, 286, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 287, 0, 0, 0, 0, 0, 0, 48, 49, 50,
- 51, 52, 0, 0, 0, 0, 56, 0, 0, 59,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 0, 0, 0, 418, 0,
- 0, 0, 0, 0, 0, 1577, 0, 1578, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 157,
- 0, 0, 160, 0, 0, 0, 0, 161, 162, 163,
- 164, 165, 404, 405, 406, 407, 408, 409, 410, 411,
- 412, 413, 414, 415, 416, 417, 0, 167, 439, 0,
- 418, 0, 169, 0, 0, 0, 0, 289, 0, 888,
- 0, 0, 173, 0, 0, 546, 108, 280, 110, 0,
- 0, 0, 111, 112, 113, 0, 0, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 282,
- 0, 0, 136, 137, 138, 139, 140, 141, 142, 143,
- 144, 145, 146, 0, 0, 0, 147, 148, 149, 0,
- 0, 150, 0, 151, 152, 153, 0, 0, 0, 0,
- 0, 154, 155, 0, 0, 283, 0, 0, 284, 0,
- 0, 285, 0, 286, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 287, 0, 0, 0, 0,
- 0, 0, 48, 49, 50, 51, 52, 0, 0, 0,
- 0, 56, 0, 0, 59, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 0,
- 0, 0, 0, 418, 0, 0, 0, 0, 0, 0,
- 0, 0, 939, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 157, 158, 159, 160, 0, 0,
- 0, 0, 161, 162, 163, 164, 165, 166, 404, 405,
- 406, 407, 408, 409, 410, 411, 412, 413, 414, 415,
- 416, 417, 167, 288, 0, 0, 418, 169, 791, 0,
- 0, 0, 289, 736, 108, 280, 110, 173, 0, 290,
- 111, 112, 113, 0, 0, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 282, 0, 0,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 0, 0, 0, 147, 148, 149, 0, 0, 150,
- 0, 151, 152, 153, 0, 0, 0, 0, 0, 154,
- 155, 0, 0, 283, 0, 0, 284, 0, 0, 285,
- 0, 286, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 287, 0, 0, 0, 0, 0, 0,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 289,
+ 164, 165, 0, 0, 0, 0, 0, 0, 145, 146,
+ 147, 172, 0, 89, 173, 152, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 157, 158, 159, 0,
+ 0, 0, 0, 0, 160, 0, 0, 0, 290, 0,
+ 0, 291, 0, 0, 292, 0, 293, 440, 112, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 48, 49, 50, 51, 52,
+ 0, 0, 0, 0, 56, 0, 0, 59, 0, 0,
+ 0, 0, 0, 139, 140, 141, 142, 143, 144, 0,
+ 0, 0, 148, 149, 150, 151, 0, 0, 0, 0,
+ 153, 154, 155, 0, 0, 156, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 161, 0, 0, 163,
+ 0, 0, 166, 0, 0, 0, 167, 168, 169, 170,
+ 171, 0, 0, 89, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 174, 295,
+ 0, 0, 432, 176, 811, 0, 0, 0, 296, 756,
+ 110, 287, 1352, 180, 0, 297, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 289, 0, 0, 0, 0, 0,
+ 0, 164, 165, 145, 146, 147, 0, 0, 0, 0,
+ 152, 0, 172, 0, 89, 173, 0, 0, 0, 0,
+ 0, 157, 158, 159, 0, 0, 0, 0, 0, 160,
+ 0, 0, 0, 290, 0, 0, 291, 0, 0, 292,
+ 0, 293, 323, 112, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
48, 49, 50, 51, 52, 0, 0, 0, 0, 56,
- 0, 0, 59, 404, 405, 406, 407, 408, 409, 410,
- 411, 412, 413, 414, 415, 416, 417, 0, 0, 0,
- 0, 418, 0, 0, 0, 0, 0, 0, 0, 0,
- 992, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 157, 158, 159, 160, 0, 0, 0, 0,
- 161, 162, 163, 164, 165, 166, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
- 167, 288, 0, 0, 418, 169, 0, 0, 0, 0,
- 289, 673, 108, 319, 110, 173, 0, 1470, 111, 112,
- 113, 0, 0, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 135, 0, 0, 0, 136, 137,
- 138, 139, 140, 141, 142, 143, 144, 145, 146, 0,
- 0, 0, 147, 148, 149, 0, 0, 150, 0, 151,
- 152, 153, 0, 108, 319, 110, 0, 154, 155, 111,
- 112, 113, 0, 0, 114, 115, 116, 117, 118, 119,
+ 0, 0, 59, 0, 0, 0, 0, 0, 139, 140,
+ 141, 142, 143, 144, 0, 0, 0, 148, 149, 150,
+ 151, 0, 0, 0, 0, 153, 154, 155, 0, 0,
+ 156, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 161, 0, 0, 163, 0, 0, 166, 0, 0,
+ 0, 167, 168, 169, 170, 171, 0, 0, 89, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 174, 295, 0, 0, 432, 176, 0,
+ 0, 0, 0, 296, 693, 110, 287, 0, 180, 0,
+ 1353, 113, 114, 115, 0, 0, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 0, 0, 0, 136,
- 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
- 0, 0, 0, 147, 148, 149, 0, 0, 150, 0,
- 151, 152, 153, 0, 0, 0, 0, 0, 154, 155,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 0, 0, 0, 418, 0,
- 157, 158, 159, 160, 0, 0, 0, 1012, 161, 162,
- 163, 164, 165, 166, 404, 405, 406, 407, 408, 409,
- 410, 411, 412, 413, 414, 415, 416, 417, 167, 168,
- 0, 0, 418, 169, 0, 0, 0, 0, 289, 0,
- 0, 1042, 0, 173, 0, 1263, 0, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 157, 158, 159, 160, 418, 0, 630, 0, 161,
- 162, 163, 164, 165, 166, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 167,
- 168, 0, 0, 418, 169, 0, 0, 0, 0, 289,
- 736, 108, 319, 110, 173, 0, 1463, 111, 112, 113,
- 0, 0, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 0, 0, 0, 136, 137, 138,
- 139, 140, 141, 142, 143, 144, 145, 146, 0, 7,
- 8, 147, 148, 149, 0, 0, 150, 0, 151, 152,
- 153, 0, 0, 0, 0, 0, 154, 155, 404, 405,
- 406, 407, 408, 409, 410, 411, 412, 413, 414, 415,
- 416, 417, 0, 0, 0, 0, 418, 0, 0, 0,
- 0, 0, 0, 0, 0, 1146, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 639,
- 24, 25, 640, 27, 28, 641, 30, 642, 32, 0,
- 33, 0, 0, 0, 0, 38, 39, 0, 41, 42,
- 43, 0, 0, 0, 46, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 157,
- 158, 159, 160, 418, 0, 683, 0, 161, 162, 163,
- 164, 165, 166, 0, 0, 0, 0, 0, 67, 68,
- 69, 0, 0, 0, 0, 0, 0, 167, 168, 0,
- 0, 0, 169, 0, 0, 0, 0, 289, 0, 108,
- 280, 281, 173, 0, 1473, 111, 112, 113, 0, 0,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 282, 0, 0, 0, 0, 0, 0, 0,
- 0, 142, 143, 144, 1029, 146, 0, 0, 0, 7,
- 8, 0, 0, 0, 0, 0, 151, 152, 153, 0,
- 0, 0, 0, 0, 154, 0, 0, 0, 283, 0,
- 0, 284, 0, 0, 285, 0, 286, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 287, 0,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 289,
+ 0, 0, 0, 0, 0, 0, 164, 165, 145, 146,
+ 147, 0, 0, 0, 0, 152, 0, 172, 0, 0,
+ 173, 0, 0, 0, 0, 0, 157, 158, 159, 0,
+ 0, 0, 0, 0, 160, 0, 0, 0, 290, 0,
+ 0, 291, 0, 0, 292, 0, 293, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
0, 0, 0, 0, 0, 48, 49, 50, 51, 52,
- 0, 0, 0, 0, 56, 0, 0, 59, 0, 639,
- 24, 25, 640, 27, 28, 641, 30, 642, 32, 0,
- 33, 0, 0, 0, 0, 38, 39, 0, 41, 42,
- 43, 0, 0, 0, 46, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 157, 0, 0,
- 160, 0, 0, 0, 0, 161, 162, 163, 164, 165,
- 0, 0, 0, 0, 0, 0, 0, 0, 67, 68,
- 69, 0, 0, 0, 0, 167, 288, 0, 0, 0,
- 169, 0, 0, 0, 0, 289, 0, 108, 280, 1326,
- 173, 0, 290, 111, 112, 113, 0, 0, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 282, 0, 0, 0, 0, 0, 0, 0, 0, 142,
- 143, 144, 0, 146, 1034, 0, 0, 7, 8, 0,
- 0, 0, 0, 0, 151, 152, 153, 0, 0, 0,
- 0, 0, 154, 0, 0, 0, 283, 0, 0, 284,
- 0, 0, 285, 0, 286, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 287, 0, 0, 0,
- 0, 0, 0, 48, 49, 50, 51, 52, 0, 0,
- 0, 0, 56, 0, 0, 59, 0, 639, 24, 25,
- 640, 27, 28, 641, 30, 642, 32, 0, 33, 0,
- 0, 0, 0, 38, 39, 0, 41, 42, 43, 0,
- 0, 0, 46, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 157, 0, 0, 160, 0,
- 0, 0, 0, 161, 162, 163, 164, 165, 0, 0,
- 0, 0, 0, 0, 0, 0, 67, 68, 69, 0,
- 0, 0, 0, 167, 288, 0, 0, 0, 169, 0,
- 0, 0, 0, 289, 0, 108, 280, 0, 173, 0,
- 1327, 111, 112, 113, 0, 0, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 282, 0,
- 0, 0, 0, 0, 0, 0, 0, 142, 143, 144,
- 0, 146, 1142, 0, 0, 7, 8, 0, 0, 0,
- 0, 0, 151, 152, 153, 0, 0, 0, 0, 0,
- 154, 0, 0, 0, 283, 0, 0, 284, 0, 0,
- 285, 0, 286, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 287, 0, 0, 0, 0, 0,
- 0, 48, 49, 50, 51, 52, 0, 0, 0, 0,
- 56, 0, 0, 59, 0, 639, 24, 25, 640, 27,
- 28, 641, 30, 642, 32, 0, 33, 0, 0, 0,
- 0, 38, 39, 0, 41, 42, 43, 0, 0, 0,
- 46, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 157, 0, 0, 160, 0, 0, 0,
- 0, 161, 162, 163, 164, 165, 0, 0, 0, 0,
- 0, 0, 0, 0, 67, 68, 69, 0, 0, 0,
- 0, 167, 288, 0, 0, 0, 169, 0, 0, 0,
- 0, 289, 0, 108, 280, 0, 173, 0, 290, 111,
- 112, 113, 0, 0, 114, 115, 116, 117, 118, 119,
+ 0, 0, 0, 0, 56, 0, 0, 59, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 0, 0, 0, 0, 432, 0, 0, 0,
+ 0, 0, 0, 1449, 0, 1450, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 163,
+ 0, 0, 166, 0, 0, 0, 167, 168, 169, 170,
+ 171, 0, 0, 89, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 174, 295,
+ 0, 0, 432, 176, 0, 0, 0, 0, 296, 756,
+ 110, 287, 0, 180, 0, 297, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 289, 0, 0, 0, 0, 0,
+ 0, 0, 0, 145, 146, 147, 0, 0, 0, 0,
+ 152, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 157, 158, 159, 0, 0, 0, 0, 0, 160,
+ 0, 0, 0, 290, 0, 0, 291, 0, 0, 292,
+ 0, 293, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
+ 48, 49, 50, 51, 52, 0, 0, 0, 0, 56,
+ 0, 0, 59, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 430, 431, 0, 0, 0,
+ 0, 432, 0, 0, 0, 0, 0, 0, 1484, 0,
+ 1485, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 163, 0, 0, 166, 0, 0,
+ 0, 167, 168, 169, 170, 171, 0, 0, 89, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 174, 453, 0, 0, 432, 176, 0,
+ 0, 0, 0, 296, 757, 110, 287, 0, 180, 0,
+ 556, 113, 114, 115, 0, 0, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 135, 282, 0, 0, 0,
- 0, 0, 0, 0, 0, 142, 143, 144, 0, 146,
- 1644, 0, 0, 7, 8, 0, 0, 0, 0, 0,
- 151, 152, 153, 0, 0, 0, 0, 0, 154, 0,
- 0, 0, 283, 0, 0, 284, 0, 0, 285, 0,
- 286, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 287, 0, 0, 0, 0, 0, 0, 48,
- 49, 50, 51, 52, 0, 0, 0, 0, 56, 0,
- 0, 59, 0, 639, 24, 25, 640, 27, 28, 641,
- 30, 642, 32, 0, 33, 0, 0, 0, 0, 38,
- 39, 0, 41, 42, 43, 0, 0, 0, 46, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 157, 0, 0, 160, 0, 0, 0, 0, 161,
- 162, 163, 164, 165, 0, 0, 0, 0, 0, 0,
- 0, 0, 67, 68, 69, 0, 0, 0, 0, 167,
- 439, 0, 0, 0, 169, 0, 0, 0, 0, 289,
- 0, 108, 280, 0, 173, 0, 542, 111, 112, 113,
- 0, 0, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 282, 0, 0, 0, 0, 0,
- 0, 0, 0, 142, 143, 144, 0, 146, 1715, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 151, 152,
- 153, 0, 0, 0, 0, 0, 154, 0, 0, 0,
- 283, 0, 0, 284, 0, 0, 285, 0, 286, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 287, 0, 0, 0, 0, 0, 0, 48, 49, 50,
- 51, 52, 0, 0, 0, 0, 56, 0, 0, 59,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 0, 0, 0, 418, 0,
- 0, 0, 0, 0, 0, 0, 0, 1421, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 157,
- 0, 0, 160, 0, 0, 0, 0, 161, 162, 163,
- 164, 165, 404, 405, 406, 407, 408, 409, 410, 411,
- 412, 413, 414, 415, 416, 417, 0, 167, 439, 0,
- 418, 0, 169, 0, 0, 0, 0, 289, 572, 108,
- 280, 0, 173, 0, 794, 111, 112, 113, 0, 0,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 282, 0, 0, 0, 0, 0, 0, 0,
- 0, 142, 143, 144, 0, 146, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 151, 152, 153, 0,
- 0, 0, 0, 0, 154, 0, 0, 0, 283, 0,
- 0, 284, 0, 0, 285, 0, 286, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 287, 0,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 289,
+ 0, 0, 0, 0, 0, 0, 0, 0, 145, 146,
+ 147, 0, 0, 0, 0, 152, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 157, 158, 159, 0,
+ 0, 0, 0, 0, 160, 0, 0, 0, 290, 0,
+ 0, 291, 0, 0, 292, 0, 293, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
0, 0, 0, 0, 0, 48, 49, 50, 51, 52,
- 0, 0, 0, 0, 56, 0, 0, 59, 404, 405,
- 406, 407, 408, 409, 410, 411, 412, 413, 414, 415,
- 416, 417, 0, 0, 0, 0, 418, 0, 0, 0,
- 0, 0, 0, 0, 0, 1440, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 157, 0, 0,
- 160, 0, 0, 0, 0, 161, 162, 163, 164, 165,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 167, 288, 0, 418, 0,
- 169, 0, 0, 0, 0, 289, 729, 108, 280, 0,
- 173, 0, 1331, 111, 112, 113, 0, 0, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 282, 0, 0, 0, 0, 0, 0, 0, 0, 142,
- 143, 144, 0, 146, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 151, 152, 153, 0, 0, 0,
- 0, 0, 154, 0, 0, 0, 283, 0, 0, 284,
- 0, 0, 285, 0, 286, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 287, 0, 0, 0,
- 0, 0, 0, 48, 49, 50, 51, 52, 0, 0,
- 0, 0, 56, 0, 0, 59, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
- 0, 0, 0, 0, 418, 0, 0, 0, 0, 0,
- 0, 0, 0, 1495, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 157, 0, 0, 160, 0,
- 0, 0, 0, 161, 162, 163, 164, 165, 404, 405,
- 406, 407, 408, 409, 410, 411, 412, 413, 414, 415,
- 416, 417, 0, 495, 1443, 0, 418, 0, 169, 0,
- 0, 0, 0, 497, 1507, 108, 319, 110, 173, 0,
- 247, 111, 112, 113, 0, 0, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 0, 0,
- 0, 136, 137, 138, 139, 140, 141, 142, 143, 144,
- 145, 146, 0, 0, 0, 147, 148, 149, 0, 0,
- 150, 0, 151, 152, 153, 0, 0, 0, 0, 0,
- 154, 155, 404, 405, 406, 407, 408, 409, 410, 411,
- 412, 413, 414, 415, 416, 417, 0, 0, 0, 0,
- 418, 0, 0, 0, 0, 0, 0, 0, 0, 1496,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 0, 0, 0, 418, 0,
- 0, 0, 0, 0, 0, 0, 0, 1497, 0, 0,
- 404, 405, 406, 407, 408, 409, 410, 411, 412, 413,
- 414, 415, 416, 417, 0, 0, 0, 0, 418, 0,
- 0, 0, 0, 157, 158, 159, 160, 1498, 0, 0,
- 0, 161, 162, 163, 164, 165, 166, 404, 405, 406,
- 407, 408, 409, 410, 411, 412, 413, 414, 415, 416,
- 417, 167, 168, 0, 0, 418, 169, 108, 280, 0,
- 0, 289, 737, 111, 112, 113, 173, 0, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 282, 0, 0, 0, 0, 0, 0, 0, 0, 142,
- 143, 144, 0, 146, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 151, 152, 153, 0, 0, 0,
- 0, 0, 154, 0, 0, 0, 283, 0, 0, 284,
- 0, 0, 285, 0, 286, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 287, 0, 0, 0,
+ 0, 0, 0, 0, 56, 0, 0, 59, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 0, 0, 0, 0, 432, 0, 0, 0,
+ 0, 0, 0, 1603, 0, 1604, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 163,
+ 0, 0, 166, 0, 0, 0, 167, 168, 169, 170,
+ 171, 0, 0, 89, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 174, 453,
+ 0, 0, 432, 176, 0, 0, 0, 0, 296, 823,
+ 110, 287, 0, 180, 0, 814, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 289, 0, 0, 0, 0, 0,
+ 0, 0, 0, 145, 146, 147, 0, 0, 0, 0,
+ 152, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 157, 158, 159, 0, 0, 0, 0, 0, 160,
+ 0, 0, 0, 290, 0, 0, 291, 0, 0, 292,
+ 0, 293, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 294, 0, 0, 0, 0, 0, 0,
+ 48, 49, 50, 51, 52, 0, 0, 0, 0, 56,
+ 0, 0, 59, 418, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 429, 430, 431, 0, 0, 0,
+ 0, 432, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1038, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 163, 0, 0, 166, 0, 0,
+ 0, 167, 168, 169, 170, 171, 0, 0, 89, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 174, 295, 0, 0, 432, 176, 0,
+ 0, 0, 0, 296, 859, 110, 287, 0, 180, 0,
+ 1357, 113, 114, 115, 0, 0, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 135, 136, 137, 138, 289,
+ 0, 0, 0, 0, 0, 0, 0, 0, 145, 146,
+ 147, 0, 0, 0, 0, 152, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 157, 158, 159, 0,
+ 0, 0, 0, 0, 160, 0, 0, 0, 290, 0,
+ 0, 291, 0, 0, 292, 0, 293, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
+ 0, 0, 0, 0, 0, 48, 49, 50, 51, 52,
+ 0, 0, 0, 0, 56, 0, 0, 59, 418, 419,
+ 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
+ 430, 431, 0, 0, 0, 0, 432, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1068, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 163,
+ 0, 0, 166, 0, 0, 0, 167, 168, 169, 170,
+ 171, 0, 0, 89, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 509, 1469,
+ 0, 0, 432, 176, 0, 0, 0, 0, 511, 867,
+ 110, 329, 0, 180, 0, 254, 113, 114, 115, 0,
+ 0, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 137, 138, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 145, 146, 147, 0, 0, 0, 0,
+ 152, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 157, 158, 159, 110, 329, 112, 0, 0, 160,
+ 113, 114, 115, 0, 0, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, 136, 137, 138, 0, 0,
+ 0, 139, 140, 141, 142, 143, 144, 145, 146, 147,
+ 148, 149, 150, 151, 152, 0, 0, 0, 153, 154,
+ 155, 0, 0, 156, 0, 157, 158, 159, 0, 0,
+ 0, 0, 0, 160, 161, 0, 0, 0, 0, 0,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 163, 0, 0, 166, 432, 0,
+ 0, 167, 168, 169, 170, 171, 0, 1172, 89, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 509, 510, 0, 0, 432, 176, 0,
+ 0, 0, 0, 511, 0, 0, 1447, 0, 180, 0,
+ 254, 0, 0, 0, 418, 419, 420, 421, 422, 423,
+ 424, 425, 426, 427, 428, 429, 430, 431, 163, 164,
+ 165, 166, 432, 0, 0, 167, 168, 169, 170, 171,
+ 172, 1466, 89, 173, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 174, 175, 0,
+ 0, 0, 176, 110, 287, 0, 0, 296, 0, 113,
+ 114, 115, 180, 0, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 135, 136, 137, 138, 289, 0, 0,
+ 0, 0, 0, 0, 0, 0, 145, 146, 147, 0,
+ 0, 0, 0, 152, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 157, 158, 159, 0, 0, 0,
+ 0, 0, 160, 0, 0, 0, 290, 0, 0, 291,
+ 0, 0, 292, 0, 293, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 294, 0, 0, 0,
0, 0, 0, 48, 49, 50, 51, 52, 0, 0,
- 0, 0, 56, 0, 0, 59, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
- 0, 0, 0, 0, 418, 0, 0, 0, 0, 0,
- 0, 0, 0, 1499, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 157, 0, 0, 160, 0,
- 0, 0, 0, 161, 162, 163, 164, 165, 0, 404,
- 405, 406, 407, 408, 409, 410, 411, 412, 413, 414,
- 415, 416, 417, 167, 439, 0, 0, 418, 169, 108,
- 319, 0, 0, 289, 803, 111, 112, 113, 173, 0,
- 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 142, 143, 144, 0, 146, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 151, 152, 153, 0,
- 0, 0, 0, 0, 154, 404, 405, 406, 407, 408,
- 409, 410, 411, 412, 413, 414, 415, 416, 417, 0,
- 0, 0, 0, 418, 0, 0, 0, 0, 0, 0,
- 0, 0, 1531, 404, 405, 406, 407, 408, 409, 410,
- 411, 412, 413, 414, 415, 416, 417, 0, 0, 0,
- 0, 418, 0, 0, 0, 0, 0, 0, 0, 0,
- 1593, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, -4, 1, 0, 0, -4, 0, 0, 0,
- 0, 0, 0, 0, -4, -4, 0, 157, 0, 0,
- 160, 0, 0, 0, 0, 161, 162, 163, 164, 165,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, -4,
- -4, 0, 0, 0, 0, 167, 168, 0, 0, 0,
- 169, 0, -4, -4, -4, 289, 0, 0, -4, -4,
- 173, -4, 0, 0, 0, -4, -4, 0, -4, -4,
+ 0, 0, 56, 0, 0, 59, 418, 419, 420, 421,
+ 422, 423, 424, 425, 426, 427, 428, 429, 430, 431,
+ 0, 0, 0, 0, 432, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1521, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 163, 0, 0,
+ 166, 0, 0, 0, 167, 168, 169, 170, 171, 0,
+ 0, 89, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 174, 453, 0, 0,
+ 432, 176, 110, 329, 0, 0, 296, 868, 113, 114,
+ 115, 180, 0, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 135, 136, 137, 138, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 145, 146, 147, 0, 0,
+ 0, 0, 152, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 157, 158, 159, 0, 0, 0, 0,
+ 0, 160, 418, 419, 420, 421, 422, 423, 424, 425,
+ 426, 427, 428, 429, 430, 431, 0, 0, 0, 0,
+ 432, 0, 0, 0, 0, 0, 0, 0, 0, 1522,
+ 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
+ 428, 429, 430, 431, 0, 0, 0, 0, 432, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1523, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, -4, 1,
+ 0, 0, -4, 0, 0, 0, 0, 0, 0, 0,
+ -4, -4, 0, 0, 0, 0, 163, 0, 0, 166,
+ 0, 0, 0, 167, 168, 169, 170, 171, 0, 0,
+ 89, 0, 0, 0, 0, 0, -4, -4, 0, 0,
+ 0, 0, 0, 0, 0, 174, 175, 0, 0, 0,
+ 176, 0, -4, -4, -4, 296, 0, 0, -4, -4,
+ 180, -4, 0, 0, 0, -4, -4, 0, -4, -4,
0, 0, -4, -4, -4, -4, -4, -4, -4, -4,
-4, -4, -4, -4, 0, -4, -4, -4, -4, -4,
-4, -4, -4, -4, -4, -4, -4, 0, -4, -4,
@@@ -9654,21 -4482,11 +5732,20 @@@ yyreduce
Free((yyvsp[-4].c));
Free((yyvsp[-1].c));
}
- #line 4384 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4486 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 26:
+<<<<<<< HEAD
+#line 248 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 249 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 27:
- #line 258 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 263 "Gmsh.y" /* yacc.c:1646 */
{
char tmpstring[5000];
int i = PrintListOfDouble((yyvsp[-4].c), (yyvsp[-2].l), tmpstring);
@@@ -9681,21 -4499,11 +5758,20 @@@
Free((yyvsp[-4].c));
List_Delete((yyvsp[-2].l));
}
- #line 4401 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4503 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 27:
+<<<<<<< HEAD
+#line 261 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 262 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 28:
- #line 271 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 276 "Gmsh.y" /* yacc.c:1646 */
{
char tmpstring[5000];
int i = PrintListOfDouble((yyvsp[-4].c), (yyvsp[-2].l), tmpstring);
@@@ -9708,21 -4516,11 +5784,20 @@@
Free((yyvsp[-4].c));
List_Delete((yyvsp[-2].l));
}
- #line 4418 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4520 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 28:
+<<<<<<< HEAD
+#line 274 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 275 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 29:
- #line 284 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 289 "Gmsh.y" /* yacc.c:1646 */
{
char tmpstring[5000];
int i = PrintListOfDouble((yyvsp[-6].c), (yyvsp[-4].l), tmpstring);
@@@ -9745,21 -4543,11 +5820,20 @@@
Free((yyvsp[-1].c));
List_Delete((yyvsp[-4].l));
}
- #line 4445 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4547 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 29:
+<<<<<<< HEAD
+#line 302 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 303 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 30:
- #line 312 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 317 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-5].c), "View") && ViewData->finalize()){
@@@ -9773,21 -4561,11 +5847,20 @@@
#endif
Free((yyvsp[-5].c)); Free((yyvsp[-4].c));
}
- #line 4463 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4565 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 30:
+<<<<<<< HEAD
+#line 316 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 317 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 31:
- #line 326 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 331 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-4].c), "View")){
@@@ -9800,21 -4578,11 +5873,20 @@@
#endif
Free((yyvsp[-4].c));
}
- #line 4480 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4582 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 31:
+<<<<<<< HEAD
+#line 329 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 330 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 32:
- #line 339 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 344 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-4].c), "View")){
@@@ -9827,21 -4595,11 +5899,20 @@@
#endif
Free((yyvsp[-4].c));
}
- #line 4497 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4599 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 32:
+<<<<<<< HEAD
+#line 342 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 343 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 33:
- #line 352 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 357 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-6].c), "View")){
@@@ -9856,21 -4614,11 +5927,20 @@@
#endif
Free((yyvsp[-6].c));
}
- #line 4516 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4618 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 33:
+<<<<<<< HEAD
+#line 360 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 361 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 34:
- #line 370 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 375 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
ViewData = new PViewDataList();
@@@ -10046,21 -4756,11 +6078,20 @@@
ViewCoord.clear();
Free((yyvsp[0].c));
}
- #line 4658 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4760 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 44:
+<<<<<<< HEAD
+#line 492 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 493 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 45:
- #line 502 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 507 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(ViewValueList){
@@@ -10070,83 -4770,43 +6101,79 @@@
}
#endif
}
- #line 4672 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4774 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 45:
+<<<<<<< HEAD
+#line 502 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 503 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 46:
- #line 512 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 517 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(ViewValueList) (*ViewNumList)++;
#endif
}
- #line 4682 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4784 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 46:
+<<<<<<< HEAD
+#line 511 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 512 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 47:
- #line 521 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 526 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[0].c)[i]);
#endif
Free((yyvsp[0].c));
}
- #line 4693 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4795 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 47:
+<<<<<<< HEAD
+#line 518 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 519 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 48:
- #line 528 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 533 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[0].c)[i]);
#endif
Free((yyvsp[0].c));
}
- #line 4704 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4806 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 48:
+<<<<<<< HEAD
+#line 528 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 529 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 49:
- #line 538 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 543 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
ViewData->T2D.push_back((yyvsp[-5].d));
@@@ -10155,83 -4815,43 +6182,79 @@@
ViewData->T2D.push_back(ViewData->T2C.size());
#endif
}
- #line 4717 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4819 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 49:
+<<<<<<< HEAD
+#line 537 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 538 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 50:
- #line 547 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 552 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
ViewData->NbT2++;
#endif
}
- #line 4727 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4829 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 50:
+<<<<<<< HEAD
+#line 546 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 547 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 51:
- #line 556 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 561 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[0].c)[i]);
#endif
Free((yyvsp[0].c));
}
- #line 4738 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4840 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 51:
+<<<<<<< HEAD
+#line 553 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 554 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 52:
- #line 563 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 568 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[0].c)[i]);
#endif
Free((yyvsp[0].c));
}
- #line 4749 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4851 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 52:
+<<<<<<< HEAD
+#line 563 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 564 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 53:
- #line 573 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 578 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
ViewData->T3D.push_back((yyvsp[-7].d)); ViewData->T3D.push_back((yyvsp[-5].d));
@@@ -10239,41 -4859,21 +6262,39 @@@
ViewData->T3D.push_back(ViewData->T3C.size());
#endif
}
- #line 4761 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4863 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 53:
+<<<<<<< HEAD
+#line 571 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 572 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 54:
- #line 581 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 586 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
ViewData->NbT3++;
#endif
}
- #line 4771 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4873 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 54:
+<<<<<<< HEAD
+#line 581 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 582 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 55:
- #line 591 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 596 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
int type =
@@@ -10289,21 -4889,11 +6310,20 @@@
ListOfListOfDouble2Matrix((yyvsp[-2].l)));
#endif
}
- #line 4791 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4893 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 55:
+<<<<<<< HEAD
+#line 600 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 601 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 56:
- #line 610 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 615 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
int type =
@@@ -10319,90 -4909,30 +6339,87 @@@
ListOfListOfDouble2Matrix((yyvsp[-2].l)));
#endif
}
- #line 4811 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4913 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 56:
+<<<<<<< HEAD
+#line 619 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 620 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 57:
- #line 629 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 634 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
ViewValueList = &ViewData->Time;
#endif
}
- #line 4821 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4923 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 57:
+<<<<<<< HEAD
+#line 625 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 626 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 58:
- #line 635 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 640 "Gmsh.y" /* yacc.c:1646 */
{
}
- #line 4828 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4930 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 58:
+<<<<<<< HEAD
+#line 632 "Gmsh.y"
+ { (yyval.i) = 0; ;}
+ break;
+
+ case 59:
+#line 633 "Gmsh.y"
+ { (yyval.i) = 1; ;}
+ break;
+
+ case 60:
+#line 634 "Gmsh.y"
+ { (yyval.i) = 2; ;}
+ break;
+
+ case 61:
+#line 635 "Gmsh.y"
+ { (yyval.i) = 3; ;}
+ break;
+
+ case 62:
+#line 636 "Gmsh.y"
+ { (yyval.i) = 4; ;}
+ break;
+
+ case 63:
+#line 640 "Gmsh.y"
+ { (yyval.i) = 1; ;}
+ break;
+
+ case 64:
+#line 641 "Gmsh.y"
+ { (yyval.i) = -1; ;}
+=======
+/* Line 1787 of yacc.c */
+#line 633 "Gmsh.y"
+=======
case 59:
- #line 642 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 647 "Gmsh.y" /* yacc.c:1646 */
{ (yyval.i) = 0; }
- #line 4834 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 4936 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
case 60:
@@@ -10513,18 -5011,11 +6498,17 @@@
Free((yyvsp[-4].c));
Free((yyvsp[-2].c));
}
- #line 4913 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5015 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 71:
+/* Line 1787 of yacc.c */
+#line 658 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 74:
- #line 678 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 683 "Gmsh.y" /* yacc.c:1646 */
{
if(!gmsh_yysymbols.count((yyvsp[-3].c)) && (yyvsp[-2].i) && List_Nbr((yyvsp[-1].l)) == 1){
yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
@@@ -10584,21 -5075,11 +6568,20 @@@
Free((yyvsp[-3].c));
List_Delete((yyvsp[-1].l));
}
- #line 4977 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5079 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 72:
+<<<<<<< HEAD
+#line 718 "Gmsh.y"
+=======
+/* Line 1787 of yacc.c */
+#line 719 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 75:
- #line 738 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 743 "Gmsh.y" /* yacc.c:1646 */
{
gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
s.list = true;
@@@ -10627,21 -5108,11 +6610,20 @@@
Free((yyvsp[-5].c));
List_Delete((yyvsp[-1].l));
}
- #line 5010 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5112 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 73:
+<<<<<<< HEAD
+#line 747 "Gmsh.y"
+ {
+=======
+/* Line 1787 of yacc.c */
+#line 748 "Gmsh.y"
+=======
case 76:
- #line 767 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 772 "Gmsh.y" /* yacc.c:1646 */
{
gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
s.list = true;
@@@ -10674,117 -5145,54 +6656,113 @@@
break;
case 77:
- #line 796 "Gmsh.y" /* yacc.c:1646 */
+ #line 801 "Gmsh.y" /* yacc.c:1646 */
{
+<<<<<<< HEAD
+>>>>>>> upstream/2.9.3+dfsg1
+ assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
+ Free((yyvsp[(1) - (7)].c));
+=======
assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
Free((yyvsp[-6].c));
+>>>>>>> upstream/2.10.1+dfsg1
}
- #line 5052 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5154 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 74:
+#line 752 "Gmsh.y"
+=======
+ case 75:
+/* Line 1787 of yacc.c */
+#line 782 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 78:
- #line 801 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 806 "Gmsh.y" /* yacc.c:1646 */
{
assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
Free((yyvsp[-6].c));
}
- #line 5061 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5163 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 75:
+#line 757 "Gmsh.y"
+ {
+ assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
+ Free((yyvsp[(1) - (7)].c));
+ ;}
+ break;
+
+ case 76:
+#line 762 "Gmsh.y"
+=======
+ case 76:
+/* Line 1787 of yacc.c */
+#line 787 "Gmsh.y"
+=======
case 79:
- #line 806 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 811 "Gmsh.y" /* yacc.c:1646 */
{
assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
Free((yyvsp[-6].c));
}
- #line 5070 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5172 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 77:
+/* Line 1787 of yacc.c */
+#line 792 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 80:
- #line 811 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 816 "Gmsh.y" /* yacc.c:1646 */
{
assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
Free((yyvsp[-6].c));
}
- #line 5079 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5181 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 77:
+#line 769 "Gmsh.y"
+=======
+ case 78:
+/* Line 1787 of yacc.c */
+#line 799 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 81:
- #line 816 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 821 "Gmsh.y" /* yacc.c:1646 */
{
assignVariables((yyvsp[-8].c), (yyvsp[-5].l), (yyvsp[-2].i), (yyvsp[-1].l));
Free((yyvsp[-8].c));
List_Delete((yyvsp[-5].l));
List_Delete((yyvsp[-1].l));
}
- #line 5090 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5192 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 78:
+#line 776 "Gmsh.y"
+=======
+ case 79:
+/* Line 1787 of yacc.c */
+#line 806 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 82:
- #line 823 "Gmsh.y" /* yacc.c:1646 */
+ #line 828 "Gmsh.y" /* yacc.c:1646 */
{
assignVariables((yyvsp[-8].c), (yyvsp[-5].l), (yyvsp[-2].i), (yyvsp[-1].l));
Free((yyvsp[-8].c));
@@@ -10811,125 -5218,57 +6788,120 @@@
}
Free((yyvsp[-2].c));
}
- #line 5120 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5222 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 79:
+#line 791 "Gmsh.y"
+=======
+ case 80:
+/* Line 1787 of yacc.c */
+#line 821 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 84:
- #line 845 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 850 "Gmsh.y" /* yacc.c:1646 */
{
incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
Free((yyvsp[-5].c));
}
- #line 5129 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5231 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 80:
+#line 796 "Gmsh.y"
+ {
+ incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
+ Free((yyvsp[(1) - (6)].c));
+ ;}
+ break;
+
+ case 81:
+#line 801 "Gmsh.y"
+=======
+ case 81:
+/* Line 1787 of yacc.c */
+#line 826 "Gmsh.y"
+=======
case 85:
- #line 850 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 855 "Gmsh.y" /* yacc.c:1646 */
{
incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
Free((yyvsp[-5].c));
}
- #line 5138 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5240 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 82:
+/* Line 1787 of yacc.c */
+#line 831 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 86:
- #line 855 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 860 "Gmsh.y" /* yacc.c:1646 */
{
incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
Free((yyvsp[-5].c));
}
- #line 5147 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5249 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 82:
+#line 810 "Gmsh.y"
+=======
+ case 83:
+/* Line 1787 of yacc.c */
+#line 840 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 87:
- #line 860 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 865 "Gmsh.y" /* yacc.c:1646 */
{
incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
Free((yyvsp[-5].c));
}
- #line 5156 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5258 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 83:
+#line 816 "Gmsh.y"
+=======
+ case 84:
+/* Line 1787 of yacc.c */
+#line 846 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 88:
- #line 865 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 870 "Gmsh.y" /* yacc.c:1646 */
{
gmsh_yystringsymbols[(yyvsp[-3].c)] = std::string((yyvsp[-1].c));
Free((yyvsp[-3].c));
Free((yyvsp[-1].c));
}
- #line 5166 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5268 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 84:
+#line 825 "Gmsh.y"
+=======
+ case 85:
+/* Line 1787 of yacc.c */
+#line 855 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 89:
- #line 874 "Gmsh.y" /* yacc.c:1646 */
+ #line 879 "Gmsh.y" /* yacc.c:1646 */
{
std::string tmp((yyvsp[-1].c));
StringOption(GMSH_SET|GMSH_GUI, (yyvsp[-5].c), 0, (yyvsp[-3].c), tmp);
@@@ -10968,22 -5306,11 +6939,21 @@@
}
Free((yyvsp[-5].c)); Free((yyvsp[-3].c));
}
- #line 5208 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5310 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 85:
+#line 843 "Gmsh.y"
+=======
+ case 86:
+/* Line 1787 of yacc.c */
+#line 873 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 92:
- #line 907 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 912 "Gmsh.y" /* yacc.c:1646 */
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), d)){
@@@ -11001,22 -5328,11 +6971,21 @@@
}
Free((yyvsp[-8].c)); Free((yyvsp[-3].c));
}
- #line 5230 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5332 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 86:
+#line 861 "Gmsh.y"
+=======
+ case 87:
+/* Line 1787 of yacc.c */
+#line 891 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 93:
- #line 925 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 930 "Gmsh.y" /* yacc.c:1646 */
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[-4].c), 0, (yyvsp[-2].c), d)){
@@@ -11025,22 -5341,11 +6994,21 @@@
}
Free((yyvsp[-4].c)); Free((yyvsp[-2].c));
}
- #line 5243 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5345 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 87:
+#line 870 "Gmsh.y"
+=======
+ case 88:
+/* Line 1787 of yacc.c */
+#line 900 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 94:
- #line 934 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 939 "Gmsh.y" /* yacc.c:1646 */
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[-7].c), (int)(yyvsp[-5].d), (yyvsp[-2].c), d)){
@@@ -11049,62 -5354,29 +7017,59 @@@
}
Free((yyvsp[-7].c)); Free((yyvsp[-2].c));
}
- #line 5256 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5358 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 88:
+#line 882 "Gmsh.y"
+=======
+ case 89:
+/* Line 1787 of yacc.c */
+#line 912 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 95:
- #line 946 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 951 "Gmsh.y" /* yacc.c:1646 */
{
ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[-7].c), 0, (yyvsp[-3].c), (yyvsp[-1].u));
Free((yyvsp[-7].c)); Free((yyvsp[-3].c));
}
- #line 5265 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5367 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 89:
+#line 887 "Gmsh.y"
+=======
+ case 90:
+/* Line 1787 of yacc.c */
+#line 917 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 96:
- #line 951 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 956 "Gmsh.y" /* yacc.c:1646 */
{
ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[-10].c), (int)(yyvsp[-8].d), (yyvsp[-3].c), (yyvsp[-1].u));
Free((yyvsp[-10].c)); Free((yyvsp[-3].c));
}
- #line 5274 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5376 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 90:
+#line 895 "Gmsh.y"
+=======
+ case 91:
+/* Line 1787 of yacc.c */
+#line 925 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 97:
- #line 959 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 964 "Gmsh.y" /* yacc.c:1646 */
{
GmshColorTable *ct = GetColorTable(0);
if(!ct)
@@@ -11124,22 -5396,11 +7089,21 @@@
Free((yyvsp[-5].c));
List_Delete((yyvsp[-1].l));
}
- #line 5298 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5400 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 91:
+#line 915 "Gmsh.y"
+=======
+ case 92:
+/* Line 1787 of yacc.c */
+#line 945 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 98:
- #line 979 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 984 "Gmsh.y" /* yacc.c:1646 */
{
GmshColorTable *ct = GetColorTable((int)(yyvsp[-6].d));
if(!ct)
@@@ -11159,22 -5420,11 +7123,21 @@@
Free((yyvsp[-8].c));
List_Delete((yyvsp[-1].l));
}
- #line 5322 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5424 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 92:
+#line 938 "Gmsh.y"
+=======
+ case 93:
+/* Line 1787 of yacc.c */
+#line 968 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 99:
- #line 1002 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1007 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
if(!strcmp((yyvsp[-4].c),"Background"))
@@@ -11185,22 -5435,11 +7148,21 @@@
yymsg(0, "Unknown command %s Field", (yyvsp[-4].c));
#endif
}
- #line 5337 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5439 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 93:
+#line 949 "Gmsh.y"
+=======
+ case 94:
+/* Line 1787 of yacc.c */
+#line 979 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 100:
- #line 1013 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1018 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
if(!GModel::current()->getFields()->newField((int)(yyvsp[-4].d), (yyvsp[-1].c)))
@@@ -11208,22 -5447,11 +7170,21 @@@
#endif
Free((yyvsp[-1].c));
}
- #line 5349 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5451 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 94:
+#line 957 "Gmsh.y"
+=======
+ case 95:
+/* Line 1787 of yacc.c */
+#line 987 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 101:
- #line 1021 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1026 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[-6].d));
@@@ -11245,22 -5473,11 +7206,21 @@@
#endif
Free((yyvsp[-3].c));
}
- #line 5375 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5477 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 95:
+#line 979 "Gmsh.y"
+=======
+ case 96:
+/* Line 1787 of yacc.c */
+#line 1009 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 102:
- #line 1043 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1048 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[-6].d));
@@@ -11283,22 -5500,11 +7243,21 @@@
Free((yyvsp[-3].c));
Free((yyvsp[-1].c));
}
- #line 5402 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5504 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 96:
+#line 1002 "Gmsh.y"
+=======
+ case 97:
+/* Line 1787 of yacc.c */
+#line 1032 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 103:
- #line 1066 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1071 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[-8].d));
@@@ -11324,22 -5530,11 +7283,21 @@@
Free((yyvsp[-5].c));
List_Delete((yyvsp[-2].l));
}
- #line 5432 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5534 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 97:
+#line 1028 "Gmsh.y"
+=======
+ case 98:
+/* Line 1787 of yacc.c */
+#line 1058 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 104:
- #line 1092 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1097 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
Field *field = GModel::current()->getFields()->get((int)(yyvsp[-4].d));
@@@ -11357,22 -5552,11 +7315,21 @@@
#endif
Free((yyvsp[-1].c));
}
- #line 5454 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5556 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 98:
+#line 1049 "Gmsh.y"
+=======
+ case 99:
+/* Line 1787 of yacc.c */
+#line 1079 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 105:
- #line 1113 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1118 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_PLUGINS)
try {
@@@ -11384,22 -5568,11 +7341,21 @@@
#endif
Free((yyvsp[-6].c)); Free((yyvsp[-3].c));
}
- #line 5470 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5572 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 99:
+#line 1061 "Gmsh.y"
+=======
+ case 100:
+/* Line 1787 of yacc.c */
+#line 1091 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 106:
- #line 1125 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1130 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_PLUGINS)
try {
@@@ -11411,22 -5584,11 +7367,21 @@@
#endif
Free((yyvsp[-6].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
}
- #line 5486 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5588 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 103:
+#line 1079 "Gmsh.y"
+=======
+ case 104:
+/* Line 1787 of yacc.c */
+#line 1109 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 110:
- #line 1143 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1148 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[0].c));
std::vector<double> val(1, 0.);
@@@ -11435,22 -5597,11 +7390,21 @@@
}
Free((yyvsp[0].c));
}
- #line 5499 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5601 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 104:
+#line 1088 "Gmsh.y"
+=======
+ case 105:
+/* Line 1787 of yacc.c */
+#line 1118 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 111:
- #line 1152 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1157 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-2].c));
std::vector<double> val(1, (yyvsp[0].d));
@@@ -11459,39 -5610,17 +7413,37 @@@
}
Free((yyvsp[-2].c));
}
- #line 5512 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5614 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 105:
+#line 1097 "Gmsh.y"
+ { floatOptions.clear(); charOptions.clear(); ;}
+ break;
+
+ case 106:
+#line 1099 "Gmsh.y"
+=======
+ case 106:
+/* Line 1787 of yacc.c */
+#line 1127 "Gmsh.y"
+=======
case 112:
- #line 1161 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1166 "Gmsh.y" /* yacc.c:1646 */
{ floatOptions.clear(); charOptions.clear(); }
- #line 5518 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5620 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 107:
+/* Line 1787 of yacc.c */
+#line 1129 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 113:
- #line 1163 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1168 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-6].c));
std::vector<double> val;
@@@ -11507,22 -5636,11 +7459,21 @@@
Free((yyvsp[-6].c));
Free((yyvsp[-3].l));
}
- #line 5538 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5640 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 107:
+#line 1109 "Gmsh.y"
+=======
+ case 108:
+/* Line 1787 of yacc.c */
+#line 1139 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 114:
- #line 1179 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1184 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-2].c)), val((yyvsp[0].c));
if(!gmsh_yystringsymbols.count(key)){
@@@ -11531,39 -5649,17 +7482,37 @@@
Free((yyvsp[-2].c));
Free((yyvsp[0].c));
}
- #line 5551 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5653 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 108:
+#line 1118 "Gmsh.y"
+ { floatOptions.clear(); charOptions.clear(); ;}
+ break;
+
+ case 109:
+#line 1120 "Gmsh.y"
+=======
+ case 109:
+/* Line 1787 of yacc.c */
+#line 1148 "Gmsh.y"
+=======
case 115:
- #line 1188 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1193 "Gmsh.y" /* yacc.c:1646 */
{ floatOptions.clear(); charOptions.clear(); }
- #line 5557 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5659 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 110:
+/* Line 1787 of yacc.c */
+#line 1150 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 116:
- #line 1190 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1195 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-6].c)), val((yyvsp[-3].c));
if(!gmsh_yysymbols.count(key)){
@@@ -11573,84 -5669,40 +7522,80 @@@
Free((yyvsp[-6].c));
Free((yyvsp[-3].c));
}
- #line 5571 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5673 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 111:
+#line 1134 "Gmsh.y"
+=======
+ case 112:
+/* Line 1787 of yacc.c */
+#line 1164 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 118:
- #line 1204 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1209 "Gmsh.y" /* yacc.c:1646 */
{
std::string name((yyvsp[0].c));
Msg::UndefineOnelabParameter(name);
Free((yyvsp[0].c));
}
- #line 5581 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5683 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 112:
+#line 1142 "Gmsh.y"
+=======
+ case 113:
+/* Line 1787 of yacc.c */
+#line 1172 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 119:
- #line 1212 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1217 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.l) = List_Create(20,20,sizeof(doubleXstring));
doubleXstring v = {(yyvsp[-2].d), (yyvsp[0].c)};
List_Add((yyval.l), &v);
}
- #line 5591 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5693 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 113:
+#line 1148 "Gmsh.y"
+=======
+ case 114:
+/* Line 1787 of yacc.c */
+#line 1178 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 120:
- #line 1218 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1223 "Gmsh.y" /* yacc.c:1646 */
{
doubleXstring v = {(yyvsp[-2].d), (yyvsp[0].c)};
List_Add((yyval.l), &v);
}
- #line 5600 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5702 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 116:
+#line 1160 "Gmsh.y"
+=======
+ case 117:
+/* Line 1787 of yacc.c */
+#line 1190 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 123:
- #line 1230 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1235 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-1].c));
for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
@@@ -11661,22 -5713,11 +7606,21 @@@
Free((yyvsp[-1].c));
List_Delete((yyvsp[0].l));
}
- #line 5615 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5717 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 117:
+#line 1171 "Gmsh.y"
+=======
+ case 118:
+/* Line 1787 of yacc.c */
+#line 1201 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 124:
- #line 1241 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1246 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-3].c));
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
@@@ -11690,22 -5731,11 +7634,21 @@@
Free(((doubleXstring*)List_Pointer((yyvsp[-1].l), i))->s);
List_Delete((yyvsp[-1].l));
}
- #line 5633 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5735 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 118:
+#line 1186 "Gmsh.y"
+=======
+ case 119:
+/* Line 1787 of yacc.c */
+#line 1216 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 125:
- #line 1256 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1261 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-1].c));
std::string val((yyvsp[0].c));
@@@ -11713,44 -5743,22 +7656,42 @@@
Free((yyvsp[-1].c));
Free((yyvsp[0].c));
}
- #line 5645 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5747 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 121:
+#line 1202 "Gmsh.y"
+=======
+ case 122:
+/* Line 1787 of yacc.c */
+#line 1232 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 128:
- #line 1272 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1277 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-1].c));
double val = (yyvsp[0].d);
floatOptions[key].push_back(val);
Free((yyvsp[-1].c));
}
- #line 5656 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5758 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 122:
+#line 1210 "Gmsh.y"
+=======
+ case 123:
+/* Line 1787 of yacc.c */
+#line 1240 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 129:
- #line 1280 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1285 "Gmsh.y" /* yacc.c:1646 */
{
std::string key((yyvsp[-1].c));
std::string val((yyvsp[0].c));
@@@ -11758,22 -5766,11 +7699,21 @@@
Free((yyvsp[-1].c));
Free((yyvsp[0].c));
}
- #line 5668 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5770 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 123:
+#line 1219 "Gmsh.y"
+=======
+ case 124:
+/* Line 1787 of yacc.c */
+#line 1249 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 130:
- #line 1289 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1294 "Gmsh.y" /* yacc.c:1646 */
{
std::string key("Macro");
std::string val((yyvsp[0].c));
@@@ -11797,121 -5794,56 +7737,116 @@@
Free((yyvsp[-3].c));
List_Delete((yyvsp[-1].l));
}
- #line 5696 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5798 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 124:
+#line 1237 "Gmsh.y"
+=======
+ case 125:
+/* Line 1787 of yacc.c */
+#line 1267 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 132:
- #line 1315 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1320 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = (int)(yyvsp[0].d);
}
- #line 5704 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5806 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 125:
+#line 1241 "Gmsh.y"
+=======
+ case 126:
+/* Line 1787 of yacc.c */
+#line 1271 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 133:
- #line 1319 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1324 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = GModel::current()->setPhysicalName
(std::string((yyvsp[0].c)), 0, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
Free((yyvsp[0].c));
}
- #line 5714 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5816 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 126:
+#line 1251 "Gmsh.y"
+=======
+ case 127:
+/* Line 1787 of yacc.c */
+#line 1280 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 134:
- #line 1325 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1330 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 0, (yyvsp[0].d));
Free((yyvsp[-2].c));
}
- #line 5723 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5825 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 127:
+#line 1255 "Gmsh.y"
+=======
+ case 128:
+/* Line 1787 of yacc.c */
+#line 1284 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 135:
- #line 1333 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1338 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = (int)(yyvsp[0].d);
}
- #line 5731 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5833 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 128:
+#line 1267 "Gmsh.y"
+=======
+ case 129:
+/* Line 1787 of yacc.c */
+#line 1293 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 136:
- #line 1337 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1342 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = GModel::current()->setPhysicalName
(std::string((yyvsp[0].c)), 1, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
Free((yyvsp[0].c));
}
- #line 5741 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5843 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 129:
+#line 1271 "Gmsh.y"
+=======
+ case 130:
+/* Line 1787 of yacc.c */
+#line 1297 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 137:
- #line 1343 "Gmsh.y" /* yacc.c:1646 */
+ #line 1348 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 1, (yyvsp[0].d));
Free((yyvsp[-2].c));
@@@ -11935,21 -5866,11 +7869,20 @@@
(std::string((yyvsp[0].c)), 2, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
Free((yyvsp[0].c));
}
- #line 5768 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5870 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 130:
+#line 1281 "Gmsh.y"
+=======
+ case 131:
+/* Line 1787 of yacc.c */
+#line 1306 "Gmsh.y"
+=======
case 140:
- #line 1361 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1366 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 2, (yyvsp[0].d));
Free((yyvsp[-2].c));
@@@ -12019,18 -5940,11 +7952,17 @@@
{
for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[0].v)[i];
}
- #line 5842 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5944 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 137:
+/* Line 1787 of yacc.c */
+#line 1349 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 148:
- #line 1417 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1422 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindPoint(num)){
@@@ -12052,33 -5966,12 +7984,32 @@@
}
(yyval.s).Type = MSH_POINT;
(yyval.s).Num = num;
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 131:
+#line 1304 "Gmsh.y"
+ {
+ curPhysDim = 0;
+ ;}
+ break;
+
+ case 132:
+#line 1308 "Gmsh.y"
+=======
}
- #line 5869 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 5971 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 138:
+/* Line 1787 of yacc.c */
+#line 1372 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 149:
- #line 1440 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1445 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].i);
int op = (yyvsp[-2].i);
@@@ -12110,22 -6003,11 +8041,21 @@@
(yyval.s).Type = MSH_PHYSICAL_POINT;
(yyval.s).Num = num;
}
- #line 5905 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6007 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 133:
+#line 1324 "Gmsh.y"
+=======
+ case 139:
+/* Line 1787 of yacc.c */
+#line 1404 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 150:
- #line 1472 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1477 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
double d;
@@@ -12145,22 -6027,11 +8075,21 @@@
(yyval.s).Type = 0;
(yyval.s).Num = 0;
}
- #line 5929 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6031 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 134:
+#line 1346 "Gmsh.y"
+=======
+ case 140:
+/* Line 1787 of yacc.c */
+#line 1427 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 151:
- #line 1495 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1500 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindCurve(num)){
@@@ -12178,22 -6049,11 +8107,21 @@@
(yyval.s).Type = MSH_SEGM_LINE;
(yyval.s).Num = num;
}
- #line 5951 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6053 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 135:
+#line 1364 "Gmsh.y"
+=======
+ case 141:
+/* Line 1787 of yacc.c */
+#line 1445 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 152:
- #line 1513 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1518 "Gmsh.y" /* yacc.c:1646 */
{
for (int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
double dnum;
@@@ -12214,22 -6074,11 +8142,21 @@@
}
}
}
- #line 5976 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6078 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 136:
+#line 1385 "Gmsh.y"
+=======
+ case 142:
+/* Line 1787 of yacc.c */
+#line 1466 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 153:
- #line 1534 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1539 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindCurve(num)){
@@@ -12247,22 -6096,11 +8174,21 @@@
(yyval.s).Type = MSH_SEGM_SPLN;
(yyval.s).Num = num;
}
- #line 5998 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6100 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 137:
+#line 1403 "Gmsh.y"
+=======
+ case 143:
+/* Line 1787 of yacc.c */
+#line 1484 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 154:
- #line 1552 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1557 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-5].d);
if(FindCurve(num)){
@@@ -12292,22 -6130,11 +8218,21 @@@
(yyval.s).Type = MSH_SEGM_CIRC;
(yyval.s).Num = num;
}
- #line 6032 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6134 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 138:
+#line 1433 "Gmsh.y"
+=======
+ case 144:
+/* Line 1787 of yacc.c */
+#line 1514 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 155:
- #line 1582 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1587 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-5].d);
if(FindCurve(num)){
@@@ -12337,22 -6164,11 +8262,21 @@@
(yyval.s).Type = MSH_SEGM_ELLI;
(yyval.s).Num = num;
}
- #line 6066 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6168 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 139:
+#line 1463 "Gmsh.y"
+=======
+ case 145:
+/* Line 1787 of yacc.c */
+#line 1544 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 156:
- #line 1612 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1617 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindCurve(num)){
@@@ -12370,22 -6186,11 +8294,21 @@@
(yyval.s).Type = MSH_SEGM_BSPLN;
(yyval.s).Num = num;
}
- #line 6088 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6190 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 140:
+#line 1481 "Gmsh.y"
+=======
+ case 146:
+/* Line 1787 of yacc.c */
+#line 1562 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 157:
- #line 1630 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1635 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindCurve(num)){
@@@ -12403,22 -6208,11 +8326,21 @@@
(yyval.s).Type = MSH_SEGM_BEZIER;
(yyval.s).Num = num;
}
- #line 6110 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6212 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 141:
+#line 1500 "Gmsh.y"
+=======
+ case 147:
+/* Line 1787 of yacc.c */
+#line 1581 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 158:
- #line 1649 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1654 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-8].d);
if(List_Nbr((yyvsp[-5].l)) + (int)(yyvsp[-1].d) + 1 != List_Nbr((yyvsp[-3].l))){
@@@ -12444,22 -6238,11 +8366,21 @@@
(yyval.s).Type = MSH_SEGM_NURBS;
(yyval.s).Num = num;
}
- #line 6140 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6242 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 142:
+#line 1526 "Gmsh.y"
+=======
+ case 148:
+/* Line 1787 of yacc.c */
+#line 1607 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 159:
- #line 1675 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1680 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindEdgeLoop(num)){
@@@ -12477,22 -6260,11 +8398,21 @@@
(yyval.s).Type = MSH_SEGM_LOOP;
(yyval.s).Num = num;
}
- #line 6162 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6264 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 143:
+#line 1544 "Gmsh.y"
+=======
+ case 149:
+/* Line 1787 of yacc.c */
+#line 1625 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 160:
- #line 1693 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1698 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindCurve(num)){
@@@ -12509,33 -6281,12 +8429,32 @@@
List_Delete((yyvsp[-1].l));
(yyval.s).Type = MSH_SEGM_COMPOUND;
(yyval.s).Num = num;
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 144:
+#line 1562 "Gmsh.y"
+ {
+ curPhysDim = 1;
+ ;}
+ break;
+
+ case 145:
+#line 1566 "Gmsh.y"
+=======
}
- #line 6184 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6286 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 150:
+/* Line 1787 of yacc.c */
+#line 1643 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 161:
- #line 1711 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1716 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].i);
int op = (yyvsp[-2].i);
@@@ -12567,22 -6318,11 +8486,21 @@@
(yyval.s).Type = MSH_PHYSICAL_LINE;
(yyval.s).Num = num;
}
- #line 6220 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6322 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 146:
+#line 1585 "Gmsh.y"
+=======
+ case 151:
+/* Line 1787 of yacc.c */
+#line 1678 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 162:
- #line 1746 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1751 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindSurface(num)){
@@@ -12600,22 -6340,11 +8518,21 @@@
(yyval.s).Type = MSH_SURF_PLAN;
(yyval.s).Num = num;
}
- #line 6242 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6344 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 147:
+#line 1603 "Gmsh.y"
+=======
+ case 152:
+/* Line 1787 of yacc.c */
+#line 1696 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 163:
- #line 1764 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1769 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-5].d), type = 0;
if(FindSurface(num)){
@@@ -12654,86 -6383,42 +8571,82 @@@
(yyval.s).Type = type;
(yyval.s).Num = num;
}
- #line 6285 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6387 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 148:
+#line 1642 "Gmsh.y"
+=======
+ case 153:
+/* Line 1787 of yacc.c */
+#line 1735 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 164:
- #line 1803 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1808 "Gmsh.y" /* yacc.c:1646 */
{
myGmshSurface = 0;
(yyval.s).Type = 0;
(yyval.s).Num = 0;
}
- #line 6295 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6397 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 149:
+#line 1648 "Gmsh.y"
+=======
+ case 154:
+/* Line 1787 of yacc.c */
+#line 1741 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 165:
- #line 1809 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1814 "Gmsh.y" /* yacc.c:1646 */
{
myGmshSurface = gmshSurface::getSurface((int)(yyvsp[-1].d));
(yyval.s).Type = 0;
(yyval.s).Num = 0;
}
- #line 6305 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6407 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 150:
+#line 1654 "Gmsh.y"
+=======
+ case 155:
+/* Line 1787 of yacc.c */
+#line 1747 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 166:
- #line 1815 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1820 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-6].d);
myGmshSurface = gmshParametricSurface::NewParametricSurface(num, (yyvsp[-3].c), (yyvsp[-2].c), (yyvsp[-1].c));
(yyval.s).Type = 0;
(yyval.s).Num = num;
}
- #line 6316 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6418 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 151:
+#line 1661 "Gmsh.y"
+=======
+ case 156:
+/* Line 1787 of yacc.c */
+#line 1754 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 167:
- #line 1822 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1827 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if (List_Nbr((yyvsp[-1].l)) != 2){
@@@ -12758,22 -6443,11 +8671,21 @@@
(yyval.s).Type = 0;
(yyval.s).Num = num;
}
- #line 6345 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6447 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 152:
+#line 1686 "Gmsh.y"
+=======
+ case 157:
+/* Line 1787 of yacc.c */
+#line 1779 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 168:
- #line 1847 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1852 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if (List_Nbr((yyvsp[-1].l)) != 2){
@@@ -12798,22 -6472,11 +8710,21 @@@
(yyval.s).Type = 0;
(yyval.s).Num = num;
}
- #line 6374 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6476 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 153:
+#line 1711 "Gmsh.y"
+=======
+ case 158:
+/* Line 1787 of yacc.c */
+#line 1804 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 169:
- #line 1872 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1877 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindSurfaceLoop(num)){
@@@ -12830,22 -6493,11 +8741,21 @@@
(yyval.s).Type = MSH_SURF_LOOP;
(yyval.s).Num = num;
}
- #line 6395 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6497 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 154:
+#line 1728 "Gmsh.y"
+=======
+ case 159:
+/* Line 1787 of yacc.c */
+#line 1821 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 170:
- #line 1889 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1894 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindSurface(num)){
@@@ -12864,22 -6516,11 +8774,21 @@@
(yyval.s).Type = MSH_SURF_COMPOUND;
(yyval.s).Num = num;
}
- #line 6418 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6520 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 155:
+#line 1748 "Gmsh.y"
+=======
+ case 160:
+/* Line 1787 of yacc.c */
+#line 1841 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 171:
- #line 1909 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1914 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-8].d);
if(FindSurface(num)){
@@@ -12911,33 -6552,12 +8820,32 @@@
Free((yyvsp[-4].c));
(yyval.s).Type = MSH_SURF_COMPOUND;
(yyval.s).Num = num;
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 156:
+#line 1781 "Gmsh.y"
+ {
+ curPhysDim = 2;
+ ;}
+ break;
+
+ case 157:
+#line 1785 "Gmsh.y"
+=======
}
- #line 6455 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6557 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 161:
+/* Line 1787 of yacc.c */
+#line 1874 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 172:
- #line 1942 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1947 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].i);
int op = (yyvsp[-2].i);
@@@ -12969,22 -6589,11 +8877,21 @@@
(yyval.s).Type = MSH_PHYSICAL_SURFACE;
(yyval.s).Num = num;
}
- #line 6491 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6593 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 158:
+#line 1805 "Gmsh.y"
+=======
+ case 162:
+/* Line 1787 of yacc.c */
+#line 1910 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 173:
- #line 1978 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 1983 "Gmsh.y" /* yacc.c:1646 */
{
yymsg(0, "'Complex Volume' command is deprecated: use 'Volume' instead");
int num = (int)(yyvsp[-4].d);
@@@ -13002,22 -6611,11 +8909,21 @@@
(yyval.s).Type = MSH_VOLUME;
(yyval.s).Num = num;
}
- #line 6513 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6615 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 159:
+#line 1823 "Gmsh.y"
+=======
+ case 163:
+/* Line 1787 of yacc.c */
+#line 1928 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 174:
- #line 1996 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2001 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindVolume(num)){
@@@ -13034,22 -6632,11 +8940,21 @@@
(yyval.s).Type = MSH_VOLUME;
(yyval.s).Num = num;
}
- #line 6534 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6636 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 160:
+#line 1840 "Gmsh.y"
+=======
+ case 164:
+/* Line 1787 of yacc.c */
+#line 1945 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 175:
- #line 2013 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2018 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].d);
if(FindVolume(num)){
@@@ -13064,33 -6651,12 +8969,32 @@@
List_Delete((yyvsp[-1].l));
(yyval.s).Type = MSH_VOLUME_COMPOUND;
(yyval.s).Num = num;
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 161:
+#line 1856 "Gmsh.y"
+ {
+ curPhysDim = 3;
+ ;}
+ break;
+
+ case 162:
+#line 1860 "Gmsh.y"
+=======
}
- #line 6554 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6656 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 165:
+/* Line 1787 of yacc.c */
+#line 1961 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 176:
- #line 2029 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2034 "Gmsh.y" /* yacc.c:1646 */
{
int num = (int)(yyvsp[-4].i);
int op = (yyvsp[-2].i);
@@@ -13122,122 -6688,56 +9026,116 @@@
(yyval.s).Type = MSH_PHYSICAL_VOLUME;
(yyval.s).Num = num;
}
- #line 6590 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6692 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 163:
+#line 1882 "Gmsh.y"
+=======
+ case 166:
+/* Line 1787 of yacc.c */
+#line 1998 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 177:
- #line 2066 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2071 "Gmsh.y" /* yacc.c:1646 */
{
TranslateShapes((yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], (yyvsp[-1].l));
(yyval.l) = (yyvsp[-1].l);
}
- #line 6599 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6701 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 164:
+#line 1887 "Gmsh.y"
+=======
+ case 167:
+/* Line 1787 of yacc.c */
+#line 2003 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 178:
- #line 2071 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2076 "Gmsh.y" /* yacc.c:1646 */
{
RotateShapes((yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d), (yyvsp[-1].l));
(yyval.l) = (yyvsp[-1].l);
}
- #line 6608 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6710 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 165:
+#line 1892 "Gmsh.y"
+=======
+ case 168:
+/* Line 1787 of yacc.c */
+#line 2008 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 179:
- #line 2076 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2081 "Gmsh.y" /* yacc.c:1646 */
{
SymmetryShapes((yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], (yyvsp[-3].v)[3], (yyvsp[-1].l));
(yyval.l) = (yyvsp[-1].l);
}
- #line 6617 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6719 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 166:
+#line 1897 "Gmsh.y"
+=======
+ case 169:
+/* Line 1787 of yacc.c */
+#line 2013 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 180:
- #line 2081 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2086 "Gmsh.y" /* yacc.c:1646 */
{
DilatShapes((yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d), (yyvsp[-4].d), (yyvsp[-4].d), (yyvsp[-1].l));
(yyval.l) = (yyvsp[-1].l);
}
- #line 6626 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6728 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 167:
+#line 1902 "Gmsh.y"
+=======
+ case 170:
+/* Line 1787 of yacc.c */
+#line 2018 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 181:
- #line 2086 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2091 "Gmsh.y" /* yacc.c:1646 */
{
DilatShapes((yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], (yyvsp[-1].l));
(yyval.l) = (yyvsp[-1].l);
}
- #line 6635 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6737 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 168:
+#line 1907 "Gmsh.y"
+=======
+ case 171:
+/* Line 1787 of yacc.c */
+#line 2023 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 182:
- #line 2091 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2096 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
if(!strcmp((yyvsp[-3].c), "Duplicata")){
@@@ -13260,43 -6760,21 +9158,41 @@@
Free((yyvsp[-3].c));
List_Delete((yyvsp[-1].l));
}
- #line 6662 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6764 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 169:
+#line 1930 "Gmsh.y"
+=======
+ case 172:
+/* Line 1787 of yacc.c */
+#line 2046 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 183:
- #line 2114 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2119 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
IntersectCurvesWithSurface((yyvsp[-5].l), (int)(yyvsp[-1].d), (yyval.l));
List_Delete((yyvsp[-5].l));
}
- #line 6672 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6774 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 170:
+#line 1936 "Gmsh.y"
+=======
+ case 173:
+/* Line 1787 of yacc.c */
+#line 2052 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 184:
- #line 2120 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2125 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.l) = List_Create(2, 1, sizeof(Shape*));
List_T *tmp = ListOfDouble2ListOfInt((yyvsp[-2].l));
@@@ -13304,89 -6782,39 +9200,85 @@@
SplitCurve((int)(yyvsp[-5].d), tmp, (yyval.l));
List_Delete(tmp);
}
- #line 6684 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6786 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 171:
+#line 1946 "Gmsh.y"
+ { (yyval.l) = (yyvsp[(1) - (1)].l); ;}
+ break;
+
+ case 172:
+#line 1947 "Gmsh.y"
+ { (yyval.l) = (yyvsp[(1) - (1)].l); ;}
+ break;
+
+ case 173:
+#line 1952 "Gmsh.y"
+=======
+ case 174:
+/* Line 1787 of yacc.c */
+#line 2062 "Gmsh.y"
+ { (yyval.l) = (yyvsp[(1) - (1)].l); }
+=======
case 185:
- #line 2130 "Gmsh.y" /* yacc.c:1646 */
+ #line 2135 "Gmsh.y" /* yacc.c:1646 */
{ (yyval.l) = (yyvsp[0].l); }
- #line 6690 "Gmsh.tab.cpp" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 6792 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
case 186:
- #line 2131 "Gmsh.y" /* yacc.c:1646 */
+ #line 2136 "Gmsh.y" /* yacc.c:1646 */
{ (yyval.l) = (yyvsp[0].l); }
- #line 6696 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6798 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+ case 176:
+/* Line 1787 of yacc.c */
+#line 2068 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 187:
- #line 2136 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2141 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
}
- #line 6704 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6806 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 174:
+#line 1956 "Gmsh.y"
+=======
+ case 177:
+/* Line 1787 of yacc.c */
+#line 2072 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 188:
- #line 2140 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2145 "Gmsh.y" /* yacc.c:1646 */
{
List_Add((yyval.l), &(yyvsp[0].s));
}
- #line 6712 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6814 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 175:
+#line 1960 "Gmsh.y"
+=======
+ case 178:
+/* Line 1787 of yacc.c */
+#line 2076 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 189:
- #line 2144 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2149 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
double d;
@@@ -13409,22 -6837,11 +9301,21 @@@
}
}
}
- #line 6739 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6841 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 176:
+#line 1983 "Gmsh.y"
+=======
+ case 179:
+/* Line 1787 of yacc.c */
+#line 2099 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 190:
- #line 2167 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2172 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
double d;
@@@ -13447,22 -6864,11 +9338,21 @@@
}
}
}
- #line 6766 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6868 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 177:
+#line 2006 "Gmsh.y"
+=======
+ case 180:
+/* Line 1787 of yacc.c */
+#line 2122 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 191:
- #line 2190 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2195 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
double d;
@@@ -13485,22 -6891,11 +9375,21 @@@
}
}
}
- #line 6793 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6895 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 178:
+#line 2029 "Gmsh.y"
+=======
+ case 181:
+/* Line 1787 of yacc.c */
+#line 2145 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 192:
- #line 2213 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2218 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
double d;
@@@ -13523,22 -6918,11 +9412,21 @@@
}
}
}
- #line 6820 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6922 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 179:
+#line 2057 "Gmsh.y"
+=======
+ case 182:
+/* Line 1787 of yacc.c */
+#line 2173 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 193:
- #line 2241 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2246 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[-1].l)) == 4){
@@@ -13559,22 -6943,11 +9447,21 @@@
yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-4].d));
#endif
}
- #line 6845 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6947 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 180:
+#line 2078 "Gmsh.y"
+=======
+ case 183:
+/* Line 1787 of yacc.c */
+#line 2194 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 194:
- #line 2262 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2267 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
int t = (int)(yyvsp[-6].d);
@@@ -13600,22 -6973,11 +9487,21 @@@
List_Delete((yyvsp[-2].l));
#endif
}
- #line 6875 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 6977 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 181:
+#line 2105 "Gmsh.y"
+=======
+ case 184:
+/* Line 1787 of yacc.c */
+#line 2221 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 195:
- #line 2289 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2294 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[-2].l)) == 0){
@@@ -13635,22 -6997,11 +9521,21 @@@
yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-10].d));
#endif
}
- #line 6899 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7001 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 182:
+#line 2126 "Gmsh.y"
+=======
+ case 185:
+/* Line 1787 of yacc.c */
+#line 2242 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 196:
- #line 2310 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2315 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[-2].l)) == 0){
@@@ -13671,22 -7022,11 +9556,21 @@@
yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-12].d));
#endif
}
- #line 6924 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7026 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 183:
+#line 2147 "Gmsh.y"
+=======
+ case 186:
+/* Line 1787 of yacc.c */
+#line 2263 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 197:
- #line 2331 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2336 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(List_Nbr((yyvsp[-2].l)) == 1){
@@@ -13706,22 -7046,11 +9590,21 @@@
yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-8].d));
#endif
}
- #line 6948 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7050 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 184:
+#line 2167 "Gmsh.y"
+=======
+ case 187:
+/* Line 1787 of yacc.c */
+#line 2283 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 198:
- #line 2351 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2356 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[-6].c), "Union")){
@@@ -13833,22 -7162,11 +9716,21 @@@
Free((yyvsp[-6].c));
#endif
}
- #line 7064 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7166 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 185:
+#line 2279 "Gmsh.y"
+=======
+ case 188:
+/* Line 1787 of yacc.c */
+#line 2395 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 199:
- #line 2463 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2468 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[-6].c), "MathEval")){
@@@ -13867,22 -7185,11 +9749,21 @@@
Free((yyvsp[-6].c)); Free((yyvsp[-1].c));
#endif
}
- #line 7087 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7189 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 186:
+#line 2298 "Gmsh.y"
+=======
+ case 189:
+/* Line 1787 of yacc.c */
+#line 2414 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 200:
- #line 2482 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2487 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[-4].c), "CutMesh")){
@@@ -13920,22 -7227,11 +9801,21 @@@
Free((yyvsp[-4].c));
#endif
}
- #line 7129 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7231 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 187:
+#line 2337 "Gmsh.y"
+=======
+ case 190:
+/* Line 1787 of yacc.c */
+#line 2453 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 201:
- #line 2521 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2526 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_DINTEGRATION)
if(!strcmp((yyvsp[-12].c), "Cylinder") && List_Nbr((yyvsp[-2].l)) == 1){
@@@ -14038,22 -7334,11 +9918,21 @@@
Free((yyvsp[-12].c));
#endif
}
- #line 7236 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7338 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 188:
+#line 2445 "Gmsh.y"
+=======
+ case 191:
+/* Line 1787 of yacc.c */
+#line 2561 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 202:
- #line 2629 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2634 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14062,43 -7347,21 +9941,41 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7249 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7351 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 189:
+#line 2454 "Gmsh.y"
+=======
+ case 192:
+/* Line 1787 of yacc.c */
+#line 2570 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 203:
- #line 2638 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2643 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_MESH)
GModel::current()->getFields()->deleteField((int)(yyvsp[-2].d));
#endif
}
- #line 7259 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7361 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 190:
+#line 2460 "Gmsh.y"
+=======
+ case 193:
+/* Line 1787 of yacc.c */
+#line 2576 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 204:
- #line 2644 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2649 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-4].c), "View")){
@@@ -14113,22 -7376,11 +9990,21 @@@
#endif
Free((yyvsp[-4].c));
}
- #line 7278 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7380 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 191:
+#line 2475 "Gmsh.y"
+=======
+ case 194:
+/* Line 1787 of yacc.c */
+#line 2591 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 205:
- #line 2659 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2664 "Gmsh.y" /* yacc.c:1646 */
{
if(!strcmp((yyvsp[-1].c), "Meshes") || !strcmp((yyvsp[-1].c), "All")){
ClearProject();
@@@ -14156,22 -7408,11 +10032,21 @@@
}
Free((yyvsp[-1].c));
}
- #line 7310 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7412 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 192:
+#line 2503 "Gmsh.y"
+=======
+ case 195:
+/* Line 1787 of yacc.c */
+#line 2619 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 206:
- #line 2687 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2692 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-2].c), "Empty") && !strcmp((yyvsp[-1].c), "Views")){
@@@ -14183,22 -7424,11 +10058,21 @@@
#endif
Free((yyvsp[-2].c)); Free((yyvsp[-1].c));
}
- #line 7326 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7428 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 193:
+#line 2520 "Gmsh.y"
+=======
+ case 196:
+/* Line 1787 of yacc.c */
+#line 2636 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 207:
- #line 2704 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2709 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14207,22 -7437,11 +10081,21 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7339 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7441 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 194:
+#line 2529 "Gmsh.y"
+=======
+ case 197:
+/* Line 1787 of yacc.c */
+#line 2645 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 208:
- #line 2713 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2718 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14231,21 -7450,11 +10104,21 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7352 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7454 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 195:
+#line 2543 "Gmsh.y"
+=======
+ case 198:
+/* Line 1787 of yacc.c */
+#line 2659 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 209:
- #line 2727 "Gmsh.y" /* yacc.c:1646 */
+ #line 2732 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14265,43 -7473,21 +10137,41 @@@
VisibilityShape((yyvsp[-1].c), i, 1, false);
Free((yyvsp[-1].c));
}
- #line 7375 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7477 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 196:
+#line 2549 "Gmsh.y"
+=======
+ case 199:
+/* Line 1787 of yacc.c */
+#line 2665 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 211:
- #line 2747 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2752 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[-1].c), i, 0, false);
Free((yyvsp[-1].c));
}
- #line 7385 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7487 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 197:
+#line 2555 "Gmsh.y"
+=======
+ case 200:
+/* Line 1787 of yacc.c */
+#line 2671 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 212:
- #line 2753 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2758 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14310,22 -7496,11 +10180,21 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7398 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7500 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 198:
+#line 2564 "Gmsh.y"
+=======
+ case 201:
+/* Line 1787 of yacc.c */
+#line 2680 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 213:
- #line 2762 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2767 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14334,22 -7509,11 +10203,21 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7411 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7513 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 199:
+#line 2573 "Gmsh.y"
+=======
+ case 202:
+/* Line 1787 of yacc.c */
+#line 2689 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 214:
- #line 2771 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2776 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14358,22 -7522,11 +10226,21 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7424 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7526 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 200:
+#line 2582 "Gmsh.y"
+=======
+ case 203:
+/* Line 1787 of yacc.c */
+#line 2698 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 215:
- #line 2780 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2785 "Gmsh.y" /* yacc.c:1646 */
{
for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
Shape TheShape;
@@@ -14382,22 -7535,11 +10249,21 @@@
}
List_Delete((yyvsp[-1].l));
}
- #line 7437 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7539 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 201:
+#line 2596 "Gmsh.y"
+=======
+ case 204:
+/* Line 1787 of yacc.c */
+#line 2712 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 216:
- #line 2794 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2799 "Gmsh.y" /* yacc.c:1646 */
{
if(!strcmp((yyvsp[-2].c), "Include")){
std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
@@@ -14445,38 -7587,22 +10311,39 @@@
std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
CreateSingleDir(tmp);
}
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ else if(!strcmp((yyvsp[(1) - (3)].c), "OnelabRun")){
+ Msg::RunOnelabClient((yyvsp[(2) - (3)].c));
+=======
else if(!strcmp((yyvsp[-2].c), "OnelabRun")){
Msg::RunOnelabClient((yyvsp[-1].c));
+>>>>>>> upstream/2.10.1+dfsg1
}
- >>>>>>> upstream/2.9.3+dfsg1
+ else if(!strcmp((yyvsp[-2].c), "OptimizeMesh")){
+ GModel::current()->optimizeMesh((yyvsp[-1].c));
+ }
else{
yymsg(0, "Unknown command '%s'", (yyvsp[-2].c));
}
Free((yyvsp[-2].c)); Free((yyvsp[-1].c));
}
- #line 7497 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7602 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 202:
+#line 2649 "Gmsh.y"
+=======
+ case 205:
+/* Line 1787 of yacc.c */
+#line 2768 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 217:
- #line 2850 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2858 "Gmsh.y" /* yacc.c:1646 */
{
int n = List_Nbr((yyvsp[-2].l));
if(n == 1){
@@@ -14515,22 -7641,11 +10382,21 @@@
#endif
Free((yyvsp[-6].c)); Free((yyvsp[-5].c)); Free((yyvsp[-1].c));
}
- #line 7540 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7645 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 203:
+#line 2666 "Gmsh.y"
+=======
+ case 207:
+/* Line 1787 of yacc.c */
+#line 2803 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 219:
- #line 2885 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2893 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST) && defined(HAVE_MESH)
if(!strcmp((yyvsp[-6].c), "Background") && !strcmp((yyvsp[-5].c), "Mesh") && !strcmp((yyvsp[-4].c), "View")){
@@@ -14545,22 -7660,11 +10411,21 @@@
#endif
Free((yyvsp[-6].c)); Free((yyvsp[-5].c)); Free((yyvsp[-4].c));
}
- #line 7559 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7664 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 204:
+#line 2681 "Gmsh.y"
+=======
+ case 208:
+/* Line 1787 of yacc.c */
+#line 2818 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 220:
- #line 2900 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2908 "Gmsh.y" /* yacc.c:1646 */
{
if(!strcmp((yyvsp[-2].c), "Sleep")){
SleepInSeconds((yyvsp[-1].d));
@@@ -14579,22 -7690,11 +10451,21 @@@
yymsg(0, "Unknown command '%s'", (yyvsp[-2].c));
Free((yyvsp[-2].c));
}
- #line 7582 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7694 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 205:
+#line 2700 "Gmsh.y"
+=======
+ case 209:
+/* Line 1787 of yacc.c */
+#line 2837 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 221:
- #line 2919 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2934 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_PLUGINS)
try {
@@@ -14606,22 -7706,11 +10477,21 @@@
#endif
Free((yyvsp[-4].c)); Free((yyvsp[-1].c));
}
- #line 7598 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7710 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 206:
+#line 2712 "Gmsh.y"
+=======
+ case 210:
+/* Line 1787 of yacc.c */
+#line 2849 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 222:
- #line 2931 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2946 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_POST)
if(!strcmp((yyvsp[-1].c), "ElementsFromAllViews"))
@@@ -14645,82 -7734,39 +10515,79 @@@
#endif
Free((yyvsp[-1].c));
}
- #line 7626 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7738 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 207:
+#line 2736 "Gmsh.y"
+=======
+ case 211:
+/* Line 1787 of yacc.c */
+#line 2873 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 223:
- #line 2955 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2970 "Gmsh.y" /* yacc.c:1646 */
{
Msg::Exit(0);
}
- #line 7634 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7746 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 208:
+#line 2740 "Gmsh.y"
+=======
+ case 212:
+/* Line 1787 of yacc.c */
+#line 2877 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 224:
- #line 2959 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2974 "Gmsh.y" /* yacc.c:1646 */
{
gmsh_yyerrorstate = 999; // this will be checked when yyparse returns
YYABORT;
}
- #line 7643 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7755 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 209:
+#line 2745 "Gmsh.y"
+=======
+ case 213:
+/* Line 1787 of yacc.c */
+#line 2882 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 225:
- #line 2964 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2979 "Gmsh.y" /* yacc.c:1646 */
{
// FIXME: this is a hack to force a transfer from the old DB to
// the new DB. This will become unnecessary if/when we fill the
// GModel directly during parsing.
GModel::current()->importGEOInternals();
}
- #line 7654 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7766 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 210:
+#line 2752 "Gmsh.y"
+=======
+ case 214:
+/* Line 1787 of yacc.c */
+#line 2889 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 226:
- #line 2971 "Gmsh.y" /* yacc.c:1646 */
+ #line 2986 "Gmsh.y" /* yacc.c:1646 */
{
new GModel();
GModel::current(GModel::list.size() - 1);
@@@ -14736,63 -7781,30 +10602,60 @@@
GModel::current()->importGEOInternals();
SetBoundingBox();
}
- #line 7673 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7785 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 211:
+#line 2758 "Gmsh.y"
+=======
+ case 215:
+/* Line 1787 of yacc.c */
+#line 2895 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 228:
- #line 2982 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 2997 "Gmsh.y" /* yacc.c:1646 */
{
CTX::instance()->forcedBBox = 1;
SetBoundingBox((yyvsp[-12].d), (yyvsp[-10].d), (yyvsp[-8].d), (yyvsp[-6].d), (yyvsp[-4].d), (yyvsp[-2].d));
}
- #line 7682 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7794 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 212:
+#line 2763 "Gmsh.y"
+=======
+ case 216:
+/* Line 1787 of yacc.c */
+#line 2900 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 229:
- #line 2987 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3002 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_OPENGL)
drawContext::global()->draw();
#endif
}
- #line 7692 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7804 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 213:
+#line 2769 "Gmsh.y"
+=======
+ case 217:
+/* Line 1787 of yacc.c */
+#line 2906 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 230:
- #line 2993 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3008 "Gmsh.y" /* yacc.c:1646 */
{
#if defined(HAVE_OPENGL)
CTX::instance()->mesh.changed = ENT_ALL;
@@@ -14800,80 -7812,36 +10663,76 @@@
PView::list[index]->setChanged(true);
#endif
}
- #line 7704 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7816 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 214:
+#line 2777 "Gmsh.y"
+=======
+ case 218:
+/* Line 1787 of yacc.c */
+#line 2914 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 231:
- #line 3001 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3016 "Gmsh.y" /* yacc.c:1646 */
{
GModel::current()->createTopologyFromMesh();
}
- #line 7712 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7824 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 215:
+#line 2781 "Gmsh.y"
+=======
+ case 219:
+/* Line 1787 of yacc.c */
+#line 2918 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 232:
- #line 3005 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3020 "Gmsh.y" /* yacc.c:1646 */
{
GModel::current()->createTopologyFromMesh(1);
}
- #line 7720 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7832 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 216:
+#line 2785 "Gmsh.y"
+=======
+ case 220:
+/* Line 1787 of yacc.c */
+#line 2922 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 233:
- #line 3009 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3024 "Gmsh.y" /* yacc.c:1646 */
{
GModel::current()->importGEOInternals();
GModel::current()->refineMesh(CTX::instance()->mesh.secondOrderLinear);
}
- #line 7729 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7841 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 217:
+#line 2791 "Gmsh.y"
+=======
+ case 221:
+/* Line 1787 of yacc.c */
+#line 2928 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 234:
- #line 3015 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3030 "Gmsh.y" /* yacc.c:1646 */
{
int lock = CTX::instance()->lock;
CTX::instance()->lock = 0;
@@@ -14927,45 -7895,11 +10786,21 @@@
List_Delete((yyvsp[-7].l));
CTX::instance()->lock = lock;
}
- #line 7787 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 7899 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 218:
+#line 2845 "Gmsh.y"
+=======
+ case 222:
+/* Line 1787 of yacc.c */
+#line 2982 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 235:
- #line 3069 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
- {
- #if defined(HAVE_MESH)
- SetOrderN(GModel::current(), (yyvsp[-1].d), CTX::instance()->mesh.secondOrderLinear,
- CTX::instance()->mesh.secondOrderIncomplete,
- CTX::instance()->mesh.meshOnlyVisible);
- #endif
- }
- #line 7799 "Gmsh.tab.cpp" /* yacc.c:1646 */
- break;
-
- <<<<<<< HEAD
- <<<<<<< HEAD
- case 219:
- #line 2858 "Gmsh.y"
- =======
- case 223:
- /* Line 1787 of yacc.c */
- #line 2995 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 236:
- #line 3082 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3089 "Gmsh.y" /* yacc.c:1646 */
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-3].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-1].d);
@@@ -15144,22 -8028,23 +10930,33 @@@
ImbricatedLoop--;
}
}
- #line 7932 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8032 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 240:
+ #line 3202 "Gmsh.y" /* yacc.c:1646 */
+ {
+ if(!FunctionManager::Instance()->createFunction
+ (std::string((yyvsp[0].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+ yymsg(0, "Redefinition of function %s", (yyvsp[0].c));
+ skip_until(NULL, "Return");
+ Free((yyvsp[0].c));
+ }
+ #line 8044 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 224:
+#line 2969 "Gmsh.y"
+=======
+ case 228:
+/* Line 1787 of yacc.c */
+#line 3106 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 241:
- #line 3195 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3210 "Gmsh.y" /* yacc.c:1646 */
{
if(!FunctionManager::Instance()->createFunction
(std::string((yyvsp[0].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@@ -15167,148 -8052,147 +10964,217 @@@
skip_until(NULL, "Return");
Free((yyvsp[0].c));
}
- #line 7944 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8056 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 225:
+#line 2977 "Gmsh.y"
+=======
+ case 229:
+/* Line 1787 of yacc.c */
+#line 3114 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 242:
- #line 3203 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3218 "Gmsh.y" /* yacc.c:1646 */
{
if(!FunctionManager::Instance()->leaveFunction
(&gmsh_yyin, gmsh_yyname, gmsh_yylineno))
yymsg(0, "Error while exiting function");
}
- #line 7954 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8066 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 226:
+#line 2983 "Gmsh.y"
+=======
+ case 230:
+/* Line 1787 of yacc.c */
+#line 3120 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 243:
- #line 3209 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3224 "Gmsh.y" /* yacc.c:1646 */
{
if(!FunctionManager::Instance()->enterFunction
(std::string((yyvsp[-1].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
yymsg(0, "Unknown function %s", (yyvsp[-1].c));
Free((yyvsp[-1].c));
}
- #line 7965 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8077 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 227:
+#line 2990 "Gmsh.y"
+=======
+ case 231:
+/* Line 1787 of yacc.c */
+#line 3127 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 244:
- #line 3216 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3231 "Gmsh.y" /* yacc.c:1646 */
{
- if(!(yyvsp[-1].d)) skip_until("If", "EndIf");
+ if(!FunctionManager::Instance()->enterFunction
+ (std::string((yyvsp[-1].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+ yymsg(0, "Unknown function %s", (yyvsp[-1].c));
+ Free((yyvsp[-1].c));
}
- #line 7973 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8088 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 228:
+#line 2994 "Gmsh.y"
+=======
+ case 232:
+/* Line 1787 of yacc.c */
+#line 3131 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 245:
- #line 3220 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3238 "Gmsh.y" /* yacc.c:1646 */
{
+ ImbricatedTest++;
+ if(ImbricatedTest > MAX_RECUR_TESTS-1){
+ yymsg(0, "Reached maximum number of imbricated tests");
+ ImbricatedTest = MAX_RECUR_TESTS-1;
+ }
+
+ if((yyvsp[-1].d)){
+ // Current test is true
+ statusImbricatedTests[ImbricatedTest] = 1;
+ }
+ else{
+ statusImbricatedTests[ImbricatedTest] = 0;
+ // Go after the next ElseIf or Else or EndIf
+ int type_until2 = 0;
+ skip_until_test("If", "EndIf", "ElseIf", 4, &type_until2);
+ if(!type_until2) ImbricatedTest--; // EndIf reached
+ }
}
- #line 7980 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8112 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 229:
+#line 3003 "Gmsh.y"
+=======
+ case 233:
+/* Line 1787 of yacc.c */
+#line 3140 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 246:
- #line 3229 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3258 "Gmsh.y" /* yacc.c:1646 */
{
- (yyval.l) = List_Create(2, 1, sizeof(Shape));
- ExtrudeShapes(TRANSLATE, (yyvsp[-1].l),
- (yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], 0., 0., 0., 0., 0., 0., 0.,
- NULL, (yyval.l));
- List_Delete((yyvsp[-1].l));
+ if(ImbricatedTest > 0){
+ if (statusImbricatedTests[ImbricatedTest]){
+ // Last test (If or ElseIf) was true, thus go after EndIf (out of If EndIf)
+ skip_until("If", "EndIf");
+ ImbricatedTest--;
+ }
+ else{
+ // Previous test(s) (If and ElseIf) not yet true
+ if((yyvsp[-1].d)){
+ statusImbricatedTests[ImbricatedTest] = 1;
+ }
+ else{
+ // Current test still not true: statusImbricatedTests[ImbricatedTest] = 0;
+ // Go after the next ElseIf or Else or EndIf
+ int type_until2 = 0;
+ skip_until_test("If", "EndIf", "ElseIf", 4, &type_until2);
+ if(!type_until2) ImbricatedTest--;
+ }
+ }
+ }
+ else{
+ yymsg(0, "Orphan ElseIf");
+ }
}
- #line 7992 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8142 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 230:
+#line 3011 "Gmsh.y"
+=======
+ case 234:
+/* Line 1787 of yacc.c */
+#line 3148 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 247:
- #line 3237 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3284 "Gmsh.y" /* yacc.c:1646 */
{
- (yyval.l) = List_Create(2, 1, sizeof(Shape));
- ExtrudeShapes(ROTATE, (yyvsp[-1].l),
- 0., 0., 0., (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d),
- NULL, (yyval.l));
- List_Delete((yyvsp[-1].l));
+ if(ImbricatedTest > 0){
+ if(statusImbricatedTests[ImbricatedTest]){
+ skip_until("If", "EndIf");
+ ImbricatedTest--;
+ }
+ }
+ else{
+ yymsg(0, "Orphan Else");
+ }
}
- #line 8004 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8158 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
+<<<<<<< HEAD
+<<<<<<< HEAD
+ case 231:
+#line 3019 "Gmsh.y"
+=======
+ case 235:
+/* Line 1787 of yacc.c */
+#line 3156 "Gmsh.y"
+>>>>>>> upstream/2.9.3+dfsg1
+=======
case 248:
- #line 3245 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ #line 3296 "Gmsh.y" /* yacc.c:1646 */
+ {
+ ImbricatedTest--;
+ if(ImbricatedTest < 0)
+ yymsg(1, "Orphan EndIf");
+ }
+ #line 8168 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 249:
+ #line 3308 "Gmsh.y" /* yacc.c:1646 */
+ {
+ (yyval.l) = List_Create(2, 1, sizeof(Shape));
+ ExtrudeShapes(TRANSLATE, (yyvsp[-1].l),
+ (yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+ NULL, (yyval.l));
+ List_Delete((yyvsp[-1].l));
+ }
+ #line 8180 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 250:
+ #line 3316 "Gmsh.y" /* yacc.c:1646 */
+ {
+ (yyval.l) = List_Create(2, 1, sizeof(Shape));
+ ExtrudeShapes(ROTATE, (yyvsp[-1].l),
+ 0., 0., 0., (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d),
+ NULL, (yyval.l));
+ List_Delete((yyvsp[-1].l));
+ }
+ #line 8192 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 251:
+ #line 3324 "Gmsh.y" /* yacc.c:1646 */
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[-1].l),
@@@ -16308,50 -8697,22 +11679,36 @@@
yymsg(0, "Method 'QuadTriDbl' deprecated. Use 'QuadTriAddVerts' instead, "
"which has no requirement for the number of extrusion layers and meshes "
"with body-centered vertices.");
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 277:
+#line 3354 "Gmsh.y"
+=======
}
- #line 8514 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8702 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
- <<<<<<< HEAD
- case 281:
- /* Line 1787 of yacc.c */
- #line 3491 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 294:
- #line 3580 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ case 297:
+ #line 3659 "Gmsh.y" /* yacc.c:1646 */
{
yymsg(0, "Method 'QuadTriDbl' deprecated. Use 'QuadTriAddVerts' instead, "
"which has no requirement for the number of extrusion layers and meshes "
"with body-centered vertices.");
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 278:
+#line 3360 "Gmsh.y"
+=======
}
- #line 8524 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 8712 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
- <<<<<<< HEAD
- case 282:
- /* Line 1787 of yacc.c */
- #line 3497 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 295:
- #line 3586 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ case 298:
+ #line 3665 "Gmsh.y" /* yacc.c:1646 */
{
extr.mesh.QuadToTri = QUADTRI_ADDVERTS_1;
}
@@@ -18731,32 -10293,13 +13289,32 @@@
else
(yyval.d) = s.value[index];
}
+<<<<<<< HEAD
+ Free((yyvsp[(1) - (4)].c));
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 380:
+#line 4350 "Gmsh.y"
+ {
+ (yyval.d) = gmsh_yysymbols.count((yyvsp[(3) - (4)].c));
+ Free((yyvsp[(3) - (4)].c));
+ ;}
+ break;
+
+ case 381:
+#line 4355 "Gmsh.y"
+=======
+=======
Free((yyvsp[-3].c));
+>>>>>>> upstream/2.10.1+dfsg1
}
- #line 10105 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 10299 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
- case 405:
- #line 4724 "Gmsh.y" /* yacc.c:1646 */
+ case 409:
+ #line 4804 "Gmsh.y" /* yacc.c:1646 */
{
int index = (int)(yyvsp[-1].d);
if(!gmsh_yysymbols.count((yyvsp[-3].c))){
@@@ -18868,20 -10394,12 +13409,13 @@@
(yyval.d) = (s.value[0] += (yyvsp[0].i));
}
Free((yyvsp[-1].c));
+>>>>>>> upstream/2.10.1+dfsg1
}
- #line 10205 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 10399 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
- <<<<<<< HEAD
- case 388:
- /* Line 1787 of yacc.c */
- #line 4532 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 411:
- #line 4800 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ case 415:
+ #line 4880 "Gmsh.y" /* yacc.c:1646 */
{
int index = (int)(yyvsp[-2].d);
if(!gmsh_yysymbols.count((yyvsp[-4].c))){
@@@ -18996,31 -10481,13 +13497,24 @@@
else
(yyval.d) = (s.value[index] += (yyvsp[0].i));
}
+<<<<<<< HEAD
+ Free((yyvsp[(1) - (5)].c));
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 386:
+#line 4429 "Gmsh.y"
+=======
+=======
- Free((yyvsp[-4].c));
- >>>>>>> upstream/2.10.1+dfsg1
- }
- #line 10293 "Gmsh.tab.cpp" /* yacc.c:1646 */
- break;
-
- <<<<<<< HEAD
- case 392:
- /* Line 1787 of yacc.c */
- #line 4600 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 415:
- #line 4875 "Gmsh.y" /* yacc.c:1646 */
+ Free((yyvsp[-4].c));
+>>>>>>> upstream/2.10.1+dfsg1
+ }
+ #line 10487 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ break;
+
+ case 419:
+ #line 4955 "Gmsh.y" /* yacc.c:1646 */
{
NumberOption(GMSH_GET, (yyvsp[-2].c), 0, (yyvsp[0].c), (yyval.d));
Free((yyvsp[-2].c)); Free((yyvsp[0].c));
@@@ -20688,26 -11446,12 +14473,19 @@@
std::string action = Msg::GetOnelabAction();
(yyval.c) = (char *)Malloc(action.size() + 1);
strcpy((yyval.c), action.c_str());
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 450:
+#line 5005 "Gmsh.y"
+=======
}
- #line 11249 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 11451 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
- <<<<<<< HEAD
- case 467:
- /* Line 1787 of yacc.c */
- #line 5294 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 491:
- #line 5576 "Gmsh.y" /* yacc.c:1646 */
- >>>>>>> upstream/2.10.1+dfsg1
+ case 496:
+ #line 5660 "Gmsh.y" /* yacc.c:1646 */
{
const char *env = GetEnvironmentVar((yyvsp[-1].c));
if(!env) env = "";
@@@ -20735,32 -11468,14 +14502,26 @@@
std::string s = Msg::GetString((yyvsp[-3].c), (yyvsp[-1].c));
(yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
strcpy((yyval.c), s.c_str());
+<<<<<<< HEAD
+ Free((yyvsp[(3) - (6)].c));
+ Free((yyvsp[(5) - (6)].c));
+<<<<<<< HEAD
+ ;}
+ break;
+
+ case 452:
+#line 5021 "Gmsh.y"
+=======
+=======
Free((yyvsp[-3].c));
Free((yyvsp[-1].c));
+>>>>>>> upstream/2.10.1+dfsg1
}
- #line 11273 "Gmsh.tab.cpp" /* yacc.c:1646 */
+ #line 11475 "Gmsh.tab.cpp" /* yacc.c:1646 */
break;
- <<<<<<< HEAD
- case 469:
- /* Line 1787 of yacc.c */
- #line 5310 "Gmsh.y"
- >>>>>>> upstream/2.9.3+dfsg1
- =======
- case 493:
- #line 5592 "Gmsh.y" /* yacc.c:1646 */
+ case 498:
+ #line 5676 "Gmsh.y" /* yacc.c:1646 */
{
std::string s = Msg::GetOnelabString((yyvsp[-1].c));
(yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
diff --cc Parser/Gmsh.tab.hpp
index 8fc0ff6,69761c8..73d38fb
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@@ -523,190 -56,187 +523,197 @@@ extern int gmsh_yydebug
tMPI_Size = 266,
tEuclidian = 267,
tCoordinates = 268,
- tExp = 269,
- tLog = 270,
- tLog10 = 271,
- tSqrt = 272,
- tSin = 273,
- tAsin = 274,
- tCos = 275,
- tAcos = 276,
- tTan = 277,
- tRand = 278,
- tAtan = 279,
- tAtan2 = 280,
- tSinh = 281,
- tCosh = 282,
- tTanh = 283,
- tFabs = 284,
- tFloor = 285,
- tCeil = 286,
- tRound = 287,
- tFmod = 288,
- tModulo = 289,
- tHypot = 290,
- tList = 291,
- tPrintf = 292,
- tError = 293,
- tStr = 294,
- tSprintf = 295,
- tStrCat = 296,
- tStrPrefix = 297,
- tStrRelative = 298,
- tStrReplace = 299,
- tFind = 300,
- tStrFind = 301,
- tStrCmp = 302,
- tStrChoice = 303,
- tTextAttributes = 304,
- tBoundingBox = 305,
- tDraw = 306,
- tSetChanged = 307,
- tToday = 308,
- tFixRelativePath = 309,
- tCurrentDirectory = 310,
- tSyncModel = 311,
- tNewModel = 312,
- tOnelabAction = 313,
- tOnelabRun = 314,
- tCpu = 315,
- tMemory = 316,
- tTotalMemory = 317,
- tCreateTopology = 318,
- tCreateTopologyNoHoles = 319,
- tDistanceFunction = 320,
- tDefineConstant = 321,
- tUndefineConstant = 322,
- tDefineNumber = 323,
- tDefineString = 324,
- tSetNumber = 325,
- tSetString = 326,
- tPoint = 327,
- tCircle = 328,
- tEllipse = 329,
- tLine = 330,
- tSphere = 331,
- tPolarSphere = 332,
- tSurface = 333,
- tSpline = 334,
- tVolume = 335,
- tCharacteristic = 336,
- tLength = 337,
- tParametric = 338,
- tElliptic = 339,
- tRefineMesh = 340,
- tAdaptMesh = 341,
- tRelocateMesh = 342,
- tPlane = 343,
- tRuled = 344,
- tTransfinite = 345,
- tComplex = 346,
- tPhysical = 347,
- tCompound = 348,
- tPeriodic = 349,
- tUsing = 350,
- tPlugin = 351,
- tDegenerated = 352,
- tRecursive = 353,
- tRotate = 354,
- tTranslate = 355,
- tSymmetry = 356,
- tDilate = 357,
- tExtrude = 358,
- tLevelset = 359,
- tAffine = 360,
- tRecombine = 361,
- tSmoother = 362,
- tSplit = 363,
- tDelete = 364,
- tCoherence = 365,
- tIntersect = 366,
- tMeshAlgorithm = 367,
- tReverse = 368,
- tLayers = 369,
- tScaleLast = 370,
- tHole = 371,
- tAlias = 372,
- tAliasWithOptions = 373,
- tCopyOptions = 374,
- tQuadTriAddVerts = 375,
- tQuadTriNoNewVerts = 376,
- tQuadTriSngl = 377,
- tQuadTriDbl = 378,
- tRecombLaterals = 379,
- tTransfQuadTri = 380,
- tText2D = 381,
- tText3D = 382,
- tInterpolationScheme = 383,
- tTime = 384,
- tCombine = 385,
- tBSpline = 386,
- tBezier = 387,
- tNurbs = 388,
- tNurbsOrder = 389,
- tNurbsKnots = 390,
- tColor = 391,
- tColorTable = 392,
- tFor = 393,
- tIn = 394,
- tEndFor = 395,
- tIf = 396,
- tEndIf = 397,
- tExit = 398,
- tAbort = 399,
- tField = 400,
- tReturn = 401,
- tCall = 402,
- tMacro = 403,
- tShow = 404,
- tHide = 405,
- tGetValue = 406,
- tGetEnv = 407,
- tGetString = 408,
- tGetNumber = 409,
- tHomology = 410,
- tCohomology = 411,
- tBetti = 412,
- tSetOrder = 413,
- tExists = 414,
- tFileExists = 415,
- tGMSH_MAJOR_VERSION = 416,
- tGMSH_MINOR_VERSION = 417,
- tGMSH_PATCH_VERSION = 418,
- tGmshExecutableName = 419,
- tSetPartition = 420,
- tAFFECTPLUS = 421,
- tAFFECTMINUS = 422,
- tAFFECTTIMES = 423,
- tAFFECTDIVIDE = 424,
- tOR = 425,
- tAND = 426,
- tEQUAL = 427,
- tNOTEQUAL = 428,
- tLESSOREQUAL = 429,
- tGREATEROREQUAL = 430,
- tPLUSPLUS = 431,
- tMINUSMINUS = 432,
- UNARYPREC = 433
+ tTestLevel = 269,
+ tExp = 270,
+ tLog = 271,
+ tLog10 = 272,
+ tSqrt = 273,
+ tSin = 274,
+ tAsin = 275,
+ tCos = 276,
+ tAcos = 277,
+ tTan = 278,
+ tRand = 279,
+ tAtan = 280,
+ tAtan2 = 281,
+ tSinh = 282,
+ tCosh = 283,
+ tTanh = 284,
+ tFabs = 285,
+ tFloor = 286,
+ tCeil = 287,
+ tRound = 288,
+ tFmod = 289,
+ tModulo = 290,
+ tHypot = 291,
+ tList = 292,
+ tPrintf = 293,
+ tError = 294,
+ tStr = 295,
+ tSprintf = 296,
+ tStrCat = 297,
+ tStrPrefix = 298,
+ tStrRelative = 299,
+ tStrReplace = 300,
+ tFind = 301,
+ tStrFind = 302,
+ tStrCmp = 303,
+ tStrChoice = 304,
+ tUpperCase = 305,
+ tLowerCase = 306,
+ tLowerCaseIn = 307,
+ tTextAttributes = 308,
+ tBoundingBox = 309,
+ tDraw = 310,
+ tSetChanged = 311,
+ tToday = 312,
+ tFixRelativePath = 313,
+ tCurrentDirectory = 314,
+ tSyncModel = 315,
+ tNewModel = 316,
+ tOnelabAction = 317,
+ tOnelabRun = 318,
+ tCpu = 319,
+ tMemory = 320,
+ tTotalMemory = 321,
+ tCreateTopology = 322,
+ tCreateTopologyNoHoles = 323,
+ tDistanceFunction = 324,
+ tDefineConstant = 325,
+ tUndefineConstant = 326,
+ tDefineNumber = 327,
+ tDefineString = 328,
+ tSetNumber = 329,
+ tSetString = 330,
+ tPoint = 331,
+ tCircle = 332,
+ tEllipse = 333,
+ tLine = 334,
+ tSphere = 335,
+ tPolarSphere = 336,
+ tSurface = 337,
+ tSpline = 338,
+ tVolume = 339,
+ tCharacteristic = 340,
+ tLength = 341,
+ tParametric = 342,
+ tElliptic = 343,
+ tRefineMesh = 344,
+ tAdaptMesh = 345,
+ tRelocateMesh = 346,
+ tPlane = 347,
+ tRuled = 348,
+ tTransfinite = 349,
+ tComplex = 350,
+ tPhysical = 351,
+ tCompound = 352,
+ tPeriodic = 353,
+ tUsing = 354,
+ tPlugin = 355,
+ tDegenerated = 356,
+ tRecursive = 357,
+ tRotate = 358,
+ tTranslate = 359,
+ tSymmetry = 360,
+ tDilate = 361,
+ tExtrude = 362,
+ tLevelset = 363,
+ tAffine = 364,
+ tRecombine = 365,
+ tSmoother = 366,
+ tSplit = 367,
+ tDelete = 368,
+ tCoherence = 369,
+ tIntersect = 370,
+ tMeshAlgorithm = 371,
+ tReverse = 372,
+ tLayers = 373,
+ tScaleLast = 374,
+ tHole = 375,
+ tAlias = 376,
+ tAliasWithOptions = 377,
+ tCopyOptions = 378,
+ tQuadTriAddVerts = 379,
+ tQuadTriNoNewVerts = 380,
+ tQuadTriSngl = 381,
+ tQuadTriDbl = 382,
+ tRecombLaterals = 383,
+ tTransfQuadTri = 384,
+ tText2D = 385,
+ tText3D = 386,
+ tInterpolationScheme = 387,
+ tTime = 388,
+ tCombine = 389,
+ tBSpline = 390,
+ tBezier = 391,
+ tNurbs = 392,
+ tNurbsOrder = 393,
+ tNurbsKnots = 394,
+ tColor = 395,
+ tColorTable = 396,
+ tFor = 397,
+ tIn = 398,
+ tEndFor = 399,
+ tIf = 400,
+ tElseIf = 401,
+ tElse = 402,
+ tEndIf = 403,
+ tExit = 404,
+ tAbort = 405,
+ tField = 406,
+ tReturn = 407,
+ tCall = 408,
+ tMacro = 409,
+ tShow = 410,
+ tHide = 411,
+ tGetValue = 412,
+ tGetEnv = 413,
+ tGetString = 414,
+ tGetNumber = 415,
+ tHomology = 416,
+ tCohomology = 417,
+ tBetti = 418,
+ tExists = 419,
+ tFileExists = 420,
+ tGMSH_MAJOR_VERSION = 421,
+ tGMSH_MINOR_VERSION = 422,
+ tGMSH_PATCH_VERSION = 423,
+ tGmshExecutableName = 424,
+ tSetPartition = 425,
+ tNameFromString = 426,
+ tStringFromName = 427,
+ tAFFECTPLUS = 428,
+ tAFFECTMINUS = 429,
+ tAFFECTTIMES = 430,
+ tAFFECTDIVIDE = 431,
+ tOR = 432,
+ tAND = 433,
+ tEQUAL = 434,
+ tNOTEQUAL = 435,
+ tLESSOREQUAL = 436,
+ tGREATEROREQUAL = 437,
+ tPLUSPLUS = 438,
+ tMINUSMINUS = 439,
+ UNARYPREC = 440
};
+>>>>>>> upstream/2.10.1+dfsg1
#endif
+>>>>>>> upstream/2.9.3+dfsg1
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+<<<<<<< HEAD
+typedef union YYSTYPE
+<<<<<<< HEAD
+#line 100 "Gmsh.y"
+=======
+>>>>>>> upstream/2.9.3+dfsg1
+=======
union YYSTYPE
+>>>>>>> upstream/2.10.1+dfsg1
{
- #line 105 "Gmsh.y" /* yacc.c:1909 */
+ #line 109 "Gmsh.y" /* yacc.c:1909 */
char *c;
int i;
@@@ -715,14 -245,8 +722,14 @@@
double v[5];
Shape s;
List_T *l;
+<<<<<<< HEAD
+}
+/* Line 1529 of yacc.c. */
+#line 391 "Gmsh.tab.hpp"
+ YYSTYPE;
+=======
- #line 243 "Gmsh.tab.hpp" /* yacc.c:1909 */
+ #line 250 "Gmsh.tab.hpp" /* yacc.c:1909 */
};
typedef union YYSTYPE YYSTYPE;
diff --cc Parser/Gmsh.y
index bb86bbe,e266227..f95f98d
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@@ -120,19 -124,11 +124,19 @@@ struct doubleXstring
%token tAtan tAtan2 tSinh tCosh tTanh tFabs tFloor tCeil tRound
%token tFmod tModulo tHypot tList
%token tPrintf tError tStr tSprintf tStrCat tStrPrefix tStrRelative tStrReplace
- %token tFind tStrFind tStrCmp tStrChoice
+ %token tFind tStrFind tStrCmp tStrChoice tUpperCase tLowerCase tLowerCaseIn
%token tTextAttributes
+<<<<<<< HEAD
+<<<<<<< HEAD
+%token tBoundingBox tDraw tSetChanged tToday tOnelabAction tSyncModel
+=======
+%token tBoundingBox tDraw tSetChanged tToday tFixRelativePath tSyncModel
+=======
%token tBoundingBox tDraw tSetChanged tToday tFixRelativePath tCurrentDirectory
%token tSyncModel tNewModel
+>>>>>>> upstream/2.10.1+dfsg1
%token tOnelabAction tOnelabRun
+>>>>>>> upstream/2.9.3+dfsg1
%token tCpu tMemory tTotalMemory
%token tCreateTopology tCreateTopologyNoHoles
%token tDistanceFunction tDefineConstant tUndefineConstant
diff --cc Parser/Gmsh.yy.cpp
index 5637dbb,5a15b33..e6f91ce
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@@ -2788,17 -1855,8 +1855,16 @@@ return tEuclidian
YY_BREAK
case 87:
YY_RULE_SETUP
+<<<<<<< HEAD
+#line 166 "Gmsh.l"
+<<<<<<< HEAD
+return tFileExists;
+=======
+return tFind;
+>>>>>>> upstream/2.9.3+dfsg1
+=======
#line 165 "Gmsh.l"
- return tExists;
- >>>>>>> upstream/2.10.1+dfsg1
+ return tError;
YY_BREAK
case 88:
YY_RULE_SETUP
@@@ -2999,40 -1935,8 +1943,40 @@@ return tGetValue
YY_BREAK
case 103:
YY_RULE_SETUP
+<<<<<<< HEAD
+#line 184 "Gmsh.l"
+return tHypot;
+>>>>>>> upstream/2.9.3+dfsg1
+ YY_BREAK
+case 104:
+YY_RULE_SETUP
+#line 186 "Gmsh.l"
+<<<<<<< HEAD
+return tIntersect;
+=======
+return tIn;
+>>>>>>> upstream/2.9.3+dfsg1
+ YY_BREAK
+case 105:
+YY_RULE_SETUP
+#line 187 "Gmsh.l"
+<<<<<<< HEAD
+return tInterpolationScheme;
+ YY_BREAK
+case 106:
+YY_RULE_SETUP
+#line 189 "Gmsh.l"
+return tNurbsKnots;
+ YY_BREAK
+case 107:
+YY_RULE_SETUP
+#line 191 "Gmsh.l"
+return tLength;
+=======
+return tIf;
+=======
#line 183 "Gmsh.l"
- return tGMSH_PATCH_VERSION;
+ return tGMSH_MAJOR_VERSION;
YY_BREAK
case 104:
YY_RULE_SETUP
diff --cc Post/adaptiveData.cpp
index 7b93c01,a0a3572..f4c360b
--- a/Post/adaptiveData.cpp
+++ b/Post/adaptiveData.cpp
@@@ -1382,21 -1413,18 +1413,21 @@@ void adaptiveElements<T>::addInView(dou
break;
case 9:
numEle = in->getNumPrisms();
- outNb = (numComp == 1) ? &out->NbSI : &out->NbVI;
- outList = (numComp == 1) ? &out->SI : &out->VI;
+ outNb = (numComp == 1) ? &out->NbSI : ((numComp == 3) ? &out->NbVI : &out->NbTI);
+ outList = (numComp == 1) ? &out->SI : ((numComp == 3) ? &out->VI : &out->TI);
break;
+<<<<<<< HEAD
+=======
case 8:
numEle = in->getNumPyramids();
- outNb = (numComp == 1) ? &out->NbSY : &out->NbVY;
- outList = (numComp == 1) ? &out->SY : &out->VY;
+ outNb = (numComp == 1) ? &out->NbSY : ((numComp == 3) ? &out->NbVY : &out->NbTY);
+ outList = (numComp == 1) ? &out->SY : ((numComp == 3) ? &out->VY : &out->TY);
break;
+>>>>>>> upstream/2.9.3+dfsg1
case 12:
numEle = in->getNumHexahedra();
- outNb = (numComp == 1) ? &out->NbSH : &out->NbVH;
- outList = (numComp == 1) ? &out->SH : &out->VH;
+ outNb = (numComp == 1) ? &out->NbSH : ((numComp == 3) ? &out->NbVH : &out->NbTH);
+ outList = (numComp == 1) ? &out->SH : ((numComp == 3) ? &out->VH : &out->TH);
break;
}
if(!numEle) return;
@@@ -1450,17 -1502,18 +1505,22 @@@
}
}
- adaptiveData::adaptiveData(PViewData *data)
+ adaptiveData::adaptiveData(PViewData *data, bool outDataInit)
: _step(-1), _level(-1), _tol(-1.), _inData(data),
_points(0), _lines(0), _triangles(0), _quadrangles(0),
+<<<<<<< HEAD
+ _tetrahedra(0), _hexahedra(0), _prisms(0)
+=======
_tetrahedra(0), _hexahedra(0), _prisms(0),_pyramids(0)
+>>>>>>> upstream/2.9.3+dfsg1
{
- _outData = new PViewDataList(true);
- _outData->setName(data->getName() + "_adapted");
+ if(outDataInit == true) { // For visualization of the adapted view in GMSH GUI only
+ _outData = new PViewDataList(true);
+ _outData->setName(data->getName() + "_adapted");
+ }
+ else {
+ _outData = 0; // For external used
+ }
std::vector<fullMatrix<double>*> p;
if(_inData->getNumPoints()){
_inData->getInterpolationMatrices(TYPE_PNT, p);
diff --cc contrib/mobile/Android/src/org/geuz/onelab/Model.java
index ea97be6,6cdc581..10c7692
--- a/contrib/mobile/Android/src/org/geuz/onelab/Model.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/Model.java
@@@ -56,11 -31,12 +57,18 @@@ class Model
options.inDither = true;
_bitmap = BitmapFactory.decodeFile(f.toString(), options);
}
+<<<<<<< HEAD
+ public void setUrl(Uri url) {
+ _url = url;
+ }
+=======
public void setUrl(Uri url) { _url = url; }
+>>>>>>> upstream/2.9.3+dfsg1
}
+
+ class ModelComp implements Comparator<Model>{
+ @Override
+ public int compare(Model e1, Model e2) {
+ return e1.getName().compareTo(e2.getName());
+ }
+ }
diff --cc contrib/mobile/Android/src/org/geuz/onelab/ModelArrayAdapter.java
index 63e5399,7e13422..dc340d6
--- a/contrib/mobile/Android/src/org/geuz/onelab/ModelArrayAdapter.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/ModelArrayAdapter.java
@@@ -14,12 -15,8 +15,11 @@@ import android.widget.TextView
public class ModelArrayAdapter extends ArrayAdapter<Model> {
private List<Model> _models;
+<<<<<<< HEAD
+ public ModelArrayAdapter(Context c) {
+=======
public ModelArrayAdapter(Context c)
- {
- >>>>>>> upstream/2.9.3+dfsg1
+ {
super(c, R.layout.model);
_models = new ArrayList<Model>();
}
diff --cc contrib/mobile/Android/src/org/geuz/onelab/ModelList.java
index 3c6a1be,2af3c65..423c19f
--- a/contrib/mobile/Android/src/org/geuz/onelab/ModelList.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/ModelList.java
@@@ -26,25 -26,9 +26,26 @@@ import android.widget.AdapterView
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.Toast;
+ import android.util.Log;
public class ModelList extends Activity {
+<<<<<<< HEAD
+
+ private ModelArrayAdapter _modelArrayAdapter;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ _modelArrayAdapter = new ModelArrayAdapter(this);
+ try {
+ this.getModels();
+ } catch (XmlPullParserException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+=======
private ModelArrayAdapter _modelArrayAdapter;
@@@ -128,43 -126,18 +152,25 @@@
}
@Override
+<<<<<<< HEAD
+ public boolean onCreateOptionsMenu(Menu menu) {
+=======
public boolean onCreateOptionsMenu(Menu menu)
{
+>>>>>>> upstream/2.9.3+dfsg1
MenuItem about = menu.add("About");
about.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- MenuItem loadFile = menu.add(R.string.button_open_file);
- loadFile.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+
return super.onCreateOptionsMenu(menu);
}
@Override
+<<<<<<< HEAD
+ public boolean onMenuItemSelected(int featureId, MenuItem item) {
+=======
public boolean onMenuItemSelected(int featureId, MenuItem item)
{
- >>>>>>> upstream/2.9.3+dfsg1
- if(item.getTitle().equals(getString(R.string.button_open_file))) {
- Intent fileBrowserIntent = new Intent();
- fileBrowserIntent.setAction(Intent.ACTION_GET_CONTENT);
- fileBrowserIntent.setType("file/*");
- try {
- startActivityForResult(fileBrowserIntent, 1);
- }
- catch(ActivityNotFoundException e) {
- <<<<<<< HEAD
- Toast.makeText(this, "No application found on your device to open the files.", Toast.LENGTH_LONG).show();
- =======
- Toast.makeText(this, "No application found on your device to open the files.",
- Toast.LENGTH_LONG).show();
- >>>>>>> upstream/2.9.3+dfsg1
- }
- }
- else if(item.getTitle().equals("About")) {
+ if(item.getTitle().equals("About")) {
Intent intent = new Intent(ModelList.this, AboutActivity.class);
startActivity(intent);
}
diff --cc contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java
index 24099ba,731f10b..bb283e6
--- a/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java
@@@ -16,31 -18,12 +18,17 @@@ import android.os.Message
import android.util.Log;
public class SplashScreen extends Activity{
- private static final int SPLASHTIME = 1000; // duration for the splash screen in milliseconds
-
- private static final int STOPSPLASH = 0;
- private static final int EXITAPP = 1;
-
- private Intent newIntent;
+<<<<<<< HEAD
+ private final Handler handler = new Handler()
+ {
+=======
private final Handler handler = new Handler() {
+>>>>>>> upstream/2.9.3+dfsg1
public void handleMessage(Message msg) {
- switch (msg.what) {
- case STOPSPLASH:
- startActivity(newIntent);
- finish();
- break;
- case EXITAPP:
- finish();
- break;
- default:
- break;
- }
+ Intent i = new Intent(SplashScreen.this, ModelList.class);
+ startActivity(i);
+ finish();
};
};
diff --cc contrib/mobile/CMakeLists.txt
index 22e529b,3f42cca..9da370f
--- a/contrib/mobile/CMakeLists.txt
+++ b/contrib/mobile/CMakeLists.txt
@@@ -70,39 -76,32 +76,38 @@@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_
# add target
add_custom_target(xcodeProject
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/models/
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/Onelab/
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/iOS/Onelab/
- ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
+ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/iOS/Onelab.xcodeproj/
- ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab.xcodeproj/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawContext.cpp ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawContext.h ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawGeom.cpp ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawMesh.cpp ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawString.cpp ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawString.h ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Trackball.cpp ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Trackball.h ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/movePosition.h ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/iosGModel.h ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/iosGModel.cpp ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${GETDP_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/GetDP.framework/
+ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}.xcodeproj/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawContext.cpp ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawContext.h ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawGeom.cpp ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawMesh.cpp ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawString.cpp ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/drawString.h ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Trackball.cpp ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Trackball.h ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/iosUtils.h ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/iosUtils.cpp ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/frameworks/
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${GETDP_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/frameworks/GetDP.framework/
COMMAND ${CMAKE_COMMAND} -E remove ${GMSH_FRAMEWORK}/Headers/gmsh
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${GMSH_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/Gmsh.framework/
- COMMAND ${CMAKE_COMMAND} -E create_symlink . ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/Gmsh.framework/Headers/gmsh
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${GMSH_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/frameworks/Gmsh.framework/
+ COMMAND ${CMAKE_COMMAND} -E create_symlink . ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/frameworks/Gmsh.framework/Headers/gmsh
COMMAND ${CMAKE_COMMAND} -E create_symlink . ${GMSH_FRAMEWORK}/Headers/gmsh
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${PETSC_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/petsc.framework/
- COMMAND ${CMAKE_COMMAND} -E copy_directory ${SLEPC_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/frameworks/slepc.framework/
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${PETSC_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/frameworks/petsc.framework/
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${SLEPC_FRAMEWORK}/ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/frameworks/slepc.framework/
)
+<<<<<<< HEAD
+ foreach(DIR ${BENCHMARKS})
+ get_filename_component(DIRNAME ${DIR} NAME)
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${DIR} ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/files/${DIRNAME})
+=======
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove_directory
- ${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/files)
+ ${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/files)
foreach(DIR ${BENCHMARKS})
get_filename_component(DIRNAME ${DIR} NAME)
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory
@@@ -112,18 -111,29 +117,30 @@@
get_filename_component(IMGNAME ${IMG} NAME)
if(NOT (IMGNAME MATCHES ".*_128.png"))
add_custom_command(TARGET xcodeProject POST_BUILD COMMAND ${CMAKE_COMMAND} -E remove
- "${CMAKE_CURRENT_BINARY_DIR}/Onelab/Onelab/files/${DIRNAME}/${IMGNAME}")
+ "${CMAKE_CURRENT_BINARY_DIR}/${APPNAME}/${APPNAME}/files/${DIRNAME}/${IMGNAME}")
endif()
endforeach(IMG)
+>>>>>>> upstream/2.9.3+dfsg1
endforeach(DIR)
-
+ if("${APPNAME}" STREQUAL "BBEMG")
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
+ sed -e \"s|Onelab|BBEMG|\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj")
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
+ sed -e \"s|Images.xcassets|Images_BBEMG.xcassets|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj")
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
+ sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPhoneiPodStoryboard.storyboard")
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
+ sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPadStoryboard.storyboard")
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
+ sed -e \"s|Onelab/Mobile|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/AboutViewController.mm")
+ add_custom_command(TARGET xcodeProject POST_BUILD COMMAND
+ sed -e \"s|onelab.info|www.bbemg.be|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/AboutViewController.mm")
+ endif("${APPNAME}" STREQUAL "BBEMG")
message(STATUS "")
- message(STATUS "ONELAB for iOS successfully configured:")
- message(STATUS " * Run `make xcodeProject' to create the XCode project")
- message(STATUS " * Then run `open Onelab/Onelab.xcodeproj' to launch XCode")
+ message(STATUS "${APPNAME} for iOS successfully configured:")
+ message(STATUS " * Run 'make xcodeProject' to create the XCode project")
+ message(STATUS " * Then run 'open ${APPNAME}/${APPNAME}.xcodeproj' to launch XCode")
message(STATUS "")
-
endif(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS)
if(ENABLE_BUILD_ANDROID)
diff --cc contrib/mobile/androidUtils.cpp
index ee41ed2,86e8682..242b6fe
--- a/contrib/mobile/androidUtils.cpp
+++ b/contrib/mobile/androidUtils.cpp
@@@ -310,15 -243,10 +310,15 @@@ extern "C"
JNIEXPORT jobjectArray JNICALL Java_org_geuz_onelab_Gmsh_getParams
(JNIEnv *env, jobject obj)
{
- jclass stringClass = env->FindClass( "java/lang/String" );
+ jclass stringClass = env->FindClass("java/lang/String");
std::vector<std::string> tmp = onelab::server::instance()->toChar();
+<<<<<<< HEAD
+ for(unsigned int i=0;i<tmp.size();i++)
+ for(unsigned int j=0; j<tmp[i].size();j++)
+=======
for(unsigned int i = 0; i < tmp.size(); i++)
for(unsigned int j = 0; j < tmp[i].size(); j++)
+>>>>>>> upstream/2.9.3+dfsg1
if(tmp[i][j] == '\0') tmp[i][j] = 0x03;
jobjectArray params = env->NewObjectArray(tmp.size(), stringClass, 0);
for(int i=0; i<tmp.size();i++){
diff --cc contrib/mobile/iOS/Onelab/ModelViewController.mm
index 734ff4f,ea44a84..00c63eb
--- a/contrib/mobile/iOS/Onelab/ModelViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ModelViewController.mm
@@@ -379,13 -374,9 +374,13 @@@ void getBitmap(void *self, const char *
-(void) getBitmapFromStringObjC:(const char *)text withTextSize:(int)textsize inMap:(unsigned char **)map inHeight:(int *)height inWidth:(int *)width inRealWidth:(int *) realWidth
{
+<<<<<<< HEAD
+ UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 1024, textsize)];
+=======
UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 1024, 7*textsize/6)];
+>>>>>>> upstream/2.9.3+dfsg1
lbl.font = [UIFont systemFontOfSize:textsize];
- [lbl setText:[NSString stringWithCString:text encoding:[NSString defaultCStringEncoding]]];
+ [lbl setText:[Utils getStringFromCString:text]];
[lbl setBackgroundColor:[UIColor clearColor]];
CGSize lblSize = [[lbl text] sizeWithAttributes:@{NSFontAttributeName:[lbl font]}];
*realWidth = lblSize.width;
diff --cc contrib/mobile/iOS/Onelab/Parameter.mm
index 3b43f36,d78297a..1aad74d
--- a/contrib/mobile/iOS/Onelab/Parameter.mm
+++ b/contrib/mobile/iOS/Onelab/Parameter.mm
@@@ -142,32 -146,8 +146,32 @@@
-(void)selectValue
{
+<<<<<<< HEAD
+ std::vector<onelab::number> number;
+ onelab::server::instance()->get(number,[name UTF8String]);
+ if(number.size() < 1) return;
+ UIActionSheet *popupSelectValue = [[UIActionSheet alloc] initWithTitle:[NSString stringWithFormat:@"%s", number[0].getLabel().c_str()] delegate:self cancelButtonTitle:nil destructiveButtonTitle:nil otherButtonTitles:nil];
+ std::vector<double> choices = number[0].getChoices();
+ for(int i=0;i<choices.size();i++)
+ [popupSelectValue addButtonWithTitle:[NSString stringWithFormat:@"%s", number[0].getValueLabel(choices[i]).c_str()]];
+ [popupSelectValue addButtonWithTitle:@"Cancel"];
+ [popupSelectValue setCancelButtonIndex:popupSelectValue.numberOfButtons - 1];
+ [popupSelectValue showInView:button];
+}
+
+-(void)actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex
+{
+ std::vector<onelab::number> number;
+ onelab::server::instance()->get(number,[name UTF8String]);
+ if(number.size() < 1) return;
+ if(buttonIndex > number[0].getChoices().size() - 1) return; // cancel
+ double selected = number[0].getChoices()[buttonIndex];
+ number[0].setValue(selected);
+ onelab::server::instance()->set(number[0]);
+ [button setTitle:[NSString stringWithFormat:@"%s", number[0].getValueLabel(number[0].getValue()).c_str()] forState:UIControlStateNormal];
+=======
std::vector<onelab::number> numbers;
- onelab::server::instance()->get(numbers,[name UTF8String]);
+ onelab::server::instance()->get(numbers, [name UTF8String]);
if(numbers.size() < 1) return;
UIAlertController *alertController;
UIAlertAction *destroyAction;
@@@ -282,69 -266,9 +291,69 @@@
-(bool)isReadOnly
{
std::vector<onelab::number> number;
- onelab::server::instance()->get(number,[name UTF8String]);
+ onelab::server::instance()->get(number, [name UTF8String]);
if(number.size() < 1) return YES;
return number[0].getReadOnly();
+<<<<<<< HEAD
+}
+
++(double)getHeight
+{
+ return 40.0f;
+}
+ at end
+
+ at implementation ParameterNumberStepper
+-(id) initWithNumber:(onelab::number) number
+{
+ self = [super init];
+ if(self) {
+ name = [NSString stringWithCString:number.getName().c_str() encoding:[NSString defaultCStringEncoding]];
+ label.alpha = (number.getReadOnly())? 0.439216f : 1.0f;
+ stepper = [[UIStepper alloc] init];
+ [stepper setValue:number.getValue()];
+ [stepper setStepValue:1];
+ [stepper setMaximumValue:number.getMax()];
+ [stepper setMinimumValue:number.getMin()];
+ [stepper addTarget:self action:@selector(stepperValueChanged:) forControlEvents:UIControlEventValueChanged];
+ [label setText:[NSString stringWithFormat:@"%s %d" ,number.getShortName().c_str(), (int)number.getValue()]];
+ }
+ return self;
+}
+
+-(void)stepperValueChanged:(UIStepper *)sender
+{
+ std::vector<onelab::number> number;
+ onelab::server::instance()->get(number,[name UTF8String]);
+ if(number.size() < 1) return;
+ number[0].setValue(sender.value);
+ onelab::server::instance()->set(number[0]);
+ [label setText:[NSString stringWithFormat:@"%s %d" ,number[0].getShortName().c_str(), (int)number[0].getValue()]];
+ [super editValue];
+}
+
+-(void)refresh
+{
+ std::vector<onelab::number> number;
+ onelab::server::instance()->get(number,[name UTF8String]);
+ if(number.size() < 1) return;
+ [stepper setValue:number[0].getValue()];
+ [label setText:[NSString stringWithFormat:@"%s %d" ,number[0].getShortName().c_str(), (int)number[0].getValue()]];
+}
+
+-(void)setFrame:(CGRect)frame
+{
+ [stepper setFrame:frame];
+}
+
+-(UIStepper *)getStepper
+{
+ return stepper;
+}
+
++(double)getHeight
+{
+=======
}
+(double)getHeight
diff --cc contrib/mobile/iOS/Onelab/Utils.mm
index 6a71a2e,24757f7..bff1a66
--- a/contrib/mobile/iOS/Onelab/Utils.mm
+++ b/contrib/mobile/iOS/Onelab/Utils.mm
@@@ -43,7 -57,11 +63,12 @@@
return [Utils traverseResponderChainForUIViewController:nextResponder];
else
return nil;
+>>>>>>> upstream/2.9.3+dfsg1
}
+ + (NSString *) getStringFromCString:(const char*)s
+ {
+ return [NSString stringWithCString:s encoding:NSUTF8StringEncoding];
+ }
+
@end
diff --cc doc/texinfo/gmsh.texi
index 7fc6ec8,0535345..a8b92d3
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@@ -21,17 -21,8 +21,9 @@@
@c =========================================================================
@c %**start of header
@setfilename gmsh.info
- <<<<<<< HEAD
- <<<<<<< HEAD
- @set GMSH-VERSION 2.8
- @set COPYRIGHT @copyright{} 1997-2014 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
- =======
- @set GMSH-VERSION 2.9
- =======
- @set GMSH-VERSION 2.10
- >>>>>>> upstream/2.10.1+dfsg1
+ @set GMSH-VERSION 2.11
@set COPYRIGHT @copyright{} 1997-2015 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
+>>>>>>> upstream/2.9.3+dfsg1
@settitle Gmsh @value{GMSH-VERSION}
@footnotestyle separate
@setchapternewpage odd
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list