mesa: Changes to 'upstream-ubuntu'
Makefile | 27
configs/autoconf.in | 4
configs/darwin | 26
configs/default | 4
configure.ac | 8
docs/contents.html | 1
docs/llvmpipe.html | 204
docs/news.html | 7
docs/relnotes-7.10.3.html | 298
docs/relnotes.html | 2
src/gallium/SConscript | 1
src/gallium/auxiliary/draw/draw_pipe_clip.c | 62
src/gallium/auxiliary/draw/draw_vs.h | 3
src/gallium/auxiliary/draw/draw_vs_aos_io.c | 4
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 29
src/gallium/auxiliary/tgsi/tgsi_ureg.c | 2
src/gallium/drivers/llvmpipe/README | 153
src/gallium/drivers/llvmpipe/lp_fence.c | 3
src/gallium/drivers/r300/r300_blit.c | 37
src/gallium/drivers/r300/r300_context.h | 2
src/gallium/drivers/r300/r300_emit.c | 17
src/gallium/drivers/r300/r300_render.c | 16
src/gallium/drivers/r300/r300_state.c | 16
src/gallium/drivers/r300/r300_state_derived.c | 6
src/gallium/state_trackers/wgl/stw_ext_pbuffer.c | 87
src/gallium/state_trackers/wgl/stw_framebuffer.c | 101
src/gallium/state_trackers/wgl/stw_st.c | 11
src/gallium/state_trackers/wgl/stw_st.h | 4
src/gallium/winsys/r600/drm/radeon_pciid.c | 5
src/glsl/Makefile | 8
src/glsl/ast_function.cpp | 2
src/glsl/ast_to_hir.cpp | 148
src/glsl/builtin_function.cpp | 2
src/glsl/glcpp/glcpp-parse.c | 84
src/glsl/glcpp/glcpp-parse.y | 84
src/glsl/glsl_parser_extras.cpp | 2
src/glx/apple/Makefile | 5
src/glx/apple/apple_glx_pbuffer.c | 4
src/glx/apple/apple_glx_pixmap.c | 2
src/glx/apple/apple_visual.c | 2
src/glx/apple/apple_xgl_api_read.c | 4
src/glx/apple/apple_xgl_api_stereo.c | 4
src/glx/apple/apple_xgl_api_viewport.c | 2
src/glx/apple/glx_empty.c | 2
src/glx/apple/glx_error.c | 12
src/glx/apple/specs/enum.spec | 711
src/glx/apple/specs/enumext.spec | 507
src/glx/apple/specs/gl.spec |19112 ++++++++------
src/glx/apple/specs/gl.tm | 12
src/glx/apple/specs/glxenum.spec | 73
src/glx/apple/specs/glxenumext.spec | 56
src/glx/apple/specs/glxext.spec | 166
src/glx/applegl_glx.c | 45
src/glx/dri2_glx.c | 3
src/glx/glx_pbuffer.c | 2
src/glx/glxclient.h | 17
src/glx/glxcmds.c | 8
src/glx/glxcurrent.c | 6
src/glx/glxext.c | 18
src/mesa/drivers/dri/common/spantmp2.h | 122
src/mesa/drivers/dri/i965/brw_context.c | 18
src/mesa/drivers/dri/i965/brw_context.h | 8
src/mesa/drivers/dri/i965/brw_defines.h | 30
src/mesa/drivers/dri/i965/brw_eu_emit.c | 71
src/mesa/drivers/dri/i965/brw_fs.cpp | 8
src/mesa/drivers/dri/i965/brw_gs.c | 52
src/mesa/drivers/dri/i965/brw_gs.h | 5
src/mesa/drivers/dri/i965/brw_gs_emit.c | 32
src/mesa/drivers/dri/i965/brw_misc_state.c | 4
src/mesa/drivers/dri/i965/brw_vs_emit.c | 10
src/mesa/drivers/dri/i965/gen6_cc.c | 2
src/mesa/drivers/dri/i965/gen6_clip_state.c | 2
src/mesa/drivers/dri/i965/gen6_gs_state.c | 50
src/mesa/drivers/dri/i965/gen6_sampler_state.c | 2
src/mesa/drivers/dri/i965/gen6_scissor_state.c | 2
src/mesa/drivers/dri/i965/gen6_sf_state.c | 2
src/mesa/drivers/dri/i965/gen6_urb.c | 29
src/mesa/drivers/dri/i965/gen6_viewport_state.c | 2
src/mesa/drivers/dri/i965/gen6_vs_state.c | 9
src/mesa/drivers/dri/i965/gen6_wm_state.c | 8
src/mesa/drivers/dri/intel/intel_chipset.h | 13
src/mesa/drivers/dri/intel/intel_context.h | 30
src/mesa/drivers/dri/intel/intel_fbo.c | 2
src/mesa/drivers/dri/intel/intel_span.c | 77
src/mesa/drivers/dri/intel/intel_tex_copy.c | 13
src/mesa/drivers/dri/r300/compiler/memory_pool.c | 2
src/mesa/drivers/dri/r300/compiler/radeon_compiler_util.c | 121
src/mesa/drivers/dri/r300/compiler/radeon_compiler_util.h | 6
src/mesa/drivers/dri/r300/compiler/radeon_dataflow.c | 7
src/mesa/drivers/dri/r300/compiler/radeon_optimize.c | 36
src/mesa/drivers/dri/radeon/radeon_chipset.h | 5
src/mesa/drivers/dri/radeon/radeon_screen.c | 5
src/mesa/drivers/osmesa/osmesa.c | 28
src/mesa/main/buffers.c | 2
src/mesa/main/depthstencil.c | 3
src/mesa/main/dlist.c | 22
src/mesa/main/fbobject.c | 108
src/mesa/main/formats.c | 4
src/mesa/main/formats.h | 2
src/mesa/main/framebuffer.c | 2
src/mesa/main/get.c | 2
src/mesa/main/mtypes.h | 3
src/mesa/main/renderbuffer.c | 713
src/mesa/main/renderbuffer.h | 2
src/mesa/main/shaderapi.c | 4
src/mesa/main/teximage.c | 2
src/mesa/main/texstore.c | 14
src/mesa/main/uniforms.c | 4
src/mesa/main/version.h | 4
src/mesa/program/ir_to_mesa.cpp | 28
src/mesa/program/program_parse.tab.c | 1121
src/mesa/program/program_parse.tab.h | 13
src/mesa/program/program_parse.y | 29
src/mesa/program/program_parse_extra.c | 10
src/mesa/program/program_parser.h | 1
src/mesa/state_tracker/st_cb_blit.c | 14
src/mesa/state_tracker/st_cb_condrender.c | 11
src/mesa/state_tracker/st_cb_drawpixels.c | 18
src/mesa/state_tracker/st_cb_fbo.c | 17
src/mesa/state_tracker/st_cb_readpixels.c | 9
src/mesa/state_tracker/st_cb_texture.c | 23
src/mesa/state_tracker/st_context.h | 4
src/mesa/state_tracker/st_gen_mipmap.c | 19
src/mesa/state_tracker/st_texture.c | 4
src/mesa/swrast/s_blit.c | 3
src/mesa/swrast/s_clear.c | 8
src/mesa/swrast/s_readpix.c | 11
src/mesa/swrast/s_span.c | 5
src/mesa/vbo/vbo_exec_api.c | 12
src/mesa/vbo/vbo_save_api.c | 11
src/mesa/vbo/vbo_save_draw.c | 20
131 files changed, 15405 insertions(+), 9933 deletions(-)
New commits:
commit 2d0fd0703727b7eb2590cb887b1efb0aff43a2da
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Jun 13 16:10:26 2011 -0700
docs: Add change log to 7.10.3 release notes
diff --git a/docs/relnotes-7.10.3.html b/docs/relnotes-7.10.3.html
index aeb20b5..423d89a 100644
--- a/docs/relnotes-7.10.3.html
+++ b/docs/relnotes-7.10.3.html
@@ -89,7 +89,210 @@ tbd
git log mesa-7.10.2..mesa-7.10.3
</pre>
-<p><em>Note:</em> Reverted commits and the reverts are not included in this list.</p>
+<p>Alan Hourihane (1):
+<ul>
+ <li>Check for out of memory when creating fence</li>
+</ul></p>
+
+<p>Alex Buell (1):
+<ul>
+ <li>configure: bump LIBDRM_REQUIRED to 2.4.24</li>
+</ul></p>
+
+<p>Alex Deucher (2):
+<ul>
+ <li>r600c: add new pci ids</li>
+ <li>r600g: add new pci ids</li>
+</ul></p>
+
+<p>Brian Paul (19):
+<ul>
+ <li>docs: add link to 7.10.2 release notes</li>
+ <li>scons: remove dangling reference to state_trackers/python/SConscript</li>
+ <li>Makefile: add missing Scons files</li>
+ <li>llvmpipe: document issue with LLVM 2.8 and earlier with AVX</li>
+ <li>docs: replace llvmpipe/README with docs/llvmpipe.html</li>
+ <li>glsl: add static qualifier to silence warning</li>
+ <li>glsl: add cast to silence signed/unsigned comparison warning</li>
+ <li>mesa: s/height/depth/ in texsubimage()</li>
+ <li>mesa: fix void pointer arithmetic warnings</li>
+ <li>mesa: add some missing GLAPIENTRY keywords</li>
+ <li>mesa: check that flex/bison are installed</li>
+ <li>st/mesa: fix incorrect texture level/face/slice accesses</li>
+ <li>draw: fix edge flag handling in clipper (for unfilled tris/quads/polygons)</li>
+ <li>vbo: check array indexes to prevent negative indexing</li>
+ <li>vbo: remove node->count > 0 test in vbo_save_playback_vertex_list()</li>
+ <li>st/mesa: fix software accum buffer format bug</li>
+ <li>mesa: add include/c99/inttypes.h include/c99/stdbool.h include/c99/stdint.h files to tarballs</li>
+ <li>docs: 7.10.3 release notes skeleton file, links</li>
+ <li>mesa: bump version to 7.10.3</li>
+</ul></p>
+
+<p>Carl Worth (2):
+<ul>
+ <li>glcpp: Simplify calling convention of parser's active_list functions</li>
+ <li>glcpp: Fix attempts to expand recursive macros infinitely (bug #32835).</li>
+</ul></p>
+
+<p>Dave Airlie (1):
+<ul>
+ <li>st/mesa: fix compressed mipmap generation.</li>
+</ul></p>
+
+<p>Eric Anholt (19):
+<ul>
+ <li>i965: Fix the VS thread limits for GT1, and clarify the WM limits on both.</li>
+ <li>glsl: Avoid cascading errors when looking for a scalar boolean and failing.</li>
+ <li>glsl: Semantically check the RHS of `&&' even when short-circuiting.</li>
+ <li>glsl: Semantically check the RHS of `||' even when short-circuiting.</li>
+ <li>glsl: When we've emitted a semantic error for ==, return a bool constant.</li>
+ <li>glsl: Perform type checking on "^^" operands.</li>
+ <li>intel: Use _mesa_base_tex_format for FBO texture attachments.</li>
+ <li>swrast: Don't assert against glReadPixels of GL_RED and GL_RG.</li>
+ <li>mesa: Add a gl_renderbuffer.RowStride field like textures have.</li>
+ <li>mesa: Add a function to set up the default renderbuffer accessors.</li>
+ <li>intel: Use Mesa core's renderbuffer accessors for depth.</li>
+ <li>mesa: Use _mesa_get_format_bytes to refactor out the RB get_pointer_*</li>
+ <li>mesa: Use _mesa_get_format_bytes to refactor out the RB get_row_*</li>
+ <li>mesa: Add renderbuffer accessors for R8/RG88/R16/RG1616.</li>
+ <li>swrast: Don't try to adjust_colors for <8bpc when handling R16, RG1616.</li>
+ <li>intel: Use mesa core's R8, RG88, R16, RG1616 RB accessors.</li>
+ <li>Revert "intel: Add spans code for the ARB_texture_rg support."</li>
+ <li>mesa: Add support for the ARB_fragment_program part of ARB_draw_buffers.</li>
+ <li>mesa: Add support for OPTION ATI_draw_buffers to ARB_fp.</li>
+</ul></p>
+
+<p>Hans de Goede (1):
+<ul>
+ <li>texstore: fix regression stricter check for memcpy path for unorm88 and unorm1616</li>
+</ul></p>
+
+<p>Henri Verbeet (3):
+<ul>
+ <li>mesa: Also update the color draw buffer if it's explicitly set to GL_NONE.</li>
+ <li>glx: Destroy dri2Hash on DRI2 display destruction.</li>
+ <li>glx: Only remove the glx_display from the list after it's destroyed.</li>
+</ul></p>
+
+<p>Ian Romanick (9):
+<ul>
+ <li>docs: Add 7.10.2 md5sums</li>
+ <li>glsl: Fix off-by-one error setting max_array_access for non-constant indexing</li>
+ <li>ir_to_mesa: Handle shadow compare w/projection and LOD bias correctly</li>
+ <li>intel: Fix ROUND_DOWN_TO macro</li>
+ <li>glsl: Regenerate compiler and glcpp files from cherry picks</li>
+ <li>i965: Remove hint_gs_always and resulting dead code</li>
+ <li>mesa: Don't try to clear a NULL renderbuffer</li>
+ <li>mesa: Ignore blits to/from missing buffers</li>
+ <li>docs: Add list of bugs fixed in 7.10.3 release</li>
+</ul></p>
+
+<p>Jeremy Huddleston (18):
+<ul>
+ <li>apple: Update GL specs</li>
+ <li>apple: Rename glcontextmodes.[ch] to glxconfig.[ch]</li>
+ <li>apple: Rename __GLcontextModes to struct glx_config</li>
+ <li>apple: Rename GLXcontext</li>
+ <li>apple: Re-add driContext and do_destroy</li>
+ <li>apple: Rename _gl_context_modes_find_visual to glx_config_find_visual</li>
+ <li>apple: Rename GLXcontext</li>
+ <li>apple: Change from XExtDisplayInfo to struct glx_display</li>
+ <li>apple: ifdef out come glapi-foo on darwin</li>
+ <li>glx: Dead code removal</li>
+ <li>apple: Build darwin using applegl rather than indirect</li>
+ <li>apple: Fix build failures in applegl_glx.c</li>
+ <li>darwin: Define GALLIUM_DRIVERS_DIRS in darwin config</li>
+ <li>apple: Package applegl source into MesaLib tarball</li>
+ <li>darwin: Set VG_LIB_{NAME,GLOB} to fix make install</li>
+ <li>darwin: Don't link against libGL when building libOSMesa</li>
+ <li>darwin: Fix VG_LIB_GLOB to also match the unversioned symlink</li>
+ <li>osmesa: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.</li>
+</ul></p>
+
+<p>José Fonseca (13):
+<ul>
+ <li>llvmpipe: Update readme.</li>
+ <li>mesa: GL_PROVOKING_VERTEX_EXT is a GLenum, not GLboolean.</li>
+ <li>mesa: Fix GetVertexAttrib* inside display lists.</li>
+ <li>draw: Fix draw_variant_output::format's type.</li>
+ <li>gallivm: Tell LLVM to not assume a 16-byte aligned stack on x86.</li>
+ <li>gallivm: Fix for dynamically linked LLVM 2.8 library.</li>
+ <li>st/wgl: Adjust the pbuffer invisible window size.</li>
+ <li>st/wgl: Fix debug output format specifiers of stw_framebuffer_get_size().</li>
+ <li>st/wgl: Prevent spurious framebuffer sizes when the window is minimized.</li>
+ <li>st/wgl: Cope with zero width/height windows.</li>
+ <li>st/wgl: Allow to create pbuffers bigger than the desktop.</li>
+ <li>st/wgl: Remove buggy assertion.</li>
+ <li>wgl: Don't hold on to user supplied HDC.</li>
+</ul></p>
+
+<p>Kenneth Graunke (10):
+<ul>
+ <li>i965/fs: Switch W and 1/W in Sandybridge interpolation setup.</li>
+ <li>i965: Refactor Sandybridge implied move handling.</li>
+ <li>i965: Resolve implied moves in brw_dp_READ_4_vs_relative.</li>
+ <li>intel: Add IS_GT2 macro for recognizing Sandybridge GT2 systems.</li>
+ <li>i965: Allocate the whole URB to the VS and fix calculations for Gen6.</li>
+ <li>intel: Support glCopyTexImage() from ARGB8888 to XRGB8888.</li>
+ <li>glsl: Fix memory error when creating the supported version string.</li>
+ <li>glsl: Regenerate autogenerated file builtin_function.cpp.</li>
+ <li>i965: Rename various gen6 #defines to match the documentation.</li>
+ <li>i965: Never enable the GS on Gen6.</li>
+</ul></p>
+
+<p>Kostas Georgiou (1):
+<ul>
+ <li>r600c/g: Add pci id for FirePro 2270</li>
+</ul></p>
+
+<p>Marek Olšák (18):
+<ul>
+ <li>tgsi/ureg: bump the limit of immediates</li>
+ <li>st/mesa: fix changing internal format via RenderbufferStorage</li>
+ <li>st/mesa: GenerateMipmap should not be killed by conditional rendering</li>
+ <li>swrast: BlitFramebuffer should not be killed by conditional rendering</li>
+ <li>st/mesa: BlitFramebuffer should not be killed by conditional rendering</li>
+ <li>st/mesa: CopyTex(Sub)Image should not be killed by conditional rendering</li>
+ <li>st/mesa: conditional rendering should not kill texture decompression via blit</li>
+ <li>mesa: forbid UseProgram to be called inside Begin/End</li>
+ <li>mesa: UseShaderProgramEXT and Uniform* shouldn't be allowed inside Begin/End</li>
+ <li>mesa: queries of non-existent FBO attachments should return INVALID_OPERATION</li>
+ <li>r300g: fix draw_vbo splitting on r3xx-r4xx</li>
+ <li>r300g: fix texturing with non-3D textures and wrap R mode set to sample border</li>
+ <li>r300g: fix occlusion queries when depth test is disabled or zbuffer is missing</li>
+ <li>r300g: clear can be killed by render condition</li>
+ <li>st/mesa: remove asserts in st_texture_image_copy</li>
+ <li>mesa: fix up assertion in _mesa_source_buffer_exists</li>
+ <li>mesa: invalidate framebuffer if internal format of renderbuffer is changed</li>
+ <li>mesa: return after invalidating renderbuffer</li>
+</ul></p>
+
+<p>Matt Turner (1):
+<ul>
+ <li>r300/compiler: align memory allocations to 8-bytes</li>
+</ul></p>
+
+<p>Tom Stellard (3):
+<ul>
+ <li>r300/compiler: Fix incorrect presubtract conversion</li>
+ <li>r300/compiler: Fix dataflow analysis bug with ELSE blocks</li>
+ <li>r300/compiler: Limit instructions to 3 source selects</li>
+</ul></p>
+
+<p>Vinson Lee (1):
+<ul>
+ <li>gallivm: Disable MMX-disabling code on llvm-2.9.</li>
+</ul></p>
+
+<p>Zou Nan hai (1):
+<ul>
+ <li>i965: Align interleaved URB write length to 2</li>
+</ul></p>
+
+<p>pepp (1):
+<ul>
+ <li>st/mesa: assign renderbuffer's format field when allocating storage</li>
+</ul></p>
</body>
</html>
commit edbaa9e856cae79897650ec8a57d5fe17d8f0c40
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Jun 13 16:07:27 2011 -0700
docs: Add list of bugs fixed in 7.10.3 release
diff --git a/docs/relnotes-7.10.3.html b/docs/relnotes-7.10.3.html
index b922e95..aeb20b5 100644
--- a/docs/relnotes-7.10.3.html
+++ b/docs/relnotes-7.10.3.html
@@ -40,6 +40,45 @@ tbd
<p>This list is likely incomplete.</p>
<ul>
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=29162";>Bug 29162</a> - mesa/darwin is severly broken</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=31590";>Bug 31590</a> - Black space between colors on mole hill example</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32395";>Bug 32395</a> - [glsl] Incorrect code generation for shadow2DProj() with bias</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32564";>Bug 32564</a> - [llvmpipe] prog: Unknown command line argument '-disable-mmx'. Try: 'prog -help' with llvm-2.9svn</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=32835";>Bug 32835</a> - [glsl] recursive #define results in infinite stack recursion</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33303";>Bug 33303</a> - [glsl] ir_constant_expression.cpp:72: virtual ir_constant* ir_expression::constant_expression_value(): Assertion `op[0]->type->base_type == op[1]->type->base_type' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33314";>Bug 33314</a> - [glsl] ir_constant_expression.cpp:122: virtual ir_constant* ir_expression::constant_expression_value(): Assertion `op[0]->type->base_type == GLSL_TYPE_BOOL' failed.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=33512";>Bug 33512</a> - [SNB] case ogles2conform/GL/gl_FragCoord/gl_FragCoord_xy_frag.test and gl_FragCoord_w_frag.test fail</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34280";>Bug 34280</a> - r200 mesa-7.10 font distortion</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=34321";>Bug 34321</a> - The ARB_fragment_program subset of ARB_draw_buffers not implemented</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=35603";>Bug 35603</a> - GLSL compiler freezes compiling shaders</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36173";>Bug 36173</a> - struct renderbuffer's 'format' field never set when using FBO</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36238";>Bug 36238</a> - Mesa release files don't contain scons control files</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36410";>Bug 36410</a> - [SNB] Rendering errors in 3DMMES subtest taiji</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36527";>Bug 36527</a> - [wine] Wolfenstein: Failed to translate rgb instruction.</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36651";>Bug 36651</a> - mesa requires bison and flex to build but configure does not check for them</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=36738";>Bug 36738</a> - Openarena crash with r300g, swrastg + llvm > 2.8</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37648";>Bug 37648</a> - Logic error in mesa/main/teximage.c:texsubimage</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=37739";>Bug 37739</a> - Color clear of FBO without color buffer crashes</li>
+
+<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=";>Bug </a> - </li> -->
</ul>
commit a40eed0a10a6d5652254b4d2f6ec9f048c711765
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon Jun 13 16:21:55 2011 -0700
mesa: Regenerate parser files from previous two commits
diff --git a/src/mesa/program/program_parse.tab.c b/src/mesa/program/program_parse.tab.c
index baef311..b2276c7 100644
--- a/src/mesa/program/program_parse.tab.c
+++ b/src/mesa/program/program_parse.tab.c
@@ -1,10 +1,9 @@
-
-/* A Bison parser, made by GNU Bison 2.4.1. */
+/* A Bison parser, made by GNU Bison 2.4.3. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+ 2009, 2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -46,7 +45,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.4.3"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -189,7 +188,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
/* Line 189 of yacc.c */
-#line 193 "program_parse.tab.c"
+#line 192 "program_parse.tab.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -360,7 +359,7 @@ typedef union YYSTYPE
/* Line 214 of yacc.c */
-#line 364 "program_parse.tab.c"
+#line 363 "program_parse.tab.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -391,7 +390,7 @@ extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
/* Line 264 of yacc.c */
-#line 395 "program_parse.tab.c"
+#line 394 "program_parse.tab.c"
#ifdef short
# undef short
@@ -441,7 +440,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -608,16 +607,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 396
+#define YYLAST 402
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 120
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 143
/* YYNRULES -- Number of rules. */
-#define YYNRULES 282
+#define YYNRULES 283
/* YYNRULES -- Number of states. */
-#define YYNSTATES 475
+#define YYNSTATES 478
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -699,9 +698,9 @@ static const yytype_uint16 yyprhs[] =
654, 656, 658, 660, 662, 666, 672, 680, 690, 693,
696, 698, 700, 701, 702, 707, 709, 710, 711, 715,
719, 721, 727, 730, 733, 736, 739, 743, 746, 750,
- 751, 753, 755, 756, 758, 760, 761, 763, 765, 766,
- 768, 770, 771, 775, 776, 780, 781, 785, 787, 789,
- 791, 796, 798
+ 751, 755, 757, 759, 760, 762, 764, 765, 767, 769,
+ 770, 772, 774, 775, 779, 780, 784, 785, 789, 791,
+ 793, 795, 800, 802
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -782,11 +781,12 @@ static const yytype_int16 yyrhs[] =
-1, 244, 9, 99, 117, 249, -1, 65, 60, -1,
65, 37, -1, 65, 250, -1, 65, 59, -1, 65,
74, 255, -1, 65, 30, -1, 29, 251, 252, -1,
- -1, 39, -1, 27, -1, -1, 61, -1, 68, -1,
- -1, 39, -1, 27, -1, -1, 61, -1, 68, -1,
- -1, 111, 258, 112, -1, -1, 111, 259, 112, -1,
- -1, 111, 260, 112, -1, 23, -1, 23, -1, 23,
- -1, 6, 99, 117, 100, -1, 99, -1, 100, -1
+ -1, 111, 23, 112, -1, 39, -1, 27, -1, -1,
+ 61, -1, 68, -1, -1, 39, -1, 27, -1, -1,
+ 61, -1, 68, -1, -1, 111, 258, 112, -1, -1,
+ 111, 259, 112, -1, -1, 111, 260, 112, -1, 23,
+ -1, 23, -1, 23, -1, 6, 99, 117, 100, -1,
+ 99, -1, 100, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -818,9 +818,9 @@ static const yytype_uint16 yyrline[] =
1848, 1850, 1860, 1868, 1878, 1886, 1894, 1903, 1914, 1918,
1924, 1925, 1926, 1929, 1929, 1932, 1967, 1971, 1971, 1974,
1981, 1990, 2004, 2013, 2022, 2026, 2035, 2044, 2055, 2062,
- 2067, 2076, 2088, 2091, 2100, 2111, 2112, 2113, 2116, 2117,
- 2118, 2121, 2122, 2125, 2126, 2129, 2130, 2133, 2144, 2155,
- 2166, 2192, 2193
+ 2067, 2095, 2104, 2116, 2119, 2128, 2139, 2140, 2141, 2144,
+ 2145, 2146, 2149, 2150, 2153, 2154, 2157, 2158, 2161, 2172,
+ 2183, 2194, 2220, 2221
};
#endif
@@ -942,9 +942,9 @@ static const yytype_uint16 yyr1[] =
236, 237, 238, 238, 239, 239, 239, 239, 240, 240,
241, 241, 241, 243, 242, 244, 244, 246, 245, 247,
247, 248, 249, 249, 249, 249, 249, 249, 250, 251,
- 251, 251, 252, 252, 252, 253, 253, 253, 254, 254,
- 254, 255, 255, 256, 256, 257, 257, 258, 259, 260,
- 261, 262, 262
+ 251, 251, 251, 252, 252, 252, 253, 253, 253, 254,
+ 254, 254, 255, 255, 256, 256, 257, 257, 258, 259,
+ 260, 261, 262, 262
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -976,9 +976,9 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 3, 5, 7, 9, 2, 2,
1, 1, 0, 0, 4, 1, 0, 0, 3, 3,
1, 5, 2, 2, 2, 2, 3, 2, 3, 0,
- 1, 1, 0, 1, 1, 0, 1, 1, 0, 1,
- 1, 0, 3, 0, 3, 0, 3, 1, 1, 1,
- 4, 1, 1
+ 3, 1, 1, 0, 1, 1, 0, 1, 1, 0,
+ 1, 1, 0, 3, 0, 3, 0, 3, 1, 1,
+ 1, 4, 1, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -987,7 +987,7 @@ static const yytype_uint8 yyr2[] =
static const yytype_uint16 yydefact[] =
{
0, 3, 4, 0, 6, 1, 9, 0, 5, 246,
- 281, 282, 0, 247, 0, 0, 0, 2, 0, 0,
+ 282, 283, 0, 247, 0, 0, 0, 2, 0, 0,
0, 0, 0, 0, 0, 242, 0, 0, 8, 0,
12, 13, 14, 15, 16, 17, 18, 19, 21, 22,
23, 20, 0, 96, 97, 121, 122, 98, 0, 99,
@@ -995,140 +995,140 @@ static const yytype_uint16 yydefact[] =
0, 88, 64, 0, 0, 0, 0, 0, 76, 0,
0, 94, 240, 241, 31, 32, 83, 0, 0, 0,
10, 11, 0, 243, 250, 248, 0, 0, 125, 242,
- 123, 259, 257, 253, 255, 252, 271, 254, 242, 84,
+ 123, 259, 257, 253, 255, 252, 272, 254, 242, 84,
85, 86, 87, 91, 242, 242, 242, 242, 242, 242,
78, 55, 81, 80, 82, 92, 233, 232, 0, 0,
0, 0, 60, 0, 242, 83, 0, 61, 63, 134,
135, 213, 214, 136, 229, 230, 0, 242, 0, 0,
- 0, 280, 102, 126, 0, 127, 131, 132, 133, 227,
- 228, 231, 0, 261, 260, 262, 0, 256, 0, 0,
- 54, 0, 0, 0, 26, 0, 25, 24, 268, 119,
- 117, 271, 104, 0, 0, 0, 0, 0, 0, 265,
- 0, 265, 0, 0, 275, 271, 142, 143, 144, 145,
- 147, 146, 148, 149, 150, 151, 0, 152, 268, 109,
- 0, 107, 105, 271, 0, 114, 103, 83, 0, 52,
- 0, 0, 0, 0, 244, 249, 0, 239, 238, 263,
- 264, 258, 277, 0, 242, 95, 0, 0, 83, 242,
- 0, 48, 0, 51, 0, 242, 269, 270, 118, 120,
- 0, 0, 0, 212, 183, 184, 182, 0, 165, 267,
- 266, 164, 0, 0, 0, 0, 207, 203, 0, 202,
- 271, 195, 189, 188, 187, 0, 0, 0, 0, 108,
- 0, 110, 0, 0, 106, 0, 242, 234, 69, 0,
- 67, 68, 0, 242, 242, 251, 0, 124, 272, 28,
- 89, 90, 93, 27, 0, 79, 50, 273, 0, 0,
- 225, 0, 226, 0, 186, 0, 174, 0, 166, 0,
- 171, 172, 155, 156, 173, 153, 154, 0, 0, 201,
- 0, 204, 197, 199, 198, 194, 196, 279, 0, 170,
- 169, 176, 177, 0, 0, 116, 0, 113, 0, 0,
- 53, 0, 62, 77, 71, 47, 0, 0, 0, 242,
- 49, 0, 34, 0, 242, 220, 224, 0, 0, 265,
- 211, 0, 209, 0, 210, 0, 276, 181, 180, 178,
- 179, 175, 200, 0, 111, 112, 115, 242, 235, 0,
- 0, 70, 242, 58, 57, 59, 242, 0, 0, 0,
- 129, 137, 140, 138, 215, 216, 139, 278, 0, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 30, 29, 185, 160, 162, 159, 0, 157, 158,
- 0, 206, 208, 205, 190, 0, 74, 72, 75, 73,
- 0, 0, 0, 0, 141, 192, 242, 128, 274, 163,
- 161, 167, 168, 242, 236, 242, 0, 0, 0, 0,
- 191, 130, 0, 0, 0, 0, 218, 0, 222, 0,
- 237, 242, 0, 217, 0, 221, 0, 0, 56, 33,
- 219, 223, 0, 0, 193
+ 0, 281, 102, 126, 0, 127, 131, 132, 133, 227,
+ 228, 231, 0, 262, 261, 0, 263, 0, 256, 0,
+ 0, 54, 0, 0, 0, 26, 0, 25, 24, 269,
+ 119, 117, 272, 104, 0, 0, 0, 0, 0, 0,
+ 266, 0, 266, 0, 0, 276, 272, 142, 143, 144,
+ 145, 147, 146, 148, 149, 150, 151, 0, 152, 269,
+ 109, 0, 107, 105, 272, 0, 114, 103, 83, 0,
+ 52, 0, 0, 0, 0, 244, 249, 0, 239, 238,
+ 0, 264, 265, 258, 278, 0, 242, 95, 0, 0,
+ 83, 242, 0, 48, 0, 51, 0, 242, 270, 271,
+ 118, 120, 0, 0, 0, 212, 183, 184, 182, 0,
+ 165, 268, 267, 164, 0, 0, 0, 0, 207, 203,
+ 0, 202, 272, 195, 189, 188, 187, 0, 0, 0,
+ 0, 108, 0, 110, 0, 0, 106, 0, 242, 234,
+ 69, 0, 67, 68, 0, 242, 242, 251, 0, 124,
+ 260, 273, 28, 89, 90, 93, 27, 0, 79, 50,
+ 274, 0, 0, 225, 0, 226, 0, 186, 0, 174,
+ 0, 166, 0, 171, 172, 155, 156, 173, 153, 154,
+ 0, 0, 201, 0, 204, 197, 199, 198, 194, 196,
+ 280, 0, 170, 169, 176, 177, 0, 0, 116, 0,
+ 113, 0, 0, 53, 0, 62, 77, 71, 47, 0,
+ 0, 0, 242, 49, 0, 34, 0, 242, 220, 224,
+ 0, 0, 266, 211, 0, 209, 0, 210, 0, 277,
+ 181, 180, 178, 179, 175, 200, 0, 111, 112, 115,
+ 242, 235, 0, 0, 70, 242, 58, 57, 59, 242,
+ 0, 0, 0, 129, 137, 140, 138, 215, 216, 139,
+ 279, 0, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, 46, 30, 29, 185, 160, 162, 159,
+ 0, 157, 158, 0, 206, 208, 205, 190, 0, 74,
+ 72, 75, 73, 0, 0, 0, 0, 141, 192, 242,
+ 128, 275, 163, 161, 167, 168, 242, 236, 242, 0,
+ 0, 0, 0, 191, 130, 0, 0, 0, 0, 218,
+ 0, 222, 0, 237, 242, 0, 217, 0, 221, 0,
+ 0, 56, 33, 219, 223, 0, 0, 193
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
-1, 3, 4, 6, 8, 9, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 38, 39, 40, 298,
- 411, 41, 161, 231, 74, 60, 69, 345, 346, 384,
- 232, 61, 126, 279, 280, 281, 381, 427, 429, 70,
- 344, 111, 296, 115, 103, 160, 75, 227, 76, 228,
- 42, 43, 127, 206, 338, 274, 336, 172, 44, 45,
- 46, 144, 90, 287, 389, 145, 128, 390, 391, 129,
- 186, 315, 187, 418, 440, 188, 251, 189, 441, 190,
- 330, 316, 307, 191, 333, 371, 192, 246, 193, 305,
- 194, 264, 195, 434, 450, 196, 325, 326, 373, 261,
- 319, 363, 365, 361, 197, 130, 393, 394, 455, 131,
- 395, 457, 132, 301, 303, 396, 133, 149, 134, 135,
+ 32, 33, 34, 35, 36, 37, 38, 39, 40, 301,
+ 414, 41, 162, 233, 74, 60, 69, 348, 349, 387,
+ 234, 61, 126, 281, 282, 283, 384, 430, 432, 70,
+ 347, 111, 299, 115, 103, 161, 75, 229, 76, 230,
+ 42, 43, 127, 207, 341, 276, 339, 173, 44, 45,
+ 46, 144, 90, 289, 392, 145, 128, 393, 394, 129,
+ 187, 318, 188, 421, 443, 189, 253, 190, 444, 191,
+ 333, 319, 310, 192, 336, 374, 193, 248, 194, 308,
+ 195, 266, 196, 437, 453, 197, 328, 329, 376, 263,
+ 322, 366, 368, 364, 198, 130, 396, 397, 458, 131,
+ 398, 460, 132, 304, 306, 399, 133, 149, 134, 135,
151, 77, 47, 139, 48, 49, 54, 85, 50, 62,
- 97, 155, 221, 252, 238, 157, 352, 266, 223, 398,
- 328, 51, 12
+ 97, 156, 223, 254, 240, 158, 355, 268, 225, 401,
+ 331, 51, 12
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -401
+#define YYPACT_NINF -398
static const yytype_int16 yypact[] =
{
- 193, -401, -401, 27, -401, -401, 62, 143, -401, 24,
- -401, -401, -30, -401, -18, 12, 83, -401, 15, 15,
- 15, 15, 15, 15, 67, 61, 15, 15, -401, 127,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, 144, -401, -401, -401, -401, -401, 204, -401,
- -401, -401, -401, -401, 155, 136, 138, 34, 140, -401,
- 147, 108, -401, 150, 156, 157, 158, 160, -401, 162,
- 159, -401, -401, -401, -401, -401, 102, -13, 163, 164,
- -401, -401, 165, -401, -401, 166, 170, 10, 235, 0,
- -401, 141, -401, -401, -401, -401, 167, -401, 131, -401,
- -401, -401, -401, 168, 131, 131, 131, 131, 131, 131,
- -401, -401, -401, -401, -401, -401, -401, -401, 104, 97,
- 114, 38, 169, 30, 131, 102, 171, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, 30, 131, 172, 155,
- 175, -401, -401, -401, 173, -401, -401, -401, -401, -401,
- -401, -401, 223, -401, -401, 123, 253, -401, 177, 149,
- -401, 178, -10, 181, -401, 182, -401, -401, 134, -401,
- -401, 167, -401, 183, 184, 185, 213, 99, 186, 154,
- 187, 146, 153, 7, 188, 167, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, 215, -401, 134, -401,
- 190, -401, -401, 167, 191, 192, -401, 102, -48, -401,
- 1, 195, 196, 214, 166, -401, 189, -401, -401, -401,
- -401, -401, -401, 180, 131, -401, 194, 197, 102, 131,
- 30, -401, 203, 205, 201, 131, -401, -401, -401, -401,
- 285, 288, 289, -401, -401, -401, -401, 291, -401, -401,
- -401, -401, 248, 291, 33, 206, 207, -401, 208, -401,
- 167, 14, -401, -401, -401, 293, 292, 92, 209, -401,
- 299, -401, 301, 299, -401, 216, 131, -401, -401, 217,
- -401, -401, 221, 131, 131, -401, 212, -401, -401, -401,
- -401, -401, -401, -401, 218, -401, -401, 220, 224, 225,
- -401, 226, -401, 227, -401, 228, -401, 230, -401, 231,
- -401, -401, -401, -401, -401, -401, -401, 304, 309, -401,
- 312, -401, -401, -401, -401, -401, -401, -401, 232, -401,
- -401, -401, -401, 161, 313, -401, 233, -401, 234, 238,
- -401, 13, -401, -401, 137, -401, 242, -15, 243, 3,
- -401, 314, -401, 133, 131, -401, -401, 296, 94, 146,
- -401, 245, -401, 246, -401, 247, -401, -401, -401, -401,
- -401, -401, -401, 249, -401, -401, -401, 131, -401, 332,
- 337, -401, 131, -401, -401, -401, 131, 142, 114, 28,
- -401, -401, -401, -401, -401, -401, -401, -401, 250, -401,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, -401, 331, -401, -401,
- 68, -401, -401, -401, -401, 43, -401, -401, -401, -401,
- 255, 256, 257, 258, -401, 300, 3, -401, -401, -401,
- -401, -401, -401, 131, -401, 131, 201, 285, 288, 259,
- -401, -401, 252, 264, 265, 263, 261, 266, 270, 313,
- -401, 131, 133, -401, 285, -401, 288, 80, -401, -401,
- -401, -401, 313, 267, -401
+ 52, -398, -398, 14, -398, -398, 67, 152, -398, 24,
+ -398, -398, 5, -398, 47, 81, 99, -398, -1, -1,
+ -1, -1, -1, -1, 43, 56, -1, -1, -398, 97,
+ -398, -398, -398, -398, -398, -398, -398, -398, -398, -398,
+ -398, -398, 112, -398, -398, -398, -398, -398, 156, -398,
+ -398, -398, -398, -398, 111, 98, 141, 95, 127, -398,
+ 84, 142, -398, 146, 150, 153, 157, 158, -398, 159,
+ 165, -398, -398, -398, -398, -398, 113, -13, 161, 163,
+ -398, -398, 162, -398, -398, 164, 174, 10, 252, -3,
+ -398, -11, -398, -398, -398, -398, 166, -398, -20, -398,
+ -398, -398, -398, 167, -20, -20, -20, -20, -20, -20,
+ -398, -398, -398, -398, -398, -398, -398, -398, 137, 70,
+ 132, 85, 168, 34, -20, 113, 169, -398, -398, -398,
+ -398, -398, -398, -398, -398, -398, 34, -20, 171, 111,
+ 179, -398, -398, -398, 172, -398, -398, -398, -398, -398,
+ -398, -398, 216, -398, -398, 253, 76, 258, -398, 176,
+ 154, -398, 178, 29, 180, -398, 181, -398, -398, 110,
+ -398, -398, 166, -398, 175, 182, 183, 219, 32, 184,
+ 177, 186, 94, 140, 7, 187, 166, -398, -398, -398,
+ -398, -398, -398, -398, -398, -398, -398, 226, -398, 110,
+ -398, 188, -398, -398, 166, 189, 190, -398, 113, 9,
+ -398, 1, 193, 195, 240, 164, -398, 191, -398, -398,
+ 194, -398, -398, -398, -398, 197, -20, -398, 196, 198,
+ 113, -20, 34, -398, 203, 206, 228, -20, -398, -398,
+ -398, -398, 290, 292, 293, -398, -398, -398, -398, 294,
+ -398, -398, -398, -398, 251, 294, 48, 208, 209, -398,
+ 210, -398, 166, 21, -398, -398, -398, 299, 295, 12,
+ 212, -398, 302, -398, 304, 302, -398, 218, -20, -398,
+ -398, 217, -398, -398, 227, -20, -20, -398, 214, -398,
+ -398, -398, -398, -398, -398, -398, -398, 220, -398, -398,
+ 222, 225, 229, -398, 223, -398, 224, -398, 230, -398,
+ 231, -398, 233, -398, -398, -398, -398, -398, -398, -398,
+ 314, 316, -398, 317, -398, -398, -398, -398, -398, -398,
+ -398, 234, -398, -398, -398, -398, 170, 318, -398, 235,
+ -398, 236, 237, -398, 44, -398, -398, 143, -398, 244,
+ -15, 245, 36, -398, 332, -398, 138, -20, -398, -398,
+ 301, 101, 94, -398, 248, -398, 249, -398, 250, -398,
+ -398, -398, -398, -398, -398, -398, 254, -398, -398, -398,
+ -20, -398, 333, 340, -398, -20, -398, -398, -398, -20,
+ 102, 132, 75, -398, -398, -398, -398, -398, -398, -398,
+ -398, 255, -398, -398, -398, -398, -398, -398, -398, -398,
+ -398, -398, -398, -398, -398, -398, -398, -398, -398, -398,
+ 336, -398, -398, 49, -398, -398, -398, -398, 90, -398,
+ -398, -398, -398, 256, 260, 259, 261, -398, 298, 36,
+ -398, -398, -398, -398, -398, -398, -20, -398, -20, 228,
+ 290, 292, 262, -398, -398, 257, 265, 268, 266, 273,
+ 269, 274, 318, -398, -20, 138, -398, 290, -398, 292,
+ 107, -398, -398, -398, -398, 318, 270, -398
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -69,
- -82, -401, -100, 151, -86, 210, -401, -401, -366, -401,
- -54, -401, -401, -401, -401, -401, -401, -401, -401, 174,
- -401, -401, -401, -118, -401, -401, 229, -401, -401, -401,
- -401, -401, 295, -401, -401, -401, 110, -401, -401, -401,
- -401, -401, -401, -401, -401, -401, -401, -51, -401, -88,
- -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
- -401, -311, 139, -401, -401, -401, -401, -401, -401, -401,
- -401, -401, -401, -401, -401, -2, -401, -401, -400, -401,
- -401, -401, -401, -401, -401, 298, -401, -401, -401, -401,
- -401, -401, -401, -390, -295, 302, -401, -401, -136, -87,
- -120, -89, -401, -401, -401, -401, -401, 251, -401, 176,
- -401, -401, -401, -176, 198, -153, -401, -401, -401, -401,
- -401, -401, -6
+ -398, -398, -398, -398, -398, -398, -398, -398, -398, -398,
+ -398, -398, -398, -398, -398, -398, -398, -398, -398, -78,
+ -82, -398, -100, 155, -86, 215, -398, -398, -372, -398,
+ -54, -398, -398, -398, -398, -398, -398, -398, -398, 173,
+ -398, -398, -398, -118, -398, -398, 232, -398, -398, -398,
+ -398, -398, 303, -398, -398, -398, 114, -398, -398, -398,
+ -398, -398, -398, -398, -398, -398, -398, -53, -398, -88,
+ -398, -398, -398, -398, -398, -398, -398, -398, -398, -398,
+ -398, -334, 130, -398, -398, -398, -398, -398, -398, -398,
+ -398, -398, -398, -398, -398, 0, -398, -398, -397, -398,
+ -398, -398, -398, -398, -398, 305, -398, -398, -398, -398,
+ -398, -398, -398, -396, -383, 306, -398, -398, -137, -87,
+ -120, -89, -398, -398, -398, -398, -398, 263, -398, 185,
+ -398, -398, -398, -177, 199, -154, -398, -398, -398, -398,
+ -398, -398, -6
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1138,90 +1138,92 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -230
static const yytype_int16 yytable[] =
{
- 152, 146, 150, 52, 208, 254, 164, 209, 383, 167,
- 116, 117, 158, 116, 117, 162, 430, 162, 239, 163,
- 162, 165, 166, 125, 278, 118, 233, 5, 118, 13,
- 14, 15, 267, 262, 16, 152, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 419, 118, 119,
- 271, 212, 119, 116, 117, 322, 323, 456, 310, 467,
- 120, 276, 119, 120, 311, 387, 312, 198, 118, 207,
- 7, 277, 473, 120, 470, 199, 388, 263, 53, 453,
- 58, 55, 211, 121, 10, 11, 121, 122, 200, 275,
- 122, 201, 119, 310, 233, 468, 324, 123, 202, 311,
- 230, 68, 313, 120, 314, 124, 121, 321, 124, 442,
- 292, 56, 203, 72, 73, 59, 72, 73, 124, 310,
- 414, 124, 377, 10, 11, 311, 121, 331, 244, 293,
- 122, 173, 378, 168, 415, 204, 205, 436, 289, 314,
- 162, 169, 175, 174, 176, 88, 332, 437, 124, 299,
- 177, 89, 443, 458, 416, 245, 341, 178, 179, 180,
- 71, 181, 444, 182, 170, 314, 417, 68, 153, 91,
- 92, 471, 183, 249, 72, 73, 432, 93, 171, 248,
- 154, 249, 57, 420, 219, 250, 472, 152, 433, 184,
- 185, 220, 424, 250, 347, 236, 1, 2, 348, 94,
- 95, 255, 237, 112, 256, 257, 113, 114, 258, 99,
- 100, 101, 102, 82, 96, 83, 259, 399, 400, 401,
- 402, 403, 404, 405, 406, 407, 408, 409, 410, 63,
- 64, 65, 66, 67, 260, 80, 78, 79, 367, 368,
- 369, 370, 10, 11, 72, 73, 217, 218, 71, 225,
- 379, 380, 81, 86, 84, 87, 98, 425, 143, 104,
- 152, 392, 150, 110, 138, 105, 106, 107, 412, 108,
- 141, 109, 136, 137, 215, 140, 222, 243, 156, 58,
- -66, 268, 210, 159, 297, 216, 224, 229, 152, 213,
- 234, 235, 288, 347, 240, 241, 242, 247, 253, 265,
- 431, 270, 272, 273, 283, 284, 286, 295, 300, -229,
- 290, 302, 304, 291, 306, 308, 327, 317, 318, 320,
- 334, 329, 335, 452, 337, 343, 340, 360, 350, 342,
- 349, 351, 362, 353, 354, 364, 372, 397, 355, 356,
- 357, 385, 358, 359, 366, 374, 375, 152, 392, 150,
- 376, 382, 386, 413, 152, 426, 347, 421, 422, 423,
- 428, 424, 438, 439, 445, 446, 449, 464, 447, 448,
- 459, 460, 347, 461, 462, 463, 466, 454, 465, 474,
- 469, 294, 142, 339, 282, 451, 435, 147, 226, 285,
- 214, 148, 309, 0, 0, 0, 269
+ 152, 146, 150, 52, 209, 256, 165, 210, 386, 168,
+ 116, 117, 159, 433, 5, 163, 153, 163, 241, 164,
+ 163, 166, 167, 125, 280, 118, 235, 422, 154, 13,
+ 14, 15, 269, 264, 16, 152, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 334, 118, 119,
+ 273, 213, 116, 117, 459, 1, 2, 116, 117, 119,
+ 120, 246, 325, 326, 58, 470, 335, 118, 461, 208,
+ 120, 473, 118, 313, 313, 7, 456, 265, 476, 314,
+ 314, 315, 212, 121, 10, 11, 474, 122, 247, 445,
+ 277, 119, 471, 72, 73, 235, 119, 123, 390, 59,
+ 155, 68, 120, 327, 174, 124, 121, 120, 324, 391,
+ 72, 73, 295, 53, 199, 124, 175, 316, 278, 317,
+ 317, 251, 200, 10, 11, 121, 313, 417, 279, 122,
+ 121, 296, 314, 252, 122, 201, 435, 221, 202, 232,
+ 292, 418, 163, 68, 222, 203, 55, 124, 436, 72,
+ 73, 302, 124, 380, 124, 71, 91, 92, 344, 204,
+ 176, 419, 177, 381, 93, 82, 169, 83, 178, 72,
+ 73, 238, 317, 420, 170, 179, 180, 181, 239, 182,
+ 56, 183, 205, 206, 439, 423, 94, 95, 257, 152,
+ 184, 258, 259, 98, 440, 260, 350, 171, 57, 446,
+ 351, 96, 250, 261, 251, 80, 88, 185, 186, 447,
+ 84, 172, 89, 475, 112, 86, 252, 113, 114, 427,
+ 81, 262, 402, 403, 404, 405, 406, 407, 408, 409,
+ 410, 411, 412, 413, 63, 64, 65, 66, 67, 218,
+ 219, 78, 79, 99, 100, 101, 102, 370, 371, 372,
+ 373, 10, 11, 71, 227, 104, 382, 383, 87, 105,
+ 428, 138, 106, 152, 395, 150, 107, 108, 109, 110,
+ 136, 415, 137, 140, 141, 143, 220, 157, 216, -66,
+ 211, 224, 160, 245, 217, 226, 242, 231, 214, 236,
+ 237, 152, 270, 243, 244, 249, 350, 255, 267, 272,
+ 274, 275, 285, 434, 286, 58, 290, 298, 288, 291,
+ -229, 300, 293, 303, 294, 305, 307, 309, 311, 320,
+ 321, 323, 330, 337, 332, 338, 455, 340, 343, 345,
+ 353, 346, 352, 354, 356, 358, 359, 363, 357, 365,
+ 367, 375, 360, 361, 388, 362, 369, 377, 378, 379,
+ 152, 395, 150, 385, 389, 400, 429, 152, 416, 350,
+ 424, 425, 426, 431, 452, 448, 427, 441, 442, 449,
+ 450, 457, 451, 462, 464, 350, 463, 465, 466, 467,
+ 469, 468, 477, 472, 284, 312, 454, 297, 0, 342,
+ 142, 438, 228, 0, 147, 148, 0, 0, 271, 287,
+ 0, 0, 215
};
static const yytype_int16 yycheck[] =
{
- 89, 89, 89, 9, 124, 181, 106, 125, 23, 109,
- 23, 24, 98, 23, 24, 104, 382, 106, 171, 105,
- 109, 107, 108, 77, 23, 38, 162, 0, 38, 5,
- 6, 7, 185, 26, 10, 124, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 358, 38, 62,
- 203, 137, 62, 23, 24, 41, 42, 447, 25, 459,
- 73, 109, 62, 73, 31, 62, 33, 29, 38, 123,
- 8, 119, 472, 73, 464, 37, 73, 70, 108, 445,
- 65, 99, 136, 96, 99, 100, 96, 100, 50, 207,
- 100, 53, 62, 25, 230, 461, 82, 110, 60, 31,
- 110, 100, 69, 73, 71, 118, 96, 260, 118, 420,
- 228, 99, 74, 113, 114, 100, 113, 114, 118, 25,
- 26, 118, 109, 99, 100, 31, 96, 35, 29, 229,
- 100, 34, 119, 29, 40, 97, 98, 109, 224, 71,
- 229, 37, 28, 46, 30, 111, 54, 119, 118, 235,
- 36, 117, 109, 448, 60, 56, 276, 43, 44, 45,
- 99, 47, 119, 49, 60, 71, 72, 100, 27, 29,
- 30, 466, 58, 27, 113, 114, 34, 37, 74, 25,
- 39, 27, 99, 359, 61, 39, 106, 276, 46, 75,
- 76, 68, 112, 39, 283, 61, 3, 4, 284, 59,
- 60, 48, 68, 101, 51, 52, 104, 105, 55, 101,
- 102, 103, 104, 9, 74, 11, 63, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 19,
- 20, 21, 22, 23, 81, 108, 26, 27, 77, 78,
- 79, 80, 99, 100, 113, 114, 23, 24, 99, 100,
- 113, 114, 108, 117, 99, 117, 109, 377, 23, 109,
- 349, 349, 349, 104, 99, 109, 109, 109, 354, 109,
- 100, 109, 109, 109, 99, 109, 23, 64, 111, 65,
- 111, 66, 111, 115, 83, 112, 109, 109, 377, 117,
- 109, 109, 112, 382, 111, 111, 111, 111, 111, 111,
- 386, 111, 111, 111, 109, 109, 117, 104, 23, 104,
- 116, 23, 23, 116, 23, 67, 23, 111, 111, 111,
- 111, 29, 23, 443, 23, 104, 110, 23, 110, 112,
- 118, 111, 23, 109, 109, 23, 23, 23, 112, 112,
- 112, 347, 112, 112, 112, 112, 112, 436, 436, 436,
- 112, 109, 109, 57, 443, 23, 445, 112, 112, 112,
- 23, 112, 112, 32, 109, 109, 66, 106, 111, 111,
- 111, 119, 461, 109, 109, 112, 106, 446, 112, 112,
- 462, 230, 87, 273, 210, 436, 388, 89, 159, 213,
- 139, 89, 253, -1, -1, -1, 198
+ 89, 89, 89, 9, 124, 182, 106, 125, 23, 109,
+ 23, 24, 98, 385, 0, 104, 27, 106, 172, 105,
+ 109, 107, 108, 77, 23, 38, 163, 361, 39, 5,
+ 6, 7, 186, 26, 10, 124, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 35, 38, 62,
+ 204, 137, 23, 24, 450, 3, 4, 23, 24, 62,
+ 73, 29, 41, 42, 65, 462, 54, 38, 451, 123,
+ 73, 467, 38, 25, 25, 8, 448, 70, 475, 31,
+ 31, 33, 136, 96, 99, 100, 469, 100, 56, 423,
+ 208, 62, 464, 113, 114, 232, 62, 110, 62, 100,
+ 111, 100, 73, 82, 34, 118, 96, 73, 262, 73,
+ 113, 114, 230, 108, 29, 118, 46, 69, 109, 71,
+ 71, 27, 37, 99, 100, 96, 25, 26, 119, 100,
+ 96, 231, 31, 39, 100, 50, 34, 61, 53, 110,
+ 226, 40, 231, 100, 68, 60, 99, 118, 46, 113,
+ 114, 237, 118, 109, 118, 99, 29, 30, 278, 74,
+ 28, 60, 30, 119, 37, 9, 29, 11, 36, 113,
+ 114, 61, 71, 72, 37, 43, 44, 45, 68, 47,
+ 99, 49, 97, 98, 109, 362, 59, 60, 48, 278,
+ 58, 51, 52, 109, 119, 55, 285, 60, 99, 109,
+ 286, 74, 25, 63, 27, 108, 111, 75, 76, 119,
+ 99, 74, 117, 106, 101, 117, 39, 104, 105, 112,
+ 108, 81, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 19, 20, 21, 22, 23, 23,
+ 24, 26, 27, 101, 102, 103, 104, 77, 78, 79,
+ 80, 99, 100, 99, 100, 109, 113, 114, 117, 109,
+ 380, 99, 109, 352, 352, 352, 109, 109, 109, 104,
+ 109, 357, 109, 109, 100, 23, 23, 111, 99, 111,
+ 111, 23, 115, 64, 112, 109, 111, 109, 117, 109,
+ 109, 380, 66, 111, 111, 111, 385, 111, 111, 111,
+ 111, 111, 109, 389, 109, 65, 112, 104, 117, 112,
+ 104, 83, 116, 23, 116, 23, 23, 23, 67, 111,
+ 111, 111, 23, 111, 29, 23, 446, 23, 110, 112,
+ 110, 104, 118, 111, 109, 112, 112, 23, 109, 23,
+ 23, 23, 112, 112, 350, 112, 112, 112, 112, 112,
+ 439, 439, 439, 109, 109, 23, 23, 446, 57, 448,
Reply to: