diff -Nru mapserver-5.0.3/debian/changelog mapserver-5.0.3/debian/changelog --- mapserver-5.0.3/debian/changelog 2009-07-27 17:16:57.000000000 -0400 +++ mapserver-5.0.3/debian/changelog 2009-07-27 17:16:58.000000000 -0400 @@ -1,3 +1,29 @@ +mapserver (5.0.3-2ubuntu0.1) intrepid-security; urgency=low + + * SECURITY UPDATE: stack-based buffer overflow (LP: #398814) + - debian/patches/01_CVE-2009-0839.dpatch: Apply a regex pattern + to limit an id's value. + - CVE-2009-0839 + * SECURITY UPDATE: heap-based buffer underflow (LP: #398814) + - debian/patches/02_CVE-2009-840-CVE-2009-2281.dpatch: Add validation for + a post request and the content-length. + - CVE-2009-0840, CVE-2009-2281 + * SECURITY UPDATE: relative file path writing (LP: #398814) + - debian/patches/03_CVE-2009-0841.dpatch: Limit the buffer size. + - CVE-2009-0841 + * SECURITY UPDATE: file data leakage (LP: #398814) + - debian/patches/04_CVE-2009-0842.dpatch: Set MAP/SYMBOLSET tag as mandatory. + - CVE-2009-0842 + * SECURITY UPDATE: file existence leakage (LP: #398814) + - debian/patches/05_CVE-2009-0843.dpatch: Add regex validation for the file extension. + - CVE-2009-0843 + * SECURITY UPDATE: paths specified in url vulnerabilities. + - debian/patches/06_urlpath.dpatch: Disable the variable overwriting from URL of a + few variables. + - [http://trac.osgeo.org/mapserver/ticket/1836] + + -- Alan Boudreault Thu, 23 Jul 2009 08:53:05 -0400 + mapserver (5.0.3-2) unstable; urgency=high * Turning off optimization in debian/rules due to serious breakage of mapserver diff -Nru mapserver-5.0.3/debian/patches/00list mapserver-5.0.3/debian/patches/00list --- mapserver-5.0.3/debian/patches/00list 2009-07-27 17:16:57.000000000 -0400 +++ mapserver-5.0.3/debian/patches/00list 2009-07-27 17:16:58.000000000 -0400 @@ -1,3 +1,9 @@ 50_clean 70_ptrreturn 80_gdal_lib +01_CVE-2009-0839 +02_CVE-2009-840-CVE-2009-2281 +03_CVE-2009-0841 +04_CVE-2009-0842 +05_CVE-2009-0843 +06_urlpath diff -Nru mapserver-5.0.3/debian/patches/01_CVE-2009-0839.dpatch mapserver-5.0.3/debian/patches/01_CVE-2009-0839.dpatch --- mapserver-5.0.3/debian/patches/01_CVE-2009-0839.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ mapserver-5.0.3/debian/patches/01_CVE-2009-0839.dpatch 2009-07-27 17:16:58.000000000 -0400 @@ -0,0 +1,195 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mapserver/+bug/398814 +# Upstream: http://trac.osgeo.org/mapserver/ticket/2942 +# Patch: aboudreault@mapgears.com +# Description: CGI "id" parameter are now sufficiently validated +# +## 01_CVE-2009-0839.dpatch by Alan Boudreault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mapserver-5.0.3~/mapserv.c mapserver-5.0.3/mapserv.c +--- mapserver-5.0.3~/mapserv.c 2007-09-10 09:51:19.000000000 -0400 ++++ mapserver-5.0.3/mapserv.c 2009-06-08 13:33:31.870603634 -0400 +@@ -197,10 +197,23 @@ + } else { + if(getenv(msObj->request->ParamValues[i])) /* an environment references the actual file to use */ + map = msLoadMap(getenv(msObj->request->ParamValues[i]), NULL); +- else ++ else { ++ /* by here we know the request isn't for something in an environment variable */ ++ if(getenv("MS_MAP_NO_PATH")) { ++ msSetError(MS_WEBERR, "Mapfile not found in environment variables and this server is not configured for full paths.", "loadMap()"); ++ writeError(); ++ } ++ ++ if(getenv("MS_MAP_PATTERN") && msEvalRegex(getenv("MS_MAP_PATTERN"), msObj->request->ParamValues[i]) != MS_TRUE) { ++ msSetError(MS_WEBERR, "Parameter 'map' value fails to validate.", "loadMap()"); ++ writeError(); ++ } ++ ++ /* ok to try to load now */ + map = msLoadMap(msObj->request->ParamValues[i], NULL); ++ } + } +- ++ + if(!map) writeError(); + + /* check for any %variable% substitutions here, also do any map_ changes, we do this here so WMS/WFS */ +@@ -357,6 +370,10 @@ + } + + if(strcasecmp(msObj->request->ParamNames[i],"id") == 0) { ++ if(msEvalRegex(IDPATTERN, msObj->request->ParamValues[i]) == MS_FALSE) { ++ msSetError(MS_WEBERR, "Parameter 'id' value fails to validate.", "loadMap()"); ++ writeError(); ++ } + strncpy(msObj->Id, msObj->request->ParamValues[i], IDSIZE); + continue; + } +@@ -1207,7 +1224,7 @@ + loadForm(); + + if(msObj->SaveMap) { +- sprintf(buffer, "%s%s%s.map", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id); ++ snprintf(buffer, sizeof(buffer), "%s%s%s.map", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id); + if(msSaveMap(msObj->Map, buffer) == -1) writeError(); + } + +diff -urNad mapserver-5.0.3~/mapserver.h mapserver-5.0.3/mapserver.h +--- mapserver-5.0.3~/mapserver.h 2008-06-04 15:43:45.000000000 -0400 ++++ mapserver-5.0.3/mapserver.h 2009-06-08 13:33:31.870603634 -0400 +@@ -150,7 +150,9 @@ + /* General defines, not wrapable */ + #ifndef SWIG + #define MS_DEFAULT_MAPFILE_PATTERN "\\.map$" +-#define MS_TEMPLATE_EXPR "\\.(jsp|asp|cfm|xml|wml|html|htm|shtml|phtml|php|svg)$" ++ ++#define MS_TEMPLATE_MAGIC_STRING "MapServer Template" ++#define MS_TEMPLATE_EXPR "\\.(xml|wml|html|htm|svg|kml|gml|js|tmpl)$" + + #define MS_INDEX_EXTENSION ".qix" + #define MS_QUERY_EXTENSION ".qy" +diff -urNad mapserver-5.0.3~/maptemplate.c mapserver-5.0.3/maptemplate.c +--- mapserver-5.0.3~/maptemplate.c 2007-08-24 14:22:05.000000000 -0400 ++++ mapserver-5.0.3/maptemplate.c 2009-06-08 13:33:31.870603634 -0400 +@@ -40,6 +40,20 @@ + + char *processLine(mapservObj* msObj, char* instr, int mode); + ++static int isValidTemplate(FILE *stream, const char *filename) ++{ ++ char buffer[MS_BUFFER_LENGTH]; ++ ++ if(fgets(buffer, MS_BUFFER_LENGTH, stream) != NULL) { ++ if(!msCaseFindSubstring(buffer, MS_TEMPLATE_MAGIC_STRING)) { ++ msSetError(MS_WEBERR, "Missing magic string, %s doesn't look like a MapServer template.", "isValidTemplate()", filename); ++ return MS_FALSE; ++ } ++ } ++ ++ return MS_TRUE; ++} ++ + /* + * Redirect to (only use in CGI) + * +@@ -200,7 +214,7 @@ + img = msDrawMap(msObj->Map, MS_TRUE); + if(!img) return MS_FAILURE; + +- snprintf(buffer, 1024, "%s%s%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); ++ snprintf(buffer, sizeof(buffer), "%s%s%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); + + status = msSaveImage(msObj->Map, img, buffer); + if(status != MS_SUCCESS) return status; +@@ -211,7 +225,7 @@ + { + img = msDrawLegend(msObj->Map, MS_FALSE); + if(!img) return MS_FAILURE; +- snprintf(buffer, 1024, "%s%sleg%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); ++ snprintf(buffer, sizeof(buffer), "%s%sleg%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); + status = msSaveImage(msObj->Map, img, buffer); + if(status != MS_SUCCESS) return status; + msFreeImage(img); +@@ -221,7 +235,7 @@ + { + img = msDrawScalebar(msObj->Map); + if(!img) return MS_FAILURE; +- snprintf(buffer, 1024, "%s%ssb%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); ++ snprintf(buffer, sizeof(buffer), "%s%ssb%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); + status = msSaveImage( msObj->Map, img, buffer); + if(status != MS_SUCCESS) return status; + msFreeImage(img); +@@ -231,7 +245,7 @@ + { + img = msDrawReferenceMap(msObj->Map); + if(!img) return MS_FAILURE; +- snprintf(buffer, 1024, "%s%sref%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); ++ snprintf(buffer, sizeof(buffer), "%s%sref%s.%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_IMAGE_EXTENSION(msObj->Map->outputformat)); + status = msSaveImage(msObj->Map, img, buffer); + if(status != MS_SUCCESS) return status; + msFreeImage(img); +@@ -2392,6 +2406,11 @@ + return(NULL); + } + ++ if(isValidTemplate(stream, join->header) != MS_TRUE) { ++ fclose(stream); ++ return NULL; ++ } ++ + /* echo file to the output buffer, no substitutions */ + while(fgets(line, MS_BUFFER_LENGTH, stream) != NULL) outbuf = msStringConcatenate(outbuf, line); + +@@ -2402,7 +2421,12 @@ + msSetError(MS_IOERR, "Error while opening join template file %s.", "processOneToManyJoin()", join->template); + return(NULL); + } +- ++ ++ if(isValidTemplate(stream, join->template) != MS_TRUE) { ++ fclose(stream); ++ return NULL; ++ } ++ + records = MS_TRUE; + } + +@@ -2417,6 +2441,7 @@ + } + + rewind(stream); ++ fgets(line, MS_BUFFER_LENGTH, stream); /* skip the first line since it's the magic string */ + } /* next record */ + + if(records==MS_TRUE && join->footer) { +@@ -2425,6 +2450,11 @@ + return(NULL); + } + ++ if(isValidTemplate(stream, join->footer) != MS_TRUE) { ++ fclose(stream); ++ return NULL; ++ } ++ + /* echo file to the output buffer, no substitutions */ + while(fgets(line, MS_BUFFER_LENGTH, stream) != NULL) outbuf = msStringConcatenate(outbuf, line); + +diff -urNad mapserver-5.0.3~/maptemplate.h mapserver-5.0.3/maptemplate.h +--- mapserver-5.0.3~/maptemplate.h 2007-08-30 09:52:07.000000000 -0400 ++++ mapserver-5.0.3/maptemplate.h 2009-06-08 13:33:31.860604977 -0400 +@@ -33,7 +33,8 @@ + #include "mapserver.h" + #include "maphash.h" + +-#define IDSIZE 128 ++#define IDPATTERN "^[0-9A-Za-z]{1,63}$" ++#define IDSIZE 64 + #define TEMPLATE_TYPE(s) (((strncmp("http://", s, 7) == 0) || (strncmp("https://", s, 8) == 0) || (strncmp("ftp://", s, 6)) == 0) ? MS_URL : MS_FILE) + #define MAXZOOM 25 + #define MINZOOM -25 diff -Nru mapserver-5.0.3/debian/patches/02_CVE-2009-840-CVE-2009-2281.dpatch mapserver-5.0.3/debian/patches/02_CVE-2009-840-CVE-2009-2281.dpatch --- mapserver-5.0.3/debian/patches/02_CVE-2009-840-CVE-2009-2281.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ mapserver-5.0.3/debian/patches/02_CVE-2009-840-CVE-2009-2281.dpatch 2009-07-27 17:16:58.000000000 -0400 @@ -0,0 +1,107 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mapserver/+bug/398814 +# Upstream: http://trac.osgeo.org/mapserver/ticket/2943 +# Patch: aboudreault@mapgears.com +# Description: Fix buffer overflow for a post request +# +## 02_CVE-2009-840-CVE-2009-2281.dpatch by Alan Boudreault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mapserver-5.0.3~/cgiutil.c mapserver-5.0.3/cgiutil.c +--- mapserver-5.0.3~/cgiutil.c 2007-08-31 17:40:06.000000000 -0400 ++++ mapserver-5.0.3/cgiutil.c 2009-07-14 09:04:55.590607889 -0400 +@@ -1,4 +1,5 @@ + /****************************************************************************** ++ * $Id$ + * + * Project: MapServer + * Purpose: cgiRequestObj and CGI parameter parsing. +@@ -41,7 +42,8 @@ + static char *readPostBody( cgiRequestObj *request ) + { + char *data; +- int data_max, data_len, chunk_size; ++ size_t data_max, data_len; ++ int chunk_size; + + msIO_needBinaryStdin(); + +@@ -49,11 +51,17 @@ + /* If the length is provided, read in one gulp. */ + /* -------------------------------------------------------------------- */ + if( getenv("CONTENT_LENGTH") != NULL ) { +- data_max = atoi(getenv("CONTENT_LENGTH")); ++ data_max = (size_t) atoi(getenv("CONTENT_LENGTH")); ++ /* Test for suspicious CONTENT_LENGTH (negative value or SIZE_MAX) */ ++ if( data_max >= SIZE_MAX ) { ++ msIO_printf("Content-type: text/html%c%c",10,10); ++ msIO_printf("Suspicious Content-Length.\n"); ++ exit( 1 ); ++ } + data = (char *) malloc(data_max+1); + if( data == NULL ) { + msIO_printf("Content-type: text/html%c%c",10,10); +- msIO_printf("malloc() failed, Content-Length: %d unreasonably large?\n", data_max ); ++ msIO_printf("malloc() failed, Content-Length: %u unreasonably large?\n", data_max ); + exit( 1 ); + } + +@@ -70,7 +78,9 @@ + /* -------------------------------------------------------------------- */ + /* Otherwise read in chunks to the end. */ + /* -------------------------------------------------------------------- */ +- data_max = 10000; ++#define DATA_ALLOC_SIZE 10000 ++ ++ data_max = DATA_ALLOC_SIZE; + data_len = 0; + data = (char *) malloc(data_max+1); + +@@ -78,12 +88,19 @@ + data_len += chunk_size; + + if( data_len == data_max ) { +- data_max = data_max + 10000; ++ /* Realloc buffer, making sure we check for possible size_t overflow */ ++ if ( data_max > SIZE_MAX - (DATA_ALLOC_SIZE+1) ) { ++ msIO_printf("Content-type: text/html%c%c",10,10); ++ msIO_printf("Possible size_t overflow, cannot reallocate input buffer, POST body too large?\n" ); ++ exit(1); ++ } ++ ++ data_max = data_max + DATA_ALLOC_SIZE; + data = (char *) realloc(data, data_max+1); + + if( data == NULL ) { + msIO_printf("Content-type: text/html%c%c",10,10); +- msIO_printf("out of memory trying to allocate %d input buffer, POST body too large?\n", data_max+1 ); ++ msIO_printf("out of memory trying to allocate %u input buffer, POST body too large?\n", data_max+1 ); + exit(1); + } + } +diff -urNad mapserver-5.0.3~/mapserver.h mapserver-5.0.3/mapserver.h +--- mapserver-5.0.3~/mapserver.h 2008-06-04 15:43:45.000000000 -0400 ++++ mapserver-5.0.3/mapserver.h 2009-07-14 09:04:55.590607889 -0400 +@@ -65,6 +65,10 @@ + + /* definition of ms_int32/ms_uint32 */ + #include ++#ifndef _WIN32 ++#include ++#endif ++ + #if ULONG_MAX == 0xffffffff + typedef long ms_int32; + typedef unsigned long ms_uint32; +@@ -72,7 +76,6 @@ + typedef int ms_int32; + typedef unsigned int ms_uint32; + #else +-#include + typedef int32_t ms_int32; + typedef uint32_t ms_uint32; + #endif diff -Nru mapserver-5.0.3/debian/patches/03_CVE-2009-0841.dpatch mapserver-5.0.3/debian/patches/03_CVE-2009-0841.dpatch --- mapserver-5.0.3/debian/patches/03_CVE-2009-0841.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ mapserver-5.0.3/debian/patches/03_CVE-2009-0841.dpatch 2009-07-27 17:16:58.000000000 -0400 @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mapserver/+bug/398814 +# Upstream: http://trac.osgeo.org/mapserver/ticket/2942 +# Patch: aboudreault@mapgears.com +# Description: Fix relative file path writing +# +## 03_CVE-2009-0841.dpatch by Alan Boudreault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mapserver-5.0.3~/mapserv.c mapserver-5.0.3/mapserv.c +--- mapserver-5.0.3~/mapserv.c 2007-09-10 09:51:19.000000000 -0400 ++++ mapserver-5.0.3/mapserv.c 2009-06-08 13:35:11.130609480 -0400 +@@ -1585,7 +1585,7 @@ + if(msReturnTemplateQuery(msObj, msObj->Map->web.queryformat, NULL) != MS_SUCCESS) writeError(); + + if(msObj->SaveQuery) { +- sprintf(buffer, "%s%s%s%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_QUERY_EXTENSION); ++ snprintf(buffer, sizeof(buffer), "%s%s%s%s", msObj->Map->web.imagepath, msObj->Map->name, msObj->Id, MS_QUERY_EXTENSION); + if((status = msSaveQuery(msObj->Map, buffer)) != MS_SUCCESS) return status; + } + } diff -Nru mapserver-5.0.3/debian/patches/04_CVE-2009-0842.dpatch mapserver-5.0.3/debian/patches/04_CVE-2009-0842.dpatch --- mapserver-5.0.3/debian/patches/04_CVE-2009-0842.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ mapserver-5.0.3/debian/patches/04_CVE-2009-0842.dpatch 2009-07-27 17:16:58.000000000 -0400 @@ -0,0 +1,126 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mapserver/+bug/398814 +# Upstream: http://trac.osgeo.org/mapserver/ticket/2941 +# Patch: aboudreault@mapgears.com +# Description: Fix mapfile parser leak sensitive data +# +## 04_CVE-2009-0842.dpatch by Alan Boudreault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mapserver-5.0.3~/mapfile.c mapserver-5.0.3/mapfile.c +--- mapserver-5.0.3~/mapfile.c 2008-01-20 11:11:29.000000000 -0500 ++++ mapserver-5.0.3/mapfile.c 2009-06-08 13:35:53.641855604 -0400 +@@ -4228,10 +4228,20 @@ + static int loadMapInternal(mapObj *map) + { + int i,j,k; ++ int foundMapToken=MS_FALSE; ++ int token; + + for(;;) { + +- switch(msyylex()) { ++ token = msyylex(); ++ ++ if(!foundMapToken && token != MAP) { ++ msSetError(MS_IDENTERR, "First token must be MAP, this doesn't look like a mapfile.", "msLoadMap()"); ++ return(MS_FAILURE); ++ } ++ ++ switch(token) { ++ + + case(CONFIG): + { +@@ -4358,6 +4368,7 @@ + if(loadLegend(&(map->legend), map) == -1) return MS_FAILURE; + break; + case(MAP): ++ foundMapToken = MS_TRUE; + break; + case(MAXSIZE): + if(getInteger(&(map->maxsize)) == -1) return MS_FAILURE; +diff -urNad mapserver-5.0.3~/mapsymbol.c mapserver-5.0.3/mapsymbol.c +--- mapserver-5.0.3~/mapsymbol.c 2007-11-08 10:19:29.000000000 -0500 ++++ mapserver-5.0.3/mapsymbol.c 2009-06-08 13:35:53.651858522 -0400 +@@ -616,7 +616,7 @@ + int msLoadSymbolSet(symbolSetObj *symbolset, mapObj *map) + { + int retval = MS_FAILURE; +- ++ + msAcquireLock( TLOCK_PARSER ); + retval = loadSymbolSet( symbolset, map ); + msReleaseLock( TLOCK_PARSER ); +@@ -631,6 +631,9 @@ + int status=1; + char szPath[MS_MAXPATHLEN], *pszSymbolPath=NULL; + ++ int foundSymbolSetToken=MS_FALSE; ++ int token; ++ + if(!symbolset) { + msSetError(MS_SYMERR, "Symbol structure unallocated.", "loadSymbolSet()"); + return(-1); +@@ -657,7 +660,15 @@ + ** Read the symbol file + */ + for(;;) { +- switch(msyylex()) { ++ ++ token = msyylex(); ++ ++ if(!foundSymbolSetToken && token != SYMBOLSET) { ++ msSetError(MS_IDENTERR, "First token must be SYMBOLSET, this doesn't look like a symbol file.", "msLoadSymbolSet()"); ++ return(-1); ++ } ++ ++ switch(token) { + case(END): + case(EOF): + status = 0; +@@ -673,6 +684,7 @@ + symbolset->numsymbols++; + break; + case(SYMBOLSET): ++ foundSymbolSetToken = MS_TRUE; + break; + default: + msSetError(MS_IDENTERR, "Parsing error near (%s):(line %d)", "loadSymbolSet()", msyytext, msyylineno); +diff -urNad mapserver-5.0.3~/tests/symbols.txt mapserver-5.0.3/tests/symbols.txt +--- mapserver-5.0.3~/tests/symbols.txt 2004-11-18 10:07:36.000000000 -0500 ++++ mapserver-5.0.3/tests/symbols.txt 2009-06-08 13:35:53.651858522 -0400 +@@ -1,22 +1,22 @@ +- +-SYMBOL ++SYMBOLSET ++ SYMBOL + NAME 'circle' + TYPE ellipse + FILLED true + POINTS + 1 1 + END +-END ++ END + +-SYMBOL ++ SYMBOL + NAME 'xmarks-png' + TYPE PIXMAP + IMAGE 'xmarks.png' +-END ++ END + +-SYMBOL ++ SYMBOL + NAME 'home-png' + TYPE PIXMAP + IMAGE 'home.png' ++ END + END +- diff -Nru mapserver-5.0.3/debian/patches/05_CVE-2009-0843.dpatch mapserver-5.0.3/debian/patches/05_CVE-2009-0843.dpatch --- mapserver-5.0.3/debian/patches/05_CVE-2009-0843.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ mapserver-5.0.3/debian/patches/05_CVE-2009-0843.dpatch 2009-07-27 17:16:58.000000000 -0400 @@ -0,0 +1,29 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mapserver/+bug/398814 +# Upstream: http://trac.osgeo.org/mapserver/ticket/2939 +# Patch: aboudreault@mapgears.com +# Patch: aboudreault@mapgears.com +# Description: Fix file Existence Leakage +# +## 05_CVE-2009-0843.dpatch by Alan Boudreault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mapserver-5.0.3~/mapquery.c mapserver-5.0.3/mapquery.c +--- mapserver-5.0.3~/mapquery.c 2008-05-05 10:46:11.000000000 -0400 ++++ mapserver-5.0.3/mapquery.c 2009-06-08 13:36:44.410605642 -0400 +@@ -120,6 +120,11 @@ + return(MS_FAILURE); + } + ++ /* ++ ** Make sure the file at least has the right extension. ++ */ ++ if(msEvalRegex("\\.qy$", filename) != MS_TRUE) return MS_FAILURE; ++ + stream = fopen(filename, "rb"); + if(!stream) { + msSetError(MS_IOERR, "(%s)", "msLoadQuery()", filename); diff -Nru mapserver-5.0.3/debian/patches/06_urlpath.dpatch mapserver-5.0.3/debian/patches/06_urlpath.dpatch --- mapserver-5.0.3/debian/patches/06_urlpath.dpatch 1969-12-31 19:00:00.000000000 -0500 +++ mapserver-5.0.3/debian/patches/06_urlpath.dpatch 2009-07-27 17:16:58.000000000 -0400 @@ -0,0 +1,1817 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mapserver/+bug/398814 +# Upstream: http://trac.osgeo.org/mapserver/ticket/1836 +# Patch: aboudreault@mapgears.com +# Description: Fix handling of IMAGEPATH and IMAGEURL +# +## 06_urlpath.dpatch by Alan Boudreault +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad mapserver-5.0.3~/maplexer.c mapserver-5.0.3/maplexer.c +--- mapserver-5.0.3~/maplexer.c 2008-06-03 11:36:38.000000000 -0400 ++++ mapserver-5.0.3/maplexer.c 2009-07-23 09:07:55.450606144 -0400 +@@ -373,7 +373,7 @@ + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +-static yyconst flex_int16_t yy_accept[1554] = ++static yyconst flex_int16_t yy_accept[1550] = + { 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 280, 277, 1, 275, 277, 2, +@@ -404,148 +404,147 @@ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 268, 0, 274, + 192, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 223, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 7, 0, 0, 5, +- 0, 0, 259, 259, 259, 0, 259, 0, 11, 6, ++ 274, 274, 274, 223, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 7, 0, 0, 5, 0, ++ 0, 259, 259, 259, 0, 259, 0, 11, 6, 12, + +- 12, 10, 0, 260, 0, 8, 0, 13, 11, 9, +- 0, 4, 0, 264, 0, 267, 0, 273, 271, 266, +- 258, 0, 0, 274, 258, 263, 261, 258, 0, 0, +- 258, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 194, +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 44, ++ 10, 0, 260, 0, 8, 0, 13, 11, 9, 0, ++ 4, 0, 264, 0, 267, 0, 273, 271, 266, 258, ++ 0, 0, 274, 258, 263, 261, 258, 0, 0, 258, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 59, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 194, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 44, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 95, 96, 274, 274, 274, 274, 274, ++ 274, 59, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 95, 96, 274, 274, 274, 274, 274, 274, + +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 221, +- 222, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 221, 222, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 238, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 179, +- 252, 274, 181, 253, 274, 0, 255, 0, 0, 0, +- 0, 0, 0, 96, 0, 0, 0, 0, 0, 0, +- 0, 0, 0, 179, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 221, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 238, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 179, 252, ++ 274, 181, 253, 274, 0, 255, 0, 0, 0, 0, ++ 0, 0, 96, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 179, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 221, 274, 274, 274, 274, 274, 274, 274, + +- 274, 274, 274, 274, 274, 269, 0, 259, 259, 0, +- 0, 259, 16, 0, 14, 262, 258, 261, 0, 258, +- 274, 274, 274, 274, 184, 274, 274, 274, 274, 274, +- 274, 187, 274, 274, 274, 274, 274, 274, 274, 37, +- 274, 274, 274, 41, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 202, 274, 274, 274, 54, 274, 274, +- 274, 58, 274, 274, 60, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 75, 274, 274, 274, 274, 274, +- 274, 274, 274, 211, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 269, 0, 259, 259, 0, 0, 259, ++ 16, 0, 14, 262, 258, 261, 0, 258, 274, 274, ++ 274, 274, 184, 274, 274, 274, 274, 274, 274, 187, ++ 274, 274, 274, 274, 274, 274, 274, 37, 274, 274, ++ 274, 41, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 202, 274, 274, 274, 54, 274, 274, 274, 58, ++ 274, 274, 60, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 75, 274, 274, 274, 274, 274, 274, 274, ++ 274, 211, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 122, +- 219, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 122, 219, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 155, 274, 274, 274, +- 274, 274, 274, 274, 167, 274, 244, 274, 274, 274, +- 274, 246, 177, 274, 274, 274, 182, 0, 0, 0, +- 0, 0, 0, 0, 0, 0, 0, 0, 155, 0, +- 0, 0, 274, 37, 274, 54, 274, 274, 274, 274, +- 274, 274, 155, 274, 274, 246, 0, 259, 0, 254, ++ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 155, 274, 274, 274, 274, 274, ++ 274, 274, 167, 274, 244, 274, 274, 274, 274, 246, ++ 177, 274, 274, 274, 182, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 155, 0, 0, 0, ++ 274, 37, 274, 54, 274, 274, 274, 274, 274, 155, ++ 274, 274, 246, 0, 259, 0, 254, 22, 274, 274, + +- 22, 274, 274, 274, 274, 185, 274, 274, 274, 274, +- 274, 190, 274, 31, 33, 274, 274, 274, 274, 39, +- 274, 274, 274, 200, 42, 274, 45, 274, 274, 201, +- 274, 274, 274, 274, 274, 274, 56, 274, 204, 274, +- 62, 205, 274, 274, 64, 274, 274, 72, 274, 274, +- 274, 274, 274, 79, 209, 274, 89, 274, 274, 274, ++ 274, 274, 185, 274, 274, 274, 274, 274, 190, 274, ++ 31, 33, 274, 274, 274, 274, 39, 274, 274, 274, ++ 200, 42, 274, 45, 274, 274, 201, 274, 274, 274, ++ 274, 274, 274, 56, 274, 204, 274, 62, 205, 274, ++ 274, 64, 274, 274, 72, 274, 274, 274, 274, 274, ++ 79, 209, 274, 89, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 216, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 217, 274, 233, 195, 274, ++ 216, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 217, 274, 233, 195, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + +- 274, 274, 274, 274, 230, 274, 274, 274, 274, 274, +- 274, 274, 235, 274, 274, 274, 274, 274, 274, 237, +- 149, 274, 274, 274, 274, 274, 274, 242, 274, 274, +- 158, 274, 164, 274, 274, 170, 274, 274, 274, 274, +- 178, 274, 180, 22, 31, 0, 0, 89, 0, 0, +- 0, 0, 0, 0, 158, 0, 178, 33, 274, 274, +- 79, 274, 274, 274, 274, 0, 274, 274, 274, 274, +- 274, 186, 274, 29, 274, 274, 191, 274, 274, 34, +- 274, 274, 274, 274, 40, 274, 274, 274, 274, 47, +- 274, 50, 51, 203, 274, 53, 274, 274, 63, 206, ++ 274, 230, 274, 274, 274, 274, 274, 274, 274, 235, ++ 274, 274, 274, 274, 274, 274, 237, 149, 274, 274, ++ 274, 274, 274, 274, 242, 274, 274, 158, 274, 164, ++ 274, 274, 170, 274, 274, 274, 274, 178, 274, 180, ++ 22, 31, 0, 0, 89, 0, 0, 0, 0, 0, ++ 0, 158, 0, 178, 33, 274, 79, 274, 274, 274, ++ 274, 0, 274, 274, 274, 274, 274, 186, 274, 29, ++ 274, 274, 191, 274, 274, 34, 274, 274, 274, 274, ++ 40, 274, 274, 274, 274, 47, 274, 50, 51, 203, ++ 274, 53, 274, 274, 63, 206, 274, 274, 274, 274, + +- 274, 274, 274, 274, 274, 274, 207, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 88, +- 90, 274, 274, 97, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 214, 274, 215, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 220, 123, ++ 274, 274, 207, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 88, 90, 274, 274, 97, ++ 274, 274, 274, 274, 274, 274, 274, 274, 274, 214, ++ 274, 215, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 220, 123, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 229, 228, 234, 137, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 229, 228, 234, 137, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 236, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 240, 241, 274, 243, 157, +- 274, 160, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 236, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 240, 241, 274, 243, 157, 274, 160, 274, 274, ++ 274, 274, 274, 274, 274, 274, 251, 47, 0, 0, + +- 251, 47, 0, 0, 90, 0, 0, 0, 0, 0, +- 0, 274, 160, 274, 15, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 197, 199, +- 274, 274, 274, 49, 274, 55, 274, 274, 274, 274, +- 274, 274, 274, 274, 71, 274, 274, 274, 77, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 92, 274, +- 274, 99, 274, 274, 274, 274, 105, 274, 274, 274, +- 274, 274, 111, 274, 274, 274, 274, 274, 118, 274, +- 274, 274, 274, 124, 274, 125, 274, 274, 274, 274, +- 274, 136, 274, 231, 274, 232, 274, 274, 274, 274, ++ 90, 0, 0, 0, 0, 0, 0, 274, 160, 274, ++ 15, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 197, 199, 274, 274, 274, 49, ++ 274, 55, 274, 274, 274, 274, 274, 274, 274, 274, ++ 71, 274, 274, 274, 77, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 92, 274, 274, 99, 274, 274, ++ 274, 274, 105, 274, 274, 274, 274, 274, 111, 274, ++ 274, 274, 274, 274, 118, 274, 274, 274, 274, 124, ++ 274, 125, 274, 274, 274, 274, 274, 136, 274, 231, ++ 274, 232, 274, 274, 274, 274, 274, 274, 274, 274, + + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 0, 0, 0, 0, 0, +- 0, 0, 0, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 43, 274, +- 274, 274, 274, 274, 274, 274, 274, 274, 274, 70, +- 274, 274, 76, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 93, 274, 274, 274, 274, 103, 274, 274, +- 108, 109, 110, 274, 274, 274, 274, 116, 274, 274, +- 121, 218, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 0, 0, 0, 0, 0, 0, 0, 0, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 43, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 70, 274, 274, 76, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 93, 274, ++ 274, 274, 274, 103, 274, 274, 108, 109, 110, 274, ++ 274, 274, 274, 116, 274, 274, 121, 218, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 135, 274, + +- 274, 274, 135, 274, 138, 274, 274, 140, 274, 274, +- 274, 144, 274, 274, 274, 147, 274, 151, 274, 239, +- 274, 274, 274, 274, 274, 274, 274, 165, 274, 169, +- 274, 274, 274, 245, 247, 0, 0, 0, 144, 0, +- 0, 151, 0, 165, 274, 274, 23, 274, 27, 274, +- 188, 30, 32, 274, 274, 274, 19, 274, 48, 274, +- 274, 61, 274, 68, 69, 274, 66, 73, 74, 274, +- 274, 274, 274, 82, 274, 274, 274, 274, 274, 274, ++ 138, 274, 274, 140, 274, 274, 274, 144, 274, 274, ++ 274, 147, 274, 151, 274, 239, 274, 274, 274, 274, ++ 274, 274, 274, 165, 274, 169, 274, 274, 274, 245, ++ 247, 0, 0, 0, 144, 0, 0, 151, 0, 165, ++ 274, 274, 23, 274, 27, 274, 188, 30, 32, 274, ++ 274, 274, 19, 274, 48, 274, 274, 61, 274, 68, ++ 69, 274, 66, 73, 74, 274, 274, 274, 274, 82, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- + 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 20, 145, 274, 274, 274, 274, 274, 154, 156, +- 159, 274, 163, 274, 168, 172, 176, 274, 0, 66, +- 0, 145, 0, 0, 21, 183, 274, 274, 17, 35, +- 274, 46, 52, 274, 65, 274, 78, 208, 80, 274, +- 274, 274, 274, 274, 274, 98, 100, 274, 274, 274, +- 274, 274, 112, 274, 274, 274, 274, 274, 274, 274, +- 224, 274, 274, 274, 274, 274, 274, 274, 274, 274, +- 274, 274, 196, 274, 141, 142, 274, 146, 148, 150, +- 274, 153, 274, 274, 274, 274, 65, 142, 148, 0, + +- 274, 274, 274, 274, 274, 38, 274, 274, 81, 274, +- 274, 274, 274, 274, 101, 102, 274, 274, 107, 113, +- 274, 115, 274, 274, 120, 225, 274, 274, 274, 274, +- 274, 274, 274, 274, 133, 274, 227, 274, 143, 152, +- 161, 274, 274, 274, 175, 175, 274, 274, 274, 28, +- 274, 57, 67, 274, 274, 274, 91, 274, 274, 106, +- 274, 274, 119, 274, 126, 127, 274, 129, 274, 274, +- 274, 274, 274, 274, 274, 274, 174, 274, 274, 274, +- 274, 83, 85, 87, 274, 104, 274, 117, 226, 274, +- 274, 274, 274, 134, 274, 274, 274, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 20, 145, 274, ++ 274, 274, 274, 274, 154, 156, 159, 274, 163, 274, ++ 168, 172, 176, 274, 0, 66, 0, 145, 0, 0, ++ 21, 183, 274, 274, 17, 35, 274, 46, 52, 274, ++ 65, 274, 78, 208, 80, 274, 274, 274, 274, 274, ++ 274, 98, 100, 274, 274, 274, 274, 274, 112, 274, ++ 274, 274, 274, 274, 274, 274, 224, 274, 274, 274, ++ 274, 274, 274, 274, 274, 274, 274, 274, 196, 274, ++ 141, 142, 274, 146, 148, 150, 274, 153, 274, 274, ++ 274, 274, 65, 142, 148, 0, 274, 274, 274, 274, + +- 274, 36, 274, 274, 274, 114, 274, 130, 131, 274, +- 139, 274, 274, 173, 18, 24, 274, 274, 274, 94, +- 274, 274, 274, 166, 274, 274, 274, 274, 274, 162, +- 274, 274, 274, 274, 274, 274, 274, 274, 84, 86, +- 274, 274, 274, 274, 274, 132, 274, 26, 274, 25, +- 274, 128, 0 ++ 274, 38, 274, 274, 81, 274, 274, 274, 274, 274, ++ 101, 102, 274, 274, 107, 113, 274, 115, 274, 274, ++ 120, 225, 274, 274, 274, 274, 274, 274, 274, 274, ++ 133, 274, 227, 274, 143, 152, 161, 274, 274, 274, ++ 175, 175, 274, 274, 274, 28, 274, 57, 67, 274, ++ 274, 274, 91, 274, 274, 106, 274, 274, 119, 274, ++ 126, 127, 274, 129, 274, 274, 274, 274, 274, 274, ++ 274, 274, 174, 274, 274, 274, 274, 83, 85, 87, ++ 274, 104, 274, 117, 226, 274, 274, 274, 274, 134, ++ 274, 274, 274, 274, 274, 274, 274, 36, 274, 274, ++ ++ 274, 114, 274, 130, 131, 274, 139, 274, 274, 173, ++ 18, 24, 274, 274, 274, 94, 274, 274, 274, 166, ++ 274, 274, 274, 274, 274, 162, 274, 274, 274, 274, ++ 274, 274, 274, 274, 84, 86, 274, 274, 274, 274, ++ 274, 132, 274, 26, 274, 25, 274, 128, 0 + } ; + + static yyconst flex_int32_t yy_ec[256] = +@@ -590,361 +589,361 @@ + 6, 1, 1, 1 + } ; + +-static yyconst flex_int16_t yy_base[1576] = ++static yyconst flex_int16_t yy_base[1572] = + { 0, + 0, 0, 52, 104, 158, 0, 212, 0, 55, 59, +- 107, 111, 55, 59, 1958, 1959, 83, 1959, 1950, 0, +- 1946, 1943, 53, 62, 266, 105, 1931, 64, 97, 295, +- 301, 303, 319, 110, 103, 45, 1913, 121, 330, 331, +- 32, 337, 345, 1906, 296, 361, 367, 359, 1921, 378, +- 0, 1959, 1959, 1959, 82, 1911, 1912, 1899, 1909, 307, +- 1920, 1902, 1898, 1913, 385, 1899, 1902, 1910, 346, 1932, +- 1928, 376, 1911, 392, 397, 395, 410, 1906, 286, 1901, +- 411, 415, 412, 114, 422, 388, 90, 1959, 458, 464, +- 1915, 1926, 1923, 1921, 357, 375, 456, 1911, 347, 1910, ++ 107, 111, 55, 59, 1952, 1953, 83, 1953, 1944, 0, ++ 1940, 1937, 53, 62, 266, 105, 1925, 64, 97, 295, ++ 301, 303, 319, 110, 103, 45, 1907, 121, 330, 331, ++ 32, 337, 345, 1900, 296, 361, 367, 359, 1915, 378, ++ 0, 1953, 1953, 1953, 82, 1905, 1906, 1893, 1903, 307, ++ 1914, 1896, 1892, 1907, 385, 1893, 1896, 1904, 346, 1926, ++ 1922, 376, 1905, 392, 397, 395, 410, 1900, 1890, 1894, ++ 411, 415, 412, 114, 422, 388, 90, 1953, 458, 464, ++ 1908, 1919, 1916, 1914, 357, 375, 456, 1904, 347, 1903, + +- 1903, 1888, 1884, 412, 304, 416, 434, 1882, 1872, 1959, +- 1959, 473, 1907, 1915, 1911, 0, 1959, 0, 477, 1913, +- 1885, 0, 1908, 1883, 1904, 1903, 435, 468, 0, 459, +- 474, 1898, 0, 1879, 463, 482, 1889, 1888, 1869, 458, +- 1864, 63, 1861, 1862, 1866, 439, 1862, 0, 1878, 1860, +- 1876, 455, 0, 1854, 1855, 0, 473, 1865, 1860, 1860, +- 474, 326, 1853, 461, 1858, 479, 1857, 471, 1853, 1851, +- 1865, 486, 1845, 1863, 1851, 1861, 488, 1852, 1835, 1847, +- 480, 0, 1851, 1843, 0, 1849, 0, 478, 484, 497, +- 1843, 496, 1841, 479, 1847, 1834, 1846, 1849, 1848, 1828, ++ 1896, 1881, 1877, 412, 295, 416, 434, 1875, 1865, 1953, ++ 1953, 473, 1900, 1908, 1904, 0, 1953, 0, 477, 1906, ++ 1878, 0, 1901, 1876, 1897, 1896, 435, 468, 0, 459, ++ 474, 1891, 0, 1872, 463, 482, 1882, 1881, 1862, 458, ++ 1857, 63, 1854, 1855, 1859, 439, 1855, 0, 1871, 1853, ++ 1869, 455, 0, 1847, 1848, 0, 473, 1858, 1853, 1853, ++ 474, 326, 1846, 461, 1851, 479, 1850, 471, 1846, 1844, ++ 1858, 486, 1838, 1856, 1844, 1854, 488, 1845, 1828, 1840, ++ 480, 0, 1844, 1836, 0, 1842, 0, 478, 484, 497, ++ 1836, 496, 1834, 479, 1840, 1827, 1839, 1842, 1841, 1821, + +- 1842, 494, 1828, 1821, 1823, 504, 509, 1838, 506, 515, +- 1821, 1840, 1835, 1827, 1837, 493, 1836, 1815, 521, 1822, +- 1832, 513, 516, 1821, 530, 1816, 0, 0, 1822, 0, +- 1827, 1827, 1809, 1823, 1806, 1806, 1823, 1825, 537, 1959, +- 1815, 1820, 1800, 1818, 1793, 1810, 1800, 1800, 1809, 534, +- 1812, 1786, 1786, 1809, 1800, 1806, 1825, 1959, 1821, 1802, +- 0, 1792, 1783, 1796, 1797, 1780, 529, 1798, 1795, 1795, +- 1772, 1775, 533, 1788, 0, 1773, 1787, 529, 1776, 1789, +- 1763, 1787, 1774, 536, 1774, 1764, 1959, 1802, 1774, 1959, +- 1797, 1772, 550, 560, 562, 569, 564, 574, 1959, 1959, ++ 1835, 494, 1821, 1814, 1816, 504, 509, 1831, 506, 515, ++ 1814, 1833, 1828, 1820, 1830, 493, 1829, 1808, 521, 1815, ++ 1825, 513, 516, 1814, 530, 1809, 0, 0, 1815, 0, ++ 1820, 1820, 1802, 1816, 1799, 1799, 1816, 1818, 537, 1953, ++ 1808, 1813, 1793, 1811, 1786, 1803, 1793, 1793, 1802, 534, ++ 1805, 1779, 1779, 1802, 1793, 1799, 1818, 1953, 1814, 1795, ++ 0, 1785, 1776, 1789, 1790, 1773, 529, 1789, 1789, 1766, ++ 1769, 533, 1782, 0, 1767, 1781, 529, 1770, 1783, 1757, ++ 1781, 1768, 536, 1768, 1758, 1953, 1796, 1768, 1953, 1791, ++ 1766, 550, 560, 562, 569, 564, 574, 1953, 1953, 1953, + +- 1959, 1959, 1780, 1959, 1775, 1959, 1761, 1959, 1763, 1959, +- 1756, 1959, 1784, 1765, 1791, 1959, 1787, 0, 1959, 1959, +- 567, 582, 1779, 1778, 1777, 1759, 0, 572, 587, 1775, +- 1774, 1757, 1752, 1748, 1753, 1746, 1749, 1755, 1753, 1744, +- 1733, 1749, 1734, 1733, 1734, 1748, 1731, 1734, 567, 0, +- 1747, 1726, 1745, 1723, 1728, 1734, 1737, 1721, 1725, 0, +- 1724, 1720, 1732, 1717, 1715, 1714, 566, 1721, 1712, 1711, +- 577, 1717, 0, 1715, 1708, 1723, 1705, 1722, 1720, 1714, +- 1715, 575, 1716, 1715, 1705, 573, 1703, 1712, 1709, 1703, +- 1709, 1708, 1707, 0, 0, 1700, 587, 1701, 590, 1704, ++ 1953, 1774, 1953, 1769, 1953, 1755, 1953, 1757, 1953, 1750, ++ 1953, 1778, 1759, 1785, 1953, 1781, 0, 1953, 1953, 567, ++ 582, 1773, 1772, 1771, 1753, 0, 572, 587, 1769, 1768, ++ 1751, 1746, 1742, 1747, 1740, 1743, 1749, 1747, 1738, 1727, ++ 1743, 1728, 1727, 1728, 1742, 1725, 1728, 567, 0, 1741, ++ 1720, 1739, 1717, 1722, 1728, 1731, 1715, 1719, 0, 1718, ++ 1714, 1726, 1711, 1709, 1708, 566, 1715, 1706, 1705, 577, ++ 1711, 0, 1709, 1702, 1717, 1699, 1716, 1714, 1708, 1709, ++ 575, 1710, 1709, 1699, 573, 1697, 1706, 1703, 1697, 1703, ++ 1702, 1701, 0, 0, 1694, 587, 1695, 590, 1698, 1697, + +- 1703, 596, 1702, 1686, 1696, 1687, 1698, 1697, 1688, 1681, +- 0, 1710, 1695, 1694, 587, 1678, 1675, 1674, 1690, 596, +- 1685, 1677, 1665, 602, 1674, 610, 1670, 1680, 1666, 1680, +- 1683, 1662, 1667, 1667, 1668, 0, 1674, 608, 1662, 1670, +- 1671, 1663, 1673, 1653, 1660, 1669, 1658, 1653, 1648, 1662, +- 1641, 1653, 1659, 1649, 1661, 1656, 1655, 1639, 1638, 0, +- 0, 1637, 0, 0, 1640, 1657, 1959, 1642, 1634, 1647, +- 1644, 1645, 1644, 1959, 1638, 1629, 1641, 1630, 1632, 1638, +- 1630, 1627, 1620, 1959, 1624, 1637, 1632, 1616, 1628, 1626, +- 1628, 1613, 1626, 1611, 0, 1617, 1610, 1613, 1617, 1615, ++ 596, 1696, 1680, 1690, 1681, 1692, 1691, 1682, 1675, 0, ++ 1704, 1689, 1688, 587, 1672, 1669, 1668, 1684, 596, 1679, ++ 1671, 1659, 602, 1668, 610, 1664, 1674, 1660, 1674, 1677, ++ 1656, 1661, 1661, 1662, 0, 1668, 608, 1656, 1664, 1665, ++ 1657, 1667, 1647, 1654, 1663, 1652, 1647, 1642, 1656, 1635, ++ 1647, 1653, 1643, 1655, 1650, 1649, 1633, 1632, 0, 0, ++ 1631, 0, 0, 1634, 1651, 1953, 1636, 1628, 1641, 1638, ++ 1639, 1638, 1953, 1632, 1623, 1635, 1624, 1626, 1632, 1624, ++ 1621, 1614, 1953, 1618, 1631, 1626, 1610, 1621, 1623, 1608, ++ 1621, 1606, 0, 1612, 1605, 1608, 1612, 1610, 1615, 1613, + +- 1620, 1618, 1620, 1605, 1615, 1959, 1627, 1626, 612, 637, +- 1625, 1624, 1959, 1608, 1959, 1959, 1622, 1959, 1621, 1620, +- 1610, 1605, 1589, 1607, 0, 1600, 1587, 1593, 1603, 1584, +- 1597, 0, 1586, 607, 1588, 1580, 1580, 1588, 1591, 605, +- 1588, 1573, 1588, 0, 1576, 1587, 1565, 1585, 1570, 1582, +- 1572, 1580, 1563, 0, 1578, 1577, 1566, 1561, 1574, 1573, +- 1576, 0, 1556, 1566, 0, 1558, 1565, 1567, 1551, 1565, +- 1564, 1547, 1543, 1548, 0, 1552, 619, 1551, 1551, 1557, +- 1546, 1542, 1545, 627, 1553, 1539, 1541, 1550, 1540, 629, +- 1548, 1543, 1530, 1546, 1531, 1529, 1527, 1528, 1530, 1535, ++ 1615, 1600, 1610, 1953, 1622, 1621, 612, 637, 1620, 1619, ++ 1953, 1603, 1953, 1953, 1617, 1953, 1616, 1615, 1605, 1600, ++ 1584, 1602, 0, 1595, 1582, 1588, 1598, 1579, 1592, 0, ++ 1581, 298, 1583, 1575, 1575, 1583, 1586, 605, 1583, 1568, ++ 1583, 0, 1571, 1582, 1560, 1580, 1565, 1577, 1567, 1575, ++ 1558, 0, 1573, 1572, 1561, 1556, 1569, 1568, 1571, 0, ++ 1551, 1561, 0, 1553, 1560, 1562, 1546, 1560, 1559, 1542, ++ 1538, 1543, 0, 1547, 618, 1546, 1546, 1552, 1541, 1537, ++ 1540, 625, 1548, 1534, 1536, 1545, 1535, 627, 1543, 1538, ++ 1525, 1541, 1526, 1524, 1522, 1523, 1525, 1530, 1533, 1523, + +- 1538, 1528, 630, 1536, 1531, 1521, 1529, 1518, 1524, 0, +- 0, 1534, 609, 1514, 1524, 1520, 1522, 1509, 1517, 1519, +- 1522, 1521, 1513, 1523, 1514, 1502, 1514, 1500, 624, 1501, +- 1513, 1512, 1491, 1510, 1509, 1495, 1492, 1502, 1498, 1505, +- 1503, 1504, 1491, 1500, 1492, 1491, 1481, 1489, 1482, 1478, +- 1493, 1482, 1491, 1483, 0, 1485, 0, 1488, 1474, 1472, +- 1476, 1469, 0, 1469, 1472, 1478, 0, 1480, 1465, 1469, +- 1477, 1463, 1466, 1474, 1453, 1459, 1464, 1470, 1959, 1469, +- 1454, 1453, 1453, 0, 1456, 0, 1464, 1456, 1464, 1463, +- 1453, 1444, 0, 1448, 1450, 0, 1469, 1468, 1439, 1455, ++ 628, 1531, 1526, 1516, 1524, 1513, 1519, 0, 0, 1529, ++ 609, 1509, 1519, 1515, 1517, 1504, 1512, 1514, 1517, 1516, ++ 1508, 1518, 1509, 1497, 1509, 1495, 626, 1496, 1508, 1507, ++ 1486, 1505, 1504, 1490, 1487, 1497, 1493, 1500, 1498, 1499, ++ 1486, 1495, 1487, 1486, 1476, 1484, 1477, 1473, 1488, 1477, ++ 1486, 1478, 0, 1480, 0, 1483, 1469, 1467, 1471, 1464, ++ 0, 1464, 1467, 1473, 0, 1475, 1460, 1464, 1472, 1458, ++ 1461, 1469, 1448, 1454, 1459, 1465, 1953, 1464, 1449, 1448, ++ 1448, 0, 1451, 0, 1452, 1460, 1459, 1449, 1440, 0, ++ 1444, 1446, 0, 1465, 1464, 1435, 1451, 0, 1452, 1440, + +- 0, 1456, 1444, 1437, 1445, 0, 1437, 1447, 1433, 1438, +- 1446, 0, 1443, 1438, 1428, 1438, 1441, 1442, 1441, 0, +- 1429, 1422, 1417, 0, 0, 1408, 0, 1331, 380, 0, +- 1323, 1323, 31, 91, 333, 343, 0, 359, 0, 419, +- 0, 0, 481, 528, 639, 549, 580, 0, 622, 584, +- 568, 639, 636, 640, 0, 631, 0, 643, 647, 639, +- 639, 658, 638, 662, 644, 664, 640, 665, 655, 665, +- 657, 670, 653, 0, 648, 671, 651, 657, 676, 658, +- 678, 654, 679, 669, 679, 0, 668, 0, 0, 673, +- 666, 667, 673, 669, 685, 677, 672, 692, 693, 677, ++ 1433, 1441, 0, 1433, 1443, 1429, 1434, 1442, 0, 1439, ++ 1434, 1424, 1434, 1437, 1438, 1437, 0, 1425, 1418, 1416, ++ 0, 0, 1425, 0, 1411, 380, 0, 1393, 1340, 1317, ++ 1298, 44, 96, 0, 318, 0, 358, 0, 0, 361, ++ 417, 637, 480, 529, 0, 572, 567, 559, 607, 627, ++ 638, 0, 625, 0, 638, 642, 630, 628, 649, 631, ++ 658, 640, 660, 636, 661, 651, 661, 653, 666, 649, ++ 0, 644, 667, 647, 653, 672, 654, 674, 650, 675, ++ 665, 675, 0, 664, 0, 0, 669, 662, 663, 669, ++ 665, 681, 673, 668, 688, 689, 673, 678, 674, 678, + +- 682, 678, 682, 685, 681, 686, 693, 694, 703, 696, +- 687, 704, 702, 700, 692, 706, 704, 696, 695, 0, +- 715, 698, 697, 705, 717, 718, 710, 0, 720, 707, +- 718, 716, 0, 728, 716, 0, 730, 726, 726, 709, +- 0, 717, 0, 1959, 1959, 717, 735, 1959, 735, 737, +- 728, 738, 723, 743, 1959, 730, 1959, 0, 727, 732, +- 740, 749, 732, 740, 753, 748, 742, 738, 750, 745, +- 741, 0, 756, 0, 754, 744, 0, 745, 765, 0, +- 747, 748, 755, 750, 0, 766, 758, 754, 765, 0, +- 770, 0, 767, 0, 757, 0, 763, 758, 0, 0, ++ 681, 677, 682, 689, 690, 699, 692, 683, 700, 698, ++ 696, 688, 702, 700, 692, 691, 0, 711, 694, 693, ++ 701, 713, 714, 706, 0, 716, 703, 714, 712, 0, ++ 724, 712, 0, 726, 722, 722, 705, 0, 713, 0, ++ 1953, 1953, 713, 731, 1953, 731, 733, 724, 734, 719, ++ 739, 1953, 726, 1953, 0, 723, 735, 744, 727, 735, ++ 747, 741, 735, 732, 744, 739, 735, 0, 750, 0, ++ 748, 738, 0, 739, 759, 0, 741, 742, 749, 744, ++ 0, 760, 752, 748, 759, 0, 764, 0, 761, 0, ++ 751, 0, 757, 752, 0, 0, 759, 760, 775, 756, + +- 765, 766, 781, 762, 759, 767, 0, 781, 786, 787, +- 782, 785, 788, 772, 792, 779, 775, 795, 792, 0, +- 792, 783, 791, 782, 783, 784, 785, 801, 795, 803, +- 805, 794, 791, 0, 792, 0, 797, 795, 796, 796, +- 797, 813, 807, 815, 817, 806, 803, 812, 0, 0, +- 820, 837, 802, 809, 824, 824, 806, 820, 819, 814, +- 0, 0, 0, 0, 821, 821, 818, 833, 837, 820, +- 822, 822, 828, 843, 825, 0, 832, 825, 843, 829, +- 849, 846, 847, 850, 853, 0, 0, 846, 0, 0, +- 836, 838, 838, 855, 855, 847, 847, 862, 852, 849, ++ 753, 761, 0, 775, 780, 781, 776, 779, 782, 766, ++ 786, 773, 769, 789, 786, 0, 786, 777, 785, 776, ++ 777, 778, 779, 795, 789, 797, 799, 788, 785, 0, ++ 786, 0, 791, 789, 790, 790, 791, 807, 801, 809, ++ 811, 800, 797, 806, 0, 0, 814, 831, 796, 803, ++ 818, 818, 800, 814, 813, 808, 0, 0, 0, 0, ++ 815, 815, 812, 827, 831, 814, 816, 816, 822, 837, ++ 819, 0, 826, 819, 837, 823, 843, 840, 841, 844, ++ 847, 0, 0, 840, 0, 0, 830, 832, 832, 849, ++ 849, 841, 841, 856, 846, 843, 0, 1953, 845, 836, + +- 0, 1959, 851, 842, 1959, 848, 869, 857, 852, 872, +- 873, 850, 0, 856, 1959, 865, 869, 878, 859, 876, +- 867, 869, 879, 880, 872, 878, 868, 882, 0, 0, +- 883, 882, 877, 0, 873, 0, 878, 883, 884, 893, +- 878, 898, 884, 889, 0, 899, 891, 899, 0, 896, +- 901, 904, 890, 904, 886, 897, 895, 898, 0, 900, +- 906, 0, 907, 896, 900, 914, 0, 911, 909, 914, +- 922, 919, 0, 916, 925, 906, 910, 924, 0, 921, +- 919, 924, 928, 0, 921, 0, 919, 934, 923, 937, +- 922, 0, 941, 0, 929, 0, 925, 940, 921, 938, ++ 1953, 842, 863, 851, 846, 866, 867, 844, 0, 850, ++ 1953, 859, 863, 872, 853, 870, 861, 863, 873, 874, ++ 866, 872, 862, 876, 0, 0, 877, 876, 871, 0, ++ 867, 0, 872, 877, 878, 887, 872, 892, 878, 883, ++ 0, 893, 885, 893, 0, 890, 895, 898, 884, 898, ++ 880, 891, 889, 892, 0, 894, 900, 0, 901, 890, ++ 894, 908, 0, 905, 903, 908, 916, 913, 0, 910, ++ 919, 900, 904, 918, 0, 915, 913, 918, 922, 0, ++ 915, 0, 913, 928, 917, 931, 916, 0, 935, 0, ++ 923, 0, 919, 934, 915, 932, 933, 925, 929, 942, + +- 939, 931, 935, 948, 951, 950, 938, 949, 941, 946, +- 957, 947, 954, 944, 945, 961, 964, 963, 965, 958, +- 969, 955, 956, 970, 971, 965, 962, 970, 964, 978, +- 973, 965, 966, 983, 982, 973, 974, 971, 977, 979, +- 975, 989, 977, 983, 990, 984, 995, 996, 0, 988, +- 990, 1000, 986, 1002, 993, 1004, 1002, 999, 1007, 0, +- 1008, 995, 0, 1001, 998, 1009, 1005, 1006, 1001, 1002, +- 1001, 1005, 1011, 999, 1000, 1009, 1006, 1025, 1008, 1030, +- 0, 0, 0, 1006, 1019, 1016, 1013, 1032, 1015, 1037, +- 0, 0, 1038, 1026, 1040, 1027, 1025, 1043, 1030, 1045, ++ 945, 944, 932, 943, 935, 940, 951, 941, 948, 938, ++ 939, 955, 958, 957, 959, 952, 963, 949, 950, 964, ++ 965, 959, 956, 964, 958, 972, 967, 959, 960, 977, ++ 976, 967, 968, 965, 971, 973, 969, 983, 971, 977, ++ 984, 978, 989, 990, 0, 982, 984, 994, 980, 996, ++ 987, 998, 996, 993, 1001, 0, 1002, 989, 0, 995, ++ 992, 1003, 999, 1000, 995, 996, 995, 999, 1005, 993, ++ 994, 1003, 1000, 1019, 1002, 1024, 0, 0, 0, 1000, ++ 1013, 1010, 1007, 1026, 1009, 1031, 0, 0, 1032, 1020, ++ 1034, 1021, 1019, 1037, 1024, 1039, 1020, 1033, 0, 1036, + +- 1026, 1039, 0, 1042, 0, 1033, 1039, 0, 1038, 1038, +- 1042, 0, 1043, 1052, 1038, 0, 1044, 0, 1045, 0, +- 1049, 1036, 1055, 1046, 1053, 1066, 1048, 1053, 1046, 0, +- 1066, 1059, 1068, 0, 0, 1059, 1070, 1061, 1959, 1072, +- 1063, 1959, 1074, 0, 1062, 1067, 0, 1078, 0, 1070, +- 0, 0, 0, 1079, 1071, 1068, 0, 1073, 0, 1075, +- 1080, 0, 1072, 0, 0, 1082, 0, 0, 0, 1085, +- 1074, 1089, 1094, 0, 1093, 1094, 1089, 1086, 1099, 1096, +- 1097, 1098, 1103, 1100, 1097, 1087, 1103, 1106, 1105, 1110, +- 1107, 1104, 1094, 1101, 1111, 1097, 1106, 1106, 1117, 1109, ++ 0, 1027, 1033, 0, 1032, 1032, 1036, 0, 1037, 1046, ++ 1032, 0, 1038, 0, 1039, 0, 1043, 1030, 1049, 1040, ++ 1047, 1060, 1042, 1047, 1040, 0, 1060, 1053, 1062, 0, ++ 0, 1053, 1064, 1055, 1953, 1066, 1057, 1953, 1068, 0, ++ 1056, 1061, 0, 1072, 0, 1064, 0, 0, 0, 1073, ++ 1065, 1062, 0, 1067, 0, 1069, 1074, 0, 1066, 0, ++ 0, 1076, 0, 0, 0, 1079, 1068, 1083, 1088, 0, ++ 1087, 1088, 1083, 1080, 1093, 1090, 1091, 1092, 1097, 1094, ++ 1091, 1081, 1097, 1100, 1099, 1104, 1101, 1098, 1088, 1095, ++ 1105, 1091, 1100, 1100, 1111, 1103, 1092, 1103, 1098, 1093, + +- 1098, 1109, 1104, 1099, 1113, 1122, 1116, 1126, 1123, 1117, +- 1131, 0, 0, 1118, 1120, 1122, 1121, 1132, 0, 0, +- 0, 1126, 0, 1138, 0, 1119, 0, 1127, 1124, 1959, +- 1129, 1959, 1130, 1131, 1128, 0, 1144, 1147, 0, 1129, +- 1136, 0, 0, 1136, 0, 1132, 0, 0, 0, 1133, +- 1153, 1154, 1138, 1156, 1134, 0, 0, 1140, 1148, 1147, +- 1158, 1159, 0, 1160, 1147, 1155, 1154, 1165, 1165, 1146, +- 0, 1163, 1158, 1173, 1164, 1161, 1158, 1159, 1167, 1175, +- 1179, 1163, 0, 1182, 0, 0, 1164, 0, 0, 0, +- 1167, 0, 1181, 1167, 1174, 1186, 1959, 1959, 1959, 1170, ++ 1107, 1116, 1110, 1120, 1117, 1111, 1125, 0, 0, 1112, ++ 1114, 1116, 1115, 1126, 0, 0, 0, 1120, 0, 1132, ++ 0, 1113, 0, 1121, 1118, 1953, 1123, 1953, 1124, 1125, ++ 1122, 0, 1138, 1141, 0, 1123, 1130, 0, 0, 1130, ++ 0, 1126, 0, 0, 0, 1127, 1147, 1148, 1132, 1150, ++ 1128, 0, 0, 1134, 1142, 1141, 1152, 1153, 0, 1154, ++ 1141, 1149, 1148, 1159, 1159, 1140, 0, 1157, 1152, 1167, ++ 1158, 1155, 1152, 1153, 1161, 1169, 1173, 1157, 0, 1176, ++ 0, 0, 1158, 0, 0, 0, 1161, 0, 1175, 1161, ++ 1168, 1180, 1953, 1953, 1953, 1164, 1184, 1171, 1179, 1168, + +- 1190, 1177, 1185, 1174, 1170, 0, 1182, 1172, 0, 1186, +- 1187, 1195, 1181, 1183, 0, 0, 1188, 1199, 0, 0, +- 1196, 0, 1192, 1203, 0, 0, 1208, 1192, 1191, 1205, +- 1195, 1205, 1206, 1207, 0, 1202, 0, 1215, 0, 0, +- 1215, 1200, 1212, 1197, 0, 1959, 1209, 1212, 1224, 0, +- 1210, 0, 0, 1222, 1223, 1210, 0, 1221, 1218, 0, +- 1206, 1220, 0, 1222, 0, 0, 1217, 0, 1210, 1211, +- 1224, 1227, 1232, 1236, 1237, 1223, 0, 1237, 1230, 1242, +- 1242, 1244, 1245, 0, 1224, 0, 1246, 0, 0, 1237, +- 1248, 1249, 1250, 0, 1251, 1243, 1240, 1240, 1255, 1243, ++ 1164, 0, 1176, 1166, 0, 1180, 1181, 1189, 1175, 1177, ++ 0, 0, 1182, 1193, 0, 0, 1190, 0, 1186, 1197, ++ 0, 0, 1202, 1186, 1185, 1199, 1189, 1199, 1200, 1201, ++ 0, 1196, 0, 1209, 0, 0, 1209, 1194, 1206, 1191, ++ 0, 1953, 1203, 1206, 1218, 0, 1204, 0, 0, 1216, ++ 1217, 1204, 0, 1215, 1212, 0, 1200, 1214, 0, 1216, ++ 0, 0, 1211, 0, 1204, 1205, 1218, 1221, 1226, 1230, ++ 1231, 1217, 0, 1231, 1224, 1236, 1236, 1238, 1239, 0, ++ 1218, 0, 1240, 0, 0, 1231, 1242, 1243, 1244, 0, ++ 1245, 1237, 1234, 1234, 1249, 1237, 1241, 0, 1252, 1253, + +- 1247, 0, 1258, 1259, 1260, 0, 1245, 0, 0, 1264, +- 0, 1253, 1255, 0, 0, 0, 1247, 1257, 1258, 0, +- 1259, 1259, 1262, 0, 1273, 1262, 1263, 1275, 1268, 0, +- 1266, 1273, 1270, 1271, 1282, 1271, 1275, 1262, 0, 0, +- 1274, 1272, 1276, 1288, 1282, 0, 1277, 0, 1281, 0, +- 1279, 0, 1959, 1322, 1329, 1336, 1343, 1350, 1357, 1364, +- 1367, 1373, 1375, 1382, 1389, 1396, 1403, 1410, 1417, 1424, +- 1431, 1438, 1445, 1452, 1457 ++ 1254, 0, 1239, 0, 0, 1258, 0, 1247, 1249, 0, ++ 0, 0, 1241, 1251, 1252, 0, 1253, 1253, 1256, 0, ++ 1267, 1256, 1257, 1269, 1262, 0, 1260, 1267, 1264, 1265, ++ 1276, 1265, 1269, 1256, 0, 0, 1268, 1266, 1270, 1282, ++ 1276, 0, 1271, 0, 1275, 0, 1273, 0, 1953, 1316, ++ 1323, 1330, 1337, 1344, 1351, 1358, 1361, 1367, 1369, 1376, ++ 1383, 1390, 1397, 1404, 1411, 1418, 1425, 1432, 1439, 1446, ++ 1451 + } ; + +-static yyconst flex_int16_t yy_def[1576] = ++static yyconst flex_int16_t yy_def[1572] = + { 0, +- 1553, 1, 1554, 1554, 1553, 5, 1553, 7, 1555, 1555, +- 1555, 1555, 1556, 1556, 1553, 1553, 1553, 1553, 1557, 1558, +- 1559, 1560, 1553, 1561, 1553, 1553, 1562, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1553, 1553, 1553, 1563, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1564, +- 1565, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, +- 1553, 1566, 1553, 1567, 1553, 1553, 1553, 1553, 1553, 1553, ++ 1549, 1, 1550, 1550, 1549, 5, 1549, 7, 1551, 1551, ++ 1551, 1551, 1552, 1552, 1549, 1549, 1549, 1549, 1553, 1554, ++ 1555, 1556, 1549, 1557, 1549, 1549, 1558, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1549, 1549, 1549, 1559, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1560, ++ 1561, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1549, 1549, 1549, ++ 1549, 1562, 1549, 1563, 1549, 1549, 1549, 1549, 1549, 1549, + +- 1568, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1569, 1570, 1571, 1572, 1553, 1573, 1553, 1557, +- 1553, 1558, 1559, 1553, 1560, 1560, 1553, 1553, 1561, 1561, +- 1561, 1574, 25, 1561, 1553, 1553, 1562, 1562, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1564, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1565, 1566, 1567, 1568, 1549, 1569, 1549, 1553, ++ 1549, 1554, 1555, 1549, 1556, 1556, 1549, 1549, 1557, 1557, ++ 1557, 1570, 25, 1557, 1549, 1549, 1558, 1558, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1575, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1564, 1553, 1565, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1553, 1566, 1553, 1553, +- 1567, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1571, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1560, 1549, 1561, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1549, 1562, 1549, 1549, 1563, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, + +- 1553, 1553, 1568, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1569, 1553, 1570, 1553, 1571, 1572, 1553, 1553, +- 1553, 1553, 1553, 1561, 1561, 1553, 1561, 1553, 1553, 1553, +- 1553, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1549, 1564, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1565, 1549, 1566, 1549, 1567, 1568, 1549, 1549, 1549, ++ 1549, 1549, 1557, 1557, 1549, 1557, 1549, 1549, 1549, 1549, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1575, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1571, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1549, 1549, 1549, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1553, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1549, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1549, 1549, 1549, + +- 1561, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1561, 1561, 1561, 1553, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1557, 1557, 1557, ++ 1549, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1553, 1553, +- 1553, 1553, 1553, 1553, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1553, 1553, 1553, 1553, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1549, 1549, 1549, 1549, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1553, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1549, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, + +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, +- 1561, 1561, 0, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553 ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, ++ 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 0, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549 + } ; + +-static yyconst flex_int16_t yy_nxt[2014] = ++static yyconst flex_int16_t yy_nxt[2008] = + { 0, + 16, 17, 18, 17, 17, 16, 19, 20, 16, 21, + 22, 16, 16, 23, 24, 25, 26, 16, 16, 16, +@@ -953,16 +952,16 @@ + 43, 44, 45, 46, 47, 48, 49, 50, 51, 51, + 51, 16, 16, 16, 52, 53, 112, 193, 112, 112, + 112, 117, 112, 112, 117, 117, 54, 127, 117, 128, +- 113, 194, 55, 893, 113, 54, 118, 56, 130, 57, ++ 113, 194, 55, 891, 113, 54, 118, 56, 130, 57, + 118, 58, 176, 177, 119, 59, 119, 119, 60, 61, +- 337, 131, 62, 63, 64, 65, 66, 67, 239, 68, ++ 336, 131, 62, 63, 64, 65, 66, 67, 239, 68, + +- 139, 338, 140, 53, 240, 53, 52, 53, 112, 141, ++ 139, 337, 140, 53, 240, 53, 52, 53, 112, 141, + 112, 112, 112, 114, 112, 112, 115, 114, 54, 135, + 115, 128, 142, 234, 55, 235, 143, 54, 173, 56, +- 144, 57, 174, 58, 136, 170, 175, 59, 894, 145, ++ 144, 57, 174, 58, 136, 170, 175, 59, 892, 145, + 60, 61, 146, 171, 62, 63, 64, 65, 66, 67, +- 179, 68, 172, 278, 180, 53, 279, 53, 16, 17, ++ 179, 68, 172, 277, 180, 53, 278, 53, 16, 17, + 52, 69, 17, 16, 70, 16, 16, 71, 16, 16, + 16, 23, 24, 51, 26, 16, 16, 16, 16, 16, + 16, 16, 16, 72, 73, 74, 75, 76, 77, 51, +@@ -981,196 +980,195 @@ + + 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, + 133, 133, 133, 133, 133, 133, 133, 132, 132, 132, +- 147, 209, 148, 268, 269, 210, 155, 149, 150, 156, ++ 147, 209, 148, 708, 306, 210, 155, 149, 150, 156, + 157, 151, 245, 307, 152, 211, 246, 153, 154, 160, +- 161, 162, 308, 158, 165, 163, 159, 119, 166, 119, +- 119, 164, 167, 359, 360, 181, 188, 182, 168, 183, +- 189, 169, 895, 184, 190, 300, 185, 195, 196, 186, +- 202, 293, 187, 294, 203, 197, 191, 198, 204, 199, +- 192, 205, 200, 201, 206, 896, 227, 207, 212, 213, +- 214, 295, 221, 215, 216, 228, 222, 229, 217, 301, ++ 161, 162, 709, 158, 165, 163, 159, 119, 166, 119, ++ 119, 164, 167, 358, 359, 181, 188, 182, 168, 183, ++ 189, 169, 893, 184, 190, 299, 185, 195, 196, 186, ++ 202, 292, 187, 293, 203, 197, 191, 198, 204, 199, ++ 192, 205, 200, 201, 206, 894, 227, 207, 212, 213, ++ 214, 294, 221, 215, 216, 228, 222, 229, 217, 300, + +- 223, 230, 218, 897, 296, 219, 224, 232, 233, 225, +- 220, 234, 251, 235, 140, 236, 226, 284, 252, 148, +- 237, 141, 263, 889, 890, 156, 264, 285, 261, 253, +- 286, 262, 161, 265, 153, 165, 270, 163, 182, 166, +- 271, 302, 274, 266, 272, 309, 898, 185, 273, 267, +- 275, 321, 198, 187, 280, 281, 306, 276, 277, 119, +- 310, 119, 119, 287, 322, 119, 282, 119, 119, 342, +- 297, 283, 294, 311, 119, 130, 119, 119, 119, 328, +- 119, 119, 135, 343, 128, 298, 323, 324, 131, 333, +- 325, 348, 329, 349, 330, 330, 334, 136, 331, 352, ++ 223, 230, 218, 895, 295, 219, 224, 232, 233, 225, ++ 220, 234, 251, 235, 140, 236, 226, 283, 252, 148, ++ 237, 141, 263, 885, 886, 156, 264, 284, 261, 253, ++ 285, 262, 161, 265, 153, 165, 269, 163, 182, 166, ++ 270, 301, 273, 266, 271, 308, 896, 185, 272, 267, ++ 274, 320, 198, 187, 279, 280, 305, 275, 276, 119, ++ 309, 119, 119, 286, 321, 119, 281, 119, 119, 341, ++ 296, 282, 293, 310, 119, 130, 119, 119, 119, 327, ++ 119, 119, 135, 342, 128, 297, 322, 323, 131, 332, ++ 324, 347, 328, 348, 329, 329, 333, 136, 330, 351, + +- 357, 362, 335, 353, 365, 363, 388, 368, 366, 369, +- 370, 375, 398, 371, 358, 382, 383, 408, 395, 376, +- 396, 409, 389, 899, 390, 377, 397, 405, 399, 391, +- 439, 440, 384, 400, 401, 402, 417, 422, 418, 406, +- 423, 403, 425, 441, 428, 430, 444, 424, 426, 429, +- 448, 431, 450, 239, 451, 454, 432, 900, 433, 240, +- 452, 449, 498, 455, 477, 368, 295, 488, 370, 400, +- 445, 494, 499, 504, 297, 456, 294, 478, 295, 296, +- 509, 507, 507, 321, 449, 508, 511, 511, 328, 298, +- 512, 296, 907, 510, 323, 323, 322, 538, 517, 519, ++ 356, 361, 334, 352, 364, 362, 387, 367, 365, 368, ++ 369, 374, 397, 370, 357, 381, 382, 407, 394, 375, ++ 395, 408, 388, 903, 389, 376, 396, 404, 398, 390, ++ 438, 439, 383, 399, 400, 401, 416, 421, 417, 405, ++ 422, 402, 424, 440, 427, 429, 443, 423, 425, 428, ++ 447, 430, 449, 239, 450, 453, 431, 904, 432, 240, ++ 451, 448, 496, 454, 476, 367, 294, 487, 369, 399, ++ 444, 492, 497, 502, 296, 455, 293, 477, 294, 295, ++ 507, 505, 505, 320, 448, 506, 509, 509, 327, 297, ++ 510, 295, 907, 508, 322, 322, 321, 536, 515, 517, + +- 519, 329, 555, 520, 560, 539, 576, 571, 908, 911, +- 556, 572, 586, 587, 561, 594, 577, 588, 912, 595, +- 589, 598, 599, 617, 600, 623, 601, 618, 509, 602, +- 590, 591, 711, 624, 592, 628, 643, 631, 791, 603, +- 604, 510, 792, 605, 632, 718, 629, 719, 644, 697, +- 697, 712, 751, 698, 759, 808, 766, 781, 909, 752, +- 809, 760, 767, 782, 913, 914, 901, 915, 910, 920, +- 916, 921, 922, 917, 768, 783, 902, 918, 923, 903, +- 904, 924, 919, 905, 906, 925, 926, 927, 928, 929, ++ 517, 328, 553, 518, 558, 537, 574, 569, 905, 908, ++ 554, 570, 584, 585, 559, 592, 575, 586, 906, 593, ++ 587, 596, 597, 615, 598, 621, 599, 616, 507, 600, ++ 588, 589, 909, 622, 590, 626, 641, 629, 788, 601, ++ 602, 508, 789, 603, 630, 715, 627, 716, 642, 694, ++ 694, 748, 756, 695, 763, 778, 910, 805, 749, 757, ++ 764, 779, 806, 916, 897, 911, 917, 918, 912, 919, ++ 920, 913, 765, 780, 898, 914, 921, 899, 900, 922, ++ 915, 901, 902, 923, 924, 925, 926, 927, 928, 929, + 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, + + 940, 941, 942, 943, 944, 945, 946, 947, 948, 949, + 950, 951, 952, 953, 954, 955, 956, 957, 958, 959, +- 960, 961, 962, 963, 964, 965, 966, 967, 969, 970, +- 971, 972, 973, 975, 976, 977, 968, 978, 979, 974, +- 980, 981, 983, 982, 984, 985, 986, 987, 988, 989, +- 990, 991, 992, 993, 994, 996, 997, 999, 1000, 1001, +- 995, 1002, 1003, 1005, 1006, 1007, 998, 1008, 1009, 1010, +- 1011, 890, 903, 917, 1012, 964, 1013, 906, 1014, 1004, +- 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, +- 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, ++ 960, 961, 962, 963, 965, 966, 967, 968, 969, 971, ++ 972, 973, 964, 974, 975, 970, 976, 977, 979, 978, ++ 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, ++ 990, 992, 993, 995, 996, 997, 991, 998, 999, 1001, ++ 1002, 1003, 994, 1004, 1005, 1006, 1007, 886, 913, 1008, ++ 960, 1009, 1010, 1011, 1012, 1000, 1013, 1014, 1015, 1016, ++ 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, ++ 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, + +- 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, +- 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053, 1054, +- 1055, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1056, 1064, +- 1065, 1066, 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, +- 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, +- 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, +- 1095, 1096, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, +- 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1114, 1115, +- 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, +- 1126, 1127, 1128, 1113, 1129, 1130, 1131, 1132, 1133, 1134, ++ 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, ++ 1047, 1048, 1049, 1050, 1051, 1053, 1054, 1055, 1056, 1057, ++ 1058, 1059, 1052, 1060, 1061, 1062, 1063, 1064, 1065, 1066, ++ 1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, ++ 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, ++ 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, ++ 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, ++ 1107, 1108, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, ++ 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1109, 1125, 1126, ++ 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1135, 1136, + +- 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, +- 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, +- 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, +- 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, +- 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, +- 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, 1193, 1195, +- 1194, 1196, 1197, 1198, 1199, 1203, 1204, 1205, 1206, 1207, +- 1208, 1209, 1210, 1211, 1200, 1212, 1201, 1213, 1214, 1215, +- 1202, 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, +- 1225, 1226, 1228, 1227, 1229, 1230, 1231, 1232, 1233, 1234, ++ 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, ++ 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, ++ 1157, 1158, 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, ++ 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, ++ 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, ++ 1187, 1188, 1189, 1191, 1190, 1192, 1193, 1194, 1195, 1199, ++ 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1196, 1208, ++ 1197, 1209, 1210, 1211, 1198, 1212, 1213, 1214, 1215, 1216, ++ 1217, 1218, 1219, 1220, 1221, 1222, 1224, 1223, 1225, 1226, ++ 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, + +- 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1198, +- 1199, 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, +- 1253, 1254, 1201, 1255, 1256, 1257, 1202, 1258, 1259, 1260, +- 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270, +- 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, +- 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, +- 1291, 1292, 1293, 1294, 1295, 1296, 1297, 1298, 1299, 1300, +- 1301, 1303, 1304, 1306, 1307, 1308, 1309, 1310, 1302, 1311, +- 1312, 1313, 1314, 1315, 1316, 1317, 1318, 1319, 1305, 1320, +- 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330, ++ 1237, 1238, 1239, 1194, 1195, 1240, 1241, 1242, 1243, 1244, ++ 1245, 1246, 1247, 1248, 1249, 1250, 1197, 1251, 1252, 1253, ++ 1198, 1254, 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, ++ 1263, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, ++ 1273, 1274, 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, ++ 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, ++ 1293, 1294, 1295, 1296, 1297, 1299, 1300, 1302, 1303, 1304, ++ 1305, 1306, 1298, 1307, 1308, 1309, 1310, 1311, 1312, 1313, ++ 1314, 1315, 1301, 1316, 1317, 1318, 1319, 1320, 1321, 1322, ++ 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, 1332, + +- 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, +- 1341, 1342, 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, +- 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, +- 1361, 1362, 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, +- 1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378, 1379, 1380, +- 1381, 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, +- 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1398, 1399, 1400, +- 1401, 1402, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, +- 1412, 1413, 1414, 1415, 1416, 1417, 1418, 1403, 1419, 1420, +- 1421, 1422, 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, ++ 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, ++ 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, ++ 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, ++ 1363, 1364, 1365, 1366, 1367, 1368, 1369, 1370, 1371, 1372, ++ 1373, 1374, 1375, 1376, 1377, 1378, 1379, 1380, 1381, 1382, ++ 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, ++ 1393, 1394, 1395, 1396, 1397, 1398, 1400, 1401, 1402, 1403, ++ 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, ++ 1414, 1399, 1415, 1416, 1417, 1418, 1419, 1420, 1421, 1422, ++ 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1430, 1431, 1432, + +- 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440, +- 1441, 1442, 1443, 1444, 1446, 1447, 1448, 1449, 1450, 1451, +- 1452, 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, +- 1445, 1462, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, +- 1471, 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, +- 1481, 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, +- 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, +- 1501, 1502, 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, +- 1511, 1512, 1513, 1514, 1515, 1516, 1517, 1518, 1519, 1520, +- 1521, 1522, 1523, 1524, 1525, 1526, 1527, 1528, 1529, 1530, ++ 1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440, 1442, 1443, ++ 1444, 1445, 1446, 1447, 1448, 1449, 1450, 1451, 1452, 1453, ++ 1454, 1455, 1456, 1457, 1441, 1458, 1459, 1460, 1461, 1462, ++ 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, ++ 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, 1482, ++ 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1491, 1492, ++ 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1502, ++ 1503, 1504, 1505, 1506, 1507, 1508, 1509, 1510, 1511, 1512, ++ 1513, 1514, 1515, 1516, 1517, 1518, 1519, 1520, 1521, 1522, ++ 1523, 1524, 1525, 1526, 1527, 1529, 1530, 1531, 1532, 1533, + +- 1531, 1533, 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, +- 1542, 1543, 1544, 1545, 1546, 1547, 1532, 1548, 1549, 1550, +- 1551, 1552, 16, 16, 16, 16, 16, 16, 16, 111, +- 111, 111, 111, 111, 111, 111, 116, 116, 116, 116, +- 116, 116, 116, 120, 120, 120, 120, 120, 120, 120, +- 122, 892, 122, 122, 122, 122, 122, 123, 123, 123, +- 123, 123, 123, 123, 125, 891, 125, 125, 125, 125, +- 125, 129, 129, 137, 888, 137, 137, 137, 137, 137, +- 238, 238, 257, 257, 257, 257, 257, 257, 257, 259, +- 259, 259, 259, 259, 259, 259, 288, 288, 288, 288, ++ 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1542, 1543, ++ 1528, 1544, 1545, 1546, 1547, 1548, 16, 16, 16, 16, ++ 16, 16, 16, 111, 111, 111, 111, 111, 111, 111, ++ 116, 116, 116, 116, 116, 116, 116, 120, 120, 120, ++ 120, 120, 120, 120, 122, 890, 122, 122, 122, 122, ++ 122, 123, 123, 123, 123, 123, 123, 123, 125, 889, ++ 125, 125, 125, 125, 125, 129, 129, 137, 888, 137, ++ 137, 137, 137, 137, 238, 238, 257, 257, 257, 257, ++ 257, 257, 257, 259, 259, 259, 259, 259, 259, 259, ++ 287, 287, 287, 287, 287, 287, 287, 290, 290, 290, + +- 288, 288, 288, 291, 291, 291, 291, 291, 291, 291, +- 303, 303, 303, 303, 303, 303, 303, 313, 313, 313, +- 313, 313, 313, 313, 315, 315, 315, 315, 315, 315, +- 315, 317, 317, 317, 317, 317, 317, 317, 318, 318, +- 318, 887, 318, 318, 318, 319, 319, 319, 319, 319, +- 319, 319, 132, 132, 132, 132, 132, 132, 132, 466, +- 886, 466, 466, 466, 885, 884, 883, 882, 881, 880, +- 879, 878, 877, 876, 875, 874, 873, 872, 871, 870, +- 869, 868, 867, 866, 698, 698, 865, 864, 863, 862, +- 781, 766, 861, 860, 859, 858, 857, 856, 855, 854, ++ 290, 290, 290, 290, 302, 302, 302, 302, 302, 302, ++ 302, 312, 312, 312, 312, 312, 312, 312, 314, 314, ++ 314, 314, 314, 314, 314, 316, 316, 316, 316, 316, ++ 316, 316, 317, 317, 317, 887, 317, 317, 317, 318, ++ 318, 318, 318, 318, 318, 318, 132, 132, 132, 132, ++ 132, 132, 132, 465, 884, 465, 465, 465, 883, 882, ++ 881, 880, 879, 878, 877, 876, 875, 874, 873, 872, ++ 871, 870, 869, 868, 867, 866, 865, 864, 863, 862, ++ 695, 695, 861, 860, 859, 858, 778, 763, 857, 856, ++ 855, 854, 853, 852, 851, 850, 849, 848, 847, 846, + +- 853, 852, 851, 850, 849, 848, 847, 846, 845, 844, +- 843, 842, 841, 840, 839, 838, 837, 836, 835, 834, +- 833, 832, 831, 830, 829, 828, 827, 826, 825, 824, +- 823, 822, 821, 820, 819, 818, 817, 816, 815, 814, +- 813, 812, 811, 810, 807, 806, 805, 804, 803, 802, +- 801, 800, 799, 798, 797, 796, 795, 794, 793, 790, +- 789, 788, 787, 786, 785, 784, 780, 779, 778, 777, +- 776, 775, 774, 773, 772, 771, 770, 769, 765, 764, +- 763, 762, 761, 758, 757, 756, 755, 754, 753, 750, +- 749, 748, 747, 746, 745, 744, 743, 742, 741, 740, ++ 845, 844, 843, 842, 841, 840, 839, 838, 837, 836, ++ 835, 834, 833, 832, 831, 830, 829, 828, 827, 826, ++ 825, 824, 823, 822, 821, 820, 819, 818, 817, 816, ++ 815, 814, 813, 812, 811, 810, 809, 808, 807, 804, ++ 803, 802, 801, 800, 799, 798, 797, 796, 795, 794, ++ 793, 792, 791, 790, 787, 786, 785, 784, 783, 782, ++ 781, 777, 776, 775, 774, 773, 772, 771, 770, 769, ++ 768, 767, 766, 762, 761, 760, 759, 758, 755, 754, ++ 753, 752, 751, 750, 747, 746, 745, 744, 743, 742, ++ 741, 740, 739, 738, 737, 736, 735, 734, 733, 732, + +- 739, 738, 737, 736, 735, 734, 733, 732, 731, 730, +- 729, 728, 727, 726, 725, 724, 723, 722, 721, 720, +- 717, 716, 715, 714, 713, 710, 709, 708, 707, 706, +- 705, 704, 703, 702, 701, 700, 520, 520, 517, 699, +- 512, 512, 508, 508, 696, 695, 694, 693, 643, 632, +- 628, 692, 691, 617, 690, 595, 689, 688, 571, 687, +- 686, 685, 684, 683, 682, 681, 680, 679, 678, 677, +- 676, 675, 674, 673, 672, 671, 670, 669, 668, 467, +- 667, 666, 665, 664, 663, 662, 661, 660, 659, 658, +- 657, 656, 655, 654, 653, 652, 651, 650, 649, 648, ++ 731, 730, 729, 728, 727, 726, 725, 724, 723, 722, ++ 721, 720, 719, 718, 717, 714, 713, 712, 711, 710, ++ 707, 706, 705, 704, 703, 702, 701, 700, 699, 698, ++ 697, 518, 518, 515, 696, 510, 510, 506, 506, 693, ++ 692, 691, 690, 641, 630, 626, 689, 688, 615, 687, ++ 593, 686, 685, 569, 684, 683, 682, 681, 680, 679, ++ 678, 677, 676, 675, 674, 673, 672, 671, 670, 669, ++ 668, 667, 666, 466, 665, 664, 663, 662, 661, 660, ++ 659, 658, 657, 656, 655, 654, 653, 652, 651, 650, ++ 649, 648, 647, 646, 645, 644, 643, 640, 639, 638, + +- 647, 646, 645, 642, 641, 640, 639, 638, 637, 636, +- 635, 634, 633, 630, 627, 626, 625, 622, 621, 620, +- 619, 616, 615, 614, 613, 612, 611, 610, 609, 608, +- 607, 606, 597, 596, 593, 585, 584, 583, 582, 581, +- 580, 579, 578, 575, 574, 573, 570, 569, 568, 567, +- 566, 565, 564, 563, 562, 559, 558, 557, 554, 553, +- 552, 551, 550, 549, 548, 547, 546, 545, 544, 543, +- 542, 541, 540, 537, 536, 535, 534, 533, 532, 531, +- 530, 529, 528, 527, 526, 525, 524, 523, 522, 521, +- 331, 331, 518, 325, 325, 517, 316, 316, 516, 314, ++ 637, 636, 635, 634, 633, 632, 631, 628, 625, 624, ++ 623, 620, 619, 618, 617, 614, 613, 612, 611, 610, ++ 609, 608, 607, 606, 605, 604, 595, 594, 591, 583, ++ 582, 581, 580, 579, 578, 577, 576, 573, 572, 571, ++ 568, 567, 566, 565, 564, 563, 562, 561, 560, 557, ++ 556, 555, 552, 551, 550, 549, 548, 547, 546, 545, ++ 544, 543, 542, 541, 540, 539, 538, 535, 534, 533, ++ 532, 531, 530, 529, 528, 527, 526, 525, 524, 523, ++ 522, 521, 520, 519, 330, 330, 516, 324, 324, 515, ++ 315, 315, 514, 313, 513, 512, 511, 289, 303, 504, + +- 515, 514, 513, 290, 304, 506, 292, 506, 289, 505, +- 453, 503, 444, 502, 501, 500, 497, 496, 495, 493, +- 492, 491, 490, 489, 487, 360, 353, 486, 485, 337, +- 258, 258, 484, 483, 482, 481, 480, 479, 476, 475, +- 474, 473, 472, 471, 470, 469, 468, 467, 465, 464, +- 463, 462, 461, 460, 459, 458, 457, 453, 447, 446, +- 443, 442, 438, 437, 436, 435, 434, 427, 421, 420, +- 419, 416, 415, 414, 413, 412, 411, 410, 407, 404, +- 394, 393, 392, 387, 386, 385, 381, 380, 379, 378, +- 374, 373, 372, 367, 364, 361, 356, 355, 354, 351, ++ 291, 504, 288, 503, 452, 501, 443, 500, 499, 498, ++ 495, 494, 493, 491, 490, 489, 488, 486, 359, 352, ++ 485, 484, 336, 258, 258, 483, 482, 481, 480, 479, ++ 478, 475, 474, 473, 472, 471, 470, 469, 468, 467, ++ 466, 464, 463, 462, 461, 460, 459, 458, 457, 456, ++ 452, 446, 445, 442, 441, 437, 436, 435, 434, 433, ++ 426, 420, 419, 418, 415, 414, 413, 412, 411, 410, ++ 409, 406, 403, 393, 392, 391, 386, 385, 384, 380, ++ 379, 378, 377, 373, 372, 371, 366, 363, 360, 355, ++ 354, 353, 350, 349, 346, 345, 344, 343, 340, 339, + +- 350, 347, 346, 345, 344, 341, 340, 339, 336, 332, +- 138, 138, 327, 326, 126, 126, 320, 124, 320, 121, +- 316, 316, 314, 312, 312, 300, 305, 304, 302, 299, +- 292, 290, 289, 287, 180, 174, 260, 258, 258, 256, +- 255, 254, 250, 249, 248, 247, 244, 243, 242, 241, +- 231, 208, 178, 138, 126, 124, 121, 1553, 15, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, ++ 338, 335, 331, 138, 138, 326, 325, 126, 126, 319, ++ 124, 319, 121, 315, 315, 313, 311, 311, 299, 304, ++ 303, 301, 298, 291, 289, 288, 286, 180, 268, 174, ++ 260, 258, 258, 256, 255, 254, 250, 249, 248, 247, ++ 244, 243, 242, 241, 231, 208, 178, 138, 126, 124, ++ 121, 1549, 15, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, + +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553 ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549 + } ; + +-static yyconst flex_int16_t yy_chk[2014] = ++static yyconst flex_int16_t yy_chk[2008] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +@@ -1179,14 +1177,14 @@ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 3, 9, 41, 9, 9, + 10, 13, 10, 10, 13, 14, 3, 23, 14, 23, +- 9, 41, 3, 733, 10, 3, 13, 3, 24, 3, ++ 9, 41, 3, 732, 10, 3, 13, 3, 24, 3, + 14, 3, 36, 36, 17, 3, 17, 17, 3, 3, + 142, 24, 3, 3, 3, 3, 3, 3, 55, 3, + + 28, 142, 28, 3, 55, 3, 4, 4, 11, 28, + 11, 11, 12, 11, 12, 12, 11, 12, 4, 26, + 12, 26, 29, 87, 4, 87, 29, 4, 35, 4, +- 29, 4, 35, 4, 26, 34, 35, 4, 734, 29, ++ 29, 4, 35, 4, 26, 34, 35, 4, 733, 29, + 4, 4, 29, 34, 4, 4, 4, 4, 4, 4, + 38, 4, 34, 84, 38, 4, 84, 4, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, +@@ -1207,20 +1205,20 @@ + + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, + 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +- 30, 45, 30, 79, 79, 45, 31, 30, 30, 31, ++ 30, 45, 30, 532, 105, 45, 31, 30, 30, 31, + 31, 30, 60, 105, 30, 45, 60, 30, 30, 32, +- 32, 32, 105, 31, 33, 32, 31, 69, 33, 69, ++ 32, 32, 532, 31, 33, 32, 31, 69, 33, 69, + 69, 32, 33, 162, 162, 39, 40, 39, 33, 39, + 40, 33, 735, 39, 40, 99, 39, 42, 42, 39, + 43, 95, 39, 95, 43, 42, 40, 42, 43, 42, +- 40, 43, 42, 42, 43, 736, 48, 43, 46, 46, ++ 40, 43, 42, 42, 43, 737, 48, 43, 46, 46, + 46, 96, 47, 46, 46, 48, 47, 48, 46, 99, + +- 47, 48, 46, 738, 96, 46, 47, 50, 50, 47, ++ 47, 48, 46, 740, 96, 46, 47, 50, 50, 47, + 46, 50, 65, 50, 72, 50, 47, 86, 65, 74, +- 50, 72, 75, 729, 729, 75, 75, 86, 74, 65, ++ 50, 72, 75, 726, 726, 75, 75, 86, 74, 65, + 86, 74, 76, 76, 74, 77, 81, 76, 81, 77, +- 82, 104, 83, 76, 82, 106, 740, 81, 82, 77, ++ 82, 104, 83, 76, 82, 106, 741, 81, 82, 77, + 83, 127, 83, 81, 85, 85, 104, 83, 83, 89, + 106, 89, 89, 107, 127, 90, 85, 90, 90, 146, + 97, 85, 97, 107, 112, 130, 112, 112, 119, 135, +@@ -1233,167 +1231,166 @@ + 216, 216, 177, 190, 190, 190, 202, 206, 202, 192, + 206, 190, 207, 216, 209, 210, 219, 206, 207, 209, + 222, 210, 223, 239, 223, 225, 210, 744, 210, 239, +- 223, 222, 278, 225, 250, 267, 293, 267, 267, 273, +- 219, 273, 278, 284, 294, 225, 294, 250, 295, 293, +- 297, 296, 296, 321, 284, 296, 298, 298, 328, 294, +- 298, 295, 746, 297, 322, 322, 321, 349, 322, 329, ++ 223, 222, 277, 225, 250, 267, 292, 267, 267, 272, ++ 219, 272, 277, 283, 293, 225, 293, 250, 294, 292, ++ 296, 295, 295, 320, 283, 295, 297, 297, 327, 293, ++ 297, 294, 747, 296, 321, 321, 320, 348, 321, 328, + +- 329, 328, 367, 329, 371, 349, 386, 382, 747, 750, +- 367, 382, 397, 397, 371, 399, 386, 397, 751, 399, +- 397, 402, 402, 415, 402, 420, 402, 415, 509, 402, +- 397, 397, 534, 420, 397, 424, 438, 426, 613, 402, +- 402, 509, 613, 402, 426, 540, 424, 540, 438, 510, +- 510, 534, 577, 510, 584, 629, 590, 603, 749, 577, +- 629, 584, 590, 603, 752, 753, 745, 754, 749, 756, +- 754, 758, 759, 754, 590, 603, 745, 754, 760, 745, +- 745, 761, 754, 745, 745, 762, 763, 764, 765, 766, +- 767, 768, 769, 770, 771, 772, 773, 775, 776, 777, ++ 328, 327, 366, 328, 370, 348, 385, 381, 746, 748, ++ 366, 381, 396, 396, 370, 398, 385, 396, 746, 398, ++ 396, 401, 401, 414, 401, 419, 401, 414, 507, 401, ++ 396, 396, 749, 419, 396, 423, 437, 425, 611, 401, ++ 401, 507, 611, 401, 425, 538, 423, 538, 437, 508, ++ 508, 575, 582, 508, 588, 601, 750, 627, 575, 582, ++ 588, 601, 627, 753, 742, 751, 755, 756, 751, 757, ++ 758, 751, 588, 601, 742, 751, 759, 742, 742, 760, ++ 751, 742, 742, 761, 762, 763, 764, 765, 766, 767, ++ 768, 769, 770, 772, 773, 774, 775, 776, 777, 778, + +- 778, 779, 780, 781, 782, 783, 784, 785, 787, 790, +- 791, 792, 793, 794, 795, 796, 797, 798, 799, 800, +- 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, +- 811, 812, 813, 814, 815, 816, 808, 817, 818, 813, +- 819, 821, 822, 821, 823, 824, 825, 826, 827, 829, +- 830, 831, 832, 834, 835, 837, 838, 839, 840, 842, +- 835, 846, 847, 849, 850, 851, 838, 852, 853, 854, +- 856, 859, 860, 861, 862, 863, 864, 860, 865, 847, +- 866, 867, 868, 869, 870, 871, 873, 875, 876, 878, +- 879, 881, 882, 883, 884, 886, 887, 888, 889, 891, ++ 779, 780, 781, 782, 784, 787, 788, 789, 790, 791, ++ 792, 793, 794, 795, 796, 797, 798, 799, 800, 801, ++ 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, ++ 812, 813, 805, 814, 815, 810, 816, 818, 819, 818, ++ 820, 821, 822, 823, 824, 826, 827, 828, 829, 831, ++ 832, 834, 835, 836, 837, 839, 832, 843, 844, 846, ++ 847, 848, 835, 849, 850, 851, 853, 856, 857, 858, ++ 859, 860, 861, 862, 863, 844, 864, 865, 866, 867, ++ 869, 871, 872, 874, 875, 877, 878, 879, 880, 882, ++ 883, 884, 885, 887, 889, 891, 893, 894, 897, 898, + +- 893, 895, 897, 898, 901, 902, 903, 904, 905, 906, +- 908, 909, 910, 911, 912, 913, 914, 915, 916, 917, +- 918, 919, 921, 922, 923, 924, 925, 926, 918, 927, +- 928, 929, 930, 931, 932, 933, 935, 937, 938, 939, +- 940, 941, 942, 943, 944, 945, 946, 947, 948, 951, +- 952, 953, 954, 955, 956, 957, 958, 959, 960, 965, +- 966, 967, 968, 969, 970, 971, 972, 973, 974, 975, +- 977, 978, 979, 980, 981, 982, 983, 984, 985, 988, +- 991, 992, 993, 994, 995, 996, 997, 998, 999, 1000, +- 1003, 1004, 1006, 984, 1007, 1008, 1009, 1010, 1011, 1012, ++ 899, 900, 901, 902, 904, 905, 906, 907, 908, 909, ++ 910, 911, 912, 913, 914, 915, 917, 918, 919, 920, ++ 921, 922, 914, 923, 924, 925, 926, 927, 928, 929, ++ 931, 933, 934, 935, 936, 937, 938, 939, 940, 941, ++ 942, 943, 944, 947, 948, 949, 950, 951, 952, 953, ++ 954, 955, 956, 961, 962, 963, 964, 965, 966, 967, ++ 968, 969, 970, 971, 973, 974, 975, 976, 977, 978, ++ 979, 980, 981, 984, 987, 988, 989, 990, 991, 992, ++ 993, 994, 995, 996, 999, 1000, 1002, 980, 1003, 1004, ++ 1005, 1006, 1007, 1008, 1010, 1012, 1013, 1014, 1015, 1016, + +- 1014, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, +- 1025, 1026, 1027, 1028, 1031, 1032, 1033, 1035, 1037, 1038, +- 1039, 1040, 1041, 1042, 1043, 1044, 1046, 1047, 1048, 1050, +- 1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1060, 1061, +- 1063, 1064, 1065, 1066, 1068, 1069, 1070, 1071, 1072, 1074, +- 1075, 1076, 1077, 1078, 1080, 1081, 1082, 1083, 1085, 1087, +- 1085, 1088, 1089, 1090, 1090, 1091, 1093, 1095, 1097, 1098, +- 1099, 1100, 1101, 1102, 1090, 1103, 1090, 1104, 1105, 1106, +- 1090, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, +- 1116, 1117, 1118, 1117, 1119, 1120, 1121, 1122, 1123, 1124, ++ 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1027, 1028, ++ 1029, 1031, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, ++ 1042, 1043, 1044, 1046, 1047, 1048, 1049, 1050, 1051, 1052, ++ 1053, 1054, 1056, 1057, 1059, 1060, 1061, 1062, 1064, 1065, ++ 1066, 1067, 1068, 1070, 1071, 1072, 1073, 1074, 1076, 1077, ++ 1078, 1079, 1081, 1083, 1081, 1084, 1085, 1086, 1086, 1087, ++ 1089, 1091, 1093, 1094, 1095, 1096, 1097, 1098, 1086, 1099, ++ 1086, 1100, 1101, 1102, 1086, 1103, 1104, 1105, 1106, 1107, ++ 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1113, 1115, 1116, ++ 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, + +- 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, +- 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, +- 1144, 1145, 1134, 1146, 1147, 1148, 1134, 1150, 1151, 1152, +- 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1161, 1162, 1164, +- 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, +- 1175, 1176, 1177, 1178, 1179, 1180, 1184, 1185, 1186, 1187, +- 1188, 1189, 1190, 1193, 1194, 1195, 1196, 1197, 1198, 1199, +- 1200, 1201, 1202, 1204, 1206, 1207, 1209, 1210, 1200, 1211, +- 1213, 1214, 1215, 1217, 1219, 1221, 1222, 1223, 1202, 1224, +- 1225, 1226, 1227, 1228, 1229, 1231, 1232, 1233, 1236, 1237, ++ 1127, 1128, 1129, 1130, 1130, 1131, 1132, 1133, 1134, 1135, ++ 1136, 1137, 1138, 1139, 1140, 1141, 1130, 1142, 1143, 1144, ++ 1130, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, ++ 1155, 1157, 1158, 1160, 1161, 1162, 1163, 1164, 1165, 1166, ++ 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, ++ 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1189, 1190, 1191, ++ 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1200, 1202, 1203, ++ 1205, 1206, 1196, 1207, 1209, 1210, 1211, 1213, 1215, 1217, ++ 1218, 1219, 1198, 1220, 1221, 1222, 1223, 1224, 1225, 1227, ++ 1228, 1229, 1232, 1233, 1234, 1236, 1237, 1239, 1241, 1242, + +- 1238, 1240, 1241, 1243, 1245, 1246, 1248, 1250, 1254, 1255, +- 1256, 1258, 1260, 1261, 1263, 1266, 1270, 1271, 1272, 1273, +- 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1282, 1283, 1284, +- 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, +- 1295, 1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, +- 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1314, 1315, 1316, +- 1317, 1318, 1322, 1324, 1326, 1328, 1329, 1331, 1333, 1334, +- 1335, 1337, 1338, 1340, 1341, 1344, 1346, 1350, 1351, 1352, +- 1353, 1354, 1355, 1358, 1359, 1360, 1361, 1337, 1362, 1364, +- 1365, 1366, 1367, 1368, 1369, 1370, 1372, 1373, 1374, 1375, ++ 1244, 1246, 1250, 1251, 1252, 1254, 1256, 1257, 1259, 1262, ++ 1266, 1267, 1268, 1269, 1271, 1272, 1273, 1274, 1275, 1276, ++ 1277, 1278, 1279, 1280, 1281, 1282, 1283, 1284, 1285, 1286, ++ 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1294, 1295, 1296, ++ 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1306, ++ 1307, 1310, 1311, 1312, 1313, 1314, 1318, 1320, 1322, 1324, ++ 1325, 1327, 1329, 1330, 1331, 1333, 1334, 1336, 1337, 1340, ++ 1342, 1346, 1347, 1348, 1349, 1350, 1351, 1354, 1355, 1356, ++ 1357, 1333, 1358, 1360, 1361, 1362, 1363, 1364, 1365, 1366, ++ 1368, 1369, 1370, 1371, 1372, 1373, 1374, 1375, 1376, 1377, + +- 1376, 1377, 1378, 1379, 1380, 1381, 1382, 1384, 1387, 1391, +- 1393, 1394, 1395, 1396, 1400, 1401, 1402, 1403, 1404, 1405, +- 1407, 1408, 1410, 1411, 1412, 1413, 1414, 1417, 1418, 1421, +- 1396, 1423, 1424, 1427, 1428, 1429, 1430, 1431, 1432, 1433, +- 1434, 1436, 1438, 1441, 1442, 1443, 1444, 1447, 1448, 1449, +- 1451, 1454, 1455, 1456, 1458, 1459, 1461, 1462, 1464, 1467, +- 1469, 1470, 1471, 1472, 1473, 1474, 1475, 1476, 1478, 1479, +- 1480, 1481, 1482, 1483, 1485, 1487, 1490, 1491, 1492, 1493, +- 1495, 1496, 1497, 1498, 1499, 1500, 1501, 1503, 1504, 1505, +- 1507, 1510, 1512, 1513, 1517, 1518, 1519, 1521, 1522, 1523, ++ 1378, 1380, 1383, 1387, 1389, 1390, 1391, 1392, 1396, 1397, ++ 1398, 1399, 1400, 1401, 1403, 1404, 1406, 1407, 1408, 1409, ++ 1410, 1413, 1414, 1417, 1392, 1419, 1420, 1423, 1424, 1425, ++ 1426, 1427, 1428, 1429, 1430, 1432, 1434, 1437, 1438, 1439, ++ 1440, 1443, 1444, 1445, 1447, 1450, 1451, 1452, 1454, 1455, ++ 1457, 1458, 1460, 1463, 1465, 1466, 1467, 1468, 1469, 1470, ++ 1471, 1472, 1474, 1475, 1476, 1477, 1478, 1479, 1481, 1483, ++ 1486, 1487, 1488, 1489, 1491, 1492, 1493, 1494, 1495, 1496, ++ 1497, 1499, 1500, 1501, 1503, 1506, 1508, 1509, 1513, 1514, ++ 1515, 1517, 1518, 1519, 1521, 1522, 1523, 1524, 1525, 1527, + +- 1525, 1526, 1527, 1528, 1529, 1531, 1532, 1533, 1534, 1535, +- 1536, 1537, 1538, 1541, 1542, 1543, 1525, 1544, 1545, 1547, +- 1549, 1551, 1554, 1554, 1554, 1554, 1554, 1554, 1554, 1555, +- 1555, 1555, 1555, 1555, 1555, 1555, 1556, 1556, 1556, 1556, +- 1556, 1556, 1556, 1557, 1557, 1557, 1557, 1557, 1557, 1557, +- 1558, 732, 1558, 1558, 1558, 1558, 1558, 1559, 1559, 1559, +- 1559, 1559, 1559, 1559, 1560, 731, 1560, 1560, 1560, 1560, +- 1560, 1561, 1561, 1562, 728, 1562, 1562, 1562, 1562, 1562, +- 1563, 1563, 1564, 1564, 1564, 1564, 1564, 1564, 1564, 1565, +- 1565, 1565, 1565, 1565, 1565, 1565, 1566, 1566, 1566, 1566, ++ 1528, 1529, 1530, 1531, 1532, 1533, 1534, 1537, 1538, 1539, ++ 1521, 1540, 1541, 1543, 1545, 1547, 1550, 1550, 1550, 1550, ++ 1550, 1550, 1550, 1551, 1551, 1551, 1551, 1551, 1551, 1551, ++ 1552, 1552, 1552, 1552, 1552, 1552, 1552, 1553, 1553, 1553, ++ 1553, 1553, 1553, 1553, 1554, 731, 1554, 1554, 1554, 1554, ++ 1554, 1555, 1555, 1555, 1555, 1555, 1555, 1555, 1556, 730, ++ 1556, 1556, 1556, 1556, 1556, 1557, 1557, 1558, 729, 1558, ++ 1558, 1558, 1558, 1558, 1559, 1559, 1560, 1560, 1560, 1560, ++ 1560, 1560, 1560, 1561, 1561, 1561, 1561, 1561, 1561, 1561, ++ 1562, 1562, 1562, 1562, 1562, 1562, 1562, 1563, 1563, 1563, + +- 1566, 1566, 1566, 1567, 1567, 1567, 1567, 1567, 1567, 1567, +- 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1569, 1569, 1569, +- 1569, 1569, 1569, 1569, 1570, 1570, 1570, 1570, 1570, 1570, +- 1570, 1571, 1571, 1571, 1571, 1571, 1571, 1571, 1572, 1572, +- 1572, 726, 1572, 1572, 1572, 1573, 1573, 1573, 1573, 1573, +- 1573, 1573, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1575, +- 723, 1575, 1575, 1575, 722, 721, 719, 718, 717, 716, +- 715, 714, 713, 711, 710, 709, 708, 707, 705, 704, +- 703, 702, 700, 699, 698, 697, 695, 694, 692, 691, +- 690, 689, 688, 687, 685, 683, 682, 681, 680, 678, ++ 1563, 1563, 1563, 1563, 1564, 1564, 1564, 1564, 1564, 1564, ++ 1564, 1565, 1565, 1565, 1565, 1565, 1565, 1565, 1566, 1566, ++ 1566, 1566, 1566, 1566, 1566, 1567, 1567, 1567, 1567, 1567, ++ 1567, 1567, 1568, 1568, 1568, 728, 1568, 1568, 1568, 1569, ++ 1569, 1569, 1569, 1569, 1569, 1569, 1570, 1570, 1570, 1570, ++ 1570, 1570, 1570, 1571, 725, 1571, 1571, 1571, 723, 720, ++ 719, 718, 716, 715, 714, 713, 712, 711, 710, 708, ++ 707, 706, 705, 704, 702, 701, 700, 699, 697, 696, ++ 695, 694, 692, 691, 689, 688, 687, 686, 685, 683, ++ 681, 680, 679, 678, 676, 675, 674, 673, 672, 671, + +- 677, 676, 675, 674, 673, 672, 671, 670, 669, 668, +- 666, 665, 664, 662, 661, 660, 659, 658, 656, 654, +- 653, 652, 651, 650, 649, 648, 647, 646, 645, 644, +- 643, 642, 641, 640, 639, 638, 637, 636, 635, 634, +- 633, 632, 631, 630, 628, 627, 626, 625, 624, 623, +- 622, 621, 620, 619, 618, 617, 616, 615, 614, 612, +- 609, 608, 607, 606, 605, 604, 602, 601, 600, 599, +- 598, 597, 596, 595, 594, 593, 592, 591, 589, 588, +- 587, 586, 585, 583, 582, 581, 580, 579, 578, 576, +- 574, 573, 572, 571, 570, 569, 568, 567, 566, 564, ++ 670, 669, 668, 667, 666, 664, 663, 662, 660, 659, ++ 658, 657, 656, 654, 652, 651, 650, 649, 648, 647, ++ 646, 645, 644, 643, 642, 641, 640, 639, 638, 637, ++ 636, 635, 634, 633, 632, 631, 630, 629, 628, 626, ++ 625, 624, 623, 622, 621, 620, 619, 618, 617, 616, ++ 615, 614, 613, 612, 610, 607, 606, 605, 604, 603, ++ 602, 600, 599, 598, 597, 596, 595, 594, 593, 592, ++ 591, 590, 589, 587, 586, 585, 584, 583, 581, 580, ++ 579, 578, 577, 576, 574, 572, 571, 570, 569, 568, ++ 567, 566, 565, 564, 562, 561, 559, 558, 557, 556, + +- 563, 561, 560, 559, 558, 557, 556, 555, 553, 552, +- 551, 550, 549, 548, 547, 546, 545, 543, 542, 541, +- 539, 538, 537, 536, 535, 533, 531, 530, 529, 528, +- 527, 526, 524, 523, 522, 521, 520, 519, 517, 514, +- 512, 511, 508, 507, 505, 504, 503, 502, 501, 500, +- 499, 498, 497, 496, 494, 493, 492, 491, 490, 489, +- 488, 487, 486, 485, 483, 482, 481, 480, 479, 478, +- 477, 476, 475, 473, 472, 471, 470, 469, 468, 466, +- 465, 462, 459, 458, 457, 456, 455, 454, 453, 452, +- 451, 450, 449, 448, 447, 446, 445, 444, 443, 442, ++ 555, 554, 553, 551, 550, 549, 548, 547, 546, 545, ++ 544, 543, 541, 540, 539, 537, 536, 535, 534, 533, ++ 531, 529, 528, 527, 526, 525, 524, 522, 521, 520, ++ 519, 518, 517, 515, 512, 510, 509, 506, 505, 503, ++ 502, 501, 500, 499, 498, 497, 496, 495, 494, 492, ++ 491, 490, 489, 488, 487, 486, 485, 484, 482, 481, ++ 480, 479, 478, 477, 476, 475, 474, 472, 471, 470, ++ 469, 468, 467, 465, 464, 461, 458, 457, 456, 455, ++ 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, ++ 444, 443, 442, 441, 440, 439, 438, 436, 434, 433, + +- 441, 440, 439, 437, 435, 434, 433, 432, 431, 430, +- 429, 428, 427, 425, 423, 422, 421, 419, 418, 417, +- 416, 414, 413, 412, 410, 409, 408, 407, 406, 405, +- 404, 403, 401, 400, 398, 396, 393, 392, 391, 390, +- 389, 388, 387, 385, 384, 383, 381, 380, 379, 378, +- 377, 376, 375, 374, 372, 370, 369, 368, 366, 365, +- 364, 363, 362, 361, 359, 358, 357, 356, 355, 354, +- 353, 352, 351, 348, 347, 346, 345, 344, 343, 342, +- 341, 340, 339, 338, 337, 336, 335, 334, 333, 332, +- 331, 330, 326, 325, 324, 323, 317, 315, 314, 313, ++ 432, 431, 430, 429, 428, 427, 426, 424, 422, 421, ++ 420, 418, 417, 416, 415, 413, 412, 411, 409, 408, ++ 407, 406, 405, 404, 403, 402, 400, 399, 397, 395, ++ 392, 391, 390, 389, 388, 387, 386, 384, 383, 382, ++ 380, 379, 378, 377, 376, 375, 374, 373, 371, 369, ++ 368, 367, 365, 364, 363, 362, 361, 360, 358, 357, ++ 356, 355, 354, 353, 352, 351, 350, 347, 346, 345, ++ 344, 343, 342, 341, 340, 339, 338, 337, 336, 335, ++ 334, 333, 332, 331, 330, 329, 325, 324, 323, 322, ++ 316, 314, 313, 312, 310, 308, 306, 304, 302, 291, + +- 311, 309, 307, 305, 303, 292, 291, 289, 288, 286, +- 285, 283, 282, 281, 280, 279, 277, 276, 274, 272, +- 271, 270, 269, 268, 266, 265, 264, 263, 262, 260, +- 259, 257, 256, 255, 254, 253, 252, 251, 249, 248, +- 247, 246, 245, 244, 243, 242, 241, 238, 237, 236, +- 235, 234, 233, 232, 231, 229, 226, 224, 221, 220, +- 218, 217, 215, 214, 213, 212, 211, 208, 205, 204, +- 203, 201, 200, 199, 198, 197, 196, 195, 193, 191, +- 186, 184, 183, 180, 179, 178, 176, 175, 174, 173, +- 171, 170, 169, 167, 165, 163, 160, 159, 158, 155, ++ 290, 288, 287, 285, 284, 282, 281, 280, 279, 278, ++ 276, 275, 273, 271, 270, 269, 268, 266, 265, 264, ++ 263, 262, 260, 259, 257, 256, 255, 254, 253, 252, ++ 251, 249, 248, 247, 246, 245, 244, 243, 242, 241, ++ 238, 237, 236, 235, 234, 233, 232, 231, 229, 226, ++ 224, 221, 220, 218, 217, 215, 214, 213, 212, 211, ++ 208, 205, 204, 203, 201, 200, 199, 198, 197, 196, ++ 195, 193, 191, 186, 184, 183, 180, 179, 178, 176, ++ 175, 174, 173, 171, 170, 169, 167, 165, 163, 160, ++ 159, 158, 155, 154, 151, 150, 149, 147, 145, 144, + +- 154, 151, 150, 149, 147, 145, 144, 143, 141, 139, +- 138, 137, 134, 132, 126, 125, 124, 123, 121, 120, +- 115, 114, 113, 109, 108, 103, 102, 101, 100, 98, +- 94, 93, 92, 91, 80, 78, 73, 71, 70, 68, +- 67, 66, 64, 63, 62, 61, 59, 58, 57, 56, +- 49, 44, 37, 27, 22, 21, 19, 15, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, ++ 143, 141, 139, 138, 137, 134, 132, 126, 125, 124, ++ 123, 121, 120, 115, 114, 113, 109, 108, 103, 102, ++ 101, 100, 98, 94, 93, 92, 91, 80, 79, 78, ++ 73, 71, 70, 68, 67, 66, 64, 63, 62, 61, ++ 59, 58, 57, 56, 49, 44, 37, 27, 22, 21, ++ 19, 15, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, 1549, + +- 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, 1553, +- 1553, 1553, 1553 ++ 1549, 1549, 1549, 1549, 1549, 1549, 1549 + } ; + + static yy_state_type yy_last_accepting_state; +@@ -1457,7 +1454,7 @@ + + + +-#line 1461 "maplexer.c" ++#line 1458 "maplexer.c" + + #define INITIAL 0 + #define URL_VARIABLE 1 +@@ -1671,7 +1668,7 @@ + break; + } + +-#line 1675 "maplexer.c" ++#line 1672 "maplexer.c" + + if ( !(yy_init) ) + { +@@ -1724,13 +1721,13 @@ + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 1554 ) ++ if ( yy_current_state >= 1550 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } +- while ( yy_base[yy_current_state] != 1959 ); ++ while ( yy_base[yy_current_state] != 1953 ); + + yy_find_action: + yy_act = yy_accept[yy_current_state]; +@@ -3295,7 +3292,7 @@ + #line 550 "maplexer.l" + ECHO; + YY_BREAK +-#line 3299 "maplexer.c" ++#line 3296 "maplexer.c" + case YY_STATE_EOF(URL_VARIABLE): + case YY_STATE_EOF(URL_STRING): + case YY_STATE_EOF(EXPRESSION_STRING): +@@ -3531,7 +3528,7 @@ + + /* Read in more data. */ + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), +- (yy_n_chars), (size_t) num_to_read ); ++ (yy_n_chars), num_to_read ); + + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } +@@ -3584,7 +3581,7 @@ + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 1554 ) ++ if ( yy_current_state >= 1550 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; +@@ -3612,11 +3609,11 @@ + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; +- if ( yy_current_state >= 1554 ) ++ if ( yy_current_state >= 1550 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; +- yy_is_jam = (yy_current_state == 1553); ++ yy_is_jam = (yy_current_state == 1549); + + return yy_is_jam ? 0 : yy_current_state; + } +@@ -3706,7 +3703,7 @@ + case EOB_ACT_END_OF_FILE: + { + if ( msyywrap( ) ) +- return EOF; ++ return 0; + + if ( ! (yy_did_buffer_switch_on_eof) ) + YY_NEW_FILE; +@@ -4032,7 +4029,7 @@ + + /** Setup the input buffer state to scan a string. The next call to msyylex() will + * scan from a @e copy of @a str. +- * @param yystr a NUL-terminated string to scan ++ * @param str a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use +diff -urNad mapserver-5.0.3~/maplexer.l mapserver-5.0.3/maplexer.l +--- mapserver-5.0.3~/maplexer.l 2008-06-03 10:49:01.000000000 -0400 ++++ mapserver-5.0.3/maplexer.l 2009-07-23 09:07:55.450606144 -0400 +@@ -186,8 +186,8 @@ + imagetype { return(IMAGETYPE); } + imagequality { return(IMAGEQUALITY); } + imagemode { return(IMAGEMODE); } +-imagepath { return(IMAGEPATH); } +-imageurl { return(IMAGEURL); } ++imagepath { return(IMAGEPATH); } ++imageurl { return(IMAGEURL); } + include { BEGIN(INCLUDE); } + index { return(INDEX); } + interlace { return(INTERLACE); }