From: Slava Barinov Date: Wed, 29 Aug 2018 08:01:15 +0000 (+0300) Subject: Imported Upstream version 2.6.2 X-Git-Tag: upstream/2.6.2^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aeba54f18ecff8caa297af08df4bd81b81d58576;p=platform%2Fupstream%2Fflex.git Imported Upstream version 2.6.2 --- diff --git a/ABOUT-NLS b/ABOUT-NLS index 4f50fb5..b1de1b6 100644 --- a/ABOUT-NLS +++ b/ABOUT-NLS @@ -18,35 +18,7 @@ explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and work on translations can contact the appropriate team. - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters +1.1 INSTALL Matters =================== Some packages are "localizable" when properly installed; the programs @@ -56,36 +28,19 @@ internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: +provides the GNU `gettext' functions. Installers may use special +options at configuration time for changing the default behaviour. The +command: - ./configure --with-included-gettext ./configure --disable-nls -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. +will _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. +probably detect the previously built and installed `libintl' library +and will decide to use it. If not, you may have to to use the +`--with-libintl-prefix' option to tell `configure' where to look for it. Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -96,7 +51,7 @@ may be set, prior to configuration, to limit the installed set. `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.3 Using This Package +1.2 Using This Package ====================== As a user, if your language has been installed for this package, you @@ -148,7 +103,7 @@ to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -1.4 Translating Teams +1.3 Translating Teams ===================== For the Free Translation Project to be a success, we need interested @@ -177,566 +132,566 @@ reach the coordinator for all translator teams. the terminology in use. Proven linguistic skills are praised more than programming skills, here. -1.5 Available Packages +1.4 Available Packages ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of May 2010. -The matrix shows, in regard of each package, for which languages PO -files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of June +2010. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh - +---------------------------------------------------+ - a2ps | [] [] | - aegis | | - ant-phone | | - anubis | | - aspell | [] [] | - bash | | - bfd | | - bibshelf | [] | - binutils | | - bison | | - bison-runtime | [] | - bluez-pin | [] [] | - bombono-dvd | | - buzztard | | - cflow | | - clisp | | - coreutils | [] [] | - cpio | | - cppi | | - cpplib | [] | - cryptsetup | | - dfarc | | - dialog | [] [] | - dico | | - diffutils | [] | - dink | | - doodle | | - e2fsprogs | [] | - enscript | [] | - exif | | - fetchmail | [] | - findutils | [] | - flex | [] | - freedink | | - gas | | - gawk | [] [] | - gcal | [] | - gcc | | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gip | [] | - gjay | | - gliv | [] | - glunarclock | [] [] | - gnubiff | | - gnucash | [] | - gnuedu | | - gnulib | | - gnunet | | - gnunet-gtk | | - gnutls | | - gold | | - gpe-aerial | | - gpe-beam | | - gpe-bluetooth | | - gpe-calendar | | - gpe-clock | [] | - gpe-conf | | - gpe-contacts | | - gpe-edit | | - gpe-filemanager | | - gpe-go | | - gpe-login | | - gpe-ownerinfo | [] | - gpe-package | | - gpe-sketchbook | | - gpe-su | [] | - gpe-taskmanager | [] | - gpe-timesheet | [] | - gpe-today | [] | - gpe-todo | | - gphoto2 | | - gprof | [] | - gpsdrive | | - gramadoir | | - grep | | - grub | [] [] | - gsasl | | - gss | | - gst-plugins-bad | [] | - gst-plugins-base | [] | - gst-plugins-good | [] | - gst-plugins-ugly | [] | - gstreamer | [] [] [] | - gtick | | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] [] | - gutenprint | | - hello | [] | - help2man | | - hylafax | | - idutils | | - indent | [] [] | - iso_15924 | | - iso_3166 | [] [] [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | | - iso_639 | [] [] [] [] [] | - iso_639_3 | [] | - jwhois | | - kbd | | - keytouch | [] | - keytouch-editor | | - keytouch-keyboa... | [] | - klavaro | [] | - latrine | | - ld | [] | - leafpad | [] [] | - libc | [] [] | - libexif | () | - libextractor | | - libgnutls | | - libgpewidget | | - libgpg-error | | - libgphoto2 | | - libgphoto2_port | | - libgsasl | | - libiconv | [] | - libidn | | - lifelines | | - liferea | [] [] | - lilypond | | - linkdr | [] | - lordsawar | | - lprng | | - lynx | [] | - m4 | | - mailfromd | | - mailutils | | - make | | - man-db | | - man-db-manpages | | - minicom | | - mkisofs | | - myserver | | - nano | [] [] | - opcodes | | - parted | | - pies | | - popt | | - psmisc | | - pspp | [] | - pwdutils | | - radius | [] | - recode | [] [] | - rosegarden | | - rpm | | - rush | | - sarg | | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] | - sharutils | [] [] | - shishi | | - skencil | | - solfege | | - solfege-manual | | - soundtracker | | - sp | | - sysstat | | - tar | [] | - texinfo | | - tin | | - unicode-han-tra... | | - unicode-transla... | | - util-linux-ng | [] | - vice | | - vmm | | - vorbis-tools | | - wastesedge | | - wdiff | | - wget | [] [] | - wyslij-po | | - xchat | [] [] [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] | - +---------------------------------------------------+ - af am ar as ast az be be@latin bg bn_IN bs ca crh - 6 0 2 3 19 1 11 3 28 3 1 38 5 + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca + +--------------------------------------------------+ + a2ps | [] [] | + aegis | | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | + bfd | | + bibshelf | [] | + binutils | | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | + doodle | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | + gas | | + gawk | [] [] | + gcal | [] | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | + gnubiff | | + gnucash | [] | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + help2man | | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] | + iso_639_3 | | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | + libextractor | | + libgnutls | | + libgpewidget | | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | + mailutils | | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | + pwdutils | | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | | + solfege-manual | | + soundtracker | | + sp | | + sysstat | | + tar | [] | + texinfo | | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | + +--------------------------------------------------+ + af am an ar as ast az be be@latin bg bn_IN bs ca + 6 0 1 2 3 19 1 10 3 28 3 1 38 - cs da de el en en_GB en_ZA eo es et eu fa fi + crh cs da de el en en_GB en_ZA eo es et eu fa +-------------------------------------------------+ - a2ps | [] [] [] [] [] [] [] [] | - aegis | [] [] [] | - ant-phone | [] () | - anubis | [] [] [] | - aspell | [] [] [] [] [] | - bash | [] [] [] [] | - bfd | [] [] | - bibshelf | [] [] [] [] | - binutils | [] [] | - bison | [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] | - bombono-dvd | [] [] | - buzztard | [] [] [] | - cflow | [] [] [] | - clisp | [] [] [] [] | - coreutils | [] [] [] [] | - cpio | [] | - cppi | [] | - cpplib | [] [] [] | - cryptsetup | [] | - dfarc | [] [] [] [] | - dialog | [] [] [] [] [] | + a2ps | [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] | + bison | [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] [] [] | + cflow | [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | | + cppi | | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] | dico | | - diffutils | [] [] [] [] [] [] [] | - dink | [] [] [] | - doodle | [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - exif | () [] [] [] | - fetchmail | [] [] () [] [] [] | - findutils | [] [] [] [] | - flex | [] [] [] | - freedink | [] [] [] [] | - gas | [] | - gawk | [] [] [] | - gcal | [] | - gcc | [] [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] | - gip | [] [] [] [] [] | - gjay | [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] | - gnubiff | () | - gnucash | [] () () () () () | - gnuedu | [] [] | - gnulib | [] [] [] | + diffutils | [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] | + flex | [] [] | + freedink | [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] | + gjay | [] | + gliv | [] [] [] | + glunarclock | [] [] | + gnubiff | () | + gnucash | [] () () () () | + gnuedu | [] [] | + gnulib | [] [] | gnunet | | - gnunet-gtk | [] | - gnutls | [] [] | - gold | [] [] | - gpe-aerial | [] [] [] [] [] | - gpe-beam | [] [] [] [] [] | - gpe-bluetooth | [] [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] [] [] [] | - gpe-conf | [] [] [] [] | - gpe-contacts | [] [] [] [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] [] [] | - gpe-go | [] [] [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] [] [] [] | - gpe-sketchbook | [] [] [] [] [] | - gpe-su | [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] | - gpe-today | [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] () [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] [] | - grep | [] [] | - grub | [] [] [] | - gsasl | [] [] | - gss | [] | - gst-plugins-bad | [] [] [] [] [] [] | - gst-plugins-base | [] [] [] [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] | - gtick | [] () [] [] | - gtkam | [] [] () [] [] | - gtkorphan | [] [] [] [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] [] [] [] | - hello | [] [] [] [] [] | - help2man | [] [] | - hylafax | [] [] | - idutils | [] [] [] | - indent | [] [] [] [] [] [] [] [] | - iso_15924 | [] () [] [] [] | - iso_3166 | [] [] [] () [] [] [] () [] | - iso_3166_2 | () | - iso_4217 | [] [] [] () [] [] [] | - iso_639 | [] [] [] () [] [] [] | - iso_639_3 | | - jwhois | [] [] | - kbd | [] [] [] [] [] | - keytouch | [] [] [] | - keytouch-editor | [] [] [] | - keytouch-keyboa... | [] [] | - klavaro | [] [] [] [] | - latrine | [] () [] | - ld | [] [] [] | - leafpad | [] [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] [] () | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] () [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] | + gsasl | [] | + gss | | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] () [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] | + help2man | [] | + hylafax | [] [] | + idutils | [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] [] [] [] () [] [] [] () | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] | + iso_639 | [] [] [] [] () [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | [] [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] [] | + keytouch-keyboa... | [] | + klavaro | [] [] [] [] | + latrine | [] () | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () | libextractor | | - libgnutls | [] | - libgpewidget | [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] () | - libgphoto2_port | [] () [] | - libgsasl | [] | - libiconv | [] [] [] [] [] [] | - libidn | [] [] [] [] | - lifelines | [] () | - liferea | [] [] [] [] [] | - lilypond | [] [] [] [] | - linkdr | [] [] [] [] | - lordsawar | [] | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] | + linkdr | [] [] [] | + lordsawar | [] | lprng | | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] | mailfromd | | - mailutils | [] | - make | [] [] [] [] | + mailutils | [] | + make | [] [] [] | man-db | | man-db-manpages | | - minicom | [] [] [] [] [] | - mkisofs | [] | + minicom | [] [] [] [] | + mkisofs | | myserver | | - nano | [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] | + nano | [] [] [] | + opcodes | [] [] | + parted | [] [] | pies | | - popt | [] [] [] [] [] [] | - psmisc | [] [] [] [] | - pspp | [] | - pwdutils | [] | - radius | [] | - recode | [] [] [] [] [] [] [] | - rosegarden | () () () () | - rpm | [] [] [] | + popt | [] [] [] [] [] | + psmisc | [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] | + rosegarden | () () () | + rpm | [] [] [] | rush | | sarg | | screem | | - scrollkeeper | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sharutils | [] [] [] [] | shishi | | - skencil | [] () [] | - solfege | [] [] [] [] | - solfege-manual | [] [] | - soundtracker | [] [] [] | - sp | [] | - sysstat | [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] | - tin | [] [] | + skencil | [] () [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | unicode-han-tra... | | unicode-transla... | | - util-linux-ng | [] [] [] [] [] | - vice | () () | - vmm | [] | - vorbis-tools | [] [] | - wastesedge | [] | - wdiff | [] [] [] | - wget | [] [] [] [] | - wyslij-po | [] | - xchat | [] [] [] [] [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] [] [] | + util-linux-ng | [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] | + wyslij-po | | + xchat | [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | +-------------------------------------------------+ - cs da de el en en_GB en_ZA eo es et eu fa fi - 64 105 117 18 1 8 0 28 89 18 19 0 104 + crh cs da de el en en_GB en_ZA eo es et eu fa + 5 64 105 117 18 1 8 0 28 89 18 19 0 - fr ga gl gu he hi hr hu hy id is it ja ka kn - +------------------------------------------------+ - a2ps | [] [] [] | - aegis | [] [] | - ant-phone | [] [] | - anubis | [] [] [] | - aspell | [] [] [] [] | - bash | [] [] [] | - bfd | [] [] | - bibshelf | [] [] [] [] | - binutils | [] [] | - bison | [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] | - bombono-dvd | | - buzztard | [] | - cflow | [] [] | - clisp | [] | - coreutils | [] [] [] [] [] | - cpio | [] [] [] | - cppi | [] | - cpplib | [] [] | - cryptsetup | [] [] [] | - dfarc | [] [] | - dialog | [] [] [] [] [] [] [] | - dico | | - diffutils | [] [] [] [] [] [] [] [] | - dink | [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - exif | [] [] [] [] [] | - fetchmail | [] [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] | - freedink | [] [] | - gas | [] [] | - gawk | [] [] [] [] () [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] [] [] | - gip | [] [] [] [] [] | - gjay | | - gliv | () | - glunarclock | [] [] [] | - gnubiff | () [] () | - gnucash | () () () () [] | - gnuedu | [] [] | - gnulib | [] [] [] [] [] | - gnunet | | - gnunet-gtk | [] | - gnutls | [] [] | - gold | [] | - gpe-aerial | [] [] | - gpe-beam | [] [] [] | - gpe-bluetooth | [] [] [] | - gpe-calendar | [] | - gpe-clock | [] [] [] [] | - gpe-conf | [] [] [] | - gpe-contacts | [] [] [] | - gpe-edit | [] [] | - gpe-filemanager | [] [] [] | - gpe-go | [] [] [] [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] | - gpe-su | [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] [] | - grep | [] | - grub | [] [] [] | - gsasl | [] [] [] [] | - gss | [] [] [] [] | - gst-plugins-bad | [] [] [] [] | - gst-plugins-base | [] [] [] [] [] | - gst-plugins-good | [] [] [] [] [] | - gst-plugins-ugly | [] [] [] [] [] | - gstreamer | [] [] [] [] | - gtick | [] [] [] [] | - gtkam | [] [] [] [] [] | - gtkorphan | [] [] [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] [] [] | - hello | [] [] | - help2man | [] | - hylafax | [] | - idutils | [] [] [] [] [] | - indent | [] [] [] [] [] [] [] | - iso_15924 | () [] [] | - iso_3166 | () [] [] [] [] [] [] [] [] [] [] | - iso_3166_2 | () [] [] [] | - iso_4217 | () [] [] [] [] | - iso_639 | () [] [] [] [] [] [] [] | - iso_639_3 | () [] [] | - jwhois | [] [] [] [] | - kbd | [] [] | - keytouch | [] [] [] [] [] | - keytouch-editor | [] [] [] [] | - keytouch-keyboa... | [] [] [] [] | - klavaro | [] [] | - latrine | [] [] | - ld | [] [] [] | - leafpad | [] [] [] [] [] [] () | - libc | [] [] [] [] | - libexif | | - libextractor | | - libgnutls | [] [] | - libgpewidget | [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] [] [] [] | - libidn | [] [] [] | - lifelines | () | - liferea | [] [] [] [] | - lilypond | [] | - linkdr | [] [] [] [] | - lordsawar | | - lprng | [] | - lynx | [] [] [] [] [] | - m4 | [] [] [] [] [] | - mailfromd | | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | [] [] | - man-db-manpages | [] | - minicom | [] [] [] [] | - mkisofs | [] [] [] | - myserver | | - nano | [] [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] | - pies | | - popt | [] [] [] [] [] [] [] [] | - psmisc | [] [] | - pspp | | - pwdutils | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rosegarden | () () () () | - rpm | [] [] | - rush | | - sarg | [] | - screem | [] [] | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | [] | - skencil | [] | - solfege | [] [] [] | - solfege-manual | [] [] | - soundtracker | [] [] | - sp | [] () | - sysstat | [] [] [] [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] | - tin | [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux-ng | [] [] [] [] [] | - vice | () () () | - vmm | [] | - vorbis-tools | [] | - wastesedge | () () | - wdiff | | - wget | [] [] [] [] [] [] [] | - wyslij-po | [] [] | - xchat | [] [] [] [] [] [] [] [] | - xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - +------------------------------------------------+ - fr ga gl gu he hi hr hu hy id is it ja ka kn - 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4 + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] [] | + bibshelf | [] [] [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] | + cflow | [] [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] [] | + cppi | [] [] | + cpplib | [] [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] [] | + gjay | [] | + gliv | [] () | + glunarclock | [] [] [] [] | + gnubiff | () [] () | + gnucash | () () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | [] () [] [] [] [] | + iso_639 | [] () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] [] | + keytouch-editor | [] [] [] [] [] | + keytouch-keyboa... | [] [] [] [] [] | + klavaro | [] [] | + latrine | [] [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] () | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] [] | + linkdr | [] [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] [] [] | + myserver | | + nano | [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] [] | + psmisc | [] [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | [] | + wget | [] [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +----------------------------------------------------+ + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4 ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne +-----------------------------------------------+ @@ -820,7 +775,7 @@ translation percentage of at least 50%. grub | | gsasl | | gss | | - gst-plugins-bad | [] [] | + gst-plugins-bad | [] [] [] [] | gst-plugins-base | [] [] | gst-plugins-good | [] [] | gst-plugins-ugly | [] [] [] [] [] | @@ -920,7 +875,7 @@ translation percentage of at least 50%. xkeyboard-config | [] [] [] | +-----------------------------------------------+ ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne - 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1 + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1 nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr +---------------------------------------------------+ @@ -1004,7 +959,7 @@ translation percentage of at least 50%. grub | [] [] [] | gsasl | [] [] [] [] | gss | [] [] [] | - gst-plugins-bad | [] [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | gst-plugins-base | [] [] [] [] [] | gst-plugins-good | [] [] [] [] [] | gst-plugins-ugly | [] [] [] [] [] [] | @@ -1041,7 +996,7 @@ translation percentage of at least 50%. libgpewidget | [] [] [] | libgpg-error | [] [] | libgphoto2 | [] [] | - libgphoto2_port | [] [] [] [] | + libgphoto2_port | [] [] [] [] [] | libgsasl | [] [] [] [] [] | libiconv | [] [] [] [] [] | libidn | [] [] | @@ -1101,10 +1056,10 @@ translation percentage of at least 50%. wyslij-po | [] [] [] | xchat | [] [] [] [] [] [] [] [] [] | xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] [] | + xkeyboard-config | [] [] [] | +---------------------------------------------------+ nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr - 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37 + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ @@ -1113,7 +1068,7 @@ translation percentage of at least 50%. ant-phone | [] [] [] [] | 9 anubis | [] [] [] [] | 15 aspell | [] [] [] | 20 - bash | [] [] | 11 + bash | [] [] [] | 12 bfd | [] | 6 bibshelf | [] [] [] | 16 binutils | [] [] | 8 @@ -1127,7 +1082,7 @@ translation percentage of at least 50%. coreutils | [] [] [] [] | 22 cpio | [] [] [] [] [] [] | 13 cppi | [] [] | 5 - cpplib | [] [] [] [] [] [] | 13 + cpplib | [] [] [] [] [] [] | 14 cryptsetup | [] [] | 7 dfarc | [] | 9 dialog | [] [] [] [] [] [] [] | 30 @@ -1147,14 +1102,14 @@ translation percentage of at least 50%. gcal | [] [] | 5 gcc | [] [] [] | 7 gettext-examples | [] [] [] [] [] [] [] | 34 - gettext-runtime | [] [] [] [] [] [] [] | 30 + gettext-runtime | [] [] [] [] [] [] [] | 29 gettext-tools | [] [] [] [] [] [] | 22 gip | [] [] [] [] | 22 gjay | [] | 3 gliv | [] [] [] | 14 glunarclock | [] [] [] [] [] | 19 gnubiff | [] [] | 4 - gnucash | () [] () () | 9 + gnucash | () [] () [] () | 10 gnuedu | [] [] | 7 gnulib | [] [] [] [] | 16 gnunet | [] | 1 @@ -1188,9 +1143,9 @@ translation percentage of at least 50%. grub | [] [] [] | 14 gsasl | [] [] [] [] | 14 gss | [] [] [] | 11 - gst-plugins-bad | [] [] [] [] | 22 + gst-plugins-bad | [] [] [] [] | 26 gst-plugins-base | [] [] [] [] [] | 24 - gst-plugins-good | [] [] [] [] [] | 25 + gst-plugins-good | [] [] [] [] | 24 gst-plugins-ugly | [] [] [] [] [] | 29 gstreamer | [] [] [] [] | 22 gtick | [] [] [] | 13 @@ -1219,13 +1174,13 @@ translation percentage of at least 50%. ld | [] [] [] [] | 11 leafpad | [] [] [] [] [] [] | 33 libc | [] [] [] [] [] | 21 - libexif | [] () | 6 + libexif | [] () | 7 libextractor | [] | 1 libgnutls | [] [] [] | 9 libgpewidget | [] [] [] | 14 libgpg-error | [] [] [] | 9 libgphoto2 | [] [] | 8 - libgphoto2_port | [] [] [] [] | 13 + libgphoto2_port | [] [] [] [] | 14 libgsasl | [] [] [] | 13 libiconv | [] [] [] [] | 21 libidn | () [] [] | 11 @@ -1271,7 +1226,7 @@ translation percentage of at least 50%. sp | [] | 3 sysstat | [] [] | 15 tar | [] [] [] [] [] [] | 23 - texinfo | [] [] [] [] | 16 + texinfo | [] [] [] [] [] | 17 tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 @@ -1284,11 +1239,11 @@ translation percentage of at least 50%. wget | [] [] [] [] [] | 26 wyslij-po | [] [] | 8 xchat | [] [] [] [] [] [] | 36 - xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60 - xkeyboard-config | [] [] [] [] | 25 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 + xkeyboard-config | [] [] [] | 22 +---------------------------------------------------+ - 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW - 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610 + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1301,12 +1256,12 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If May 2010 seems to be old, you may fetch a more recent copy of + If June 2010 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://translationproject.org/extra/matrix.html'. -1.6 Using `gettext' in new packages +1.5 Using `gettext' in new packages =================================== If you are writing a freely available program and want to diff --git a/ChangeLog b/ChangeLog index cf99554..595890b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,537 +1,3 @@ -2017-05-06 Will Estes - - * po/ca.po, po/da.po, po/de.po, po/eo.po, po/es.po, po/fi.po, - po/fr.po, po/ga.po, po/hr.po, po/ko.po, po/nl.po, po/pl.po, - po/pt_BR.po, po/ro.po, po/ru.po, po/sr.po, po/sv.po, po/tr.po, - po/vi.po, po/zh_CN.po, po/zh_TW.po: gettext: pulled latest - translations; recompiled against current sources - -2017-05-06 Will Estes - - * NEWS: version 2.6.4 * NEWS: Record release date. - -2017-05-06 Will Estes - - * .prev-version: note previous version - -2017-05-06 Will Estes - - * NEWS: doc: update NEWS for upcoming release - -2017-05-04 viktor.shepel - - * doc/flex.texi: doc: Correct typo in C code sample in manual - -2017-05-04 Explorer09 - - * src/flex.skl: scanner: Mention %# comments are removed when - building skel.c - -2017-05-02 Demi Obenour - - * src/flex.skl: Honor user definitions of yy_* macros The user may have defined the yy_* macros themselves. In that case, - don't clobber them. - -2017-05-02 Demi Obenour - - * src/flex.skl, src/main.c: Don't leak macro definitions into header - files This allowed unnamespaced definitions to leak into header files, - breaking client code. Fixes #142 - -2017-05-03 Demi Obenour - - * src/scan.l: scanner: Check for 0 bracecount when EOL ends quoted - literal. This can happen in the case of // comments (which Flex doesn't - handle specially). - -2017-05-03 Demi Obenour - - * src/scan.l: scanner: when bracelevel is negative, treat as zero. This really should never happen, but this at least fixes the - breakage on Verilator. - -2017-04-02 Jeff Smith - - * tests/Makefile.am, tests/tableopts.am, tests/tableopts.sh: test: - enable more silent building of tests. When running 'make V=0 check', some compile and link steps are made - less verbose and some are not. This cleans up most steps that are - not. These have no effect if V=0 is not specified. - -2017-05-03 Demi Obenour - - * src/Makefile.am, src/misc.c, src/mkskel.sh: build: Delete comments - from skeleton file. Since the comments in flex.skl are, by hypothesis, not needed in - skel.c, we remove them. THis reduces the size of the resulting - executable somewhat. - -2017-05-03 Explorer09 - - * Makefile.am, configure.ac, lib/Makefile.am: build: do not generate - lib/Makefile.in. Files in lib/ are picked up and built using makefile directives in - src/Makefile.am. Remove the need to generate lib/Makefile.in and the - stub lib/Makefile.am. - -2017-05-02 Will Estes - - * po/POTFILES.in: gettext: revert listing generated .c files - -2017-04-10 Jeff Smith - - * src/filter.c: FLEX_EXIT() is the preferred way to exit flex - -2017-04-11 Explorer09 - - * src/misc.c: Fix myesc() 'sptr' conditionals * Don't call isascii() here. It's deprecated in POSIX and not needed for myesc's case. * The check of the character class and range here should match - what's defined as {ESCSEQ} in scan.l, so for [[:xdigit:]] we use - isxdigit(); for [0-7] we check '0' <= c <= '7' (not isdigit(c) - because isdigit is locale-dependant in standard's sense) * Add missing length limit for "\x" ( is at most 2 digits) - -2017-04-11 Explorer09 - - * src/flexdef.h, src/misc.c: Obsolete htoui() and otoui(); use - strtoul(). No sense to keep these two function when libc's strtoul() can do the - same job, but better. - -2017-04-12 Todd C. Miller - - * src/flex.skl: scanner: update yy_buf_size after yyrealloc() - -2017-05-02 Simon Sobisch - - * configure.ac: build: use lowest versions for gettext, automake. - -2017-05-02 Simon Sobisch - - * po/Makevars, po/Rules-getpo, po/update_linguas.sh: gettext: more - recent makevars; new script to update po files. Previously, "make dist" and similar commands would cause the po - files to be updated, which is incorrect. The more recent version now - used should not do this. Replaced Rules-getpo by extra script to manually update and rebuild - all po files. - -2017-05-02 Simon Sobisch - - * po/POTFILES.in: gettext: list generated files instead of flex, - bison sources in POTFILES.in. Listing the flex and bison sources -- as the gettext manual suggests - -- causes warnings. Listing the generated C files for the lexer and - parser removes the warnings. Since both files contain line - directives, any translator who needs to refer back to those files - should be able to find the context in which strings are needed. - -2017-05-02 Simon Sobisch - - * autogen.sh: build: only touch ChangeLog if it does not exist - -2017-05-02 Simon Sobisch - - * configure.ac, doc/Makefile.am: build: list earliest useable - versions for automake - -2017-05-02 Simon Sobisch - - * autogen.sh: build: check for how to call libtoolize. Previously, we would call libtoolize and if that failed, we would - call glibtoolize since some platforms have the libtoolize program - under that name. Instead, we check to see if the environment variable LIBTOOLIZE is - set and use that if so. Otherwise, we try to find a program - "libtoolize" on the path and failing that glibtoolize. We alert the - user if no suitable program can be found. - -2017-01-06 Alastair Hughes - - * configure.ac, m4/ax_prog_cc_for_build.m4, src/Makefile.am: build: - support cross compiling. Check for cross compiling. If cross compiling, build stage1flex - using a custom link command. We also override LDADD since that adds - the replacement implementations that are cross compiled, and instead - always use the replacement library implementations. We don't use BUILD_OBJEXT and BUILD_EXEEXT since it seems that - automake does not support these. Fixes #78. - -2017-02-17 Explorer09 - - * configure.ac, src/flexdef.h: build: Include ; add - strcasecmp() check to configure. strings.h (not string.h) is the standard-defined include header for - strcasecmp(). Include for portability (even though glibc - exposes strcasecmp() declaration also in by default). - -2017-02-17 Explorer09 - - * configure.ac, src/flexdef.h: build: Let configure error if missing - required functions, headers.. `configure` will now error if a required header or function is not - found on the system. Also add comments on optional functions checks. Add sys/stats.h and sys/wait.h to list of required headers in - configure. This fixes issue #180. - -2017-02-12 Explorer09 - - * src/dfa.c, src/flexdef.h: scanner: compute powers of two faster. Replace the naive "for" loop in determining power of two with a - clever bitwise solution. This code is around the Internet already - and is in Public Domain. - -2017-02-07 Explorer09 - - * configure.ac, tests/Makefile.am, tests/pthread.l: test: skip - pthread test when needed files missing. "Unlisting" the pthread test when libpthread is not available is - never a good idea. Should let it compile into a stub program that - returns the "skip" status. configure.ac and tests/Makefile.am are edited so that pthread test - can be built anyway, but only works (not as the stub) when both - pthread.h and libpthread are detected on the system. Also fix a small typo in tests/pthread.l comments. - -2017-02-16 Will Estes - - * src/Makefile.am: build: mv scan.c when building dist. Revert change to copy scan.c when building the distribution archive. - Move it instead. This satisfies automake's notions of what should be - clean and ensures that the distribution archive contains a - just-built copy of scan.c. Fixes #186 - -2017-02-06 Will Estes - - * src/Makefile.am: build: don't assume distdir/scan.c is writeable - -2017-01-02 Explorer09 - - * src/Makefile.am: build: Add dist-hook to force remake scan.c. This will ensure the flex scanner included in release tarball being - generated by exactly the flex version to be released. Here's one catch after this change: You may not run "make dist" or - "make distdir" if you configure the flex source to be - cross-compiled. - -2017-01-02 Explorer09 - - * src/Makefile.am: build: respect '--localedir' from configure. Makefile shouldn't overwrite the 'localedir' variable, because - that's what '--localedir' option in 'configure' is for. - -2017-01-02 Explorer09 - - * src/Makefile.am: build: Remove "-I$(top_srcdir)/intl" from - CPPFLAGS. Revert commit e02c3d27eeb6b53ec82532ab080c23ce26813fd4 ("include the intl/ subdirectory when searching for include files") Flex doesn't come with libintl source code, so inclusion of - $(top_srcdir)/intl subdirectory during compiling is unnecessary. This flag seems to be left after "remove intl from dist" (commit - 8f45da06adbd7dbcdfdbdd5c20ff4c47fc504f35) without someone cleaning - this up. Users who need to build with gettext functionality from libintl - would use the '--with-libintl-prefix' configure option. - -2017-02-03 Explorer09 - - * src/regex.c: scanner: fix regcomp's error reporting, double - malloc. Fix unneeded double malloc - let regerror(). Write its message after - our "regcomp for (regex) failed: " string. Also, errbuf cannot be free()'d because of flexfatal containing a - longjmp. - -2017-01-03 Explorer09 - - * tests/Makefile.am, tests/no_bison_stub.c: test: Skip bison tests - if bison is not available - -2017-01-03 Explorer09 - - * configure.ac: build: remove repeated bison detection from - configure. AC_PROG_YACC already detects the bison program. We can just use it, - and make notice if [ $YACC != 'bison -y' ] Remove unused AC_SUBST([BISON], ...). Add AM_CONDITIONAL([HAVE_BISON], ...) so that we can skip bison - tests in testsuite when bison is absent. We don't make any attempt to detect other yacc implementations since - flex is developed with bison. While it would be possible, the need - isn't there right now. It would be possible to add a --with-parser - option that defaulted to bison if such a need cropped up. - -2017-01-01 Explorer09 - - * src/Makefile.am: build: fix Makefile parse.h dependency clauses. The current clauses stating "main.c: parse.h" and "yylex.c: parse.h" - do not work as expected. Make did not try to build parse.h upon - building flex-main.o as it would think main.c exist already and - ignore the clause. Fix this by explicitly stating that the .o files - depend on parse.h instead. This dependency bug only happens if user builds flex from a - checked-out repository. - -2017-01-03 Explorer09 - - * tests/Makefile.am: test: Remake *_scanner.c if *_scanner.h is - missing. If a ${foo}_scanner.c exists but the respective ${foo}_scanner.h is - missing, then 'make' can halt. Fix this by deleting the - ${foo}_scanner.c file and then remake it. This rule is the same as - the automake-generated rule for .c files that require LEX or YACC - (except automake will use ylwrap). - -2016-12-31 Explorer09 - - * tests/Makefile.am: test: remove BUILT_SOURCES; add missing - dependencies. Without BUILT_SOURCES in Makefile, no test sources in tests/ will be - built when using the default "make all" target. This is desireable - for people who are just building flex but who do not want to run, - and therefore, build any part of the test suite. Also fix missing sources dependencies: bison_nr_scanner.$(OBJEXT): bison_nr_parser.h bison_yylloc_scanner.$(OBJEXT): bison_yylloc_parser.h bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h - -2017-01-19 Explorer09 - - * configure.ac, lib/reallocarray.c, src/flexint.h, src/misc.c: - build: detect overflow for [re]allocate_array. Use reallocarray() when we have it (i.e. in OpenBSD system). When we - don't, use equivalent overflow detection for our allocate_array and - reallocate_array functions. Remove lib/reallocarray.c from our LIBOBJS as we no longer need it. Provide a fallback SIZE_MAX macro definition in flexint.h (not - preprocessor friendly, but enough for our reallocate_array use - case). - -2017-01-23 Will Estes - - * NEWS, configure.ac: doc: v2.6.4 - -2017-01-23 Thomas Klausner - - * src/Makefile.am: build: more BSD make and vpath build fixes. BSD make doesn't like $< with more than one source specified. - Additionally, make sure to specify srcdir when referring to source - files since vpath builds depend on this. - -2017-01-22 Thomas Klausner - - * src/Makefile.am: build: Fix skel.c generation with BSD make - -2017-01-22 Christos Zoulas - - * src/flex.skl: Add more defines in the non-reentrant part. Fix the reentrant part; don't "#define yyfoo yyfoo" because it - breaks code that does #ifndef yywrap .. - -2017-01-22 Christos Zoulas - - * src/flexdef.h: scanner: Add yyparse prototype - -2017-01-22 Thomas Klausner - - * src/flex.skl: scanner: move comment for consistency - -2017-01-22 Christos Zoulas - - * src/misc.c: scanner: Use array instead of pointer - -2017-01-22 Christos Zoulas - - * src/main.c: scanner: manage path to m4 better. Avoid alloca() for SSP; it is better anyway; since we don't need to - strdup the path. - -2017-01-22 Christos Zoulas - - * src/gen.c: scanner: Avoid creating unused label - -2017-01-22 Christos Zoulas - - * src/buf.c: Cast argument to avoid arithmetic on void *. - -2017-01-22 Christos Zoulas - - * src/scan.l: scanner: Use strncpy - -2017-01-22 Christos Zoulas - - * src/main.c: scanner: Use prefix when defining yywrap to avoid - redefinition. Fixes regression introduced in v2.6.3. - -2017-01-22 Christos Zoulas - - * src/flexdef.h, src/misc.c: scanner: Include stdarg.h for va_list - -2017-01-22 Christos Zoulas - - * src/flexdef.h, src/main.c, src/parse.y: scanner: Rename warn to - lwarn. This avoids a naming conflict in NetBSD's libc. - -2017-01-01 Explorer09 - - * tests/README: test: document automake convention for skipped exit - status. - -2017-01-03 Explorer09 - - * tests/Makefile.am: test: let testwrapper scripts be run by - ${SHELL}. This allows user to use a different shell if /bin/sh has problems. - The use of $SHELL (variable) to run scripts is already an Automake - convention. All shell scripts in build-aux are run by $SHELL. - -2017-01-02 Explorer09 - - * tests/options.cn, tests/tableopts.sh, - tests/testwrapper-direct.sh, tests/testwrapper.sh: test: Remove test - scripts bashisms. They now all work under a POSIX compliant sh. Specifically, 'dash' - can now be used for running "make check" tests. Note that none of these scripts has ever been using a pipe, so `set - -o pipefail` is unnecessary and removed. - -2017-01-02 Explorer09 - - * tests/testwrapper.sh: test: exit on '-1' test non-zero status. If a '-1' test program returns a non-zero status, don't go further - and compare it's (numeric) output values. This allows a '-1' test to - indicate a "skip" status or an otherwise error. (Currently no such - '-1' test would skip like this, though.) Shell syntax note: `set -e` will not exit with the syntax like this - `test $(false) = $(false);`. The exit statuses of `false` in the - example will be ignored instead. But putting the output in a - variable, such as `VAR=$(false)`, DOES exit. - -2017-01-02 Explorer09 - - * Makefile.am, src/Makefile.am: build: Fix 'make indent' target This 'make indent' target has not been working since the directories - reorganization in flex 2.6.0. Now make it work again. Note that the current indent profile breaks many styles of existing - code. The indent target should not be used until the .indent.pro - options are reviewed for desireability. - -2017-01-01 Explorer09 - - * configure.ac: build: Simplify indent program detection - -2017-01-12 Tobias Klauser - - * src/filter.c: filter: Don't emit #line if %option noline set One place emitting a #line directive to the generated header was - missed in commit 647a92b9f4 when resolving #55. Fix it to respect - gen_line_dirs as well. - -2017-01-12 Will Estes - - * po/ca.po, po/da.po, po/de.po, po/eo.po, po/es.po, po/fi.po, - po/fr.po, po/ga.po, po/hr.po, po/ko.po, po/nl.po, po/pl.po, - po/pt_BR.po, po/ro.po, po/ru.po, po/sr.po, po/sv.po, po/tr.po, - po/vi.po, po/zh_CN.po, po/zh_TW.po: translation: refresh po files - from translation project - -2017-01-10 Harald van Dijk - - * src/flex.skl: c++: Fix yyrestart(NULL) SEGV. Binding a reference to a dereferenced null pointer is invalid and - compilers optimise away the &file == 0 check. We need a real stream. yyin is available already, and yyrestart(NULL) is only supported - when yyin will not be used, so there is no harm in just passing in - that. Since we now always have a valid stream, we can skip the null - check too. Fixes #98. - -2017-01-09 luistung - - * src/scan.l: scanner: join symbol list. Removed a newline that caused a problem building the scanner in some - circumstances. Specifically: 'bad character' error when executing /bin/sh ../build-aux/ylwrap scan.l lex.yy.c scan.c -- flex - -2017-01-11 Will Estes - - * src/flex.skl: scanner: remove void cast before fprintf - -2016-12-30 Will Estes - - * NEWS: doc: update NEWS for 2.6.3 release - -2016-11-26 Explorer09 - - * configure.ac, src/Makefile.am: build: New configure option - '--disable-bootstrap'. If configure is run with '--disable-bootstrap', then stage1flex - won't be built and stage1scan.c will be generated by sed'ing scan.c. This option is intended to workaround bootstrap bugs rather than to - fix the bootstrapping issues which are proving subtler and harder to - fix than anyone would like. - -2016-11-26 Explorer09 - - * src/Makefile.am: build: "make clean" deletes stage1scan.c, - stage1flex - -2016-11-26 Explorer09 - - * configure.ac, src/Makefile.am: build: allow building libfl even - with --disable-libfl. For various reasons, we may wish to build libfl explicitly even when - configure has been run with the --disable-libfl option. This is - possible, now, via 'make -C src libfl.la'. - -2016-12-19 Alexis La Goutte - - * src/flex.skl: scanner: remove trailing whitespace in skeleton - -2016-12-01 Demi Obenour - - * src/buf.c, src/main.c, src/parse.y: scanner: Disallow, overquote - '[' and ']' in prefix - -2016-12-29 Samuel Thibault - - * src/main.c: scanner: allocate correct buffer size for m4 path. Flex did not check the length of the m4 path which could lead to a - buffer overflow in some cases. Additionally, not all platforms - believe in PATH_MAX, so stop relying on it. Fixes #138 - -2016-11-24 Will Estes - - * NEWS: doc: note no more libcompat in NEWS - -2016-11-24 Will Estes - - * lib/Makefile.am: build: explain empty lib/Makefile.am - -2016-11-20 Explorer09 - - * configure.ac: build: warn about cross compiling with *alloc - -2016-11-19 Explorer09 - - * configure.ac, lib/Makefile.am, lib/lib.c, src/Makefile.am: build: - Link $(LIBOBJS) from src/ dir, remove libcompat.la. The libcompat.la library was small and less friendly to - bootstrapping and cross compilation. Now, we will simply link - individual object files as needed, which is simpler. - -2016-11-16 Explorer09 - - * src/Makefile.am: build: Let stage1flex respect LFLAGS - -2016-11-14 Will Estes - - * NEWS: doc: describe --disable-libfl in NEWS - -2016-10-31 Explorer09 - - * configure.ac, src/Makefile.am: build: Add --disable-libfl - configure option. Disabling libfl is useful when building flex for a cross-toolchain. Fixes: GH-99 - -2016-11-09 Demi Obenour - - * src/flex.skl, tests/array_r.l: fix backwards incompatible changes - in 2.6.2. This patch addscompatibility `#defines` for all macros affected by - `%prefix`. Fixes #113. - -2016-11-08 Will Estes - - * tests/.gitignore: git: ignore quote_in_comment artifacts - -2016-11-08 Demi Obenour - - * src/scan.l, tests/Makefile.am, tests/quote_in_comment.l, - tests/quote_in_comment.txt: Fixes a major bug in Flex's own lexing - of literals. My changes caused Flex to mishandle string and character literals in - line comments. This commit fixes them. Fixes #113. - -2016-11-06 Thomas Klausner - - * configure.ac: Fix unportable test(1) operator. "==" is only supported by bash, "=" is the standard comparison - operator. - -2016-11-02 Demi Obenour - - * tests/quotes.l: Add more escaping tests - -2016-11-01 Demi Obenour - - * src/scan.l: Fix another escaping bug in non-indented verbatim section 2 code. I also did some reformatting. - -2016-10-28 Alastair Hughes - - * configure.ac: build: fix false negatives for help2man and texi2dvi HELP2MAN and TEXI2DVI (or the corresponding ac_prog variables) will - never be zero length as they fall back to the missing script; check - for the fall back and warn on that instead of always warning. - -2016-10-28 Explorer09 - - * doc/Makefile.am: doc: Don't delete flex.1 during "make distclean". flex.1 is pre-generated in release tarball. If we delete it, the - next "configure and make" on the source directory will then require - help2man unnecessarily. - -2016-10-27 Alastair Hughes - - * NEWS, doc/Makefile.am: Only regenerate the man page when required. Make the flex binary an order-only prerequisite, and add back the - prerequisites from before 7cfb440. This prevents rebuilding the man - page whenever the flex binary is rebuilt, which causes problems if - help2man is not installed and will never work when cross compiling. Fixes #108. - -2016-10-26 Will Estes - - * NEWS, src/Makefile.am: build: no longer build PIC version of - libfl. The PIC version of libfl was not being built correctly. From the - lack of bug reports around this problem, we conclude that the PIC - version of libfl is not used and so we drop it from the build build - targets for flex. - -2016-10-25 Explorer09 - - * README.md: doc: README.md formatting fixes * Wrap everything in the raw document in 72 char per line limit. * Proper casing for terms "Git" and "GitHub" (don't try to look - lazy). * Add unordered list marks when needed. * Say `configure && make && make install` and quoted for fixed-width font. Signed-off-by: Kang-Che Sung - -2016-10-25 Will Estes - - * NEWS, configure.ac: build: version 2.6.3 begins - 2016-10-24 Will Estes * NEWS: doc: mark 2.6.2 release date diff --git a/Makefile.am b/Makefile.am index 638c549..1540bb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,7 @@ # to DEFS. ACLOCAL_AMFLAGS = -I m4 +indent = @INDENT@ dist_doc_DATA = \ AUTHORS \ @@ -42,6 +43,7 @@ EXTRA_DIST = \ autogen.sh SUBDIRS = \ + lib \ src \ doc \ examples \ @@ -56,11 +58,8 @@ ChangeLog: $(srcdir)/tools/git2cl $(srcdir)/tools/git2cl > $@ \ ; fi -indent: - cd src && $(MAKE) $(AM_MAKEFLAGS) indent - install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(LN_S) -f flex$(EXEEXT) flex++$(EXEEXT) -.PHONY: ChangeLog indent +.PHONY: ChangeLog tags indent diff --git a/Makefile.in b/Makefile.in index 8c41885..f6e6617 100644 --- a/Makefile.in +++ b/Makefile.in @@ -120,15 +120,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -286,17 +285,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -328,14 +322,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -387,7 +379,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -437,6 +428,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 +indent = @INDENT@ dist_doc_DATA = \ AUTHORS \ COPYING \ @@ -449,6 +441,7 @@ EXTRA_DIST = \ autogen.sh SUBDIRS = \ + lib \ src \ doc \ examples \ @@ -961,14 +954,11 @@ ChangeLog: $(srcdir)/tools/git2cl $(srcdir)/tools/git2cl > $@ \ ; fi -indent: - cd src && $(MAKE) $(AM_MAKEFLAGS) indent - install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(LN_S) -f flex$(EXEEXT) flex++$(EXEEXT) -.PHONY: ChangeLog indent +.PHONY: ChangeLog tags indent # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/NEWS b/NEWS index 85d900b..d0ca2d6 100644 --- a/NEWS +++ b/NEWS @@ -1,104 +1,7 @@ -flex NEWS +This is the file NEWS for the flex package. It records user -visible +changes between releases of flex. -* Noteworthy changes in release 2.6.4 (2017-05-06) [stable] - -** build - -*** The indent target now knows about flex's new (as of 2.6.0) - layout. The indent rules it would apply are not correct and do - need to be fixed. - -*** The files included in the flex distribution are now built by the - version of flex that is included in the distribution. - -*** The configure script has a better idea of which headers are - required to build flex. It will also error when missing functions - are detected. - -*** We have lowered the versions of automake and gettext that - configure.ac lists as required for building flex. In autogen.sh, - we now check for how to call libtoolize and use what we find in - the rest of the script. - -*** Since files in lib/ are picked up as needed by src/, we no longer - generate a Makefile for that directory. - -*** Flex can be cross compiled. - -** documentation - -*** Some typos were removed from the manual. - -** scanner - -*** Some minor performance enhancements. - -*** We honor user defined yy_* macros again. We are also more careful - to not leak macro definitions into header files. - -*** A number of portability fixes were introduced so building flex is - more reliable on more platforms. Additionally, outdated function - calls were removed. - -*** When building the flex executable itself, %# comments from - flex.skl are removed when generating the C source code array. This - reduces the size of flex. - -** test suite - -*** All scripts in the test suite are now run by $(SHELL) and the - needed portability fixes have been included. - -*** Test suite dependencies are handled much better. This only matters - if you are actively developing flex or its test suite. - -*** Tests that depend on platform dependent features now properly skip - when those platforms are not present. - -*** When running "make check", you can now pas V=0 to silence more of - the build. This is useful when you're less connncerned about the - details of building and linking the test programs themselves. - -* Noteworthy changes in release 2.6.3 (2016-12-30) [stable] - -** scanner - -*** several bug fixes resolved problems introduced in recent flex - versions regarding processing of comments, literals and various - quoting scenarios. - -*** If the path to m4 was sufficiently long, a buffer overflow could - occur. This has been resolved. The fix also removes dependence on - the constant PATH_MAX. - -** build - -*** A new configure option --disable-bootstrap changes the behavior of - the build system when building flex. The default - "--enable-bootstrap" behavior is to build flex, then to use that - flex to build flex again. With --disable-bootstrap, the scanner is - simply built by sedding the scanner source. This is friendlier to - cross compilation. - -*** The compatibility functions in lib/ are no longer built as a - library. Instead, they are built as $(LIBOBJ) objects. This is - simpler and friendlier to cross compilation. - -*** It is now possible to build flex without building the accompanying - libfl. This is friendlier to cross compilation. See the - --disable-libfl option to configure. Resolves #99. - -*** the PIC version of libfl was not correctly built. It is no longer - included in the build/installation targets of flex since it was - unused. - -*** the distributed man page is only rebuilt when the relevant source - files change or when the binary doesn't exist. In particular, this - is friendlier to cross compilation. Resolves #108 - -** test - -*** the shell scripts in the test suite are more portable across different shell implementations. +See the file COPYING for copying conditions. * version 2.6.2 released 2016-10-24 @@ -738,8 +641,6 @@ But the inverse is still true See the file ONEWS for changes in earlier releases. -See the file COPYING for copying conditions. - Local Variables: mode: text mode: outline-minor diff --git a/README.md b/README.md index b979b01..cb5e8b5 100644 --- a/README.md +++ b/README.md @@ -3,61 +3,58 @@ This is flex, the fast lexical analyzer generator. flex is a tool for generating scanners: programs which recognize lexical patterns in text. -The flex codebase is kept in -[Git on GitHub.](https://github.com/westes/flex) +The flex codebase is kept in [git on github.](https://github.com/westes/flex) -Use GitHub's [issues](https://github.com/westes/flex/issues) and -[pull request](https://github.com/westes/flex) features to file bugs -and submit patches. +Use github's [issues](https://github.com/westes/flex/issues) and [pull request](https://github.com/westes/flex) features to file bugs and submit patches. There are several mailing lists available as well: -* flex-announce@lists.sourceforge.net - where posts will be made - announcing new releases of flex. -* flex-help@lists.sourceforge.net - where you can post questions about - using flex -* flex-devel@lists.sourceforge.net - where you can discuss development - of flex itself +flex-announce@lists.sourceforge.net - where posts will be made +announcing new releases of flex. + +flex-help@lists.sourceforge.net - where you can post questions about +using flex + +flex-devel@lists.sourceforge.net - where you can discuss development of +flex itself Find information on subscribing to the mailing lists at: http://sourceforge.net/mail/?group_id=97492 -The flex distribution contains the following files which may be of -interest: - -* README - This file. -* NEWS - current version number and list of user-visible changes. -* INSTALL - basic installation information. -* ABOUT-NLS - description of internationalization support in flex. -* COPYING - flex's copyright and license. -* doc/ - user documentation. -* examples/ - containing examples of some possible flex scanners and a - few other things. See the file examples/README for more - details. -* tests/ - regression tests. See TESTS/README for details. -* po/ - internationalization support files. +The flex distribution contains the following files which may be of interest: + +README - This file. +NEWS - current version number and list of user-visible changes. +INSTALL - basic installation information. +ABOUT-NLS - description of internationalization support in flex. +COPYING - flex's copyright and license. +doc/ - user documentation. +examples/ - containing examples of some possible flex scanners and a + few other things. See the file examples/README for more details. +tests/ - regression tests. See TESTS/README for details. +po/ - internationalization support files. You need the following tools to build flex from the maintainer's repository: -* compiler suite - flex is built with gcc -* bash, or a good Bourne-style shell -* m4 - m4 -p needs to work; GNU m4 and a few others are suitable -* GNU bison; to generate parse.c from parse.y -* autoconf; for handling the build system -* automake; for Makefile generation -* gettext; for i18n support -* help2man; to generate the flex man page -* tar, gzip, lzip, etc.; for packaging of the source distribution -* GNU texinfo; to build and test the flex manual. Note that if you want - to build the dvi/ps/pdf versions of the documentation you will need - texi2dvi and related programs, along with a sufficiently powerful - implementation of TeX to process them. See your operating system - documentation for how to achieve this. The printable versions of the - manual are not built unless specifically requested, but the targets - are included by automake. -* GNU indent; for indenting the flex source the way we want it done +compiler suite - flex is built with gcc +bash, or a good Bourne-style shell +m4 - m4 -p needs to work; GNU m4 and a few others are suitable +GNU bison; to generate parse.c from parse.y +autoconf; for handling the build system +automake; for Makefile generation +gettext; for i18n support +help2man; to generate the flex man page +tar, gzip, etc.; for packaging of the source distribution +GNU texinfo; to build and test the flex manual. Note that if you want +to build the dvi/ps/pdf versions of the documentation you will need +texi2dvi and related programs, along with a sufficiently powerful +implementation of \TeX to process them. See your operating system +documentation for how to achieve this. The printable versions of the +manual are not built unless specifically requested, but the targets +are included by automake. +GNU indent; for indenting the flex source the way we want it done In cases where the versions of the above tools matter, the file configure.ac will specify the minimum required versions. @@ -65,20 +62,14 @@ configure.ac will specify the minimum required versions. Once you have all the necessary tools installed, life becomes simple. To prepare the flex tree for building, run the script: -```bash -./autogen.sh -``` +$ ./autogen.sh in the top level of the flex source tree. - This script calls the various tools needed to get flex ready for the GNU-style configure script to be able to work. -From this point on, building flex follows the usual routine: - -```bash -configure && make && make install -``` +From this point on, building flex follows the usual configure, make, +make install routine. This file is part of flex. diff --git a/aclocal.m4 b/aclocal.m4 index 1b6f735..1a4e650 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -752,38 +752,6 @@ else fi ]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for 'mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl FIXME we are no longer going to remove this! adjust warning -dnl FIXME message accordingly. -AC_DIAGNOSE([obsolete], -[$0: this macro is deprecated, and will soon be removed. -You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, -and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- # Copyright (C) 2001-2014 Free Software Foundation, Inc. @@ -1200,7 +1168,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/ax_prog_cc_for_build.m4]) m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) m4_include([m4/intlmacosx.m4]) diff --git a/autogen.sh b/autogen.sh index 6802e9f..46611bf 100755 --- a/autogen.sh +++ b/autogen.sh @@ -24,28 +24,10 @@ # If you see no configure script, then run ./autogen.sh to create it # and procede with the "normal" build procedures. -# use LIBTOOLIZE, if set -LIBTOOLIZE_ORIG="$LIBTOOLIZE"; -if test "x$LIBTOOLIZE" = "x"; then LIBTOOLIZE=libtoolize; fi - -# test libtoolize -$LIBTOOLIZE --version 2>/dev/null -if test "$?" -ne 0; then - LIBTOOLIZE=glibtoolize - $LIBTOOLIZE --version 2>/dev/null - if test "$?" -ne 0; then - echo "error: libtoolize not working, re-run with LIBTOOLIZE=/path/to/libtoolize" - echo " LIBTOOLIZE is currently \"$LIBTOOLIZE_ORIG\"" - exit 1 - fi -fi - #if we pretend to have a ChangeLog, then automake is less #worried. (Don't worry, we *do* have a ChangeLog, we just need the #Makefile first.) -if ! test -f ChangeLog; then - touch ChangeLog -fi -"$LIBTOOLIZE" --install --force +touch ChangeLog +libtoolize --install --force || glibtoolize --install --force autoreconf --install --force diff --git a/build-aux/config.rpath b/build-aux/config.rpath index 17298f2..ab6fd99 100755 --- a/build-aux/config.rpath +++ b/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2010 Free Software Foundation, Inc. +# Copyright 1996-2014 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -25,7 +25,7 @@ # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -57,13 +57,6 @@ else aix*) wl='-Wl,' ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) @@ -72,9 +65,7 @@ else irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - newsos6) - ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in ecc*) wl='-Wl,' @@ -85,17 +76,26 @@ else lf95*) wl='-Wl,' ;; - pgcc | pgf77 | pgf90) + nagfor*) + wl='-Wl,-Wl,,' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; *Sun\ C*) wl='-Wl,' ;; @@ -103,13 +103,24 @@ else ;; esac ;; + newsos6) + ;; + *nto* | *qnx*) + ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; rdos*) ;; solaris*) - wl='-Wl,' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + wl='-Qoption ld ' + ;; + *) + wl='-Wl,' + ;; + esac ;; sunos4*) wl='-Qoption ld ' @@ -171,15 +182,14 @@ if test "$with_gnu_ld" = yes; then fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -198,11 +208,13 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; + haiku*) + ;; interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - gnu* | linux* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -325,10 +337,14 @@ else fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) ;; @@ -342,24 +358,15 @@ else ;; darwin* | rhapsody*) hardcode_direct=no - if test "$GCC" = yes ; then + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then : else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -420,6 +427,8 @@ else hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; + *nto* | *qnx*) + ;; openbsd*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes @@ -515,7 +524,12 @@ case "$host_os" in library_names_spec='$libname$shrext' ;; amigaos*) - library_names_spec='$libname.a' + case "$host_cpu" in + powerpc*) + library_names_spec='$libname$shrext' ;; + m68k) + library_names_spec='$libname.a' ;; + esac ;; beos*) library_names_spec='$libname$shrext' @@ -534,8 +548,6 @@ case "$host_os" in dgux*) library_names_spec='$libname$shrext' ;; - freebsd1*) - ;; freebsd* | dragonfly*) case "$host_os" in freebsd[123]*) @@ -547,6 +559,9 @@ case "$host_os" in gnu*) library_names_spec='$libname$shrext' ;; + haiku*) + library_names_spec='$libname$shrext' + ;; hpux9* | hpux10* | hpux11*) case $host_cpu in ia64*) @@ -582,7 +597,7 @@ case "$host_os" in ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) library_names_spec='$libname$shrext' ;; knetbsd*-gnu) @@ -594,7 +609,7 @@ case "$host_os" in newsos6) library_names_spec='$libname$shrext' ;; - nto-qnx*) + *nto* | *qnx*) library_names_spec='$libname$shrext' ;; openbsd*) @@ -625,6 +640,9 @@ case "$host_os" in sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) library_names_spec='$libname$shrext' ;; + tpf*) + library_names_spec='$libname$shrext' + ;; uts4*) library_names_spec='$libname$shrext' ;; diff --git a/configure b/configure index d88c47c..5bbbede 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for the fast lexical analyser generator 2.6.4. +# Generated by GNU Autoconf 2.69 for the fast lexical analyser generator 2.6.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='the fast lexical analyser generator' PACKAGE_TARNAME='flex' -PACKAGE_VERSION='2.6.4' -PACKAGE_STRING='the fast lexical analyser generator 2.6.4' +PACKAGE_VERSION='2.6.2' +PACKAGE_STRING='the fast lexical analyser generator 2.6.2' PACKAGE_BUGREPORT='flex-help@lists.sourceforge.net' PACKAGE_URL='' @@ -639,17 +639,13 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS ALLOCA -LIBPTHREAD +want_pthread_FALSE +want_pthread_TRUE INDENT M4 TEXI2DVI HELP2MAN -CROSS_FALSE -CROSS_TRUE -ENABLE_BOOTSTRAP_FALSE -ENABLE_BOOTSTRAP_TRUE -ENABLE_LIBFL_FALSE -ENABLE_LIBFL_TRUE +BISON WARNINGFLAGS am__fastdepCXX_FALSE am__fastdepCXX_TRUE @@ -658,19 +654,9 @@ CXXCPP ac_ct_CXX CXXFLAGS CXX -LDFLAGS_FOR_BUILD -CPPFLAGS_FOR_BUILD -CFLAGS_FOR_BUILD -BUILD_OBJEXT -BUILD_EXEEXT -CPP_FOR_BUILD -ac_ct_CC_FOR_BUILD -CC_FOR_BUILD LEXLIB LEX_OUTPUT_ROOT LEX -HAVE_BISON_FALSE -HAVE_BISON_TRUE YFLAGS YACC POSUB @@ -823,8 +809,6 @@ enable_rpath with_libiconv_prefix with_libintl_prefix enable_warnings -enable_libfl -enable_bootstrap ' ac_precious_vars='build_alias host_alias @@ -1392,7 +1376,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures the fast lexical analyser generator 2.6.4 to adapt to many kinds of systems. +\`configure' configures the fast lexical analyser generator 2.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1463,7 +1447,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of the fast lexical analyser generator 2.6.4:";; + short | recursive ) echo "Configuration of the fast lexical analyser generator 2.6.2:";; esac cat <<\_ACEOF @@ -1486,8 +1470,6 @@ Optional Features: --disable-rpath do not hardcode runtime library paths --enable-warnings enable a bunch of compiler warning flags (defaults to GCC warning flags). - --disable-libfl do not build -lfl runtime support library - --disable-bootstrap don't perform a bootstrap when building flex Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1500,7 +1482,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib @@ -1593,7 +1575,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -the fast lexical analyser generator configure 2.6.4 +the fast lexical analyser generator configure 2.6.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2137,7 +2119,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by the fast lexical analyser generator $as_me 2.6.4, which was +It was created by the fast lexical analyser generator $as_me 2.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -11998,7 +11980,7 @@ fi # Define the identity of the package. PACKAGE='flex' - VERSION='2.6.4' + VERSION='2.6.2' cat >>confdefs.h <<_ACEOF @@ -12229,13 +12211,6 @@ SHARED_VERSION_INFO="2:0:0" # checks for programs -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -12251,7 +12226,7 @@ $as_echo "$USE_NLS" >&6; } - GETTEXT_MACRO_VERSION=0.18 + GETTEXT_MACRO_VERSION=0.19 @@ -12259,15 +12234,14 @@ $as_echo "$USE_NLS" >&6; } # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -12382,15 +12356,14 @@ fi # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -12460,15 +12433,14 @@ fi # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -12552,6 +12524,7 @@ fi prefix="$acl_save_prefix" + # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -12562,21 +12535,21 @@ fi # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -12586,11 +12559,11 @@ $as_echo_n "checking for ld used by GCC... " >&6; } esac case $ac_prog in # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) + [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -12615,23 +12588,26 @@ if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 &6; } if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 @@ -12839,7 +12817,7 @@ fi done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -13368,15 +13346,19 @@ if eval \${$gt_func_gnugettext_libc+:} false; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include $gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ; return 0; } @@ -13434,14 +13416,16 @@ else am_cv_lib_iconv=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include #include + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -13456,14 +13440,16 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include #include + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -13487,15 +13473,17 @@ if ${am_cv_func_iconv_works+:} false; then : $as_echo_n "(cached) " >&6 else - am_save_LIBS="$LIBS" + am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi if test "$cross_compiling" = yes; then : - case "$host_os" in + + case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; esac + else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13504,6 +13492,7 @@ else #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -13520,7 +13509,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); } } /* Test against Solaris 10 bug: Failures are not distinguishable from @@ -13539,7 +13529,27 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -13558,7 +13568,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -13572,8 +13583,8 @@ int main () && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; + result |= 16; + return result; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : @@ -13690,7 +13701,7 @@ fi done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -14088,6 +14099,7 @@ else LIBS="$LIBS $LIBINTL" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include $gt_revision_test_code extern int _nl_msg_cat_cntr; @@ -14096,11 +14108,14 @@ extern "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } @@ -14116,6 +14131,7 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include $gt_revision_test_code extern int _nl_msg_cat_cntr; @@ -14124,19 +14140,22 @@ extern "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" fi rm -f core conftest.err conftest.$ac_objext \ @@ -14298,21 +14317,6 @@ fi done test -n "$YACC" || YACC="yacc" -if test "$YACC" != 'bison -y'; then : - - YACC="\${top_srcdir}/build-aux/missing bison -y" - { $as_echo "$as_me:${as_lineno-$LINENO}: no bison program found: only required for maintainers" >&5 -$as_echo "$as_me: no bison program found: only required for maintainers" >&6;} - -fi - if test "$YACC" = 'bison -y'; then - HAVE_BISON_TRUE= - HAVE_BISON_FALSE='#' -else - HAVE_BISON_TRUE='#' - HAVE_BISON_FALSE= -fi - for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -15073,29 +15077,27 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -save_cross_compiling=$cross_compiling -save_ac_tool_prefix=$ac_tool_prefix -cross_compiling=no -ac_tool_prefix= - -ac_ext=c -ac_build_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' -ac_build_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -ac_build_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +if test -z "$CXX"; then + if test -n "$CCC"; then + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_FOR_BUILD+:} false; then : +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC_FOR_BUILD"; then - ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -15104,7 +15106,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC_FOR_BUILD="${ac_tool_prefix}gcc" + ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15114,28 +15116,32 @@ IFS=$as_save_IFS fi fi -CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD -if test -n "$CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 -$as_echo "$CC_FOR_BUILD" >&6; } +CXX=$ac_cv_prog_CXX +if test -n "$CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + test -n "$CXX" && break + done fi -if test -z "$ac_cv_prog_CC_FOR_BUILD"; then - ac_ct_CC_FOR_BUILD=$CC_FOR_BUILD - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 +if test -z "$CXX"; then + ac_ct_CXX=$CXX + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC_FOR_BUILD+:} false; then : +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_CC_FOR_BUILD"; then - ac_cv_prog_ac_ct_CC_FOR_BUILD="$ac_ct_CC_FOR_BUILD" # Let the user override the test. + if test -n "$ac_ct_CXX"; then + ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -15144,7 +15150,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC_FOR_BUILD="gcc" + ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15154,853 +15160,99 @@ IFS=$as_save_IFS fi fi -ac_ct_CC_FOR_BUILD=$ac_cv_prog_ac_ct_CC_FOR_BUILD -if test -n "$ac_ct_CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC_FOR_BUILD" >&5 -$as_echo "$ac_ct_CC_FOR_BUILD" >&6; } +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX +if test -n "$ac_ct_CXX"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_CC_FOR_BUILD" = x; then - CC_FOR_BUILD="" + + test -n "$ac_ct_CXX" && break +done + + if test "x$ac_ct_CXX" = x; then + CXX="g++" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with build triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with build triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - CC_FOR_BUILD=$ac_ct_CC_FOR_BUILD + CXX=$ac_ct_CXX fi -else - CC_FOR_BUILD="$ac_cv_prog_CC_FOR_BUILD" fi -if test -z "$CC_FOR_BUILD"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_FOR_BUILD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC_FOR_BUILD"; then - ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC_FOR_BUILD="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 fi +fi +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } done - done -IFS=$as_save_IFS -fi -fi -CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD -if test -n "$CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 -$as_echo "$CC_FOR_BUILD" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ +#ifndef __GNUC__ + choke me +#endif - fi -fi -if test -z "$CC_FOR_BUILD"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_FOR_BUILD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC_FOR_BUILD"; then - ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ac_compiler_gnu=yes else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC_FOR_BUILD="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC_FOR_BUILD - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC_FOR_BUILD to just the basename; use the full file name. - shift - ac_cv_prog_CC_FOR_BUILD="$as_dir/$ac_word${1+' '}$@" - fi -fi + ac_compiler_gnu=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu + fi -CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD -if test -n "$CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 -$as_echo "$CC_FOR_BUILD" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - + GXX= fi -if test -z "$CC_FOR_BUILD"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_FOR_BUILD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC_FOR_BUILD"; then - ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC_FOR_BUILD="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD -if test -n "$CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 -$as_echo "$CC_FOR_BUILD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC_FOR_BUILD" && break - done -fi -if test -z "$CC_FOR_BUILD"; then - ac_ct_CC_FOR_BUILD=$CC_FOR_BUILD - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC_FOR_BUILD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC_FOR_BUILD"; then - ac_cv_prog_ac_ct_CC_FOR_BUILD="$ac_ct_CC_FOR_BUILD" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC_FOR_BUILD="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC_FOR_BUILD=$ac_cv_prog_ac_ct_CC_FOR_BUILD -if test -n "$ac_ct_CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC_FOR_BUILD" >&5 -$as_echo "$ac_ct_CC_FOR_BUILD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC_FOR_BUILD" && break -done - - if test "x$ac_ct_CC_FOR_BUILD" = x; then - CC_FOR_BUILD="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with build triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with build triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC_FOR_BUILD=$ac_ct_CC_FOR_BUILD - fi -fi - -fi - - -test -z "$CC_FOR_BUILD" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_build_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_build_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS_FOR_BUILD+set} -ac_save_CFLAGS=$CFLAGS_FOR_BUILD -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_FOR_BUILD accepts -g" >&5 -$as_echo_n "checking whether $CC_FOR_BUILD accepts -g... " >&6; } -if ${ac_cv_build_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_build_prog_cc_g=no - CFLAGS_FOR_BUILD="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_build_prog_cc_g=yes -else - CFLAGS_FOR_BUILD="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS_FOR_BUILD="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_build_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_build_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_build_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_build_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build_prog_cc_g" >&5 -$as_echo "$ac_cv_build_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS_FOR_BUILD=$ac_save_CFLAGS -elif test $ac_cv_build_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS_FOR_BUILD="-g -O2" - else - CFLAGS_FOR_BUILD="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS_FOR_BUILD="-O2" - else - CFLAGS_FOR_BUILD= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC_FOR_BUILD option to accept ISO C89" >&5 -$as_echo_n "checking for $CC_FOR_BUILD option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC_FOR_BUILD -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC_FOR_BUILD="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_build_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC_FOR_BUILD=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC_FOR_BUILD="$CC_FOR_BUILD $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_build_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' -ac_build_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -ac_build_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -ac_ext=c -ac_build_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' -ac_build_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -ac_build_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC_FOR_BUILD understands -c and -o together" >&5 -$as_echo_n "checking whether $CC_FOR_BUILD understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC_FOR_BUILD -c conftest.$ac_ext -o conftest2.$ac_build_objext" >&5 - ($CC_FOR_BUILD -c conftest.$ac_ext -o conftest2.$ac_build_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_build_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC_FOR_BUILD="$am_aux_dir/compile $CC_FOR_BUILD" -fi -ac_ext=c -ac_build_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' -ac_build_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -ac_build_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_ext=c -ac_build_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' -ac_build_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -ac_build_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP_FOR_BUILD" && test -d "$CPP_FOR_BUILD"; then - CPP_FOR_BUILD= -fi -if test -z "$CPP_FOR_BUILD"; then - if ${ac_cv_build_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP_FOR_BUILD in "$CC_FOR_BUILD -E" "$CC_FOR_BUILD -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_build_prog_CPP=$CPP_FOR_BUILD - -fi - CPP_FOR_BUILD=$ac_cv_build_prog_CPP -else - ac_cv_build_prog_CPP=$CPP_FOR_BUILD -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP_FOR_BUILD" >&5 -$as_echo "$CPP_FOR_BUILD" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP_FOR_BUILD\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_build_cpp='$CPP_FOR_BUILD $CPPFLAGS_FOR_BUILD' -ac_build_compile='$CC_FOR_BUILD -c $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD conftest.$ac_ext >&5' -ac_build_link='$CC_FOR_BUILD -o conftest$ac_build_exeext $CFLAGS_FOR_BUILD $CPPFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -ac_tool_prefix=$save_ac_tool_prefix -cross_compiling=$save_cross_compiling - - -BUILD_EXEEXT=$ac_build_exeext -BUILD_OBJEXT=$ac_build_objext - -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CXX" && break -done - - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi -fi -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : +ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_save_CXXFLAGS=$CXXFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -19602,7 +18854,7 @@ done # Check whether --enable-warnings was given. if test "${enable_warnings+set}" = set; then : - enableval=$enable_warnings; if test "x$GCC" = xyes; then : + enableval=$enable_warnings; if test "x$GCC" == xyes; then : : ${WARNINGFLAGS="-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wold-style-definition -Wredundant-decls -Wconversion -Wno-unused-but-set-variable"} fi fi @@ -19610,50 +18862,57 @@ fi -# Check whether --enable-libfl was given. -if test "${enable_libfl+set}" = set; then : - enableval=$enable_libfl; +# Extract the first word of "bison", so it can be a program name with args. +set dummy bison; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_BISON+:} false; then : + $as_echo_n "(cached) " >&6 else - enable_libfl=yes -fi + case $BISON in + [\\/]* | ?:[\\/]*) + ac_cv_path_BISON="$BISON" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - if test "x$enable_libfl" = xyes; then - ENABLE_LIBFL_TRUE= - ENABLE_LIBFL_FALSE='#' + test -z "$ac_cv_path_BISON" && ac_cv_path_BISON="no" + ;; +esac +fi +BISON=$ac_cv_path_BISON +if test -n "$BISON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 +$as_echo "$BISON" >&6; } else - ENABLE_LIBFL_TRUE='#' - ENABLE_LIBFL_FALSE= + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# --disable-bootstrap is intended only to workaround problems with bootstrap -# (e.g. when cross-compiling flex or when bootstrapping has bugs). -# Ideally we should be able to bootstrap even when cross-compiling. -# Check whether --enable-bootstrap was given. -if test "${enable_bootstrap+set}" = set; then : - enableval=$enable_bootstrap; -else - enable_bootstrap=yes -fi +if test "$BISON" != no; then : - if test "x$enable_bootstrap" = xyes; then - ENABLE_BOOTSTRAP_TRUE= - ENABLE_BOOTSTRAP_FALSE='#' else - ENABLE_BOOTSTRAP_TRUE='#' - ENABLE_BOOTSTRAP_FALSE= -fi + BISON=\${top_srcdir}/build-aux/missing bison + { $as_echo "$as_me:${as_lineno-$LINENO}: no bison program found: only required for maintainers" >&5 +$as_echo "$as_me: no bison program found: only required for maintainers" >&6;} - if test "x$cross_compiling" = xyes; then - CROSS_TRUE= - CROSS_FALSE='#' -else - CROSS_TRUE='#' - CROSS_FALSE= fi - # Extract the first word of "help2man", so it can be a program name with args. set dummy help2man; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -19695,9 +18954,11 @@ $as_echo "no" >&6; } fi - if test "$HELP2MAN" = "\${top_srcdir}/build-aux/missing help2man"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: help2man: program not found: building man page will not work" >&5 -$as_echo "$as_me: WARNING: help2man: program not found: building man page will not work" >&2;} + if test -z "$ac_cv_path_HELP2MAN" ; then : + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: program not found: help2man: building man page will not work" >&5 +$as_echo "$as_me: WARNING: program not found: help2man: building man page will not work" >&2;} fi @@ -19747,7 +19008,9 @@ fi done test -n "$TEXI2DVI" || TEXI2DVI="\${top_srcdir}/build-aux/missing texi2dvi" - if test "$TEXI2DVI" = "\${top_srcdir}/build-aux/missing texi2dvi"; then : + if test -z "$ac_cv_path_TEXI2DVI" ; then : + +else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: texi2dvi: program not found: building pdf version of manual will not work" >&5 $as_echo "$as_me: WARNING: texi2dvi: program not found: building pdf version of manual will not work" >&2;} @@ -19825,7 +19088,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_INDENT" && ac_cv_path_INDENT="\${top_srcdir}/build-aux/missing indent" + test -z "$ac_cv_path_INDENT" && ac_cv_path_INDENT="indent" ;; esac fi @@ -19839,38 +19102,27 @@ $as_echo "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $INDENT is GNU indent" >&5 +# if INDENT is set to 'indent' then we didn't find indent +if test "$INDENT" != indent ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $INDENT is GNU indent" >&5 $as_echo_n "checking if $INDENT is GNU indent... " >&6; } - if $INDENT --version 2>/dev/null | head -n 1 | grep "GNU indent" >/dev/null; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $INDENT does not appear to be GNU indent; 'make indent' may not function properly" >&5 -$as_echo "$as_me: WARNING: $INDENT does not appear to be GNU indent; 'make indent' may not function properly" >&2;} - -fi - -# checks for headers - -for ac_header in regex.h strings.h sys/stat.h sys/wait.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $INDENT does not appear to be GNU indent." >&5 +$as_echo "$as_me: WARNING: $INDENT does not appear to be GNU indent." >&2;} + fi else - as_fn_error $? "required header not found on your system" "$LINENO" 5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no indent program found: make indent target will not function" >&5 +$as_echo "$as_me: WARNING: no indent program found: make indent target will not function" >&2;} fi -done - +# checks for headers -for ac_header in inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h +for ac_header in inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h regex.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -19890,7 +19142,6 @@ done # all we need is the preprocessor symbol defined since we don't need # LIBS to include libpthread for building flex. -LIBPTHREAD='' { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5 $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; } if ${ac_cv_lib_pthread_pthread_mutex_lock+:} false; then : @@ -19928,28 +19179,37 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_lock" >&5 $as_echo "$ac_cv_lib_pthread_pthread_mutex_lock" >&6; } if test "x$ac_cv_lib_pthread_pthread_mutex_lock" = xyes; then : - for ac_header in pthread.h + +$as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h + +else + +$as_echo "#define HAVE_LIBPTHREAD 0" >>confdefs.h + + +fi + +for ac_header in pthread.h do : ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default" if test "x$ac_cv_header_pthread_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_H 1 _ACEOF - LIBPTHREAD=-lpthread -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pthread tests will be skipped" >&5 -$as_echo "$as_me: WARNING: pthread tests will be skipped" >&2;} + fi done + if test x$ac_cv_lib_pthread_pthread_mutex_lock = xyes; then + want_pthread_TRUE= + want_pthread_FALSE='#' else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pthread tests will be skipped" >&5 -$as_echo "$as_me: WARNING: pthread tests will be skipped" >&2;} + want_pthread_TRUE='#' + want_pthread_FALSE= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for log10 in -lm" >&5 $as_echo_n "checking for log10 in -lm... " >&6; } if ${ac_cv_lib_m_log10+:} false; then : @@ -20663,10 +19923,6 @@ $as_echo "#define malloc rpl_malloc" >>confdefs.h fi -if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_malloc_0_nonnull guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_malloc_0_nonnull guessed because of cross compilation" >&2;} -fi for ac_header in stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" @@ -20734,12 +19990,8 @@ $as_echo "#define realloc rpl_realloc" >>confdefs.h fi -if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_realloc_0_nonnull guessed because of cross compilation" >&5 -$as_echo "$as_me: WARNING: result $ac_cv_func_realloc_0_nonnull guessed because of cross compilation" >&2;} -fi -for ac_func in dup2 memset regcomp strcasecmp strchr strdup strtol +for ac_func in dup2 memset pow regcomp setlocale strchr strdup strtol do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -20748,27 +20000,26 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -else - as_fn_error $? "required library function not found on your system" "$LINENO" 5 fi done -# Optional library functions -for ac_func in pow setlocale reallocarray -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" +if test "x$ac_cv_func_reallocarray" = xyes; then : + $as_echo "#define HAVE_REALLOCARRAY 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" reallocarray.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS reallocarray.$ac_objext" + ;; +esac fi -done -ac_config_files="$ac_config_files Makefile doc/Makefile examples/Makefile examples/fastwc/Makefile examples/manual/Makefile po/Makefile.in src/Makefile tools/Makefile tests/Makefile" + +ac_config_files="$ac_config_files Makefile doc/Makefile examples/Makefile examples/fastwc/Makefile examples/manual/Makefile lib/Makefile po/Makefile.in src/Makefile tools/Makefile tests/Makefile" cat >confcache <<\_ACEOF @@ -20904,24 +20155,12 @@ else am__EXEEXT_FALSE= fi -if test -z "${HAVE_BISON_TRUE}" && test -z "${HAVE_BISON_FALSE}"; then - as_fn_error $? "conditional \"HAVE_BISON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_LIBFL_TRUE}" && test -z "${ENABLE_LIBFL_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_LIBFL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${ENABLE_BOOTSTRAP_TRUE}" && test -z "${ENABLE_BOOTSTRAP_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_BOOTSTRAP\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${CROSS_TRUE}" && test -z "${CROSS_FALSE}"; then - as_fn_error $? "conditional \"CROSS\" was never defined. +if test -z "${want_pthread_TRUE}" && test -z "${want_pthread_FALSE}"; then + as_fn_error $? "conditional \"want_pthread\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -21321,7 +20560,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by the fast lexical analyser generator $as_me 2.6.4, which was +This file was extended by the fast lexical analyser generator $as_me 2.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21387,7 +20626,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -the fast lexical analyser generator config.status 2.6.4 +the fast lexical analyser generator config.status 2.6.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -21913,6 +21152,7 @@ do "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "examples/fastwc/Makefile") CONFIG_FILES="$CONFIG_FILES examples/fastwc/Makefile" ;; "examples/manual/Makefile") CONFIG_FILES="$CONFIG_FILES examples/manual/Makefile" ;; + "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; @@ -23325,7 +22565,7 @@ $as_echo X"$file" | case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -23341,7 +22581,8 @@ $as_echo X"$file" | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -23352,12 +22593,12 @@ $as_echo X"$file" | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES diff --git a/configure.ac b/configure.ac index 55e774b..c786752 100644 --- a/configure.ac +++ b/configure.ac @@ -24,11 +24,11 @@ # autoconf requirements and initialization -AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex]) +AC_INIT([the fast lexical analyser generator],[2.6.2],[flex-help@lists.sourceforge.net],[flex]) AC_CONFIG_SRCDIR([src/scan.l]) AC_CONFIG_AUX_DIR([build-aux]) LT_INIT -AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects]) +AM_INIT_AUTOMAKE([-Wno-portability foreign check-news std-options dist-lzip parallel-tests 1.14.1]) AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_LIBOBJ_DIR([lib]) AC_CONFIG_MACRO_DIR([m4]) @@ -38,16 +38,10 @@ AC_SUBST(SHARED_VERSION_INFO) # checks for programs AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18]) +AM_GNU_GETTEXT_VERSION([0.19]) AC_PROG_YACC -AS_IF([test "$YACC" != 'bison -y'], [ - YACC="\${top_srcdir}/build-aux/missing bison -y" - AC_MSG_NOTICE(no bison program found: only required for maintainers) - ]) -AM_CONDITIONAL([HAVE_BISON], [test "$YACC" = 'bison -y']) AM_PROG_LEX AC_PROG_CC -AX_PROG_CC_FOR_BUILD AC_PROG_CXX AM_PROG_CC_C_O AC_PROG_LN_S @@ -61,35 +55,24 @@ AC_PROG_INSTALL AC_ARG_ENABLE([warnings], [AS_HELP_STRING([--enable-warnings], [enable a bunch of compiler warning flags (defaults to GCC warning flags).])], - [AS_IF([test "x$GCC" = xyes], + [AS_IF([test "x$GCC" == xyes], [ : ${WARNINGFLAGS="-Wall -Wextra -Wmissing-prototypes -Wstrict-prototypes -Wnested-externs -Wold-style-definition -Wredundant-decls -Wconversion -Wno-unused-but-set-variable"} ])]) AC_SUBST([WARNINGFLAGS]) -AC_ARG_ENABLE([libfl], - [AS_HELP_STRING([--disable-libfl], - [do not build -lfl runtime support library])], - [], [enable_libfl=yes]) -AM_CONDITIONAL([ENABLE_LIBFL], [test "x$enable_libfl" = xyes]) - -# --disable-bootstrap is intended only to workaround problems with bootstrap -# (e.g. when cross-compiling flex or when bootstrapping has bugs). -# Ideally we should be able to bootstrap even when cross-compiling. -AC_ARG_ENABLE([bootstrap], - [AS_HELP_STRING([--disable-bootstrap], - [don't perform a bootstrap when building flex])], - [], [enable_bootstrap=yes]) -AM_CONDITIONAL([ENABLE_BOOTSTRAP], [test "x$enable_bootstrap" = xyes]) - -AM_CONDITIONAL([CROSS], [test "x$cross_compiling" = xyes]) +AC_PATH_PROG([BISON], bison, no) +AS_IF([test "$BISON" != no],[], + [ AC_SUBST([BISON], [\${top_srcdir}/build-aux/missing bison]) + AC_MSG_NOTICE(no bison program found: only required for maintainers) + ]) AC_PATH_PROG([HELP2MAN], help2man, [\${top_srcdir}/build-aux/missing help2man]) - AS_IF([test "$HELP2MAN" = "\${top_srcdir}/build-aux/missing help2man"], - AC_MSG_WARN(help2man: program not found: building man page will not work) + AS_IF([test -z "$ac_cv_path_HELP2MAN" ],[], + AC_MSG_WARN(program not found: help2man: building man page will not work) ) AC_PATH_PROGS([TEXI2DVI], [gtexi2dvi texi2dvi], [\${top_srcdir}/build-aux/missing texi2dvi]) - AS_IF([test "$TEXI2DVI" = "\${top_srcdir}/build-aux/missing texi2dvi"], + AS_IF([test -z "$ac_cv_path_TEXI2DVI" ], [], AC_MSG_WARN(texi2dvi: program not found: building pdf version of manual will not work) ) @@ -104,20 +87,23 @@ AC_CACHE_CHECK([for m4 that supports -P], [ac_cv_path_M4], AC_SUBST([M4], [$ac_cv_path_M4]) AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the m4 executable name.]) -AC_PATH_PROG([INDENT], indent, [\${top_srcdir}/build-aux/missing indent]) - AC_MSG_CHECKING(if $INDENT is GNU indent) - AS_IF([$INDENT --version 2>/dev/null | head -n 1 | grep "GNU indent" >/dev/null], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no) - AC_MSG_WARN($INDENT does not appear to be GNU indent; 'make indent' may not function properly) - ]) +AC_PATH_PROG(INDENT, indent, indent) +# if INDENT is set to 'indent' then we didn't find indent +if test "$INDENT" != indent ; then + AC_MSG_CHECKING(if $INDENT is GNU indent) + if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + AC_MSG_WARN($INDENT does not appear to be GNU indent.) + fi +else + AC_MSG_WARN(no indent program found: make indent target will not function) +fi # checks for headers -AC_CHECK_HEADERS([regex.h strings.h sys/stat.h sys/wait.h unistd.h], [], - [AC_MSG_ERROR(required header not found on your system)]) - -AC_CHECK_HEADERS([inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h]) +AC_CHECK_HEADERS([inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h regex.h unistd.h]) # checks for libraries @@ -125,12 +111,12 @@ AC_CHECK_HEADERS([inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h]) # all we need is the preprocessor symbol defined since we don't need # LIBS to include libpthread for building flex. -LIBPTHREAD='' AC_CHECK_LIB(pthread, pthread_mutex_lock, - [AC_CHECK_HEADERS([pthread.h], [LIBPTHREAD=-lpthread], - [AC_MSG_WARN([pthread tests will be skipped])])], - [AC_MSG_WARN([pthread tests will be skipped])]) -AC_SUBST([LIBPTHREAD]) +AC_DEFINE([HAVE_LIBPTHREAD], 1, [pthread library] ), +AC_DEFINE([HAVE_LIBPTHREAD], 0, [pthread library] ) +) +AC_CHECK_HEADERS([pthread.h]) +AM_CONDITIONAL([want_pthread], [test x$ac_cv_lib_pthread_pthread_mutex_lock = xyes]) AC_CHECK_LIB(m, log10) @@ -144,30 +130,19 @@ AC_TYPE_SIZE_T AC_FUNC_ALLOCA AC_FUNC_FORK -dnl Autoconf bug: AC_FUNC_MALLOC and AC_FUNC_REALLOC might not warn of cross -dnl compilation. Workaround this. AC_FUNC_MALLOC -AS_IF([test "$cross_compiling" = yes], - AC_MSG_WARN([result $ac_cv_func_malloc_0_nonnull guessed because of cross compilation])) AC_FUNC_REALLOC -AS_IF([test "$cross_compiling" = yes], - AC_MSG_WARN([result $ac_cv_func_realloc_0_nonnull guessed because of cross compilation])) -AC_CHECK_FUNCS([dup2 dnl +AC_CHECK_FUNCS(dup2 dnl memset dnl +pow dnl regcomp dnl -strcasecmp dnl +setlocale dnl strchr dnl strdup dnl -strtol dnl -], [], [AC_MSG_ERROR(required library function not found on your system)]) +strtol) -# Optional library functions -AC_CHECK_FUNCS([dnl -pow dnl Used only by "examples/manual/expr" -setlocale dnl Needed only if NLS is enabled -reallocarray dnl OpenBSD function. We have replacement if not available. -]) +AC_REPLACE_FUNCS(reallocarray) AC_CONFIG_FILES( Makefile @@ -175,6 +150,7 @@ doc/Makefile examples/Makefile examples/fastwc/Makefile examples/manual/Makefile +lib/Makefile po/Makefile.in src/Makefile tools/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 523aa97..882843c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,14 +1,30 @@ -FLEX = $(top_builddir)/src/flex$(EXEEXT) +help2man = @HELP2MAN@ info_TEXINFOS = flex.texi dist_man_MANS = flex.1 -MAINTAINERCLEANFILES = flex.1 +DISTCLEANFILES = flex.1 -CLEANFILES = *.aux *.cp *.cps *.fn *.fns *.hk *.hks *.ky *.log \ - *.op *.ops *.pg *.toc *.tp *.tps *.vr *.vrs +CLEANFILES = \ + flex.aux \ + flex.cp \ + flex.cps \ + flex.fn \ + flex.fns \ + flex.hk \ + flex.hks \ + flex.ky \ + flex.log \ + flex.op \ + flex.ops \ + flex.pg \ + flex.toc \ + flex.tp \ + flex.tps \ + flex.vr \ + flex.vrs -flex.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/flex.skl $(top_srcdir)/src/options.c $(top_srcdir)/src/options.h | $(FLEX) - $(HELP2MAN) --name='$(PACKAGE_NAME)' --section=1 \ +flex.1: ../src/flex$(EXEEXT) + $(help2man) --name='$(PACKAGE_NAME)' --section=1 \ --source='The Flex Project' --manual='Programming' \ - --output=$@ $(FLEX) \ + --output=$@ $< \ || rm -f $@ diff --git a/doc/Makefile.in b/doc/Makefile.in index 5e65a31..6f2e558 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -89,15 +89,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \ @@ -210,17 +209,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -252,14 +246,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -311,7 +303,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -360,12 +351,28 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -FLEX = $(top_builddir)/src/flex$(EXEEXT) +help2man = @HELP2MAN@ info_TEXINFOS = flex.texi dist_man_MANS = flex.1 -MAINTAINERCLEANFILES = flex.1 -CLEANFILES = *.aux *.cp *.cps *.fn *.fns *.hk *.hks *.ky *.log \ - *.op *.ops *.pg *.toc *.tp *.tps *.vr *.vrs +DISTCLEANFILES = flex.1 +CLEANFILES = \ + flex.aux \ + flex.cp \ + flex.cps \ + flex.fn \ + flex.fns \ + flex.hk \ + flex.hks \ + flex.ky \ + flex.log \ + flex.op \ + flex.ops \ + flex.pg \ + flex.toc \ + flex.tp \ + flex.tps \ + flex.vr \ + flex.vrs all: all-am @@ -684,11 +691,11 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-aminfo clean-generic clean-libtool mostlyclean-am @@ -872,10 +879,10 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile -flex.1: $(top_srcdir)/configure.ac $(top_srcdir)/src/flex.skl $(top_srcdir)/src/options.c $(top_srcdir)/src/options.h | $(FLEX) - $(HELP2MAN) --name='$(PACKAGE_NAME)' --section=1 \ +flex.1: ../src/flex$(EXEEXT) + $(help2man) --name='$(PACKAGE_NAME)' --section=1 \ --source='The Flex Project' --manual='Programming' \ - --output=$@ $(FLEX) \ + --output=$@ $< \ || rm -f $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/doc/flex.1 b/doc/flex.1 index a1cd269..909958d 100644 --- a/doc/flex.1 +++ b/doc/flex.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH FLEX "1" "May 2017" "The Flex Project" "Programming" +.TH FLEX "1" "October 2016" "The Flex Project" "Programming" .SH NAME flex \- the fast lexical analyser generator .SH SYNOPSIS diff --git a/doc/flex.info b/doc/flex.info index a972bcd..74189b1 100644 --- a/doc/flex.info +++ b/doc/flex.info @@ -43,239 +43,239 @@ END-INFO-DIR-ENTRY  Indirect: flex.info-1: 1622 -flex.info-2: 318745 +flex.info-2: 318748  Tag Table: (Indirect) Node: Top1622 -Node: Copyright9414 -Node: Reporting Bugs10933 -Node: Introduction11189 -Node: Simple Examples12018 -Node: Format15304 -Node: Definitions Section15759 -Ref: Definitions Section-Footnote-118017 -Node: Rules Section18085 -Node: User Code Section19243 -Node: Comments in the Input19681 -Node: Patterns21051 -Ref: case and character ranges27883 -Node: Matching31886 -Node: Actions35171 -Node: Generated Scanner44133 -Node: Start Conditions49136 -Node: Multiple Input Buffers59678 -Ref: Scanning Strings66221 -Node: EOF67850 -Node: Misc Macros69436 -Node: User Values72290 -Node: Yacc74615 -Node: Scanner Options75510 -Node: Options for Specifying Filenames78299 -Ref: option-header78525 -Ref: option-outfile79239 -Ref: option-stdout79564 -Node: Options Affecting Scanner Behavior80547 -Ref: option-case-insensitive80788 -Ref: option-lex-compat81221 -Ref: option-batch81753 -Ref: option-interactive82272 -Ref: option-7bit83626 -Ref: option-8bit84930 -Ref: option-default85342 -Ref: option-always-interactive85406 -Ref: option-posix86010 -Ref: option-stack87157 -Ref: option-stdinit87265 -Ref: option-yylineno87744 -Ref: option-yywrap88187 -Node: Code-Level And API Options88454 -Ref: option-ansi-definitions88681 -Ref: option-ansi-prototypes88756 -Ref: option-bison-bridge88829 -Ref: option-bison-locations89170 -Ref: option-noline89430 -Ref: option-reentrant89944 -Ref: option-c++90556 -Ref: option-array90682 -Ref: option-pointer90780 -Ref: option-prefix90907 -Ref: option-main92435 -Ref: option-nounistd92619 -Ref: option-yyclass93130 -Node: Options for Scanner Speed and Size93614 -Ref: option-align94164 -Ref: option-ecs94666 -Ref: option-meta-ecs95705 -Ref: option-read96193 -Ref: option-full98076 -Ref: option-fast98271 -Node: Debugging Options99195 -Ref: option-backup99382 -Ref: option-debug99927 -Ref: option-perf-report100649 -Ref: option-nodefault101275 -Ref: option-trace101593 -Ref: option-nowarn101884 -Ref: option-verbose101952 -Ref: option-warn102381 -Node: Miscellaneous Options102600 -Node: Performance103056 -Node: Cxx113303 -Node: Reentrant121395 -Node: Reentrant Uses122129 -Node: Reentrant Overview123691 -Node: Reentrant Example124491 -Node: Reentrant Detail125264 -Node: Specify Reentrant125768 -Node: Extra Reentrant Argument126418 -Node: Global Replacement127670 -Node: Init and Destroy Functions128905 -Node: Accessor Methods131426 -Node: Extra Data132773 -Node: About yyscan_t135040 -Node: Reentrant Functions135437 -Ref: bison-functions136921 -Node: Lex and Posix137660 -Node: Memory Management145007 -Ref: memory-management145153 -Node: The Default Memory Management145387 -Ref: The Default Memory Management-Footnote-1149207 -Node: Overriding The Default Memory Management149360 -Ref: Overriding The Default Memory Management-Footnote-1151774 -Node: A Note About yytext And Memory151938 -Node: Serialized Tables153178 -Ref: serialization153322 -Node: Creating Serialized Tables154102 -Node: Loading and Unloading Serialized Tables155717 -Node: Tables File Format157490 -Node: Diagnostics164515 -Node: Limitations167924 -Node: Bibliography169872 -Node: FAQ170542 -Node: When was flex born?175705 -Node: How do I expand backslash-escape sequences in C-style quoted strings?176082 -Node: Why do flex scanners call fileno if it is not ANSI compatible?177385 -Node: Does flex support recursive pattern definitions?178182 -Node: How do I skip huge chunks of input (tens of megabytes) while using flex?179029 -Node: Flex is not matching my patterns in the same order that I defined them.179496 -Node: My actions are executing out of order or sometimes not at all.181242 -Node: How can I have multiple input sources feed into the same scanner at the same time?182015 -Node: Can I build nested parsers that work with the same input file?184000 -Node: How can I match text only at the end of a file?185007 -Node: How can I make REJECT cascade across start condition boundaries?185811 -Node: Why cant I use fast or full tables with interactive mode?186825 -Node: How much faster is -F or -f than -C?188082 -Node: If I have a simple grammar cant I just parse it with flex?188394 -Node: Why doesn't yyrestart() set the start state back to INITIAL?188876 -Node: How can I match C-style comments?189503 -Node: The period isn't working the way I expected.190313 -Node: Can I get the flex manual in another format?191558 -Node: Does there exist a "faster" NDFA->DFA algorithm?192048 -Node: How does flex compile the DFA so quickly?192558 -Node: How can I use more than 8192 rules?193524 -Node: How do I abandon a file in the middle of a scan and switch to a new file?194934 -Node: How do I execute code only during initialization (only before the first scan)?195488 -Node: How do I execute code at termination?196265 -Node: Where else can I find help?196591 -Node: Can I include comments in the "rules" section of the file?196965 -Node: I get an error about undefined yywrap().197345 -Node: How can I change the matching pattern at run time?197821 -Node: How can I expand macros in the input?198183 -Node: How can I build a two-pass scanner?199215 -Node: How do I match any string not matched in the preceding rules?200133 -Node: I am trying to port code from AT&T lex that uses yysptr and yysbuf.201042 -Node: Is there a way to make flex treat NULL like a regular character?201837 -Node: Whenever flex can not match the input it says "flex scanner jammed".202357 -Node: Why doesn't flex have non-greedy operators like perl does?203000 -Node: Memory leak - 16386 bytes allocated by malloc.204353 -Ref: faq-memory-leak204651 -Node: How do I track the byte offset for lseek()?205622 -Node: How do I use my own I/O classes in a C++ scanner?207131 -Node: How do I skip as many chars as possible?207974 -Node: deleteme00209049 -Node: Are certain equivalent patterns faster than others?209489 -Node: Is backing up a big deal?212907 -Node: Can I fake multi-byte character support?214813 -Node: deleteme01216254 -Node: Can you discuss some flex internals?217363 -Node: unput() messes up yy_at_bol219607 -Node: The | operator is not doing what I want220709 -Node: Why can't flex understand this variable trailing context pattern?222255 -Node: The ^ operator isn't working223504 -Node: Trailing context is getting confused with trailing optional patterns224739 -Node: Is flex GNU or not?225982 -Node: ERASEME53227655 -Node: I need to scan if-then-else blocks and while loops228425 -Node: ERASEME55229624 -Node: ERASEME56230722 -Node: ERASEME57232080 -Node: Is there a repository for flex scanners?233078 -Node: How can I conditionally compile or preprocess my flex input file?233394 -Node: Where can I find grammars for lex and yacc?233867 -Node: I get an end-of-buffer message for each character scanned.234214 -Node: unnamed-faq-62234809 -Node: unnamed-faq-63235827 -Node: unnamed-faq-64237124 -Node: unnamed-faq-65238090 -Node: unnamed-faq-66238876 -Node: unnamed-faq-67239991 -Node: unnamed-faq-68240978 -Node: unnamed-faq-69242120 -Node: unnamed-faq-70242833 -Node: unnamed-faq-71243594 -Node: unnamed-faq-72244803 -Node: unnamed-faq-73245846 -Node: unnamed-faq-74246770 -Node: unnamed-faq-75247715 -Node: unnamed-faq-76248847 -Node: unnamed-faq-77249553 -Node: unnamed-faq-78250446 -Node: unnamed-faq-79251444 -Node: unnamed-faq-80253144 -Node: unnamed-faq-81254462 -Node: unnamed-faq-82257262 -Node: unnamed-faq-83258219 -Node: unnamed-faq-84259999 -Node: unnamed-faq-85261102 -Node: unnamed-faq-86262109 -Node: unnamed-faq-87263047 -Node: unnamed-faq-88263693 -Node: unnamed-faq-90264524 -Node: unnamed-faq-91265787 -Node: unnamed-faq-92268215 -Node: unnamed-faq-93268714 -Node: unnamed-faq-94269641 -Node: unnamed-faq-95271053 -Node: unnamed-faq-96272571 -Node: unnamed-faq-97273330 -Node: unnamed-faq-98273997 -Node: unnamed-faq-99274662 -Node: unnamed-faq-100275591 -Node: unnamed-faq-101276301 -Node: What is the difference between YYLEX_PARAM and YY_DECL?277114 -Node: Why do I get "conflicting types for yylex" error?277638 -Node: How do I access the values set in a Flex action from within a Bison action?278168 -Node: Appendices278597 -Node: Makefiles and Flex278862 -Ref: Makefiles and Flex-Footnote-1282064 -Ref: Makefiles and Flex-Footnote-2282181 -Ref: Makefiles and Flex-Footnote-3282368 -Node: Bison Bridge282419 -Ref: Bison Bridge-Footnote-1285086 -Node: M4 Dependency285278 -Ref: M4 Dependency-Footnote-1286692 -Node: Common Patterns286828 -Node: Numbers287151 -Node: Identifiers288127 -Node: Quoted Constructs288954 -Node: Addresses290008 -Node: Indices291320 -Node: Concept Index291612 -Node: Index of Functions and Macros318745 -Node: Index of Variables323714 -Node: Index of Data Types325380 -Node: Index of Hooks326268 -Node: Index of Scanner Options326836 +Node: Copyright9419 +Node: Reporting Bugs10938 +Node: Introduction11194 +Node: Simple Examples12023 +Node: Format15309 +Node: Definitions Section15764 +Ref: Definitions Section-Footnote-118022 +Node: Rules Section18090 +Node: User Code Section19248 +Node: Comments in the Input19686 +Node: Patterns21056 +Ref: case and character ranges27888 +Node: Matching31891 +Node: Actions35176 +Node: Generated Scanner44138 +Node: Start Conditions49141 +Node: Multiple Input Buffers59683 +Ref: Scanning Strings66224 +Node: EOF67853 +Node: Misc Macros69439 +Node: User Values72293 +Node: Yacc74618 +Node: Scanner Options75513 +Node: Options for Specifying Filenames78302 +Ref: option-header78528 +Ref: option-outfile79242 +Ref: option-stdout79567 +Node: Options Affecting Scanner Behavior80550 +Ref: option-case-insensitive80791 +Ref: option-lex-compat81224 +Ref: option-batch81756 +Ref: option-interactive82275 +Ref: option-7bit83629 +Ref: option-8bit84933 +Ref: option-default85345 +Ref: option-always-interactive85409 +Ref: option-posix86013 +Ref: option-stack87160 +Ref: option-stdinit87268 +Ref: option-yylineno87747 +Ref: option-yywrap88190 +Node: Code-Level And API Options88457 +Ref: option-ansi-definitions88684 +Ref: option-ansi-prototypes88759 +Ref: option-bison-bridge88832 +Ref: option-bison-locations89173 +Ref: option-noline89433 +Ref: option-reentrant89947 +Ref: option-c++90559 +Ref: option-array90685 +Ref: option-pointer90783 +Ref: option-prefix90910 +Ref: option-main92438 +Ref: option-nounistd92622 +Ref: option-yyclass93133 +Node: Options for Scanner Speed and Size93617 +Ref: option-align94167 +Ref: option-ecs94669 +Ref: option-meta-ecs95708 +Ref: option-read96196 +Ref: option-full98079 +Ref: option-fast98274 +Node: Debugging Options99198 +Ref: option-backup99385 +Ref: option-debug99930 +Ref: option-perf-report100652 +Ref: option-nodefault101278 +Ref: option-trace101596 +Ref: option-nowarn101887 +Ref: option-verbose101955 +Ref: option-warn102384 +Node: Miscellaneous Options102603 +Node: Performance103059 +Node: Cxx113306 +Node: Reentrant121398 +Node: Reentrant Uses122132 +Node: Reentrant Overview123694 +Node: Reentrant Example124494 +Node: Reentrant Detail125267 +Node: Specify Reentrant125771 +Node: Extra Reentrant Argument126421 +Node: Global Replacement127673 +Node: Init and Destroy Functions128908 +Node: Accessor Methods131429 +Node: Extra Data132776 +Node: About yyscan_t135043 +Node: Reentrant Functions135440 +Ref: bison-functions136924 +Node: Lex and Posix137663 +Node: Memory Management145010 +Ref: memory-management145156 +Node: The Default Memory Management145390 +Ref: The Default Memory Management-Footnote-1149210 +Node: Overriding The Default Memory Management149363 +Ref: Overriding The Default Memory Management-Footnote-1151777 +Node: A Note About yytext And Memory151941 +Node: Serialized Tables153181 +Ref: serialization153325 +Node: Creating Serialized Tables154105 +Node: Loading and Unloading Serialized Tables155720 +Node: Tables File Format157493 +Node: Diagnostics164518 +Node: Limitations167927 +Node: Bibliography169875 +Node: FAQ170545 +Node: When was flex born?175708 +Node: How do I expand backslash-escape sequences in C-style quoted strings?176085 +Node: Why do flex scanners call fileno if it is not ANSI compatible?177388 +Node: Does flex support recursive pattern definitions?178185 +Node: How do I skip huge chunks of input (tens of megabytes) while using flex?179032 +Node: Flex is not matching my patterns in the same order that I defined them.179499 +Node: My actions are executing out of order or sometimes not at all.181245 +Node: How can I have multiple input sources feed into the same scanner at the same time?182018 +Node: Can I build nested parsers that work with the same input file?184003 +Node: How can I match text only at the end of a file?185010 +Node: How can I make REJECT cascade across start condition boundaries?185814 +Node: Why cant I use fast or full tables with interactive mode?186828 +Node: How much faster is -F or -f than -C?188085 +Node: If I have a simple grammar cant I just parse it with flex?188397 +Node: Why doesn't yyrestart() set the start state back to INITIAL?188879 +Node: How can I match C-style comments?189506 +Node: The period isn't working the way I expected.190316 +Node: Can I get the flex manual in another format?191561 +Node: Does there exist a "faster" NDFA->DFA algorithm?192051 +Node: How does flex compile the DFA so quickly?192561 +Node: How can I use more than 8192 rules?193527 +Node: How do I abandon a file in the middle of a scan and switch to a new file?194937 +Node: How do I execute code only during initialization (only before the first scan)?195491 +Node: How do I execute code at termination?196268 +Node: Where else can I find help?196594 +Node: Can I include comments in the "rules" section of the file?196968 +Node: I get an error about undefined yywrap().197348 +Node: How can I change the matching pattern at run time?197824 +Node: How can I expand macros in the input?198186 +Node: How can I build a two-pass scanner?199218 +Node: How do I match any string not matched in the preceding rules?200136 +Node: I am trying to port code from AT&T lex that uses yysptr and yysbuf.201045 +Node: Is there a way to make flex treat NULL like a regular character?201840 +Node: Whenever flex can not match the input it says "flex scanner jammed".202360 +Node: Why doesn't flex have non-greedy operators like perl does?203003 +Node: Memory leak - 16386 bytes allocated by malloc.204356 +Ref: faq-memory-leak204654 +Node: How do I track the byte offset for lseek()?205625 +Node: How do I use my own I/O classes in a C++ scanner?207134 +Node: How do I skip as many chars as possible?207977 +Node: deleteme00209052 +Node: Are certain equivalent patterns faster than others?209492 +Node: Is backing up a big deal?212910 +Node: Can I fake multi-byte character support?214816 +Node: deleteme01216257 +Node: Can you discuss some flex internals?217366 +Node: unput() messes up yy_at_bol219610 +Node: The | operator is not doing what I want220712 +Node: Why can't flex understand this variable trailing context pattern?222258 +Node: The ^ operator isn't working223507 +Node: Trailing context is getting confused with trailing optional patterns224742 +Node: Is flex GNU or not?225985 +Node: ERASEME53227658 +Node: I need to scan if-then-else blocks and while loops228428 +Node: ERASEME55229627 +Node: ERASEME56230725 +Node: ERASEME57232083 +Node: Is there a repository for flex scanners?233081 +Node: How can I conditionally compile or preprocess my flex input file?233397 +Node: Where can I find grammars for lex and yacc?233870 +Node: I get an end-of-buffer message for each character scanned.234217 +Node: unnamed-faq-62234812 +Node: unnamed-faq-63235830 +Node: unnamed-faq-64237127 +Node: unnamed-faq-65238093 +Node: unnamed-faq-66238879 +Node: unnamed-faq-67239994 +Node: unnamed-faq-68240981 +Node: unnamed-faq-69242123 +Node: unnamed-faq-70242836 +Node: unnamed-faq-71243597 +Node: unnamed-faq-72244806 +Node: unnamed-faq-73245849 +Node: unnamed-faq-74246773 +Node: unnamed-faq-75247718 +Node: unnamed-faq-76248850 +Node: unnamed-faq-77249556 +Node: unnamed-faq-78250449 +Node: unnamed-faq-79251447 +Node: unnamed-faq-80253147 +Node: unnamed-faq-81254465 +Node: unnamed-faq-82257265 +Node: unnamed-faq-83258222 +Node: unnamed-faq-84260002 +Node: unnamed-faq-85261105 +Node: unnamed-faq-86262112 +Node: unnamed-faq-87263050 +Node: unnamed-faq-88263696 +Node: unnamed-faq-90264527 +Node: unnamed-faq-91265790 +Node: unnamed-faq-92268218 +Node: unnamed-faq-93268717 +Node: unnamed-faq-94269644 +Node: unnamed-faq-95271056 +Node: unnamed-faq-96272574 +Node: unnamed-faq-97273333 +Node: unnamed-faq-98274000 +Node: unnamed-faq-99274665 +Node: unnamed-faq-100275594 +Node: unnamed-faq-101276304 +Node: What is the difference between YYLEX_PARAM and YY_DECL?277117 +Node: Why do I get "conflicting types for yylex" error?277641 +Node: How do I access the values set in a Flex action from within a Bison action?278171 +Node: Appendices278600 +Node: Makefiles and Flex278865 +Ref: Makefiles and Flex-Footnote-1282067 +Ref: Makefiles and Flex-Footnote-2282184 +Ref: Makefiles and Flex-Footnote-3282371 +Node: Bison Bridge282422 +Ref: Bison Bridge-Footnote-1285089 +Node: M4 Dependency285281 +Ref: M4 Dependency-Footnote-1286695 +Node: Common Patterns286831 +Node: Numbers287154 +Node: Identifiers288130 +Node: Quoted Constructs288957 +Node: Addresses290011 +Node: Indices291323 +Node: Concept Index291615 +Node: Index of Functions and Macros318748 +Node: Index of Variables323717 +Node: Index of Data Types325383 +Node: Index of Hooks326271 +Node: Index of Scanner Options326839  End Tag Table diff --git a/doc/flex.info-1 b/doc/flex.info-1 index b79df5e..4f7fadf 100644 --- a/doc/flex.info-1 +++ b/doc/flex.info-1 @@ -50,8 +50,8 @@ This manual describes 'flex', a tool for generating programs that perform pattern-matching on text. The manual includes both tutorial and reference sections. - This edition of 'The flex Manual' documents 'flex' version 2.6.4. It -was last updated on 6 May 2017. + This edition of 'The flex Manual' documents 'flex' version 2.6.2. It +was last updated on 22 October 2016. This manual was written by Vern Paxson, Will Estes and John Millaway. @@ -1766,7 +1766,7 @@ letting flex do it). } <> { - if ( --include_stack_ptr == 0 ) + if ( --include_stack_ptr 0 ) { yyterminate(); } @@ -5014,7 +5014,7 @@ Is there a way to make flex treat NULL like a regular character? ================================================================ Yes, '\0' and '\x00' should both do the trick. Perhaps you have an -ancient version of 'flex'. The latest release is version 2.6.4. +ancient version of 'flex'. The latest release is version 2.6.2.  File: flex.info, Node: Whenever flex can not match the input it says "flex scanner jammed"., Next: Why doesn't flex have non-greedy operators like perl does?, Prev: Is there a way to make flex treat NULL like a regular character?, Up: FAQ diff --git a/doc/flex.texi b/doc/flex.texi index bccab1e..65ae419 100644 --- a/doc/flex.texi +++ b/doc/flex.texi @@ -2182,7 +2182,7 @@ manages its own input buffer stack manually (instead of letting flex do it). } <> { - if ( --include_stack_ptr == 0 ) + if ( --include_stack_ptr 0 ) { yyterminate(); } diff --git a/doc/stamp-vti b/doc/stamp-vti index fa020ed..2d8dfbb 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 6 May 2017 -@set UPDATED-MONTH May 2017 -@set EDITION 2.6.4 -@set VERSION 2.6.4 +@set UPDATED 22 October 2016 +@set UPDATED-MONTH October 2016 +@set EDITION 2.6.2 +@set VERSION 2.6.2 diff --git a/doc/version.texi b/doc/version.texi index fa020ed..2d8dfbb 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 6 May 2017 -@set UPDATED-MONTH May 2017 -@set EDITION 2.6.4 -@set VERSION 2.6.4 +@set UPDATED 22 October 2016 +@set UPDATED-MONTH October 2016 +@set EDITION 2.6.2 +@set VERSION 2.6.2 diff --git a/examples/Makefile.in b/examples/Makefile.in index f7267c5..cc41ade 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -110,15 +110,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = examples ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -217,17 +216,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -259,14 +253,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -318,7 +310,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/examples/fastwc/Makefile.in b/examples/fastwc/Makefile.in index 0acf52f..f8b1e10 100644 --- a/examples/fastwc/Makefile.in +++ b/examples/fastwc/Makefile.in @@ -110,15 +110,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = examples/fastwc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -157,17 +156,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -199,14 +193,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -258,7 +250,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/examples/manual/Makefile.in b/examples/manual/Makefile.in index 2b41a71..84950fb 100644 --- a/examples/manual/Makefile.in +++ b/examples/manual/Makefile.in @@ -110,15 +110,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = examples/manual ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -157,17 +156,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -199,14 +193,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -258,7 +250,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 0000000..011163e --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,4 @@ +noinst_LTLIBRARIES = libcompat.la +libcompat_la_SOURCES = lib.c +libcompat_la_LIBADD = $(LTLIBOBJS) + diff --git a/lib/Makefile.in b/lib/Makefile.in new file mode 100644 index 0000000..de6e6cd --- /dev/null +++ b/lib/Makefile.in @@ -0,0 +1,628 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = lib +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/src/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LTLIBRARIES = $(noinst_LTLIBRARIES) +libcompat_la_DEPENDENCIES = $(LTLIBOBJS) +am_libcompat_la_OBJECTS = lib.lo +libcompat_la_OBJECTS = $(am_libcompat_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libcompat_la_SOURCES) +DIST_SOURCES = $(libcompat_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp malloc.c realloc.c \ + reallocarray.c +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ +GMSGFMT = @GMSGFMT@ +GMSGFMT_015 = @GMSGFMT_015@ +GREP = @GREP@ +HELP2MAN = @HELP2MAN@ +INDENT = @INDENT@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLLIBS = @INTLLIBS@ +INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +M4 = @M4@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGFMT_015 = @MSGFMT_015@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHARED_VERSION_INFO = @SHARED_VERSION_INFO@ +SHELL = @SHELL@ +STRIP = @STRIP@ +TEXI2DVI = @TEXI2DVI@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARNINGFLAGS = @WARNINGFLAGS@ +XGETTEXT = @XGETTEXT@ +XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +noinst_LTLIBRARIES = libcompat.la +libcompat_la_SOURCES = lib.c +libcompat_la_LIBADD = $(LTLIBOBJS) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign lib/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +libcompat.la: $(libcompat_la_OBJECTS) $(libcompat_la_DEPENDENCIES) $(EXTRA_libcompat_la_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(libcompat_la_OBJECTS) $(libcompat_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/malloc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/realloc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/reallocarray.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf $(DEPDIR) ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/lib/lib.c b/lib/lib.c new file mode 100644 index 0000000..4b4bf73 --- /dev/null +++ b/lib/lib.c @@ -0,0 +1,9 @@ +/* Since building an empty library could cause problems, we provide a + * function to go into the library. We could make this non-trivial by + * moving something that flex treats as a library function into this + * directory. */ + +extern void do_nothing(void); + +void do_nothing(void){ return;} + diff --git a/lib/reallocarray.c b/lib/reallocarray.c new file mode 100644 index 0000000..0c1e250 --- /dev/null +++ b/lib/reallocarray.c @@ -0,0 +1,49 @@ +/* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $ */ +/* + * Copyright (c) 2008 Otto Moerbeek + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* OPENBSD ORIGINAL: lib/libc/stdlib/reallocarray.c */ + +#include +#ifndef HAVE_REALLOCARRAY +#undef reallocarray + +#include +#include +#ifdef HAVE_STDINT_H +#include +#endif +#include + +void *reallocarray(void *, size_t, size_t); + +/* + * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX + * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW + */ +#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) + +void * +reallocarray(void *optr, size_t nmemb, size_t size) +{ + if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && + nmemb > 0 && SIZE_MAX / nmemb < size) { + errno = ENOMEM; + return NULL; + } + return realloc(optr, size * nmemb); +} +#endif /* HAVE_REALLOCARRAY */ diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 deleted file mode 100644 index 77fd346..0000000 --- a/m4/ax_prog_cc_for_build.m4 +++ /dev/null @@ -1,125 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PROG_CC_FOR_BUILD -# -# DESCRIPTION -# -# This macro searches for a C compiler that generates native executables, -# that is a C compiler that surely is not a cross-compiler. This can be -# useful if you have to generate source code at compile-time like for -# example GCC does. -# -# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything -# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). -# The value of these variables can be overridden by the user by specifying -# a compiler with an environment variable (like you do for standard CC). -# -# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object -# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if -# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are -# substituted in the Makefile. -# -# LICENSE -# -# Copyright (c) 2008 Paolo Bonzini -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 8 - -AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) -AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_EXEEXT])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl - -dnl Use the standard macros, but make them use other variable names -dnl -pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl -pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl -pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl -pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl -pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl -pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl -pushdef([ac_cv_objext], ac_cv_build_objext)dnl -pushdef([ac_exeext], ac_build_exeext)dnl -pushdef([ac_objext], ac_build_objext)dnl -pushdef([CC], CC_FOR_BUILD)dnl -pushdef([CPP], CPP_FOR_BUILD)dnl -pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl -pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl -pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl -pushdef([host], build)dnl -pushdef([host_alias], build_alias)dnl -pushdef([host_cpu], build_cpu)dnl -pushdef([host_vendor], build_vendor)dnl -pushdef([host_os], build_os)dnl -pushdef([ac_cv_host], ac_cv_build)dnl -pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl -pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl -pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl -pushdef([ac_cv_host_os], ac_cv_build_os)dnl -pushdef([ac_cpp], ac_build_cpp)dnl -pushdef([ac_compile], ac_build_compile)dnl -pushdef([ac_link], ac_build_link)dnl - -save_cross_compiling=$cross_compiling -save_ac_tool_prefix=$ac_tool_prefix -cross_compiling=no -ac_tool_prefix= - -AC_PROG_CC -AC_PROG_CPP -AC_EXEEXT - -ac_tool_prefix=$save_ac_tool_prefix -cross_compiling=$save_cross_compiling - -dnl Restore the old definitions -dnl -popdef([ac_link])dnl -popdef([ac_compile])dnl -popdef([ac_cpp])dnl -popdef([ac_cv_host_os])dnl -popdef([ac_cv_host_vendor])dnl -popdef([ac_cv_host_cpu])dnl -popdef([ac_cv_host_alias])dnl -popdef([ac_cv_host])dnl -popdef([host_os])dnl -popdef([host_vendor])dnl -popdef([host_cpu])dnl -popdef([host_alias])dnl -popdef([host])dnl -popdef([LDFLAGS])dnl -popdef([CPPFLAGS])dnl -popdef([CFLAGS])dnl -popdef([CPP])dnl -popdef([CC])dnl -popdef([ac_objext])dnl -popdef([ac_exeext])dnl -popdef([ac_cv_objext])dnl -popdef([ac_cv_exeext])dnl -popdef([ac_cv_prog_cc_g])dnl -popdef([ac_cv_prog_cc_cross])dnl -popdef([ac_cv_prog_cc_works])dnl -popdef([ac_cv_prog_gcc])dnl -popdef([ac_cv_prog_CPP])dnl - -dnl Finally, set Makefile variables -dnl -BUILD_EXEEXT=$ac_build_exeext -BUILD_OBJEXT=$ac_build_objext -AC_SUBST(BUILD_EXEEXT)dnl -AC_SUBST(BUILD_OBJEXT)dnl -AC_SUBST([CFLAGS_FOR_BUILD])dnl -AC_SUBST([CPPFLAGS_FOR_BUILD])dnl -AC_SUBST([LDFLAGS_FOR_BUILD])dnl -]) diff --git a/m4/gettext.m4 b/m4/gettext.m4 index f84e6a5..be247bf 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 63 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +# gettext.m4 serial 66 (gettext-0.18.2) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. +dnl the value '$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled @@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. gt_INTL_MACOSX dnl Set USE_NLS. @@ -157,12 +157,18 @@ changequote([,])dnl fi AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_TRY_LINK([#include + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include $gt_revision_test_code extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], +extern int *_nl_domain_bindings; + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ]])], [eval "$gt_func_gnugettext_libc=yes"], [eval "$gt_func_gnugettext_libc=no"])]) @@ -183,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], [eval "$gt_func_gnugettext_libintl=yes"], [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include $gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) diff --git a/m4/iconv.m4 b/m4/iconv.m4 index f46ff14..4b29c5f 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial 9 (gettext-0.18) -dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. +# iconv.m4 serial 18 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -30,27 +30,35 @@ AC_DEFUN([AM_ICONV_LINK], dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], [am_cv_lib_iconv=yes] [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" @@ -58,16 +66,19 @@ AC_DEFUN([AM_ICONV_LINK], ]) if test "$am_cv_func_iconv" = yes; then AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ - dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, + dnl Solaris 10. am_save_LIBS="$LIBS" if test $am_cv_lib_iconv = yes; then LIBS="$LIBS $LIBICONV" fi - AC_TRY_RUN([ + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ #include #include int main () { + int result = 0; /* Test against AIX 5.1 bug: Failures are not distinguishable from successful returns. */ { @@ -84,7 +95,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 1; + iconv_close (cd_utf8_to_88591); } } /* Test against Solaris 10 bug: Failures are not distinguishable from @@ -103,7 +115,27 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if (res == 0) - return 1; + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); } } #if 0 /* This bug could be worked around by the caller. */ @@ -122,7 +154,8 @@ int main () (char **) &inptr, &inbytesleft, &outptr, &outbytesleft); if ((int)res > 0) - return 1; + result |= 8; + iconv_close (cd_88591_to_utf8); } } #endif @@ -136,13 +169,19 @@ int main () && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) /* Try HP-UX names. */ && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in + result |= 16; + return result; +}]])], + [am_cv_func_iconv_works=yes], + [am_cv_func_iconv_works=no], + [ +changequote(,)dnl + case "$host_os" in aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; *) am_cv_func_iconv_works="guessing yes" ;; - esac]) + esac +changequote([,])dnl + ]) LIBS="$am_save_LIBS" ]) case "$am_cv_func_iconv_works" in @@ -170,30 +209,60 @@ int main () AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [m4_ifdef([gl_00GNULIB], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])])) +gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) AC_CACHE_VAL([am_cv_proto_iconv], [ - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif -], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) + ]], + [[]])], + [am_cv_proto_iconv_arg1=""], + [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` AC_MSG_RESULT([ $am_cv_proto_iconv]) AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated . + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi + ]) fi ]) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index dd91025..8a045f6 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 3 (gettext-0.18) -dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -13,35 +13,40 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. -dnl Checks for special options needed on MacOS X. +dnl Checks for special options needed on Mac OS X. dnl Defines INTL_MACOSX_LIBS. AC_DEFUN([gt_INTL_MACOSX], [ - dnl Check for API introduced in MacOS X 10.2. + dnl Check for API introduced in Mac OS X 10.2. AC_CACHE_CHECK([for CFPreferencesCopyAppValue], [gt_cv_func_CFPreferencesCopyAppValue], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], [gt_cv_func_CFPreferencesCopyAppValue=yes], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi - dnl Check for API introduced in MacOS X 10.3. + dnl Check for API introduced in Mac OS X 10.3. AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], [gt_save_LIBS="$LIBS" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], [gt_cv_func_CFLocaleCopyCurrent=yes], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index ebb3052..ddc569f 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,50 +1,56 @@ -# lib-ld.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) + AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -54,11 +60,11 @@ if test "$GCC" = yes; then esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" @@ -79,23 +85,26 @@ else fi AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 = 2.61 supports dots in --with options. - pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ @@ -242,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 1601cea..31f49e4 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nls.m4 b/m4/nls.m4 index 003704c..53cdc8b 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/po.m4 b/m4/po.m4 index 47f36a4..84659ea 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 17 (gettext-0.18) -dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. +# po.m4 serial 22 (gettext-0.19) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,19 +17,20 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ([2.50]) +AC_PREREQ([2.60]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + AC_SUBST([GETTEXT_MACRO_VERSION], [0.19]) dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -102,7 +103,7 @@ changequote([,])dnl case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -118,7 +119,8 @@ changequote([,])dnl if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -129,12 +131,12 @@ changequote([,])dnl test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -226,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], changequote(,)dnl # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -254,6 +256,7 @@ EOT fi # A sed script that extracts the value of VARIABLE from a Makefile. + tab=`printf '\t'` sed_x_variable=' # Test if the hold space is empty. x @@ -261,9 +264,9 @@ s/P/P/ x ta # Yes it was empty. Look if we have the expected variable definition. -/^[ ]*VARIABLE[ ]*=/{ +/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ # Seen the first line of the variable definition. - s/^[ ]*VARIABLE[ ]*=// + s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// ba } bd @@ -315,7 +318,7 @@ changequote([,])dnl sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -405,14 +408,15 @@ changequote([,])dnl fi sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + tab=`printf '\t'` if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` cat >> "$ac_file.tmp" <> "$ac_file.tmp" <conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 83d8838..65184f6 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -8,13 +8,14 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.18 -GETTEXT_MACRO_VERSION = 0.18 +# Origin: gettext-0.19 +GETTEXT_MACRO_VERSION = 0.19 PACKAGE = @PACKAGE@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +SED = @SED@ SHELL = /bin/sh @SET_MAKE@ @@ -76,6 +77,16 @@ POTFILES = \ CATALOGS = @CATALOGS@ +POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot +POFILESDEPS_yes = $(POFILESDEPS_) +POFILESDEPS_no = +POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT)) + +DISTFILESDEPS_ = update-po +DISTFILESDEPS_yes = $(DISTFILESDEPS_) +DISTFILESDEPS_no = +DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO)) + # Makevars gets inserted here. (Don't remove this line!) .SUFFIXES: @@ -96,14 +107,14 @@ CATALOGS = @CATALOGS@ mv t-$@ $@ -all: check-macro-version all-@USE_NLS@ +all: all-@USE_NLS@ all-yes: stamp-po all-no: # Ensure that the gettext macros and this Makefile.in.in are in sync. -check-macro-version: - @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ exit 1; \ } @@ -123,6 +134,7 @@ check-macro-version: # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -137,11 +149,29 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ - package_gnu='GNU '; \ + package_gnu="$(PACKAGE_GNU)"; \ + test -n "$$package_gnu" || { \ + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ + -size -10000000c -exec grep 'GNU @PACKAGE@' \ + /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu=yes; \ + else \ + package_gnu=no; \ + fi; \ + }; \ + if test "$$package_gnu" = "yes"; then \ + package_prefix='GNU '; \ else \ - package_gnu=''; \ + package_prefix=''; \ fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ @@ -161,7 +191,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --package-name="$${package_gnu}@PACKAGE@" \ + --package-name="$${package_prefix}@PACKAGE@" \ --package-version='@VERSION@' \ --msgid-bugs-address="$$msgid_bugs_address" \ ;; \ @@ -189,9 +219,10 @@ $(srcdir)/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/$(DOMAIN).pot +$(POFILES): $(POFILESDEPS) @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ + test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ cd $(srcdir) \ @@ -352,7 +383,7 @@ maintainer-clean: distclean distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) dist distdir: - $(MAKE) update-po + test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) @$(MAKE) dist2 # This is a separate target because 'update-po' must be executed before. dist2: stamp-po $(DISTFILES) diff --git a/po/Makevars b/po/Makevars index cff165f..2ac7ee8 100644 --- a/po/Makevars +++ b/po/Makevars @@ -8,7 +8,7 @@ subdir = po top_builddir = .. # These options get passed to xgettext. -XGETTEXT_OPTIONS = --language=C --keyword=_ --keyword=N_ +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding @@ -20,13 +20,6 @@ XGETTEXT_OPTIONS = --language=C --keyword=_ --keyword=N_ # their copyright. COPYRIGHT_HOLDER = -# This tells whether or not to prepend "GNU " prefix to the package -# name that gets inserted into the header of the $(DOMAIN).pot file. -# Possible values are "yes", "no", or empty. If it is empty, try to -# detect it automatically by scanning the files in $(top_srcdir) for -# "GNU packagename" string. -PACKAGE_GNU = "no" - # This is the email address or URL to which the translators shall report # bugs in the untranslated strings: # - Strings which are not entire sentences, see the maintainer guidelines @@ -46,33 +39,3 @@ MSGID_BUGS_ADDRESS = flex-devel@lists.sourceforge.net # This is the list of locale categories, beyond LC_MESSAGES, for which the # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = - -# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' -# context. Possible values are "yes" and "no". Set this to yes if the -# package uses functions taking also a message context, like pgettext(), or -# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. -USE_MSGCTXT = no - -# These options get passed to msgmerge. -# Useful options are in particular: -# --previous to keep previous msgids of translated messages, -# --quiet to reduce the verbosity. -MSGMERGE_OPTIONS = - -# These options get passed to msginit. -# If you want to disable line wrapping when writing PO files, add -# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and -# MSGINIT_OPTIONS. -MSGINIT_OPTIONS = - -# This tells whether or not to regenerate a PO file when $(DOMAIN).pot -# has changed. Possible values are "yes" and "no". Set this to no if -# the POT file is checked in the repository and the version control -# program ignores timestamps. -PO_DEPENDS_ON_POT = yes - -# This tells whether or not to forcibly update $(DOMAIN).pot and -# regenerate PO files on "make dist". Possible values are "yes" and -# "no". Set this to no if the POT file and PO files are maintained -# externally. -DIST_DEPENDS_ON_UPDATE_PO = no diff --git a/po/Rules-quot b/po/Rules-quot index af52487..7b92c7e 100644 --- a/po/Rules-quot +++ b/po/Rules-quot @@ -1,3 +1,4 @@ +# This file, Rules-quot, can be copied and used freely without restrictions. # Special Makefile rules for English message catalogs with quotation marks. DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot @@ -14,13 +15,23 @@ en@boldquot.po-update: en@boldquot.po-update-en .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null \ + | $(SED) -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | \ + { case `$(MSGFILTER) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-8] | 0.1[0-8].*) \ + $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed \ + ;; \ + *) \ + $(MSGFILTER) `echo $$lang | sed -e 's/.*@//'` \ + ;; \ + esac } 2>/dev/null > $$tmpdir/$$lang.new.po \ + ; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ diff --git a/po/ca.gmo b/po/ca.gmo index c87a2b3..c902a14 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 93703ca..b0e3e32 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-12-04 17:36+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -15,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -77,20 +76,20 @@ msgstr "" "Bolcat AFD:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "no s'ha pogut crear un estat únic de final-de-búfer" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "estat # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "No s'ha pogut escriure yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "caràcter de transició incorrecte detectat en sympartition()" @@ -106,29 +105,29 @@ msgstr "" "Classes d'equivalència:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "l'estat # %d accepta: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "l'estat # %d accepta: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "No s'ha pogut escriure yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "No s'ha pogut escriure yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "No s'ha pogut escriure ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,39 +137,39 @@ msgstr "" "\n" "Classes de metaequivalència:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "No s'ha pogut escriure yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "No s'ha pogut escriure yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "No s'ha pogut escriure yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "No s'ha pogut escriure yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "No s'ha pogut escriure yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "No s'ha pogut escriure ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "No s'ha pogut escriure ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "No s'ha pogut escriure eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "No s'ha pogut escriure yynultrans_tbl" @@ -227,204 +226,200 @@ msgstr "Les opcions -+ i --reentrant són mútuament excloents" msgid "bison bridge not supported for the C++ scanner." msgstr "No es suporta «bison bridge» per a l'analitzador de C++" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "no s'ha pogut crear %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "no s'ha pogut crear la capçalera de les taules" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "No es pot obrir el fitxer d'esquema %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "Ha fallat l'assignació de la definició de la macro" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "error d'entrada al llegir el fitxer d'esquema %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "s'ha produït un error en tancar el fitxer d'esquema %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "s'ha produït un error en crear el fitxer de capçalera %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "s'ha produït un error en escriure el fitxer d'eixida %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "s'ha produït un error en tancar el fitxer d'eixida %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "s'ha produït un error en suprimir el fitxer d'eixida %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "No hi ha retrocés.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d estats de retrocés (no-acceptació).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Les taules comprimides sempre impliquen un retard.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "s'ha produït un error en escriure el fitxer de còpia de seguretat %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "s'ha produït un error en tancar el fitxer de còpia de seguretat %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "estadístiques d'ús de %s versió %s:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " opcions de l'analitzador: -" # NFA == Autómata finit no-determinista. jm -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estats AFN\n" # DFA == Autómata finit deterministic. jm -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estats AFD (%d paraules)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d regles\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Sense retrocés\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d estats de retrocés (no-acceptació)\n" # Es refereix a còpia de seguretat, o retrocés? jm -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Sempre es realitza còpia de seguretat de les taules comprimides\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Utilitzats patrons de principi-de-línia\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condicions d'activació\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estats èpsilon, %d estats doble èpsilon\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " sense classes de caràcter\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " les classes de caràcters %d/%d necessitaren %d/%d paraules de magatzement, " "%d reutilitzades\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d parells estat/estat-següent creats\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transicions úniques/duplicades\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d entrades de la taula\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entrades base-def creades\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pic %d) entrades nxt-chk creades\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pic %d) entrades de plantilla nxt-chk creades\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d entrades de la tabla buides\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototips creats\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d plantilles creades, %d usos\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes d'equivalència creades\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de meta-equivalència creades\n" @@ -433,65 +428,65 @@ msgstr " %d/%d classes de meta-equivalència creades\n" # segons un company de treballa que estudia a la UOC, allí # les "hashtables" s'anomenen "taules de DISPERSIÓ". En aquest context # no sé que dir-te. ear -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d desades) col·lisions d'ubicació («hash»), %d AFD iguals\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " es necessiten %d conjunts de relocalització\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " es necessiten %d entrades totals de la taula\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Error intern. Els flexopts estan malformats.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Proveu «%s --help» per a obtindre més informació.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "opció de -C desconeguda «%c»" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" # Hmm. No se si açò està be. jm -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "s'ha produït un error fatal d'anàlisi sintàctic" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "no s'ha pogut crear un fitxer d'informació del retrocés %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l l'opció de compatibilitat amb AT&T lex implica una penalització del " "rendiment molt gran\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " i pot ser l'origen real d'altres penalitzacions del rendiment notificades\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -500,48 +495,48 @@ msgstr "" "l'%%opció yylineno implica una penalització del rendiment NOMÉS en regles " "que poden fer coincidir caràcters de nova línia\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactiu) implica una xicoteta penalització del rendiment\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() implica una xicoteta penalització del rendiment\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT implica una penalització del rendiment molt gran\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Les regles de context posterior variable implica una penalització del " "rendiment molt gran\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT no es pot fer servir amb -f o -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "l'%opció yylineno no es pot fer servir amb REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "Les regles de context posterior variable no es poden utilitzar amb -f o -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "l'%opció yyclass només té sentit per a analitzadors de C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Forma d'ús: %s [OPCIONS] [FITXER]...\n" @@ -550,7 +545,7 @@ msgstr "Forma d'ús: %s [OPCIONS] [FITXER]...\n" # molt això de text emparellat. # Encara que coincident tampoc no m'acaba de convéncer. ear # I que faig amb "reentrant" i "parser"? jm -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -687,48 +682,48 @@ msgstr "" " -h, --help mostra aquest missatge d'ajuda\n" " -V, --version informa de la versió de %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "Ha fallat l'assignació de «sko_stack»" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "el nom «%s» és ridículament llarg" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "ha fallat l'assignació de memòria en allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "caràcter incorrecte «%s» detectat en check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "l'analitzador requereix l'opció -8 per a fer servir el caràcter %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "ha fallat l'assignació de memòria en allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: error intern fatal, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "ha fallat l'intent d'augmentar la mida de la matriu" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "línia incorrecta en el fitxer d'esquema" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "ha fallat l'assignació de memòria en yy_flex_xmalloc()" @@ -784,142 +779,138 @@ msgstr "massa regles (> %d)!" msgid "unknown error processing section 1" msgstr "s'ha produït un error desconegut en processar la secció 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "condició de començament incorrecta" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regla no reconeguda" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "s'ha utilitzat el context posterior dos vegades" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valors d'iteració incorrectes" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "el valor d'iteració ha de ser positiu" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "el rang de caràcters [%c-%c] és ambigu en un analitzador insensible a les " "majúscules i minúscules" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "rang negatiu en classe de caràcter" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] és ambigu en un analitzador insensible a les majúscules i " "minúscules" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] és ambigu en un analitzador insensible a les majúscules i " "minúscules" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "La línia d'entrada és massa llarga\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "directiva «%top» malformada" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "directiva «%» no reconeguda" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "El nom de la definició és massa llarg\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "«|» no emparellat" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "El valor de la definició de {%s} és massa llarg\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "definició del nom incompleta" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "La línia d'opcions és massa llarga\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opció no reconeguda: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "classe de caràcter incorrecta" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "definició no definida {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr " incorrecta: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "manca una cometa" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "expressió de la classe de caràcters incorrecta: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "caràcter incorrecte dins de {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "manca una }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "s'ha trobat un EOF dins d'una acció" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "s'ha trobat un EOF dins d'un patró" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "caràcter incorrecte: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "no es pot obrir %s" diff --git a/po/da.gmo b/po/da.gmo index 612ffe8..4215270 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 2f1bbbe..9d71793 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2015-04-26 09:12+0200\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -16,7 +16,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -78,22 +77,22 @@ msgstr "" "DFA-udskrift:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "kunne ikke oprette en unik buffersluttilstand" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "tilstand %d:\n" # Dette er ju helt sjukt. Har buggrapporteret dette at det bør # erstatas med %s -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Kunne ikke skrive yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "forkert overgangstegn fundet i sympartition()" @@ -109,29 +108,29 @@ msgstr "" "Ækvivalensklasser:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "tilstand %d accepterer: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "tilstand %d accepterer: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Kunne ikke skrive yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Kunne ikke skrive yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Kunne ikke skrive esctbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -141,39 +140,39 @@ msgstr "" "\n" "Meta-ækvivalensklasser:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Kunne ikke skrive yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "kunne ikke oprette yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Kunne ikke oprette yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Kunne ikke skrive yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Kunne ikke skrive yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Kunne ikke skrive ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Kunne ikke skrive ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Kunne ikke skrive eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Kunne ikke skrive yynultrans_tbl" @@ -230,259 +229,255 @@ msgstr "Flagene -+ og --reentrant er gensidigt udelukkende." msgid "bison bridge not supported for the C++ scanner." msgstr "bisonbro understøttes ikke for C++-skanneren." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "kunne ikke oprette %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "kunne ikke skrive tabellhoved" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "kan ikke åbne skabelonfilen %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "tildeling af makro-definition mislykkedes" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "fejl ved læsning af skabelonsfilen %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "fejl ved lukning af skabelonfilen %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "fejl ved oprettelsen af headerfilen %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "fejl ved skrivning af udfilen %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "fejl ved lukning af udfilen %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "fejl ved sletning af udfilen %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Ingen sikkerhedskopiering.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d sikkerhedskopierer (ikke-accepterende) tilstande.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Komprimerete tabeller backer alltid tillbaka.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "fejl ved skrivning af sikkerhedskopifilen %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "fejl ved lukning af sikerhedskopifilen %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Statistik over brugaf %s version %s:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " fortolkningsflag: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-tilstand\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-tilstand (%d ord)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d regler\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Ingen sikkerhedskopiering\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d sikkerhedskopierer (ikke-accepterende) tilstande.\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Komprimerede tabeller bakker altid tilbake\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Begyndelse-af-linje-mønster brugt\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startbetingelse\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontilstande, %d dobbelte epsilontilstande\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " ingen tegnklasser\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d tegnklasser behøvede %d/%d ord for gemning, %d genbrugte\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d par med tilstand/næste-tilstand oprettede\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unikke/duplikerede overgange\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d tabelposter\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base/standard-poster oprettede\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max %d) næste/test-poster oprettede\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max %d) skablon-næste/test-poster oprettede\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d tomme tabelposter\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototyper oprettede\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d skabloner oprettede, %d formål\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ækvivalensklasser oprettet\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-ækvivalensklasser oprettede\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d gemte) hash-kollisioner, %d DFA'er er ens\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d opsætninger med omallokeringer krævedes\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d totale tabelposter kræves\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Intern fejl. flexopts er fejlbehæftede.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prøv '%s --help' for mere information.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "ukendt flag til -C '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "uoprettelig fejl ved analysen" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "kunne ikke oprette sikkerhedskopi af info-fil %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "flaget -l for opførsel som AT&T's lex medfører et væsentligt præstationstab\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " og kan være den egentlige årsag til andre rapporter om dette\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -491,54 +486,54 @@ msgstr "" "%%option yylineno medfører et præstationstab KUN på regler der kan matche " "nylinje-tegn\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) medfører et mindre præstationstab\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() medfører et mindre præstationstab\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT medfører et væsentligt præstationstab\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regler for variabel efterfølgende kontekst medfører et væsentlig " "præstationstab\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kan ikke bruges sammen med -f eller -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kan ikke bruges sammen med REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "regler for variabel efterfølgende kontekst kan ikke bruges\n" "sammen med -f eller -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass er kun meningsfyldt for C++-fortolkere" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Brug: %s [FLAG] [FIL]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -667,48 +662,48 @@ msgstr "" " -h, --help udskriv denne hjælpebesked\n" " -V, --version udskriv %s version\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "tildeling af sko_stack mislykkedes" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "navnet '%s' er latterligt langt" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "hukommelsestildelingen mislykkedes i allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "forkert tegn '%s' fundet i check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "skanneren kræver flaget -8 for at kunne bruge tegnet %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "hukommelsestildelingen mislykkedes i allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: uoprettelig intern fejl, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "forsøg på at øge arraystørrelse mislykkedes" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "forkert linje i skeletfilen" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "hukommelsestildelingen mislykkedes i yy_flex_xmalloc()" @@ -764,136 +759,132 @@ msgstr "for mange regler (> %d)!" msgid "unknown error processing section 1" msgstr "ukendt fejl ved tolkning af sektion 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "forkert liste af startbetingelser" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "ukendt regel" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "efterfølgende kontekst brugt to gange" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "fejlagtige iterationsværdier" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iterationsværdi skal være positiv" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "tegnintervallet [%c-%c] er flertydigt i en versalufølsom skanner" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativt interval i tegnklasse" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] er flertydigt i en versalufølsom skanner" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] er flertydigt i en versalufølsom skanner" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "For lang inddatalinje\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "fejlagtigt '%top'-direktiv" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "ukendt '%'-direktiv" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "For langt definitionsnavn\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Ensomt '{'" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definitionsværdi for (%s) for langt\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "ufuldstændig navnedefinition" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "For lang valgmulighedslinje\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "ukendt %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "forkert tegnklasse" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "udefinieret definition {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "forkert : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "citationstegn savnes" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "forkert udtryk for tegnklasse: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "forkert tegn imellem {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "} savnes" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "filslutning mødt inden i en handling" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "filslutning mødt inden i et mønster" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "forkert tegn: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "kan ikke åbne %s" diff --git a/po/de.gmo b/po/de.gmo index bc52244..9a0061e 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 89f1909..3ab6ebf 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.36\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-08-03 13:42+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" @@ -15,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -77,20 +76,20 @@ msgstr "" "DFA-Ausgabe:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "konnte keinen einzigartigen Ende-des-Puffers-Zustand erzeugen" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "Zustand # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Konnte yynxt_tbl[][] nicht schreiben" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "ungültiges Übergangszeichen in sympartition() entdeckt" @@ -106,29 +105,29 @@ msgstr "" "Äquivalenz-Klassen:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "Zustand # %d akzeptiert: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "Zustand # %d akzeptiert: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Konnte yyacclist_tbl nicht schreiben" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Konnte yyacc_tbl nicht schreiben" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Konnte ecstbl nicht schreiben" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,39 +137,39 @@ msgstr "" "\n" "Meta-Äquivalenz-Klassen:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Konnte yymeta_tbl nicht schreiben" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Konnte yybase_tbl nicht schreiben" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Konnte yydef_tbl nicht schreiben" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Konnte yynxt_tbl nicht schreiben" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Konnte yychk_tbl nicht schreiben" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Konnte ftbl nicht schreiben" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Konnte ssltbl nicht schreiben" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Konnte eoltbl nicht schreiben" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Konnte yynultrans_tbl nicht schreiben" @@ -228,261 +227,257 @@ msgstr "Optionen „-+“ und „--reentrant“ schließen sich gegenseitig aus. msgid "bison bridge not supported for the C++ scanner." msgstr "Brücke zu Bison für den C++-Scanner nicht unterstützt." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "konnte %s nicht erzeugen" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "konnte Tabellenköpfe nicht schreiben" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "kann Skelett-Datei %s nicht öffnen" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "Anlegen der Makrodefinition fehlgeschlagen" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "Eingabefehler beim Lesen der Skelett-Datei %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "Fehler beim Schließen der Skelett-Datei %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "Fehler beim Erstellen der Header-Datei %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "Fehler beim Schreiben der Ausgabe-Datei %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "Fehler beim Schließen der Ausgabe-Datei %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "Fehler beim Löschen der Ausgabe-Datei %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Kein Backing-up.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d Zustände mit Backing-up (nicht akzeptierend).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Komprimierte Tabellen benutzen immer Backing-up.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "Fehler beim Schreiben der Backup-Datei %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "Fehler beim Schließen der Backup-Datei %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s Version %s Benutzungsstatistiken:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " Scanner-Optionen: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-Zustände\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-Zustände (%d Wörter)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d Regeln\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Kein Backing-up.\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d Zustände mit Backing-up (nicht akzeptierend).\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Komprimierte Tabellen benutzen immer Backing-up.\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Zeilenanfang-Muster benutzt\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d Startbedingungen\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d Epsilon-Zustände, %d Doppel-Epsilon-Zustände\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " keine Zeichenklassen\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d Zeichenklassen brauchten %d/%d Speicherwörter, %d wiederbenutzt\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d Zustand/Nächster-Zustand-Paare erzeugt\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d einzigartige/doppelte Übergänge\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d Tabelleneinträge\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d Einträge „base-def“ erzeugt\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max. %d) Einträge „nxt-chk“ erzeugt\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max. %d) Einträge „template nxt-chk“ erzeugt\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d leere Tabelleneinträge\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d Protos erzeugt\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d Schablonen erzeugt, %d Benutzungen\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d Äquivalenz-Klassen erzeugt\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d Meta-Äquivalenz-Klassen erzeugt\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d gespeichert) Hash-Kollisionen, %d DFAs gleich\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d Sätze von Neuallozierungen benötigt\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d Tabelleneinträge insgesamt benötigt\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Interner Fehler. flexopts sind missgestaltet.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Versuchen Sie es mit „%s --help“ für mehr Informationen.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "unbekannte „-C“-Option „%c“" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "fataler Parse-Fehler" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "konnte Datei %s mit Informationen zum Backing-up nicht erzeugen" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l AT&T-lex-Kompatibilitätsmodus führt zu großen Geschwindigkeitseinbußen\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " und ist möglicherweise die wirkliche Quelle anderer gemeldeter Einbußen\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -491,54 +486,54 @@ msgstr "" "%%option yylineno führt zu Geschwindigkeitseinbußen NUR für Regeln, die auf " "einen Zeilenvorschub passen können\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) führt zu kleineren Geschwindigkeitseinbußen\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() führt zu kleineren Geschwindigkeitseinbußen\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT führt zu großen Geschwindigkeitseinbußen\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regeln mit variablem folgenden Kontext führen zu großen " "Geschwindigkeitseinbußen\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kann nicht mit „-f“ oder „-F“ zusammen verwendet werden" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kann nicht mit REJECT zusammen verwendet werden" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "Regeln mit variablem folgenden Kontext können nicht mit „-f“ oder „-F“ " "verwendet werden" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass ist nur bei C++-Scannern sinnvoll" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Aufruf: %s [OPTIONEN...] [DATEI...]\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -670,48 +665,48 @@ msgstr "" " -h, --help produziere diese Hilfenachricht\n" " -V, --version melde %s-Version\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "Anlegen des sko_stack fehlgeschlagen" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "name „%s“ ist lächerlich lang" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "Speicheranforderung in allocate_array() fehlgeschlagen" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "ungültiges Zeichen „%s“ in check_char() entdeckt" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "Scanner erfordert Option „-8“, um das Zeichen %s benutzen zu können" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "Speicheranforderung in allocate_array() fehlgeschlagen" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: fataler interner Fehler, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "Versuch, die Feldgröße zu erhöhen, fehlgeschlagen" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "ungültige Zeile in Skelettdatei" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "Speicheranforderung in yy_flex_xmalloc() fehlgeschlagen" @@ -767,142 +762,138 @@ msgstr "zu viele Regeln (> %d)!" msgid "unknown error processing section 1" msgstr "unbekannter Fehler beim Bearbeiten von Abschnitt 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "ungültige Startbedingungs-Liste" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "nicht erkannte Regel" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "folgender Kontext doppelt verwendet" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "ungültige Iterationswerte" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "Iterationswerte müssen positiv sein" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "der Zeichenbereich [%c-%c] ist in Scannern ohne Beachtung von Groß-/" "Kleinschreibung mehrdeutig" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativer Bereich in Zeichenklasse" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] ist in Scannern ohne Beachtung von Groß-/Kleinschreibung " "mehrdeutig" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] ist in Scannern ohne Beachtung von Groß-/Kleinschreibung " "mehrdeutig" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Eingabezeile zu lang\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "falsch geformte „%top“-Direktive" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "nicht erkannte „%“-Direktive" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Definitionsname zu lang\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Unbalancierte „{“" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definitionswert für {%s} ist zu lang\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "unvollständige Namensdefinition" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Optionszeile zu lang\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "nicht erkannte %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "ungültige Zeichenklasse" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "undefinierte Definitione {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "ungültige : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "fehlendes Anführungszeichen" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "ungültiger Zeichenklassenausdruck: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "ungültiges Zeichen innerhalb von {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "fehlende }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF innerhalb einer Aktion angetroffen" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "EOF innerhalb eines Musters angetroffen" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "ungültiges Zeichen: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "kann %s nicht öffnen" diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo index 692a49a..2fa6847 100644 Binary files a/po/en@boldquot.gmo and b/po/en@boldquot.gmo differ diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 667b706..20c5b36 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,6 +1,6 @@ # English translations for flex package. # This file is put in the public domain. -# Automatically generated, 2017. +# Automatically generated, 2016. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -29,10 +29,10 @@ # msgid "" msgstr "" -"Project-Id-Version: flex 2.6.4\n" +"Project-Id-Version: flex 2.6.2\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" -"PO-Revision-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" +"PO-Revision-Date: 2016-10-24 18:33-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@boldquot\n" @@ -101,20 +101,20 @@ msgstr "" "DFA Dump:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "could not create unique end-of-buffer state" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "state # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Could not write yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "bad transition character detected in sympartition()" @@ -130,29 +130,29 @@ msgstr "" "Equivalence Classes:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "state # %d accepts: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "state # %d accepts: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Could not write yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Could not write yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Could not write ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -162,39 +162,39 @@ msgstr "" "\n" "Meta-Equivalence Classes:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Could not write yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Could not write yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Could not write yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Could not write yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Could not write yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Could not write ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Could not write ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Could not write eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Could not write yynultrans_tbl" @@ -251,259 +251,255 @@ msgstr "Options -+ and --reentrant are mutually exclusive." msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge not supported for the C++ scanner." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "could not create %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "could not write tables header" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "can't open skeleton file %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "Prefix cannot include ‘[’ or ‘]’" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "allocation of macro definition failed" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "input error reading skeleton file %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "error closing skeleton file %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "error creating header file %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "error writing output file %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "error closing output file %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "error deleting output file %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "No backing up.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d backing up (non-accepting) states.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Compressed tables always back up.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "error writing backup file %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "error closing backup file %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s version %s usage statistics:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " scanner options: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA states\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA states (%d words)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d rules\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " No backing up\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d backing-up (non-accepting) states\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Compressed tables always back-up\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Beginning-of-line patterns used\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d start conditions\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon states, %d double epsilon states\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " no character classes\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d character classes needed %d/%d words of storage, %d reused\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d state/nextstate pairs created\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unique/duplicate transitions\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d table entries\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def entries created\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (peak %d) nxt-chk entries created\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (peak %d) template nxt-chk entries created\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d empty table entries\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d protos created\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d templates created, %d uses\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d equivalence classes created\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-equivalence classes created\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d saved) hash collisions, %d DFAs equal\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d sets of reallocations needed\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d total table entries needed\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Internal error. flexopts are malformed.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "unknown -C option ‘%c’" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "fatal parse error" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "could not create backing-up info file %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex compatibility option entails a large performance penalty\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " and may be the actual source of other reported performance penalties\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -512,50 +508,50 @@ msgstr "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactive) entails a minor performance penalty\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() entails a minor performance penalty\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entails a large performance penalty\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Variable trailing context rules entail a large performance penalty\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT cannot be used with -f or -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno cannot be used with REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "variable trailing context rules cannot be used with -f or -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass only meaningful for C++ scanners" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Usage: %s [OPTIONS] [FILE]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -682,47 +678,47 @@ msgstr "" " -h, --help produce this help message\n" " -V, --version report %s version\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "allocation of sko_stack failed" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "name “%s” ridiculously long" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "memory allocation failed in allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "bad character ‘%s’ detected in check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scanner requires -8 flag to use the character %s" -#: src/misc.c:229 +#: src/misc.c:225 msgid "memory allocation failure in xstrdup()" msgstr "memory allocation failure in xstrdup()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: fatal internal error, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "attempt to increase array size failed" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "bad line in skeleton file" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "memory allocation failed in yy_flex_xmalloc()" @@ -778,136 +774,132 @@ msgstr "too many rules (> %d)!" msgid "unknown error processing section 1" msgstr "unknown error processing section 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "bad start condition list" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "Prefix must not contain [ or ]" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "unrecognized rule" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "trailing context used twice" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "bad iteration values" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteration value must be positive" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "the character range [%c-%c] is ambiguous in a case-insensitive scanner" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negative range in character class" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] is ambiguous in case insensitive scanner" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] ambiguous in case insensitive scanner" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Input line too long\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "malformed ‘%top’ directive" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "unrecognized ‘%’ directive" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Definition name too long\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Unmatched ‘{’" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definition value for {%s} too long\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "incomplete name definition" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Option line too long\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "unrecognized %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "bad character class" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "undefined definition {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "unbalanced parenthesis" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "bad : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "missing quote" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "bad character class expression: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "bad character inside {}'s" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "missing }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF encountered inside an action" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "EOF encountered inside pattern" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "bad character: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "can't open %s" diff --git a/po/en@quot.gmo b/po/en@quot.gmo index d32b1b5..599977d 100644 Binary files a/po/en@quot.gmo and b/po/en@quot.gmo differ diff --git a/po/en@quot.po b/po/en@quot.po index 36d9618..e689da8 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,6 +1,6 @@ # English translations for flex package. # This file is put in the public domain. -# Automatically generated, 2017. +# Automatically generated, 2016. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -26,10 +26,10 @@ # msgid "" msgstr "" -"Project-Id-Version: flex 2.6.4\n" +"Project-Id-Version: flex 2.6.2\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" -"PO-Revision-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" +"PO-Revision-Date: 2016-10-24 18:33-0400\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en@quot\n" @@ -98,20 +98,20 @@ msgstr "" "DFA Dump:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "could not create unique end-of-buffer state" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "state # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Could not write yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "bad transition character detected in sympartition()" @@ -127,29 +127,29 @@ msgstr "" "Equivalence Classes:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "state # %d accepts: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "state # %d accepts: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Could not write yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Could not write yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Could not write ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -159,39 +159,39 @@ msgstr "" "\n" "Meta-Equivalence Classes:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Could not write yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Could not write yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Could not write yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Could not write yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Could not write yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Could not write ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Could not write ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Could not write eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Could not write yynultrans_tbl" @@ -248,259 +248,255 @@ msgstr "Options -+ and --reentrant are mutually exclusive." msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge not supported for the C++ scanner." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "could not create %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "could not write tables header" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "can't open skeleton file %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "Prefix cannot include ‘[’ or ‘]’" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "allocation of macro definition failed" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "input error reading skeleton file %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "error closing skeleton file %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "error creating header file %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "error writing output file %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "error closing output file %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "error deleting output file %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "No backing up.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d backing up (non-accepting) states.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Compressed tables always back up.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "error writing backup file %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "error closing backup file %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s version %s usage statistics:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " scanner options: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA states\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA states (%d words)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d rules\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " No backing up\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d backing-up (non-accepting) states\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Compressed tables always back-up\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Beginning-of-line patterns used\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d start conditions\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon states, %d double epsilon states\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " no character classes\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d character classes needed %d/%d words of storage, %d reused\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d state/nextstate pairs created\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unique/duplicate transitions\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d table entries\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def entries created\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (peak %d) nxt-chk entries created\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (peak %d) template nxt-chk entries created\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d empty table entries\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d protos created\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d templates created, %d uses\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d equivalence classes created\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-equivalence classes created\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d saved) hash collisions, %d DFAs equal\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d sets of reallocations needed\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d total table entries needed\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Internal error. flexopts are malformed.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Try ‘%s --help’ for more information.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "unknown -C option ‘%c’" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "fatal parse error" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "could not create backing-up info file %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex compatibility option entails a large performance penalty\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " and may be the actual source of other reported performance penalties\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -509,50 +505,50 @@ msgstr "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactive) entails a minor performance penalty\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() entails a minor performance penalty\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entails a large performance penalty\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Variable trailing context rules entail a large performance penalty\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT cannot be used with -f or -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno cannot be used with REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "variable trailing context rules cannot be used with -f or -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass only meaningful for C++ scanners" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Usage: %s [OPTIONS] [FILE]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -679,47 +675,47 @@ msgstr "" " -h, --help produce this help message\n" " -V, --version report %s version\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "allocation of sko_stack failed" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "name “%s” ridiculously long" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "memory allocation failed in allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "bad character ‘%s’ detected in check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scanner requires -8 flag to use the character %s" -#: src/misc.c:229 +#: src/misc.c:225 msgid "memory allocation failure in xstrdup()" msgstr "memory allocation failure in xstrdup()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: fatal internal error, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "attempt to increase array size failed" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "bad line in skeleton file" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "memory allocation failed in yy_flex_xmalloc()" @@ -775,136 +771,132 @@ msgstr "too many rules (> %d)!" msgid "unknown error processing section 1" msgstr "unknown error processing section 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "bad start condition list" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "Prefix must not contain [ or ]" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "unrecognized rule" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "trailing context used twice" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "bad iteration values" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteration value must be positive" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "the character range [%c-%c] is ambiguous in a case-insensitive scanner" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negative range in character class" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] is ambiguous in case insensitive scanner" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] ambiguous in case insensitive scanner" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Input line too long\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "malformed ‘%top’ directive" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "unrecognized ‘%’ directive" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Definition name too long\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Unmatched ‘{’" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definition value for {%s} too long\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "incomplete name definition" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Option line too long\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "unrecognized %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "bad character class" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "undefined definition {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "unbalanced parenthesis" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "bad : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "missing quote" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "bad character class expression: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "bad character inside {}'s" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "missing }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF encountered inside an action" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "EOF encountered inside pattern" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "bad character: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "can't open %s" diff --git a/po/eo.gmo b/po/eo.gmo index 6b74299..de28b51 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index e116220..9db9785 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-09-08 07:15-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" @@ -15,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -77,20 +76,20 @@ msgstr "" "Nekropsio DFA:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "ne eblis krei unikan staton de bufro-fino" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "stato * %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Ne eblis skribi yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "malĝusta transiga signo estis detektata en sympartition()" @@ -106,29 +105,29 @@ msgstr "" "Ekvivalentecaj Klasoj:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "stato # %d akceptas: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "stato # %d akceptas: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Ne eblis skribi yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Ne eblis skribi yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Ne eblis skribi ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,39 +137,39 @@ msgstr "" "\n" "Meta-Ekvivalentecaj Klasoj:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Ne eblis skribi yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Ne eblis skribi yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Ne eblis skribi yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Ne eblis skribi yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Ne eblis skribi yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Ne eblis skribi ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Ne eblis skribi ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Ne eblis skribi eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Ne eblis skribi yynultrans_tbl" @@ -228,261 +227,257 @@ msgstr "Modifiloj -+ kaj --reentrant estas reciproke ekskluzivaj." msgid "bison bridge not supported for the C++ scanner." msgstr "bison-ponto ne estas subtenata por la skanilo C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "ne eblis krei %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "ne eblis skribi tabel-kapojn" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "ne eblas malfermi la skeletan dosieron %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "rezervo de makroa difino fiaskis" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "eniga eraro dum lego de la skeleta dosiero %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "eraro dum fermo de la skeleta dosiero %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "eraro dum kreo de la kap-dosiero %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "eraro dum skribo de la eliga dosiero %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "eraro dum fermo de la eliga dosiero %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "eraro dum forigo de eliga dosiero %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Sen savkopiado.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d savkopiadas (ne-akceptantajn) statojn.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Densigitaj tabeloj ĉiam estas savkopiataj.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "eraro dum skribo de la savkopia dosiero %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "eraro dum fermo de la savkopia dosiero %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versio %s statistikoj pri usado:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " skanilaj modifiloj: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d statoj NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d statoj DFA (%d vortoj)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d reguloj\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Sen savkopiado\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d savkopianta (ne-akceptantajn) statojn\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Densigitaj tabeloj ĉiam savkopiite\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " modeloj komenco-de-linio estas uzataj\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d komencaj kondiĉoj\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilonaj statoj, %d duoblaj epsilonaj statoj\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " neniu signo-klaso\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d signo-klasoj bezonis %d/%d vortojn da memoro, %d reuzitaj\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d stato/sekvstato-paroj estis kreataj\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unikaj/duobligitaj transigoj\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d tabel-enigoj\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d bazo-def enigoj estis kreataj\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pinto %d) enigoj nxt-chk estis kreataj\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pinto %d) ŝablonaj enigoj nxt-chk estis kreataj\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d malplenaj tabel-enigoj\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d protoj estis kreataj\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d ŝablonoj estis kreataj, %d uzoj\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalento-klasoj estis kreataj\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d metaekvivalento-klasoj estis kreataj\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d konservitaj) haketaj kolizioj, %d DFA egalaj\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d aroj de relokigoj estas bezonataj\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " entute %d tabel-enigoj estas bezonataj\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Interna eraro. 'flexopt' estas misformitaj.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Provu '%s --help' por pli da informo.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "nekonata modifilo -C '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "neriparebla analiz-eraro" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "ne eblis krei savkopiad-informan dosieron %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "La modifilo -l AT&T de akordigo al lex alportas grandan malaltigon de " "rendimento\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " kaj povas esti la vera fonto de aliaj raportitaj malaltigoj de rendimento\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -491,50 +486,50 @@ msgstr "" "%%option yylineno alportas malaltigon de rendimento NUR kun reguloj kiuj " "povas akordiĝi kun novliniaj signoj\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interage) alportas etan malaltigon de rendimento\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() alportas etan malaltigon de rendimento\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT alportas grandan malaltigon de rendimento\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Variabla vosta kunteksto alportas grandan malaltigon de rendimento\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ne povas esti uzata kun -f aÅ­ F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ne povas esti uzata kun REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "variablaj vostaj kuntekstaj reguloj ne povas esti uzataj kun -f aÅ­ F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass nur koheras por skaniloj C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uzado: %s [MODIFILOJ] [DOSIERO]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -664,48 +659,48 @@ msgstr "" " -h, --help produkti tiun ĉi help-mesaĝon\n" " -V, --version raporti la version de %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "rezervo de sko_stack fiaskis" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "la nomo \"%s\" estas ridinde longa" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "rezervo de memoro fiaskis en allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "malĝusta signo '%s' estis detektata en check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "la skanilo postulas la flagon -8 por uzi la signon %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "rezervo de memoro fiaskis en allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: neriparebla interna eraro, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "provo pliigi grandon de tabelo fiaskis" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "malĝusta linio en skeleta dosiero" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "rezervo de memoro fiaskis en yy_flex_xmalloc()" @@ -761,136 +756,132 @@ msgstr "tro multe da reguoloj (> %d)!" msgid "unknown error processing section 1" msgstr "Nekonata erar-proceza sekcio 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "malĝusta komenc-kondiĉa listo" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "nerekonata regulo" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "vosta kunteksto estis uzata duoble" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "malĝustaj iteraciaj valoroj" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteracia valoro devas esti pozitiva" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "la signara intervalo [%c-%c] estas dusenca en sen-uskleca skanilo" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativa intervalo en signo-klaso" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] estas dusenca en sen-uskleca skanilo" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] estas dusenca en sen-uskleca skanilo" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Eniga linio tro longas\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "misformita instrukcio '%top'" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "nerekonita instrukcio '%'" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Nom-difino tro longas\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Senpara '{'" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Valor-difino por {%s} tro longas\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "nekompleta nom-difino" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Linio de modifiloj tro longas\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "nerekonita %%modifilo: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "malĝusta signo-klaso" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "nedifinita difino {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "malĝusta : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "mankas citilo" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "malĝusta signo-klasa esprimo: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "malĝusta signo interne de {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "mankas }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF estis trovata interne de ago" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "EOF estis trovata interne de modelo" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "malĝusta signo: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "ne eblas malfermi %s" diff --git a/po/es.gmo b/po/es.gmo index 707243f..f688e79 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 40f4025..e07f69e 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU flex 2.5.8\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2003-01-02 12:06+0100\n" "Last-Translator: Nicolás García-Pedrajas \n" "Language-Team: Spanish \n" @@ -15,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -91,20 +90,20 @@ msgstr "" "Volcado AFD:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "no se pudo crear un estado único de final-de-buffer" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "estado # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "carácter de transición erróneo detectado en sympartition()" @@ -120,32 +119,32 @@ msgstr "" "Clases de equivalencia:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "el estado # %d acepta: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "el estado # %d acepta: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 #, fuzzy msgid "Could not write ecstbl" msgstr "no se pudo crear %s" # ¿No sería mejor "MetaEquivalencia" o "Meta-Equivalencia"? sv # yo prefiero como está, es el mismo caso de metafísica ng+ -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -155,43 +154,43 @@ msgstr "" "\n" "Clases de metaequivalencia:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "" -#: src/gen.c:1352 +#: src/gen.c:1348 #, fuzzy msgid "Could not write yybase_tbl" msgstr "no se pudo crear %s" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 #, fuzzy msgid "Could not write ftbl" msgstr "no se pudo crear %s" -#: src/gen.c:1614 +#: src/gen.c:1610 #, fuzzy msgid "Could not write ssltbl" msgstr "no se pudo crear %s" -#: src/gen.c:1665 +#: src/gen.c:1661 #, fuzzy msgid "Could not write eoltbl" msgstr "no se pudo crear %s" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "" @@ -267,12 +266,12 @@ msgstr "-+ y -R son mutuamente excluyentes" msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "no se pudo crear %s" -#: src/main.c:431 +#: src/main.c:432 #, fuzzy msgid "could not write tables header" msgstr "no se pudo crear %s" @@ -281,16 +280,12 @@ msgstr "no se pudo crear %s" # lo mismo de antes ng # Lo mismo que antes :) em # idem ng+ -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "no se puede abrir el archivo de esquema %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "" @@ -310,46 +305,46 @@ msgstr "" # que decida una tercera persona # # ## Cambio "leyendo" por "al leer", como en otras traducciones. sv -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "error de entrada al leer el archivo de esquema %s" # Otra vez :) em -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "error al cerrar el archivo de esquema %s" # Lo mismo, archivo de seguridad? em -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "error al crear el archivo de cabecera %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "error al escribir el archivo de salida %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "error al cerrar el archivo de salida %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "error al borrar el archivo de salida %s" # Copia de seguridad? em # Sugerencia: No hay retroceso. sv -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Sin retroceso.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d estados de retroceso (no-aceptación).\n" @@ -359,13 +354,13 @@ msgstr "%d estados de retroceso (no-aceptaci # "Compressed tables are always back up" # (supuesto que back es irregular y su pasado/participio es back y no backed, # que ahora mismo no me acuerdo). sv -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Las tablas comprimidas siempre implican un retraso.\n" # Lo mismo, archivo de seguridad? em -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "error al escribir el archivo de seguridad %s" @@ -373,47 +368,47 @@ msgstr "error al escribir el archivo de seguridad %s" # En todas las traducciones que ha aparecido # he sugerido el uso de copia de seguridad em # ok ng -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "error al cerrar el archivo de copia de seguridad %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versión %s estadísticas de uso:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " opciones del analizador: -" # NFA significa non-deterministic finite automata, así que lo he traducido # por AFN -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estados AFN\n" # DFA significa deterministic finite autómata, lo he traducido por AFD -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estados AFD {%d palabras}\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d reglas\n" # Otra vez ;) em # modificado como en la anterior ng -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Sin retroceso\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d estados de retroceso (no-aceptación)\n" @@ -421,18 +416,18 @@ msgstr " %d estados de retroceso (no-aceptaci # FIXME. # Informar al autor de que esta frase es casi idéntica a una anterior, para # que sólo haya que traducirla una vez. sv -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Siempre se realiza copia de seguridad de las tablas comprimidas\n" # Lo mismo "se han usado patrones de comienzo de línea". sv -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Usados patrones de comienzo-de-línea\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condiciones de activación\n" @@ -445,17 +440,17 @@ msgstr " %d/%d condiciones de activaci # lo de doble épsilon no lo he oído nunca. Creo que hay que dejar el término # técnico. ng # Tu mandas, no tengo nada que decir a eso em -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estados épsilon, %d estados doble épsilon\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " sin clases de caracteres\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" @@ -466,13 +461,13 @@ msgstr "" # ¿Qué tal " se han creado %d pares estado/estado-siguiente"? # Bueno, mejor no lo hagas hasta que no se sepa cómo queda al lado # de las otras. sv -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d pares estado/estado-siguiente creados\n" # ## Añado sendas eses, ya que son transiciones. sv -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transiciones únicas/duplicadas\n" @@ -481,50 +476,50 @@ msgstr " %d/%d transiciones # sí, mejor ng # ¿Que había antes? (¿entradas a la tabla?) # (entradas *de* la tabla me suena mejor) sv. -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d entradas en la tabla\n" # ## pongo `comillas' en el base-def. sv -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entradas `base-def' creadas\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas nxt-chk creadas\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas de plantilla nxt-chk creadas\n" # ¿entradas a la tabla o entradas de la tabla? sv -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d entradas en la tabla vacías\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototipos creados\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d plantillas creadas, %d usos\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d clases de equivalencia creadas\n" # "se han creado..." sv -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d clases de metaequivalencia creadas\n" @@ -542,40 +537,40 @@ msgstr " %d/%d clases de metaequivalencia creadas\n" # un lugar que se puede determinar mediante una transformación directa de su # clave, por eso si hay dos claves iguales hay una colisión, porque dos # registros van al mismo sitio ng+ -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" " %d (%d almacenadas) colisiones de localización ('hash'), %d AFDs iguales\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " se necesitan %d conjuntos de relocalización\n" # Lo mismo que en otro sitio: ¿table entries son entradas a la tabla o # de la tabla? sv -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " se necesitan %d entradas totales en la tabla\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Error interno. flexopts mal formadas.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Pruebe `%s --help' para más información.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "opción -C desconocida '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" @@ -592,7 +587,7 @@ msgstr "%s %s\n" # Sugerencia: error fatal. sv # con comillas es un término medio. Lo de error grave fue una sugerencia # de Enrique, y croe que queda mejor. ng+ -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "error muy grave en el analizador sintáctico" @@ -615,28 +610,28 @@ msgstr "error muy grave en el analizador sint # ## # ## Eso no es válido ( solución, usa emacs po-mode :) ) em # ## ok, ya estoy instalando linux otra vez ng+ -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "" "no se pudo crear el archivo de información de las reglas\n" "que producen un retroceso del analizador %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l la opción de compatibilidad con AT&T lex implica una penalización del\n" "rendimiento muy alta\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " y puede ser el origen real de otras penalizaciones del rendimiento " "notificadas\n" -#: src/main.c:1538 +#: src/main.c:1537 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -644,53 +639,53 @@ msgid "" msgstr "" "la %%opción yylineno implica una penalización del rendimiento muy alta\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactivo) implica una pequeña penalización del rendimiento\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() implica un pequeña penalización del rendimiento\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT implica una penalización del rendimiento muy alta\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "La existencia de reglas de contexto posterior variable implica una\n" "penalización del rendimiento muy alta\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT no se puede usar con -f o -F" -#: src/main.c:1576 +#: src/main.c:1575 #, fuzzy, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "la %opción yylineno no se puede usar con -f o -F" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "las reglas de contexto posterior variable no se pueden usar con -f o -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "la %option yyclass sólo tiene sentido para los analizadores en C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uso: %s [OPCIONES] [FICHERO]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -818,11 +813,11 @@ msgstr "" " -h, --help produce este mensaje de ayuda\n" " -V, --version informa de la versión %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nombre \"%s\" ridículamente grande" @@ -832,18 +827,18 @@ msgstr "nombre \"%s\" rid # Sí, pero creo que sólo por mí. Normalmente esos mensajes # los dá la biblioteca C antes em # ok ng+ -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "falló la asignación de memoria en `allocate_array()'" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "carácter incorrecto '%s' detectado en `check_char()'" # he añadido el `poder' em # ok ng -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "el analizador requiere la opción -8 para poder usar el carácter %s" @@ -853,26 +848,26 @@ msgstr "el analizador requiere la opci # Sí, pero creo que sólo por mí. Normalmente esos mensajes # los dá la biblioteca C antes em # ok ng+ -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "falló la asignación de memoria en `allocate_array()'" # Sugerencia: error fatal. sv -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: error interno muy grave, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "falló el intento de aumentar el tamaño de la matriz" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "línea incorrecta en el archivo de esquema" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "la reserva de memoria falló en yy_flex_xmalloc()" @@ -931,111 +926,107 @@ msgstr "demasiadas reglas (> %d)!" msgid "unknown error processing section 1" msgstr "error desconocido en el proceso de la sección 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "lista de condiciones de activación incorrecta" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regla no reconocida" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "contexto posterior usado dos veces" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valores incorrectos para iteración" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "los valores para iteración deben ser positivos" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "rango negativo en clase caracteres" -#: src/parse.y:918 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "\t-i genera un analizador que no distingue entre mayúsculas y minúsculas\n" -#: src/parse.y:924 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "\t-i genera un analizador que no distingue entre mayúsculas y minúsculas\n" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "" -#: src/scan.l:183 +#: src/scan.l:181 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "directiva '%' no reconocida" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "directiva '%' no reconocida" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "definición de nombre incompleta" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opción no reconocida: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "clase de caracteres incorrecta" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "definición no definida {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr " incorrecta: %s" # Sugerencia: falta una comilla. sv -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "falta comilla" @@ -1043,35 +1034,35 @@ msgstr "falta comilla" # incorrecta la expresión ... em # ok, de traducir al final ocurre que acabas hablando al revés, # como en inglés ng -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "expresión de la clase de caracteres incorrecta: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "carácter incorrecto dentro de {}'s" # Sugerencia: "falta una }". sv -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "falta }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "Fin de archivo (EOF) encontrado dentro de una acción" -#: src/scan.l:977 +#: src/scan.l:978 #, fuzzy msgid "EOF encountered inside pattern" msgstr "Fin de archivo (EOF) encontrado dentro de una acción" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "carácter incorrecto: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "no se puede abrir %s" diff --git a/po/fi.gmo b/po/fi.gmo index 80076ad..fff6702 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 7132566..50ff9c3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.36\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-08-02 21:16+0200\n" "Last-Translator: Jorma Karvonen \n" "Language-Team: Finnish \n" @@ -16,7 +16,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/buf.c:79 @@ -81,20 +80,20 @@ msgstr "" "Deterministisen äärellisen automaatin vedos:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "ei voitu luoda uniikkia puskurinlopputilaa" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "tila numero %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Ei voitu kirjoittaa yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "väärä siirtymämerkki havaittu funktiossa sympartition()" @@ -110,29 +109,29 @@ msgstr "" "Ekvivalenssiluokat:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "tila numero %d hyväksyy: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "tila numero %d hyväksyy: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Ei voitu kirjoittaa: yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Ei voitu kirjoittaa: yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Ei voitu kirjoitaa ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -142,39 +141,39 @@ msgstr "" "\n" "Meta-ekvivalenssiluokkia:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Ei voitu kirjoittaa: yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Ei voitu kirjoittaa: yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Ei voitu kirjoittaa: yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Ei voitu kirjoittaa: yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Ei voitu kirjoittaa: yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Ei voitu kirjoittaa: ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Ei voitu kirjoittaa: ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Ei voitu kirjoittaa: eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Ei voitu kirjoittaa: yynultrans_tbl" @@ -233,264 +232,260 @@ msgstr "Valitsimen -+ ja --reentrant ovat toisensa poissulkevia." msgid "bison bridge not supported for the C++ scanner." msgstr "”bison bridge”-menettelyä ei tueta C++-skannerille." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "ei voitu luoda %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "ei voitu kirjoittaa tauluotsaketta" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "ei voi avata kehystiedostoa %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "Makromäärityksen varaaminen epäonnistui" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "syötevirhe luettaessa kehystiedostoa %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "virhe suljettaessa kehystiedostoa %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "virhe luotaessa otsaketiedostoa %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "virhe kirjoitettaessa tulostetiedostoa %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "virhe suljettaessa tulostetiedostoa %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "virhe poistettaessa tulostetiedostoa %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Ei varmuuskopiointia.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d (ei-hyväksyvää) varmuuskopiointitilaa.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Tiivistetyt taulut varmuuskopioidaan aina.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "virhe kirjoitettaessa varmuuskopiotiedostoa %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "virhe suljettaessa varmuuskopiotiedostoa %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s-version %s käyttötilastot:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " skannerivalitsimet: -" # Epädeterministinen äärellinen automaatti, lyh. NFA (engl. non-deterministic finite-state automaton) -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d Epädeterministisen äärellisen automaatin tilaa\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d Deterministisen äärellisen automaatin tilaa (%d sanaa)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d sääntöä\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Ei varmuuskopiointia\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d (ei-hyväksyvää) varmuuskopiotilaa\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Tiivistetyt taulut varmuuskopioidaan aina\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Rivin-alku-malleja käytetään\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d-käynnistysehtoja\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon-tilaa, %d double epsilon-tilaa\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " ei merkkiluokkia\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d merkkiluokkaa tarvittu %d/%d tallennussanaan, %d käytetty uudelleen\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d tila/seuraavatila-paria luotu\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d uniikkia/kaksoiskappelsiirtymää\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d-tauluriviä\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def-alkiota luotu\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (huippu %d) nxt-chk-alkiota luotu\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (huippu %d) malline nxt-chk-alkiota luotu\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d tyhjää taulualkiota\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d protoa luotu\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mallinetta luotu, %d käytetään\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalenssiluokkaa luotu\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-ekvivalenssiluokkaa luotu\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" " %d (%d tallennettu) hash-törmäykset, yhtäsuuri kuin %d Deterministisen " "äärellisen automaatin törmäystä\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d uudelleenvarausjoukkoa tarvittu\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d taulukkoalkiota tarvittu yhteensä\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Sisäinen virhe. flex-valitsimet ovat vääränmuotoisia.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Lisätietoja käskyllä ”%s --help”.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "tuntematon valitsin -C ”%c”" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "vakava jäsennysvirhe" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "ei voitu luoda varmuuskopiotietotiedostoa %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l AT&T lex-yhteensopivuusvalitsin tuo mukanaan ison suorituskykysakon\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " ja saattaa olla muiden ilmoitettujen suorituskykysakkojen todellinen lähde\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -499,51 +494,51 @@ msgstr "" "%%option yylineno tuo mukanaan suorituskykysakon VAIN säännöissä, jotka " "voivat täsmätä rivinvaihtomerkkeihin\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiivinen) tuo mukanaan pienemmän suorituskykysakon\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() tuo mukanaan pienemmän suorituskykysakon\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT tuo mukanaan ison suorituskykyrangaistuksen\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Muuttujajättökontekstisäännöt tuovat mukanaan ison suorityskykysakon\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ei voida käyttää valitsimen -f tai -F kanssa" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ei voi käyttää REJECT:n kanssa" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "muuttujajättökontekstisääntöjä ei voida käyttää valitsimen -f tai -F kanssa" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass on merkityksellinen vain C++-skannereille" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Käyttö: %s [VALITSIMET] [TIEDOSTO]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -677,48 +672,48 @@ msgstr "" " -h, --help tuota tämä opastesanoma\n" " -V, --version ilmoita %s-versio\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "sko_stack-varaaminen epäonnistui" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nimi ”%s” on naurettavan pitkä" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "muistinvaraus epäonnistui funktiossa allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "väärä merkki ”%s” havaittu funktiossa check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "skanneri vaatiin lipun -8 käytettäväksi merkille %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "muistinvaraus epäonnistui funktiossa allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: vakava sisäinen virhe, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "yritys taulukon koon kasvattamiseksi epäonnistui" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "väärä rivi kehystiedostossa" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "muistinvaraus epäonnistui funktiossa yy_flex_xmalloc()" @@ -777,140 +772,136 @@ msgstr "liian moni sääntöjä (> %d)!" msgid "unknown error processing section 1" msgstr "tuntematon virhe käsiteltäessä lohkoa 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "väärä alkuehtoluettelo" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "tunnistamaton sääntö" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "jättökontekstia käytetty kahdesti" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "vääriä iteraatioarvoja" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteraatioarvon on oltava positiivinen" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "merkkialue [%c-%c] ei ole yksiselitteinen skannerissa, joka ei välitä " "kirjainkoosta" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negatiivinen lukualue merkkiluokassa" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] ei ole yksiselitteinen skannerissa, joka ei välitä kirjainkoosta" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] ei ole yksiselitteinen skannerissa, joka ei välit kirjainkoosta" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Syöterivi on liian pitkä\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "vääränmuotoinen ”%top”-direktiivi" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "tunnistamaton ”%”-direktiivi" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Määritysnimi on liian pitkä\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Pariton ”{”" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Määritysarvo kohteelle {%s} on liian pitkä\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "epätäydellinen nimimäärittely" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Valitsinrivi on liian pitkä\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "tunnistamaton %%valitsin: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "väärä merkkiluokka" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "määrittelemätön määrittely {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "virheellinen : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "puuttuva lainausmerkki" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "väärä merkkiluokkalauseke: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "väärä merkki aaltosulkeiden {} sisällä" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "puuttuva }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "Tiedoston loppumerkki EOF tavattu toiminnon sisällä" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "Tiedoston loppumerkki EOF tavattu mallin sisällä" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "väärä merkki: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "ei voi avata %s" diff --git a/po/flex.pot b/po/flex.pot index f965b48..6e163ec 100644 --- a/po/flex.pot +++ b/po/flex.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: flex 2.6.4\n" +"Project-Id-Version: flex 2.6.2\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,20 +70,20 @@ msgid "" "\n" msgstr "" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "" @@ -95,68 +95,68 @@ msgid "" "\n" msgstr "" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "" -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" "Meta-Equivalence Classes:\n" msgstr "" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "" @@ -213,308 +213,304 @@ msgstr "" msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr "" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr "" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr "" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr "" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr "" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr "" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr "" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr "" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr "" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr "" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr "" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr "" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr "" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr "" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr "" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr "" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr "" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr "" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr "" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr "" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr "" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "" -#: src/main.c:1794 +#: src/main.c:1793 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -580,47 +576,47 @@ msgid "" " -V, --version report %s version\n" msgstr "" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "" -#: src/misc.c:229 +#: src/misc.c:225 msgid "memory allocation failure in xstrdup()" msgstr "" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "" @@ -673,136 +669,132 @@ msgstr "" msgid "unknown error processing section 1" msgstr "" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "" diff --git a/po/fr.gmo b/po/fr.gmo index 185f016..669ba2f 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 8ff3737..eeb602f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-09-19 21:01-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -19,7 +19,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.4\n" @@ -83,20 +82,20 @@ msgstr "" "Vidage de l'AFD :\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "impossible de créer un seul état de fin de tampon" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "état nº %d :\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Impossible d'écrire yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "mauvais caractère de transition détecté dans sympartition()" @@ -112,29 +111,29 @@ msgstr "" "Classes d'équivalence :\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "l'état nº %d accepte : [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "l'état nº %d accepte : " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Impossible d'écrire yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Impossible d'écrire yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Impossible d'écrire ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -144,39 +143,39 @@ msgstr "" "\n" "Classes de métaéquivalence :\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Impossible d'écrire yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Impossible d'écrire yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Impossible d'écrire yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Impossible d'écrire yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Impossible d'écrire yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Impossible d'écrire ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Impossible d'écrire ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Impossible d'écrire eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Impossible d'écrire yynultrnas_tbl" @@ -237,262 +236,258 @@ msgstr "Les options +- et --reentrant sont mutuellement exclusives." msgid "bison bridge not supported for the C++ scanner." msgstr "bridge bison n'est pas pris en charge pour l'analyseur C++" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "impossible de créer %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "impossible d'écrire les tables d'en-tête" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "impossible d'ouvrir le fichier canevas %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "échec d'allocation de définition de macro" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "erreur de lecture du fichier canevas %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "erreur de fermeture du fichier canevas %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "erreur de création du fichier d'en-tête %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "erreur d'écriture du fichier de sortie %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "erreur de fermeture du fichier de sortie %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "erreur d'effacement du fichier de sortie %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Pas d'archivage.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d états d'archivage (non acceptants).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Les tables comprimées sont toujours archivées.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "erreur d'écriture du fichier de sauvegarde %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "erreur de fermeture du fichier de sauvegarde %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "« %s » version %s, statistiques d'utilisation :\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " options de l'analyseur lexical : -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d états NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d états AFD (%d mots)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d règles\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Pas d'archivage\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d états d'archivage (si non acceptants)\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Les tables comprimées sont toujours archivées\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Modèles utilisés en début de ligne\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d conditions de départ\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d états epsilon, %d états double epsilon\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " pas de classes de caractères\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d classes de caractères nécessaires %d/%d mots-mémoire, %d recyclés\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d paires state/nextstate produites\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transitions uniques/dupliquées\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d entrées dans la table\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entrées base-def produites\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max. %d) entrées nxt-chk produites\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max. %d) entrées de modèle nxt-chk produites\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d entrées vides dans la table\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototypes produits\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modèles produits, %d usages\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes d'équivalence produites\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de métaéquivalence produites\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d sauvés) collisions durant dispersion, %d AFD égaux\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d ensembles de réallocations nécessaires\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d entrées nécessaires dans la table, au total\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Erreur interne. Les options « flexopts » sont mal composées.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" "Exécutez « %s --help » pour obtenir des renseignements complémentaires.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "l'option -C « %c » inconnue" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "erreur de lecture fatale" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "impossible de créer le fichier d'informations d'archivage %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "L'option -l de compatibilité avec le « lex » d'AT&T entraîne une importante\n" "perte de performance\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " et peuvent être cause d'autres vices de performance observés\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -501,54 +496,54 @@ msgstr "" "%%option yylineno n'entraîne une importante perte de performance QUE sur\n" "les règles pouvant correspondre avec le caractère de changement de ligne\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "l'option -I (interactif) entraîne une faible perte de performance\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() entraîne une faible baisse de performance\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT entraîne une importante baisse de performance\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Les règles de contexte traîné variable entraînent une importante baisse de\n" "performance\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT ne peut pas être utilisé avec -f ou -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno ne peut être utilisé avec REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "les règles de contexte traîné variable ne peuvent pas être utilisées avec\n" "-f ou -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass n'a de sens qu'avec les analyseurs C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Utilisation : %s [OPTIONS] [FICHIER]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -684,49 +679,49 @@ msgstr "" " -h, --help afficher l'aide-mémoire\n" " -V, --version afficher la version %s du logiciel\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "échec d'allocation de sko_stack" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "le nom « %s » est ridiculement long" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "échec d'allocation mémoire dans allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "mauvais caractère « %s » détecté dans check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "" "l'analyseur nécessite l'option -8 pour pouvoir utiliser le caractère %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "échec d'allocation mémoire dans allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s : erreur interne fatale, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "échec de la tentative d'augmenter la taille du tableau" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "mauvaise ligne dans le fichier canevas" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "échec d'allocation mémoire dans yy_flex_xmalloc()" @@ -782,138 +777,134 @@ msgstr "trop de règles (> %d)." msgid "unknown error processing section 1" msgstr "erreur inconnue de traitement à la section 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "mauvaise liste de conditions de départ" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "règle non reconnue" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "contexte traîné utilisé deux fois" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valeurs d'itération erronée" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "la valeur d'itération doit être positive" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "l'étendue de caractères [%c-%c] est ambiguë pour un scanner insensible à la " "casse" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "plage négative dans la classe de caractères" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] est ambigu pour un scanner insensible à la casse" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] est ambigu pour un scanner insensible à la casse" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "ligne d'entrée trop longue\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "directive « %top » mal composée" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "directive « % » inconnue" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Nom de définition trop long\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "« { » non apparié" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Valeur de définition trop longue pour {%s}\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "définition de nom incomplète" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Ligne d'option trop longue\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "%%option non reconnue : %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "mauvaise classe de caractères" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "définition {%s} non définie" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "mauvaise  : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "guillemet manquant" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "mauvaise expression de classe de caractères : %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "mauvais caractère entre accolades « {} »" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "« } » manquante" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "Fin de fichier rencontrée à l'intérieur d'une action" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "Fin de fichier rencontrée à l'intérieur d'un modèle" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "mauvais caractère : %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "impossible d'ouvrir %s" diff --git a/po/ga.gmo b/po/ga.gmo index 85eaf91..cae3ac5 100644 Binary files a/po/ga.gmo and b/po/ga.gmo differ diff --git a/po/ga.po b/po/ga.po index 32ef518..2d8813a 100644 --- a/po/ga.po +++ b/po/ga.po @@ -1,36 +1,35 @@ # Irish translations for flex. # Copyright (C) 2008 The Flex Project (msgids) # This file is distributed under the same license as the flex package. -# Kevin Patrick Scannell , 2003, 2006, 2008, 2017. +# Kevin Patrick Scannell , 2003, 2006, 2008. msgid "" msgstr "" -"Project-Id-Version: flex 2.5.38\n" +"Project-Id-Version: flex 2.5.34\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" -"PO-Revision-Date: 2017-01-10 09:37-0500\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" +"PO-Revision-Date: 2008-07-23 09:37-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "Language: ga\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" -msgstr "Níorbh fhéidir spás a leagan amach chun teaghrán a phriontáil" +msgstr "" #: src/buf.c:107 msgid "Allocation of buffer for line directive failed" -msgstr "Níorbh fhéidir spás a leagan amach do threoir líne" +msgstr "" #: src/buf.c:177 msgid "Allocation of buffer for m4 def failed" -msgstr "Níorbh fhéidir spás a leagan amach do shainmhíniú m4" +msgstr "" #: src/buf.c:198 msgid "Allocation of buffer for m4 undef failed" -msgstr "Níorbh fhéidir spás a leagan amach do dhí-shainmhíniú m4" +msgstr "" #: src/dfa.c:59 #, c-format @@ -39,12 +38,12 @@ msgstr "Níl an staid #%d ina staid ghlactha -\n" #: src/dfa.c:119 msgid "dangerous trailing context" -msgstr "comhthéacs leantach baolach" +msgstr "comhthéacs sraoilleach baolach" #: src/dfa.c:159 #, c-format msgid " associated rule line numbers:" -msgstr " líne-uimhreacha de na rialacha gaolmhara:" +msgstr " líne-uimhreacha de na rialacha bainteacha:" #: src/dfa.c:193 #, c-format @@ -63,7 +62,7 @@ msgstr "" #: src/dfa.c:331 msgid "consistency check failed in epsclosure()" -msgstr "níorbh fhéidir comhsheasmhacht a sheiceáil in epsclosure()" +msgstr "theip ar sheiceáil chomhionannais i epsclosure()" #: src/dfa.c:419 msgid "" @@ -74,23 +73,23 @@ msgid "" msgstr "" "\n" "\n" -"Dumpa DFA:\n" +"Dumpáil DFA:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "níorbh fhéidir staid shainiúil a chruthú ag deireadh maoláin" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "staid # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Níorbh fhéidir yynxt_tbl[][] a scríobh" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "carachtar trasdula neamhbhailí i sympartition()" @@ -106,29 +105,29 @@ msgstr "" "Aicmí Coibhéise:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "glacann staid # %d le: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "glacann staid # %d le: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Níorbh fhéidir yyacclist_tbl a scríobh" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Níorbh fhéidir yyacc_tbl a scríobh" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Níorbh fhéidir ecstbl a scríobh" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,73 +137,75 @@ msgstr "" "\n" "Aicmí Meiteachoibhéise:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Níorbh fhéidir yymeta_tbl a scríobh" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Níorbh fhéidir yybase_tbl a scríobh" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Níorbh fhéidir yydef_tbl a scríobh" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Níorbh fhéidir yynxt_tbl a scríobh" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Níorbh fhéidir yychk_tbl a scríobh" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Níorbh fhéidir ftbl a scríobh" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Níorbh fhéidir ssltbl a scríobh" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Níorbh fhéidir eoltbl a scríobh" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Níorbh fhéidir yynultrans_tbl a scríobh" #: src/main.c:178 msgid "rule cannot be matched" -msgstr "ní féidir an riail a mheaitseáil" +msgstr "Ní féidir riail chomhoiriúnach a aimsiú" #: src/main.c:183 msgid "-s option given but default rule can be matched" -msgstr "tugadh rogha -s ach is féidir riail réamhshocraithe a mheaitseáil" +msgstr "" +"bhí an rogha -s tugtha ach is féidir an riail réamhshocraithe a chur i " +"gcomhoiriúnacht" #: src/main.c:221 msgid "Can't use -+ with -l option" -msgstr "Níl -+ ar fáil in éineacht le rogha -l" +msgstr "Níl -+ ar fáil in éineacht leis an rogha -l" #: src/main.c:224 msgid "Can't use -f or -F with -l option" -msgstr "Níl -f nó -F ar fáil in éineacht le -l" +msgstr "Níl -f nó -F ar fáil in éineacht leis an rogha -l" #: src/main.c:228 msgid "Can't use --reentrant or --bison-bridge with -l option" -msgstr "Níl --reentrant nó --bison-bridge ar fáil in éineacht le rogha -l" +msgstr "Níl --reentrant nó --bison-bridge ar fáil in éineacht leis an rogha -l" #: src/main.c:260 msgid "-Cf/-CF and -Cm don't make sense together" -msgstr "Ní féidir -Cf/-CF agus -Cm a úsáid le chéile" +msgstr "Níl -Cf/-CF agus -Cm comhoiriúnach" #: src/main.c:263 msgid "-Cf/-CF and -I are incompatible" -msgstr "Ní féidir -Cf/-CF agus -I a úsáid le chéile" +msgstr "Níl -Cf/-CF agus -I comhoiriúnach" #: src/main.c:267 msgid "-Cf/-CF are incompatible with lex-compatibility mode" -msgstr "Níl -Cf/-CF ar fáil i mód comhoiriúnachta lex" +msgstr "Níl -Cf/-CF ar fáil sa mhód comhoiriúnachta lex" #: src/main.c:272 msgid "-Cf and -CF are mutually exclusive" @@ -212,12 +213,12 @@ msgstr "Is comheisiatach iad na roghanna -Cf agus -CF" #: src/main.c:276 msgid "Can't use -+ with -CF option" -msgstr "Níl -+ ar fáil in éineacht le rogha -CF" +msgstr "Níl -+ ar fáil in éineacht leis an rogha -CF" #: src/main.c:279 #, c-format msgid "%array incompatible with -+ option" -msgstr "Ní féidir %array a úsáid le rogha -+" +msgstr "níl %array comhoiriúnach leis an rogha -+" #: src/main.c:284 msgid "Options -+ and --reentrant are mutually exclusive." @@ -227,314 +228,312 @@ msgstr "Is comheisiatach iad na roghanna -+ agus --reentrant." msgid "bison bridge not supported for the C++ scanner." msgstr "níl bison bridge ar fáil don scanóir C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "níorbh fhéidir %s a chruthú" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "níorbh fhéidir ceanntásc táblaí a scríobh" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "ní féidir creatchomhad %s a oscailt" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" -msgstr "níorbh fhéidir spás a leagan amach do shainmhíniú an mhacra" +msgstr "" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "earráid agus creatchomhaid %s á léamh" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "earráid agus creatchomhaid %s á dhúnadh" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "earráid agus comhad ceanntáisc %s á chruthú" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "earráid agus aschomhaid %s á scríobh" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "earráid agus aschomhad %s á dhúnadh" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "earráid agus aschomhaid %s á scriosadh" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" -msgstr "Gan cúlú.\n" +msgstr "Ná cúlaítear.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" -msgstr "%d staid chúlaithe (nach bhfuil ina staid ghlactha).\n" +msgstr "%d staid chúlaithe (níl ina staid ghlactha).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Cúlaíonn táblaí comhbhrúite i gcónaí.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "earráid agus comhad cúltaca %s á scríobh" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "earráid agus comhad cúltaca %s á dhúnadh" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s leagan %s staitistic d'úsáid:\n" # fr uses "lexical analyzer"; scanóir seems fine though --KPS -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " roghanna don scanóir: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d staid NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d staid DFA (%d focal)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d riail\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" -msgstr " Gan cúlú\n" +msgstr " Ná cúlaítear\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d staid chúlaithe (níl ina staid ghlactha)\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Cúlaíonn táblaí comhbhrúite i gcónaí\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" -msgstr " Patrúin úsáidte ag tús na líne\n" +msgstr " Patrúin úsáidte ag ceann líne\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d coinníoll tosaigh\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d staid eipsealóin, %d staid eipsealóin dúbailte\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" -msgstr " níl aon aicme charachtair ann\n" +msgstr " níl aon aicme charachtair\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " tá gá le %d/%d aicme charachtair %d/%d focal stórála, %d athúsáidte\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d péire state/nextstate\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d athrú sainiúil/dúblach\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d iontráil sa tábla\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d iontráil base-def\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (buaic %d) iontráil nxt-chk\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (buaic %d) iontráil teimpléid nxt-chk\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d iontráil tábla folamh\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d fréamhshamhail\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d teimpléad, %d i bhfeidhm\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d aicme choibhéise\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d aicme mheiteachoibhéise\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d sábháilte) tuairt haiseála, %d DFA comhionann le chéile\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " tá gá le %d sraith athdháilte\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " tá gá le %d iontráil tábla ar fad\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Earráid inmheánach (flexopts míchumtha).\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Bain triail as `%s --help' chun tuilleadh eolais a fháil.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "rogha -C anaithnid '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "earráid pharsála mharfach" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "níorbh fhéidir comhad %s a chruthú don eolas faoin chúlú" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "is cúis le moilliú mór an rogha -l (comhoiriúnacht le AT&T lex)\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" -msgstr " agus b'fhéidir gur cúis le fadhbanna luais eile é\n" +msgstr " agus is féidir gur cúis é le fadhbanna luais eile é\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -"is cúis le moilliú mór an %%rogha yylineno, MÁ tá rialacha ann a bhfuil " -"línte nua iontu\n" +"is cúis le moilliú mór an %%rogha yylineno, MÁ tá rialacha ann le línte nua " +"iontu\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "is cúis le moilliú beag an rogha -I (idirghníomhach)\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "is cúis le moilliú beag an fheidhm yymore()\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" -msgstr "is cúis le moilliú mór é REJECT\n" +msgstr "is REJECT cúis le moilliú mór\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -"is cúis le moilliú na rialacha maidir le comhthéacs leantach athraitheach\n" +"is cúis le moilliú na rialacha maidir le comhthéacs sraoilleach " +"athraitheach\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "Níl REJECT ar fáil leis na roghanna -f nó -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "níl %option yylineno ar fáil le REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -"níl rialacha maidir le comhthéacs leantach athraitheach ar fáil le -f nó -F" +"níl rialacha maidir le comhthéacs sraoilleach athraitheach ar fáil le -f nó -" +"F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "tá an %option yyclass gan bhrí ach amháin le scanóirí C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Úsáid: %s [ROGHANNA] [COMHAD]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -663,50 +662,50 @@ msgstr "" " -h, --help taispeáin an chabhair seo\n" " -V, --version taispeáin leagan %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" -msgstr "níorbh fhéidir spás a leagan amach do sko_stack" +msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "tá an t-ainm \"%s\" i bhfad Éireann rófhada" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "theip ar dháileadh na cuimhne i allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "aimsíodh carachtar neamhbhailí '%s' i check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" -msgstr "teastaíonn rogha -8 ón scanóir chun carachtar %s a úsáid" +msgstr "ní foláir an rogha -8 chun an charachtair %s a úsáid" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "theip ar dháileadh na cuimhne i allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: earráid inmheánach mharfach, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "theip ar mhéadú an eagair" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "drochlíne i gcreatchomhad" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" -msgstr "theip ar dháileadh cuimhne i yy_flex_xmalloc()" +msgstr "theip ar dháileadh na cuimhne i yy_flex_xmalloc()" #: src/nfa.c:100 #, c-format @@ -727,7 +726,7 @@ msgstr "staid # %4d\t" #: src/nfa.c:126 #, c-format msgid "********** end of dump\n" -msgstr "********** deireadh an dumpa\n" +msgstr "********** i ndeireadh dumpála\n" #: src/nfa.c:169 msgid "empty machine in dupmachine()" @@ -736,7 +735,7 @@ msgstr "meaisín folamh i dupmachine()" #: src/nfa.c:234 #, c-format msgid "Variable trailing context rule at line %d\n" -msgstr "Riail maidir le comhthéacs leantach athraitheach ag líne %d\n" +msgstr "riail maidir le comhthéacs sraoilleach athraitheach ag líne %d\n" #: src/nfa.c:357 msgid "bad state type in mark_beginning_as_normal()" @@ -760,142 +759,140 @@ msgstr "an iomarca rialacha (> %d)!" msgid "unknown error processing section 1" msgstr "earráid anaithnid agus an chéad pháirt á próiseáil" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" -msgstr "is neamhbhailí liosta na gcoinníollacha tosaigh" - -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" +msgstr "is neamhbhailí liosta na coinníollacha tosaigh" -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "riail anaithnid" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" -msgstr "baineadh úsáid as comhthéacs leantach faoi dhó" +msgstr "baineadh úsáid as comhthéacs sraoilleach faoi dhó" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "luachanna timthrialla neamhbhailí" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "ní foláir luach timthrialla deimhneach" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "tá an raon carachtair [%c-%c] débhríoch i scanóir a dhéanann neamhshuim ar " "cheannlitreacha agus litreacha beaga" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "raon diúltach in aicme charachtair" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "tá [:^lower:] débhríoch i scanóir a dhéanann neamhshuim ar cheannlitreacha " "agus litreacha beaga" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "tá [:^upper:] débhríoch i scanóir a dhéanann neamhshuim ar cheannlitreacha " "agus litreacha beaga" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" -msgstr "Líne ionchurtha rófhada\n" +msgstr "Tá líne an ionchuir rófhada\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "treoir '%top' míchumtha" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "treoir '%' anaithnid" -#: src/scan.l:214 +#: src/scan.l:212 +#, fuzzy msgid "Definition name too long\n" -msgstr "Ainm an tsainmhínithe rófhada\n" +msgstr "Tá líne an ionchuir rófhada\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "'{' corr" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" -msgstr "Luach an tsainmhínithe {%s} rófhada\n" +msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" -msgstr "is neamhiomlán sainmhíniú an ainm" +msgstr "is neamhiomlán an sainmhíniú ainm" -#: src/scan.l:467 +#: src/scan.l:466 +#, fuzzy msgid "Option line too long\n" -msgstr "Líne roghanna rófhada\n" +msgstr "Tá líne an ionchuir rófhada\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "rogha %% anaithnid: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "aicme charachtair neamhbhailí" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "sainmhíniú neamhshainithe {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr " neamhbhailí: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "comhartha athfhriotal ar iarraidh" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "is neamhbhailí an slonn aicme carachtair: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "carachtar neamhbhailí idir {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "} ar iarraidh." -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" -msgstr "Buaileadh comhadchríoch laistigh de ghníomh" +msgstr "Buaileadh comhadchríoch isteach i ngníomh" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" -msgstr "Buaileadh comhadchríoch laistigh de phatrún" +msgstr "Buaileadh comhadchríoch isteach i bpatrún" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "carachtar neamhbhailí: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "ní féidir %s a oscailt" @@ -932,7 +929,7 @@ msgstr "Earráid anaithnid=(%d)\n" #: src/sym.c:92 msgid "symbol table memory allocation failed" -msgstr "theip ar dháileadh na cuimhne don tábla na siombailí" +msgstr "theip ar dháileadh na cuimhne don tábla siombalach" #: src/sym.c:183 msgid "name defined twice" @@ -945,7 +942,7 @@ msgstr "fógraíodh an coinníoll tosaigh %s faoi dhó" #: src/yylex.c:57 msgid "premature EOF" -msgstr "comhadchríoch gan súil leis" +msgstr "comhadchríoch gan choinne" #: src/yylex.c:200 #, c-format @@ -958,7 +955,7 @@ msgid "*Something Weird* - tok: %d val: %d\n" msgstr "*Rud Éigin Aisteach* - tok: %d val: %d\n" #~ msgid "dynamic memory failure in copy_string()" -#~ msgstr "theip ar chuimhne dhinimiciúil i copy_string()" +#~ msgstr "theip ar dháileadh na cuimhne i copy_string()" #~ msgid "consistency check failed in symfollowset" #~ msgstr "theip ar sheiceáil chomhionannais i symfollowset" diff --git a/po/hr.gmo b/po/hr.gmo index 81e3aef..e4c0a39 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index 4c6beec..57caacd 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-10-05 16:48+0200\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -15,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.4\n" @@ -74,20 +73,20 @@ msgid "" "\n" msgstr "" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "" @@ -99,68 +98,68 @@ msgid "" "\n" msgstr "" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "" -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" "Meta-Equivalence Classes:\n" msgstr "" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "" @@ -217,308 +216,304 @@ msgstr "" msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "greÅ¡ka pri zatvaranju datoteke predloÅ¡ka %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "greÅ¡ka pri stvaranju datoteke zaglavlja %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "greÅ¡ka pri pisanju izlazne datoteke %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "greÅ¡ka pri zatvaranju izlazne datoteke %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "greÅ¡ka pri uklanjanju izlazne datoteke %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr "" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr "" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr "" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr "" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr "" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr "" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr "" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr "" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr "" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr "" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr "" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr "" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr "" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr "" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr "" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr "" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr "" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr "" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr "" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr "" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr "" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr "" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr "" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr "" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "PokuÅ¡ajte „%s --help” za viÅ¡e informacija.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "nepoznata -C opcija „%c”" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "fatalna greÅ¡ka analize" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uporaba: %s [OPCIJE] [DATOTEKA]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -584,48 +579,48 @@ msgid "" " -V, --version report %s version\n" msgstr "" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "alokacija memorije za tablicu simbola nije uspjela" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "neispravan redak u datoteci predloÅ¡ka" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "" @@ -678,136 +673,132 @@ msgstr "previÅ¡e pravila (> %d)!" msgid "unknown error processing section 1" msgstr "" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "neprepoznato pravilo" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "neispravne vrijednosti iteracije" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "vrijednost iteracije mora biti pozitivna" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Ulazni redak je predugačak\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Ime definicije je predugačko\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Neuparena „{”" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "nepotpuna definicija imena" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Redak opcija je predugačak\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "neispravan razred znakova" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "nedefinirana definicija {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "nedostaje navodnik" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "neispravan znak unutar {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "nedostaje }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "neispravan znak: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "ne mogu otvoriti %s" diff --git a/po/ko.gmo b/po/ko.gmo index 32fb888..083c446 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index 4043a36..6d63c59 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.2\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 1997-02-05 20:30\n" "Last-Translator: Choi Jun Ho \n" "Language-Team: Korean \n" @@ -14,7 +14,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-KR\n" "Content-Transfer-Encoding: 8-bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -76,20 +75,20 @@ msgstr "" "DFA Ãâ·Â:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "À¯ÀÏÇÑ ¹öÆÛÀÇ ³¡(end-of-buffer)»óŸ¦ ¸¸µé ¼ö ¾ø¾ú½À´Ï´Ù" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "»óŹøÈ£ %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "sympartition()¿¡¼­ À߸øµÈ ÀüÀÌ ¹®ÀÚ¸¦ ã¾Ò½À´Ï´Ù" @@ -105,30 +104,30 @@ msgstr "" "µ¿Ä¡·ù:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "»óŹøÈ£ %d´Â [%d]¸¦ ¹Þ¾ÆµéÀÔ´Ï´Ù\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "»óŹøÈ£ %d´Â ´ÙÀ½À» ¹Þ¾ÆµéÀÔ´Ï´Ù: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 #, fuzzy msgid "Could not write ecstbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,43 +137,43 @@ msgstr "" "\n" "¸ÞŸ-µ¿Ä¡·ùµé:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "" -#: src/gen.c:1352 +#: src/gen.c:1348 #, fuzzy msgid "Could not write yybase_tbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 #, fuzzy msgid "Could not write ftbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/gen.c:1614 +#: src/gen.c:1610 #, fuzzy msgid "Could not write ssltbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/gen.c:1665 +#: src/gen.c:1661 #, fuzzy msgid "Could not write eoltbl" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "" @@ -233,311 +232,307 @@ msgstr "-Cf msgid "bison bridge not supported for the C++ scanner." msgstr "" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/main.c:431 +#: src/main.c:432 #, fuzzy msgid "could not write tables header" msgstr "%s¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:709 +#: src/main.c:708 #, fuzzy, c-format msgid "error creating header file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ¾²´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ ¾²´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "Ãâ·ÂÆÄÀÏ %s¸¦ Áö¿ì´Â µ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "µÇµ¹¸²ÀÌ ¾ø½À´Ï´Ù.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d°³ÀÇ µÇµ¹¸²(¹Þ¾ÆµéÀÌÁö ¾Ê´Â) »óÅÂ.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr " ¾ÐÃàµÈ Å×À̺íÀº Ç×»ó ¹é¾÷ÇÕ´Ï´Ù.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ¾²´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "¹é¾÷ ÆÄÀÏ %s¸¦ ´Ý´Âµ¥ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s ¹öÀü %s »ç¿ë Åë°è:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " ½ºÄ³³Ê ¿É¼Ç: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d°³ÀÇ NFA »óÅÂ\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d°³ÀÇ DFA »óÅ (%d ´Ü¾î)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d°³ÀÇ ±ÔÄ¢\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " µÇµ¹¸²ÀÌ ¾ø½À´Ï´Ù\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d°³ÀÇ µÇµ¹¸²(¹Þ¾ÆµéÀÌÁö ¾Ê´Â) »óÅÂ\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " ¾ÐÃàµÈ Å×À̺íÀº Ç×»ó ¹é¾÷ÇÕ´Ï´Ù\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Çà ½ÃÀÛ(beginning-of-line) À¯ÇüÀ» »ç¿ëÇÏ¿´½À´Ï´Ù\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d°³ÀÇ ½ÃÀÛÁ¶°Ç\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d°³ÀÇ ¿¦½Ç·Ð »óÅÂ, %d°³ÀÇ ÀÌÁß ¿¦½Ç·Ð »óÅÂ\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " ¹®ÀÚ·ù°¡ ¾ø½À´Ï´Ù\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d ¹®ÀÚ ÁýÇÕ¿¡ %d/%d°³ÀÇ ÀúÀå¿ë ¹®ÀÚ°¡ ÇÊ¿äÇß°í, %d°³´Â Àç»ç¿ëµÇ¾ú½À´Ï" "´Ù.\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d°³ÀÇ »óÅÂ/´ÙÀ½ »óÅ ½ÖÀÌ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d°³ÀÇ À¯ÀÏÇÑ/Áߺ¹µÇ´Â ÀüÀÌ\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d°³ÀÇ Å×ÀÌºí ¿£Æ®¸®\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (ÃÖ´ë %d) nxt-chk ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (ÃÖ´ë %d) ÅÛÇø®Æ® nxt-chk ¿£Æ®¸®°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d°³ÀÇ ºó Å×ÀÌºí ¿£Æ®¸®\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d°³ÀÇ ¿øÇüÀÌ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d°³ÀÇ ÅÛÇø®Æ®°¡ ¸¸µé¾îÁö°í, %d°³¸¦ ¾¹´Ï´Ù\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d°³ÀÇ µ¿Ä¡·ù°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d ¸ÞŸ µ¿Ä¡·ù°¡ ¸¸µé¾îÁ³½À´Ï´Ù\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d(%d ÀúÀåµÊ)°³ÀÇ ÇØ½Ì Ãæµ¹·Î %d°³ÀÇ DFA°¡ °°°Ô 󸮵˴ϴÙ\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d°³ÀÇ ÀçÇÒ´ç ÁýÇÕÀÌ ÇÊ¿äÇÕ´Ï´Ù\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " ÃÑ %d°³ÀÇ Å×ÀÌºí ¿£Æ®¸®°¡ ÇÊ¿äÇÕ´Ï´Ù\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "¾Ë ¼ö ¾ø´Â -C ¿É¼Ç '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, fuzzy, c-format msgid "%s %s\n" msgstr "%s ¹öÀü %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "Ä¡¸íÀûÀÎ ÆÄ½Ì ¿¡·¯" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "µÇµ¹¸² Á¤º¸ ÆÄÀÏ %s¸¦ ¸¸µé ¼ö ¾ø¾ú½À´Ï´Ù" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex ȣȯ ¿É¼ÇÀº Å« ¼º´É ÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " ±×¸®°í ¾Æ¸¶µµ ´Ù¸¥ º¸°íµÈ ¼º´É ÀúÇÏÀÇ ½ÇÁ¦ ¿øÀÎÀÏ °ÍÀÔ´Ï´Ù\n" -#: src/main.c:1538 +#: src/main.c:1537 #, fuzzy, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno´Â Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (´ëÈ­Çü) Àº ¼Ò±Ô¸ðÀÇ ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore()´Â ¼Ò±Ô¸ðÀÇ ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT´Â Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "°¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢Àº Å« ¼º´ÉÀúÇϸ¦ ÀÏÀ¸Åµ´Ï´Ù\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT´Â -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/main.c:1576 +#: src/main.c:1575 #, fuzzy, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylinenoÀº -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "°¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢Àº -f³ª -F¿É¼Ç°ú °°ÀÌ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass´Â C++½ºÄ³³Ê¿¡°Ô¸¸ Àǹ̰¡ ÀÖ½À´Ï´Ù" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "" -#: src/main.c:1794 +#: src/main.c:1793 #, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -603,48 +598,48 @@ msgid "" " -V, --version report %s version\n" msgstr "" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "À̸§ \"%s\"´Â ºñÁ¤»óÀûÀ¸·Î ±é´Ï´Ù" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "allocate_array()¿¡¼­ ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "check_char()¿¡¼­ À߸øµÈ ¹®ÀÚ '%s'¸¦ ã¾Ò½À´Ï´Ù" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "½ºÄ³³Ê¿¡¼­ ¹®ÀÚ %s¸¦ ¾²±â À§Çؼ­´Â -8¿É¼ÇÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "allocate_array()¿¡¼­ ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: Ä¡¸íÀûÀÎ ³»ºÎ ¿¡·¯, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "¹è¿­ Å©±â¸¦ ´Ã¸®·Á´Â ½Ãµµ°¡ ½ÇÆÐÇß½À´Ï´Ù" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "½ºÄÌ·¹Åæ ÆÄÀÏ¿¡ À߸øµÈ Çà" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "yy_flex_xmalloc()¿¡¼­ ¸Þ¸ð¸® ÇÒ´çÀÌ ½ÇÆÐÇß½À´Ï´Ù" @@ -700,143 +695,139 @@ msgstr " msgid "unknown error processing section 1" msgstr "" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 #, fuzzy msgid "bad start condition list" msgstr "À߸øµÈ <½ÃÀÛ Á¶°Ç>: %s" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 #, fuzzy msgid "unrecognized rule" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 #, fuzzy msgid "trailing context used twice" msgstr "%dÇà¿¡¼­ °¡º¯ ÃßÀû ¹®¸Æ ±ÔÄ¢\n" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" -#: src/parse.y:821 +#: src/parse.y:819 #, fuzzy msgid "negative range in character class" msgstr " ¹®ÀÚ·ù°¡ ¾ø½À´Ï´Ù\n" -#: src/parse.y:918 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "\t-i ´ë¼Ò¹®ÀÚ ±¸º°¾ø´Â ½ºÄ³³Ê¸¦ ¸¸µì´Ï´Ù\n" -#: src/parse.y:924 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "\t-i ´ë¼Ò¹®ÀÚ ±¸º°¾ø´Â ½ºÄ³³Ê¸¦ ¸¸µì´Ï´Ù\n" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "" -#: src/scan.l:183 +#: src/scan.l:181 #, fuzzy, c-format msgid "malformed '%top' directive" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "¾Ë ¼ö ¾ø´Â '%' Áö½ÃÀÚ" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "ºÒ¿ÏÀüÇÑ À̸§ Á¤ÀÇ" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "¾Ë ¼ö ¾ø´Â %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "À߸øµÈ ¹®ÀÚ·ù" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "Á¤ÀǵÇÁö ¾ÊÀº Á¤ÀÇ {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "À߸øµÈ <½ÃÀÛ Á¶°Ç>: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "Àοë±âÈ£ ºüÁü" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "À߸øµÈ ¹®ÀÚ ÁýÇÕ ½Ä: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "{}¾ÈÀÇ À߸øµÈ ¹®ÀÚ" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "}ÀÌ ºüÁ³½À´Ï´Ù" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "µ¿ÀÛ µµÁß¿¡ EOF¸¦ ¸¸³µ½À´Ï´Ù" -#: src/scan.l:977 +#: src/scan.l:978 #, fuzzy msgid "EOF encountered inside pattern" msgstr "µ¿ÀÛ µµÁß¿¡ EOF¸¦ ¸¸³µ½À´Ï´Ù" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "À߸øµÈ ¹®ÀÚ: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "%s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù" diff --git a/po/nl.gmo b/po/nl.gmo index 0c50a8d..b92ee43 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index 78ee429..34d54ee 100644 --- a/po/nl.po +++ b/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2014-02-13 22:25+0100\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" @@ -17,7 +17,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -81,20 +80,20 @@ msgstr "" "DFA-dump:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "kon geen unieke toestand voor einde-van-buffer aanmaken" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "toestand # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Kan yynxt_tbl[][] niet schrijven" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "onjuist transitieteken in sympartition()" @@ -110,29 +109,29 @@ msgstr "" "Equivalentieklassen:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "toestand # %d accepteert: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "toestand # %d accepteert: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Kan yyacclist_tbl niet schrijven" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Kan yyacc_tbl niet schrijven" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Kan ecstbl niet schrijven" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -142,39 +141,39 @@ msgstr "" "\n" "Meta-equivalentieklassen:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Kan yymeta_tbl niet schrijven" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Kan yybase_tbl niet schrijven" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Kan yydef_tbl niet schrijven" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Kan yynxt_tbl niet schrijven" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Kan yychk_tbl niet schrijven" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Kan ftbl niet schrijven" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Kan ssltbl niet schrijven" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Kan eoltbl niet schrijven" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Kan yynultrans_tbl niet schrijven" @@ -232,263 +231,259 @@ msgstr "Opties '-+' en '--reentrant' sluiten elkaar uit." msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge wordt niet ondersteund voor de C++-scanner." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "kan %s niet aanmaken" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "kan tabellenkop niet schrijven" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "kan skeletbestand %s niet openen" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "geheugenreservering voor macrodefinitie is mislukt" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "invoerfout tijdens lezen van skeletbestand %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "fout tijdens sluiten van skeletbestand %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "fout tijdens aanmaken van headerbestand %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "fout tijdens schrijven van uitvoerbestand %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "fout tijdens sluiten van uitvoerbestand %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "fout tijdens verwijderen van uitvoerbestand %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Terugstappen is niet mogelijk.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d terugstappende (niet-accepterende) toestanden.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Gecomprimeerde tabellen kunnen altijd terugstappen.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "fout tijdens schrijven van terugstapbestand %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "fout tijdens sluiten van terugstapbestand %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versie %s gebruiksstatistieken:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " scanneropties: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-toestanden\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-toestanden (%d woorden)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d voorschriften\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Terugstappen is niet mogelijk\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d terugstappende (niet-accepterende) toestanden\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Gecomprimeerde tabellen kunnen altijd terugstappen\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Begin-van-regel-patronen gebruikt\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startvoorwaarden\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontoestanden, %d dubbele epsilontoestanden\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " geen tekenklassen\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d tekenklassen hadden %d/%d opslagwoorden nodig, %d hergebruikt\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d toestand/volgtoestand-paren aangemaakt\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unieke/dubbele transities\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d tabelitems\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def-items aangemaakt\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (piek %d) nxt-chk-items aangemaakt\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (piek %d) sjabloon-nxt-chk-items aangemaakt\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d lege tabelitems\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototypes aangemaakt\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d sjablonen aangemaakt, %d keer gebruikt\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d equivalentieklassen aangemaakt\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d meta-equivalentieklassen aangemaakt\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d bewaarde) hash-botsingen, %d DFA's gelijk\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d sets van herallocaties waren nodig\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " in totaal %d tabelitems nodig\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "*Interne fout*: ongeldige flexopts.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Typ '%s --help' voor meer informatie.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "onbekende -C-optie '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "fatale ontledingsfout" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "kon terugstapbestand %s niet aanmaken" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "de AT&T-lexcompatibiliteitsoptie '-l' betekent een grote " "prestatievermindering\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " en zou de eigenlijke bron kunnen zijn van andere gemelde " "prestatieverminderingen\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -497,54 +492,54 @@ msgstr "" "de %%optie yylineno betekent een prestatievermindering, maar ALLEEN voor " "voorschriften die met het regeleindeteken overeen kunnen komen\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "optie '-I' (interactief) betekent een kleine prestatievermindering\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() betekent een kleine prestatievermindering\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT betekent een grote prestatievermindering\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Voorschriften met variabele nakomende context betekenen een grote " "prestatievermindering\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT gaat niet samen met -f of -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%optie yylineno gaat niet samen met REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "voorschriften met variabele nakomende context gaan niet samen met '-f' of '-" "F'" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%optie yyclass heeft alleen betekenis voor C++-scanners" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Gebruik: %s [OPTIE...] [BESTAND...]\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -676,48 +671,48 @@ msgstr "" " -h, --help deze hulptekst tonen\n" " -V, --version de versie van %s tonen\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "geheugenreservering voor 'sko_stack' is mislukt" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "naam is belachelijk lang: \"%s\"" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "geheugenreservering is mislukt in allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "onjuist teken '%s' in check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scanner heeft de optie '-8' nodig om teken %s te kunnen gebruiken" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "geheugenreservering is mislukt in allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: **fatale interne programmafout**, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "vergroting van array is mislukt" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "onjuiste regel in skeletbestand" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "geheugenreservering is mislukt in yy_flex_xmalloc()" @@ -773,138 +768,134 @@ msgstr "te veel voorschriften (> %d)!" msgid "unknown error processing section 1" msgstr "onbekende fout tijdens verwerken van sectie 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "onjuiste lijst van startvoorwaarden" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "onbekend voorschrift" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "nakomende context twee keer gebruikt" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "onjuiste iteratiewaarden" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iteratiewaarde moet positief zijn" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "het tekenbereik [%c-%c] is niet eenduidig in een hoofdletterongevoelige " "scanner" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negatief bereik in tekenklasse" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] is niet eenduidig in een hoofdletterongevoelige scanner" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] is niet eenduidig in een hoofdletterongevoelige scanner" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Invoerregel is te lang\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "verkeerde opbouw van '%top'-commando" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "onbekend '%'-commando" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Definitienaam is te lang\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Ongepaarde '{'" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definitiewaarde voor {%s} is te lang\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "onvolledige naamsdefinitie" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Optiesregel is te lang\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "onbekende %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "onjuiste tekenklasse" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "ongedefinieerde definitie {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "onjuiste : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "ontbrekend aanhalingsteken" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "onjuiste expressie '%s' in tekenklasse" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "onjuist teken tussen {}'s" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "ontbrekende }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF werd bereikt tijdens een actie" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "EOF werd bereikt binnen een patroon" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "onjuist teken: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "kan %s niet openen" diff --git a/po/pl.gmo b/po/pl.gmo index 182bf8f..e67911e 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index bb51298..6d61d83 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.36\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2012-08-02 18:15+0200\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -15,7 +15,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -77,20 +76,20 @@ msgstr "" "Zrzut DFA:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "nie mo¿na utworzyæ unikalnego stanu koñca bufora" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "stan # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Nie mo¿na zapisaæ yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "wykryto b³êdny znak przej¶cia w sympartition()" @@ -106,29 +105,29 @@ msgstr "" "Klasy równowa¿no¶ci:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "stan # %d akceptuje: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "stan # %d akceptuje: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Nie mo¿na zapisaæ yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Nie mo¿na zapisaæ yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Nie mo¿na zapisaæ ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,39 +137,39 @@ msgstr "" "\n" "Klasy meta-równowa¿no¶ci:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Nie mo¿na zapisaæ yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Nie mo¿na zapisaæ yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Nie mo¿na zapisaæ yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Nie mo¿na zapisaæ yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Nie mo¿na zapisaæ yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Nie mo¿na zapisaæ ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Nie mo¿na zapisaæ ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Nie mo¿na zapisaæ eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Nie mo¿na zapisaæ yynultrans_tbl" @@ -227,259 +226,255 @@ msgstr "Opcje -+ i --reentrant wykluczaj msgid "bison bridge not supported for the C++ scanner." msgstr "pomost dla bisona nie jest obs³ugiwany dla skanera C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "nie mo¿na utworzyæ %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "nie mo¿na zapisaæ nag³ówka tablic" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "nie mo¿na otworzyæ pliku szablonu %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "przydzielenie pamiêci dla definicji makra nie powiod³o siê" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "b³±d wej¶cia podczas odczytu pliku szablonu %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "b³±d podczas zamykania pliku szablonu %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "b³±d podczas tworzenia pliku nag³ówkowego %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "b³±d podczas zapisu pliku wyj¶ciowego %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "b³±d podczas zamykania pliku wyj¶ciowego %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "b³±d podczas usuwania pliku wyj¶ciowego %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Bez zapamiêtywania.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d zapamiêtywanych stanów (nie akceptuj±cych).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Skompresowane tablice zawsze zapamiêtuj±.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "b³±d podczas zapisu pliku raportu z zapamiêtywania %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "b³±d podczas zamykania pliku raportu z zapamiêtywania %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s w wersji %s - statystyka u¿ycia:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " opcje skanera: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d stanów NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d stanów DFA (%d s³ów)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d regu³\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Bez zapamiêtywania\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d zapamiêtywanych stanów (nie akceptuj±cych)\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Skompresowane tablice zawsze zapamiêtuj±\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " U¿ytych wzorców pocz±tek-linii\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d warunków pocz±tkowych\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d stanów epsilonowych, %d stanów podwójnie epsilonowych\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " bez klas znaków\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d klas znaków potrzebuje %d/%d s³ów pamiêci, %d ponownie u¿ytych\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d utworzonych par stan/nastêpny-stan\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d przej¶æ unikalny/duplikat\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d elementów tablicy\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d utworzonych elementów base-def\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (maksymalnie %d) utworzonych elementów nxt-chk\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (maksymalnie %d) utworzonych szablonowych elementów nxt-chk\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d pustych elementów tablicy\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d utworzonych prototypów\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d utworzonych szablonów, %d u¿yæ\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d utworzonych klas równowa¿no¶ci\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d utworzonych klas meta-równowa¿no¶ci\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d zachowanych) kolizji haszy, %d jednakowych DFA\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d potrzebnych zbiorów realokacji\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d potrzebnych ogó³em elementów tablicy\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "B³±d wewnêtrzny. ¬le sformu³owane flexopts.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "`%s --help' poda wiêcej informacji.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "nieznana opcja -C '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "krytyczny b³±d analizy sk³adni" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "nie mo¿na utworzyæ pliku informacji o zapamiêtywaniu %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "opcja -l zgodno¶ci z leksem AT&T powoduje du¿± stratê wydajno¶ci\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " i mo¿e byæ przyczyn± innych zg³aszanych strat wydajno¶ci\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -488,51 +483,51 @@ msgstr "" "%%option yylineno powoduje straty wydajno¶ci TYLKO dla regu³ dopasowuj±cych " "znak koñca linii\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktywny) powoduje ma³± stratê wydajno¶ci\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() powoduje ma³± stratê wydajno¶ci\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT powoduje du¿± stratê wydajno¶ci\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regu³y ze zmiennym koñcowym kontekstem powoduj± du¿± stratê wydajno¶ci\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT nie mo¿e byæ u¿yte z -f ani -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno nie mo¿e byæ u¿yte z REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "regu³y ze zmiennym koñcowym kontekstem nie mog± byæ u¿yte z -f ani -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass ma znaczenie tylko dla skanerów C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Sk³adnia: %s [OPCJE] [PLIK]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -666,48 +661,48 @@ msgstr "" " -h, --help wy¶wietlenie tego pomocnego opisu\n" " -V, --version podanie wersji programu %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "przydzielenie sko_stack nie powiod³o siê" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nazwa \"%s\" jest ¶miesznie d³uga" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "nie uda³o siê przydzieliæ pamiêci w allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "b³êdny znak '%s' usuniêty w check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "skaner wymaga flagi -8 aby u¿yæ znaku %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "nie uda³o siê przydzieliæ pamiêci w allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: krytyczny b³±d wewnêtrzny: %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "próba zwiêkszenia rozmiaru tablicy nie powiod³a siê" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "b³êdna linia w pliku szablonu" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "nie uda³o siê przydzieliæ pamiêci w yy_flex_xmalloc()" @@ -763,142 +758,138 @@ msgstr "zbyt du msgid "unknown error processing section 1" msgstr "nieznany b³±d podczas przetwarzania sekcji 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "b³êdna lista warunków pocz±tkowych" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "nierozpoznana regu³a" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "koñcowy kontekst u¿yty dwukrotnie" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "b³êdne warto¶ci iteracji" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "warto¶æ iteracji musi byæ dodatnia" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "przedzia³ znaków [%c-%c] jest niejednoznaczny w skanerze ignoruj±cym " "wielko¶æ liter" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "ujemny przedzia³ w klasie znaków" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[:^lower:] jest niejednoznaczne w przypadku skanera ignoruj±cego wielko¶æ " "liter" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[:^upper:] jest niejednoznaczne w przypadku skanera ignoruj±cego wielko¶æ " "liter" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Linia wej¶ciowa zbyt d³uga\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "¼le sformu³owana dyrektywa '%top'" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "nierozpoznana dyrektywa '%'" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Nazwa definizji zbyt d³uga\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Niesparowany '{'" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definicja warto¶ci dla {%s} zbyt d³uga\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "niekompletna definicja nazwy" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Linia opcji zbyt d³uga\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "nierozpoznane %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "b³êdna klasa znaków" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "niezdefiniowana definicja {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "b³êdny : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "brak cudzys³owu" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "b³êdne wyra¿enie klasy znaków: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "b³êdny znak wewn±trz {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "brak }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF napotkany wewn±trz akcji" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "EOF napotkany wewn±trz wzorca" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "b³êdny znak: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "nie mo¿na otworzyæ %s" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index cd3789f..52d15f4 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_BR.po b/po/pt_BR.po index fd9aa11..b19adba 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2013-11-27 08:09-0300\n" "Last-Translator: Rafael Ferreira \n" "Language-Team: Brazilian Portuguese 1);\n" @@ -81,20 +80,20 @@ msgstr "" "Despejo DFA:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "não foi possível criar um estado único de final de buffer" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "estado # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Não foi possível escrever yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "caractere de transição inválido detectado em sympartition()" @@ -110,29 +109,29 @@ msgstr "" "Classes de Equivalência:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "estado # %d aceita: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "estado # %d aceita: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Não foi possível escrever yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Não foi possível escrever yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Não foi possível escrever ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -142,39 +141,39 @@ msgstr "" "\n" "Classes de Meta-Equivalência:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Não foi possível escrever yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Não foi possível escrever yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Não foi possível escrever yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Não foi possível escrever yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Não foi possível escrever yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Não foi possível escrever ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Não foi possível escrever ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Não foi possível escrever eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Não foi possível escrever yynultrans_tbl" @@ -231,264 +230,260 @@ msgstr "As opções -+ e --reentrant são mutuamente exclusivas." msgid "bison bridge not supported for the C++ scanner." msgstr "sem suporte à ponte bison pelo scanner de C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "não foi possível criar %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "não foi possível escrever o cabeçalho das tabelas" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "não é possível abrir o arquivo esqueleto %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "a alocação de definição de macro falhou" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "erro lendo o arquivo esqueleto %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "erro fechando o arquivo esqueleto %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "erro ao criar o arquivo cabeçalho %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "erro ao gravar o arquivo de saída %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "erro ao fechar o arquivo de saída %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "erro ao remover o arquivo de saída %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Impossível restaurar.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d fazendo cópia de segurança de estados (não-aceita).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Tabelas compactadas sempre têm cópias de segurança.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "erro ao gravar a cópia de segurança %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "erro ao fechar a cópia de segurança %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versão %s estatísticas de uso:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " opções de scanner: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d estados NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d estados DFA (%d palavras)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d regras\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Sem cópia de segurança\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d fazendo cópia de segurança de estados (não-aceita)\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Tabelas compactadas sempre têm cópias de segurança\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Padrões de início-de-linha usados\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condições de início\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d estados epsilon, %d estados epsilon duplo\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " nenhuma classe de caracteres\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d classes de caracteres precisaram de %d/%d palavras de armazenamento, " "%d reusadas\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d pares estado/próximoestado criados\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d transições únicas/duplicadas\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d entradas de tabela\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d entradas base-def criadas\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (pico %d) entradas nxt-chk criadas\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (pico %d) modelos de entradas nxt-chk criadas\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d entradas vazias na tabela\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d protos criados\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modelos criados, %d usos\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d classes de equivalência criadas\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d classes de meta-equivalência criadas\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d salvas) colisões de hash, %d DFAs iguais\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d conjuntos de realocação necessários\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d total de entradas de tabela necessárias\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Erro interno. flexopts estão malformados.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Tente \"%s --help\" para maiores informações.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "opção -C \"%c\" desconhecida" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "erro fatal de análise" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "" "não foi possível criar arquivo de cópia de segurança das informações %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "a opção de compatibilidade com lex da AT&T \"-l\" acarreta em uma grande " "penalidade na performance\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " e pode ser a fonte real de outras penalidades de performance reportadas\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -497,53 +492,53 @@ msgstr "" "%%option yylineno acarreta em uma penalidade na performance APENAS em regras " "que podem bater caracteres de nova linha\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interativo) acarreta em uma pequena penalidade na performance\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() acarreta em uma pequena penalidade na performance\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT acarreta em uma grande penalidade na performance\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Variável seguindo regras de contexto implicam em grande perda de " "performance\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT não pode ser usado com -f ou -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno não pode ser usada com REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "variáveis seguindo regras de contexto não podem ser usadas com -f ou -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass só tem sentido para scanners C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Uso: %s [OPÇÕES] [ARQUIVO]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -675,48 +670,48 @@ msgstr "" " -h, --help produz esta mensagem de ajuda\n" " -V, --version informa a versão do %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "alocação de sko_stack falhou" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "nome \"%s\" ridiculamente longo" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "alocação de memória falhou em allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "caractere inválido \"%s\" detectado em check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "o scanner precisa da opção -8 para usar o caractere %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "alocação de memória falhou em allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: erro interno fatal, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "tentativa de aumentar o tamanho do vetor falhou" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "linha inválida no arquivo de esqueleto" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "alocação de memória falhou em yy_flex_xmalloc()" @@ -772,137 +767,133 @@ msgstr "muitas regras (> %d)!" msgid "unknown error processing section 1" msgstr "erro desconhecido processando a seção 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "lista de condições de início inválida" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regra não reconhecida" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "contexto final usado duas vezes" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valores de iteração inválidos" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "valor de iteração deve ser positivo" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "a faixa de caracteres [%c-%c] é ambígua em um scanner \"case-insensitive\"" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "faixa negativa na classe de caracteres" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] é ambígua em um scanner \"case-insensitive\"" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] é ambígua em um scanner \"case-insensitive\"" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Linha de entrada muito longa\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "diretiva \"%top\" malformada" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "diretiva \"%\" não reconhecida" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Nome de definição muito longo\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "'{' sem fechamento" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Valor de definição para {%s} muito longo\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "definição de nome incompleta" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Linha de opção muito longa\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "%%option não reconhecida: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "classe de caractere inválida" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "definição indefinida {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr " inválida: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "faltou aspa" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "expressão de classe de caractere inválida: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "caracatere inválido entre {}'s" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "faltou }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "Fim de Arquivo encontrado dentro de uma ação" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "Fim de Arquivo encontrado dentro do padrão" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "caracter inválido: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "não foi possível abrir %s" diff --git a/po/ro.gmo b/po/ro.gmo index a324a03..3dc0999 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index 76d4edd..632fc94 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.31\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2003-11-22 11:07+0200\n" "Last-Translator: Eugen Hoanca \n" "Language-Team: Romanian \n" @@ -14,7 +14,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -76,20 +75,20 @@ msgstr "" "Rezultat(dump) DFA:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "nu am putut crea sfârºit unic pentru starea buffer-ului" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "stare # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Nu am putut scrie yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "caracter greºit de tranziþie detectat în sympartition()" @@ -105,29 +104,29 @@ msgstr "" "Clase de Echivalenþã:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "starea # %d acceptã: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "starea # %d acceptã: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Nu am putut scrie yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Nu am putut scrie yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Nu am putut scrie ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -137,39 +136,39 @@ msgstr "" "\n" "Clase de Meta-Echivalenþã:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Nu am putut scrie yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Nu am putut scrie yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Nu am putut scrie yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Nu am putut scrie yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Nu am putut scrie yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Nu am putut scrie ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Nu am putut scrie ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Nu am putut scrie eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Nu am putut scrie yynultrans_tbl" @@ -226,261 +225,257 @@ msgstr "Op msgid "bison bridge not supported for the C++ scanner." msgstr "bridge bison nu este suportat pentru scannerul C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "nu am putut crea %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "Nu am putut scrie capul de tabel" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "nu am putut deschide fiºierul schelet %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "eroare de intrare(input) în timpul citirii fiºierului schelet %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "eroare în închiderea fiºierului schelet %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "eroare în crearea fiºierului de header %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "eroare în scrierea fiºierului de output %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "eroare în închiderea fiºierului de output %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "eroare în ºtergerea fiºierului de output %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Nu se revine (backing-up).\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d salvare de (inacceptabile) stãri.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Tabelele compresate întotdeauna au back-up.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "eroare în scrierea fiºierului de backup %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "eroare în închiderea fiºierului de backup %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s versiunea %s statistici de folosire:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " opþiuni de scanner: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d stãri NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d stãri DFA (%d cuvinte)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d reguli\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Nu se face backup\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d salvare de (inacceptabile) stãri\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Tabelele compresate întotdeauna au back-up\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Tipare de începuturi de linie folosite\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d condiþii de start\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d stãri epsilon, %d stãri dublu epsilon\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " nici o clasã de caractere\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d clase de caractere necesare %d/%d cuvinte de stocare, %d refolosite\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d perechi de stare/stareurmãtoare create\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d tranziþii unice/duplicate\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d intrãri în tabele\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def intrãri create\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (maxim %d) nxt-chk intrãri create\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (maxim %d) model nxt-chk intrãri create\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d intrãri în tabel goale\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototipuri create\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d modele create, %d folosiri\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d clase de echivalenþã create\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d clase de meta-echivalenþã create\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d salvate) coliziuni disipate(hash), %d egaluri de DFA-uril\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d seturi de realocãri necesare\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d intrãri totale în tabel necesare\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Eroare internã. Opþiunile flex(flexopts) sunt malformate.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Încercaþi `%s --help' pentru mai multe informaþii.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "opþiune -C necunoscutã `%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "eroare fatalã de analizã(parse)" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "nu s-a putut crea fiºierul de informaþii de back-up %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "-l opþiunea de compatibilitate AT&T lex determinã o scãdere drasticã a " "performanþei\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "ºi poate fi sursa realã a altor scãderi de performanþã raportate\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -489,53 +484,53 @@ msgstr "" "%%opþiunea yylineno determinã o scãdere drasticã a performanþei DOAR în " "regulile care se potrivesc caracterelor linie_nouã(newline)\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interactiãe) determinã o scãdere minorã a performanþei\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() determinã o scãdere minorã a performanþei\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT determinã o scãdere drasticã a performanþei\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Contextul de sfârºit(trailing) variabil determinã o scãdere drasticã a " "performanþei\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT nu poate fi folosit cu -f sau -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%opþiunea yylineno nu poate fi folositã cu REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "contextul de sfârºit(trailing) variabil nu poate fi folosit cu -f sau -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%opþunea yyclass este folositoare doar pentru scannerele C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Folosire: %s [OPÞIUNI] [FIªIER]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -667,48 +662,48 @@ msgstr "" " -h, --help produce acest mesaj de ajutor\n" " -V, --version raporteazã versiunea %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "numele \"%s\" este ridicol de lung" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "alocare de memorie eºuatã în allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "caracter greºit `%s' detectat în check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "scannerul necesitã parametrul(flag) -8 pentru a folosi caracterul %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "alocare de memorie eºuatã în allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: eroare internã fatalã, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "încercare de a mãri dimensiunea domeniului eºuatã" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "linie greºitã în fiºierul schelet" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "alocare de memorie eºuatã în yy_flex_xmalloc()" @@ -764,147 +759,143 @@ msgstr "prea multe reguli (> %d)!" msgid "unknown error processing section 1" msgstr "eroare necunoscutã în procesarea secþiunii 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "listã de stãri în condiþie proastã" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "regulã necunoscutã" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "context de sfârºit(trailing) utilizat de douã ori" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "valori de iteraþie greºite" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "valoarea iteraþiei trebuie sã fie pozitivã" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "intervalul(range) de caracter [%c %c] este ambiguu într-un scanner caz-" "insenzitiv" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "domeniu negativ în clasa de caractere" -#: src/parse.y:918 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "intervalul(range) de caracter [%c %c] este ambiguu într-un scanner caz-" "insenzitiv" -#: src/parse.y:924 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "intervalul(range) de caracter [%c %c] este ambiguu într-un scanner caz-" "insenzitiv" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Linie de intrare(input) prea lungã\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "directivã '%top' malformatã" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "directivã '%' necunoscutã" -#: src/scan.l:214 +#: src/scan.l:212 #, fuzzy msgid "Definition name too long\n" msgstr "Linie de intrare(input) prea lungã\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "'{' fãrã corespondent" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "definire de nume incompletã" -#: src/scan.l:467 +#: src/scan.l:466 #, fuzzy msgid "Option line too long\n" msgstr "Linie de intrare(input) prea lungã\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "%%opþiune necunoscutã: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "clasã de caractere greºitã" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "definiþie nedefinitã {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr " greºitã: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "menþionare(quote) lipsã" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "expresie clasã caracter greºitã: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "caracter eronat între {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "lipseºte }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "EOF întâlnit în mijlocul acþiunii" -#: src/scan.l:977 +#: src/scan.l:978 #, fuzzy msgid "EOF encountered inside pattern" msgstr "EOF întâlnit în mijlocul acþiunii" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "caracter eronat: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "nu pot deschide %s" diff --git a/po/ru.gmo b/po/ru.gmo index 8a303cc..8d3f459 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 1a0987b..730b126 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2014-02-16 10:00+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -16,7 +16,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.4\n" @@ -81,20 +80,20 @@ msgstr "" "Дамп ДКА:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "невозможно создать уникальное состояние конца буфера" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "состояние # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Невозможно записать yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "обнаружен неверный переходный символ в sympartition()" @@ -110,29 +109,29 @@ msgstr "" "Классы эквивалентности:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "состояние # %d допускает: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "состояние # %d допускает: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Невозможно записать yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Невозможно записать yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Невозможно записать ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -142,39 +141,39 @@ msgstr "" "\n" "Мета-эквивалентные Классы:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Невозможно записать yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Невозможно записать yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Невозможно записать yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Невозможно записать yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Невозможно записать yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Невозможно записать ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Невозможно записать ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Невозможно записать eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Невозможно записать yynultrans_tbl" @@ -231,263 +230,259 @@ msgstr "Параметры -+ и --reentrant являются взаимоиск msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge не поддерживается для сканера C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "невозможно создать %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "Невозможно записать заголовок таблиц" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "Невозможно открыть файл-каркас %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "Не удалось разместить определение макроса" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "ошибка чтения файла-каркаса %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "ошибка при закрытии файла-каркаса %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "ошибка создания заголовочного файла %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "ошибка записи в выходной файл %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "ошибка закрытия выходного файла %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "ошибка удаления выходного файла %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Резервное копирование отключено.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "резервное копирование %d (недопустимых) состояний.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Резервное копирование сжатых таблиц выполняется всегда.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "ошибка записи резервной копии файла %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "ошибка закрытия резервной копии файла %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "статистика использования %s версии %s:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " параметры сканера: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d состояний НКА\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d состояний ДКА (%d слов)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d правил\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Резервное копирование отключено\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " резервное копирование %d (недопустимых) состояний\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Резервное копирование сжатых таблиц выполняется всегда\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Используются шаблоны начала строки\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d начальных условий\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d эпсилон-состояний, %d двойных эпсилон-состояний\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " отсутствуют классы символов\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d классов символов требуют %d/%d слов для хранения, %d повторно " "использовано\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " создано %d пар состояние/след_состояние\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d уникальных/повторяющихся переходов\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d элементов таблицы\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " создано %d/%d base-def элементов\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " создано %d/%d (пик %d) nxt-chk элементов\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " создано %d/%d (пик %d) шаблонных nxt-chk элементов\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d пустых элементов таблицы\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " создано %d прототипов\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " создано %d шаблонов, %d используются\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " созданы классы эквивалентности %d/%d\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d мета-эквивалентных классов создано\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d записано) коллизий хэш-таблицы, %d эквивалентных ДКА\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " требуется %d наборов повторных размещений\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " всего требуется %d элементов таблицы\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Внутренняя ошибка. Неправильное значение flexopts.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Попробуйте «%s --help» для получения более подробного описания.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "неизвестное значение «%c» для -C" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "фатальная ошибка разбора" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "невозможно создать резервную копию информационного файла %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "Параметр -l совместимости с AT&T lex влечёт значительное снижение " "производительности\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " и также может быть истинным источником проблем с производительностью\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -496,54 +491,54 @@ msgstr "" "%%option yylineno влечёт значительное снижение производительности ТОЛЬКО для " "правил, которые могут совпадать с символами новой строки\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (интерактивный) влечёт незначительное снижение производительности\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() приводит к небольшому снижению производительности\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT влечёт значительное снижение производительности\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Правила с переменным замыкающим контекстом приводят к значительному снижению " "производительности\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT не может быть использован вместе с -f или -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno не может быть использован с REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "правила с переменным замыкающим контекстом не могут быть использованы с -f " "или -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass имеет смысл только для сканеров C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Использование: %s [ПАРАМЕТРЫ] [ФАЙЛ]…\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -677,48 +672,48 @@ msgstr "" " -h, --help показать эту справку\n" " -V, --version показать версию %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "не удалось разместить sko_stack" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "имя «%s» нелепо длинное" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "ошибка выделения памяти в allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "найден неверный символ «%s» в check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "для использования символа %s сканеру требуется параметр -8" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "ошибка выделения памяти в allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: фатальная внутренняя ошибка, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "ошибка при попытке увеличить размер массива" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "неверная строка в файле-каркасе" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "ошибка при выделении памяти в yy_flex_xmalloc()" @@ -774,142 +769,138 @@ msgstr "слишком много правил (> %d)!" msgid "unknown error processing section 1" msgstr "неизвестная ошибка при обработке раздела 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "неверный список начальных условий" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "нераспознанное правило" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "замыкающий контекст используется дважды" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "неверные значения итераций" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "значение итераций должно быть положительным" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "использование символьного диапазона [%c-%c] сомнительно в сканере, не " "чувствительном к регистру" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "отрицательный диапазон в классе символов" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "использование [:^lower:] сомнительно для сканера, не чувствительного к " "регистру" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "использование [:^upper:] сомнительно для сканера, не чувствительного к " "регистру" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Слишком длинная входная строка\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "нераспознанная директива «%top»" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "нераспознанная директива «%»" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Слишком длинное определение имени\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Непарная «{»" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Слишком длинное определение значения для {%s}\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "неполное определение имени" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Слишком длинный параметр\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "нераспознанный %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "неверный класс символа" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "неопределенное определение {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "неверное <начальное условие>: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "отсутствуют кавычки" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "неверное выражение класса символа: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "неверный символ внутри {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "отсутствует }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "встречен EOF внутри действия" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "встречен EOF внутри шаблона" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "неверный символ: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "невозможно открыть %s" diff --git a/po/sr.gmo b/po/sr.gmo index 9f36fb9..b5ddc6f 100644 Binary files a/po/sr.gmo and b/po/sr.gmo differ diff --git a/po/sr.po b/po/sr.po index 752b49d..3746263 100644 --- a/po/sr.po +++ b/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2013-10-30 18:20+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian <(nothing)>\n" @@ -14,7 +14,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" @@ -78,20 +77,20 @@ msgstr "" "ДФА испис:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "не могу да направим јединствено стање краја међумеморије" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "стање # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Не могу да запишем „yynxt_tbl[][]“" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "откривен је лош знак прелаза у „sympartition()“" @@ -107,29 +106,29 @@ msgstr "" "Разреди једнакости:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "стање # %d прихвата: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "стање # %d прихвата: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Не могу да запишем „yyacclist_tbl“" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Не могу да запишем „yyacc_tbl“" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Не могу да запишем „ecstbl“" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -139,39 +138,39 @@ msgstr "" "\n" "Разреди мета-једнакости:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Не могу да запишем „yymeta_tbl“" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Не могу да запишем „yybase_tbl“" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Не могу да запишем „yydef_tbl“" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Не могу да запишем „yynxt_tbl“" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Не могу да запишем „ychk_tbl“" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Не могу да запишем „ftbl“" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Не могу да запишем „ssltbl“" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Не могу да запишем „eoltbl“" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Не могу да запишем „yynultrans_tbl“" @@ -228,260 +227,256 @@ msgstr "Опције -+ и „--reentrant“ се међусобно искљу msgid "bison bridge not supported for the C++ scanner." msgstr "бизонов мост није подржан за Ц++ скенер." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "не могу да направим %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "не могу да запшем бестаблично заглавље" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "Не могу да отворим датотеку окоснице „%s“" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "није успело додељивање одреднице макроа" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "грешка улаза читања датотеке окоснице „%s“" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "грешка затварања датотеке окоснице „%s“" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "грешка стварања датотеке заглавља „%s“" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "грешка записивања излазне датотеке „%s“" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "грешка затварања излазне датотеке „%s“" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "грешка брисања излазне датотеке „%s“" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Не правим резерву.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d стварам резерве (не-прихватам) стања.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Сжете табеле увек стварају резерву.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "грешка записивања датотеке резерве „%s“" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "грешка затварања датотеке резерве „%s“" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Статистика коришћења %s издања%s:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " опције прегледача: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d НФА стања\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d ДФА стања (%d речи)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d правила\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Не правим резерву\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d стварам резерве (не-прихватам) стања\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Сжете табеле увек стварају резерву\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Коришћени су шаблони почетка-реда\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d услови покретања\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d стања ипсилона, %d стања двоструког ипсилона\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " нема разреда знака\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d разредима знака беху потребне %d/%d речи складишта, %d поново " "коришћених\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d пара стања/следећег_стања је направљено\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d јединствена/удвостручена прелаза\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d уноса табеле\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " направљено је %d/%d уноса основне одреднице\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " направљено је %d/%d (врх %d) „nxt-chk“ уноса\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " направљено је %d/%d (врх %d)шаблона „nxt-chk“ уноса\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d празна уноса табеле\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " направљених узорака — %d\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " направљених шаблона - %d, користим %d\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " направљено је %d/%d разреда једнакости\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " направљено је %d/%d разреда мета-једнакости\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (сачуваних %d) сукоба хеша, %d једнак ДФА-су\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " потребна су %d скупа поновног додељивања\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " потребна су укупно %d уноса табеле\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Унутрашња грешка. „flexopts“ је лоше обликован.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Пробајте „%s --help“ за више података.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "непозната опција -C „%c“" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "кобна грешка обраде" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "не могу да направим резерву датотеке података „%s“" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l опција сагласности АТ&Т лекса изазива велико смањење учинка\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " и може бити стваран извор других извешених ограничења учинка\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -490,51 +485,51 @@ msgstr "" "%%опција „yylineno“ изазива смањење учинка САМО на правилима која могу да " "поклопе знакове новог реда\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (међудејствено) изазива мање смањење учинка\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "„yymore()“ изазива мање смањење учинка\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "„REJECT“ изазива веће смањење учинка\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Променљива правила пратећег контекса изазивају веће смањење учинка\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "„REJECT“ не може да се користи са „-f“ или „-F“" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%oпција „yylineno“ не може да се користи са „REJECT“" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "променљива правила пратећег контекста не могу бити коришћена са „-f“ или „-F“" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%oпција „yyclass“ има смисла само за Ц++ скенере" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Употреба: %s [ОПЦИЈЕ] [ДАТОТЕКА]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -671,48 +666,48 @@ msgstr "" " -h, --help исписује ову помоћ\n" " -V, --version извештава о издању %s-а\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "није успело додељивање „sko_stack“-а" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "назив „%s“ је смешно дуг" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "није успело додељивање меморије у „allocate_array()“" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "лош знак „%s“ је откривен у „check_char()“" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "скенер захтева -8 обележја да би користио знак „%s“" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "није успело додељивање меморије у „allocate_array()“" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: кобна унутрашња грешка, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "није успео покушај повећања величине низа" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "лош ред у датотеци окоснице" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "није успело додељивање меморије у „yy_flex_xmalloc()“" @@ -768,136 +763,132 @@ msgstr "превише правила (> %d)!" msgid "unknown error processing section 1" msgstr "непозната грешка обраде одељка 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "лош списак почетног услова" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "непознато правило" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "пратећи контекст је коришћен два пута" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "лоша вредност опетовања" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "вредност опетовања мора бити позитивна" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "опсег знака [%c-%c] је нејасан у скенеру неосетљивом на величину слова" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "негативан опсег у разреду знака" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] је нејасно у скенеру неосетљивом на величину слова" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] је нејасно у скенеру неосетљивом на величину слова" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Улазни ред је предуг\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "лоша одредница „%top“" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "непозната " -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Назив одреднице је предуг\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Неупарена „{“" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Вредност одреднице за {%s} је предуга\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "непотпуна одредница назива" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "Ред опције је предуг\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "непозната %%опција: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "лош разред знака" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "неодређена одредница {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "лош [почетни услов]: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "недостају наводници" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "лош израз разреда знака: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "лош знак унутар {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "недостаје }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "наишао сам на крај датотеке унутар радње" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "наишао сам на крај датотеке унутар шаблона" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "лош знак: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "не могу да отворим „%s“" diff --git a/po/sv.gmo b/po/sv.gmo index 7461ce7..9fb21e2 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index 05cf214..c90b7cb 100644 --- a/po/sv.po +++ b/po/sv.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2016-06-06 19:10+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" @@ -19,7 +19,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" #: src/buf.c:79 msgid "Allocation of buffer to print string failed" @@ -81,22 +80,22 @@ msgstr "" "DFA-utskrift:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "kunde inte skapa ett unikt buffertsluttillstÃ¥nd" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "tillstÃ¥nd %d:\n" # Det här är ju helt sjukt. Har buggrapporterat detta att det bör # ersättas med %s -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Kunde inte skriva yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "otillÃ¥tet övergÃ¥ngstecken funnet i sympartition()" @@ -112,29 +111,29 @@ msgstr "" "Ekvivalensklasser:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "tillstÃ¥nd %d accepterar: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "tillstÃ¥nd %d accepterar: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Kunde inte skriva yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Kunde inte skriva yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Kunde inte skriva ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -144,39 +143,39 @@ msgstr "" "\n" "Metaekvivalensklasser:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Kunde inte skriva yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Kunde inte skriva yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Kunde inte skriva yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Kunde inte skriva yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Kunde inte skriva yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Kunde inte skriva ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Kunde inte skriva ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Kunde inte skriva eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Kunde inte skriva yynultrans_tbl" @@ -234,260 +233,256 @@ msgstr "Flaggorna -+ och --reentrant är ömsesidigt uteslutande." msgid "bison bridge not supported for the C++ scanner." msgstr "bisonbrygga stöds inte för C++-inläsaren." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "kunde inte skapa %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "kunde inte skriva tabellhuvud" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "kan inte öppna mallfilen %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "allokering av makrodefinitioner misslyckades" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "indatafel vid läsande av mallfilen %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "fel vid stängande av mallfilen %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "fel vid skapande av huvudfilen %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "fel vid skrivande av utfilen %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "fel vid stängande av utfilen %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "fel vid borttagning av utfilen %s" # "Back up" i det här sammanhanget handlar om att flexmaskinen backar. -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Backar inte.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d backar (icke-accepterande) tillstÃ¥nd.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Komprimerade tabeller backar alltid.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "fel när backningsfilen %s skrevs" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "fel när backningsfilen %s stängdes" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "Statistik över användning av %s version %s:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " inläsarflaggor: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA-tillstÃ¥nd\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA-tillstÃ¥nd (%d ord)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d regler\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Inget backande\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d backande (icke-accepterande) tillstÃ¥nd\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Komprimerade tabeller backar alltid\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Början-av-rad-mönster använda\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d startvillkor\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilontillstÃ¥nd, %d dubbla epsilontillstÃ¥nd\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " inga teckenklasser\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d teckenklasser behövde %d/%d ord för lagring, %d Ã¥teranvända\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d par med tillstÃ¥nd/nästa-tillstÃ¥nd skapade\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d unika/duplicerade övergÃ¥ngar\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d tabellposter\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d basstandardposter skapade\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (max %d) poster för nästa kontroll skapade\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (max %d) mallposter för nästa kontroll skapade\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d tomma tabellposter\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototyper skapade\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mallar skapade, %d användningar\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d ekvivalensklasser skapade\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d metaekvivalensklasser skapade\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d sparade) hashkollisioner, %d DFA lika\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d uppsättningar med omallokeringar krävdes\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d tabellposter krävs totalt\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Internt fel. flexopts är felaktiga.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Prova \"%s --help\" för mer information.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "okänd flagga till -C \"%c\"" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "allvarligt fel vid tolkningen" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "kunde inte skapa filen %s med backningsinformation" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "flaggan -l för beteende som AT&T:s lex medför en väsentlig prestandaförlust\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " och kan vara den egentliga orsaken till andra rapporter om detta\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -496,54 +491,54 @@ msgstr "" "%%option yylineno medför en prestandaförlust ENDAST pÃ¥ regler som kan matcha " "nyradstecken\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (interaktiv) medför en mindre prestandaförlust\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() medför en mindre prestandaförlust\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT medför en väsentlig prestandaförlust\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Regler för varierbar efterföljande kontext medför en väsentlig " "prestandaförlust\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT kan inte användas tillsammans med -f eller -F" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno kan inte användas tillsammans med REJECT" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "regler för varierbar efterföljande kontext kan inte användas\n" "tillsammans med -f eller -F" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass är bara meningsfull för C++-inläsare" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Användning: %s [FLAGGOR] [FIL]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -671,48 +666,48 @@ msgstr "" " -h, --help visa detta hjälpmeddelande\n" " -V, --version visa versionsinformation för %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "allokering av sko_stack misslyckades" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "namnet \"%s\" är löjligt lÃ¥ngt" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "minnesallokeringen misslyckades i allocate_array()" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "otillÃ¥tet tecken \"%s\" funnet i check_char()" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "inläsaren kräver flaggan -8 för att kunna använda tecknet %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "minnesallokeringen misslyckades i allocate_array()" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: allvarligt internt fel, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "försök att öka arraystorlek misslyckades" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "otillÃ¥ten rad i mallfilen" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "minnesallokeringen misslyckades i yy_flex_xmalloc()" @@ -768,137 +763,133 @@ msgstr "för mÃ¥nga regler (> %d)!" msgid "unknown error processing section 1" msgstr "okänt fel vid tolkning av avsnitt 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "felaktig lista med startvillkor" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "okänd regel" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "efterföljande kontext används tvÃ¥ gÃ¥nger" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "felaktiga iterationsvärden" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "iterationsvärde mÃ¥ste vara positivt" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "teckenintervallet [%c-%c] är tvetydigt i en skiftlägesokänslig inläsare" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "negativt intervall i teckenklass" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] är tvetydigt i en skiftlägesokänslig inläsare" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] är tvetydigt i en skiftlägesokänslig inläsare" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "För lÃ¥ng indatarad\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "felaktigt \"%top\"-direktiv" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "okänt \"%\"-direktiv" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "För lÃ¥ngt definitionsnamn\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "Ensamt \"{\"" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Definitionsvärdet för {%s} är för lÃ¥ngt\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "ofullständig namndefinition" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "För lÃ¥ng alternativrad\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "okänd %%option: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "otillÃ¥ten teckenklass" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "odefinierad definition {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "otillÃ¥tet : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "citationstecken saknas" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "otillÃ¥tet uttryck för teckenklass: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "otillÃ¥tet tecken inom {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "} saknas" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "filslut pÃ¥träffat inuti en handling" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "filslut pÃ¥träffat inuti ett mönster" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "otillÃ¥tet tecken: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "kan inte öppna %s" diff --git a/po/tr.gmo b/po/tr.gmo index 9bf07d6..ddbae24 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index 25f0926..7d706b7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.31\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2004-05-16 18:36+0300\n" "Last-Translator: Deniz Akkus Kanca \n" "Language-Team: Turkish \n" @@ -14,7 +14,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: KBabel 1.0.2\n" #: src/buf.c:79 @@ -77,20 +76,20 @@ msgstr "" "DFA Dökümü:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "tekil tampon sonu durumu yaratılamadı" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "durum # %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "yynxt_tbl[][] yazılamadı" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "sympartition() içinde hatalı geçiş karakterleri saptandı" @@ -106,29 +105,29 @@ msgstr "" "Denklik Sınıfları:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "durum # %d kabul eder: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "durum # %d kabul eder: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "yyacclist_tbl yazılamadı" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "yyacc_tbl yazılamadı" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "ecstbl yazılamadı" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -138,39 +137,39 @@ msgstr "" "\n" "Ara-Denklik Sınıfları:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "yymeta_tbl yazılamadı" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "yybase_tbl yazılamadı" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "yydef_tbl yazılamadı" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "yynxt_tbl yazılamadı" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "yychk_tbl yazılamadı" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "ftbl yazılamadı" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "ssltbl yazılamadı" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "eoltbl yazılamadı" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "yynultrans_tbl yazılamadı" @@ -227,261 +226,257 @@ msgstr "-+ ve --reentrant seçenekleri bir arada kullanılamaz" msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge, C++ tarayıcısı için desteklenmiyor." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "%s oluşturulamadı" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "tablo başlığı yazılamadı" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "iskelet dosyası %s açılamadı" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "iskelet dosyası %s okunurken girdi hatası" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "iskelet dosyası %s kapatılırken hata" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "başlık dosyası %s oluşturulurken hata" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "çıktı dosyası %s yazılırken hata" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "çıktı dosyası %s kapatılırken hata" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "çıktı dosyası %s silinirken hata" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Yedekleme yok.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d yedeklenen (kabul-etmeyen) durumlar.\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Sıkıştırılmış tablolar daima yedeklidir.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "yedek dosyası %s yazılırken hata" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "yedek dosyası %s kapatılırken hata" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s sürüm %s kullanım istatistikleri:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " tarayıcı seçenekleri: -" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA durumu\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA durumu (%d sözcük)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d kural\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Yedekleme yok\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d yedeklenmiş (kabul-edilmeyen) durum\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Sıkıştırılmış tablolar daima yedeklenir\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Başlangıç-satırı kalıpları kullanıldı\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d başlangıç şartları\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d epsilon durumu, %d çift epsilon durumu\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " karakter sınıfı yok\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr "" " %d/%d ihtiyaç duyulan karakter sınıfı %d/%d depolanan sözcük, %d yeniden " "kullanıldı\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d durumu/sonrakidurum çifti yaratıldı\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d tekil/çift geçişler\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d tablo girdileri\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d temel-tanım girdileri yaratıldı\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (en yüksek %d) nxt-chk girdileri yaratıldı\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (en yüksek %d) şablon nxt-chk girdileri yaratıldı\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d boş tablo girdileri\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d prototip yaratıldı\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d şablon yaratıldı, %d kullanıldı\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d denklik sınıfı yaratıldı\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d ara-denklik sınıfı yaratıldı\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d kaydedildi) saçılma çarpışması, %d DFA denk\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " %d tekrar ayırım kümesine ihtiyaç var\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " %d toplam tablo girdisine ihtiyaç var\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "İç hata. flexopt'lar bozuk.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "bilinmeyen -C seçeneği '%c'" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "ölümcül ayrıştırma hatası" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "yedekleme bilgi dosyası %s oluşturulamadı" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex uyumluluğu seçeneği önemli ölçüde yavaşlamaya yol açar\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr "" " ve belki bildirilen başka performans kayıplarının da kaynağı olabilir\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -490,51 +485,51 @@ msgstr "" "yylineno %%seçeneği YALNIZCA yenisatır karakterlerini de eşleyen satırlarda " "yavaşlar.\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (etkileşimli) küçük ölçekli bir yavaşlamaya neden olur\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() küçük ölçekli bir yavaşlamaya neden olur\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT büyük ölçekli bir yavaşlamaya neden olur\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "" "Değişken izleyen bağlam kuralları, büyük ölçekli yavaşlamaya neden olur\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT, -f veya -F ile kullanılamaz" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno, REJECT ile birlikte kullanılamaz" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "değişken izleme ortamı kuralları, -f veya -F ile birlikte kullanılamaz" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass, sadece C++ tarayıcıları için anlamlıdır" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Kullanım: %s [SEÇENEKLER...] [DOSYA...]\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -661,48 +656,48 @@ msgstr "" " -h, --help bu yardım bilgisini gösterir\n" " -V, --version %s sürümünü bildirir\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "\"%s\" ismi gülünç derecede uzun" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "allocate_array() içinde bellek ayırımı başarısız" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "check_char() içinde hatalı karakter '%s' saptandı" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "tarayıcı %s karakterini kullanmak için -8 bayrağına ihtiyaç duyar" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "allocate_array() içinde bellek ayırımı başarısız" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: ölümcül iç hata, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "dizi boyutunu artırma denemesi başarısız" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "iskelet dosya içinde hatalı satır" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "yy_flex_xmalloc() içinde bellek ayırımı başarısız" @@ -758,147 +753,143 @@ msgstr "çok fazla kural (> %d)!" msgid "unknown error processing section 1" msgstr "1. bölüm işlenirken bilinmeyen hata oluştu" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "hatalı başlangıç şart listesi" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "bilinmeyen kural" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "izleyen bağlam iki defa kullanılmış" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "hatalı yineleme değerleri" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "yineleme değeri pozitif olmalı" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "[%c-%c] karakter aralığı, büyük/küçük harf farkı gözetmeyen bir tarayıcıda\n" "belirsiz anlamlı" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "karakter sınıflarında negatif aralık" -#: src/parse.y:918 +#: src/parse.y:916 #, fuzzy msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "" "[%c-%c] karakter aralığı, büyük/küçük harf farkı gözetmeyen bir tarayıcıda\n" "belirsiz anlamlı" -#: src/parse.y:924 +#: src/parse.y:922 #, fuzzy msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "" "[%c-%c] karakter aralığı, büyük/küçük harf farkı gözetmeyen bir tarayıcıda\n" "belirsiz anlamlı" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "Girdi satırı fazla uzun\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "hatalı `%top' yönergesi" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "'%' yönergesi bilinmiyor" -#: src/scan.l:214 +#: src/scan.l:212 #, fuzzy msgid "Definition name too long\n" msgstr "Girdi satırı fazla uzun\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "'{' eşleşmiyor" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "eksik isim tanımlaması" -#: src/scan.l:467 +#: src/scan.l:466 #, fuzzy msgid "Option line too long\n" msgstr "Girdi satırı fazla uzun\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "geçersiz %%seçenek: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "hatalı karakter sınıfı" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "belirsiz tanım {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "hatalı : %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "eksik çift tırnak" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "bozuk karakter sınıfı ifadesi: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "{}'ler içinde hatalı karakter" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "eksik }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "bir eylem içinde EOF ile karşılaşıldı" -#: src/scan.l:977 +#: src/scan.l:978 #, fuzzy msgid "EOF encountered inside pattern" msgstr "bir eylem içinde EOF ile karşılaşıldı" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "hatalı karakter: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "%s açılamıyor" diff --git a/po/vi.gmo b/po/vi.gmo index 33df582..b5310af 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index bfd8dad..37bac0e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: flex-2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2014-02-14 08:17+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -18,7 +18,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.5.5\n" "X-Poedit-SourceCharset: utf-8\n" @@ -83,20 +82,20 @@ msgstr "" "Đổ DFA:\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "không thể tạo trạng thái kết-thúc-bộ-đệm duy nhất" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "trạng thái# %d:\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "Không thể ghi \"yynxt_tbl[][]\"" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "phát hiện ký tá»± chuyển tiếp sai trong sympartition()" @@ -112,29 +111,29 @@ msgstr "" "Lớp tÆ°Æ¡ng đương:\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "trạng thái # %d chấp nhận: [%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "trạng thái # %d chấp nhận: " -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "Không thể ghi \"yyacclist_tbl\"" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "Không thể ghi \"yyacc_tbl\"" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "Không thể ghi \"ecstbl\"" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -144,39 +143,39 @@ msgstr "" "\n" "Lớp tÆ°Æ¡ng-đương-meta:\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "Không thể ghi \"yymeta_tbl\"" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "Không thể ghi \"yybase_tbl\"" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "Không thể ghi \"yydef_tbl\"" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "Không thể ghi \"yynxt_tbl\"" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "Không thể ghi \"yychk_tbl\"" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "Không thể ghi \"ftbl\"" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "Không thể ghi \"ssltbl\"" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "Không thể ghi \"eoltbl\"" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "Không thể ghi \"yynultrans_tbl\"" @@ -237,260 +236,256 @@ msgstr "Hai tùy chọn \"- +\" và \"--reentrant\" xung đột với nhau." msgid "bison bridge not supported for the C++ scanner." msgstr "bison bridge (chiếc cầu bison) không được hỗ trợ với bộ quét C++." -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "không thể tạo %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "không thể ghi phần đầu bảng" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "không thể mở tập tin khung sườn %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "việc phân bổ cho định nghÄ©a macro gặp lỗi" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "gặp lỗi nhập vào khi đọc tập tin khung sườn %s" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "gặp lỗi khi đóng tập tin khung sườn %s" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "gặp lỗi khi tạo tập tin phần đầu %s" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "gặp lỗi khi ghi tập tin xuất %s" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "gặp lỗi khi đóng tập tin xuất %s" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "gặp lỗi khi xoá bỏ tập tin xuất %s" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "Không sao lÆ°u.\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d đang sao lÆ°u các trạng thái (kiểu không chấp nhận).\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "Bảng đã nén lúc nào cÅ©ng sao lÆ°u.\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "găp lỗi khi ghi tập tin sao lÆ°u %s" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "gặp lỗi khi đóng tập tin sao lÆ°u %s" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s phiên bản %s thống kê sá»­ dụng:\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " tùy chọn bộ quét: —" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d trạng thái NFA\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d trạng thái DFA (%d từ)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d quy tắc\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " Không sao lÆ°u\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d đang sao lÆ°u các trạng thái (kiểu không chấp nhận)\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " Bảng đã nén lúc nào cÅ©ng sao lÆ°u\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " Dùng mẫu kiểu đầu dòng\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d điều kiện bắt đầu\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d trạng thái épxilông (ε), %d trạng thái épxilông đôi\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " không có lớp ký tá»±\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d lớp ký tá»± cần %d/%d từ bộ nhớ, %d được dùng lại\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d cặp trạng_thái/trạng_thái_kế đã được tạo\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d việc chuyển tiếp duy nhất/trùng\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d mục tin bảng\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d mục tin base-def (định nghÄ©a cÆ¡ bản) đã được tạo\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (tối đa %d) mục tin nxt-chk (kiểm tra kế tiếp) đã được tạo\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr "" " %d/%d (tối đa %d) mục tin biểu mẫu nxt-chk (kiểm tra kế tiếp) đã được tạo\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d mục tin bảng trống\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d proto (khai báo nguyên mẫu) đã được tạo\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d mẫu đã được tạo, %d lần dùng\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d lớp kiểu tÆ°Æ¡ng đương đã được tạo\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d lớp tÆ°Æ¡ng-đương-meta đã được tạo\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d được lÆ°u) lần va chạm mã băm, %d DFA bằng nhau\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " cần %d tập hợp tái cấp phát\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " cần tổng %d mục tin bảng\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "Gặp lỗi nội bộ vì những flexopts sai dạng.\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Hãy thá»­ lệnh \"%s --help\" (trợ giúp) để xem thêm thông tin.\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "không hiểu tùy chọn \"-C\" là \"%c\"" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "gặp lỗi phân tích nghiêm trọng" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "không thể tạo tập tin thông tin sao lÆ°u %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "" "Tùy chọn kiểu tÆ°Æ¡ng thích lex AT&T \"-l\" làm giảm hiệu suất rất nhiều\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " thì có lẽ thật gây ra trường hợp giảm hiệu suất khác\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " @@ -499,53 +494,53 @@ msgstr "" "%%tùy chọn \"yylineno\" giảm hiệu suất CHỈ với quy tắc khớp với ký tá»± dòng " "mới\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "Tùy chọn \"-I\" (tÆ°Æ¡ng tác) giảm hiệu suất một ít\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() giảm hiệu suất một ít\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT (đẩy ra) làm suy giảm hiệu suất nghiêm trọng\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "Quy tắc ngữ cảnh theo sau biến rất giảm hiệu suất\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "Không cho phép dùng REJECT (đẩy ra) với tùy chọn \"-f\" hay \"-F\"" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "" "Không cho phép dùng %option (tùy chọn) \"yylineno\" với REJECT (đẩy ra)" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "" "không cho phép dùng quy tắc ngữ cảnh theo sau biến với tùy chọn \"-f\" hay " "\"-F\"" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option (tùy chọn) \"yyclass\" chỉ có ý nghÄ©a với bộ quét C++" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "Cách dùng: %s [TÙY_CHỌN] [TẬP_TIN]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -682,48 +677,48 @@ msgstr "" " -h, --help hiển thị _trợ giúp_ này\n" " -V, --version thông báo phiên bản %s\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "việc phân bổ cho sko_stack gặp lỗi" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "tên \"%s\" là dài nhố nhăng" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "việc phân chia bộ nhớ bị lỗi trong allocate_array() (phân bổ mảng)" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "phát hiện ký tá»± sai \"%s\" trong check_char() (kiểm tra ký tá»±)" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "bộ quét cần thiết cờ \"-8\" để dùng ký tá»± %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "việc phân chia bộ nhớ bị lỗi trong allocate_array() (phân bổ mảng)" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s: gặp lỗi nôi bộ nghiêm trọng, %s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "việc thá»­ tăng kích cỡ mảng đã thất bại" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "gặp dòng sai trong tập tin khung sườn" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "việc phân bổ bộ nhớ bị lỗi trong yy_flex_xmalloc()" @@ -780,138 +775,134 @@ msgstr "quá nhiều quy tắc (> %d) !" msgid "unknown error processing section 1" msgstr "gặp lỗi không rõ khi xá»­ lý phần 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "danh sách điều kiện bắt đầu là sai" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "gặp quy tắc không được thừa nhận" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "ngữ cảnh theo sau được dùng hai lần" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "gặp giá trị lặp lại sai" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "giá trị lặp lại phải là số dÆ°Æ¡ng" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "" "phạm vi ký tá»± [%c-%c] là chÆ°a rõ ràng trong trường hợp quét bỏ qua chữ HOA/" "thường" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "gặp phạm vi âm trong lớp ký tá»±" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "[:^lower:] là chÆ°a rõ ràng trong trường hợp quét bỏ qua chữ HOA/thường" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "[:^upper:] là chÆ°a rõ ràng trong trường hợp quét bỏ qua chữ HOA/thường" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "dòng nhập quá dài\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "chỉ thị kiểu \"%top\" (đầu) dạng sai" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "gặp chỉ thị kiểu \"%\" không được nhận dạng" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "Tên định nghÄ©a quá dài\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "ChÆ°a khớp \"{\"" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "Giá trị định nghÄ©a cho {%s} quá dài\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "lời đinh nghÄ©a tên chÆ°a hoàn tất" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "dòng tùy chọn quá dài\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "gặp tùy chọn %% không được nhận dạng: %s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "lớp ký tá»± sai" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "chÆ°a định nghÄ©a định danh {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr " (điệu kiện bắt đầu) sai: %s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "thiếu dấu trích dẫn" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "biểu thức lớp ký tá»± sai: %s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "có ký tá»± sai ở trong hai dấu ngoặc móc {}" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "thiếu }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "gặp kết thúc tập tin ở trong một hành động" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "gặp kết thúc tập tin ở trong mẫu" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "ký tá»± sai: %s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "không thể mở %s" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 9db6499..53544e1 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_CN.po b/po/zh_CN.po index 01cee78..4790ecf 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.38\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2015-08-27 16:54+0800\n" "Last-Translator: Mingye Wang \n" "Language-Team: Chinese (simplified) \n" @@ -16,7 +16,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 1.8.4\n" #: src/buf.c:79 @@ -79,20 +78,20 @@ msgstr "" "DFA 转储：\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "无法创建独立的 end-of-buffer 状态" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "状态 # %d：\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "无法写入 yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "在 sympartition() 检测到错误的变换字符" @@ -108,29 +107,29 @@ msgstr "" "等价类：\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "状态 # %d 接受：[%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "状态 # %d 接受：" -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "无法写入 yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "无法写入 yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "无法写入 ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -140,39 +139,39 @@ msgstr "" "\n" "元等价类：\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "无法写入 yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "无法写入 yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "无法写入 yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "无法写入 yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "无法写入 yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "无法写入 ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "无法写入 ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "无法写入 eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "无法写入 yynultrans_tbl" @@ -229,309 +228,305 @@ msgstr "选项 -+ 和 --reentrant 是互斥的。" msgid "bison bridge not supported for the C++ scanner." msgstr "bison 桥接器不受 C++ 扫描程序支持。" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "无法创建 %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "无法写入表头" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "无法打开骨架文件 %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "给予宏定义配额时失败" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "读取骨架文件 %s 时输入错误" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "关闭骨架文件 %s 出错" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "创建头文件 %s 出错" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "写入输出文件 %s 出错" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "关闭输出文件 %s 出错" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "删除输出文件 %s 出错" # See Concept Index. fr translation is wrong for that 'archive'. -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "没有回溯。\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d 回溯 (非接受) 状态。\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "压缩过的表格总会自动回溯。\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "写入回溯文件 %s 出错" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "关闭回溯文件 %s 出错" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s 版本 %s 用法统计：\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " 扫描器选项：-" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA 状态\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA 状态 (%d 个字词)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d 条规则\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " 没有回溯\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d 回溯 (非接受) 状态\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " 压缩过的表格总会自动回溯\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " 列首式样已使用\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d 起始条件\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d ε状态，%d 双倍ε状态\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " 无字符类别\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d 字符类别所需 %d/%d 字词的保存体，%d 重新使用\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d 状态/下一状态对已创建\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d 独一/重复转换\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d 表格项目\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def 项目已创建\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (峰值 %d) nxt-chk 项目已创建\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (峰值 %d) 模板 nxt-chk 项目已创建\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d 清空表格项目\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d 原型已创建\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d 范本已创建，%d 使用\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d 等价类别已创建\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d 后设等价类别已创建\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d 已保存) 哈希碰撞，%d DFAs 相等\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " 需要 %d 组重新配置\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " 总计需要 %d 表格项目\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "内部错误。flexopts 功能异常。\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "尝试「%s --help」以获得更多信息。\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "未知的 -C 选项“%c”" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "致命的解析错误" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "无法创建回溯信息文件 %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex 兼容性选项会导致大幅性能减退\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " 同时也许是其他回报性能减退的实际来源\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno 导致性能减退，只有当该规则该吻合新列字符时才会\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (交互式) 导致小幅性能减退\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() 导致小幅性能减退\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT 导致大幅性能减退\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "变量末尾上下文规则导致大幅性能减退\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT 无法与 -f 或 -F 共同使用" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno 无法与 REJECT 共同使用" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "变量末尾上下文规则无法与 -f 或 -F 共同使用" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass 只对于 C++ 扫描程序有意义" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "用法：%s [选项] [文件]...\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -657,48 +652,48 @@ msgstr "" " -h, --help 产生这个说明消息\n" " -V, --version 报告 %s 版本\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "给予 sko_stack 配额时失败" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "名称「%s」有荒谬的长度" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "在 allocatearray() 中内存配置失败" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "在 checkchar() 中侦测到不当的字符「%s」" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "扫描程序需要 -8 旗标以使用字符 %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "在 allocatearray() 中内存配置失败" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s：严重内部错误，%s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "试图增加数组大小时失败" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "骨架文件中错误的行" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "在 yy_flex_xmalloc() 中的内存分配失败" @@ -754,136 +749,132 @@ msgstr "规则过多 (> %d)！" msgid "unknown error processing section 1" msgstr "未知的错误处理节 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "错误的起始状态列表" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "不能识别的规则" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "末尾上下文已使用两次" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "不当的迭代值" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "迭代值必须是正值" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "在大小写不须相符的扫描程序中，字符范围 [%c-%c] 是模棱两可的" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "在字符类别中有负值范围" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "在大小写不须相符的扫描程序中，[:^lower:] 是模棱两可的" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "在大小写不须相符的扫描程序中，[:^upper:] 是模棱两可的" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "输入列太长\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "异常的「%top」指令" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "无法辨识的「%」指令" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "定义名称太长\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "不成对的「{」" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "{%s} 的定义值太长\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "不完整的名称定义" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "选项列太长\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "不能识别的 %%选项：%s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "错误的字符类别" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "未定义的定义 {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "错误 <起始条件>：%s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "遗漏引号" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "错误的字符类别表达式：%s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "不当字符于 {} 内部" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "遗漏 }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "在动作中文件结束" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "在式样之内遇到文件结束" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "错误的字符：%s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "无法打开 %s" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 57d8ae4..d8c3aac 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ diff --git a/po/zh_TW.po b/po/zh_TW.po index f0f0ca0..45d9108 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: flex 2.5.37\n" "Report-Msgid-Bugs-To: flex-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2017-05-06 10:49-0400\n" +"POT-Creation-Date: 2016-10-24 18:33-0400\n" "PO-Revision-Date: 2013-02-12 23:23+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -16,7 +16,6 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=1; plural=0;\n" #: src/buf.c:79 @@ -79,20 +78,20 @@ msgstr "" " DFA 傾印：\n" "\n" -#: src/dfa.c:587 +#: src/dfa.c:592 msgid "could not create unique end-of-buffer state" msgstr "無法建立獨一的緩衝區結尾狀態" -#: src/dfa.c:608 +#: src/dfa.c:613 #, c-format msgid "state # %d:\n" msgstr "狀態 # %d：\n" -#: src/dfa.c:768 +#: src/dfa.c:773 msgid "Could not write yynxt_tbl[][]" msgstr "無法寫入 yynxt_tbl[][]" -#: src/dfa.c:1028 +#: src/dfa.c:1033 msgid "bad transition character detected in sympartition()" msgstr "在 sympartition() 偵測到不當的轉換字元" @@ -108,29 +107,29 @@ msgstr "" "等價類別：\n" "\n" -#: src/gen.c:669 src/gen.c:698 src/gen.c:1218 +#: src/gen.c:665 src/gen.c:694 src/gen.c:1214 #, c-format msgid "state # %d accepts: [%d]\n" msgstr "狀態 # %d 接受：[%d]\n" -#: src/gen.c:1115 +#: src/gen.c:1111 #, c-format msgid "state # %d accepts: " msgstr "狀態 # %d 接受：" -#: src/gen.c:1162 +#: src/gen.c:1158 msgid "Could not write yyacclist_tbl" msgstr "無法寫入 yyacclist_tbl" -#: src/gen.c:1236 +#: src/gen.c:1232 msgid "Could not write yyacc_tbl" msgstr "無法寫入 yyacc_tbl" -#: src/gen.c:1251 src/gen.c:1623 src/gen.c:1646 +#: src/gen.c:1247 src/gen.c:1619 src/gen.c:1642 msgid "Could not write ecstbl" msgstr "無法寫入 ecstbl" -#: src/gen.c:1271 +#: src/gen.c:1267 msgid "" "\n" "\n" @@ -140,39 +139,39 @@ msgstr "" "\n" " 後設等價類別：\n" -#: src/gen.c:1293 +#: src/gen.c:1289 msgid "Could not write yymeta_tbl" msgstr "無法寫入 yymeta_tbl" -#: src/gen.c:1352 +#: src/gen.c:1348 msgid "Could not write yybase_tbl" msgstr "無法寫入 yybase_tbl" -#: src/gen.c:1384 +#: src/gen.c:1380 msgid "Could not write yydef_tbl" msgstr "無法寫入 yydef_tbl" -#: src/gen.c:1422 +#: src/gen.c:1418 msgid "Could not write yynxt_tbl" msgstr "無法寫入 yynxt_tbl" -#: src/gen.c:1456 +#: src/gen.c:1452 msgid "Could not write yychk_tbl" msgstr "無法寫入 yychk_tbl" -#: src/gen.c:1608 src/gen.c:1637 +#: src/gen.c:1604 src/gen.c:1633 msgid "Could not write ftbl" msgstr "無法寫入 ftbl" -#: src/gen.c:1614 +#: src/gen.c:1610 msgid "Could not write ssltbl" msgstr "無法寫入 ssltbl" -#: src/gen.c:1665 +#: src/gen.c:1661 msgid "Could not write eoltbl" msgstr "無法寫入 eoltbl" -#: src/gen.c:1722 +#: src/gen.c:1718 msgid "Could not write yynultrans_tbl" msgstr "無法寫入 yynultrans_tbl" @@ -229,308 +228,304 @@ msgstr "選項 -+ 和 --reentrant 是互斥的。" msgid "bison bridge not supported for the C++ scanner." msgstr "bison 橋接器不受 C++ 掃描程式支援。" -#: src/main.c:336 src/main.c:419 +#: src/main.c:336 src/main.c:420 #, c-format msgid "could not create %s" msgstr "無法建立 %s" -#: src/main.c:431 +#: src/main.c:432 msgid "could not write tables header" msgstr "無法寫入表頭" -#: src/main.c:435 +#: src/main.c:436 #, c-format msgid "can't open skeleton file %s" msgstr "無法開啟架構檔案 %s" -#: src/main.c:450 -msgid "Prefix cannot include '[' or ']'" -msgstr "" - -#: src/main.c:474 +#: src/main.c:473 msgid "allocation of macro definition failed" msgstr "給予巨集定義配額時失敗" -#: src/main.c:521 +#: src/main.c:520 #, c-format msgid "input error reading skeleton file %s" msgstr "讀取架構檔案 %s 時輸入錯誤" -#: src/main.c:525 +#: src/main.c:524 #, c-format msgid "error closing skeleton file %s" msgstr "關閉架構檔案 %s 時發生錯誤" -#: src/main.c:709 +#: src/main.c:708 #, c-format msgid "error creating header file %s" msgstr "建立標頭檔案 %s 時發生錯誤" -#: src/main.c:717 +#: src/main.c:716 #, c-format msgid "error writing output file %s" msgstr "寫入輸出檔案 %s 時發生錯誤" -#: src/main.c:721 +#: src/main.c:720 #, c-format msgid "error closing output file %s" msgstr "關閉輸出檔案 %s 時發生錯誤" -#: src/main.c:725 +#: src/main.c:724 #, c-format msgid "error deleting output file %s" msgstr "刪除輸出檔案 %s 時發生錯誤" -#: src/main.c:732 +#: src/main.c:731 #, c-format msgid "No backing up.\n" msgstr "沒有備份。\n" -#: src/main.c:736 +#: src/main.c:735 #, c-format msgid "%d backing up (non-accepting) states.\n" msgstr "%d 備份 (非接受) 狀態。\n" -#: src/main.c:740 +#: src/main.c:739 #, c-format msgid "Compressed tables always back up.\n" msgstr "壓縮過的表格自動備份。\n" -#: src/main.c:743 +#: src/main.c:742 #, c-format msgid "error writing backup file %s" msgstr "寫入備份檔案 %s 時發生錯誤" -#: src/main.c:747 +#: src/main.c:746 #, c-format msgid "error closing backup file %s" msgstr "關閉備份檔案 %s 時發生錯誤" -#: src/main.c:752 +#: src/main.c:751 #, c-format msgid "%s version %s usage statistics:\n" msgstr "%s 版本 %s 用法統計：\n" -#: src/main.c:755 +#: src/main.c:754 #, c-format msgid " scanner options: -" msgstr " 掃描程式選項：-" -#: src/main.c:834 +#: src/main.c:833 #, c-format msgid " %d/%d NFA states\n" msgstr " %d/%d NFA 狀態\n" -#: src/main.c:836 +#: src/main.c:835 #, c-format msgid " %d/%d DFA states (%d words)\n" msgstr " %d/%d DFA 狀態 (%d 個字詞)\n" -#: src/main.c:838 +#: src/main.c:837 #, c-format msgid " %d rules\n" msgstr " %d 條規則\n" -#: src/main.c:843 +#: src/main.c:842 #, c-format msgid " No backing up\n" msgstr " 沒有備份\n" -#: src/main.c:847 +#: src/main.c:846 #, c-format msgid " %d backing-up (non-accepting) states\n" msgstr " %d 備份 (非接受) 狀態\n" -#: src/main.c:852 +#: src/main.c:851 #, c-format msgid " Compressed tables always back-up\n" msgstr " 壓縮過的表格自動備份\n" -#: src/main.c:856 +#: src/main.c:855 #, c-format msgid " Beginning-of-line patterns used\n" msgstr " 列首式樣已使用\n" -#: src/main.c:858 +#: src/main.c:857 #, c-format msgid " %d/%d start conditions\n" msgstr " %d/%d 起始條件\n" -#: src/main.c:862 +#: src/main.c:861 #, c-format msgid " %d epsilon states, %d double epsilon states\n" msgstr " %d ε狀態，%d 雙倍ε狀態\n" -#: src/main.c:866 +#: src/main.c:865 #, c-format msgid " no character classes\n" msgstr " 無字元類別\n" -#: src/main.c:870 +#: src/main.c:869 #, c-format msgid " %d/%d character classes needed %d/%d words of storage, %d reused\n" msgstr " %d/%d 字元類別所需 %d/%d 字詞的儲存體，%d 重新使用\n" -#: src/main.c:875 +#: src/main.c:874 #, c-format msgid " %d state/nextstate pairs created\n" msgstr " %d 狀態/下一狀態對已建立\n" -#: src/main.c:878 +#: src/main.c:877 #, c-format msgid " %d/%d unique/duplicate transitions\n" msgstr " %d/%d 獨一/重複轉換\n" -#: src/main.c:883 +#: src/main.c:882 #, c-format msgid " %d table entries\n" msgstr " %d 表格項目\n" -#: src/main.c:891 +#: src/main.c:890 #, c-format msgid " %d/%d base-def entries created\n" msgstr " %d/%d base-def 項目已建立\n" -#: src/main.c:895 +#: src/main.c:894 #, c-format msgid " %d/%d (peak %d) nxt-chk entries created\n" msgstr " %d/%d (尖峰 %d) nxt-chk 項目已建立\n" -#: src/main.c:899 +#: src/main.c:898 #, c-format msgid " %d/%d (peak %d) template nxt-chk entries created\n" msgstr " %d/%d (尖峰 %d) 模板 nxt-chk 項目已建立\n" -#: src/main.c:903 +#: src/main.c:902 #, c-format msgid " %d empty table entries\n" msgstr " %d 清空表格項目\n" -#: src/main.c:905 +#: src/main.c:904 #, c-format msgid " %d protos created\n" msgstr " %d 原型已建立\n" -#: src/main.c:908 +#: src/main.c:907 #, c-format msgid " %d templates created, %d uses\n" msgstr " %d 範本已建立，%d 使用\n" -#: src/main.c:916 +#: src/main.c:915 #, c-format msgid " %d/%d equivalence classes created\n" msgstr " %d/%d 等價類別已建立\n" -#: src/main.c:924 +#: src/main.c:923 #, c-format msgid " %d/%d meta-equivalence classes created\n" msgstr " %d/%d 後設等價類別已建立\n" -#: src/main.c:930 +#: src/main.c:929 #, c-format msgid " %d (%d saved) hash collisions, %d DFAs equal\n" msgstr " %d (%d 已儲存) 雜湊碰撞，%d DFAs 相等\n" -#: src/main.c:932 +#: src/main.c:931 #, c-format msgid " %d sets of reallocations needed\n" msgstr " 需要 %d 組重新配置\n" -#: src/main.c:934 +#: src/main.c:933 #, c-format msgid " %d total table entries needed\n" msgstr " 總計需要 %d 表格項目\n" -#: src/main.c:1008 +#: src/main.c:1007 #, c-format msgid "Internal error. flexopts are malformed.\n" msgstr "內部錯誤。flexopts 功能異常。\n" -#: src/main.c:1018 +#: src/main.c:1017 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "嘗試「%s --help」以獲得更多資訊。\n" -#: src/main.c:1075 +#: src/main.c:1074 #, c-format msgid "unknown -C option '%c'" msgstr "不明 -C 選項「%c」" -#: src/main.c:1204 +#: src/main.c:1203 #, c-format msgid "%s %s\n" msgstr "%s %s\n" -#: src/main.c:1476 +#: src/main.c:1475 msgid "fatal parse error" msgstr "嚴重的解析錯誤" -#: src/main.c:1508 +#: src/main.c:1507 #, c-format msgid "could not create backing-up info file %s" msgstr "無法建立備份資訊檔案 %s" -#: src/main.c:1529 +#: src/main.c:1528 #, c-format msgid "-l AT&T lex compatibility option entails a large performance penalty\n" msgstr "-l AT&T lex 相容性選項會導致大幅效能減退\n" -#: src/main.c:1532 +#: src/main.c:1531 #, c-format msgid " and may be the actual source of other reported performance penalties\n" msgstr " 同時也許是其他回報效能減退的實際來源\n" -#: src/main.c:1538 +#: src/main.c:1537 #, c-format msgid "" "%%option yylineno entails a performance penalty ONLY on rules that can match " "newline characters\n" msgstr "%%option yylineno 導致效能減退，只有當該規則該吻合新列字元時才會\n" -#: src/main.c:1545 +#: src/main.c:1544 #, c-format msgid "-I (interactive) entails a minor performance penalty\n" msgstr "-I (互動式) 導致小幅效能減退\n" -#: src/main.c:1550 +#: src/main.c:1549 #, c-format msgid "yymore() entails a minor performance penalty\n" msgstr "yymore() 導致小幅效能減退\n" -#: src/main.c:1556 +#: src/main.c:1555 #, c-format msgid "REJECT entails a large performance penalty\n" msgstr "REJECT 導致大幅效能減退\n" -#: src/main.c:1561 +#: src/main.c:1560 #, c-format msgid "Variable trailing context rules entail a large performance penalty\n" msgstr "變數末尾內文規則導致大幅效能減退\n" -#: src/main.c:1573 +#: src/main.c:1572 msgid "REJECT cannot be used with -f or -F" msgstr "REJECT 無法與 -f 或 -F 共同使用" -#: src/main.c:1576 +#: src/main.c:1575 #, c-format msgid "%option yylineno cannot be used with REJECT" msgstr "%option yylineno 無法與 REJECT 共同使用" -#: src/main.c:1579 +#: src/main.c:1578 msgid "variable trailing context rules cannot be used with -f or -F" msgstr "變數末尾內文規則無法與 -f 或 -F 共同使用" -#: src/main.c:1704 +#: src/main.c:1703 #, c-format msgid "%option yyclass only meaningful for C++ scanners" msgstr "%option yyclass 只對於 C++ 掃描程式有意義" -#: src/main.c:1791 +#: src/main.c:1790 #, c-format msgid "Usage: %s [OPTIONS] [FILE]...\n" msgstr "用法：%s [選項] [檔案]…\n" -#: src/main.c:1794 +#: src/main.c:1793 #, fuzzy, c-format msgid "" "Generates programs that perform pattern-matching on text.\n" @@ -656,48 +651,48 @@ msgstr "" " -h, --help 產生這個說明訊息\n" " -V, --version 報告 %s 版本\n" -#: src/misc.c:64 +#: src/misc.c:65 msgid "allocation of sko_stack failed" msgstr "給予 sko_stack 配額時失敗" -#: src/misc.c:100 +#: src/misc.c:101 #, c-format msgid "name \"%s\" ridiculously long" msgstr "名稱「%s」有荒謬的長度" -#: src/misc.c:155 +#: src/misc.c:151 msgid "memory allocation failed in allocate_array()" msgstr "在 allocatearray() 中記憶體配置失敗" -#: src/misc.c:205 +#: src/misc.c:201 #, c-format msgid "bad character '%s' detected in check_char()" msgstr "在 checkchar() 中偵測到不當的字元「%s」" -#: src/misc.c:210 +#: src/misc.c:206 #, c-format msgid "scanner requires -8 flag to use the character %s" msgstr "掃描程式需要 -8 旗標以使用字元 %s" -#: src/misc.c:229 +#: src/misc.c:225 #, fuzzy msgid "memory allocation failure in xstrdup()" msgstr "在 allocatearray() 中記憶體配置失敗" -#: src/misc.c:303 +#: src/misc.c:299 #, c-format msgid "%s: fatal internal error, %s\n" msgstr "%s：嚴重內部錯誤，%s\n" -#: src/misc.c:671 +#: src/misc.c:689 msgid "attempt to increase array size failed" msgstr "試圖增加陣列大小時失敗" -#: src/misc.c:795 +#: src/misc.c:816 msgid "bad line in skeleton file" msgstr "架構檔案中不當的列" -#: src/misc.c:845 +#: src/misc.c:866 msgid "memory allocation failed in yy_flex_xmalloc()" msgstr "在 yy_flex_xmalloc() 中的記憶體配置失敗" @@ -753,136 +748,132 @@ msgstr "太多規則 (> %d)！" msgid "unknown error processing section 1" msgstr "不明的錯誤處理區段 1" -#: src/parse.y:184 src/parse.y:353 +#: src/parse.y:184 src/parse.y:351 msgid "bad start condition list" msgstr "不當的起始條件清單" -#: src/parse.y:204 -msgid "Prefix must not contain [ or ]" -msgstr "" - -#: src/parse.y:317 +#: src/parse.y:315 msgid "unrecognized rule" msgstr "無法辨識的規則" -#: src/parse.y:436 src/parse.y:449 src/parse.y:518 +#: src/parse.y:434 src/parse.y:447 src/parse.y:516 msgid "trailing context used twice" msgstr "末尾內文已使用兩次" -#: src/parse.y:554 src/parse.y:564 src/parse.y:637 src/parse.y:647 +#: src/parse.y:552 src/parse.y:562 src/parse.y:635 src/parse.y:645 msgid "bad iteration values" msgstr "不當的迭代值" -#: src/parse.y:582 src/parse.y:600 src/parse.y:665 src/parse.y:683 +#: src/parse.y:580 src/parse.y:598 src/parse.y:663 src/parse.y:681 msgid "iteration value must be positive" msgstr "迭代值必須是正值" -#: src/parse.y:806 src/parse.y:816 +#: src/parse.y:804 src/parse.y:814 #, c-format msgid "the character range [%c-%c] is ambiguous in a case-insensitive scanner" msgstr "在大小寫不須相符的掃描程式中，字元範圍 [%c-%c] 是模稜兩可的" -#: src/parse.y:821 +#: src/parse.y:819 msgid "negative range in character class" msgstr "在字元類別中有負值範圍" -#: src/parse.y:918 +#: src/parse.y:916 msgid "[:^lower:] is ambiguous in case insensitive scanner" msgstr "在大小寫不須相符的掃描程式中，[:^lower:] 是模稜兩可的" -#: src/parse.y:924 +#: src/parse.y:922 msgid "[:^upper:] ambiguous in case insensitive scanner" msgstr "在大小寫不須相符的掃描程式中，[:^upper:] 是模稜兩可的" -#: src/scan.l:82 src/scan.l:644 src/scan.l:702 +#: src/scan.l:82 src/scan.l:642 src/scan.l:700 msgid "Input line too long\n" msgstr "輸入列太長\n" -#: src/scan.l:183 +#: src/scan.l:181 #, c-format msgid "malformed '%top' directive" msgstr "異常的「%top」指令" -#: src/scan.l:205 +#: src/scan.l:203 #, no-c-format msgid "unrecognized '%' directive" msgstr "無法辨識的「%」指令" -#: src/scan.l:214 +#: src/scan.l:212 msgid "Definition name too long\n" msgstr "定義名稱太長\n" -#: src/scan.l:309 +#: src/scan.l:308 msgid "Unmatched '{'" msgstr "不成對的「{」" -#: src/scan.l:325 +#: src/scan.l:324 #, c-format msgid "Definition value for {%s} too long\n" msgstr "{%s} 的定義值太長\n" -#: src/scan.l:342 +#: src/scan.l:341 msgid "incomplete name definition" msgstr "不完整的名稱定義" -#: src/scan.l:467 +#: src/scan.l:466 msgid "Option line too long\n" msgstr "選項列太長\n" -#: src/scan.l:475 +#: src/scan.l:474 #, c-format msgid "unrecognized %%option: %s" msgstr "無法辨識的 %%option：%s" -#: src/scan.l:659 src/scan.l:832 +#: src/scan.l:657 src/scan.l:830 msgid "bad character class" msgstr "不當的字元類別" -#: src/scan.l:709 +#: src/scan.l:707 #, c-format msgid "undefined definition {%s}" msgstr "未定義的定義 {%s}" -#: src/scan.l:772 +#: src/scan.l:770 msgid "unbalanced parenthesis" msgstr "" -#: src/scan.l:787 +#: src/scan.l:785 #, c-format msgid "bad : %s" msgstr "不當的 <起始條件>：%s" -#: src/scan.l:800 +#: src/scan.l:798 msgid "missing quote" msgstr "缺少引號" -#: src/scan.l:866 +#: src/scan.l:864 #, c-format msgid "bad character class expression: %s" msgstr "不當的字元類別運算式：%s" -#: src/scan.l:888 +#: src/scan.l:886 msgid "bad character inside {}'s" msgstr "不當字元於 {} 內部" -#: src/scan.l:894 +#: src/scan.l:892 msgid "missing }" msgstr "缺少 }" -#: src/scan.l:972 +#: src/scan.l:973 msgid "EOF encountered inside an action" msgstr "在動作之內遇到檔案結束" -#: src/scan.l:977 +#: src/scan.l:978 msgid "EOF encountered inside pattern" msgstr "在式樣之內遇到檔案結束" -#: src/scan.l:1010 +#: src/scan.l:1011 #, c-format msgid "bad character: %s" msgstr "不當的字元：%s" -#: src/scan.l:1038 +#: src/scan.l:1039 #, c-format msgid "can't open %s" msgstr "無法開啟 %s" diff --git a/src/Makefile.am b/src/Makefile.am index e379692..77ddf4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,44 +1,21 @@ AM_YFLAGS = -d -AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" +localedir = $(datadir)/locale +AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl LIBS = @LIBS@ m4 = @M4@ bin_PROGRAMS = flex -if ENABLE_BOOTSTRAP noinst_PROGRAMS = stage1flex -endif - -if ENABLE_LIBFL -lib_LTLIBRARIES = libfl.la -endif -libfl_la_SOURCES = \ - libmain.c \ - libyywrap.c -libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +lib_LTLIBRARIES = \ + libfl.la \ + libfl_pic.la stage1flex_SOURCES = \ scan.l \ $(COMMON_SOURCES) -if CROSS -stage1flex_LDADD = -stage1flex_SOURCES += \ - ../lib/malloc.c \ - ../lib/realloc.c -stage1flex_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC_FOR_BUILD) \ - $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ - -$(stage1flex_OBJECTS): CC=$(CC_FOR_BUILD) -$(stage1flex_OBJECTS): CFLAGS=$(CFLAGS_FOR_BUILD) -$(stage1flex_OBJECTS): CPP=$(CPP_FOR_BUILD) -$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD) -else -stage1flex_LDADD = $(LDADD) -stage1flex_LINK = $(LINK) stage1flex_CFLAGS = $(AM_CFLAGS) -endif flex_SOURCES = \ $(COMMON_SOURCES) @@ -77,7 +54,19 @@ COMMON_SOURCES = \ version.h \ yylex.c -LDADD = $(LIBOBJS) @LIBINTL@ +LDADD = ../lib/libcompat.la @LIBINTL@ + +libfl_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ + +libfl_pic_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ include_HEADERS = \ FlexLexer.h @@ -87,38 +76,29 @@ EXTRA_DIST = \ mkskel.sh \ gettext.h -CLEANFILES = stage1scan.c stage1flex$(EXEEXT) +DISTCLEANFILES = stage1scan.c MAINTAINERCLEANFILES = skel.c skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c - $(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp + sed 's/4_/a4_/g; s/m4preproc_/m4_/g' $< | \ + $(m4) -P -I $(srcdir) \ + -DFLEX_MAJOR_VERSION=` echo $(VERSION)|cut -f 1 -d .` \ + -DFLEX_MINOR_VERSION=` echo $(VERSION)|cut -f 2 -d .` \ + -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | \ + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp mv $@.tmp $@ -if ENABLE_BOOTSTRAP stage1scan.c: scan.l stage1flex$(EXEEXT) - ./stage1flex$(EXEEXT) $(AM_LFLAGS) $(LFLAGS) -o $@ $(srcdir)/scan.l -else -stage1scan.c: scan.c - sed 's|^\(#line .*\)"'`printf %s $< | sed 's|[][\\\\.*]|\\\\&|g'`'"|\1"$@"|g' $< > $@ -endif - -dist-hook: scan.l flex$(EXEEXT) - chmod u+w $(distdir)/scan.c && \ - ./flex$(EXEEXT) -o scan.c $< && \ - mv scan.c $(distdir) + ./stage1flex$(EXEEXT) -o $@ $< # make needs to be told to make parse.h so that parallelized runs will # not fail. -stage1flex-main.$(OBJEXT): parse.h -flex-main.$(OBJEXT): parse.h - -stage1flex-yylex.$(OBJEXT): parse.h -flex-yylex.$(OBJEXT): parse.h - -stage1flex-scan.$(OBJEXT): parse.h -flex-stage1scan.$(OBJEXT): parse.h +main.c : parse.h +scan.c : parse.h +stage1scan.c : parse.h +yylex.c : parse.h # Run GNU indent on sources. Don't run this unless all the sources compile cleanly. # @@ -155,14 +135,12 @@ indentfiles = \ tables_shared.h \ tblcmp.c -indent: $(top_srcdir)/.indent.pro - cd $(top_srcdir) && \ - for f in $(indentfiles); do \ - f=src/$$f; \ - echo indenting $$f; \ - INDENT_PROFILE=.indent.pro $(INDENT) <$$f >/dev/null && \ - INDENT_PROFILE=.indent.pro $(INDENT) $$f || \ - echo $$f FAILED to indent; \ - done; - -.PHONY: indent +indent: + if [ -f .indent.pro ] ; then \ + for f in $(indentfiles);\ + do\ + echo indenting $$f ;\ + f='$(srcdir)'/$$f; \ + $(indent) < $$f >/dev/null && indent $$f || echo $$f FAILED to indent ;\ + done \ + fi diff --git a/src/Makefile.in b/src/Makefile.in index e570b87..f048441 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -91,22 +91,17 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = flex$(EXEEXT) -@ENABLE_BOOTSTRAP_TRUE@noinst_PROGRAMS = stage1flex$(EXEEXT) -@CROSS_TRUE@am__append_1 = \ -@CROSS_TRUE@ ../lib/malloc.c \ -@CROSS_TRUE@ ../lib/realloc.c - +noinst_PROGRAMS = stage1flex$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \ @@ -155,9 +150,13 @@ am__v_lt_1 = libfl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libfl_la_LDFLAGS) $(LDFLAGS) -o $@ -@ENABLE_LIBFL_TRUE@am_libfl_la_rpath = -rpath $(libdir) +libfl_pic_la_LIBADD = +am_libfl_pic_la_OBJECTS = libmain.lo libyywrap.lo +libfl_pic_la_OBJECTS = $(am_libfl_pic_la_OBJECTS) +libfl_pic_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libfl_pic_la_LDFLAGS) $(LDFLAGS) -o $@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -LIBOBJDIR = ../lib/ am__objects_1 = flex-buf.$(OBJEXT) flex-ccl.$(OBJEXT) \ flex-dfa.$(OBJEXT) flex-ecs.$(OBJEXT) flex-filter.$(OBJEXT) \ flex-gen.$(OBJEXT) flex-main.$(OBJEXT) flex-misc.$(OBJEXT) \ @@ -170,15 +169,10 @@ am_flex_OBJECTS = $(am__objects_1) nodist_flex_OBJECTS = flex-stage1scan.$(OBJEXT) flex_OBJECTS = $(am_flex_OBJECTS) $(nodist_flex_OBJECTS) flex_LDADD = $(LDADD) -flex_DEPENDENCIES = $(LIBOBJS) +flex_DEPENDENCIES = ../lib/libcompat.la flex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(flex_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am__stage1flex_SOURCES_DIST = scan.l buf.c ccl.c dfa.c ecs.c filter.c \ - flexdef.h flexint.h gen.c main.c misc.c nfa.c options.c \ - options.h parse.y regex.c scanflags.c scanopt.c scanopt.h \ - skel.c sym.c tables.c tables.h tables_shared.c tables_shared.h \ - tblcmp.c version.h yylex.c ../lib/malloc.c ../lib/realloc.c am__objects_2 = stage1flex-buf.$(OBJEXT) stage1flex-ccl.$(OBJEXT) \ stage1flex-dfa.$(OBJEXT) stage1flex-ecs.$(OBJEXT) \ stage1flex-filter.$(OBJEXT) stage1flex-gen.$(OBJEXT) \ @@ -189,14 +183,13 @@ am__objects_2 = stage1flex-buf.$(OBJEXT) stage1flex-ccl.$(OBJEXT) \ stage1flex-skel.$(OBJEXT) stage1flex-sym.$(OBJEXT) \ stage1flex-tables.$(OBJEXT) stage1flex-tables_shared.$(OBJEXT) \ stage1flex-tblcmp.$(OBJEXT) stage1flex-yylex.$(OBJEXT) -am__dirstamp = $(am__leading_dot)dirstamp -@CROSS_TRUE@am__objects_3 = ../lib/stage1flex-malloc.$(OBJEXT) \ -@CROSS_TRUE@ ../lib/stage1flex-realloc.$(OBJEXT) -am_stage1flex_OBJECTS = stage1flex-scan.$(OBJEXT) $(am__objects_2) \ - $(am__objects_3) +am_stage1flex_OBJECTS = stage1flex-scan.$(OBJEXT) $(am__objects_2) stage1flex_OBJECTS = $(am_stage1flex_OBJECTS) -am__DEPENDENCIES_1 = $(LIBOBJS) -@CROSS_FALSE@stage1flex_DEPENDENCIES = $(am__DEPENDENCIES_1) +stage1flex_LDADD = $(LDADD) +stage1flex_DEPENDENCIES = ../lib/libcompat.la +stage1flex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(stage1flex_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -248,10 +241,10 @@ AM_V_YACC = $(am__v_YACC_@AM_V@) am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) am__v_YACC_0 = @echo " YACC " $@; am__v_YACC_1 = -SOURCES = $(libfl_la_SOURCES) $(flex_SOURCES) $(nodist_flex_SOURCES) \ - $(stage1flex_SOURCES) -DIST_SOURCES = $(libfl_la_SOURCES) $(flex_SOURCES) \ - $(am__stage1flex_SOURCES_DIST) +SOURCES = $(libfl_la_SOURCES) $(libfl_pic_la_SOURCES) $(flex_SOURCES) \ + $(nodist_flex_SOURCES) $(stage1flex_SOURCES) +DIST_SOURCES = $(libfl_la_SOURCES) $(libfl_pic_la_SOURCES) \ + $(flex_SOURCES) $(stage1flex_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -280,8 +273,7 @@ ETAGS = etags CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \ - $(top_srcdir)/lib/malloc.c $(top_srcdir)/lib/realloc.c parse.c \ - parse.h scan.c + parse.c parse.h scan.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -292,17 +284,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -334,14 +321,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -393,7 +378,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -424,7 +408,7 @@ infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ +localedir = $(datadir)/locale localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -443,22 +427,17 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_YFLAGS = -d -AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" +AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl m4 = @M4@ -@ENABLE_LIBFL_TRUE@lib_LTLIBRARIES = libfl.la -libfl_la_SOURCES = \ - libmain.c \ - libyywrap.c +lib_LTLIBRARIES = \ + libfl.la \ + libfl_pic.la -libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ -stage1flex_SOURCES = scan.l $(COMMON_SOURCES) $(am__append_1) -@CROSS_FALSE@stage1flex_LDADD = $(LDADD) -@CROSS_TRUE@stage1flex_LDADD = -@CROSS_FALSE@stage1flex_LINK = $(LINK) -@CROSS_TRUE@stage1flex_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC_FOR_BUILD) \ -@CROSS_TRUE@ $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ - -@CROSS_FALSE@stage1flex_CFLAGS = $(AM_CFLAGS) +stage1flex_SOURCES = \ + scan.l \ + $(COMMON_SOURCES) + +stage1flex_CFLAGS = $(AM_CFLAGS) flex_SOURCES = \ $(COMMON_SOURCES) @@ -495,7 +474,17 @@ COMMON_SOURCES = \ version.h \ yylex.c -LDADD = $(LIBOBJS) @LIBINTL@ +LDADD = ../lib/libcompat.la @LIBINTL@ +libfl_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ +libfl_pic_la_SOURCES = \ + libmain.c \ + libyywrap.c + +libfl_pic_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ include_HEADERS = \ FlexLexer.h @@ -504,7 +493,7 @@ EXTRA_DIST = \ mkskel.sh \ gettext.h -CLEANFILES = stage1scan.c stage1flex$(EXEEXT) +DISTCLEANFILES = stage1scan.c MAINTAINERCLEANFILES = skel.c # Run GNU indent on sources. Don't run this unless all the sources compile cleanly. @@ -628,7 +617,10 @@ clean-libLTLIBRARIES: } libfl.la: $(libfl_la_OBJECTS) $(libfl_la_DEPENDENCIES) $(EXTRA_libfl_la_DEPENDENCIES) - $(AM_V_CCLD)$(libfl_la_LINK) $(am_libfl_la_rpath) $(libfl_la_OBJECTS) $(libfl_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libfl_la_LINK) -rpath $(libdir) $(libfl_la_OBJECTS) $(libfl_la_LIBADD) $(LIBS) + +libfl_pic.la: $(libfl_pic_la_OBJECTS) $(libfl_pic_la_DEPENDENCIES) $(EXTRA_libfl_pic_la_DEPENDENCIES) + $(AM_V_CCLD)$(libfl_pic_la_LINK) -rpath $(libdir) $(libfl_pic_la_OBJECTS) $(libfl_pic_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -710,32 +702,17 @@ parse.h: parse.c flex$(EXEEXT): $(flex_OBJECTS) $(flex_DEPENDENCIES) $(EXTRA_flex_DEPENDENCIES) @rm -f flex$(EXEEXT) $(AM_V_CCLD)$(flex_LINK) $(flex_OBJECTS) $(flex_LDADD) $(LIBS) -../lib/$(am__dirstamp): - @$(MKDIR_P) ../lib - @: > ../lib/$(am__dirstamp) -../lib/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) ../lib/$(DEPDIR) - @: > ../lib/$(DEPDIR)/$(am__dirstamp) -../lib/stage1flex-malloc.$(OBJEXT): ../lib/$(am__dirstamp) \ - ../lib/$(DEPDIR)/$(am__dirstamp) -../lib/stage1flex-realloc.$(OBJEXT): ../lib/$(am__dirstamp) \ - ../lib/$(DEPDIR)/$(am__dirstamp) stage1flex$(EXEEXT): $(stage1flex_OBJECTS) $(stage1flex_DEPENDENCIES) $(EXTRA_stage1flex_DEPENDENCIES) @rm -f stage1flex$(EXEEXT) - $(AM_V_GEN)$(stage1flex_LINK) $(stage1flex_OBJECTS) $(stage1flex_LDADD) $(LIBS) + $(AM_V_CCLD)$(stage1flex_LINK) $(stage1flex_OBJECTS) $(stage1flex_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f ../lib/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/malloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/realloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/stage1flex-malloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@../lib/$(DEPDIR)/stage1flex-realloc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flex-buf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flex-ccl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flex-dfa.Po@am__quote@ @@ -782,25 +759,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stage1flex-yylex.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -1393,34 +1367,6 @@ stage1flex-yylex.obj: yylex.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -c -o stage1flex-yylex.obj `if test -f 'yylex.c'; then $(CYGPATH_W) 'yylex.c'; else $(CYGPATH_W) '$(srcdir)/yylex.c'; fi` -../lib/stage1flex-malloc.o: ../lib/malloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -MT ../lib/stage1flex-malloc.o -MD -MP -MF ../lib/$(DEPDIR)/stage1flex-malloc.Tpo -c -o ../lib/stage1flex-malloc.o `test -f '../lib/malloc.c' || echo '$(srcdir)/'`../lib/malloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/stage1flex-malloc.Tpo ../lib/$(DEPDIR)/stage1flex-malloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/malloc.c' object='../lib/stage1flex-malloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -c -o ../lib/stage1flex-malloc.o `test -f '../lib/malloc.c' || echo '$(srcdir)/'`../lib/malloc.c - -../lib/stage1flex-malloc.obj: ../lib/malloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -MT ../lib/stage1flex-malloc.obj -MD -MP -MF ../lib/$(DEPDIR)/stage1flex-malloc.Tpo -c -o ../lib/stage1flex-malloc.obj `if test -f '../lib/malloc.c'; then $(CYGPATH_W) '../lib/malloc.c'; else $(CYGPATH_W) '$(srcdir)/../lib/malloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/stage1flex-malloc.Tpo ../lib/$(DEPDIR)/stage1flex-malloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/malloc.c' object='../lib/stage1flex-malloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -c -o ../lib/stage1flex-malloc.obj `if test -f '../lib/malloc.c'; then $(CYGPATH_W) '../lib/malloc.c'; else $(CYGPATH_W) '$(srcdir)/../lib/malloc.c'; fi` - -../lib/stage1flex-realloc.o: ../lib/realloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -MT ../lib/stage1flex-realloc.o -MD -MP -MF ../lib/$(DEPDIR)/stage1flex-realloc.Tpo -c -o ../lib/stage1flex-realloc.o `test -f '../lib/realloc.c' || echo '$(srcdir)/'`../lib/realloc.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/stage1flex-realloc.Tpo ../lib/$(DEPDIR)/stage1flex-realloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/realloc.c' object='../lib/stage1flex-realloc.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -c -o ../lib/stage1flex-realloc.o `test -f '../lib/realloc.c' || echo '$(srcdir)/'`../lib/realloc.c - -../lib/stage1flex-realloc.obj: ../lib/realloc.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -MT ../lib/stage1flex-realloc.obj -MD -MP -MF ../lib/$(DEPDIR)/stage1flex-realloc.Tpo -c -o ../lib/stage1flex-realloc.obj `if test -f '../lib/realloc.c'; then $(CYGPATH_W) '../lib/realloc.c'; else $(CYGPATH_W) '$(srcdir)/../lib/realloc.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../lib/$(DEPDIR)/stage1flex-realloc.Tpo ../lib/$(DEPDIR)/stage1flex-realloc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../lib/realloc.c' object='../lib/stage1flex-realloc.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stage1flex_CFLAGS) $(CFLAGS) -c -o ../lib/stage1flex-realloc.obj `if test -f '../lib/realloc.c'; then $(CYGPATH_W) '../lib/realloc.c'; else $(CYGPATH_W) '$(srcdir)/../lib/realloc.c'; fi` - .l.c: $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) @@ -1536,9 +1482,6 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) config.h @@ -1568,16 +1511,13 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: - -test -z "$(LIBOBJS)" || rm -f $(LIBOBJS) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -rm -f ../lib/$(DEPDIR)/$(am__dirstamp) - -rm -f ../lib/$(am__dirstamp) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1592,7 +1532,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ../lib/$(DEPDIR) ./$(DEPDIR) + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -1638,7 +1578,7 @@ install-ps-am: installcheck-am: installcheck-binPROGRAMS maintainer-clean: maintainer-clean-am - -rm -rf ../lib/$(DEPDIR) ./$(DEPDIR) + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1663,68 +1603,53 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ - ctags-am dist-hook distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-libLTLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installcheck-binPROGRAMS installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-includeHEADERS \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-includeHEADERS install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installcheck-binPROGRAMS \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-libLTLIBRARIES .PRECIOUS: Makefile -@CROSS_TRUE@$(stage1flex_OBJECTS): CC=$(CC_FOR_BUILD) -@CROSS_TRUE@$(stage1flex_OBJECTS): CFLAGS=$(CFLAGS_FOR_BUILD) -@CROSS_TRUE@$(stage1flex_OBJECTS): CPP=$(CPP_FOR_BUILD) -@CROSS_TRUE@$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -@CROSS_TRUE@$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD) - skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c - $(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp + sed 's/4_/a4_/g; s/m4preproc_/m4_/g' $< | \ + $(m4) -P -I $(srcdir) \ + -DFLEX_MAJOR_VERSION=` echo $(VERSION)|cut -f 1 -d .` \ + -DFLEX_MINOR_VERSION=` echo $(VERSION)|cut -f 2 -d .` \ + -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | \ + $(SHELL) $(srcdir)/mkskel.sh > $@.tmp mv $@.tmp $@ -@ENABLE_BOOTSTRAP_TRUE@stage1scan.c: scan.l stage1flex$(EXEEXT) -@ENABLE_BOOTSTRAP_TRUE@ ./stage1flex$(EXEEXT) $(AM_LFLAGS) $(LFLAGS) -o $@ $(srcdir)/scan.l -@ENABLE_BOOTSTRAP_FALSE@stage1scan.c: scan.c -@ENABLE_BOOTSTRAP_FALSE@ sed 's|^\(#line .*\)"'`printf %s $< | sed 's|[][\\\\.*]|\\\\&|g'`'"|\1"$@"|g' $< > $@ - -dist-hook: scan.l flex$(EXEEXT) - chmod u+w $(distdir)/scan.c && \ - ./flex$(EXEEXT) -o scan.c $< && \ - mv scan.c $(distdir) +stage1scan.c: scan.l stage1flex$(EXEEXT) + ./stage1flex$(EXEEXT) -o $@ $< # make needs to be told to make parse.h so that parallelized runs will # not fail. -stage1flex-main.$(OBJEXT): parse.h -flex-main.$(OBJEXT): parse.h - -stage1flex-yylex.$(OBJEXT): parse.h -flex-yylex.$(OBJEXT): parse.h - -stage1flex-scan.$(OBJEXT): parse.h -flex-stage1scan.$(OBJEXT): parse.h - -indent: $(top_srcdir)/.indent.pro - cd $(top_srcdir) && \ - for f in $(indentfiles); do \ - f=src/$$f; \ - echo indenting $$f; \ - INDENT_PROFILE=.indent.pro $(INDENT) <$$f >/dev/null && \ - INDENT_PROFILE=.indent.pro $(INDENT) $$f || \ - echo $$f FAILED to indent; \ - done; - -.PHONY: indent +main.c : parse.h +scan.c : parse.h +stage1scan.c : parse.h +yylex.c : parse.h + +indent: + if [ -f .indent.pro ] ; then \ + for f in $(indentfiles);\ + do\ + echo indenting $$f ;\ + f='$(srcdir)'/$$f; \ + $(indent) < $$f >/dev/null && indent $$f || echo $$f FAILED to indent ;\ + done \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/buf.c b/src/buf.c index 185083c..1d22a6f 100644 --- a/src/buf.c +++ b/src/buf.c @@ -166,7 +166,7 @@ struct Buf *buf_strdefine (struct Buf *buf, const char *str, const char *def) */ struct Buf *buf_m4_define (struct Buf *buf, const char* def, const char* val) { - const char * fmt = "m4_define( [[%s]], [[[[%s]]]])m4_dnl\n"; + const char * fmt = "m4_define( [[%s]], [[%s]])m4_dnl\n"; char * str; size_t strsz; @@ -259,7 +259,7 @@ struct Buf *buf_append (struct Buf *buf, const void *ptr, int n_elem) buf->nmax = n_alloc; } - memcpy ((char *) buf->elts + (size_t) buf->nelts * buf->elt_size, ptr, + memcpy (buf->elts + (size_t) buf->nelts * buf->elt_size, ptr, (size_t) n_elem * buf->elt_size); buf->nelts += n_elem; diff --git a/src/config.h.in b/src/config.h.in index 4756505..92335e7 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -19,17 +19,11 @@ */ #undef HAVE_ALLOCA_H -/* Define to 1 if you have the `available.' function. */ -#undef HAVE_AVAILABLE_ - -/* Define to 1 if you have the `by' function. */ -#undef HAVE_BY - -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework. */ #undef HAVE_CFPREFERENCESCOPYAPPVALUE @@ -40,45 +34,30 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `dnl' function. */ -#undef HAVE_DNL - /* Define to 1 if you have the `dup2' function. */ #undef HAVE_DUP2 -/* Define to 1 if you have the `enabled' function. */ -#undef HAVE_ENABLED - /* Define to 1 if you have the `fork' function. */ #undef HAVE_FORK -/* Define to 1 if you have the `function.' function. */ -#undef HAVE_FUNCTION_ - /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define to 1 if you have the `have' function. */ -#undef HAVE_HAVE - /* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV -/* Define to 1 if you have the `if' function. */ -#undef HAVE_IF - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the `is' function. */ -#undef HAVE_IS - /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM +/* pthread library */ +#undef HAVE_LIBPTHREAD + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -98,24 +77,9 @@ /* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define to 1 if you have the `Needed' function. */ -#undef HAVE_NEEDED - /* Define to 1 if you have the header file. */ #undef HAVE_NETINET_IN_H -/* Define to 1 if you have the `NLS' function. */ -#undef HAVE_NLS - -/* Define to 1 if you have the `not' function. */ -#undef HAVE_NOT - -/* Define to 1 if you have the `only' function. */ -#undef HAVE_ONLY - -/* Define to 1 if you have the `OpenBSD' function. */ -#undef HAVE_OPENBSD - /* Define to 1 if you have the `pow' function. */ #undef HAVE_POW @@ -135,9 +99,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_REGEX_H -/* Define to 1 if you have the `replacement' function. */ -#undef HAVE_REPLACEMENT - /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE @@ -150,9 +111,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - /* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR @@ -174,24 +132,15 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `Used' function. */ -#undef HAVE_USED - /* Define to 1 if you have the `vfork' function. */ #undef HAVE_VFORK /* Define to 1 if you have the header file. */ #undef HAVE_VFORK_H -/* Define to 1 if you have the `We' function. */ -#undef HAVE_WE - /* Define to 1 if `fork' works. */ #undef HAVE_WORKING_FORK diff --git a/src/dfa.c b/src/dfa.c index ab10314..0fcc5b3 100644 --- a/src/dfa.c +++ b/src/dfa.c @@ -463,9 +463,14 @@ void ntod (void) /* We still may want to use the table if numecs * is a power of 2. */ - if (numecs <= csize && is_power_of_2(numecs)) { - use_NUL_table = true; - } + int power_of_two; + + for (power_of_two = 1; power_of_two <= csize; + power_of_two *= 2) + if (numecs == power_of_two) { + use_NUL_table = true; + break; + } } if (use_NUL_table) diff --git a/src/filter.c b/src/filter.c index 71f3635..9d0ace5 100644 --- a/src/filter.c +++ b/src/filter.c @@ -176,7 +176,7 @@ clearerr(stdin); if ((r = chain->filter_func (chain)) == -1) flexfatal (_("filter_func failed")); - FLEX_EXIT (0); + exit (0); } else { execvp (chain->argv[0], @@ -185,7 +185,7 @@ clearerr(stdin); chain->argv[0]); } - FLEX_EXIT (1); + exit (1); } /* Parent */ @@ -296,8 +296,7 @@ int filter_tee_header (struct filter *chain) fprintf (to_h, "\n"); /* write a fake line number. It will get fixed by the linedir filter. */ - if (gen_line_dirs) - fprintf (to_h, "#line 4000 \"M4_YY_OUTFILE_NAME\"\n"); + fprintf (to_h, "#line 4000 \"M4_YY_OUTFILE_NAME\"\n"); fprintf (to_h, "#undef %sIN_HEADER\n", prefix); fprintf (to_h, "#endif /* %sHEADER_H */\n", prefix); @@ -324,7 +323,7 @@ int filter_tee_header (struct filter *chain) while (wait (0) > 0) ; - FLEX_EXIT (0); + exit (0); return 0; } diff --git a/src/flex.skl b/src/flex.skl index 786c977..de45168 100644 --- a/src/flex.skl +++ b/src/flex.skl @@ -6,18 +6,17 @@ %# pre-compilation stage of flex. Only macros starting %# with `m4preproc_' are processed, and quoting is normal. %# -%# 2. The preprocessed skeleton is translated into a C array, saved -%# as "skel.c" and compiled into the flex binary. The %# comment -%# lines are removed. +%# 2. The preprocessed skeleton is translated verbatim into a +%# C array, saved as "skel.c" and compiled into the flex binary. %# %# 3. At runtime, the skeleton is generated and filtered (again) %# through m4. Macros beginning with `m4_' will be processed. %# The quoting is "[[" and "]]" so we don't interfere with %# user code. -%# +%# %# All generate macros for the m4 stage contain the text "m4" or "M4" %# in them. This is to distinguish them from CPP macros. -%# The exception to this rule is YY_G, which is an m4 macro, +%# The exception to this rule is YY_G, which is an m4 macro, %# but it needs to be remain short because it is used everywhere. %# /* A lexical scanner generated by flex */ @@ -30,7 +29,7 @@ m4_changecom m4_changequote m4_changequote([[, ]]) -%# +%# %# Lines in this skeleton starting with a "%" character are "control lines" %# and affect the generation of the scanner. The possible control codes are %# listed and processed in misc.c. @@ -62,17 +61,11 @@ m4_changequote([[, ]]) m4_ifelse(M4_YY_PREFIX,yy,, #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] -#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] -#define yy_scan_string M4_YY_PREFIX[[_scan_string]] -#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] +#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] -#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] -#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] -#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] -#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] #define yyin M4_YY_PREFIX[[in]] #define yyleng M4_YY_PREFIX[[leng]] #define yylex M4_YY_PREFIX[[lex]] @@ -112,16 +105,8 @@ m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]]) m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) -m4preproc_define(`M4_GEN_PREFIX',`` -[[#ifdef yy$1 -#define ]]M4_YY_PREFIX[[$1_ALREADY_DEFINED -#else -#define yy$1 ]]M4_YY_PREFIX[[$1 -#endif]] -'m4preproc_divert(1)` -[[#ifndef ]]M4_YY_PREFIX[[$1_ALREADY_DEFINED -#undef yy$1 -#endif]]'m4preproc_divert(0)') +m4preproc_define(`M4_GEN_PREFIX', + ``m4_define(yy[[$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') %if-c++-only /* The c++ scanner is a mess. The FlexLexer.h header file relies on the @@ -134,7 +119,6 @@ m4preproc_define(`M4_GEN_PREFIX',`` %endif %if-c-only -m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`_create_buffer') M4_GEN_PREFIX(`_delete_buffer') M4_GEN_PREFIX(`_scan_buffer') @@ -170,7 +154,6 @@ m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`set_column') ]]) M4_GEN_PREFIX(`wrap') -) %endif m4_ifdef( [[M4_YY_BISON_LVAL]], @@ -186,14 +169,11 @@ m4_ifdef( [[]], ]]) -m4_ifelse(M4_YY_PREFIX,yy,, M4_GEN_PREFIX(`alloc') M4_GEN_PREFIX(`realloc') M4_GEN_PREFIX(`free') -) %if-c-only -m4_ifelse(M4_YY_PREFIX,yy,, m4_ifdef( [[M4_YY_NOT_REENTRANT]], [[ M4_GEN_PREFIX(`text') @@ -203,7 +183,6 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], M4_GEN_PREFIX(`_flex_debug') M4_GEN_PREFIX(`lineno') ]]) -) %endif @@ -234,9 +213,9 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], m4preproc_include(`flexint.h') %endif -/* begin standard C++ headers. */ %if-c++-only -#include +/* begin standard C++ headers. */ +#include #include #include #include @@ -309,7 +288,7 @@ m4_define( [[M4_YY_DOC_PARAM]], [[@param yyscanner The scanner object.]]) #define yy_flex_debug YY_G(yy_flex_debug_r) m4_define( [[M4_YY_INCR_LINENO]], -[[ +[[ do{ yylineno++; yycolumn=0; }while(0) @@ -322,7 +301,7 @@ m4_define( [[M4_YY_INCR_LINENO]], %if-not-reentrant m4_define( [[M4_YY_INCR_LINENO]], -[[ +[[ yylineno++; ]]) @@ -418,7 +397,7 @@ m4_ifdef( [[M4_YY_NOT_IN_HEADER]], [[ /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. + * existing scanners that call yyless() from OUTSIDE yylex. * One obvious solution it to make yy_act a global. I tried that, and saw * a 5% performance hit in a non-yylineno scanner, because yy_act is * normally declared as a register variable-- so it is not worth it. @@ -467,7 +446,7 @@ struct yy_buffer_state %endif %if-c++-only - std::streambuf* yy_input_file; + std::streambuf* yy_input_file; %endif @@ -505,7 +484,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. @@ -1075,7 +1054,7 @@ int yytables_destroy (M4_YY_PROTO_ONLY_ARG); /** Describes a mapping from a serialized table id to its deserialized state in * this scanner. This is the bridge between our "generic" deserialization code - * and the specifics of this scanner. + * and the specifics of this scanner. */ struct yytbl_dmap { enum yytbl_id dm_id;/**< table identifier */ @@ -1684,8 +1663,6 @@ m4_ifdef( [[M4_YY_USES_REJECT]], (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size M4_YY_CALL_LAST_ARG ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } YY_G(yy_n_chars) += number_to_move; @@ -1918,9 +1895,6 @@ m4_ifdef( [[M4_YY_USE_LINENO]], */ void yyFlexLexer::yyrestart( std::istream* input_file ) { - if( ! input_file ) { - input_file = &yyin; - } yyrestart( *input_file ); } %endif @@ -2082,7 +2056,7 @@ static void yy_load_buffer_state (M4_YY_DEF_ONLY_ARG) b->yy_input_file = file; %endif %if-c++-only - b->yy_input_file = file.rdbuf(); + b->yy_input_file = (&file == 0) ? NULL : file.rdbuf(); %endif b->yy_fill_buffer = 1; @@ -2245,10 +2219,10 @@ void yyFlexLexer::yyensure_buffer_stack(void) M4_YY_CALL_LAST_ARG); if ( ! YY_G(yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - + + memset(YY_G(yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + YY_G(yy_buffer_stack_max) = num_to_alloc; YY_G(yy_buffer_stack_top) = 0; return; @@ -2284,7 +2258,7 @@ m4_ifdef( [[M4_YY_NO_SCAN_BUFFER]],, * @param base the character buffer * @param size the size in bytes of the character buffer * M4_YY_DOC_PARAM - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer YYFARGS2( char *,base, yy_size_t ,size) { @@ -2460,7 +2434,7 @@ static void yynoreturn yy_fatal_error YYFARGS1(const char*, msg) { M4_YY_DECL_GUTS_VAR(); M4_YY_NOOP_GUTS_VAR(); - fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } %endif @@ -2517,7 +2491,7 @@ m4_ifdef( [[M4_YY_NO_GET_LINENO]],, int yyget_lineno (M4_YY_DEF_ONLY_ARG) { M4_YY_DECL_GUTS_VAR(); - + m4_ifdef( [[M4_YY_REENTRANT]], [[ if (! YY_CURRENT_BUFFER) @@ -2537,7 +2511,7 @@ m4_ifdef( [[M4_YY_NO_GET_COLUMN]],, int yyget_column (M4_YY_DEF_ONLY_ARG) { M4_YY_DECL_GUTS_VAR(); - + m4_ifdef( [[M4_YY_REENTRANT]], [[ if (! YY_CURRENT_BUFFER) @@ -2789,20 +2763,20 @@ int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) errno = EINVAL; return 1; } - + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - + yyset_extra (yy_user_defined, *ptr_yy_globals); - + return yy_init_globals ( *ptr_yy_globals ); } @@ -3090,7 +3064,7 @@ static struct yytbl_dmap *yytbl_dmap_lookup YYFARGS2(struct yytbl_dmap *, dmap, return NULL; } -/** Read a table while mapping its contents to the local array. +/** Read a table while mapping its contents to the local array. * @param dmap used to performing mapping * @return 0 on success */ @@ -3135,7 +3109,7 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read if(M4_YY_TABLES_VERIFY) /* We point to the array itself */ - p = dmap->dm_arr; + p = dmap->dm_arr; else /* We point to the address of a pointer. */ *dmap->dm_arr = p = (void *) yyalloc (bytes M4_YY_CALL_LAST_ARG); @@ -3182,7 +3156,7 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read rv = yytbl_read8 (&t8, rd); t32 = t8; break; - default: + default: YY_FATAL_ERROR( "invalid td_flags" ); /* TODO: not fatal. */ return -1; } @@ -3239,7 +3213,7 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read YY_FATAL_ERROR( "transition table not found" ); /* TODO: not fatal. */ return -1; } - + if( M4_YY_TABLES_VERIFY) v = &(((struct yy_trans_info *) (transdmap->dm_arr))[t32]); else @@ -3250,7 +3224,7 @@ static int yytbl_data_load YYFARGS2(struct yytbl_dmap *, dmap, struct yytbl_read YY_FATAL_ERROR( "tables verification failed at YYTD_PTRANS" ); }else ((struct yy_trans_info **) p)[0] = v; - + /* increment p */ p = (struct yy_trans_info **) p + 1; } @@ -3366,7 +3340,7 @@ int yytables_fload YYFARGS1(FILE *, fp) /** Destroy the loaded tables, freeing memory, etc.. */ int yytables_destroy (M4_YY_DEF_ONLY_ARG) -{ +{ struct yytbl_dmap *dmap=0; if(!M4_YY_TABLES_VERIFY){ @@ -3423,5 +3397,4 @@ m4_ifdef( [[M4_YY_IN_HEADER]], #undef YY_DECL_IS_OURS #undef YY_DECL #endif -m4preproc_undivert(1) ]]) diff --git a/src/flexdef.h b/src/flexdef.h index 9dac654..a4d1896 100644 --- a/src/flexdef.h +++ b/src/flexdef.h @@ -57,24 +57,23 @@ #ifdef HAVE_LIMITS_H #include #endif -/* Required: dup() and dup2() in */ +#ifdef HAVE_UNISTD_H #include +#endif #ifdef HAVE_NETINET_IN_H #include #endif #ifdef HAVE_SYS_PARAMS_H #include #endif -/* Required: stat() in */ +#ifdef HAVE_SYS_STAT_H #include -/* Required: wait() in */ +#endif #include #include -#include -/* Required: regcomp(), regexec() and regerror() in */ +#ifdef HAVE_REGEX_H #include -/* Required: strcasecmp() in */ -#include +#endif #include "flexint.h" /* We use gettext. So, when we write strings which should be translated, we mark them with _() */ @@ -109,8 +108,6 @@ #define ABS(x) ((x) < 0 ? -(x) : (x)) #endif -/* Whether an integer is a power of two */ -#define is_power_of_2(n) ((n) > 0 && ((n) & ((n) - 1)) == 0) #define unspecified -1 @@ -845,6 +842,9 @@ extern void flexfatal(const char *); }while(0) #endif /* ! HAVE_DECL___func__ */ +/* Convert a hexadecimal digit string to an integer value. */ +extern unsigned int htoui(unsigned char[]); + /* Report an error message formatted */ extern void lerr(const char *, ...) #if defined(__GNUC__) && __GNUC__ >= 3 @@ -881,6 +881,9 @@ extern int myctoi(const char *); /* Return character corresponding to escape sequence. */ extern unsigned char myesc(unsigned char[]); +/* Convert an octal digit string to an integer value. */ +extern unsigned int otoui(unsigned char[]); + /* Output a (possibly-formatted) string to the generated scanner. */ extern void out(const char *); extern void out_dec(const char *, int); @@ -971,9 +974,8 @@ extern void line_pinpoint(const char *, int); extern void format_synerr(const char *, const char *); extern void synerr(const char *); /* report a syntax error */ extern void format_warn(const char *, const char *); -extern void lwarn(const char *); /* report a warning */ +extern void warn(const char *); /* report a warning */ extern void yyerror(const char *); /* report a parse error */ -extern int yyparse(void); /* the YACC parser */ /* from file scan.l */ diff --git a/src/flexint.h b/src/flexint.h index 43bb3a8..f9fa80c 100644 --- a/src/flexint.h +++ b/src/flexint.h @@ -58,10 +58,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - #endif /* ! C99 */ #endif /* ! FLEXINT_H */ diff --git a/src/gen.c b/src/gen.c index 590e5d8..e0dc776 100644 --- a/src/gen.c +++ b/src/gen.c @@ -509,12 +509,8 @@ void gen_find_action (void) indent_puts ("yy_current_state = *--YY_G(yy_state_ptr);"); indent_puts ("YY_G(yy_lp) = yy_accept[yy_current_state];"); - if (!variable_trailing_context_rules) - outn ("m4_ifdef( [[M4_YY_USES_REJECT]],\n[["); if(reject_really_used) outn ("find_rule: /* we branch to this label when backing up */"); - if (!variable_trailing_context_rules) - outn ("]])\n"); indent_puts ("for ( ; ; ) /* until we find what rule we matched */"); diff --git a/src/main.c b/src/main.c index e5eac44..9103abf 100644 --- a/src/main.c +++ b/src/main.c @@ -276,7 +276,7 @@ void check_options (void) flexerror (_("Can't use -+ with -CF option")); if (C_plus_plus && yytext_is_array) { - lwarn (_("%array incompatible with -+ option")); + warn (_("%array incompatible with -+ option")); yytext_is_array = false; } @@ -310,8 +310,8 @@ void check_options (void) } } - if (extra_type) - buf_m4_define( &m4defs_buf, "M4_EXTRA_TYPE_DEFS", extra_type); + if (extra_type) + buf_m4_define( &m4defs_buf, "M4_EXTRA_TYPE_DEFS", extra_type); if (!use_stdout) { FILE *prev_stdout; @@ -351,8 +351,8 @@ void check_options (void) if (!path) { m4 = M4; } else { - int m4_length = strlen(m4); do { + char m4_path[PATH_MAX]; size_t length = strlen(path); struct stat sbuf; @@ -360,18 +360,19 @@ void check_options (void) if (!endOfDir) endOfDir = path+length; - { - char *m4_path = calloc(endOfDir-path + 1 + m4_length + 1, 1); - - memcpy(m4_path, path, endOfDir-path); - m4_path[endOfDir-path] = '/'; - memcpy(m4_path + (endOfDir-path) + 1, m4, m4_length + 1); - if (stat(m4_path, &sbuf) == 0 && - (S_ISREG(sbuf.st_mode)) && sbuf.st_mode & S_IXUSR) { - m4 = m4_path; - break; - } - free(m4_path); + if (endOfDir + 2 >= path + sizeof(m4_path)) { + path = endOfDir+1; + continue; + } + + strncpy(m4_path, path, sizeof(m4_path)); + m4_path[endOfDir-path] = '/'; + m4_path[endOfDir-path+1] = '\0'; + strncat(m4_path, m4, sizeof(m4_path) - strlen(m4_path) - 1); + if (stat(m4_path, &sbuf) == 0 && + (S_ISREG(sbuf.st_mode)) && sbuf.st_mode & S_IXUSR) { + m4 = strdup(m4_path); + break; } path = endOfDir+1; } while (path[0]); @@ -446,8 +447,6 @@ void check_options (void) if ( bison_bridge_lloc) buf_m4_define (&m4defs_buf, "", NULL); - if (strchr(prefix, '[') || strchr(prefix, ']')) - flexerror(_("Prefix cannot include '[' or ']'")); buf_m4_define(&m4defs_buf, "M4_YY_PREFIX", prefix); if (did_outfilename) @@ -1587,9 +1586,9 @@ void readin (void) if (!do_yywrap) { if (!C_plus_plus) { if (reentrant) - out_str ("\n#define %swrap(yyscanner) (/*CONSTCOND*/1)\n", prefix); + outn ("\n#define yywrap(yyscanner) (/*CONSTCOND*/1)"); else - out_str ("\n#define %swrap() (/*CONSTCOND*/1)\n", prefix); + outn ("\n#define yywrap() (/*CONSTCOND*/1)"); } outn ("#define YY_SKIP_YYWRAP"); } diff --git a/src/misc.c b/src/misc.c index ef27833..e4e3f88 100644 --- a/src/misc.c +++ b/src/misc.c @@ -30,6 +30,7 @@ /* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */ /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ /* PURPOSE. */ + #include "flexdef.h" #include "tables.h" @@ -142,14 +143,9 @@ void add_action (const char *new_text) void *allocate_array (int size, size_t element_size) { void *mem; -#if HAVE_REALLOCARRAY - /* reallocarray has built-in overflow detection */ - mem = reallocarray(NULL, (size_t) size, element_size); -#else - size_t num_bytes = (size_t) size * element_size; - mem = (size && SIZE_MAX / (size_t) size < element_size) ? NULL : - malloc(num_bytes); -#endif + size_t num_bytes = element_size * (size_t) size; + + mem = malloc(num_bytes); if (!mem) flexfatal (_ ("memory allocation failed in allocate_array()")); @@ -306,6 +302,18 @@ void flexfatal (const char *msg) } +/* htoui - convert a hexadecimal digit string to an unsigned integer value */ + +unsigned int htoui (unsigned char str[]) +{ + unsigned int result; + + (void) sscanf ((char *) str, "%x", &result); + + return result; +} + + /* lerr - report an error message */ void lerr (const char *msg, ...) @@ -340,7 +348,7 @@ void line_directive_out (FILE *output_file, int do_infile) { char directive[MAXLINE], filename[MAXLINE]; char *s1, *s2, *s3; - static const char line_fmt[] = "#line %d \"%s\"\n"; + static const char *line_fmt = "#line %d \"%s\"\n"; if (!gen_line_dirs) return; @@ -505,14 +513,18 @@ unsigned char myesc (unsigned char array[]) int sptr = 1; while (sptr <= 3 && - array[sptr] >= '0' && array[sptr] <= '7') { + isascii (array[sptr]) && + isdigit (array[sptr])) + /* Don't increment inside loop control + * because if isdigit() is a macro it might + * expand into multiple increments ... + */ ++sptr; - } c = array[sptr]; array[sptr] = '\0'; - esc_char = (unsigned char) strtoul (array + 1, NULL, 8); + esc_char = (unsigned char) otoui (array + 1); array[sptr] = c; @@ -523,18 +535,18 @@ unsigned char myesc (unsigned char array[]) { /* \x */ int sptr = 2; - while (sptr <= 3 && isxdigit (array[sptr])) { + while (isascii (array[sptr]) && + isxdigit (array[sptr])) /* Don't increment inside loop control - * because if isxdigit() is a macro it might + * because if isdigit() is a macro it might * expand into multiple increments ... */ ++sptr; - } c = array[sptr]; array[sptr] = '\0'; - esc_char = (unsigned char) strtoul (array + 2, NULL, 16); + esc_char = (unsigned char) htoui (array + 2); array[sptr] = c; @@ -547,6 +559,17 @@ unsigned char myesc (unsigned char array[]) } +/* otoui - convert an octal digit string to an unsigned integer value */ + +unsigned int otoui (unsigned char str[]) +{ + unsigned int result; + + (void) sscanf ((char *) str, "%o", &result); + return result; +} + + /* out - various flavors of outputing a (possibly formatted) string for the * generated scanner, keeping track of the line count. */ @@ -659,14 +682,9 @@ char *readable_form (int c) void *reallocate_array (void *array, int size, size_t element_size) { void *new_array; -#if HAVE_REALLOCARRAY - /* reallocarray has built-in overflow detection */ - new_array = reallocarray(array, (size_t) size, element_size); -#else - size_t num_bytes = (size_t) size * element_size; - new_array = (size && SIZE_MAX / (size_t) size < element_size) ? NULL : - realloc(array, num_bytes); -#endif + size_t num_bytes = element_size * (size_t) size; + + new_array = realloc(array, num_bytes); if (!new_array) flexfatal (_("attempt to increase array size failed")); @@ -791,6 +809,9 @@ void skelout (void) /* %e end linkage-only code. */ OUT_END_CODE (); } + else if (buf[1] == '#') { + /* %# a comment in the skel. ignore. */ + } else { flexfatal (_("bad line in skeleton file")); } diff --git a/src/mkskel.sh b/src/mkskel.sh index 1aa59e1..512f1f9 100755 --- a/src/mkskel.sh +++ b/src/mkskel.sh @@ -21,31 +21,13 @@ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR # PURPOSE. -if test ! $# = 3; then - echo 'Usage: mkskel.sh srcdir m4 version' >&2 - exit 1 -fi echo '/* File created from flex.skl via mkskel.sh */ #include "flexdef.h" const char *skel[] = {' -srcdir=$1 -m4=$2 -VERSION=$3 -case $VERSION in - *[!0-9.]*) echo 'Invalid version number' >&2; exit 1;; -esac -IFS=. -set $VERSION -sed 's/4_/a4_/g -s/m4preproc_/m4_/g -' "$srcdir/flex.skl" | -"$m4" -P -I "$srcdir" "-DFLEX_MAJOR_VERSION=$1" \ - "-DFLEX_MINOR_VERSION=$2" \ - "-DFLEX_SUBMINOR_VERSION=$3" | -sed '/^%#/d -s/m4_/m4preproc_/g + +sed 's/m4_/m4preproc_/g s/a4_/4_/g s/[\\"]/\\&/g s/.*/ "&",/' diff --git a/src/parse.c b/src/parse.c index 32458e4..065f9a1 100644 --- a/src/parse.c +++ b/src/parse.c @@ -112,7 +112,7 @@ int previous_continued_action; /* whether the previous rule's action was '|' */ do{ \ char fw3_msg[MAXLINE];\ snprintf( fw3_msg, MAXLINE,(fmt), (a1), (a2) );\ - lwarn( fw3_msg );\ + warn( fw3_msg );\ }while(0) /* Expand a POSIX character class expression. */ @@ -594,14 +594,14 @@ static const yytype_uint16 yyrline[] = { 0, 118, 118, 148, 155, 156, 157, 158, 162, 170, 173, 177, 180, 183, 187, 190, 191, 194, 199, 201, - 205, 207, 209, 213, 215, 217, 221, 233, 269, 293, - 316, 321, 324, 327, 345, 348, 350, 352, 356, 379, - 435, 438, 481, 499, 505, 510, 537, 545, 548, 576, - 590, 612, 619, 625, 631, 659, 673, 692, 726, 744, - 754, 757, 760, 775, 776, 777, 782, 784, 791, 851, - 869, 877, 885, 886, 887, 888, 889, 890, 891, 896, - 897, 898, 899, 900, 906, 907, 908, 909, 910, 911, - 912, 913, 914, 915, 916, 922, 930, 946 + 203, 205, 207, 211, 213, 215, 219, 231, 267, 291, + 314, 319, 322, 325, 343, 346, 348, 350, 354, 377, + 433, 436, 479, 497, 503, 508, 535, 543, 546, 574, + 588, 610, 617, 623, 629, 657, 671, 690, 724, 742, + 752, 755, 758, 773, 774, 775, 780, 782, 789, 849, + 867, 875, 883, 884, 885, 886, 887, 888, 889, 894, + 895, 896, 897, 898, 904, 905, 906, 907, 908, 909, + 910, 911, 912, 913, 914, 920, 928, 944 }; #endif @@ -1584,44 +1584,42 @@ yyreduce: case 19: #line 202 "parse.y" /* yacc.c:1646 */ - { prefix = xstrdup(nmstr); - if (strchr(prefix, '[') || strchr(prefix, ']')) - flexerror(_("Prefix must not contain [ or ]")); } -#line 1591 "parse.c" /* yacc.c:1646 */ + { prefix = xstrdup(nmstr); } +#line 1589 "parse.c" /* yacc.c:1646 */ break; case 20: -#line 206 "parse.y" /* yacc.c:1646 */ +#line 204 "parse.y" /* yacc.c:1646 */ { yyclass = xstrdup(nmstr); } -#line 1597 "parse.c" /* yacc.c:1646 */ +#line 1595 "parse.c" /* yacc.c:1646 */ break; case 21: -#line 208 "parse.y" /* yacc.c:1646 */ +#line 206 "parse.y" /* yacc.c:1646 */ { headerfilename = xstrdup(nmstr); } -#line 1603 "parse.c" /* yacc.c:1646 */ +#line 1601 "parse.c" /* yacc.c:1646 */ break; case 22: -#line 210 "parse.y" /* yacc.c:1646 */ +#line 208 "parse.y" /* yacc.c:1646 */ { tablesext = true; tablesfilename = xstrdup(nmstr); } -#line 1609 "parse.c" /* yacc.c:1646 */ +#line 1607 "parse.c" /* yacc.c:1646 */ break; case 23: -#line 214 "parse.y" /* yacc.c:1646 */ +#line 212 "parse.y" /* yacc.c:1646 */ { scon_stk_ptr = (yyvsp[-3]); } -#line 1615 "parse.c" /* yacc.c:1646 */ +#line 1613 "parse.c" /* yacc.c:1646 */ break; case 24: -#line 216 "parse.y" /* yacc.c:1646 */ +#line 214 "parse.y" /* yacc.c:1646 */ { scon_stk_ptr = (yyvsp[-3]); } -#line 1621 "parse.c" /* yacc.c:1646 */ +#line 1619 "parse.c" /* yacc.c:1646 */ break; case 26: -#line 221 "parse.y" /* yacc.c:1646 */ +#line 219 "parse.y" /* yacc.c:1646 */ { /* Initialize for a parse of one rule. */ trlcontxt = variable_trail_rule = varlength = false; @@ -1632,11 +1630,11 @@ yyreduce: new_rule(); } -#line 1636 "parse.c" /* yacc.c:1646 */ +#line 1634 "parse.c" /* yacc.c:1646 */ break; case 27: -#line 234 "parse.y" /* yacc.c:1646 */ +#line 232 "parse.y" /* yacc.c:1646 */ { pat = (yyvsp[0]); finish_rule( pat, variable_trail_rule, @@ -1671,11 +1669,11 @@ yyreduce: "'^' operator results in sub-optimal performance" ); } } -#line 1675 "parse.c" /* yacc.c:1646 */ +#line 1673 "parse.c" /* yacc.c:1646 */ break; case 28: -#line 270 "parse.y" /* yacc.c:1646 */ +#line 268 "parse.y" /* yacc.c:1646 */ { pat = (yyvsp[0]); finish_rule( pat, variable_trail_rule, @@ -1698,11 +1696,11 @@ yyreduce: pat ); } } -#line 1702 "parse.c" /* yacc.c:1646 */ +#line 1700 "parse.c" /* yacc.c:1646 */ break; case 29: -#line 294 "parse.y" /* yacc.c:1646 */ +#line 292 "parse.y" /* yacc.c:1646 */ { if ( scon_stk_ptr > 0 ) build_eof_action(); @@ -1717,36 +1715,36 @@ yyreduce: scon_stk[++scon_stk_ptr] = i; if ( scon_stk_ptr == 0 ) - lwarn( + warn( "all start conditions already have <> rules" ); else build_eof_action(); } } -#line 1728 "parse.c" /* yacc.c:1646 */ +#line 1726 "parse.c" /* yacc.c:1646 */ break; case 30: -#line 317 "parse.y" /* yacc.c:1646 */ +#line 315 "parse.y" /* yacc.c:1646 */ { synerr( _("unrecognized rule") ); } -#line 1734 "parse.c" /* yacc.c:1646 */ +#line 1732 "parse.c" /* yacc.c:1646 */ break; case 31: -#line 321 "parse.y" /* yacc.c:1646 */ +#line 319 "parse.y" /* yacc.c:1646 */ { (yyval) = scon_stk_ptr; } -#line 1740 "parse.c" /* yacc.c:1646 */ +#line 1738 "parse.c" /* yacc.c:1646 */ break; case 32: -#line 325 "parse.y" /* yacc.c:1646 */ +#line 323 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-2]); } -#line 1746 "parse.c" /* yacc.c:1646 */ +#line 1744 "parse.c" /* yacc.c:1646 */ break; case 33: -#line 328 "parse.y" /* yacc.c:1646 */ +#line 326 "parse.y" /* yacc.c:1646 */ { (yyval) = scon_stk_ptr; @@ -1762,23 +1760,23 @@ yyreduce: scon_stk[++scon_stk_ptr] = i; } } -#line 1766 "parse.c" /* yacc.c:1646 */ +#line 1764 "parse.c" /* yacc.c:1646 */ break; case 34: -#line 345 "parse.y" /* yacc.c:1646 */ +#line 343 "parse.y" /* yacc.c:1646 */ { (yyval) = scon_stk_ptr; } -#line 1772 "parse.c" /* yacc.c:1646 */ +#line 1770 "parse.c" /* yacc.c:1646 */ break; case 37: -#line 353 "parse.y" /* yacc.c:1646 */ +#line 351 "parse.y" /* yacc.c:1646 */ { synerr( _("bad start condition list") ); } -#line 1778 "parse.c" /* yacc.c:1646 */ +#line 1776 "parse.c" /* yacc.c:1646 */ break; case 38: -#line 357 "parse.y" /* yacc.c:1646 */ +#line 355 "parse.y" /* yacc.c:1646 */ { if ( (scnum = sclookup( nmstr )) == 0 ) format_pinpoint_message( @@ -1799,11 +1797,11 @@ yyreduce: scon_stk[++scon_stk_ptr] = scnum; } } -#line 1803 "parse.c" /* yacc.c:1646 */ +#line 1801 "parse.c" /* yacc.c:1646 */ break; case 39: -#line 380 "parse.y" /* yacc.c:1646 */ +#line 378 "parse.y" /* yacc.c:1646 */ { if ( transchar[lastst[(yyvsp[0])]] != SYM_EPSILON ) /* Provide final transition \now/ so it @@ -1827,7 +1825,7 @@ yyreduce: * erroneously. */ if ( ! varlength || headcnt != 0 ) - lwarn( + warn( "trailing context made variable due to preceding '|' action" ); /* Mark as variable. */ @@ -1858,17 +1856,17 @@ yyreduce: (yyval) = link_machines( (yyvsp[-1]), (yyvsp[0]) ); } -#line 1862 "parse.c" /* yacc.c:1646 */ +#line 1860 "parse.c" /* yacc.c:1646 */ break; case 40: -#line 436 "parse.y" /* yacc.c:1646 */ +#line 434 "parse.y" /* yacc.c:1646 */ { synerr( _("trailing context used twice") ); } -#line 1868 "parse.c" /* yacc.c:1646 */ +#line 1866 "parse.c" /* yacc.c:1646 */ break; case 41: -#line 439 "parse.y" /* yacc.c:1646 */ +#line 437 "parse.y" /* yacc.c:1646 */ { headcnt = 0; trailcnt = 1; @@ -1888,7 +1886,7 @@ yyreduce: /* See the comment in the rule for "re2 re" * above. */ - lwarn( + warn( "trailing context made variable due to preceding '|' action" ); varlength = true; @@ -1910,11 +1908,11 @@ yyreduce: (yyval) = link_machines( (yyvsp[-1]), link_machines( eps, mkstate( '\n' ) ) ); } -#line 1914 "parse.c" /* yacc.c:1646 */ +#line 1912 "parse.c" /* yacc.c:1646 */ break; case 42: -#line 482 "parse.y" /* yacc.c:1646 */ +#line 480 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); @@ -1929,26 +1927,26 @@ yyreduce: trailcnt = rulelen; } } -#line 1933 "parse.c" /* yacc.c:1646 */ +#line 1931 "parse.c" /* yacc.c:1646 */ break; case 43: -#line 500 "parse.y" /* yacc.c:1646 */ +#line 498 "parse.y" /* yacc.c:1646 */ { varlength = true; (yyval) = mkor( (yyvsp[-2]), (yyvsp[0]) ); } -#line 1942 "parse.c" /* yacc.c:1646 */ +#line 1940 "parse.c" /* yacc.c:1646 */ break; case 44: -#line 506 "parse.y" /* yacc.c:1646 */ +#line 504 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 1948 "parse.c" /* yacc.c:1646 */ +#line 1946 "parse.c" /* yacc.c:1646 */ break; case 45: -#line 511 "parse.y" /* yacc.c:1646 */ +#line 509 "parse.y" /* yacc.c:1646 */ { /* This rule is written separately so the * reduction will occur before the trailing @@ -1973,28 +1971,28 @@ yyreduce: current_state_type = STATE_TRAILING_CONTEXT; (yyval) = (yyvsp[-1]); } -#line 1977 "parse.c" /* yacc.c:1646 */ +#line 1975 "parse.c" /* yacc.c:1646 */ break; case 46: -#line 538 "parse.y" /* yacc.c:1646 */ +#line 536 "parse.y" /* yacc.c:1646 */ { /* This is where concatenation of adjacent patterns * gets done. */ (yyval) = link_machines( (yyvsp[-1]), (yyvsp[0]) ); } -#line 1988 "parse.c" /* yacc.c:1646 */ +#line 1986 "parse.c" /* yacc.c:1646 */ break; case 47: -#line 546 "parse.y" /* yacc.c:1646 */ +#line 544 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[0]); } -#line 1994 "parse.c" /* yacc.c:1646 */ +#line 1992 "parse.c" /* yacc.c:1646 */ break; case 48: -#line 549 "parse.y" /* yacc.c:1646 */ +#line 547 "parse.y" /* yacc.c:1646 */ { varlength = true; @@ -2021,11 +2019,11 @@ yyreduce: (yyval) = mkrep( (yyvsp[-5]), (yyvsp[-3]), (yyvsp[-1]) ); } } -#line 2025 "parse.c" /* yacc.c:1646 */ +#line 2023 "parse.c" /* yacc.c:1646 */ break; case 49: -#line 577 "parse.y" /* yacc.c:1646 */ +#line 575 "parse.y" /* yacc.c:1646 */ { varlength = true; @@ -2038,11 +2036,11 @@ yyreduce: else (yyval) = mkrep( (yyvsp[-4]), (yyvsp[-2]), INFINITE_REPEAT ); } -#line 2042 "parse.c" /* yacc.c:1646 */ +#line 2040 "parse.c" /* yacc.c:1646 */ break; case 50: -#line 591 "parse.y" /* yacc.c:1646 */ +#line 589 "parse.y" /* yacc.c:1646 */ { /* The series could be something like "(foo)", * in which case we have no idea what its length @@ -2061,39 +2059,39 @@ yyreduce: (yyval) = link_machines( (yyvsp[-3]), copysingl( (yyvsp[-3]), (yyvsp[-1]) - 1 ) ); } -#line 2065 "parse.c" /* yacc.c:1646 */ +#line 2063 "parse.c" /* yacc.c:1646 */ break; case 51: -#line 613 "parse.y" /* yacc.c:1646 */ +#line 611 "parse.y" /* yacc.c:1646 */ { varlength = true; (yyval) = mkclos( (yyvsp[-1]) ); } -#line 2075 "parse.c" /* yacc.c:1646 */ +#line 2073 "parse.c" /* yacc.c:1646 */ break; case 52: -#line 620 "parse.y" /* yacc.c:1646 */ +#line 618 "parse.y" /* yacc.c:1646 */ { varlength = true; (yyval) = mkposcl( (yyvsp[-1]) ); } -#line 2084 "parse.c" /* yacc.c:1646 */ +#line 2082 "parse.c" /* yacc.c:1646 */ break; case 53: -#line 626 "parse.y" /* yacc.c:1646 */ +#line 624 "parse.y" /* yacc.c:1646 */ { varlength = true; (yyval) = mkopt( (yyvsp[-1]) ); } -#line 2093 "parse.c" /* yacc.c:1646 */ +#line 2091 "parse.c" /* yacc.c:1646 */ break; case 54: -#line 632 "parse.y" /* yacc.c:1646 */ +#line 630 "parse.y" /* yacc.c:1646 */ { varlength = true; @@ -2120,11 +2118,11 @@ yyreduce: (yyval) = mkrep( (yyvsp[-5]), (yyvsp[-3]), (yyvsp[-1]) ); } } -#line 2124 "parse.c" /* yacc.c:1646 */ +#line 2122 "parse.c" /* yacc.c:1646 */ break; case 55: -#line 660 "parse.y" /* yacc.c:1646 */ +#line 658 "parse.y" /* yacc.c:1646 */ { varlength = true; @@ -2137,11 +2135,11 @@ yyreduce: else (yyval) = mkrep( (yyvsp[-4]), (yyvsp[-2]), INFINITE_REPEAT ); } -#line 2141 "parse.c" /* yacc.c:1646 */ +#line 2139 "parse.c" /* yacc.c:1646 */ break; case 56: -#line 674 "parse.y" /* yacc.c:1646 */ +#line 672 "parse.y" /* yacc.c:1646 */ { /* The singleton could be something like "(foo)", * in which case we have no idea what its length @@ -2159,11 +2157,11 @@ yyreduce: (yyval) = link_machines( (yyvsp[-3]), copysingl( (yyvsp[-3]), (yyvsp[-1]) - 1 ) ); } -#line 2163 "parse.c" /* yacc.c:1646 */ +#line 2161 "parse.c" /* yacc.c:1646 */ break; case 57: -#line 693 "parse.y" /* yacc.c:1646 */ +#line 691 "parse.y" /* yacc.c:1646 */ { if ( ! madeany ) { @@ -2196,11 +2194,11 @@ yyreduce: else (yyval) = mkstate( -ccldot ); } -#line 2200 "parse.c" /* yacc.c:1646 */ +#line 2198 "parse.c" /* yacc.c:1646 */ break; case 58: -#line 727 "parse.y" /* yacc.c:1646 */ +#line 725 "parse.y" /* yacc.c:1646 */ { /* Sort characters for fast searching. */ @@ -2217,11 +2215,11 @@ yyreduce: (yyval) = mkstate( -(yyvsp[0]) ); } -#line 2221 "parse.c" /* yacc.c:1646 */ +#line 2219 "parse.c" /* yacc.c:1646 */ break; case 59: -#line 745 "parse.y" /* yacc.c:1646 */ +#line 743 "parse.y" /* yacc.c:1646 */ { ++rulelen; @@ -2230,23 +2228,23 @@ yyreduce: (yyval) = mkstate( -(yyvsp[0]) ); } -#line 2234 "parse.c" /* yacc.c:1646 */ +#line 2232 "parse.c" /* yacc.c:1646 */ break; case 60: -#line 755 "parse.y" /* yacc.c:1646 */ +#line 753 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2240 "parse.c" /* yacc.c:1646 */ +#line 2238 "parse.c" /* yacc.c:1646 */ break; case 61: -#line 758 "parse.y" /* yacc.c:1646 */ +#line 756 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2246 "parse.c" /* yacc.c:1646 */ +#line 2244 "parse.c" /* yacc.c:1646 */ break; case 62: -#line 761 "parse.y" /* yacc.c:1646 */ +#line 759 "parse.y" /* yacc.c:1646 */ { ++rulelen; @@ -2259,38 +2257,38 @@ yyreduce: else (yyval) = mkstate( (yyvsp[0]) ); } -#line 2263 "parse.c" /* yacc.c:1646 */ +#line 2261 "parse.c" /* yacc.c:1646 */ break; case 63: -#line 775 "parse.y" /* yacc.c:1646 */ +#line 773 "parse.y" /* yacc.c:1646 */ { (yyval) = ccl_set_diff ((yyvsp[-2]), (yyvsp[0])); } -#line 2269 "parse.c" /* yacc.c:1646 */ +#line 2267 "parse.c" /* yacc.c:1646 */ break; case 64: -#line 776 "parse.y" /* yacc.c:1646 */ +#line 774 "parse.y" /* yacc.c:1646 */ { (yyval) = ccl_set_union ((yyvsp[-2]), (yyvsp[0])); } -#line 2275 "parse.c" /* yacc.c:1646 */ +#line 2273 "parse.c" /* yacc.c:1646 */ break; case 66: -#line 782 "parse.y" /* yacc.c:1646 */ +#line 780 "parse.y" /* yacc.c:1646 */ { (yyval) = (yyvsp[-1]); } -#line 2281 "parse.c" /* yacc.c:1646 */ +#line 2279 "parse.c" /* yacc.c:1646 */ break; case 67: -#line 785 "parse.y" /* yacc.c:1646 */ +#line 783 "parse.y" /* yacc.c:1646 */ { cclnegate( (yyvsp[-1]) ); (yyval) = (yyvsp[-1]); } -#line 2290 "parse.c" /* yacc.c:1646 */ +#line 2288 "parse.c" /* yacc.c:1646 */ break; case 68: -#line 792 "parse.y" /* yacc.c:1646 */ +#line 790 "parse.y" /* yacc.c:1646 */ { if (sf_case_ins()) @@ -2349,11 +2347,11 @@ yyreduce: (yyval) = (yyvsp[-3]); } -#line 2353 "parse.c" /* yacc.c:1646 */ +#line 2351 "parse.c" /* yacc.c:1646 */ break; case 69: -#line 852 "parse.y" /* yacc.c:1646 */ +#line 850 "parse.y" /* yacc.c:1646 */ { ccladd( (yyvsp[-1]), (yyvsp[0]) ); cclsorted = cclsorted && ((yyvsp[0]) > lastchar); @@ -2370,193 +2368,193 @@ yyreduce: (yyval) = (yyvsp[-1]); } -#line 2374 "parse.c" /* yacc.c:1646 */ +#line 2372 "parse.c" /* yacc.c:1646 */ break; case 70: -#line 870 "parse.y" /* yacc.c:1646 */ +#line 868 "parse.y" /* yacc.c:1646 */ { /* Too hard to properly maintain cclsorted. */ cclsorted = false; (yyval) = (yyvsp[-1]); } -#line 2384 "parse.c" /* yacc.c:1646 */ +#line 2382 "parse.c" /* yacc.c:1646 */ break; case 71: -#line 877 "parse.y" /* yacc.c:1646 */ +#line 875 "parse.y" /* yacc.c:1646 */ { cclsorted = true; lastchar = 0; currccl = (yyval) = cclinit(); } -#line 2394 "parse.c" /* yacc.c:1646 */ +#line 2392 "parse.c" /* yacc.c:1646 */ break; case 72: -#line 885 "parse.y" /* yacc.c:1646 */ +#line 883 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isalnum); } -#line 2400 "parse.c" /* yacc.c:1646 */ +#line 2398 "parse.c" /* yacc.c:1646 */ break; case 73: -#line 886 "parse.y" /* yacc.c:1646 */ +#line 884 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isalpha); } -#line 2406 "parse.c" /* yacc.c:1646 */ +#line 2404 "parse.c" /* yacc.c:1646 */ break; case 74: -#line 887 "parse.y" /* yacc.c:1646 */ +#line 885 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(IS_BLANK); } -#line 2412 "parse.c" /* yacc.c:1646 */ +#line 2410 "parse.c" /* yacc.c:1646 */ break; case 75: -#line 888 "parse.y" /* yacc.c:1646 */ +#line 886 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(iscntrl); } -#line 2418 "parse.c" /* yacc.c:1646 */ +#line 2416 "parse.c" /* yacc.c:1646 */ break; case 76: -#line 889 "parse.y" /* yacc.c:1646 */ +#line 887 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isdigit); } -#line 2424 "parse.c" /* yacc.c:1646 */ +#line 2422 "parse.c" /* yacc.c:1646 */ break; case 77: -#line 890 "parse.y" /* yacc.c:1646 */ +#line 888 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isgraph); } -#line 2430 "parse.c" /* yacc.c:1646 */ +#line 2428 "parse.c" /* yacc.c:1646 */ break; case 78: -#line 891 "parse.y" /* yacc.c:1646 */ +#line 889 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(islower); if (sf_case_ins()) CCL_EXPR(isupper); } -#line 2440 "parse.c" /* yacc.c:1646 */ +#line 2438 "parse.c" /* yacc.c:1646 */ break; case 79: -#line 896 "parse.y" /* yacc.c:1646 */ +#line 894 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isprint); } -#line 2446 "parse.c" /* yacc.c:1646 */ +#line 2444 "parse.c" /* yacc.c:1646 */ break; case 80: -#line 897 "parse.y" /* yacc.c:1646 */ +#line 895 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(ispunct); } -#line 2452 "parse.c" /* yacc.c:1646 */ +#line 2450 "parse.c" /* yacc.c:1646 */ break; case 81: -#line 898 "parse.y" /* yacc.c:1646 */ +#line 896 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isspace); } -#line 2458 "parse.c" /* yacc.c:1646 */ +#line 2456 "parse.c" /* yacc.c:1646 */ break; case 82: -#line 899 "parse.y" /* yacc.c:1646 */ +#line 897 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isxdigit); } -#line 2464 "parse.c" /* yacc.c:1646 */ +#line 2462 "parse.c" /* yacc.c:1646 */ break; case 83: -#line 900 "parse.y" /* yacc.c:1646 */ +#line 898 "parse.y" /* yacc.c:1646 */ { CCL_EXPR(isupper); if (sf_case_ins()) CCL_EXPR(islower); } -#line 2474 "parse.c" /* yacc.c:1646 */ +#line 2472 "parse.c" /* yacc.c:1646 */ break; case 84: -#line 906 "parse.y" /* yacc.c:1646 */ +#line 904 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isalnum); } -#line 2480 "parse.c" /* yacc.c:1646 */ +#line 2478 "parse.c" /* yacc.c:1646 */ break; case 85: -#line 907 "parse.y" /* yacc.c:1646 */ +#line 905 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isalpha); } -#line 2486 "parse.c" /* yacc.c:1646 */ +#line 2484 "parse.c" /* yacc.c:1646 */ break; case 86: -#line 908 "parse.y" /* yacc.c:1646 */ +#line 906 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(IS_BLANK); } -#line 2492 "parse.c" /* yacc.c:1646 */ +#line 2490 "parse.c" /* yacc.c:1646 */ break; case 87: -#line 909 "parse.y" /* yacc.c:1646 */ +#line 907 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(iscntrl); } -#line 2498 "parse.c" /* yacc.c:1646 */ +#line 2496 "parse.c" /* yacc.c:1646 */ break; case 88: -#line 910 "parse.y" /* yacc.c:1646 */ +#line 908 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isdigit); } -#line 2504 "parse.c" /* yacc.c:1646 */ +#line 2502 "parse.c" /* yacc.c:1646 */ break; case 89: -#line 911 "parse.y" /* yacc.c:1646 */ +#line 909 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isgraph); } -#line 2510 "parse.c" /* yacc.c:1646 */ +#line 2508 "parse.c" /* yacc.c:1646 */ break; case 90: -#line 912 "parse.y" /* yacc.c:1646 */ +#line 910 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isprint); } -#line 2516 "parse.c" /* yacc.c:1646 */ +#line 2514 "parse.c" /* yacc.c:1646 */ break; case 91: -#line 913 "parse.y" /* yacc.c:1646 */ +#line 911 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(ispunct); } -#line 2522 "parse.c" /* yacc.c:1646 */ +#line 2520 "parse.c" /* yacc.c:1646 */ break; case 92: -#line 914 "parse.y" /* yacc.c:1646 */ +#line 912 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isspace); } -#line 2528 "parse.c" /* yacc.c:1646 */ +#line 2526 "parse.c" /* yacc.c:1646 */ break; case 93: -#line 915 "parse.y" /* yacc.c:1646 */ +#line 913 "parse.y" /* yacc.c:1646 */ { CCL_NEG_EXPR(isxdigit); } -#line 2534 "parse.c" /* yacc.c:1646 */ +#line 2532 "parse.c" /* yacc.c:1646 */ break; case 94: -#line 916 "parse.y" /* yacc.c:1646 */ +#line 914 "parse.y" /* yacc.c:1646 */ { if ( sf_case_ins() ) - lwarn(_("[:^lower:] is ambiguous in case insensitive scanner")); + warn(_("[:^lower:] is ambiguous in case insensitive scanner")); else CCL_NEG_EXPR(islower); } -#line 2545 "parse.c" /* yacc.c:1646 */ +#line 2543 "parse.c" /* yacc.c:1646 */ break; case 95: -#line 922 "parse.y" /* yacc.c:1646 */ +#line 920 "parse.y" /* yacc.c:1646 */ { if ( sf_case_ins() ) - lwarn(_("[:^upper:] ambiguous in case insensitive scanner")); + warn(_("[:^upper:] ambiguous in case insensitive scanner")); else CCL_NEG_EXPR(isupper); } -#line 2556 "parse.c" /* yacc.c:1646 */ +#line 2554 "parse.c" /* yacc.c:1646 */ break; case 96: -#line 931 "parse.y" /* yacc.c:1646 */ +#line 929 "parse.y" /* yacc.c:1646 */ { if ( (yyvsp[0]) == nlch ) rule_has_nl[num_rules] = true; @@ -2570,17 +2568,17 @@ yyreduce: (yyval) = link_machines( (yyvsp[-1]), (yyval)); } -#line 2574 "parse.c" /* yacc.c:1646 */ +#line 2572 "parse.c" /* yacc.c:1646 */ break; case 97: -#line 946 "parse.y" /* yacc.c:1646 */ +#line 944 "parse.y" /* yacc.c:1646 */ { (yyval) = mkstate( SYM_EPSILON ); } -#line 2580 "parse.c" /* yacc.c:1646 */ +#line 2578 "parse.c" /* yacc.c:1646 */ break; -#line 2584 "parse.c" /* yacc.c:1646 */ +#line 2582 "parse.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2808,7 +2806,7 @@ yyreturn: #endif return yyresult; } -#line 949 "parse.y" /* yacc.c:1906 */ +#line 947 "parse.y" /* yacc.c:1906 */ @@ -2881,13 +2879,13 @@ void format_warn( const char *msg, const char arg[] ) char warn_msg[MAXLINE]; snprintf( warn_msg, sizeof(warn_msg), msg, arg ); - lwarn( warn_msg ); + warn( warn_msg ); } -/* lwarn - report a warning, unless -w was given */ +/* warn - report a warning, unless -w was given */ -void lwarn( const char *str ) +void warn( const char *str ) { line_warning( str, linenum ); } diff --git a/src/parse.y b/src/parse.y index 5a07320..4de4151 100644 --- a/src/parse.y +++ b/src/parse.y @@ -80,7 +80,7 @@ int previous_continued_action; /* whether the previous rule's action was '|' */ do{ \ char fw3_msg[MAXLINE];\ snprintf( fw3_msg, MAXLINE,(fmt), (a1), (a2) );\ - lwarn( fw3_msg );\ + warn( fw3_msg );\ }while(0) /* Expand a POSIX character class expression. */ @@ -199,9 +199,7 @@ option : TOK_OUTFILE '=' NAME | TOK_EXTRA_TYPE '=' NAME { extra_type = xstrdup(nmstr); } | TOK_PREFIX '=' NAME - { prefix = xstrdup(nmstr); - if (strchr(prefix, '[') || strchr(prefix, ']')) - flexerror(_("Prefix must not contain [ or ]")); } + { prefix = xstrdup(nmstr); } | TOK_YYCLASS '=' NAME { yyclass = xstrdup(nmstr); } | TOK_HEADER_FILE '=' NAME @@ -305,7 +303,7 @@ flexrule : '^' rule scon_stk[++scon_stk_ptr] = i; if ( scon_stk_ptr == 0 ) - lwarn( + warn( "all start conditions already have <> rules" ); else @@ -400,7 +398,7 @@ rule : re2 re * erroneously. */ if ( ! varlength || headcnt != 0 ) - lwarn( + warn( "trailing context made variable due to preceding '|' action" ); /* Mark as variable. */ @@ -455,7 +453,7 @@ rule : re2 re /* See the comment in the rule for "re2 re" * above. */ - lwarn( + warn( "trailing context made variable due to preceding '|' action" ); varlength = true; @@ -915,13 +913,13 @@ ccl_expr: | CCE_NEG_XDIGIT { CCL_NEG_EXPR(isxdigit); } | CCE_NEG_LOWER { if ( sf_case_ins() ) - lwarn(_("[:^lower:] is ambiguous in case insensitive scanner")); + warn(_("[:^lower:] is ambiguous in case insensitive scanner")); else CCL_NEG_EXPR(islower); } | CCE_NEG_UPPER { if ( sf_case_ins() ) - lwarn(_("[:^upper:] ambiguous in case insensitive scanner")); + warn(_("[:^upper:] ambiguous in case insensitive scanner")); else CCL_NEG_EXPR(isupper); } @@ -1018,13 +1016,13 @@ void format_warn( const char *msg, const char arg[] ) char warn_msg[MAXLINE]; snprintf( warn_msg, sizeof(warn_msg), msg, arg ); - lwarn( warn_msg ); + warn( warn_msg ); } -/* lwarn - report a warning, unless -w was given */ +/* warn - report a warning, unless -w was given */ -void lwarn( const char *str ) +void warn( const char *str ) { line_warning( str, linenum ); } diff --git a/src/regex.c b/src/regex.c index 38e658b..2eacacc 100644 --- a/src/regex.c +++ b/src/regex.c @@ -54,17 +54,21 @@ void flex_regcomp(regex_t *preg, const char *regex, int cflags) memset (preg, 0, sizeof (regex_t)); if ((err = regcomp (preg, regex, cflags)) != 0) { - const size_t errbuf_sz = 200; - char *errbuf; - int n; + const size_t errbuf_sz = 200; + char *errbuf, *rxerr; errbuf = malloc(errbuf_sz * sizeof(char)); if (!errbuf) flexfatal(_("Unable to allocate buffer to report regcomp")); - n = snprintf(errbuf, errbuf_sz, "regcomp for \"%s\" failed: ", regex); - regerror(err, preg, errbuf+n, errbuf_sz-(size_t)n); - - flexfatal (errbuf); /* never returns - no need to free(errbuf) */ + rxerr = malloc(errbuf_sz * sizeof(char)); + if (!rxerr) + flexfatal(_("Unable to allocate buffer for regerror")); + regerror (err, preg, rxerr, errbuf_sz); + snprintf (errbuf, errbuf_sz, "regcomp for \"%s\" failed: %s", regex, rxerr); + + flexfatal (errbuf); + free(errbuf); + free(rxerr); } } diff --git a/src/scan.c b/src/scan.c index 619c998..1f71e2c 100644 --- a/src/scan.c +++ b/src/scan.c @@ -1,6 +1,5 @@ -#line 1 "scan.c" -#line 3 "scan.c" +#line 2 "scan.c" #define YY_INT_ALIGNED short int @@ -9,7 +8,7 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 +#define YY_FLEX_SUBMINOR_VERSION 2 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -84,16 +83,10 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -/* begin standard C++ headers. */ - /* TODO: this is always defined, so inline it */ #define yyconst const @@ -125,7 +118,7 @@ typedef unsigned int flex_uint32_t; /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE yyrestart(yyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -221,7 +214,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -291,7 +284,7 @@ void yypop_buffer_state ( void ); static void yyensure_buffer_stack ( void ); static void yy_load_buffer_state ( void ); static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); -#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size ); YY_BUFFER_STATE yy_scan_string ( const char *yy_str ); @@ -307,7 +300,7 @@ void yyfree ( void * ); if ( ! YY_CURRENT_BUFFER ){ \ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } @@ -316,7 +309,7 @@ void yyfree ( void * ); if ( ! YY_CURRENT_BUFFER ){\ yyensure_buffer_stack (); \ YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_create_buffer(yyin,YY_BUF_SIZE ); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } @@ -361,131 +354,131 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[1114] = +static const flex_int16_t yy_accept[1115] = { 0, 0, 0, 0, 0, 0, 0, 246, 246, 40, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, - 239, 239, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 21, - 250, 250, 239, 239, 254, 252, 9, 20, 252, 18, + 250, 250, 0, 0, 254, 252, 9, 20, 252, 18, 1, 19, 252, 252, 252, 252, 17, 163, 148, 149, 163, 141, 163, 160, 161, 162, 162, 163, 163, 163, 162, 147, 137, 163, 163, 139, 140, 135, 136, 135, - 134, 133, 134, 246, 247, 247, 40, 42, 40, 41, - - 40, 40, 41, 41, 41, 50, 49, 51, 252, 169, - 169, 164, 169, 165, 166, 168, 170, 218, 219, 218, - 216, 215, 217, 171, 173, 171, 172, 171, 185, 185, - 185, 185, 187, 189, 187, 187, 187, 187, 188, 228, - 233, 228, 232, 231, 234, 229, 229, 229, 234, 234, - 226, 227, 252, 130, 252, 21, 23, 21, 22, 22, - 22, 235, 241, 235, 236, 242, 242, 242, 224, 224, - 225, 224, 224, 224, 224, 224, 224, 224, 129, 53, - 52, 129, 129, 129, 129, 54, 129, 129, 129, 129, + 134, 133, 134, 246, 246, 247, 247, 40, 42, 40, + + 41, 40, 40, 41, 41, 41, 50, 49, 51, 252, + 169, 169, 164, 169, 165, 166, 168, 170, 218, 219, + 218, 216, 215, 217, 171, 173, 171, 172, 171, 185, + 185, 185, 185, 187, 189, 187, 187, 187, 187, 188, + 228, 234, 228, 233, 232, 235, 230, 230, 230, 229, + 229, 226, 227, 252, 130, 252, 21, 23, 21, 22, + 22, 22, 236, 241, 236, 237, 242, 242, 242, 242, + 224, 224, 225, 224, 224, 224, 224, 224, 224, 224, + 129, 53, 52, 129, 129, 129, 129, 54, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 36, 33, 36, - 34, 48, 45, 252, 48, 48, 44, 43, 175, 174, - 176, 177, 178, 179, 180, 181, 182, 31, 32, 31, - 30, 28, 29, 28, 27, 22, 250, 251, 251, 237, - 237, 238, 9, 20, 0, 18, 1, 19, 0, 0, - 0, 16, 10, 0, 0, 0, 0, 4, 16, 5, - 0, 2, 17, 148, 149, 0, 0, 0, 143, 0, - 159, 157, 0, 153, 153, 0, 243, 243, 243, 0, - 0, 142, 0, 147, 137, 0, 0, 0, 139, 140, - 152, 138, 0, 136, 134, 133, 131, 132, 246, 244, - - 245, 40, 42, 40, 40, 37, 38, 0, 50, 49, - 51, 0, 164, 0, 164, 167, 168, 219, 215, 173, - 0, 183, 184, 189, 186, 228, 233, 0, 0, 221, - 229, 229, 229, 0, 130, 0, 21, 23, 24, 235, - 241, 240, 239, 240, 0, 0, 225, 220, 0, 0, - 53, 52, 0, 128, 0, 0, 129, 129, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 129, 129, 36, + 33, 36, 34, 48, 45, 252, 48, 48, 44, 43, + 175, 174, 176, 177, 178, 179, 180, 181, 182, 31, + 32, 31, 30, 28, 29, 28, 27, 22, 250, 250, + 251, 251, 238, 238, 239, 9, 20, 0, 18, 1, + 19, 0, 0, 0, 16, 10, 0, 0, 0, 0, + 4, 16, 5, 0, 2, 17, 148, 149, 0, 0, + 0, 143, 0, 159, 157, 0, 153, 153, 0, 243, + 243, 243, 0, 0, 142, 0, 147, 137, 0, 0, + 0, 139, 140, 152, 138, 0, 136, 134, 133, 131, + + 132, 246, 246, 244, 245, 40, 42, 40, 40, 37, + 38, 0, 50, 49, 51, 0, 164, 0, 164, 167, + 168, 219, 215, 173, 0, 183, 184, 189, 186, 228, + 234, 0, 0, 221, 230, 230, 230, 0, 130, 0, + 21, 23, 24, 236, 241, 240, 0, 0, 225, 220, + 0, 0, 53, 52, 0, 128, 0, 0, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 55, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 0, 35, - 34, 48, 45, 46, 47, 31, 32, 29, 26, 25, - - 250, 248, 249, 237, 0, 16, 10, 0, 14, 0, - 0, 0, 0, 0, 4, 16, 5, 0, 6, 0, - 144, 0, 145, 0, 158, 0, 153, 153, 0, 153, - 153, 153, 243, 243, 155, 154, 0, 156, 138, 146, - 0, 152, 0, 131, 132, 40, 40, 0, 39, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 230, 229, 229, 0, 0, 220, 0, 0, - 0, 0, 129, 129, 129, 129, 129, 129, 65, 129, - 129, 129, 70, 129, 129, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 129, 55, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - + 0, 35, 34, 48, 45, 46, 47, 31, 32, 29, + + 26, 25, 250, 250, 248, 249, 238, 0, 16, 10, + 0, 14, 0, 0, 0, 0, 0, 4, 16, 5, + 0, 6, 0, 144, 0, 145, 0, 158, 0, 153, + 153, 0, 153, 153, 153, 243, 243, 155, 154, 0, + 156, 138, 146, 0, 152, 0, 131, 132, 40, 40, + 0, 39, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 231, 230, 230, 220, 0, + 0, 0, 0, 129, 129, 129, 129, 129, 129, 65, + 129, 129, 129, 70, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 0, 0, - 0, 0, 14, 0, 0, 0, 0, 0, 0, 4, - 8, 5, 0, 153, 153, 153, 153, 153, 153, 153, - 243, 156, 0, 0, 40, 40, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 229, 229, - 0, 0, 56, 57, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 71, 72, 129, 129, 129, 129, - 77, 78, 129, 129, 129, 129, 129, 129, 129, 83, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 92, + 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 0, - 0, 0, 0, 15, 0, 0, 0, 0, 0, 8, - 8, 8, 0, 153, 153, 153, 153, 153, 153, 153, - 0, 0, 40, 40, 214, 0, 0, 0, 0, 0, + 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, + 4, 8, 5, 0, 153, 153, 153, 153, 153, 153, + 153, 243, 156, 0, 0, 40, 40, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, + 230, 0, 0, 56, 57, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 129, 71, 72, 129, 129, 129, + 129, 77, 78, 129, 129, 129, 129, 129, 129, 129, + + 83, 129, 129, 129, 129, 129, 129, 129, 129, 129, + 92, 129, 129, 129, 129, 129, 129, 129, 129, 129, + 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, + 8, 8, 8, 0, 153, 153, 153, 153, 153, 153, + 153, 0, 0, 40, 40, 214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 229, 229, - 0, 0, 58, 129, 60, 129, 62, 129, 129, 129, - 129, 68, 129, 129, 129, 73, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 86, 129, 129, - - 129, 129, 90, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 0, 0, 0, 0, 3, 0, 0, - 0, 8, 7, 8, 0, 153, 153, 153, 0, 0, - 40, 40, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 230, + 230, 0, 0, 58, 129, 60, 129, 62, 129, 129, + 129, 129, 68, 129, 129, 129, 73, 129, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 129, 86, 129, + + 129, 129, 129, 90, 129, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 0, 0, 0, 0, 3, 0, + 0, 0, 8, 7, 8, 0, 153, 153, 153, 0, + 0, 40, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 222, 223, 222, 223, - 129, 61, 129, 129, 129, 129, 129, 129, 129, 125, - 129, 129, 129, 129, 129, 129, 129, 129, 123, 129, - 85, 129, 88, 129, 89, 129, 129, 129, 104, 0, - 129, 94, 129, 0, 95, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 222, 223, 222, + 223, 129, 61, 129, 129, 129, 129, 129, 129, 129, + 125, 129, 129, 129, 129, 129, 129, 129, 129, 123, + 129, 85, 129, 88, 129, 89, 129, 129, 129, 104, + 0, 129, 94, 129, 0, 95, 0, 0, 0, 0, - 12, 0, 13, 0, 151, 0, 150, 0, 0, 0, + 0, 12, 0, 13, 0, 151, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 129, 129, 129, 129, 129, 66, 129, 69, 129, - 129, 129, 129, 129, 129, 122, 129, 82, 129, 129, - 87, 129, 91, 102, 124, 0, 0, 0, 0, 0, - 0, 129, 129, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 150, 0, 0, 0, 0, 0, 0, + 0, 0, 129, 129, 129, 129, 129, 66, 129, 69, + 129, 129, 129, 129, 129, 129, 122, 129, 82, 129, + 129, 87, 129, 91, 102, 124, 0, 0, 0, 0, + 0, 0, 129, 129, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 129, 129, - - 129, 129, 129, 67, 129, 129, 129, 129, 79, 129, - 129, 129, 129, 129, 129, 0, 0, 113, 0, 0, - 0, 0, 0, 0, 93, 129, 0, 0, 114, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, - 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 84, 129, 129, 0, - 0, 0, 0, 0, 0, 115, 0, 103, 0, 0, - 0, 0, 0, 116, 0, 0, 0, 0, 0, 201, - - 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, - 212, 0, 129, 129, 129, 129, 129, 121, 129, 129, - 75, 129, 129, 129, 129, 129, 0, 0, 109, 0, - 119, 117, 110, 0, 0, 0, 120, 118, 0, 0, - 0, 0, 0, 0, 213, 129, 129, 129, 129, 129, - 125, 74, 129, 81, 129, 126, 129, 105, 107, 0, - 106, 108, 0, 0, 0, 0, 0, 0, 0, 129, - 63, 129, 129, 129, 129, 76, 129, 111, 112, 97, - 0, 0, 0, 0, 98, 129, 129, 129, 129, 129, - 127, 96, 0, 100, 0, 129, 129, 129, 66, 129, - - 99, 101, 129, 64, 129, 129, 129, 67, 129, 129, - 80, 59, 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 129, + + 129, 129, 129, 129, 67, 129, 129, 129, 129, 79, + 129, 129, 129, 129, 129, 129, 0, 0, 113, 0, + 0, 0, 0, 0, 0, 93, 129, 0, 0, 114, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, + 0, 190, 191, 192, 193, 194, 195, 196, 197, 198, + 199, 200, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 84, 129, 129, + 0, 0, 0, 0, 0, 0, 115, 0, 103, 0, + 0, 0, 0, 0, 116, 0, 0, 0, 0, 0, + + 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, + 211, 212, 0, 129, 129, 129, 129, 129, 121, 129, + 129, 75, 129, 129, 129, 129, 129, 0, 0, 109, + 0, 119, 117, 110, 0, 0, 0, 120, 118, 0, + 0, 0, 0, 0, 0, 213, 129, 129, 129, 129, + 129, 125, 74, 129, 81, 129, 126, 129, 105, 107, + 0, 106, 108, 0, 0, 0, 0, 0, 0, 0, + 129, 63, 129, 129, 129, 129, 76, 129, 111, 112, + 97, 0, 0, 0, 0, 98, 129, 129, 129, 129, + 129, 127, 96, 0, 100, 0, 129, 129, 129, 66, + + 129, 99, 101, 129, 64, 129, 129, 129, 67, 129, + 129, 80, 59, 0 } ; static const YY_CHAR yy_ec[256] = @@ -525,291 +518,291 @@ static const YY_CHAR yy_meta[85] = 1, 1, 2, 1, 3, 4, 1, 1, 5, 6, 1, 7, 8, 9, 1, 10, 1, 11, 12, 12, 12, 12, 13, 1, 1, 1, 1, 14, 14, 14, - 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, + 14, 14, 14, 15, 15, 15, 15, 15, 15, 16, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 15, 16, 17, 18, 1, 19, 14, 14, 14, - 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, + 15, 16, 17, 18, 19, 1, 20, 14, 14, 14, + 14, 14, 14, 15, 15, 15, 15, 15, 15, 16, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, - 15, 20, 1, 21 + 16, 21, 1, 22 } ; static const flex_int16_t yy_base[1221] = { 0, - 0, 84, 167, 250, 171, 184, 135, 142, 220, 231, - 196, 200, 334, 0, 3627, 3625, 211, 416, 203, 212, - 189, 225, 266, 417, 500, 0, 207, 208, 234, 421, - 424, 436, 583, 588, 669, 0, 294, 304, 584, 751, - 579, 580, 417, 576, 287, 306, 241, 441, 595, 608, - 169, 238, 440, 754, 3680, 4511, 325, 4511, 3676, 0, - 446, 4511, 3673, 430, 827, 3661, 0, 4511, 758, 4511, - 3650, 4511, 453, 3621, 4511, 4511, 3619, 3584, 129, 746, - 445, 766, 4511, 3604, 198, 3582, 4511, 4511, 4511, 3600, - 0, 3599, 214, 0, 3506, 3483, 0, 4511, 3532, 4511, - - 420, 119, 3481, 3478, 3446, 0, 3526, 4511, 3520, 4511, - 482, 3520, 3518, 4511, 3455, 0, 4511, 4511, 4511, 3504, - 4511, 598, 4511, 4511, 4511, 3499, 4511, 754, 4511, 3477, - 759, 180, 4511, 4511, 3467, 0, 3442, 762, 4511, 0, - 4511, 3459, 4511, 3406, 3434, 0, 562, 167, 3393, 3370, - 4511, 4511, 326, 4511, 420, 0, 4511, 3418, 3402, 3366, - 3342, 0, 4511, 3368, 4511, 3317, 444, 3314, 4511, 471, - 4511, 3354, 3271, 3337, 572, 189, 3295, 3285, 4511, 3332, - 4511, 3307, 3303, 585, 594, 4511, 746, 734, 744, 754, - 763, 770, 0, 755, 748, 763, 818, 789, 240, 822, - - 762, 381, 802, 791, 813, 824, 577, 4511, 4511, 3302, - 871, 0, 4511, 3302, 3250, 3231, 4511, 4511, 4511, 4511, - 4511, 4511, 4511, 4511, 4511, 4511, 4511, 0, 4511, 3279, - 4511, 4511, 4511, 3276, 3260, 3259, 0, 3221, 3214, 0, - 3264, 4511, 835, 4511, 3262, 0, 903, 4511, 3257, 842, - 817, 0, 0, 910, 914, 918, 922, 0, 814, 0, - 457, 4511, 0, 943, 4511, 3241, 3141, 483, 4511, 3217, - 3212, 4511, 826, 556, 903, 930, 4511, 757, 0, 3134, - 3131, 4511, 3129, 964, 4511, 3190, 3110, 3174, 3161, 4511, - 0, 4511, 896, 4511, 0, 3172, 0, 0, 0, 4511, - - 4511, 0, 4511, 910, 913, 4511, 4511, 602, 0, 3169, - 4511, 957, 3164, 3161, 3127, 4511, 0, 4511, 976, 4511, - 1020, 4511, 4511, 4511, 4511, 0, 4511, 3116, 0, 4511, - 0, 926, 930, 644, 4511, 662, 0, 4511, 4511, 0, - 4511, 4511, 3071, 3121, 794, 3037, 4511, 0, 934, 932, - 3117, 4511, 3091, 4511, 938, 939, 0, 940, 738, 956, - 802, 3059, 876, 978, 933, 933, 939, 948, 964, 1030, - 938, 958, 976, 968, 0, 996, 4511, 999, 1057, 1068, - 981, 1079, 1077, 1080, 1074, 1068, 1070, 1120, 3062, 4511, - 1014, 0, 4511, 4511, 4511, 0, 4511, 4511, 4511, 4511, - - 0, 4511, 4511, 0, 1078, 0, 0, 1153, 4511, 3063, - 1166, 1077, 1076, 1091, 0, 1089, 0, 1018, 4511, 1022, - 4511, 1025, 4511, 1035, 4511, 1091, 1067, 1138, 1162, 1242, - 1177, 1308, 1105, 0, 4511, 4511, 2954, 1198, 4511, 4511, - 1144, 0, 1137, 0, 0, 1161, 1156, 1123, 4511, 1202, - 1308, 1309, 1310, 1319, 3013, 1312, 1311, 1327, 1320, 1321, - 1323, 1382, 4511, 1172, 1166, 2589, 2537, 0, 1178, 1169, - 1169, 1298, 1315, 1324, 1330, 1321, 1330, 1323, 0, 1341, - 1332, 1348, 0, 1346, 1350, 1348, 1361, 1350, 1367, 2573, - 1370, 1366, 1380, 1382, 1382, 1385, 1378, 1387, 1391, 1400, - - 1393, 1403, 1406, 1414, 1400, 1401, 1404, 1429, 1419, 1424, - 1428, 1425, 1436, 1435, 1430, 1441, 1442, 1432, 1432, 1450, - 1209, 1508, 4511, 1215, 1512, 1219, 1461, 1455, 1451, 0, - 1143, 0, 1461, 1534, 1600, 1636, 204, 2525, 1606, 1681, - 4511, 4511, 1453, 1463, 1591, 1442, 2524, 1599, 1604, 1600, - 1607, 1605, 1611, 1608, 1650, 1620, 1606, 1614, 1613, 1654, - 1663, 1652, 1661, 1666, 1682, 1664, 1693, 1694, 1655, 1674, - 1662, 1675, 4511, 4511, 1683, 1676, 1677, 1683, 1697, 1692, - 1731, 1711, 1702, 1718, 0, 0, 1719, 1706, 1716, 1735, - 0, 0, 2553, 1722, 1732, 2540, 1725, 1722, 1733, 0, - - 1727, 1747, 1740, 1739, 1735, 1752, 1739, 1740, 1746, 0, - 1750, 1763, 1760, 1750, 1752, 1759, 1777, 1762, 1778, 1769, - 1783, 1778, 2514, 4511, 1224, 1230, 1772, 1783, 1780, 0, - 1507, 1234, 2364, 732, 2273, 1809, 1845, 1430, 1076, 1585, - 1797, 2286, 1785, 1807, 4511, 1811, 1814, 1829, 1835, 1821, - 1808, 1822, 1845, 1859, 1860, 1862, 1868, 1869, 1870, 1825, - 1888, 1890, 1876, 1891, 1874, 1902, 1894, 1898, 1795, 1891, - 1882, 1899, 0, 1887, 0, 1892, 0, 2260, 1900, 1891, - 1909, 0, 1904, 2253, 1902, 0, 1916, 1907, 1918, 2227, - 1912, 1909, 1924, 2201, 1908, 1918, 1922, 0, 1934, 1925, - - 1931, 1947, 0, 1936, 1942, 1941, 1953, 2103, 1957, 1958, - 1952, 2085, 1950, 1951, 1950, 1969, 1956, 2133, 1515, 1961, - 1971, 2002, 4511, 2117, 2038, 1981, 1592, 1842, 2025, 1983, - 0, 0, 1972, 1990, 1999, 1987, 1994, 2008, 2005, 2007, - 2015, 2023, 2016, 2021, 2017, 2024, 2022, 2026, 2030, 2029, - 2037, 2035, 2045, 2051, 2054, 2061, 0, 0, 4511, 4511, - 1922, 0, 2049, 2039, 2050, 2053, 2051, 2051, 2054, 1831, - 2073, 2064, 2077, 2073, 2081, 2082, 2072, 2085, 0, 2091, - 0, 2074, 0, 1824, 0, 2091, 2094, 2082, 0, 2116, - 2088, 0, 2092, 2133, 0, 1728, 2097, 2095, 1714, 1678, - - 4511, 2135, 4511, 2096, 4511, 1726, 4511, 1703, 1612, 1601, - 1514, 1500, 1477, 1377, 1373, 1333, 1274, 1203, 2133, 2128, - 2148, 2151, 2144, 2150, 2156, 2158, 2161, 2163, 2184, 2167, - 2164, 2157, 2151, 2159, 2158, 2173, 0, 2165, 0, 2166, - 2182, 2173, 2179, 2178, 2186, 0, 2185, 0, 2187, 2193, - 0, 2202, 0, 0, 0, 2204, 2187, 2201, 2224, 2200, - 2222, 2213, 2219, 2230, 2199, 2227, 2239, 2222, 2225, 1162, - 1158, 2228, 2278, 4511, 1112, 1109, 1081, 1063, 1057, 984, - 976, 969, 923, 913, 910, 931, 895, 891, 887, 881, - 874, 856, 848, 843, 840, 804, 788, 2259, 2248, 2258, - - 2265, 2264, 2241, 0, 2254, 2265, 2268, 2279, 0, 2262, - 2268, 2271, 2266, 2278, 2283, 2289, 2273, 4511, 2280, 2281, - 2281, 2300, 2283, 2281, 0, 2303, 2307, 2292, 4511, 2302, - 2304, 2319, 2303, 2307, 2309, 2328, 2309, 2357, 4511, 2362, - 4511, 4511, 4511, 4511, 4511, 4511, 4511, 4511, 4511, 4511, - 4511, 746, 725, 597, 577, 441, 426, 420, 267, 253, - 247, 230, 183, 181, 2317, 2338, 2342, 2330, 2336, 2343, - 2339, 2331, 2334, 2350, 2341, 2345, 0, 2350, 2346, 2344, - 2349, 2361, 2364, 2367, 2359, 4511, 2357, 0, 2358, 2362, - 2379, 2383, 2375, 4511, 2388, 2375, 2382, 2377, 2389, 4511, - - 4511, 4511, 4511, 4511, 4511, 4511, 4511, 4511, 4511, 4511, - 4511, 122, 2399, 2398, 2382, 2391, 2391, 0, 2407, 2408, - 0, 2397, 2398, 2420, 2417, 2414, 2418, 2426, 4511, 2414, - 4511, 4511, 4511, 2422, 2429, 2419, 4511, 4511, 2417, 2437, - 2435, 2425, 2428, 2428, 4511, 2431, 2445, 2445, 2447, 2452, - 0, 0, 2461, 0, 2444, 0, 2459, 4511, 4511, 2452, - 4511, 4511, 2454, 2465, 2452, 2467, 2471, 2470, 2476, 2481, - 0, 2468, 2465, 2465, 2485, 0, 2465, 4511, 4511, 4511, - 2489, 2491, 2479, 2488, 4511, 2501, 2491, 2498, 2503, 2490, - 0, 4511, 2497, 4511, 2510, 2500, 2502, 2500, 0, 2514, - - 4511, 4511, 2516, 0, 2523, 2508, 2509, 0, 2528, 2531, - 0, 0, 4511, 2593, 2614, 2635, 2656, 2677, 2698, 2719, - 2740, 2761, 2782, 2803, 2824, 2845, 2866, 2887, 2908, 2929, - 2950, 2971, 2992, 3013, 3025, 3044, 3055, 3074, 3095, 3108, - 3127, 3148, 3169, 3190, 3202, 3221, 3242, 3263, 3280, 3292, - 3311, 3332, 3353, 3374, 3395, 3408, 2553, 3423, 3444, 3463, - 3484, 3505, 3517, 3536, 3557, 2569, 3057, 3578, 3590, 3609, - 3630, 3651, 2558, 3663, 3684, 3705, 3726, 3747, 3768, 3789, - 3810, 3831, 3843, 3862, 3879, 3891, 3910, 3931, 3952, 3973, - 3994, 4007, 4022, 4043, 4062, 4083, 4104, 4125, 4146, 4167, - - 4179, 4189, 4208, 4229, 4250, 2561, 4262, 4283, 4304, 4325, - 4346, 4367, 3028, 4379, 4398, 4419, 4432, 4447, 4468, 4489 + 0, 84, 167, 250, 171, 184, 174, 179, 192, 233, + 197, 201, 334, 0, 3525, 3493, 416, 424, 206, 211, + 187, 216, 276, 417, 508, 0, 193, 202, 421, 427, + 590, 594, 606, 617, 698, 0, 277, 299, 420, 599, + 767, 768, 418, 764, 210, 221, 205, 288, 444, 448, + 272, 273, 783, 806, 3544, 4642, 306, 4642, 3538, 0, + 310, 4642, 3536, 255, 879, 3512, 0, 4642, 792, 4642, + 3521, 4642, 453, 3475, 4642, 4642, 3484, 3472, 177, 586, + 446, 860, 4642, 3492, 585, 3448, 4642, 4642, 4642, 3447, + 0, 3443, 141, 3441, 4642, 3390, 3387, 0, 4642, 3427, + + 4642, 222, 219, 3375, 3368, 3337, 0, 3410, 4642, 3403, + 4642, 476, 3379, 3377, 4642, 3323, 0, 4642, 4642, 4642, + 3372, 4642, 466, 4642, 4642, 4642, 3370, 4642, 612, 4642, + 3332, 801, 232, 4642, 4642, 3348, 0, 3325, 805, 4642, + 0, 4642, 3344, 4642, 3292, 3332, 0, 427, 396, 3289, + 3282, 4642, 4642, 447, 4642, 487, 0, 4642, 3332, 3315, + 3275, 3256, 0, 4642, 3286, 4642, 4642, 3233, 0, 3230, + 4642, 226, 4642, 3281, 3196, 3265, 566, 555, 3204, 3201, + 4642, 3249, 4642, 3246, 3231, 574, 581, 4642, 753, 813, + 599, 591, 838, 822, 0, 593, 597, 861, 873, 840, + + 564, 841, 624, 574, 637, 755, 767, 774, 776, 4642, + 4642, 3228, 657, 0, 4642, 3226, 3174, 3135, 4642, 4642, + 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, 0, + 4642, 3184, 4642, 4642, 4642, 3183, 3167, 3163, 3176, 4642, + 3103, 3079, 0, 3128, 4642, 691, 4642, 3127, 0, 803, + 4642, 3126, 865, 830, 0, 0, 943, 955, 964, 976, + 0, 864, 0, 491, 4642, 0, 997, 4642, 3122, 3041, + 502, 4642, 3096, 3091, 4642, 876, 236, 917, 953, 4642, + 297, 0, 3013, 3009, 4642, 3007, 1006, 4642, 2623, 2543, + 2610, 2598, 4642, 0, 4642, 882, 4642, 0, 2619, 0, + + 0, 2615, 4642, 4642, 4642, 0, 4642, 882, 940, 4642, + 4642, 611, 0, 2614, 4642, 889, 2612, 2609, 2606, 4642, + 0, 4642, 970, 4642, 1062, 4642, 4642, 4642, 4642, 0, + 4642, 2592, 0, 4642, 0, 945, 953, 679, 4642, 685, + 0, 4642, 4642, 0, 4642, 4642, 237, 2517, 4642, 0, + 964, 965, 2572, 4642, 2536, 4642, 977, 978, 0, 984, + 800, 989, 854, 2517, 941, 992, 957, 980, 982, 983, + 1001, 995, 989, 1004, 1010, 994, 0, 1004, 4642, 1007, + 1013, 1108, 1015, 1118, 1117, 1056, 1113, 1043, 1107, 1159, + 2409, 4642, 1138, 0, 4642, 4642, 4642, 0, 4642, 4642, + + 4642, 4642, 2306, 4642, 4642, 4642, 0, 1045, 0, 0, + 1192, 4642, 2247, 1205, 1108, 1114, 1111, 0, 1123, 0, + 1061, 4642, 1069, 4642, 1076, 4642, 1159, 4642, 1128, 269, + 1148, 1201, 1281, 1211, 1347, 598, 0, 4642, 4642, 2163, + 1237, 4642, 4642, 1141, 0, 1146, 0, 0, 1174, 1173, + 1160, 4642, 1164, 1209, 1347, 1348, 1214, 2191, 1349, 1212, + 1350, 1359, 1360, 1361, 1411, 4642, 1211, 1202, 0, 1214, + 1205, 1338, 1341, 1215, 1346, 1353, 1352, 1361, 1354, 0, + 1367, 1367, 1385, 0, 1373, 1384, 1386, 1397, 1387, 1404, + 2173, 1405, 1397, 1418, 1416, 1416, 1418, 1411, 1417, 1430, + + 1434, 1432, 1442, 1447, 1454, 1446, 1441, 1441, 1463, 1453, + 1458, 1459, 1455, 1469, 1466, 1463, 1474, 1476, 1465, 1487, + 1479, 1248, 1545, 4642, 1252, 1549, 1256, 1484, 1477, 1473, + 0, 1037, 0, 1486, 1571, 1637, 1673, 784, 2118, 1643, + 1718, 4642, 4642, 1481, 1492, 1628, 1472, 2114, 1636, 1641, + 1498, 1644, 1642, 1637, 1645, 1643, 1652, 1698, 1649, 1650, + 1659, 1689, 1690, 1699, 1700, 1720, 1702, 1731, 1730, 1697, + 1684, 1722, 1710, 4642, 4642, 1718, 1711, 1712, 1718, 1734, + 1729, 1769, 1749, 1719, 1758, 0, 0, 1755, 1743, 1753, + 1758, 0, 0, 2006, 1756, 1767, 1957, 1758, 1755, 1771, + + 0, 1763, 1781, 1774, 1773, 1772, 1783, 1774, 1775, 1781, + 0, 1785, 1797, 1794, 1781, 1788, 1786, 1808, 1793, 1815, + 1804, 1817, 1806, 1968, 4642, 1257, 1264, 1806, 1819, 1816, + 0, 1189, 1554, 1858, 854, 1823, 1845, 1881, 1817, 620, + 801, 1834, 1836, 1828, 1853, 4642, 1845, 1851, 1865, 1860, + 1859, 1884, 1857, 1867, 1894, 1898, 1897, 1903, 1907, 1895, + 1908, 1912, 1924, 1910, 1909, 1928, 1933, 1940, 1926, 1917, + 1933, 1921, 1934, 0, 1925, 0, 1929, 0, 1793, 1941, + 1926, 1947, 0, 1942, 1746, 1940, 0, 1960, 1948, 1962, + 1708, 1959, 1941, 1969, 1670, 1953, 1960, 1959, 0, 1972, + + 1963, 1966, 1986, 0, 1973, 1979, 1977, 1993, 1626, 1994, + 1995, 1990, 1614, 1987, 1989, 1990, 2009, 1997, 1659, 1265, + 2001, 2011, 1715, 4642, 1623, 1535, 1991, 879, 1007, 1532, + 1514, 0, 0, 2026, 2030, 2031, 2038, 2027, 2040, 2041, + 2045, 2048, 2055, 2053, 2057, 2056, 2066, 2059, 2061, 2074, + 2068, 2058, 2071, 2079, 2095, 2090, 2085, 0, 0, 4642, + 4642, 1521, 0, 2087, 2073, 2096, 2090, 2086, 2087, 2089, + 1493, 2107, 2098, 2113, 2109, 2115, 2116, 2105, 2121, 0, + 2125, 0, 2110, 0, 1483, 0, 2122, 2130, 2116, 0, + 2156, 2123, 0, 2127, 2168, 0, 1404, 2136, 2131, 1399, + + 1671, 4642, 1891, 4642, 2131, 4642, 1404, 4642, 1389, 1374, + 1370, 1364, 1313, 1252, 1249, 1240, 1161, 1149, 1145, 2159, + 2157, 2185, 2147, 2170, 2189, 2188, 2193, 2197, 2198, 2201, + 2196, 2219, 2190, 2186, 2204, 2202, 2208, 0, 2205, 0, + 2200, 2221, 2210, 2215, 2215, 2218, 0, 2219, 0, 2222, + 2225, 0, 2238, 0, 0, 0, 2236, 2224, 2228, 2261, + 2230, 2240, 2240, 2241, 2259, 2244, 2262, 2269, 2263, 2268, + 1094, 1027, 2269, 2080, 4642, 1023, 1018, 1012, 971, 939, + 913, 901, 887, 873, 840, 835, 828, 808, 794, 789, + 766, 762, 674, 666, 662, 616, 606, 578, 2294, 2265, + + 2283, 2290, 2290, 2279, 0, 2283, 2292, 2293, 2303, 0, + 2287, 2290, 2297, 2295, 2309, 2314, 2319, 2304, 4642, 2312, + 2314, 2315, 2332, 2317, 2314, 0, 2336, 2339, 2325, 4642, + 2328, 2331, 2346, 2330, 2332, 2335, 2359, 2335, 2381, 4642, + 2386, 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, + 4642, 4642, 451, 440, 436, 428, 408, 387, 373, 255, + 240, 227, 137, 133, 160, 2345, 2364, 2369, 2359, 2366, + 2375, 2370, 2363, 2366, 2382, 2371, 2374, 0, 2380, 2377, + 2375, 2379, 2386, 2394, 2398, 2390, 4642, 2384, 0, 2385, + 2390, 2404, 2408, 2401, 4642, 2415, 2399, 2409, 2401, 2426, + + 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, 4642, + 4642, 4642, 116, 2423, 2429, 2418, 2421, 2422, 0, 2439, + 2440, 0, 2429, 2429, 2450, 2447, 2444, 2447, 2454, 4642, + 2442, 4642, 4642, 4642, 2453, 2460, 2448, 4642, 4642, 2444, + 2464, 2462, 2450, 2454, 2453, 4642, 2459, 2474, 2471, 2478, + 2479, 0, 0, 2488, 0, 2474, 0, 2490, 4642, 4642, + 2482, 4642, 4642, 2485, 2498, 2485, 2501, 2503, 2502, 2507, + 2512, 0, 2499, 2496, 2498, 2518, 0, 2499, 4642, 4642, + 4642, 2517, 2520, 2509, 2515, 4642, 2528, 2518, 2526, 2531, + 2519, 0, 4642, 2522, 4642, 2539, 2528, 2531, 2532, 0, + + 2547, 4642, 4642, 2549, 0, 2555, 2541, 2542, 0, 2562, + 2565, 0, 0, 4642, 2627, 2649, 2671, 2693, 2715, 2737, + 2759, 2781, 2803, 2825, 2847, 2869, 2891, 2913, 2935, 2957, + 2979, 3001, 3023, 3045, 3067, 3080, 3100, 3112, 3132, 3154, + 3168, 3188, 3210, 3232, 3254, 3267, 3287, 3309, 3331, 3349, + 3362, 3382, 3404, 3426, 3448, 3470, 3484, 2584, 3500, 3522, + 3542, 3564, 3586, 3599, 3619, 3641, 3650, 3657, 3677, 3690, + 3710, 3732, 3754, 2593, 3767, 3789, 3811, 3833, 3855, 3877, + 3899, 3921, 3943, 3956, 3976, 3994, 4007, 4027, 4049, 4071, + 4093, 4115, 4129, 4145, 4167, 4187, 4209, 4231, 4253, 4275, + + 4297, 4310, 4321, 4341, 4363, 4385, 2597, 4398, 4420, 4442, + 4464, 4486, 4508, 4518, 4525, 4545, 4559, 4575, 4597, 4619 } ; static const flex_int16_t yy_def[1221] = { 0, - 1113, 1113, 1114, 1114, 1115, 1116, 1117, 1117, 1118, 1118, - 1119, 1119, 1113, 13, 1120, 1120, 1121, 1121, 1122, 1122, - 1123, 1123, 1124, 1124, 1113, 25, 1125, 1125, 1126, 1126, - 1127, 1127, 1128, 1128, 1113, 35, 1129, 1129, 1130, 1130, - 1120, 1120, 1120, 1120, 1131, 1131, 1132, 1132, 1126, 1126, - 1133, 1133, 1134, 1134, 1113, 1113, 1113, 1113, 1113, 1135, - 1113, 1113, 1113, 1113, 1136, 1113, 1137, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1138, 1139, - 1140, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1141, 1113, 1141, 1142, 1113, 1113, 1143, 1113, 1143, 1113, - - 1143, 1143, 1113, 1113, 1113, 1144, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1145, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1139, 1113, 1113, - 1139, 1146, 1113, 1113, 1113, 1147, 1113, 1139, 1113, 1148, - 1113, 1148, 1113, 1149, 1113, 1150, 1150, 1150, 1113, 1113, - 1113, 1113, 1151, 1113, 1151, 1152, 1113, 1152, 1113, 1113, - 1113, 1153, 1113, 1153, 1113, 1113, 1154, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1155, 1113, 1113, 1113, 1156, 1156, 1156, 1156, - 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1157, 1156, 1156, - - 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1113, 1113, 1158, - 1113, 1159, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1160, 1113, 1160, - 1113, 1113, 1113, 1113, 1113, 1113, 1161, 1113, 1113, 1162, - 1162, 1113, 1113, 1113, 1113, 1163, 1113, 1113, 1113, 1113, - 1113, 1164, 1165, 1113, 1113, 1113, 1113, 1166, 1164, 1167, - 1168, 1113, 1169, 1113, 1113, 1113, 1113, 1170, 1113, 1113, - 1113, 1113, 1113, 1171, 1171, 1172, 1113, 1113, 1173, 1113, - 1113, 1113, 1174, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1175, 1113, 1113, 1113, 1176, 1113, 1177, 1178, 1179, 1113, - - 1113, 1180, 1113, 1180, 1180, 1113, 1113, 1181, 1182, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1183, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1184, 1113, 1113, 1185, 1113, - 1186, 1186, 1186, 1187, 1113, 1187, 1188, 1113, 1113, 1189, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1190, 1113, 1113, - 1113, 1113, 1191, 1113, 1113, 1113, 1192, 1192, 1192, 1192, - 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, - 1192, 1192, 1192, 1192, 1192, 1192, 1113, 1192, 1192, 1192, - 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1193, 1113, - 1113, 1194, 1113, 1113, 1113, 1195, 1113, 1113, 1113, 1113, - - 1196, 1113, 1113, 1197, 1113, 1198, 1199, 1200, 1113, 1113, - 1113, 1113, 1113, 1113, 1201, 1198, 1202, 1203, 1113, 1203, - 1113, 1204, 1113, 1204, 1113, 1113, 1205, 1205, 1205, 1113, - 1205, 1205, 1113, 1206, 1113, 1113, 1207, 1113, 1113, 1113, - 1113, 1208, 1113, 1209, 1210, 1211, 1211, 1212, 1113, 1212, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1113, 1214, 1214, 1113, 1215, 1216, 1113, 1113, - 1113, 1113, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1114, 1114, 1115, 1115, 1116, 1117, 1118, 1118, 1119, 1119, + 1120, 1120, 1114, 13, 1121, 1121, 1122, 1122, 1123, 1123, + 1124, 1124, 1125, 1125, 1114, 25, 1126, 1126, 1127, 1127, + 1128, 1128, 1129, 1129, 1114, 35, 1130, 1130, 1131, 1131, + 1121, 1121, 1121, 1121, 1132, 1132, 1133, 1133, 1127, 1127, + 1134, 1134, 1135, 1135, 1114, 1114, 1114, 1114, 1114, 1136, + 1114, 1114, 1114, 1114, 1137, 1114, 1138, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1139, 1140, + 1141, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1142, 1114, 1142, 1143, 1114, 1114, 1114, 1144, 1114, 1144, + + 1114, 1144, 1144, 1114, 1114, 1114, 1145, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1146, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1140, 1114, + 1114, 1140, 1147, 1114, 1114, 1114, 1148, 1114, 1140, 1114, + 1149, 1114, 1149, 1114, 1150, 1114, 1151, 1151, 1151, 1114, + 1114, 1114, 1114, 1152, 1114, 1152, 1153, 1114, 1153, 1114, + 1114, 1114, 1154, 1114, 1154, 1114, 1114, 1114, 1155, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1156, 1114, 1114, 1114, 1157, 1157, + 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1158, + + 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1157, 1114, + 1114, 1159, 1114, 1160, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1161, + 1114, 1161, 1114, 1114, 1114, 1114, 1114, 1114, 1162, 1114, + 1114, 1114, 1163, 1163, 1114, 1114, 1114, 1114, 1164, 1114, + 1114, 1114, 1114, 1114, 1165, 1166, 1114, 1114, 1114, 1114, + 1167, 1165, 1168, 1169, 1114, 1170, 1114, 1114, 1114, 1114, + 1171, 1114, 1114, 1114, 1114, 1114, 1172, 1172, 1173, 1114, + 1114, 1174, 1114, 1114, 1114, 1175, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1176, 1114, 1114, 1114, 1177, 1114, 1178, + + 1179, 1180, 1114, 1114, 1114, 1181, 1114, 1181, 1181, 1114, + 1114, 1182, 1183, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1184, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1185, + 1114, 1114, 1186, 1114, 1187, 1187, 1187, 1188, 1114, 1188, + 1189, 1114, 1114, 1190, 1114, 1114, 1114, 1114, 1114, 1191, + 1114, 1114, 1114, 1114, 1192, 1114, 1114, 1114, 1193, 1193, + 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, + 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1114, 1193, + 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, + 1194, 1114, 1114, 1195, 1114, 1114, 1114, 1196, 1114, 1114, + + 1114, 1114, 1197, 1114, 1114, 1114, 1198, 1114, 1199, 1200, + 1201, 1114, 1114, 1114, 1114, 1114, 1114, 1202, 1199, 1203, + 1204, 1114, 1204, 1114, 1205, 1114, 1205, 1114, 1114, 1206, + 1206, 1206, 1114, 1206, 1206, 1114, 1207, 1114, 1114, 1208, + 1114, 1114, 1114, 1114, 1209, 1114, 1210, 1211, 1212, 1212, + 1213, 1114, 1213, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1114, 1215, 1215, 1216, 1114, + 1114, 1114, 1114, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1113, 1113, - 1200, 1200, 1113, 1200, 1200, 1113, 1113, 1113, 1113, 1201, - 1218, 1202, 1113, 1113, 1205, 432, 430, 430, 1205, 432, - 1113, 1113, 1113, 1113, 1211, 1211, 1113, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1214, 1214, - 1113, 1113, 1113, 1113, 1217, 1217, 1217, 1217, 1217, 1217, + 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1114, + 1114, 1201, 1201, 1114, 1201, 1201, 1114, 1114, 1114, 1114, + 1202, 1218, 1203, 1114, 1114, 1206, 435, 433, 433, 1206, + 435, 1114, 1114, 1114, 1114, 1212, 1212, 1114, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1215, + 1215, 1114, 1114, 1114, 1114, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1113, - 1113, 1113, 1113, 1113, 1200, 1200, 1113, 1113, 1113, 1218, - 1218, 1218, 1113, 534, 534, 1205, 432, 1205, 1205, 1205, - 1113, 1113, 1211, 1211, 1113, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1214, 1214, - 1113, 1113, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1114, 1114, 1114, 1114, 1114, 1201, 1201, 1114, 1114, 1114, + 1218, 1218, 1218, 1114, 535, 535, 1206, 435, 1206, 1206, + 1206, 1114, 1114, 1212, 1212, 1114, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1215, + 1215, 1114, 1114, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1113, 1113, 1113, 1113, 1113, 1219, 1113, - 1113, 1218, 1113, 1218, 1113, 1205, 1205, 1205, 1113, 1113, - 1211, 1211, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1214, 1214, 1113, 1113, + 1217, 1217, 1217, 1217, 1114, 1114, 1114, 1114, 1114, 1219, + 1114, 1114, 1218, 1114, 1218, 1114, 1206, 1206, 1206, 1114, + 1114, 1212, 1212, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1215, 1215, 1114, + 1114, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1113, - 1217, 1217, 1217, 1113, 1217, 1113, 1113, 1113, 1113, 1219, + 1114, 1217, 1217, 1217, 1114, 1217, 1114, 1114, 1114, 1114, - 1113, 1219, 1113, 1113, 1113, 1113, 1113, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, - 1213, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1219, 1114, 1219, 1114, 1114, 1114, 1114, 1114, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, + 1214, 1214, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1113, 1113, 1113, 1113, 1113, - 1113, 1217, 1217, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1220, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1213, 1213, 1213, 1213, 1213, - 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1217, 1217, + 1217, 1217, 1217, 1217, 1217, 1217, 1114, 1114, 1114, 1114, + 1114, 1114, 1217, 1217, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1220, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1214, 1214, 1214, 1214, + 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1214, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1217, 1217, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1220, 1113, 1220, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1213, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1217, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1217, - 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1217, 1217, 1217, 1217, 1217, - 1217, 1113, 1113, 1113, 1113, 1217, 1217, 1217, 1217, 1217, - - 1113, 1113, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, - 1217, 1217, 0, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113 + 1217, 1217, 1217, 1217, 1217, 1217, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1217, 1217, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1220, 1114, + 1220, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1214, 1217, 1217, 1217, 1217, 1217, + 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1217, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1217, 1217, 1217, 1217, + 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1217, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1217, 1217, 1217, 1217, + 1217, 1217, 1114, 1114, 1114, 1114, 1217, 1217, 1217, 1217, + + 1217, 1114, 1114, 1217, 1217, 1217, 1217, 1217, 1217, 1217, + 1217, 1217, 1217, 0, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114 } ; -static const flex_int16_t yy_nxt[4596] = +static const flex_int16_t yy_nxt[4727] = { 0, 56, 57, 58, 56, 59, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, @@ -829,497 +822,511 @@ static const flex_int16_t yy_nxt[4596] = 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 56, 56, 56, 69, 70, - 305, 71, 72, 89, 73, 90, 1045, 74, 75, 76, - 76, 275, 276, 76, 77, 92, 89, 95, 90, 96, - 78, 56, 93, 76, 95, 323, 96, 107, 108, 305, - - 109, 107, 108, 1012, 109, 125, 291, 126, 127, 154, - 154, 155, 155, 119, 125, 120, 126, 127, 333, 79, - 80, 238, 98, 239, 99, 121, 638, 56, 100, 122, - 122, 122, 122, 98, 323, 99, 157, 1011, 158, 105, - 350, 130, 131, 233, 132, 234, 159, 333, 81, 76, - 76, 82, 83, 235, 84, 72, 128, 73, 85, 427, - 74, 75, 76, 76, 101, 128, 76, 77, 134, 350, - 135, 102, 103, 86, 104, 101, 76, 130, 131, 292, - 132, 136, 102, 103, 1010, 104, 160, 378, 161, 229, - 238, 230, 239, 101, 123, 297, 209, 298, 231, 210, - - 102, 1009, 79, 80, 101, 87, 209, 1008, 229, 210, - 230, 102, 211, 211, 211, 211, 378, 231, 137, 138, - 139, 1007, 211, 211, 211, 211, 243, 244, 335, 245, - 336, 81, 76, 76, 110, 111, 112, 110, 113, 110, - 110, 110, 110, 110, 110, 110, 114, 110, 114, 110, - 110, 110, 110, 110, 110, 110, 110, 110, 110, 115, - 110, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 116, 110, 110, 110, 110, - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - - 116, 116, 116, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116, 116, 116, 110, 110, 110, 119, 134, - 120, 135, 335, 157, 336, 158, 163, 383, 164, 165, - 121, 250, 136, 159, 122, 122, 122, 122, 163, 224, - 164, 165, 163, 233, 241, 234, 343, 247, 248, 242, - 249, 304, 225, 235, 269, 269, 383, 270, 280, 419, - 281, 420, 226, 282, 282, 282, 282, 227, 251, 137, - 138, 139, 345, 160, 1006, 161, 166, 167, 168, 346, - 1005, 304, 225, 312, 313, 423, 314, 424, 166, 167, - 168, 226, 166, 167, 168, 1004, 227, 344, 251, 123, - - 140, 140, 141, 140, 142, 143, 140, 140, 140, 144, - 140, 140, 140, 140, 140, 140, 140, 145, 140, 140, - 140, 140, 140, 140, 140, 140, 140, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 146, 147, 146, 146, 146, 146, 146, - 146, 148, 149, 140, 150, 140, 146, 146, 146, 146, - 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, - 146, 146, 146, 147, 146, 146, 146, 146, 146, 146, - 148, 151, 140, 152, 170, 171, 213, 172, 214, 170, - 171, 173, 172, 332, 219, 219, 173, 157, 224, 158, - - 174, 220, 220, 349, 449, 174, 450, 236, 428, 429, - 157, 225, 158, 355, 221, 221, 319, 319, 319, 319, - 236, 226, 356, 332, 222, 222, 227, 175, 388, 223, - 223, 1003, 175, 349, 176, 177, 215, 178, 216, 176, - 177, 225, 178, 355, 221, 221, 335, 160, 336, 161, - 226, 1002, 356, 222, 222, 227, 175, 388, 223, 223, - 160, 175, 161, 176, 335, 217, 336, 218, 176, 179, - 180, 181, 179, 182, 183, 179, 179, 179, 179, 179, - 179, 179, 179, 179, 179, 179, 179, 179, 184, 185, - 179, 179, 179, 186, 179, 179, 187, 188, 189, 190, - - 191, 192, 193, 194, 195, 193, 193, 196, 197, 198, - 199, 200, 193, 201, 202, 203, 204, 205, 206, 193, - 207, 179, 179, 179, 179, 179, 187, 188, 189, 190, - 191, 192, 193, 194, 195, 193, 193, 196, 197, 198, - 199, 200, 201, 202, 203, 204, 205, 206, 193, 207, - 179, 179, 179, 213, 726, 214, 163, 362, 241, 264, - 265, 360, 266, 242, 278, 278, 267, 284, 285, 361, - 286, 363, 278, 278, 287, 433, 433, 278, 278, 1001, - 278, 278, 475, 288, 358, 364, 369, 427, 370, 289, - 359, 360, 365, 382, 371, 345, 279, 367, 372, 361, - - 1000, 363, 346, 215, 279, 216, 166, 167, 168, 279, - 963, 475, 279, 366, 358, 364, 369, 368, 370, 359, - 376, 290, 365, 382, 371, 279, 962, 367, 372, 384, - 377, 385, 217, 279, 218, 253, 243, 244, 279, 245, - 268, 279, 366, 250, 386, 373, 368, 478, 268, 374, - 376, 387, 405, 379, 254, 416, 255, 426, 255, 384, - 377, 385, 961, 380, 255, 960, 381, 255, 256, 257, - 959, 255, 258, 259, 386, 373, 478, 260, 958, 374, - 251, 387, 405, 379, 254, 416, 255, 426, 255, 391, - 391, 391, 391, 380, 255, 381, 957, 255, 256, 257, - - 255, 258, 259, 956, 247, 248, 260, 249, 261, 955, - 251, 408, 409, 954, 410, 408, 409, 953, 410, 408, - 409, 480, 410, 408, 409, 430, 410, 443, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 264, 265, 446, 266, 431, 431, - 480, 267, 447, 952, 412, 428, 429, 443, 312, 313, - 413, 314, 464, 414, 951, 284, 285, 950, 286, 465, - 469, 470, 287, 471, 472, 473, 446, 949, 483, 484, - 432, 288, 447, 412, 485, 476, 486, 289, 490, 474, - 413, 487, 464, 414, 319, 319, 319, 319, 491, 465, - - 469, 470, 477, 471, 472, 473, 481, 483, 484, 432, - 482, 492, 499, 485, 493, 476, 486, 490, 474, 290, - 419, 487, 420, 948, 419, 268, 420, 423, 491, 424, - 947, 477, 391, 391, 391, 391, 481, 423, 946, 424, - 482, 492, 499, 493, 494, 495, 268, 451, 452, 453, - 454, 455, 455, 456, 455, 455, 455, 455, 457, 455, - 455, 455, 458, 455, 455, 459, 455, 460, 455, 455, - 461, 455, 488, 494, 495, 462, 489, 451, 452, 453, - 454, 455, 455, 456, 455, 455, 455, 455, 457, 455, - 455, 455, 458, 455, 459, 455, 460, 455, 455, 461, - - 455, 496, 488, 497, 503, 489, 500, 504, 505, 506, - 501, 945, 508, 498, 509, 502, 507, 944, 520, 428, - 429, 527, 528, 277, 277, 449, 529, 450, 428, 429, - 496, 531, 533, 497, 503, 943, 500, 504, 505, 506, - 501, 508, 498, 509, 631, 502, 507, 510, 520, 511, - 527, 528, 512, 513, 522, 523, 529, 524, 514, 515, - 534, 531, 533, 942, 516, 517, 941, 526, 409, 518, - 410, 525, 525, 525, 525, 543, 519, 510, 544, 511, - 535, 535, 512, 513, 411, 411, 411, 411, 514, 515, - 428, 429, 545, 516, 517, 539, 539, 546, 518, 542, - - 542, 542, 542, 569, 449, 543, 450, 570, 544, 571, - 572, 624, 536, 625, 936, 573, 427, 523, 935, 625, - 526, 409, 545, 410, 632, 885, 624, 546, 625, 428, - 429, 626, 523, 569, 524, 722, 723, 570, 724, 571, - 572, 536, 427, 427, 573, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 537, - 537, 537, 537, 537, 537, 537, 537, 537, 537, 537, - 537, 537, 537, 537, 537, 537, 537, 537, 537, 537, - 537, 537, 537, 537, 428, 429, 884, 538, 427, 537, - - 537, 537, 537, 537, 537, 537, 537, 537, 537, 537, - 537, 537, 537, 537, 537, 537, 537, 537, 537, 537, - 537, 537, 537, 427, 427, 427, 540, 540, 540, 540, - 547, 547, 547, 547, 547, 540, 540, 540, 540, 540, - 540, 547, 547, 547, 574, 547, 548, 549, 575, 547, - 550, 576, 553, 558, 551, 883, 552, 577, 578, 579, - 428, 429, 556, 557, 580, 540, 540, 540, 540, 540, - 540, 554, 581, 574, 555, 583, 548, 549, 575, 582, - 550, 576, 553, 558, 551, 552, 586, 577, 578, 579, - 584, 587, 556, 557, 580, 882, 585, 588, 589, 881, - - 554, 591, 581, 555, 1113, 583, 592, 593, 582, 559, - 560, 561, 562, 594, 595, 563, 586, 596, 597, 584, - 564, 587, 598, 599, 565, 585, 588, 566, 589, 567, - 600, 591, 568, 601, 602, 603, 592, 593, 606, 559, - 560, 561, 562, 594, 595, 563, 607, 596, 597, 604, - 564, 608, 598, 599, 565, 605, 566, 609, 567, 610, - 600, 568, 611, 601, 602, 603, 612, 614, 606, 613, - 615, 616, 617, 618, 620, 607, 619, 621, 622, 604, - 608, 623, 428, 429, 274, 605, 644, 609, 627, 610, - 628, 629, 611, 633, 641, 642, 612, 614, 613, 880, - - 615, 616, 617, 618, 620, 619, 621, 622, 631, 522, - 523, 623, 524, 626, 523, 644, 524, 801, 627, 802, - 628, 629, 879, 633, 641, 642, 525, 525, 525, 525, - 525, 525, 525, 525, 427, 427, 878, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 634, 428, 429, 632, 635, - 427, 634, 634, 634, 634, 634, 634, 634, 634, 634, - - 634, 634, 634, 634, 634, 634, 634, 634, 634, 634, - 634, 634, 634, 634, 634, 427, 427, 427, 636, 636, - 643, 547, 547, 877, 639, 639, 547, 547, 547, 547, - 547, 648, 651, 547, 876, 547, 547, 428, 429, 646, - 650, 647, 547, 653, 428, 429, 649, 655, 656, 657, - 643, 658, 428, 429, 637, 637, 637, 637, 428, 429, - 652, 648, 651, 637, 637, 637, 637, 637, 637, 646, - 650, 647, 547, 653, 547, 649, 547, 655, 656, 657, - 801, 658, 802, 547, 669, 547, 547, 661, 547, 652, - 654, 671, 659, 637, 637, 637, 637, 637, 637, 640, - - 640, 640, 640, 660, 547, 662, 666, 663, 640, 640, - 640, 640, 640, 640, 669, 547, 547, 661, 670, 672, - 654, 671, 659, 673, 668, 875, 664, 674, 675, 665, - 676, 677, 678, 660, 662, 667, 666, 663, 640, 640, - 640, 640, 640, 640, 682, 684, 679, 670, 672, 683, - 685, 874, 686, 673, 668, 664, 674, 675, 665, 676, - 687, 677, 678, 680, 688, 667, 690, 691, 695, 681, - 872, 693, 694, 696, 682, 684, 697, 698, 683, 699, - 685, 686, 700, 701, 869, 702, 703, 704, 705, 687, - 706, 707, 709, 680, 688, 690, 708, 691, 695, 681, - - 693, 694, 696, 710, 711, 713, 697, 698, 712, 699, - 714, 700, 716, 701, 702, 703, 715, 704, 705, 717, - 706, 707, 709, 719, 720, 708, 721, 727, 727, 729, - 547, 731, 710, 547, 711, 713, 547, 712, 732, 852, - 714, 757, 716, 547, 547, 715, 841, 547, 734, 717, - 738, 547, 719, 739, 720, 721, 737, 547, 733, 729, - 731, 428, 429, 728, 728, 728, 728, 547, 732, 735, - 757, 748, 728, 728, 728, 728, 728, 728, 734, 736, - 738, 547, 547, 739, 547, 740, 737, 733, 741, 742, - 547, 547, 547, 743, 428, 429, 547, 747, 547, 735, - - 748, 744, 728, 728, 728, 728, 728, 728, 736, 745, - 547, 746, 547, 547, 753, 740, 547, 750, 741, 742, - 547, 749, 758, 743, 547, 751, 752, 747, 759, 754, - 760, 744, 761, 756, 762, 764, 755, 832, 766, 745, - 767, 746, 768, 771, 753, 765, 770, 750, 772, 773, - 775, 749, 758, 776, 751, 777, 752, 759, 779, 754, - 760, 761, 780, 756, 762, 764, 755, 766, 781, 782, - 767, 783, 768, 771, 765, 770, 784, 785, 772, 773, - 775, 786, 776, 787, 789, 777, 788, 779, 791, 792, - 793, 780, 795, 796, 547, 797, 798, 781, 799, 782, - - 783, 803, 804, 722, 723, 784, 724, 785, 807, 547, - 786, 808, 547, 787, 789, 788, 547, 809, 791, 792, - 793, 547, 795, 796, 797, 811, 798, 547, 799, 547, - 547, 803, 804, 428, 429, 427, 810, 547, 547, 547, - 812, 808, 813, 547, 547, 547, 547, 809, 547, 814, - 806, 547, 547, 815, 817, 811, 819, 547, 821, 547, - 818, 816, 822, 805, 820, 824, 810, 547, 826, 812, - 823, 825, 813, 547, 828, 827, 547, 833, 814, 835, - 829, 836, 815, 547, 817, 830, 819, 834, 821, 818, - 816, 837, 822, 820, 831, 824, 838, 839, 826, 823, - - 840, 825, 842, 843, 828, 827, 844, 833, 845, 835, - 829, 836, 846, 847, 849, 830, 848, 834, 850, 723, - 851, 837, 853, 854, 831, 838, 839, 855, 862, 840, - 863, 870, 842, 843, 718, 871, 844, 801, 845, 802, - 873, 794, 846, 847, 849, 848, 856, 857, 850, 851, - 547, 858, 853, 854, 859, 547, 855, 860, 862, 790, - 863, 870, 861, 864, 865, 871, 547, 887, 866, 873, - 547, 867, 547, 547, 868, 888, 856, 857, 547, 886, - 547, 858, 890, 547, 859, 547, 547, 860, 889, 547, - 892, 861, 899, 864, 865, 900, 891, 887, 866, 898, - - 901, 867, 893, 902, 868, 888, 547, 894, 886, 895, - 904, 897, 890, 903, 906, 896, 778, 905, 889, 907, - 892, 908, 899, 909, 900, 891, 910, 911, 912, 898, - 901, 893, 902, 913, 914, 916, 894, 917, 895, 904, - 897, 918, 774, 903, 906, 896, 905, 923, 907, 928, - 915, 908, 909, 924, 925, 919, 910, 911, 912, 920, - 926, 927, 921, 913, 914, 916, 917, 929, 769, 933, - 934, 918, 922, 937, 930, 763, 923, 931, 928, 915, - 939, 547, 940, 924, 925, 919, 969, 932, 965, 920, - 926, 927, 921, 966, 967, 968, 970, 929, 933, 934, - - 971, 922, 937, 972, 930, 964, 973, 931, 974, 975, - 976, 730, 977, 978, 979, 969, 932, 980, 965, 981, - 982, 983, 984, 966, 967, 968, 970, 985, 427, 986, - 971, 987, 988, 972, 964, 989, 973, 974, 990, 975, - 976, 977, 991, 978, 979, 992, 993, 980, 981, 994, - 982, 983, 984, 995, 996, 999, 997, 985, 986, 939, - 987, 940, 988, 1013, 939, 989, 940, 990, 1014, 1015, - 1016, 1017, 991, 998, 1018, 992, 993, 1019, 994, 1020, - 1021, 1022, 995, 996, 999, 1023, 997, 1024, 1025, 725, - 1026, 1027, 1013, 1028, 1029, 1030, 1031, 1032, 1014, 1015, - - 1016, 1017, 998, 1033, 1018, 1034, 1035, 1019, 1020, 1021, - 1036, 1022, 1037, 1038, 1023, 1039, 1044, 1024, 1025, 1026, - 1027, 1040, 1028, 1043, 1029, 1030, 1031, 1032, 1048, 1041, - 1046, 1047, 1033, 1042, 1034, 1035, 1049, 1050, 1051, 1052, - 1036, 1053, 1037, 1038, 1054, 1039, 1044, 1055, 1056, 1057, - 1040, 1058, 1043, 1059, 1060, 1061, 1062, 1048, 1041, 1063, - 1046, 1047, 1042, 1064, 1065, 1049, 1050, 1066, 1051, 1052, - 1053, 1067, 1068, 1054, 1069, 1070, 1071, 1055, 1056, 1057, - 1072, 1058, 1073, 1059, 1060, 1061, 1062, 1074, 1075, 1063, - 1076, 1077, 1064, 1078, 1065, 1079, 1080, 1066, 1081, 1082, - - 1067, 1068, 1083, 1069, 1070, 1084, 1071, 1085, 1086, 1087, - 1072, 1088, 1073, 1089, 1090, 718, 1091, 1074, 1075, 1076, - 1092, 1077, 1093, 1078, 1094, 1079, 1080, 1081, 1095, 1082, - 1096, 1097, 1083, 1098, 1099, 1084, 1100, 1085, 1086, 1087, - 1088, 1101, 1089, 1102, 1090, 1091, 1103, 1104, 1105, 1106, - 1092, 1107, 1093, 1094, 1108, 692, 1109, 1110, 1095, 1111, - 1096, 1097, 1112, 1098, 1099, 1100, 375, 375, 689, 434, - 1101, 434, 541, 1102, 541, 1103, 1104, 1105, 645, 1106, - 427, 1107, 415, 415, 1108, 1109, 1110, 415, 590, 1111, - 344, 343, 1112, 68, 68, 68, 68, 68, 68, 68, + 1046, 71, 72, 89, 73, 90, 95, 74, 75, 76, + 76, 95, 1013, 76, 77, 92, 89, 1012, 90, 56, + 78, 1011, 93, 76, 99, 155, 100, 156, 108, 109, + + 101, 110, 108, 109, 155, 110, 156, 235, 126, 236, + 127, 128, 231, 126, 232, 127, 128, 237, 56, 79, + 80, 233, 300, 231, 301, 232, 96, 347, 97, 278, + 279, 96, 233, 97, 348, 99, 102, 100, 347, 131, + 132, 106, 133, 103, 104, 348, 105, 327, 81, 76, + 76, 82, 83, 308, 84, 72, 253, 73, 85, 129, + 74, 75, 76, 76, 129, 102, 76, 77, 131, 132, + 309, 133, 103, 86, 240, 240, 76, 102, 135, 211, + 136, 1010, 212, 308, 103, 104, 327, 105, 431, 432, + 235, 137, 236, 254, 1009, 213, 213, 213, 213, 309, + + 237, 211, 79, 80, 212, 87, 102, 246, 247, 1008, + 248, 250, 251, 103, 252, 436, 436, 213, 213, 213, + 213, 431, 432, 254, 241, 241, 242, 242, 138, 139, + 140, 81, 76, 76, 111, 112, 113, 111, 114, 111, + 111, 111, 111, 111, 111, 111, 115, 111, 115, 111, + 111, 111, 111, 111, 111, 111, 111, 111, 111, 116, + 111, 117, 117, 117, 117, 117, 117, 117, 117, 117, + 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, + 117, 117, 117, 117, 117, 117, 111, 111, 111, 111, + 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, + + 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, + 117, 117, 117, 117, 117, 111, 111, 111, 120, 135, + 121, 136, 215, 158, 216, 159, 120, 1007, 121, 158, + 122, 159, 137, 160, 123, 123, 123, 123, 122, 160, + 226, 1006, 123, 123, 123, 123, 158, 337, 159, 339, + 158, 340, 159, 227, 272, 272, 238, 273, 336, 283, + 238, 284, 1005, 228, 285, 285, 285, 285, 229, 138, + 139, 140, 217, 161, 218, 162, 337, 316, 317, 161, + 318, 162, 1004, 227, 323, 323, 323, 323, 336, 339, + 1003, 340, 228, 422, 1002, 423, 161, 229, 162, 124, + + 161, 219, 162, 220, 426, 1001, 427, 124, 141, 141, + 142, 141, 143, 144, 141, 141, 141, 145, 141, 141, + 141, 141, 141, 141, 141, 146, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 148, 147, 147, 147, 147, 147, 147, 149, + 150, 141, 151, 141, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 148, 147, 147, 147, 147, 147, 147, 149, 152, + 141, 153, 164, 294, 165, 166, 164, 351, 165, 166, + + 964, 215, 357, 216, 281, 281, 352, 172, 173, 358, + 174, 380, 364, 452, 175, 453, 280, 280, 172, 173, + 385, 174, 366, 176, 371, 175, 365, 351, 963, 167, + 281, 281, 357, 167, 176, 352, 282, 372, 962, 358, + 380, 167, 168, 169, 170, 167, 168, 169, 170, 385, + 177, 217, 366, 218, 371, 384, 365, 178, 179, 167, + 180, 177, 282, 167, 386, 282, 295, 372, 178, 179, + 167, 180, 431, 432, 167, 393, 393, 393, 393, 177, + 219, 339, 220, 340, 961, 384, 178, 339, 960, 340, + 177, 282, 246, 247, 386, 248, 959, 178, 181, 182, + + 183, 181, 184, 185, 181, 181, 181, 181, 181, 181, + 181, 181, 181, 181, 181, 181, 181, 186, 187, 181, + 181, 181, 188, 181, 181, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 195, 195, 198, 199, 200, 201, + 202, 195, 203, 204, 205, 206, 207, 208, 195, 209, + 181, 181, 181, 181, 181, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 195, 195, 198, 199, 200, 201, + 202, 203, 204, 205, 206, 207, 208, 195, 209, 181, + 181, 181, 221, 221, 958, 164, 226, 244, 957, 222, + 222, 360, 245, 267, 268, 387, 269, 361, 388, 227, + + 270, 389, 223, 223, 250, 251, 639, 252, 164, 228, + 244, 956, 224, 224, 229, 245, 955, 225, 225, 281, + 281, 360, 167, 281, 281, 387, 361, 390, 388, 227, + 954, 389, 223, 223, 167, 168, 169, 170, 228, 430, + 362, 224, 224, 229, 476, 167, 225, 225, 363, 369, + 953, 282, 167, 431, 432, 282, 390, 167, 168, 169, + 170, 287, 288, 167, 289, 408, 253, 367, 290, 370, + 362, 378, 381, 476, 271, 167, 727, 291, 363, 369, + 282, 379, 382, 292, 282, 383, 167, 256, 368, 952, + 316, 317, 373, 318, 951, 408, 374, 367, 370, 479, + + 375, 378, 381, 254, 376, 419, 257, 429, 258, 430, + 258, 379, 382, 446, 383, 293, 258, 368, 449, 258, + 259, 260, 373, 258, 261, 262, 374, 950, 479, 263, + 375, 431, 432, 254, 376, 419, 257, 429, 258, 433, + 258, 949, 271, 446, 411, 412, 258, 413, 449, 258, + 259, 260, 258, 261, 262, 948, 411, 412, 263, 413, + 264, 414, 414, 414, 414, 411, 412, 947, 413, 431, + 432, 434, 434, 414, 414, 414, 414, 411, 412, 450, + 413, 467, 414, 414, 414, 414, 481, 415, 323, 323, + 323, 323, 468, 946, 414, 414, 414, 414, 267, 268, + + 470, 269, 484, 435, 471, 270, 416, 287, 288, 450, + 289, 467, 472, 473, 290, 481, 415, 417, 477, 474, + 482, 487, 468, 291, 483, 945, 485, 486, 488, 292, + 470, 484, 435, 475, 471, 478, 416, 489, 632, 491, + 494, 490, 472, 473, 492, 493, 500, 417, 477, 474, + 482, 487, 495, 496, 483, 485, 486, 497, 488, 431, + 432, 293, 475, 422, 478, 423, 944, 489, 491, 494, + 490, 422, 943, 423, 492, 493, 500, 942, 426, 271, + 427, 495, 496, 937, 506, 521, 497, 509, 271, 454, + 455, 456, 457, 458, 458, 459, 458, 458, 458, 458, + + 460, 458, 458, 458, 461, 458, 458, 462, 458, 463, + 458, 458, 464, 458, 506, 521, 509, 465, 633, 454, + 455, 456, 457, 458, 458, 459, 458, 458, 458, 458, + 460, 458, 458, 458, 461, 458, 462, 458, 463, 458, + 458, 464, 458, 498, 504, 501, 530, 505, 507, 502, + 936, 510, 528, 499, 503, 508, 393, 393, 393, 393, + 529, 426, 452, 427, 453, 532, 452, 886, 453, 534, + 535, 885, 544, 498, 504, 501, 530, 505, 507, 502, + 510, 528, 499, 884, 503, 508, 511, 545, 512, 529, + 632, 513, 514, 523, 524, 532, 525, 515, 516, 534, + + 431, 432, 544, 517, 518, 546, 527, 412, 519, 413, + 526, 526, 526, 526, 547, 520, 511, 545, 512, 536, + 536, 513, 514, 414, 414, 414, 414, 515, 516, 540, + 540, 548, 517, 518, 548, 546, 548, 519, 543, 543, + 543, 543, 570, 571, 547, 572, 573, 549, 576, 552, + 625, 537, 626, 554, 524, 430, 626, 527, 412, 625, + 413, 626, 883, 431, 432, 627, 524, 802, 525, 803, + 633, 882, 570, 571, 881, 572, 573, 549, 576, 552, + 537, 430, 430, 554, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 538, 538, + 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, + 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, + 538, 538, 538, 431, 432, 880, 539, 430, 538, 538, + 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, + 538, 538, 538, 538, 538, 538, 538, 538, 538, 538, + 538, 538, 430, 430, 430, 541, 541, 541, 541, 548, + 548, 548, 548, 577, 541, 541, 541, 541, 541, 541, + 578, 548, 548, 548, 574, 550, 879, 575, 551, 579, + 580, 559, 878, 553, 555, 581, 877, 556, 582, 431, + + 432, 557, 558, 577, 541, 541, 541, 541, 541, 541, + 578, 876, 584, 574, 583, 550, 575, 585, 551, 579, + 580, 559, 553, 555, 587, 581, 556, 588, 582, 875, + 586, 557, 558, 1114, 589, 590, 592, 593, 560, 561, + 562, 563, 584, 583, 564, 594, 585, 595, 596, 565, + 597, 598, 599, 566, 587, 873, 567, 588, 568, 586, + 870, 569, 600, 589, 601, 590, 592, 593, 560, 561, + 562, 563, 602, 603, 564, 594, 604, 595, 596, 565, + 597, 598, 599, 566, 607, 567, 608, 568, 609, 605, + 569, 610, 600, 611, 601, 606, 612, 613, 853, 614, + + 615, 616, 602, 603, 617, 618, 604, 619, 842, 620, + 624, 628, 629, 630, 607, 608, 645, 609, 634, 605, + 548, 610, 642, 611, 643, 606, 612, 613, 614, 621, + 615, 616, 622, 623, 617, 618, 833, 619, 620, 808, + 624, 628, 629, 630, 650, 645, 523, 524, 634, 525, + 627, 524, 642, 525, 643, 723, 724, 807, 725, 621, + 806, 622, 623, 526, 526, 526, 526, 526, 526, 526, + 526, 430, 430, 650, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 635, 635, + + 635, 635, 635, 635, 635, 635, 635, 635, 635, 635, + 635, 635, 635, 635, 635, 635, 635, 635, 635, 635, + 635, 635, 635, 431, 432, 724, 636, 430, 635, 635, + 635, 635, 635, 635, 635, 635, 635, 635, 635, 635, + 635, 635, 635, 635, 635, 635, 635, 635, 635, 635, + 635, 635, 430, 430, 430, 637, 637, 644, 548, 548, + 719, 640, 640, 548, 548, 548, 548, 548, 649, 652, + 795, 548, 548, 802, 548, 803, 647, 651, 648, 656, + 654, 548, 791, 655, 658, 779, 653, 644, 659, 431, + 432, 638, 638, 638, 638, 431, 432, 660, 649, 652, + + 638, 638, 638, 638, 638, 638, 647, 651, 648, 656, + 654, 548, 548, 655, 658, 653, 723, 724, 659, 725, + 548, 548, 548, 775, 548, 662, 670, 660, 671, 661, + 638, 638, 638, 638, 638, 638, 641, 641, 641, 641, + 657, 664, 548, 663, 667, 641, 641, 641, 641, 641, + 641, 672, 548, 548, 673, 662, 670, 671, 674, 661, + 669, 770, 675, 676, 665, 677, 684, 666, 678, 679, + 657, 664, 663, 668, 667, 641, 641, 641, 641, 641, + 641, 672, 683, 673, 680, 685, 686, 689, 674, 687, + 669, 675, 676, 665, 677, 684, 666, 688, 678, 679, + + 691, 681, 692, 668, 694, 695, 696, 682, 764, 697, + 698, 699, 683, 700, 702, 685, 686, 689, 687, 701, + 703, 704, 705, 706, 707, 708, 688, 709, 710, 691, + 711, 681, 692, 694, 695, 712, 696, 682, 697, 713, + 698, 699, 714, 700, 702, 715, 717, 718, 701, 703, + 704, 716, 705, 706, 707, 708, 709, 720, 710, 711, + 721, 731, 722, 728, 728, 712, 730, 548, 713, 431, + 432, 277, 714, 548, 732, 715, 717, 718, 430, 548, + 716, 548, 548, 726, 733, 735, 720, 548, 740, 548, + 721, 722, 734, 802, 738, 803, 730, 431, 432, 729, + + 729, 729, 729, 732, 737, 736, 548, 741, 729, 729, + 729, 729, 729, 729, 733, 735, 548, 548, 740, 548, + 548, 734, 748, 742, 738, 548, 739, 743, 744, 548, + 548, 548, 548, 737, 548, 736, 745, 741, 729, 729, + 729, 729, 729, 729, 753, 750, 548, 746, 548, 747, + 548, 751, 748, 742, 749, 548, 739, 743, 744, 752, + 755, 757, 548, 758, 759, 761, 745, 760, 754, 719, + 762, 763, 693, 767, 753, 750, 765, 746, 768, 747, + 769, 751, 756, 749, 771, 777, 766, 772, 752, 773, + 755, 757, 758, 774, 759, 761, 760, 776, 754, 762, + + 778, 763, 767, 780, 781, 782, 765, 783, 768, 784, + 769, 785, 756, 771, 777, 766, 786, 772, 787, 773, + 788, 690, 789, 774, 790, 792, 793, 776, 794, 796, + 778, 797, 780, 781, 782, 798, 799, 783, 784, 800, + 785, 804, 805, 431, 432, 430, 786, 787, 548, 548, + 788, 789, 548, 548, 790, 792, 793, 810, 794, 796, + 548, 797, 548, 548, 798, 809, 799, 548, 811, 800, + 548, 804, 805, 813, 814, 548, 812, 548, 548, 548, + 548, 548, 940, 548, 941, 815, 818, 810, 548, 827, + 548, 816, 820, 548, 817, 809, 548, 819, 811, 823, + + 822, 548, 813, 821, 814, 824, 812, 548, 829, 825, + 826, 828, 548, 836, 815, 834, 818, 548, 832, 827, + 816, 831, 820, 817, 830, 835, 819, 837, 838, 823, + 822, 839, 821, 840, 824, 841, 843, 844, 829, 825, + 826, 828, 845, 836, 846, 834, 847, 848, 832, 849, + 850, 831, 851, 854, 830, 835, 852, 837, 838, 855, + 839, 856, 840, 863, 841, 864, 843, 844, 646, 548, + 871, 872, 845, 430, 846, 874, 847, 848, 849, 548, + 850, 548, 851, 854, 890, 852, 857, 858, 591, 855, + 856, 859, 548, 863, 860, 864, 888, 861, 865, 866, + + 871, 872, 862, 867, 874, 887, 868, 548, 891, 869, + 548, 548, 889, 548, 890, 548, 857, 858, 548, 548, + 548, 859, 893, 548, 860, 900, 888, 861, 865, 866, + 901, 862, 897, 867, 887, 892, 868, 894, 891, 869, + 898, 548, 889, 895, 896, 902, 441, 903, 904, 412, + 905, 906, 893, 907, 899, 900, 908, 909, 911, 901, + 910, 912, 897, 913, 892, 914, 894, 917, 919, 898, + 915, 925, 895, 896, 918, 902, 903, 924, 904, 905, + 906, 926, 927, 907, 899, 908, 916, 909, 911, 910, + 928, 912, 920, 913, 929, 914, 921, 917, 919, 922, + + 915, 925, 930, 918, 931, 966, 924, 932, 404, 923, + 934, 926, 927, 935, 938, 916, 548, 933, 967, 968, + 928, 969, 920, 929, 970, 971, 921, 972, 973, 922, + 974, 976, 930, 975, 931, 966, 977, 932, 923, 934, + 965, 978, 935, 938, 979, 980, 933, 981, 967, 968, + 982, 969, 983, 970, 984, 971, 985, 972, 973, 986, + 974, 976, 975, 987, 988, 989, 977, 990, 992, 965, + 978, 991, 993, 994, 979, 980, 995, 981, 996, 982, + 997, 1000, 983, 940, 984, 941, 985, 998, 940, 986, + 941, 1014, 987, 988, 1015, 989, 1016, 990, 992, 1017, + + 991, 1018, 993, 994, 999, 995, 1019, 996, 1020, 997, + 1000, 1021, 1022, 1023, 392, 1024, 1025, 998, 1026, 1030, + 1014, 1027, 1028, 1029, 1015, 1031, 1016, 1032, 1033, 1017, + 1034, 1018, 1035, 999, 1036, 1037, 1019, 1038, 1020, 1039, + 1021, 1022, 1040, 1023, 1024, 1041, 1025, 1044, 1026, 1030, + 1027, 1028, 1029, 1045, 1047, 1031, 1042, 1032, 1033, 1034, + 1043, 1035, 1048, 1036, 1049, 1037, 1050, 1038, 1051, 1039, + 1052, 1053, 1040, 1054, 1041, 1055, 1044, 1056, 1057, 1058, + 1059, 1060, 1061, 1045, 1047, 1042, 1062, 1063, 1064, 1043, + 1065, 1066, 1048, 1049, 1067, 1050, 1068, 1051, 1069, 1070, + + 1052, 1053, 1054, 1071, 1055, 1072, 1073, 1056, 1057, 1058, + 1059, 1060, 1061, 1074, 1075, 1076, 1062, 1063, 1064, 1065, + 1077, 1066, 1078, 1079, 1067, 1068, 1080, 1069, 1070, 1081, + 480, 1082, 1071, 1083, 1084, 1072, 1073, 1085, 1086, 1087, + 1088, 356, 1089, 1074, 1075, 1076, 1090, 1091, 1093, 1077, + 1092, 1094, 1078, 1079, 1095, 1096, 1080, 1097, 1098, 1081, + 1082, 1099, 1100, 1083, 1084, 1101, 1102, 1085, 1086, 1087, + 1088, 1089, 1103, 353, 1104, 1090, 1105, 1091, 1093, 1092, + 1106, 1094, 1107, 1095, 1108, 1096, 1109, 1097, 1098, 1110, + 1111, 1099, 1100, 1112, 1101, 1102, 1113, 377, 377, 377, + + 350, 466, 1103, 1104, 437, 1105, 437, 319, 542, 1106, + 542, 317, 1107, 319, 1108, 314, 1109, 303, 1110, 1111, + 299, 444, 443, 1112, 442, 288, 1113, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 68, 88, 88, 88, 88, 88, 88, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, - 88, 88, 88, 88, 88, 91, 91, 91, 91, 91, + 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, + 88, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, 91, - 91, 91, 91, 91, 91, 91, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 106, 106, + 91, 91, 91, 94, 94, 94, 94, 94, 94, 94, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 56, + 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 94, 98, 98, 98, 98, 98, + 98, 98, 98, 98, 98, 98, 98, 98, 98, 98, + 98, 98, 98, 98, 98, 98, 98, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 107, + 107, 107, 107, 107, 107, 107, 107, 107, 107, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 118, 118, 118, 118, 118, 118, 118, 118, 118, - 118, 124, 124, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, - 124, 124, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - - 129, 129, 129, 133, 133, 133, 133, 133, 133, 133, - 133, 133, 133, 133, 133, 133, 133, 133, 133, 133, - 133, 133, 133, 133, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 169, 169, 169, - 169, 169, 169, 169, 169, 169, 169, 169, 169, 169, - - 169, 169, 169, 169, 169, 169, 169, 169, 208, 208, - 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 208, 208, 208, 208, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 212, 212, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 228, 228, 228, 228, - 228, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 232, 232, 232, - 232, 232, 237, 237, 237, 237, 237, 237, 237, 237, - - 237, 237, 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 237, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 246, 547, 246, 438, 246, 246, - 455, 455, 455, 246, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 263, 409, 263, 390, 263, 263, - 417, 417, 479, 263, 274, 417, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 277, 354, 277, 277, 277, - + 56, 119, 119, 119, 119, 119, 119, 119, 119, 119, + 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, + + 119, 119, 119, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 125, 125, 125, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 130, 130, 130, + 130, 130, 130, 130, 130, 130, 130, 134, 134, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, + 134, 134, 134, 134, 134, 134, 134, 134, 134, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, + 154, 157, 157, 157, 157, 157, 157, 157, 157, 157, + + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 171, 171, 171, + 171, 171, 171, 171, 171, 171, 171, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, + 210, 210, 210, 210, 210, 210, 210, 210, 210, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, 214, 214, + + 214, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 230, 230, 230, 230, 230, 230, 230, + 230, 230, 230, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 234, 234, 234, 234, 234, + 234, 234, 234, 234, 234, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 239, 239, 239, + 239, 239, 239, 239, 239, 239, 239, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, + 243, 243, 243, 243, 243, 243, 243, 243, 243, 249, + 441, 249, 439, 249, 249, 249, 438, 428, 272, 249, + + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, + 255, 266, 424, 266, 268, 266, 266, 266, 251, 247, + 345, 266, 277, 406, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, - 277, 277, 277, 277, 277, 277, 283, 283, 351, 283, - 348, 283, 283, 467, 466, 463, 283, 295, 315, 295, - 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, - 295, 295, 295, 295, 295, 295, 295, 295, 299, 299, - 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, - 299, 299, 299, 313, 299, 315, 299, 299, 299, 302, - 310, 302, 302, 296, 302, 302, 302, 302, 302, 302, - 302, 302, 302, 302, 441, 302, 440, 302, 302, 302, - 309, 439, 285, 309, 309, 309, 309, 309, 309, 309, - - 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, - 309, 317, 438, 317, 436, 317, 317, 435, 425, 269, - 317, 322, 421, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 322, 322, 322, 322, 322, 322, 322, 322, - 322, 322, 325, 265, 325, 325, 325, 325, 325, 325, - 325, 325, 325, 325, 325, 325, 325, 325, 325, 248, - 325, 325, 325, 326, 244, 326, 341, 326, 403, 326, - 326, 326, 326, 402, 326, 326, 400, 399, 398, 326, - 328, 397, 328, 328, 328, 395, 328, 328, 328, 328, - 328, 328, 328, 328, 328, 328, 328, 328, 328, 328, - - 328, 331, 394, 331, 393, 331, 331, 390, 354, 352, - 331, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 337, 351, 337, 337, 337, 337, 337, 307, - 337, 337, 337, 337, 337, 337, 337, 306, 337, 330, - 337, 337, 337, 340, 348, 340, 347, 340, 340, 340, - 340, 340, 340, 340, 340, 340, 340, 340, 307, 306, - 341, 340, 340, 340, 342, 342, 342, 342, 342, 342, - 342, 342, 342, 342, 342, 342, 342, 342, 342, 342, - 342, 342, 342, 342, 342, 353, 307, 353, 353, 353, - - 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, - 353, 353, 353, 353, 353, 353, 357, 357, 306, 339, - 338, 357, 357, 389, 307, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 392, 306, 330, 392, 392, 392, - 392, 392, 392, 392, 392, 392, 392, 392, 392, 329, - 392, 327, 392, 396, 321, 396, 396, 396, 396, 324, - 396, 396, 396, 396, 396, 396, 396, 396, 396, 396, - 396, 396, 396, 396, 401, 401, 401, 401, 401, 401, - 401, 401, 401, 401, 401, 401, 401, 401, 401, 321, - - 401, 320, 401, 401, 401, 404, 318, 404, 404, 404, - 316, 404, 404, 404, 404, 404, 404, 404, 404, 404, - 313, 315, 311, 404, 404, 404, 246, 310, 246, 308, - 246, 246, 307, 306, 303, 246, 406, 301, 406, 406, - 406, 406, 406, 406, 406, 406, 406, 406, 406, 406, - 406, 406, 406, 406, 406, 406, 406, 407, 300, 407, - 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, - 407, 407, 407, 407, 407, 407, 407, 407, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 263, - - 296, 263, 294, 263, 263, 293, 285, 273, 263, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 427, 272, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 271, 427, 427, - 427, 274, 265, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 274, 274, 274, 274, 274, 274, 274, 274, - 274, 274, 437, 262, 437, 248, 437, 437, 244, 1113, - 117, 437, 117, 437, 442, 1113, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - - 442, 442, 442, 442, 442, 295, 1113, 295, 295, 295, - 295, 295, 295, 295, 295, 295, 295, 295, 295, 295, - 295, 295, 295, 295, 295, 295, 444, 1113, 444, 444, - 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, - 444, 444, 444, 444, 444, 444, 444, 445, 1113, 445, - 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, - 445, 445, 445, 445, 445, 445, 445, 445, 299, 299, - 299, 299, 299, 299, 299, 299, 299, 299, 299, 299, - 299, 299, 299, 1113, 299, 1113, 299, 299, 299, 302, - 1113, 302, 302, 1113, 302, 302, 302, 302, 302, 302, + 277, 277, 277, 277, 280, 405, 280, 280, 280, 280, + 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, + 280, 280, 280, 280, 280, 280, 286, 286, 404, 286, + 402, 286, 286, 286, 401, 400, 399, 286, 298, 397, + 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, + + 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 396, 302, 395, 302, + 302, 302, 306, 392, 306, 306, 356, 306, 306, 306, + 306, 306, 306, 306, 306, 306, 306, 306, 354, 306, + 353, 306, 306, 306, 313, 311, 310, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 321, 334, 321, 350, + 321, 321, 321, 349, 311, 310, 321, 326, 345, 326, + 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, + + 326, 326, 326, 326, 326, 326, 326, 326, 326, 329, + 311, 329, 329, 329, 329, 329, 329, 329, 329, 329, + 329, 329, 329, 329, 329, 329, 329, 310, 329, 329, + 329, 330, 343, 330, 342, 330, 311, 330, 330, 330, + 330, 310, 330, 330, 334, 333, 331, 325, 330, 332, + 328, 332, 332, 332, 325, 332, 332, 332, 332, 332, + 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 332, 335, 324, 335, 322, 335, 335, 335, 320, 317, + 319, 335, 338, 338, 338, 338, 338, 338, 338, 338, + 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, + + 338, 338, 338, 338, 341, 315, 341, 341, 341, 341, + 341, 314, 341, 341, 341, 341, 341, 341, 341, 341, + 312, 341, 311, 341, 341, 341, 344, 310, 344, 307, + 344, 344, 344, 344, 344, 344, 344, 344, 344, 344, + 344, 305, 304, 303, 299, 344, 344, 344, 346, 297, + 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + 346, 346, 346, 346, 346, 346, 346, 346, 346, 346, + 355, 296, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 355, 359, 359, 288, 276, 275, 359, 359, 359, + + 391, 274, 391, 391, 391, 391, 391, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 391, 391, 394, 268, 265, 394, 394, 394, 394, 394, + 394, 394, 394, 394, 394, 394, 394, 394, 251, 394, + 247, 394, 398, 1114, 398, 398, 398, 398, 118, 398, + 398, 398, 398, 398, 398, 398, 398, 398, 398, 398, + 398, 398, 398, 398, 403, 403, 403, 403, 403, 403, + 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, + 118, 403, 1114, 403, 403, 403, 407, 1114, 407, 407, + 407, 1114, 407, 407, 407, 407, 407, 407, 407, 407, + + 407, 1114, 1114, 1114, 1114, 407, 407, 407, 249, 1114, + 249, 1114, 249, 249, 249, 1114, 1114, 1114, 249, 409, + 1114, 409, 409, 409, 409, 409, 409, 409, 409, 409, + 409, 409, 409, 409, 409, 409, 409, 409, 409, 409, + 409, 410, 1114, 410, 410, 410, 410, 410, 410, 410, + 410, 410, 410, 410, 410, 410, 410, 410, 410, 410, + 410, 410, 410, 418, 418, 418, 1114, 1114, 1114, 418, + 420, 420, 420, 1114, 1114, 1114, 420, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 266, + + 1114, 266, 1114, 266, 266, 266, 1114, 1114, 1114, 266, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 430, 1114, 430, 430, 430, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + 1114, 430, 430, 430, 277, 1114, 277, 277, 277, 277, + 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, + 277, 277, 277, 277, 277, 277, 440, 1114, 440, 1114, + 440, 440, 440, 1114, 1114, 1114, 440, 1114, 440, 445, + 1114, 445, 445, 445, 445, 445, 445, 445, 445, 445, - 302, 302, 302, 302, 1113, 302, 1113, 302, 302, 302, - 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, + 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, + 445, 298, 1114, 298, 298, 298, 298, 298, 298, 298, + 298, 298, 298, 298, 298, 298, 298, 298, 298, 298, + 298, 298, 298, 447, 1114, 447, 447, 447, 447, 447, + 447, 447, 447, 447, 447, 447, 447, 447, 447, 447, + 447, 447, 447, 447, 447, 448, 1114, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, - 448, 309, 1113, 1113, 309, 309, 309, 309, 309, 309, - 309, 309, 309, 309, 309, 309, 309, 309, 309, 309, - 309, 309, 317, 1113, 317, 1113, 317, 317, 1113, 1113, - 1113, 317, 326, 1113, 326, 1113, 326, 1113, 326, 326, - 326, 326, 1113, 326, 326, 1113, 1113, 1113, 326, 328, - 1113, 328, 328, 328, 328, 328, 328, 328, 328, 328, - 328, 328, 328, 328, 328, 328, 328, 328, 328, 328, - - 331, 1113, 331, 1113, 331, 331, 1113, 1113, 1113, 331, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 334, 334, 334, 334, 334, 334, 334, 334, 334, - 334, 337, 1113, 337, 337, 337, 337, 337, 1113, 337, - 337, 337, 337, 337, 337, 337, 1113, 337, 1113, 337, - 337, 337, 340, 1113, 340, 1113, 340, 340, 340, 340, - 340, 340, 340, 340, 340, 340, 340, 1113, 1113, 1113, - 340, 340, 340, 468, 1113, 468, 468, 468, 468, 468, - 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, - 468, 468, 468, 468, 353, 1113, 353, 353, 353, 353, - - 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, - 353, 353, 353, 353, 353, 357, 357, 1113, 1113, 1113, - 357, 357, 389, 1113, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 389, 389, 389, 389, 389, 389, 389, - 389, 389, 389, 392, 1113, 1113, 392, 392, 392, 392, - 392, 392, 392, 392, 392, 392, 392, 392, 1113, 392, - 1113, 392, 396, 1113, 396, 396, 396, 396, 1113, 396, - 396, 396, 396, 396, 396, 396, 396, 396, 396, 396, - 396, 396, 396, 401, 401, 401, 401, 401, 401, 401, - 401, 401, 401, 401, 401, 401, 401, 401, 1113, 401, - - 1113, 401, 401, 401, 404, 1113, 404, 404, 404, 1113, - 404, 404, 404, 404, 404, 404, 404, 404, 404, 1113, - 1113, 1113, 404, 404, 404, 406, 1113, 406, 406, 406, - 406, 406, 406, 406, 406, 406, 406, 406, 406, 406, - 406, 406, 406, 406, 406, 406, 407, 1113, 407, 407, - 407, 407, 407, 407, 407, 407, 407, 407, 407, 407, - 407, 407, 407, 407, 407, 407, 407, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 521, 521, - 521, 521, 521, 521, 521, 521, 521, 521, 530, 1113, - 530, 1113, 530, 530, 1113, 1113, 1113, 530, 532, 1113, - - 532, 1113, 532, 532, 1113, 1113, 1113, 532, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 418, - 418, 418, 418, 418, 418, 418, 418, 418, 418, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 422, 422, 422, 422, 422, 422, 422, 422, 422, 422, - 427, 1113, 427, 427, 427, 427, 427, 427, 427, 427, - 427, 427, 427, 427, 427, 427, 427, 1113, 427, 427, - 427, 437, 1113, 437, 1113, 437, 437, 1113, 1113, 1113, - 437, 1113, 437, 442, 1113, 442, 442, 442, 442, 442, - 442, 442, 442, 442, 442, 442, 442, 442, 442, 442, - - 442, 442, 442, 442, 444, 1113, 444, 444, 444, 444, - 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, - 444, 444, 444, 444, 444, 445, 1113, 445, 445, 445, + 448, 448, 448, 448, 448, 448, 448, 302, 302, 302, + 302, 302, 302, 302, 302, 302, 302, 302, 302, 302, + 302, 302, 302, 1114, 302, 1114, 302, 302, 302, 306, + + 1114, 306, 306, 1114, 306, 306, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 1114, 306, 1114, 306, 306, + 306, 451, 451, 451, 451, 451, 451, 451, 451, 451, + 451, 451, 451, 451, 451, 451, 451, 451, 451, 451, + 451, 451, 451, 313, 1114, 1114, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 313, 313, 313, 313, 313, + 313, 313, 313, 313, 313, 321, 1114, 321, 1114, 321, + 321, 321, 1114, 1114, 1114, 321, 330, 1114, 330, 1114, + 330, 1114, 330, 330, 330, 330, 1114, 330, 330, 1114, + 1114, 1114, 1114, 330, 332, 1114, 332, 332, 332, 332, + + 332, 332, 332, 332, 332, 332, 332, 332, 332, 332, + 332, 332, 332, 332, 332, 332, 335, 1114, 335, 1114, + 335, 335, 335, 1114, 1114, 1114, 335, 338, 338, 338, + 338, 338, 338, 338, 338, 338, 338, 338, 338, 338, + 338, 338, 338, 338, 338, 338, 338, 338, 338, 341, + 1114, 341, 341, 341, 341, 341, 1114, 341, 341, 341, + 341, 341, 341, 341, 341, 1114, 341, 1114, 341, 341, + 341, 344, 1114, 344, 1114, 344, 344, 344, 344, 344, + 344, 344, 344, 344, 344, 344, 1114, 1114, 1114, 1114, + 344, 344, 344, 469, 1114, 469, 469, 469, 469, 469, + + 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, + 469, 469, 469, 469, 469, 355, 1114, 355, 355, 355, + 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 355, 355, 355, 355, 355, 355, 359, 359, 1114, + 1114, 1114, 359, 359, 359, 391, 1114, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 391, 391, 391, + 391, 391, 391, 391, 391, 391, 391, 394, 1114, 1114, + 394, 394, 394, 394, 394, 394, 394, 394, 394, 394, + 394, 394, 394, 1114, 394, 1114, 394, 398, 1114, 398, + 398, 398, 398, 1114, 398, 398, 398, 398, 398, 398, + + 398, 398, 398, 398, 398, 398, 398, 398, 398, 403, + 403, 403, 403, 403, 403, 403, 403, 403, 403, 403, + 403, 403, 403, 403, 403, 1114, 403, 1114, 403, 403, + 403, 407, 1114, 407, 407, 407, 1114, 407, 407, 407, + 407, 407, 407, 407, 407, 407, 1114, 1114, 1114, 1114, + 407, 407, 407, 409, 1114, 409, 409, 409, 409, 409, + 409, 409, 409, 409, 409, 409, 409, 409, 409, 409, + 409, 409, 409, 409, 409, 410, 1114, 410, 410, 410, + 410, 410, 410, 410, 410, 410, 410, 410, 410, 410, + 410, 410, 410, 410, 410, 410, 410, 522, 522, 522, + + 522, 522, 522, 522, 522, 522, 522, 522, 522, 522, + 522, 522, 522, 522, 522, 522, 522, 522, 522, 531, + 1114, 531, 1114, 531, 531, 531, 1114, 1114, 1114, 531, + 533, 1114, 533, 1114, 533, 533, 533, 1114, 1114, 1114, + 533, 421, 421, 421, 421, 421, 421, 421, 421, 421, + 421, 421, 421, 421, 421, 421, 421, 421, 421, 421, + 421, 421, 421, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 425, 425, 425, 425, 425, + 425, 425, 425, 425, 425, 430, 1114, 430, 430, 430, + 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, + + 430, 430, 430, 1114, 430, 430, 430, 440, 1114, 440, + 1114, 440, 440, 440, 1114, 1114, 1114, 440, 1114, 440, + 445, 1114, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, 445, - 445, 445, 445, 445, 445, 445, 302, 1113, 302, 302, - 1113, 302, 302, 302, 302, 302, 302, 302, 302, 302, - 302, 1113, 302, 1113, 302, 302, 302, 448, 448, 448, + 445, 445, 447, 1114, 447, 447, 447, 447, 447, 447, + 447, 447, 447, 447, 447, 447, 447, 447, 447, 447, + 447, 447, 447, 447, 448, 1114, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, 448, - 448, 448, 448, 448, 448, 448, 448, 448, 331, 1113, - 331, 1113, 331, 331, 1113, 1113, 1113, 331, 342, 1113, - - 342, 342, 342, 342, 342, 342, 342, 342, 342, 342, - 342, 342, 342, 342, 342, 342, 342, 342, 342, 468, - 1113, 468, 468, 468, 468, 468, 468, 468, 468, 468, - 468, 468, 468, 468, 468, 468, 468, 468, 468, 468, - 357, 357, 1113, 1113, 1113, 357, 357, 630, 1113, 630, - 630, 630, 630, 630, 630, 630, 630, 630, 630, 630, - 630, 630, 630, 630, 630, 630, 630, 630, 800, 800, - 800, 800, 800, 800, 800, 800, 800, 800, 800, 800, - 800, 800, 800, 800, 800, 800, 800, 800, 800, 938, - 938, 938, 938, 938, 938, 938, 938, 938, 938, 938, - - 938, 938, 938, 938, 938, 938, 938, 938, 938, 938, - 55, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113 + 448, 448, 448, 448, 448, 448, 306, 1114, 306, 306, + 1114, 306, 306, 306, 306, 306, 306, 306, 306, 306, + + 306, 306, 1114, 306, 1114, 306, 306, 306, 451, 451, + 451, 451, 451, 451, 451, 451, 451, 451, 451, 451, + 451, 451, 451, 451, 451, 451, 451, 451, 451, 451, + 458, 458, 458, 458, 335, 1114, 335, 1114, 335, 335, + 335, 1114, 1114, 1114, 335, 469, 1114, 469, 469, 469, + 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, + 469, 469, 469, 469, 469, 469, 469, 359, 359, 1114, + 1114, 1114, 359, 359, 359, 631, 1114, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 801, 801, 801, + + 801, 801, 801, 801, 801, 801, 801, 801, 801, 801, + 801, 801, 801, 801, 801, 801, 801, 801, 801, 939, + 939, 939, 939, 939, 939, 939, 939, 939, 939, 939, + 939, 939, 939, 939, 939, 939, 939, 939, 939, 939, + 939, 55, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114 } ; -static const flex_int16_t yy_chk[4596] = +static const flex_int16_t yy_chk[4727] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1339,25 +1346,25 @@ static const flex_int16_t yy_chk[4596] = 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, - 102, 3, 3, 5, 3, 5, 1012, 3, 3, 3, - 3, 79, 79, 3, 3, 6, 6, 7, 6, 7, - 3, 21, 6, 3, 8, 132, 8, 11, 11, 102, - - 11, 12, 12, 964, 12, 19, 85, 19, 19, 27, - 28, 27, 28, 17, 20, 17, 20, 20, 148, 3, - 3, 51, 9, 51, 9, 17, 537, 22, 9, 17, - 17, 17, 17, 10, 132, 10, 29, 963, 29, 10, - 176, 21, 21, 47, 21, 47, 29, 148, 3, 3, - 3, 4, 4, 47, 4, 4, 19, 4, 4, 537, - 4, 4, 4, 4, 9, 20, 4, 4, 23, 176, - 23, 9, 9, 4, 9, 10, 4, 22, 22, 85, - 22, 23, 10, 10, 962, 10, 29, 199, 29, 45, - 52, 45, 52, 9, 17, 93, 37, 93, 45, 37, - - 9, 961, 4, 4, 10, 4, 38, 960, 46, 38, - 46, 10, 37, 37, 37, 37, 199, 46, 23, 23, - 23, 959, 38, 38, 38, 38, 57, 57, 153, 57, - 153, 4, 4, 4, 13, 13, 13, 13, 13, 13, + 1013, 3, 3, 5, 3, 5, 7, 3, 3, 3, + 3, 8, 965, 3, 3, 6, 6, 964, 6, 21, + 3, 963, 6, 3, 9, 27, 9, 27, 11, 11, + + 9, 11, 12, 12, 28, 12, 28, 47, 19, 47, + 19, 19, 45, 20, 45, 20, 20, 47, 22, 3, + 3, 45, 93, 46, 93, 46, 7, 172, 7, 79, + 79, 8, 46, 8, 172, 10, 9, 10, 347, 21, + 21, 10, 21, 9, 9, 347, 9, 133, 3, 3, + 3, 4, 4, 102, 4, 4, 64, 4, 4, 19, + 4, 4, 4, 4, 20, 9, 4, 4, 22, 22, + 103, 22, 9, 4, 51, 52, 4, 10, 23, 37, + 23, 962, 37, 102, 10, 10, 133, 10, 277, 277, + 48, 23, 48, 64, 961, 37, 37, 37, 37, 103, + + 48, 38, 4, 4, 38, 4, 10, 57, 57, 960, + 57, 61, 61, 10, 61, 281, 281, 38, 38, 38, + 38, 430, 430, 64, 51, 52, 51, 52, 23, 23, + 23, 4, 4, 4, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, @@ -1366,16 +1373,17 @@ static const flex_int16_t yy_chk[4596] = 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 18, 24, - 18, 24, 155, 30, 155, 30, 31, 202, 31, 31, - 18, 64, 24, 30, 18, 18, 18, 18, 32, 43, - 32, 32, 53, 48, 53, 48, 167, 61, 61, 53, - 61, 101, 43, 48, 73, 73, 202, 73, 81, 261, - 81, 261, 43, 81, 81, 81, 81, 43, 64, 24, - 24, 24, 170, 30, 958, 30, 31, 31, 31, 170, - 957, 101, 43, 111, 111, 268, 111, 268, 32, 32, - 32, 43, 53, 53, 53, 956, 43, 167, 64, 18, - + 13, 13, 13, 13, 13, 13, 13, 13, 17, 24, + 17, 24, 39, 29, 39, 29, 18, 959, 18, 30, + 17, 30, 24, 29, 17, 17, 17, 17, 18, 30, + 43, 958, 18, 18, 18, 18, 49, 149, 49, 154, + 50, 154, 50, 43, 73, 73, 49, 73, 148, 81, + 50, 81, 957, 43, 81, 81, 81, 81, 43, 24, + 24, 24, 39, 29, 39, 29, 149, 112, 112, 30, + 112, 30, 956, 43, 123, 123, 123, 123, 148, 156, + 955, 156, 43, 264, 954, 264, 49, 43, 49, 17, + + 50, 39, 50, 39, 271, 953, 271, 18, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, @@ -1384,449 +1392,462 @@ static const flex_int16_t yy_chk[4596] = 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 33, 33, 39, 33, 39, 34, - 34, 33, 34, 147, 41, 42, 34, 49, 44, 49, - - 33, 41, 42, 175, 308, 34, 308, 49, 274, 274, - 50, 44, 50, 184, 41, 42, 122, 122, 122, 122, - 50, 44, 185, 147, 41, 42, 44, 33, 207, 41, - 42, 955, 34, 175, 33, 33, 39, 33, 39, 34, - 34, 44, 34, 184, 41, 42, 334, 49, 334, 49, - 44, 954, 185, 41, 42, 44, 33, 207, 41, 42, - 50, 34, 50, 33, 336, 39, 336, 39, 34, 35, + 25, 25, 31, 85, 31, 31, 32, 177, 32, 32, + + 898, 40, 186, 40, 80, 80, 178, 33, 33, 187, + 33, 201, 191, 312, 33, 312, 436, 436, 34, 34, + 204, 34, 192, 33, 196, 34, 191, 177, 897, 31, + 129, 129, 186, 32, 34, 178, 80, 197, 896, 187, + 201, 31, 31, 31, 31, 32, 32, 32, 32, 204, + 33, 40, 192, 40, 196, 203, 191, 33, 33, 31, + 33, 34, 129, 32, 205, 80, 85, 197, 34, 34, + 31, 34, 640, 640, 32, 213, 213, 213, 213, 33, + 40, 338, 40, 338, 895, 203, 33, 340, 894, 340, + 34, 129, 246, 246, 205, 246, 893, 34, 35, 35, + 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, - 35, 35, 35, 40, 634, 40, 54, 189, 54, 69, - 69, 188, 69, 54, 80, 80, 69, 82, 82, 188, - 82, 189, 128, 128, 82, 278, 278, 131, 131, 953, - 138, 138, 359, 82, 187, 190, 194, 634, 195, 82, - 187, 188, 191, 201, 196, 345, 80, 192, 196, 188, - - 952, 189, 345, 40, 128, 40, 54, 54, 54, 131, - 897, 359, 138, 191, 187, 190, 194, 192, 195, 187, - 198, 82, 191, 201, 196, 80, 896, 192, 196, 203, - 198, 204, 40, 128, 40, 65, 243, 243, 131, 243, - 69, 138, 191, 250, 205, 197, 192, 361, 82, 197, - 198, 206, 251, 200, 65, 259, 65, 273, 65, 203, - 198, 204, 895, 200, 65, 894, 200, 65, 65, 65, - 893, 65, 65, 65, 205, 197, 361, 65, 892, 197, - 250, 206, 251, 200, 65, 259, 65, 273, 65, 211, - 211, 211, 211, 200, 65, 200, 891, 65, 65, 65, - - 65, 65, 65, 890, 247, 247, 65, 247, 65, 889, - 250, 254, 254, 888, 254, 255, 255, 887, 255, 256, - 256, 363, 256, 257, 257, 275, 257, 293, 254, 254, - 254, 254, 255, 255, 255, 255, 256, 256, 256, 256, - 257, 257, 257, 257, 264, 264, 304, 264, 276, 276, - 363, 264, 305, 886, 254, 275, 275, 293, 312, 312, - 256, 312, 332, 257, 885, 284, 284, 884, 284, 333, - 349, 350, 284, 355, 356, 358, 304, 883, 365, 366, - 276, 284, 305, 254, 367, 360, 368, 284, 371, 358, - 256, 369, 332, 257, 319, 319, 319, 319, 372, 333, - - 349, 350, 360, 355, 356, 358, 364, 365, 366, 276, - 364, 373, 381, 367, 374, 360, 368, 371, 358, 284, - 418, 369, 418, 882, 420, 264, 420, 422, 372, 422, - 881, 360, 391, 391, 391, 391, 364, 424, 880, 424, - 364, 373, 381, 374, 376, 378, 284, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 370, 376, 378, 321, 370, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - 321, 321, 321, 321, 321, 321, 321, 321, 321, 321, - - 321, 379, 370, 380, 383, 370, 382, 383, 384, 385, - 382, 879, 386, 380, 387, 382, 385, 878, 405, 427, - 427, 412, 413, 433, 433, 448, 414, 448, 639, 639, - 379, 416, 426, 380, 383, 877, 382, 383, 384, 385, - 382, 386, 380, 387, 531, 382, 385, 388, 405, 388, - 412, 413, 388, 388, 408, 408, 414, 408, 388, 388, - 428, 416, 426, 876, 388, 388, 875, 411, 411, 388, - 411, 408, 408, 408, 408, 441, 388, 388, 443, 388, - 429, 429, 388, 388, 411, 411, 411, 411, 388, 388, - 428, 428, 446, 388, 388, 431, 431, 447, 388, 438, - - 438, 438, 438, 464, 450, 441, 450, 465, 443, 469, - 470, 521, 429, 521, 871, 471, 429, 524, 870, 524, - 526, 526, 446, 526, 531, 818, 625, 447, 625, 431, - 431, 626, 626, 464, 626, 632, 632, 465, 632, 469, - 470, 429, 430, 430, 471, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 817, 430, 430, 430, - - 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 430, 430, 430, 430, - 430, 430, 430, 430, 430, 430, 432, 432, 432, 432, - 451, 452, 453, 457, 456, 432, 432, 432, 432, 432, - 432, 454, 459, 460, 472, 461, 451, 452, 473, 458, - 453, 474, 457, 461, 454, 816, 456, 475, 476, 477, - 432, 432, 459, 460, 478, 432, 432, 432, 432, 432, - 432, 458, 480, 472, 458, 482, 451, 452, 473, 481, - 453, 474, 457, 461, 454, 456, 486, 475, 476, 477, - 484, 487, 459, 460, 478, 815, 485, 488, 489, 814, - - 458, 491, 480, 458, 462, 482, 492, 493, 481, 462, - 462, 462, 462, 494, 495, 462, 486, 496, 497, 484, - 462, 487, 498, 499, 462, 485, 488, 462, 489, 462, - 500, 491, 462, 501, 502, 503, 492, 493, 505, 462, - 462, 462, 462, 494, 495, 462, 506, 496, 497, 504, - 462, 507, 498, 499, 462, 504, 462, 508, 462, 509, - 500, 462, 510, 501, 502, 503, 511, 513, 505, 512, - 514, 515, 516, 517, 519, 506, 518, 519, 519, 504, - 507, 520, 638, 638, 638, 504, 546, 508, 527, 509, - 528, 529, 510, 533, 543, 544, 511, 513, 512, 813, - - 514, 515, 516, 517, 519, 518, 519, 519, 631, 522, - 522, 520, 522, 525, 525, 546, 525, 719, 527, 719, - 528, 529, 812, 533, 543, 544, 522, 522, 522, 522, - 525, 525, 525, 525, 534, 534, 811, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 631, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - - 534, 534, 534, 534, 534, 534, 534, 534, 534, 534, - 534, 534, 534, 534, 534, 534, 534, 534, 535, 535, - 545, 548, 550, 810, 539, 539, 549, 552, 557, 551, - 554, 549, 552, 553, 809, 559, 558, 640, 640, 548, - 551, 548, 556, 554, 727, 727, 550, 556, 557, 558, - 545, 559, 535, 535, 536, 536, 536, 536, 539, 539, - 553, 549, 552, 536, 536, 536, 536, 536, 536, 548, - 551, 548, 555, 554, 562, 550, 560, 556, 557, 558, - 800, 559, 800, 563, 569, 561, 566, 562, 564, 553, - 555, 571, 560, 536, 536, 536, 536, 536, 536, 540, - - 540, 540, 540, 561, 565, 563, 566, 564, 540, 540, - 540, 540, 540, 540, 569, 567, 568, 562, 570, 572, - 555, 571, 560, 575, 568, 808, 565, 576, 577, 565, - 578, 579, 580, 561, 563, 567, 566, 564, 540, 540, - 540, 540, 540, 540, 582, 584, 581, 570, 572, 583, - 587, 806, 588, 575, 568, 565, 576, 577, 565, 578, - 589, 579, 580, 581, 590, 567, 594, 595, 599, 581, - 799, 597, 598, 601, 582, 584, 602, 603, 583, 604, - 587, 588, 605, 606, 796, 607, 608, 609, 611, 589, - 612, 613, 615, 581, 590, 594, 614, 595, 599, 581, - - 597, 598, 601, 616, 617, 619, 602, 603, 618, 604, - 620, 605, 621, 606, 607, 608, 620, 609, 611, 622, - 612, 613, 615, 627, 628, 614, 629, 636, 636, 641, - 651, 643, 616, 646, 617, 619, 647, 618, 644, 784, - 620, 669, 621, 650, 652, 620, 770, 660, 647, 622, - 651, 648, 627, 652, 628, 629, 650, 649, 646, 641, - 643, 636, 636, 637, 637, 637, 637, 653, 644, 648, - 669, 660, 637, 637, 637, 637, 637, 637, 647, 649, - 651, 654, 655, 652, 656, 653, 650, 646, 654, 655, - 657, 658, 659, 656, 728, 728, 665, 659, 663, 648, - - 660, 657, 637, 637, 637, 637, 637, 637, 649, 658, - 661, 658, 662, 664, 665, 653, 667, 662, 654, 655, - 668, 661, 670, 656, 666, 663, 664, 659, 671, 666, - 672, 657, 674, 668, 676, 679, 667, 761, 680, 658, - 681, 658, 683, 687, 665, 679, 685, 662, 688, 689, - 691, 661, 670, 692, 663, 693, 664, 671, 695, 666, - 672, 674, 696, 668, 676, 679, 667, 680, 697, 699, - 681, 700, 683, 687, 679, 685, 701, 702, 688, 689, - 691, 704, 692, 705, 707, 693, 706, 695, 709, 710, - 711, 696, 713, 714, 733, 715, 716, 697, 717, 699, - - 700, 720, 721, 722, 722, 701, 722, 702, 730, 736, - 704, 733, 734, 705, 707, 706, 737, 734, 709, 710, - 711, 735, 713, 714, 715, 736, 716, 739, 717, 740, - 738, 720, 721, 726, 726, 726, 735, 741, 743, 745, - 737, 733, 738, 744, 747, 742, 746, 734, 748, 739, - 729, 750, 749, 740, 742, 736, 744, 752, 746, 751, - 743, 741, 747, 725, 745, 749, 735, 753, 751, 737, - 748, 750, 738, 754, 753, 752, 755, 763, 739, 764, - 754, 765, 740, 756, 742, 755, 744, 763, 746, 743, - 741, 766, 747, 745, 756, 749, 767, 768, 751, 748, - - 769, 750, 771, 772, 753, 752, 773, 763, 774, 764, - 754, 765, 775, 776, 778, 755, 777, 763, 780, 724, - 782, 766, 786, 787, 756, 767, 768, 788, 791, 769, - 793, 797, 771, 772, 718, 798, 773, 802, 774, 802, - 804, 712, 775, 776, 778, 777, 790, 790, 780, 782, - 820, 790, 786, 787, 790, 819, 788, 790, 791, 708, - 793, 797, 790, 794, 794, 798, 823, 820, 794, 804, - 821, 794, 824, 822, 794, 821, 790, 790, 825, 819, - 826, 790, 823, 827, 790, 828, 831, 790, 822, 830, - 825, 790, 832, 794, 794, 833, 824, 820, 794, 831, - - 834, 794, 826, 835, 794, 821, 829, 827, 819, 828, - 838, 830, 823, 836, 841, 829, 694, 840, 822, 842, - 825, 843, 832, 844, 833, 824, 845, 847, 849, 831, - 834, 826, 835, 850, 852, 856, 827, 857, 828, 838, - 830, 858, 690, 836, 841, 829, 840, 860, 842, 865, - 852, 843, 844, 861, 862, 859, 845, 847, 849, 859, - 863, 864, 859, 850, 852, 856, 857, 866, 684, 868, - 869, 858, 859, 872, 867, 678, 860, 867, 865, 852, - 873, 898, 873, 861, 862, 859, 903, 867, 899, 859, - 863, 864, 859, 900, 901, 902, 905, 866, 868, 869, - - 906, 859, 872, 907, 867, 898, 908, 867, 910, 911, - 912, 642, 913, 914, 915, 903, 867, 916, 899, 917, - 919, 920, 921, 900, 901, 902, 905, 922, 635, 923, - 906, 924, 926, 907, 898, 927, 908, 910, 928, 911, - 912, 913, 930, 914, 915, 931, 932, 916, 917, 933, - 919, 920, 921, 934, 935, 937, 936, 922, 923, 938, - 924, 938, 926, 965, 940, 927, 940, 928, 966, 967, - 968, 969, 930, 936, 970, 931, 932, 971, 933, 972, - 973, 974, 934, 935, 937, 975, 936, 976, 978, 633, - 979, 980, 965, 981, 982, 983, 984, 985, 966, 967, - - 968, 969, 936, 987, 970, 989, 990, 971, 972, 973, - 991, 974, 992, 993, 975, 995, 999, 976, 978, 979, - 980, 996, 981, 998, 982, 983, 984, 985, 1015, 997, - 1013, 1014, 987, 997, 989, 990, 1016, 1017, 1019, 1020, - 991, 1022, 992, 993, 1023, 995, 999, 1024, 1025, 1026, - 996, 1027, 998, 1028, 1030, 1034, 1035, 1015, 997, 1036, - 1013, 1014, 997, 1039, 1040, 1016, 1017, 1041, 1019, 1020, - 1022, 1042, 1043, 1023, 1044, 1046, 1047, 1024, 1025, 1026, - 1048, 1027, 1049, 1028, 1030, 1034, 1035, 1050, 1053, 1036, - 1055, 1057, 1039, 1060, 1040, 1063, 1064, 1041, 1065, 1066, - - 1042, 1043, 1067, 1044, 1046, 1068, 1047, 1069, 1070, 1072, - 1048, 1073, 1049, 1074, 1075, 623, 1077, 1050, 1053, 1055, - 1081, 1057, 1082, 1060, 1083, 1063, 1064, 1065, 1084, 1066, - 1086, 1087, 1067, 1088, 1089, 1068, 1090, 1069, 1070, 1072, - 1073, 1093, 1074, 1095, 1075, 1077, 1096, 1097, 1098, 1100, - 1081, 1103, 1082, 1083, 1105, 596, 1106, 1107, 1084, 1109, - 1086, 1087, 1110, 1088, 1089, 1090, 1157, 1157, 593, 1173, - 1093, 1173, 1206, 1095, 1206, 1096, 1097, 1098, 547, 1100, - 538, 1103, 1166, 1166, 1105, 1106, 1107, 1166, 490, 1109, - 467, 466, 1110, 1114, 1114, 1114, 1114, 1114, 1114, 1114, - - 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, - 1114, 1114, 1114, 1114, 1115, 1115, 1115, 1115, 1115, 1115, + 35, 35, 41, 42, 892, 53, 44, 53, 891, 41, + 42, 189, 53, 69, 69, 206, 69, 189, 207, 44, + + 69, 208, 41, 42, 250, 250, 538, 250, 54, 44, + 54, 890, 41, 42, 44, 54, 889, 41, 42, 132, + 132, 189, 53, 139, 139, 206, 189, 209, 207, 44, + 888, 208, 41, 42, 53, 53, 53, 53, 44, 538, + 190, 41, 42, 44, 361, 54, 41, 42, 190, 194, + 887, 132, 53, 641, 641, 139, 209, 54, 54, 54, + 54, 82, 82, 53, 82, 254, 253, 193, 82, 194, + 190, 200, 202, 361, 69, 54, 635, 82, 190, 194, + 132, 200, 202, 82, 139, 202, 54, 65, 193, 886, + 316, 316, 198, 316, 885, 254, 198, 193, 194, 363, + + 199, 200, 202, 253, 199, 262, 65, 276, 65, 635, + 65, 200, 202, 296, 202, 82, 65, 193, 308, 65, + 65, 65, 198, 65, 65, 65, 198, 884, 363, 65, + 199, 728, 728, 253, 199, 262, 65, 276, 65, 278, + 65, 883, 82, 296, 257, 257, 65, 257, 308, 65, + 65, 65, 65, 65, 65, 882, 258, 258, 65, 258, + 65, 257, 257, 257, 257, 259, 259, 881, 259, 278, + 278, 279, 279, 258, 258, 258, 258, 260, 260, 309, + 260, 336, 259, 259, 259, 259, 365, 257, 323, 323, + 323, 323, 337, 880, 260, 260, 260, 260, 267, 267, + + 351, 267, 367, 279, 352, 267, 259, 287, 287, 309, + 287, 336, 357, 358, 287, 365, 257, 260, 362, 360, + 366, 370, 337, 287, 366, 879, 368, 369, 371, 287, + 351, 367, 279, 360, 352, 362, 259, 372, 532, 373, + 376, 372, 357, 358, 374, 375, 383, 260, 362, 360, + 366, 370, 378, 380, 366, 368, 369, 381, 371, 729, + 729, 287, 360, 421, 362, 421, 878, 372, 373, 376, + 372, 423, 877, 423, 374, 375, 383, 876, 425, 267, + 425, 378, 380, 872, 386, 408, 381, 388, 287, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 386, 408, 388, 325, 532, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 325, 325, 325, 325, 325, 325, 325, + 325, 325, 325, 382, 385, 384, 417, 385, 387, 384, + 871, 389, 415, 382, 384, 387, 393, 393, 393, 393, + 416, 427, 451, 427, 451, 419, 453, 819, 453, 429, + 431, 818, 444, 382, 385, 384, 417, 385, 387, 384, + 389, 415, 382, 817, 384, 387, 390, 446, 390, 416, + 632, 390, 390, 411, 411, 419, 411, 390, 390, 429, + + 431, 431, 444, 390, 390, 449, 414, 414, 390, 414, + 411, 411, 411, 411, 450, 390, 390, 446, 390, 432, + 432, 390, 390, 414, 414, 414, 414, 390, 390, 434, + 434, 454, 390, 390, 460, 449, 457, 390, 441, 441, + 441, 441, 467, 468, 450, 470, 471, 454, 474, 457, + 522, 432, 522, 460, 525, 432, 525, 527, 527, 626, + 527, 626, 816, 434, 434, 627, 627, 720, 627, 720, + 632, 815, 467, 468, 814, 470, 471, 454, 474, 457, + 432, 433, 433, 460, 433, 433, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 433, 433, 433, 433, 433, + + 433, 433, 433, 433, 433, 433, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 433, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 433, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 813, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 433, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 433, 433, 433, 433, 433, + 433, 433, 433, 433, 433, 435, 435, 435, 435, 455, + 456, 459, 461, 475, 435, 435, 435, 435, 435, 435, + 476, 462, 463, 464, 472, 455, 812, 473, 456, 477, + 478, 464, 811, 459, 461, 479, 810, 461, 481, 435, + + 435, 462, 463, 475, 435, 435, 435, 435, 435, 435, + 476, 809, 483, 472, 482, 455, 473, 485, 456, 477, + 478, 464, 459, 461, 487, 479, 461, 488, 481, 807, + 486, 462, 463, 465, 489, 490, 492, 493, 465, 465, + 465, 465, 483, 482, 465, 494, 485, 495, 496, 465, + 497, 498, 499, 465, 487, 800, 465, 488, 465, 486, + 797, 465, 500, 489, 501, 490, 492, 493, 465, 465, + 465, 465, 502, 503, 465, 494, 504, 495, 496, 465, + 497, 498, 499, 465, 506, 465, 507, 465, 508, 505, + 465, 509, 500, 510, 501, 505, 511, 512, 785, 513, + + 514, 515, 502, 503, 516, 517, 504, 518, 771, 519, + 521, 528, 529, 530, 506, 507, 547, 508, 534, 505, + 551, 509, 544, 510, 545, 505, 511, 512, 513, 520, + 514, 515, 520, 520, 516, 517, 762, 518, 519, 731, + 521, 528, 529, 530, 551, 547, 523, 523, 534, 523, + 526, 526, 544, 526, 545, 633, 633, 730, 633, 520, + 726, 520, 520, 523, 523, 523, 523, 526, 526, 526, + 526, 535, 535, 551, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 725, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 535, 535, 535, 535, 535, + 535, 535, 535, 535, 535, 536, 536, 546, 549, 554, + 719, 540, 540, 550, 553, 556, 552, 555, 550, 553, + 713, 559, 560, 801, 557, 801, 549, 552, 549, 557, + 555, 561, 709, 556, 559, 695, 554, 546, 560, 536, + 536, 537, 537, 537, 537, 540, 540, 561, 550, 553, + + 537, 537, 537, 537, 537, 537, 549, 552, 549, 557, + 555, 562, 563, 556, 559, 554, 723, 723, 560, 723, + 558, 564, 565, 691, 567, 563, 570, 561, 571, 562, + 537, 537, 537, 537, 537, 537, 541, 541, 541, 541, + 558, 565, 566, 564, 567, 541, 541, 541, 541, 541, + 541, 572, 569, 568, 573, 563, 570, 571, 576, 562, + 569, 685, 577, 578, 566, 579, 584, 566, 580, 581, + 558, 565, 564, 568, 567, 541, 541, 541, 541, 541, + 541, 572, 583, 573, 582, 585, 588, 591, 576, 589, + 569, 577, 578, 566, 579, 584, 566, 590, 580, 581, + + 595, 582, 596, 568, 598, 599, 600, 582, 679, 602, + 603, 604, 583, 605, 607, 585, 588, 591, 589, 606, + 608, 609, 610, 612, 613, 614, 590, 615, 616, 595, + 617, 582, 596, 598, 599, 618, 600, 582, 602, 619, + 603, 604, 620, 605, 607, 621, 622, 623, 606, 608, + 609, 621, 610, 612, 613, 614, 615, 628, 616, 617, + 629, 643, 630, 637, 637, 618, 642, 647, 619, 639, + 639, 639, 620, 648, 644, 621, 622, 623, 636, 653, + 621, 651, 650, 634, 645, 648, 628, 649, 653, 654, + 629, 630, 647, 803, 651, 803, 642, 637, 637, 638, + + 638, 638, 638, 644, 650, 649, 652, 654, 638, 638, + 638, 638, 638, 638, 645, 648, 655, 660, 653, 657, + 656, 647, 660, 655, 651, 658, 652, 656, 657, 659, + 661, 665, 664, 650, 662, 649, 658, 654, 638, 638, + 638, 638, 638, 638, 665, 662, 663, 659, 669, 659, + 666, 663, 660, 655, 661, 667, 652, 656, 657, 664, + 667, 669, 668, 670, 671, 673, 658, 672, 666, 624, + 675, 677, 597, 681, 665, 662, 680, 659, 682, 659, + 684, 663, 668, 661, 686, 693, 680, 688, 664, 689, + 667, 669, 670, 690, 671, 673, 672, 692, 666, 675, + + 694, 677, 681, 696, 697, 698, 680, 700, 682, 701, + 684, 702, 668, 686, 693, 680, 703, 688, 705, 689, + 706, 594, 707, 690, 708, 710, 711, 692, 712, 714, + 694, 715, 696, 697, 698, 716, 717, 700, 701, 718, + 702, 721, 722, 727, 727, 727, 703, 705, 734, 738, + 706, 707, 735, 736, 708, 710, 711, 735, 712, 714, + 737, 715, 739, 740, 716, 734, 717, 741, 736, 718, + 742, 721, 722, 738, 739, 744, 737, 743, 746, 745, + 752, 748, 874, 749, 874, 740, 743, 735, 747, 752, + 751, 741, 745, 753, 742, 734, 750, 744, 736, 748, + + 747, 754, 738, 746, 739, 749, 737, 757, 754, 750, + 751, 753, 756, 765, 740, 764, 743, 755, 757, 752, + 741, 756, 745, 742, 755, 764, 744, 766, 767, 748, + 747, 768, 746, 769, 749, 770, 772, 773, 754, 750, + 751, 753, 774, 765, 775, 764, 776, 777, 757, 778, + 779, 756, 781, 787, 755, 764, 783, 766, 767, 788, + 768, 789, 769, 792, 770, 794, 772, 773, 548, 823, + 798, 799, 774, 539, 775, 805, 776, 777, 778, 821, + 779, 820, 781, 787, 823, 783, 791, 791, 491, 788, + 789, 791, 824, 792, 791, 794, 821, 791, 795, 795, + + 798, 799, 791, 795, 805, 820, 795, 822, 824, 795, + 826, 825, 822, 458, 823, 827, 791, 791, 831, 828, + 829, 791, 826, 830, 791, 833, 821, 791, 795, 795, + 834, 791, 830, 795, 820, 825, 795, 827, 824, 795, + 831, 832, 822, 828, 829, 835, 440, 836, 837, 413, + 839, 841, 826, 842, 832, 833, 843, 844, 846, 834, + 845, 848, 830, 850, 825, 851, 827, 857, 859, 831, + 853, 862, 828, 829, 858, 835, 836, 861, 837, 839, + 841, 863, 864, 842, 832, 843, 853, 844, 846, 845, + 865, 848, 860, 850, 866, 851, 860, 857, 859, 860, + + 853, 862, 867, 858, 868, 900, 861, 868, 403, 860, + 869, 863, 864, 870, 873, 853, 899, 868, 901, 902, + 865, 903, 860, 866, 904, 906, 860, 907, 908, 860, + 909, 912, 867, 911, 868, 900, 913, 868, 860, 869, + 899, 914, 870, 873, 915, 916, 868, 917, 901, 902, + 918, 903, 920, 904, 921, 906, 922, 907, 908, 923, + 909, 912, 911, 924, 925, 927, 913, 928, 931, 899, + 914, 929, 932, 933, 915, 916, 934, 917, 935, 918, + 936, 938, 920, 939, 921, 939, 922, 937, 941, 923, + 941, 966, 924, 925, 967, 927, 968, 928, 931, 969, + + 929, 970, 932, 933, 937, 934, 971, 935, 972, 936, + 938, 973, 974, 975, 391, 976, 977, 937, 979, 983, + 966, 980, 981, 982, 967, 984, 968, 985, 986, 969, + 988, 970, 990, 937, 991, 992, 971, 993, 972, 994, + 973, 974, 996, 975, 976, 997, 977, 999, 979, 983, + 980, 981, 982, 1000, 1014, 984, 998, 985, 986, 988, + 998, 990, 1015, 991, 1016, 992, 1017, 993, 1018, 994, + 1020, 1021, 996, 1023, 997, 1024, 999, 1025, 1026, 1027, + 1028, 1029, 1031, 1000, 1014, 998, 1035, 1036, 1037, 998, + 1040, 1041, 1015, 1016, 1042, 1017, 1043, 1018, 1044, 1045, + + 1020, 1021, 1023, 1047, 1024, 1048, 1049, 1025, 1026, 1027, + 1028, 1029, 1031, 1050, 1051, 1054, 1035, 1036, 1037, 1040, + 1056, 1041, 1058, 1061, 1042, 1043, 1064, 1044, 1045, 1065, + 364, 1066, 1047, 1067, 1068, 1048, 1049, 1069, 1070, 1071, + 1073, 355, 1074, 1050, 1051, 1054, 1075, 1076, 1082, 1056, + 1078, 1083, 1058, 1061, 1084, 1085, 1064, 1087, 1088, 1065, + 1066, 1089, 1090, 1067, 1068, 1091, 1094, 1069, 1070, 1071, + 1073, 1074, 1096, 353, 1097, 1075, 1098, 1076, 1082, 1078, + 1099, 1083, 1101, 1084, 1104, 1085, 1106, 1087, 1088, 1107, + 1108, 1089, 1090, 1110, 1091, 1094, 1111, 1158, 1158, 1158, + + 348, 332, 1096, 1097, 1174, 1098, 1174, 319, 1207, 1099, + 1207, 318, 1101, 317, 1104, 314, 1106, 302, 1107, 1108, + 299, 292, 291, 1110, 290, 289, 1111, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, - 1115, 1115, 1115, 1115, 1115, 1116, 1116, 1116, 1116, 1116, + 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1115, 1116, + 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, 1116, - 1116, 1116, 1116, 1116, 1116, 1116, 1117, 1117, 1117, 1117, + 1116, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1117, - 1117, 1117, 1117, 1117, 1117, 1117, 1117, 1118, 1118, 1118, - 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, - 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1119, 1119, + 1117, 1117, 1117, 1118, 1118, 1118, 1118, 1118, 1118, 1118, + 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, 1118, + 1118, 1118, 1118, 1118, 1118, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, - 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1120, - 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, + 1119, 1119, 1119, 1119, 1119, 1119, 1119, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, + 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1120, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1121, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, 1122, - 1122, 1122, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, - 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, - 1123, 1123, 1123, 1124, 1124, 1124, 1124, 1124, 1124, 1124, + 1122, 1122, 1122, 1123, 1123, 1123, 1123, 1123, 1123, 1123, + 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, 1123, + 1123, 1123, 1123, 1123, 1123, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1124, - 1124, 1124, 1124, 1124, 1125, 1125, 1125, 1125, 1125, 1125, + 1124, 1124, 1124, 1124, 1124, 1124, 1124, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, - 1125, 1125, 1125, 1125, 1125, 1126, 1126, 1126, 1126, 1126, + 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1125, 1126, + 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, 1126, - 1126, 1126, 1126, 1126, 1126, 1126, 1127, 1127, 1127, 1127, + 1126, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, + 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1127, - 1127, 1127, 1127, 1127, 1127, 1127, 1127, 1128, 1128, 1128, + 1127, 1127, 1127, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, - - 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1128, 1129, 1129, + 1128, 1128, 1128, 1128, 1128, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, - 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1130, - 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, + 1129, 1129, 1129, 1129, 1129, 1129, 1129, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, + 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1130, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, 1131, + 1131, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, 1132, - 1132, 1132, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, - + 1132, 1132, 1132, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, 1133, - 1133, 1133, 1133, 1134, 1134, 1134, 1134, 1134, 1134, 1134, + 1133, 1133, 1133, 1133, 1133, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1134, - 1134, 1134, 1134, 1134, 1135, 455, 1135, 437, 1135, 1135, - 1213, 1213, 1213, 1135, 1136, 1136, 1136, 1136, 1136, 1136, - 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, 1136, - 1136, 1136, 1136, 1136, 1137, 410, 1137, 389, 1137, 1137, - 1167, 1167, 362, 1137, 1138, 1167, 1138, 1138, 1138, 1138, - 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, 1138, - 1138, 1138, 1138, 1138, 1138, 1139, 353, 1139, 1139, 1139, - + 1134, 1134, 1134, 1134, 1134, 1134, 1134, 1135, 1135, 1135, + 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, + 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1135, 1136, + 286, 1136, 284, 1136, 1136, 1136, 283, 274, 273, 1136, + + 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, + 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, 1137, + 1137, 1138, 270, 1138, 269, 1138, 1138, 1138, 252, 248, + 244, 1138, 1139, 242, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, 1139, - 1139, 1139, 1139, 1139, 1139, 1139, 1140, 1140, 351, 1140, - 346, 1140, 1140, 344, 343, 328, 1140, 1141, 315, 1141, - 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, - 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1141, 1142, 1142, + 1139, 1139, 1139, 1139, 1140, 241, 1140, 1140, 1140, 1140, + 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, + 1140, 1140, 1140, 1140, 1140, 1140, 1141, 1141, 239, 1141, + 238, 1141, 1141, 1141, 237, 236, 232, 1141, 1142, 218, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, - 1142, 1142, 1142, 314, 1142, 313, 1142, 1142, 1142, 1143, - 310, 1143, 1143, 296, 1143, 1143, 1143, 1143, 1143, 1143, - 1143, 1143, 1143, 1143, 289, 1143, 288, 1143, 1143, 1143, - 1144, 287, 286, 1144, 1144, 1144, 1144, 1144, 1144, 1144, - - 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, - 1144, 1145, 283, 1145, 281, 1145, 1145, 280, 271, 270, - 1145, 1146, 267, 1146, 1146, 1146, 1146, 1146, 1146, 1146, - 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, 1146, - 1146, 1146, 1147, 266, 1147, 1147, 1147, 1147, 1147, 1147, - 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, 249, - 1147, 1147, 1147, 1148, 245, 1148, 241, 1148, 239, 1148, - 1148, 1148, 1148, 238, 1148, 1148, 236, 235, 234, 1148, - 1149, 230, 1149, 1149, 1149, 216, 1149, 1149, 1149, 1149, - 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, - - 1149, 1150, 215, 1150, 214, 1150, 1150, 210, 183, 182, - 1150, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, - 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, 1151, - 1151, 1151, 1152, 180, 1152, 1152, 1152, 1152, 1152, 178, - 1152, 1152, 1152, 1152, 1152, 1152, 1152, 177, 1152, 174, - 1152, 1152, 1152, 1153, 173, 1153, 172, 1153, 1153, 1153, - 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 168, 166, - 164, 1153, 1153, 1153, 1154, 1154, 1154, 1154, 1154, 1154, - 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, - 1154, 1154, 1154, 1154, 1154, 1155, 161, 1155, 1155, 1155, + 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, 1142, + 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, 1143, + 1143, 1143, 1143, 1143, 1143, 1143, 217, 1143, 216, 1143, + 1143, 1143, 1144, 212, 1144, 1144, 185, 1144, 1144, 1144, + 1144, 1144, 1144, 1144, 1144, 1144, 1144, 1144, 184, 1144, + 182, 1144, 1144, 1144, 1145, 180, 179, 1145, 1145, 1145, + 1145, 1145, 1145, 1145, 1145, 1145, 1145, 1145, 1145, 1145, + 1145, 1145, 1145, 1145, 1145, 1145, 1146, 176, 1146, 175, + 1146, 1146, 1146, 174, 170, 168, 1146, 1147, 165, 1147, + 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, + + 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1147, 1148, + 162, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, + 1148, 1148, 1148, 1148, 1148, 1148, 1148, 161, 1148, 1148, + 1148, 1149, 160, 1149, 159, 1149, 151, 1149, 1149, 1149, + 1149, 150, 1149, 1149, 146, 145, 143, 138, 1149, 1150, + 136, 1150, 1150, 1150, 131, 1150, 1150, 1150, 1150, 1150, + 1150, 1150, 1150, 1150, 1150, 1150, 1150, 1150, 1150, 1150, + 1150, 1151, 127, 1151, 121, 1151, 1151, 1151, 116, 114, + 113, 1151, 1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152, + 1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152, 1152, + + 1152, 1152, 1152, 1152, 1153, 110, 1153, 1153, 1153, 1153, + 1153, 108, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, + 106, 1153, 105, 1153, 1153, 1153, 1154, 104, 1154, 100, + 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, 1154, + 1154, 97, 96, 94, 92, 1154, 1154, 1154, 1155, 90, + 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, - 1155, 1155, 1155, 1155, 1155, 1155, 1156, 1156, 160, 159, - 158, 1156, 1156, 1158, 150, 1158, 1158, 1158, 1158, 1158, - 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158, - 1158, 1158, 1158, 1158, 1159, 149, 145, 1159, 1159, 1159, - 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 144, - 1159, 142, 1159, 1160, 137, 1160, 1160, 1160, 1160, 135, - 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, - 1160, 1160, 1160, 1160, 1161, 1161, 1161, 1161, 1161, 1161, - 1161, 1161, 1161, 1161, 1161, 1161, 1161, 1161, 1161, 130, - - 1161, 126, 1161, 1161, 1161, 1162, 120, 1162, 1162, 1162, - 115, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, - 113, 112, 109, 1162, 1162, 1162, 1163, 107, 1163, 105, - 1163, 1163, 104, 103, 99, 1163, 1164, 96, 1164, 1164, - 1164, 1164, 1164, 1164, 1164, 1164, 1164, 1164, 1164, 1164, - 1164, 1164, 1164, 1164, 1164, 1164, 1164, 1165, 95, 1165, + 1156, 86, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, 1156, + 1156, 1156, 1157, 1157, 84, 78, 77, 1157, 1157, 1157, + + 1159, 74, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, + 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, + 1159, 1159, 1160, 71, 66, 1160, 1160, 1160, 1160, 1160, + 1160, 1160, 1160, 1160, 1160, 1160, 1160, 1160, 63, 1160, + 59, 1160, 1161, 55, 1161, 1161, 1161, 1161, 16, 1161, + 1161, 1161, 1161, 1161, 1161, 1161, 1161, 1161, 1161, 1161, + 1161, 1161, 1161, 1161, 1162, 1162, 1162, 1162, 1162, 1162, + 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, 1162, + 15, 1162, 0, 1162, 1162, 1162, 1163, 0, 1163, 1163, + 1163, 0, 1163, 1163, 1163, 1163, 1163, 1163, 1163, 1163, + + 1163, 0, 0, 0, 0, 1163, 1163, 1163, 1164, 0, + 1164, 0, 1164, 1164, 1164, 0, 0, 0, 1164, 1165, + 0, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, - 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1165, 1168, 1168, - 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, - 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1168, 1169, - - 92, 1169, 90, 1169, 1169, 86, 84, 78, 1169, 1170, - 1170, 1170, 1170, 1170, 1170, 1170, 1170, 1170, 1170, 1170, - 1170, 1170, 1170, 1170, 1170, 1170, 1170, 1170, 1170, 1170, - 1171, 77, 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, - 1171, 1171, 1171, 1171, 1171, 1171, 1171, 74, 1171, 1171, - 1171, 1172, 71, 1172, 1172, 1172, 1172, 1172, 1172, 1172, + 1165, 1166, 0, 1166, 1166, 1166, 1166, 1166, 1166, 1166, + 1166, 1166, 1166, 1166, 1166, 1166, 1166, 1166, 1166, 1166, + 1166, 1166, 1166, 1167, 1167, 1167, 0, 0, 0, 1167, + 1168, 1168, 1168, 0, 0, 0, 1168, 1169, 1169, 1169, + 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, + 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1169, 1170, + + 0, 1170, 0, 1170, 1170, 1170, 0, 0, 0, 1170, + 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, + 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, 1171, + 1171, 1171, 1172, 0, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, 1172, - 1172, 1172, 1174, 66, 1174, 63, 1174, 1174, 59, 55, - 16, 1174, 15, 1174, 1175, 0, 1175, 1175, 1175, 1175, - 1175, 1175, 1175, 1175, 1175, 1175, 1175, 1175, 1175, 1175, + 0, 1172, 1172, 1172, 1173, 0, 1173, 1173, 1173, 1173, + 1173, 1173, 1173, 1173, 1173, 1173, 1173, 1173, 1173, 1173, + 1173, 1173, 1173, 1173, 1173, 1173, 1175, 0, 1175, 0, + 1175, 1175, 1175, 0, 0, 0, 1175, 0, 1175, 1176, + 0, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, - 1175, 1175, 1175, 1175, 1175, 1176, 0, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, - 1176, 1176, 1176, 1176, 1176, 1176, 1177, 0, 1177, 1177, + 1176, 1177, 0, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1177, - 1177, 1177, 1177, 1177, 1177, 1177, 1177, 1178, 0, 1178, + 1177, 1177, 1177, 1178, 0, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, - 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1178, 1179, 1179, + 1178, 1178, 1178, 1178, 1178, 1179, 0, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1179, - 1179, 1179, 1179, 0, 1179, 0, 1179, 1179, 1179, 1180, - 0, 1180, 1180, 0, 1180, 1180, 1180, 1180, 1180, 1180, + 1179, 1179, 1179, 1179, 1179, 1179, 1179, 1180, 1180, 1180, + 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, 1180, + 1180, 1180, 1180, 0, 1180, 0, 1180, 1180, 1180, 1181, - 1180, 1180, 1180, 1180, 0, 1180, 0, 1180, 1180, 1180, - 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, - 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, 1181, - 1181, 1182, 0, 0, 1182, 1182, 1182, 1182, 1182, 1182, + 0, 1181, 1181, 0, 1181, 1181, 1181, 1181, 1181, 1181, + 1181, 1181, 1181, 1181, 1181, 0, 1181, 0, 1181, 1181, + 1181, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, 1182, - 1182, 1182, 1183, 0, 1183, 0, 1183, 1183, 0, 0, - 0, 1183, 1184, 0, 1184, 0, 1184, 0, 1184, 1184, - 1184, 1184, 0, 1184, 1184, 0, 0, 0, 1184, 1185, - 0, 1185, 1185, 1185, 1185, 1185, 1185, 1185, 1185, 1185, - 1185, 1185, 1185, 1185, 1185, 1185, 1185, 1185, 1185, 1185, - - 1186, 0, 1186, 0, 1186, 1186, 0, 0, 0, 1186, - 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, - 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, 1187, - 1187, 1188, 0, 1188, 1188, 1188, 1188, 1188, 0, 1188, - 1188, 1188, 1188, 1188, 1188, 1188, 0, 1188, 0, 1188, - 1188, 1188, 1189, 0, 1189, 0, 1189, 1189, 1189, 1189, - 1189, 1189, 1189, 1189, 1189, 1189, 1189, 0, 0, 0, - 1189, 1189, 1189, 1190, 0, 1190, 1190, 1190, 1190, 1190, - 1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190, 1190, - 1190, 1190, 1190, 1190, 1191, 0, 1191, 1191, 1191, 1191, + 1182, 1182, 1182, 1183, 0, 0, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, 1183, + 1183, 1183, 1183, 1183, 1183, 1184, 0, 1184, 0, 1184, + 1184, 1184, 0, 0, 0, 1184, 1185, 0, 1185, 0, + 1185, 0, 1185, 1185, 1185, 1185, 0, 1185, 1185, 0, + 0, 0, 0, 1185, 1186, 0, 1186, 1186, 1186, 1186, + + 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186, + 1186, 1186, 1186, 1186, 1186, 1186, 1187, 0, 1187, 0, + 1187, 1187, 1187, 0, 0, 0, 1187, 1188, 1188, 1188, + 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, + 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1188, 1189, + 0, 1189, 1189, 1189, 1189, 1189, 0, 1189, 1189, 1189, + 1189, 1189, 1189, 1189, 1189, 0, 1189, 0, 1189, 1189, + 1189, 1190, 0, 1190, 0, 1190, 1190, 1190, 1190, 1190, + 1190, 1190, 1190, 1190, 1190, 1190, 0, 0, 0, 0, + 1190, 1190, 1190, 1191, 0, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, 1191, - 1191, 1191, 1191, 1191, 1191, 1192, 1192, 0, 0, 0, - 1192, 1192, 1193, 0, 1193, 1193, 1193, 1193, 1193, 1193, - 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, 1193, - 1193, 1193, 1193, 1194, 0, 0, 1194, 1194, 1194, 1194, - 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194, 0, 1194, - 0, 1194, 1195, 0, 1195, 1195, 1195, 1195, 0, 1195, + 1191, 1191, 1191, 1191, 1191, 1192, 0, 1192, 1192, 1192, + 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1192, + 1192, 1192, 1192, 1192, 1192, 1192, 1192, 1193, 1193, 0, + 0, 0, 1193, 1193, 1193, 1194, 0, 1194, 1194, 1194, + 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1194, + 1194, 1194, 1194, 1194, 1194, 1194, 1194, 1195, 0, 0, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, 1195, - 1195, 1195, 1195, 1196, 1196, 1196, 1196, 1196, 1196, 1196, - 1196, 1196, 1196, 1196, 1196, 1196, 1196, 1196, 0, 1196, - - 0, 1196, 1196, 1196, 1197, 0, 1197, 1197, 1197, 0, - 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, 0, - 0, 0, 1197, 1197, 1197, 1198, 0, 1198, 1198, 1198, - 1198, 1198, 1198, 1198, 1198, 1198, 1198, 1198, 1198, 1198, - 1198, 1198, 1198, 1198, 1198, 1198, 1199, 0, 1199, 1199, + 1195, 1195, 1195, 0, 1195, 0, 1195, 1196, 0, 1196, + 1196, 1196, 1196, 0, 1196, 1196, 1196, 1196, 1196, 1196, + + 1196, 1196, 1196, 1196, 1196, 1196, 1196, 1196, 1196, 1197, + 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, 1197, + 1197, 1197, 1197, 1197, 1197, 0, 1197, 0, 1197, 1197, + 1197, 1198, 0, 1198, 1198, 1198, 0, 1198, 1198, 1198, + 1198, 1198, 1198, 1198, 1198, 1198, 0, 0, 0, 0, + 1198, 1198, 1198, 1199, 0, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1199, - 1199, 1199, 1199, 1199, 1199, 1199, 1199, 1200, 1200, 1200, + 1199, 1199, 1199, 1199, 1199, 1200, 0, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, - 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1201, 0, - 1201, 0, 1201, 1201, 0, 0, 0, 1201, 1202, 0, + 1200, 1200, 1200, 1200, 1200, 1200, 1200, 1201, 1201, 1201, - 1202, 0, 1202, 1202, 0, 0, 0, 1202, 1203, 1203, - 1203, 1203, 1203, 1203, 1203, 1203, 1203, 1203, 1203, 1203, - 1203, 1203, 1203, 1203, 1203, 1203, 1203, 1203, 1203, 1204, + 1201, 1201, 1201, 1201, 1201, 1201, 1201, 1201, 1201, 1201, + 1201, 1201, 1201, 1201, 1201, 1201, 1201, 1201, 1201, 1202, + 0, 1202, 0, 1202, 1202, 1202, 0, 0, 0, 1202, + 1203, 0, 1203, 0, 1203, 1203, 1203, 0, 0, 0, + 1203, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, - 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, 1204, - 1205, 0, 1205, 1205, 1205, 1205, 1205, 1205, 1205, 1205, - 1205, 1205, 1205, 1205, 1205, 1205, 1205, 0, 1205, 1205, - 1205, 1207, 0, 1207, 0, 1207, 1207, 0, 0, 0, - 1207, 0, 1207, 1208, 0, 1208, 1208, 1208, 1208, 1208, - 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, 1208, - - 1208, 1208, 1208, 1208, 1209, 0, 1209, 1209, 1209, 1209, + 1204, 1204, 1204, 1205, 1205, 1205, 1205, 1205, 1205, 1205, + 1205, 1205, 1205, 1205, 1205, 1205, 1205, 1205, 1205, 1205, + 1205, 1205, 1205, 1205, 1205, 1206, 0, 1206, 1206, 1206, + 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, 1206, + + 1206, 1206, 1206, 0, 1206, 1206, 1206, 1208, 0, 1208, + 0, 1208, 1208, 1208, 0, 0, 0, 1208, 0, 1208, + 1209, 0, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, 1209, - 1209, 1209, 1209, 1209, 1209, 1210, 0, 1210, 1210, 1210, + 1209, 1209, 1210, 0, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, 1210, - 1210, 1210, 1210, 1210, 1210, 1210, 1211, 0, 1211, 1211, - 0, 1211, 1211, 1211, 1211, 1211, 1211, 1211, 1211, 1211, - 1211, 0, 1211, 0, 1211, 1211, 1211, 1212, 1212, 1212, - 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, - 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1214, 0, - 1214, 0, 1214, 1214, 0, 0, 0, 1214, 1215, 0, - - 1215, 1215, 1215, 1215, 1215, 1215, 1215, 1215, 1215, 1215, - 1215, 1215, 1215, 1215, 1215, 1215, 1215, 1215, 1215, 1216, - 0, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, + 1210, 1210, 1210, 1210, 1211, 0, 1211, 1211, 1211, 1211, + 1211, 1211, 1211, 1211, 1211, 1211, 1211, 1211, 1211, 1211, + 1211, 1211, 1211, 1211, 1211, 1211, 1212, 0, 1212, 1212, + 0, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, + + 1212, 1212, 0, 1212, 0, 1212, 1212, 1212, 1213, 1213, + 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, + 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, 1213, + 1214, 1214, 1214, 1214, 1215, 0, 1215, 0, 1215, 1215, + 1215, 0, 0, 0, 1215, 1216, 0, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1216, - 1217, 1217, 0, 0, 0, 1217, 1217, 1218, 0, 1218, + 1216, 1216, 1216, 1216, 1216, 1216, 1216, 1217, 1217, 0, + 0, 0, 1217, 1217, 1217, 1218, 0, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, - 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1219, 1219, + 1218, 1218, 1218, 1218, 1218, 1218, 1218, 1219, 1219, 1219, + 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1219, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, - 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, 1220, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, - 1113, 1113, 1113, 1113, 1113 + 1220, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, 1114, + 1114, 1114, 1114, 1114, 1114, 1114 } ; static yy_state_type yy_last_accepting_state; @@ -1919,7 +1940,7 @@ extern const char *escaped_qstart, *escaped_qend; #define RETURNNAME \ if(yyleng < MAXLINE) \ { \ - strncpy( nmstr, yytext, sizeof(nmstr) ); \ + strcpy( nmstr, yytext ); \ return NAME; \ } \ else \ @@ -1947,25 +1968,23 @@ extern const char *escaped_qstart, *escaped_qend; posix_compat = true; #define START_CODEBLOCK(x) do { \ - /* Emit the needed line directive... */\ - if (indented_code == false) { \ - linenum++; \ - line_directive_out(NULL, 1); \ - } \ - add_action(M4QSTART); \ - yy_push_state(CODEBLOCK); \ - if ((indented_code = x)) ACTION_ECHO; \ -} while(0) - + /* Emit the needed line directive... */\ + if (indented_code == false) { \ + linenum++; \ + line_directive_out(NULL, 1); \ + } \ + add_action(M4QSTART); \ + yy_push_state(CODEBLOCK); \ + if ((indented_code = x)) ACTION_ECHO; \ + } while(0) #define END_CODEBLOCK do { \ - yy_pop_state();\ + yy_pop_state();\ add_action(M4QEND); \ - if (!indented_code) line_directive_out(NULL, 0);\ -} while (0) - -#line 1966 "scan.c" + if (!indented_code) line_directive_out(NULL, 0);\ + } while (0) +#line 1985 "scan.c" -#line 1968 "scan.c" +#line 1987 "scan.c" #define INITIAL 0 #define SECT2 1 @@ -2212,16 +2231,16 @@ YY_DECL if ( ! YY_CURRENT_BUFFER ) { yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE ); + yy_create_buffer(yyin,YY_BUF_SIZE ); } - yy_load_buffer_state( ); + yy_load_buffer_state( ); } { -#line 158 "scan.l" +#line 156 "scan.l" -#line 160 "scan.l" +#line 158 "scan.l" static int bracelevel, didadef, indented_code; static int doing_rule_action = false; static int option_sense; @@ -2231,7 +2250,7 @@ YY_DECL char nmdef[MAXLINE]; -#line 2234 "scan.c" +#line 2253 "scan.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -2259,13 +2278,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1114 ) + if ( yy_current_state >= 1115 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 4511 ); + while ( yy_base[yy_current_state] != 4642 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2291,39 +2310,39 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 170 "scan.l" +#line 168 "scan.l" START_CODEBLOCK(true); YY_BREAK case 2: YY_RULE_SETUP -#line 171 "scan.l" +#line 169 "scan.l" add_action("/*[""["); yy_push_state( COMMENT ); YY_BREAK case 3: YY_RULE_SETUP -#line 172 "scan.l" +#line 170 "scan.l" yy_push_state( LINEDIR ); YY_BREAK case 4: YY_RULE_SETUP -#line 173 "scan.l" +#line 171 "scan.l" return SCDECL; YY_BREAK case 5: YY_RULE_SETUP -#line 174 "scan.l" +#line 172 "scan.l" return XSCDECL; YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 175 "scan.l" +#line 173 "scan.l" START_CODEBLOCK(false); YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 176 "scan.l" +#line 174 "scan.l" { brace_start_line = linenum; ++linenum; @@ -2334,17 +2353,17 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 184 "scan.l" +#line 182 "scan.l" synerr( _("malformed '%top' directive") ); YY_BREAK case 9: YY_RULE_SETUP -#line 186 "scan.l" +#line 184 "scan.l" /* discard */ YY_BREAK case 10: YY_RULE_SETUP -#line 188 "scan.l" +#line 186 "scan.l" { sectnum = 2; bracelevel = 0; @@ -2357,46 +2376,46 @@ YY_RULE_SETUP case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 197 "scan.l" +#line 195 "scan.l" yytext_is_array = false; ++linenum; YY_BREAK case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 198 "scan.l" +#line 196 "scan.l" yytext_is_array = true; ++linenum; YY_BREAK case 13: YY_RULE_SETUP -#line 200 "scan.l" +#line 198 "scan.l" BEGIN(OPTION); return TOK_OPTION; YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 202 "scan.l" +#line 200 "scan.l" ++linenum; /* ignore */ YY_BREAK case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 203 "scan.l" +#line 201 "scan.l" ++linenum; /* ignore */ YY_BREAK /* xgettext: no-c-format */ case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 206 "scan.l" +#line 204 "scan.l" synerr( _( "unrecognized '%' directive" ) ); YY_BREAK case 17: YY_RULE_SETUP -#line 208 "scan.l" +#line 206 "scan.l" { if(yyleng < MAXLINE) { - strncpy( nmstr, yytext, sizeof(nmstr) ); + strcpy( nmstr, yytext ); } else { @@ -2410,51 +2429,51 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 223 "scan.l" +#line 221 "scan.l" RETURNNAME; YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 224 "scan.l" +#line 222 "scan.l" ++linenum; /* allows blank lines in section 1 */ YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 225 "scan.l" +#line 223 "scan.l" ACTION_ECHO; ++linenum; /* maybe end of comment line */ YY_BREAK /* */ case 21: YY_RULE_SETUP -#line 230 "scan.l" +#line 228 "scan.l" ACTION_ECHO; YY_BREAK case 22: YY_RULE_SETUP -#line 231 "scan.l" +#line 229 "scan.l" ACTION_ECHO; YY_BREAK case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 233 "scan.l" +#line 231 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK case 24: YY_RULE_SETUP -#line 236 "scan.l" +#line 234 "scan.l" add_action("*/]""]"); yy_pop_state(); YY_BREAK case 25: YY_RULE_SETUP -#line 239 "scan.l" +#line 237 "scan.l" ACTION_ECHO; yy_pop_state(); YY_BREAK @@ -2462,41 +2481,41 @@ ACTION_ECHO; yy_pop_state(); /* This is the same as COMMENT, but is discarded rather than output. */ case 26: YY_RULE_SETUP -#line 244 "scan.l" +#line 242 "scan.l" yy_pop_state(); YY_BREAK case 27: YY_RULE_SETUP -#line 245 "scan.l" +#line 243 "scan.l" ; YY_BREAK case 28: YY_RULE_SETUP -#line 246 "scan.l" +#line 244 "scan.l" ; YY_BREAK case 29: /* rule 29 can match eol */ YY_RULE_SETUP -#line 247 "scan.l" +#line 245 "scan.l" ++linenum; YY_BREAK case 30: YY_RULE_SETUP -#line 251 "scan.l" +#line 249 "scan.l" yy_pop_state(); YY_BREAK case 31: YY_RULE_SETUP -#line 252 "scan.l" +#line 250 "scan.l" ; YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 253 "scan.l" +#line 251 "scan.l" ++linenum; YY_BREAK @@ -2504,17 +2523,17 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 257 "scan.l" +#line 255 "scan.l" yy_pop_state(); YY_BREAK case 34: YY_RULE_SETUP -#line 258 "scan.l" +#line 256 "scan.l" linenum = myctoi( yytext ); YY_BREAK case 35: YY_RULE_SETUP -#line 260 "scan.l" +#line 258 "scan.l" { free(infilename); infilename = xstrdup(yytext + 1); @@ -2523,19 +2542,19 @@ YY_RULE_SETUP YY_BREAK case 36: YY_RULE_SETUP -#line 265 "scan.l" +#line 263 "scan.l" /* ignore spurious characters */ YY_BREAK case 37: YY_RULE_SETUP -#line 268 "scan.l" +#line 267 "scan.l" ACTION_ECHO_QSTART; YY_BREAK case 38: YY_RULE_SETUP -#line 269 "scan.l" +#line 268 "scan.l" ACTION_ECHO_QEND; YY_BREAK @@ -2543,23 +2562,23 @@ ACTION_ECHO_QEND; case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 273 "scan.l" +#line 272 "scan.l" ++linenum; END_CODEBLOCK; YY_BREAK case 40: YY_RULE_SETUP -#line 274 "scan.l" +#line 273 "scan.l" ACTION_ECHO; YY_BREAK case 41: YY_RULE_SETUP -#line 275 "scan.l" +#line 274 "scan.l" ACTION_ECHO; YY_BREAK case 42: /* rule 42 can match eol */ YY_RULE_SETUP -#line 276 "scan.l" +#line 275 "scan.l" { ++linenum; ACTION_ECHO; @@ -2570,7 +2589,7 @@ YY_RULE_SETUP case 43: YY_RULE_SETUP -#line 284 "scan.l" +#line 283 "scan.l" { if( --brace_depth == 0){ /* TODO: Matched. */ @@ -2581,7 +2600,7 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 292 "scan.l" +#line 291 "scan.l" { brace_depth++; buf_strnappend(&top_buf, yytext, yyleng); @@ -2590,7 +2609,7 @@ YY_RULE_SETUP case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 297 "scan.l" +#line 296 "scan.l" { ++linenum; buf_strnappend(&top_buf, yytext, yyleng); @@ -2598,23 +2617,23 @@ YY_RULE_SETUP YY_BREAK case 46: YY_RULE_SETUP -#line 302 "scan.l" +#line 301 "scan.l" buf_strnappend(&top_buf, escaped_qstart, (int) strlen(escaped_qstart)); YY_BREAK case 47: YY_RULE_SETUP -#line 303 "scan.l" +#line 302 "scan.l" buf_strnappend(&top_buf, escaped_qend, (int) strlen(escaped_qend)); YY_BREAK case 48: YY_RULE_SETUP -#line 304 "scan.l" +#line 303 "scan.l" { buf_strnappend(&top_buf, yytext, yyleng); } YY_BREAK case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE): -#line 308 "scan.l" +#line 307 "scan.l" { linenum = brace_start_line; synerr(_("Unmatched '{'")); @@ -2625,16 +2644,16 @@ case YY_STATE_EOF(CODEBLOCK_MATCH_BRACE): case 49: YY_RULE_SETUP -#line 317 "scan.l" +#line 316 "scan.l" /* separates name and definition */ YY_BREAK case 50: YY_RULE_SETUP -#line 319 "scan.l" +#line 318 "scan.l" { if(yyleng < MAXLINE) { - strncpy( nmdef, yytext, sizeof(nmdef) ); + strcpy( nmdef, yytext ); } else { @@ -2656,7 +2675,7 @@ YY_RULE_SETUP case 51: /* rule 51 can match eol */ YY_RULE_SETUP -#line 341 "scan.l" +#line 340 "scan.l" { if ( ! didadef ) synerr( _( "incomplete name definition" ) ); @@ -2669,42 +2688,42 @@ YY_RULE_SETUP case 52: /* rule 52 can match eol */ YY_RULE_SETUP -#line 351 "scan.l" +#line 350 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 53: YY_RULE_SETUP -#line 352 "scan.l" +#line 351 "scan.l" option_sense = true; YY_BREAK case 54: YY_RULE_SETUP -#line 354 "scan.l" +#line 353 "scan.l" return '='; YY_BREAK case 55: YY_RULE_SETUP -#line 356 "scan.l" +#line 355 "scan.l" option_sense = ! option_sense; YY_BREAK case 56: YY_RULE_SETUP -#line 358 "scan.l" +#line 357 "scan.l" csize = option_sense ? 128 : 256; YY_BREAK case 57: YY_RULE_SETUP -#line 359 "scan.l" +#line 358 "scan.l" csize = option_sense ? 256 : 128; YY_BREAK case 58: YY_RULE_SETUP -#line 361 "scan.l" +#line 360 "scan.l" long_align = option_sense; YY_BREAK case 59: YY_RULE_SETUP -#line 362 "scan.l" +#line 361 "scan.l" { ACTION_M4_IFDEF( "M4""_YY_ALWAYS_INTERACTIVE", option_sense ); interactive = option_sense; @@ -2712,64 +2731,64 @@ YY_RULE_SETUP YY_BREAK case 60: YY_RULE_SETUP -#line 366 "scan.l" +#line 365 "scan.l" yytext_is_array = option_sense; YY_BREAK case 61: YY_RULE_SETUP -#line 367 "scan.l" +#line 366 "scan.l" backing_up_report = option_sense; YY_BREAK case 62: YY_RULE_SETUP -#line 368 "scan.l" +#line 367 "scan.l" interactive = ! option_sense; YY_BREAK case 63: YY_RULE_SETUP -#line 369 "scan.l" +#line 368 "scan.l" bison_bridge_lval = option_sense; YY_BREAK case 64: YY_RULE_SETUP -#line 370 "scan.l" +#line 369 "scan.l" { if((bison_bridge_lloc = option_sense)) bison_bridge_lval = true; } YY_BREAK case 65: YY_RULE_SETUP -#line 373 "scan.l" +#line 372 "scan.l" C_plus_plus = option_sense; YY_BREAK case 66: YY_RULE_SETUP -#line 374 "scan.l" +#line 373 "scan.l" sf_set_case_ins(!option_sense); YY_BREAK case 67: YY_RULE_SETUP -#line 375 "scan.l" +#line 374 "scan.l" sf_set_case_ins(option_sense); YY_BREAK case 68: YY_RULE_SETUP -#line 376 "scan.l" +#line 375 "scan.l" ddebug = option_sense; YY_BREAK case 69: YY_RULE_SETUP -#line 377 "scan.l" +#line 376 "scan.l" spprdflt = ! option_sense; YY_BREAK case 70: YY_RULE_SETUP -#line 378 "scan.l" +#line 377 "scan.l" useecs = option_sense; YY_BREAK case 71: YY_RULE_SETUP -#line 379 "scan.l" +#line 378 "scan.l" { useecs = usemecs = false; use_read = fullspd = true; @@ -2777,7 +2796,7 @@ YY_RULE_SETUP YY_BREAK case 72: YY_RULE_SETUP -#line 383 "scan.l" +#line 382 "scan.l" { useecs = usemecs = false; use_read = fulltbl = true; @@ -2785,32 +2804,32 @@ YY_RULE_SETUP YY_BREAK case 73: YY_RULE_SETUP -#line 387 "scan.l" +#line 386 "scan.l" ACTION_IFDEF("YY_NO_INPUT", ! option_sense); YY_BREAK case 74: YY_RULE_SETUP -#line 388 "scan.l" +#line 387 "scan.l" interactive = option_sense; YY_BREAK case 75: YY_RULE_SETUP -#line 389 "scan.l" +#line 388 "scan.l" lex_compat = option_sense; YY_BREAK case 76: YY_RULE_SETUP -#line 390 "scan.l" +#line 389 "scan.l" posix_compat = option_sense; YY_BREAK case 77: YY_RULE_SETUP -#line 391 "scan.l" +#line 390 "scan.l" gen_line_dirs = option_sense; YY_BREAK case 78: YY_RULE_SETUP -#line 392 "scan.l" +#line 391 "scan.l" { ACTION_M4_IFDEF( "M4""_YY_MAIN", option_sense); /* Override yywrap */ @@ -2820,12 +2839,12 @@ YY_RULE_SETUP YY_BREAK case 79: YY_RULE_SETUP -#line 398 "scan.l" +#line 397 "scan.l" usemecs = option_sense; YY_BREAK case 80: YY_RULE_SETUP -#line 399 "scan.l" +#line 398 "scan.l" { ACTION_M4_IFDEF( "M4""_YY_NEVER_INTERACTIVE", option_sense ); interactive = !option_sense; @@ -2833,237 +2852,237 @@ YY_RULE_SETUP YY_BREAK case 81: YY_RULE_SETUP -#line 403 "scan.l" +#line 402 "scan.l" performance_report += option_sense ? 1 : -1; YY_BREAK case 82: YY_RULE_SETUP -#line 404 "scan.l" +#line 403 "scan.l" yytext_is_array = ! option_sense; YY_BREAK case 83: YY_RULE_SETUP -#line 405 "scan.l" +#line 404 "scan.l" use_read = option_sense; YY_BREAK case 84: YY_RULE_SETUP -#line 406 "scan.l" +#line 405 "scan.l" reentrant = option_sense; YY_BREAK case 85: YY_RULE_SETUP -#line 407 "scan.l" +#line 406 "scan.l" reject_really_used = option_sense; YY_BREAK case 86: YY_RULE_SETUP -#line 408 "scan.l" +#line 407 "scan.l" ACTION_M4_IFDEF( "M4""_YY_STACK_USED", option_sense ); YY_BREAK case 87: YY_RULE_SETUP -#line 409 "scan.l" +#line 408 "scan.l" do_stdinit = option_sense; YY_BREAK case 88: YY_RULE_SETUP -#line 410 "scan.l" +#line 409 "scan.l" use_stdout = option_sense; YY_BREAK case 89: YY_RULE_SETUP -#line 411 "scan.l" +#line 410 "scan.l" ACTION_IFDEF("YY_NO_UNISTD_H", ! option_sense); YY_BREAK case 90: YY_RULE_SETUP -#line 412 "scan.l" +#line 411 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_UNPUT", ! option_sense); YY_BREAK case 91: YY_RULE_SETUP -#line 413 "scan.l" +#line 412 "scan.l" printstats = option_sense; YY_BREAK case 92: YY_RULE_SETUP -#line 414 "scan.l" +#line 413 "scan.l" nowarn = ! option_sense; YY_BREAK case 93: YY_RULE_SETUP -#line 415 "scan.l" +#line 414 "scan.l" do_yylineno = option_sense; ACTION_M4_IFDEF("M4""_YY_USE_LINENO", option_sense); YY_BREAK case 94: YY_RULE_SETUP -#line 416 "scan.l" +#line 415 "scan.l" yymore_really_used = option_sense; YY_BREAK case 95: YY_RULE_SETUP -#line 417 "scan.l" +#line 416 "scan.l" do_yywrap = option_sense; YY_BREAK case 96: YY_RULE_SETUP -#line 419 "scan.l" +#line 418 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_PUSH_STATE", ! option_sense); YY_BREAK case 97: YY_RULE_SETUP -#line 420 "scan.l" +#line 419 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_POP_STATE", ! option_sense); YY_BREAK case 98: YY_RULE_SETUP -#line 421 "scan.l" +#line 420 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_TOP_STATE", ! option_sense); YY_BREAK case 99: YY_RULE_SETUP -#line 423 "scan.l" +#line 422 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BUFFER", ! option_sense); YY_BREAK case 100: YY_RULE_SETUP -#line 424 "scan.l" +#line 423 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SCAN_BYTES", ! option_sense); YY_BREAK case 101: YY_RULE_SETUP -#line 425 "scan.l" +#line 424 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SCAN_STRING", ! option_sense); YY_BREAK case 102: YY_RULE_SETUP -#line 427 "scan.l" +#line 426 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_FLEX_ALLOC", ! option_sense); YY_BREAK case 103: YY_RULE_SETUP -#line 428 "scan.l" +#line 427 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_FLEX_REALLOC", ! option_sense); YY_BREAK case 104: YY_RULE_SETUP -#line 429 "scan.l" +#line 428 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_FLEX_FREE", ! option_sense); YY_BREAK case 105: YY_RULE_SETUP -#line 431 "scan.l" +#line 430 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_DEBUG", ! option_sense); YY_BREAK case 106: YY_RULE_SETUP -#line 432 "scan.l" +#line 431 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_DEBUG", ! option_sense); YY_BREAK case 107: YY_RULE_SETUP -#line 433 "scan.l" +#line 432 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_EXTRA", ! option_sense); YY_BREAK case 108: YY_RULE_SETUP -#line 434 "scan.l" +#line 433 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_EXTRA", ! option_sense); YY_BREAK case 109: YY_RULE_SETUP -#line 435 "scan.l" +#line 434 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LENG", ! option_sense); YY_BREAK case 110: YY_RULE_SETUP -#line 436 "scan.l" +#line 435 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_TEXT", ! option_sense); YY_BREAK case 111: YY_RULE_SETUP -#line 437 "scan.l" +#line 436 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LINENO", ! option_sense); YY_BREAK case 112: YY_RULE_SETUP -#line 438 "scan.l" +#line 437 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_LINENO", ! option_sense); YY_BREAK case 113: YY_RULE_SETUP -#line 439 "scan.l" +#line 438 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_IN", ! option_sense); YY_BREAK case 114: YY_RULE_SETUP -#line 440 "scan.l" +#line 439 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_IN", ! option_sense); YY_BREAK case 115: YY_RULE_SETUP -#line 441 "scan.l" +#line 440 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_OUT", ! option_sense); YY_BREAK case 116: YY_RULE_SETUP -#line 442 "scan.l" +#line 441 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_OUT", ! option_sense); YY_BREAK case 117: YY_RULE_SETUP -#line 443 "scan.l" +#line 442 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LVAL", ! option_sense); YY_BREAK case 118: YY_RULE_SETUP -#line 444 "scan.l" +#line 443 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_LVAL", ! option_sense); YY_BREAK case 119: YY_RULE_SETUP -#line 445 "scan.l" +#line 444 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_GET_LLOC", ! option_sense); YY_BREAK case 120: YY_RULE_SETUP -#line 446 "scan.l" +#line 445 "scan.l" ACTION_M4_IFDEF("M4""_YY_NO_SET_LLOC", ! option_sense); YY_BREAK case 121: YY_RULE_SETUP -#line 448 "scan.l" +#line 447 "scan.l" return TOK_EXTRA_TYPE; YY_BREAK case 122: YY_RULE_SETUP -#line 449 "scan.l" +#line 448 "scan.l" return TOK_OUTFILE; YY_BREAK case 123: YY_RULE_SETUP -#line 450 "scan.l" +#line 449 "scan.l" return TOK_PREFIX; YY_BREAK case 124: YY_RULE_SETUP -#line 451 "scan.l" +#line 450 "scan.l" return TOK_YYCLASS; YY_BREAK case 125: YY_RULE_SETUP -#line 452 "scan.l" +#line 451 "scan.l" return TOK_HEADER_FILE; YY_BREAK case 126: YY_RULE_SETUP -#line 453 "scan.l" +#line 452 "scan.l" return TOK_TABLES_FILE; YY_BREAK case 127: YY_RULE_SETUP -#line 454 "scan.l" +#line 453 "scan.l" { tablesverify = option_sense; if(!tablesext && option_sense) @@ -3072,11 +3091,11 @@ YY_RULE_SETUP YY_BREAK case 128: YY_RULE_SETUP -#line 461 "scan.l" +#line 460 "scan.l" { if(yyleng-1 < MAXLINE) { - strncpy( nmstr, yytext + 1, sizeof(nmstr) ); + strcpy( nmstr, yytext + 1 ); } else { @@ -3089,7 +3108,7 @@ YY_RULE_SETUP YY_BREAK case 129: YY_RULE_SETUP -#line 475 "scan.l" +#line 474 "scan.l" { format_synerr( _( "unrecognized %%option: %s" ), yytext ); @@ -3100,54 +3119,53 @@ YY_RULE_SETUP case 130: /* rule 130 can match eol */ YY_RULE_SETUP -#line 482 "scan.l" +#line 481 "scan.l" ++linenum; BEGIN(INITIAL); YY_BREAK case 131: YY_RULE_SETUP -#line 486 "scan.l" +#line 485 "scan.l" ++bracelevel; yyless( 2 ); /* eat only %{ */ YY_BREAK case 132: YY_RULE_SETUP -#line 487 "scan.l" +#line 486 "scan.l" --bracelevel; yyless( 2 ); /* eat only %} */ YY_BREAK case 133: YY_RULE_SETUP -#line 489 "scan.l" +#line 488 "scan.l" START_CODEBLOCK(true); /* indented code in prolog */ YY_BREAK case 134: YY_RULE_SETUP -#line 491 "scan.l" -{ - /* non-indented code */ - if ( bracelevel <= 0 ) { - /* not in %{ ... %} */ - yyless( 0 ); /* put it all back */ - yy_set_bol( 1 ); - mark_prolog(); - BEGIN(SECT2); - } else { - START_CODEBLOCK(true); - } - } +#line 490 "scan.l" +{ /* non-indented code */ + if ( bracelevel <= 0 ) + { /* not in %{ ... %} */ + yyless( 0 ); /* put it all back */ + yy_set_bol( 1 ); + mark_prolog(); + BEGIN(SECT2); + } + else + ACTION_ECHO; + } YY_BREAK case 135: YY_RULE_SETUP -#line 504 "scan.l" +#line 502 "scan.l" ACTION_ECHO; YY_BREAK case 136: /* rule 136 can match eol */ YY_RULE_SETUP -#line 505 "scan.l" +#line 503 "scan.l" ++linenum; ACTION_ECHO; YY_BREAK case YY_STATE_EOF(SECT2PROLOG): -#line 507 "scan.l" +#line 505 "scan.l" { mark_prolog(); sectnum = 0; @@ -3159,12 +3177,12 @@ case YY_STATE_EOF(SECT2PROLOG): case 137: /* rule 137 can match eol */ YY_RULE_SETUP -#line 515 "scan.l" +#line 513 "scan.l" ++linenum; /* allow blank lines in section 2 */ YY_BREAK case 138: YY_RULE_SETUP -#line 517 "scan.l" +#line 515 "scan.l" { indented_code = false; doing_codeblock = true; @@ -3174,7 +3192,7 @@ YY_RULE_SETUP YY_BREAK case 139: YY_RULE_SETUP -#line 524 "scan.l" +#line 522 "scan.l" { /* Allow "<" to appear in (?x) patterns. */ if (!sf_skip_ws()) @@ -3184,12 +3202,12 @@ YY_RULE_SETUP YY_BREAK case 140: YY_RULE_SETUP -#line 530 "scan.l" +#line 528 "scan.l" return '^'; YY_BREAK case 141: YY_RULE_SETUP -#line 531 "scan.l" +#line 529 "scan.l" BEGIN(QUOTE); return '"'; YY_BREAK case 142: @@ -3197,7 +3215,7 @@ case 142: (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 532 "scan.l" +#line 530 "scan.l" { BEGIN(NUM); if ( lex_compat || posix_compat ) @@ -3213,12 +3231,12 @@ YY_LINENO_REWIND_TO(yy_bp + 1); (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 539 "scan.l" +#line 537 "scan.l" return '$'; YY_BREAK case 144: YY_RULE_SETUP -#line 541 "scan.l" +#line 539 "scan.l" { bracelevel = 1; BEGIN(PERCENT_BRACE_ACTION); @@ -3234,7 +3252,7 @@ YY_RULE_SETUP case 145: /* rule 145 can match eol */ YY_RULE_SETUP -#line 552 "scan.l" +#line 550 "scan.l" { if (sf_skip_ws()){ /* We're in the middle of a (?x: ) pattern. */ @@ -3252,7 +3270,7 @@ YY_RULE_SETUP YY_BREAK case 146: YY_RULE_SETUP -#line 567 "scan.l" +#line 565 "scan.l" { if (sf_skip_ws()){ @@ -3269,12 +3287,12 @@ YY_RULE_SETUP YY_BREAK case 147: YY_RULE_SETUP -#line 581 "scan.l" +#line 579 "scan.l" /* allow indented rules */ ; YY_BREAK case 148: YY_RULE_SETUP -#line 583 "scan.l" +#line 581 "scan.l" { if (sf_skip_ws()){ /* We're in the middle of a (?x: ) pattern. */ @@ -3300,7 +3318,7 @@ YY_RULE_SETUP case 149: /* rule 149 can match eol */ YY_RULE_SETUP -#line 605 "scan.l" +#line 603 "scan.l" { if (sf_skip_ws()){ /* We're in the middle of a (?x: ) pattern. */ @@ -3322,15 +3340,15 @@ YY_RULE_SETUP } YY_BREAK case 150: -#line 626 "scan.l" +#line 624 "scan.l" case 151: YY_RULE_SETUP -#line 626 "scan.l" +#line 624 "scan.l" return EOF_OP; YY_BREAK case 152: YY_RULE_SETUP -#line 628 "scan.l" +#line 626 "scan.l" { sectnum = 3; BEGIN(no_section3_escape ? SECT3_NOESCAPE : SECT3); @@ -3341,13 +3359,13 @@ YY_RULE_SETUP YY_BREAK case 153: YY_RULE_SETUP -#line 636 "scan.l" +#line 634 "scan.l" { int cclval; if(yyleng < MAXLINE) { - strncpy( nmstr, yytext, sizeof(nmstr) ); + strcpy( nmstr, yytext ); } else { @@ -3391,12 +3409,12 @@ YY_RULE_SETUP YY_BREAK case 154: YY_RULE_SETUP -#line 682 "scan.l" +#line 680 "scan.l" return CCL_OP_DIFF; YY_BREAK case 155: YY_RULE_SETUP -#line 683 "scan.l" +#line 681 "scan.l" return CCL_OP_UNION; YY_BREAK /* Check for :space: at the end of the rule so we don't @@ -3406,7 +3424,7 @@ return CCL_OP_UNION; case 156: /* rule 156 can match eol */ YY_RULE_SETUP -#line 690 "scan.l" +#line 688 "scan.l" { char *nmdefptr; int end_is_ws, end_ch; @@ -3416,7 +3434,7 @@ YY_RULE_SETUP if(yyleng-1 < MAXLINE) { - strncpy( nmstr, yytext + 1, sizeof(nmstr) ); + strcpy( nmstr, yytext + 1 ); } else { @@ -3457,7 +3475,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ YY_BREAK case 157: YY_RULE_SETUP -#line 738 "scan.l" +#line 736 "scan.l" { if (sf_skip_ws()) yy_push_state(COMMENT_DISCARD); @@ -3470,7 +3488,7 @@ YY_RULE_SETUP YY_BREAK case 158: YY_RULE_SETUP -#line 748 "scan.l" +#line 746 "scan.l" { if (lex_compat || posix_compat){ /* Push back the "?#" and treat it like a normal parens. */ @@ -3484,7 +3502,7 @@ YY_RULE_SETUP YY_BREAK case 159: YY_RULE_SETUP -#line 758 "scan.l" +#line 756 "scan.l" { sf_push(); if (lex_compat || posix_compat) @@ -3497,12 +3515,12 @@ YY_RULE_SETUP YY_BREAK case 160: YY_RULE_SETUP -#line 767 "scan.l" +#line 765 "scan.l" sf_push(); return '('; YY_BREAK case 161: YY_RULE_SETUP -#line 768 "scan.l" +#line 766 "scan.l" { if (_sf_top_ix > 0) { sf_pop(); @@ -3513,12 +3531,12 @@ YY_RULE_SETUP YY_BREAK case 162: YY_RULE_SETUP -#line 776 "scan.l" +#line 774 "scan.l" return (unsigned char) yytext[0]; YY_BREAK case 163: YY_RULE_SETUP -#line 777 "scan.l" +#line 775 "scan.l" RETURNCHAR; YY_BREAK @@ -3526,17 +3544,17 @@ RETURNCHAR; case 164: /* rule 164 can match eol */ YY_RULE_SETUP -#line 782 "scan.l" +#line 780 "scan.l" ++linenum; /* Allow blank lines & continuations */ YY_BREAK case 165: YY_RULE_SETUP -#line 783 "scan.l" +#line 781 "scan.l" return (unsigned char) yytext[0]; YY_BREAK case 166: YY_RULE_SETUP -#line 784 "scan.l" +#line 782 "scan.l" BEGIN(SECT2); return '>'; YY_BREAK case 167: @@ -3544,17 +3562,17 @@ case 167: (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 785 "scan.l" +#line 783 "scan.l" BEGIN(CARETISBOL); return '>'; YY_BREAK case 168: YY_RULE_SETUP -#line 786 "scan.l" +#line 784 "scan.l" RETURNNAME; YY_BREAK case 169: YY_RULE_SETUP -#line 787 "scan.l" +#line 785 "scan.l" { format_synerr( _( "bad : %s" ), yytext ); @@ -3563,24 +3581,24 @@ YY_RULE_SETUP case 170: YY_RULE_SETUP -#line 793 "scan.l" +#line 791 "scan.l" BEGIN(SECT2); return '^'; YY_BREAK case 171: YY_RULE_SETUP -#line 797 "scan.l" +#line 795 "scan.l" RETURNCHAR; YY_BREAK case 172: YY_RULE_SETUP -#line 798 "scan.l" +#line 796 "scan.l" BEGIN(SECT2); return '"'; YY_BREAK case 173: /* rule 173 can match eol */ YY_RULE_SETUP -#line 800 "scan.l" +#line 798 "scan.l" { synerr( _( "missing quote" ) ); BEGIN(SECT2); @@ -3592,49 +3610,49 @@ YY_RULE_SETUP case 174: YY_RULE_SETUP -#line 809 "scan.l" +#line 807 "scan.l" BEGIN(SECT2); YY_BREAK case 175: YY_RULE_SETUP -#line 810 "scan.l" +#line 808 "scan.l" BEGIN(GROUP_MINUS_PARAMS); YY_BREAK case 176: YY_RULE_SETUP -#line 811 "scan.l" +#line 809 "scan.l" sf_set_case_ins(1); YY_BREAK case 177: YY_RULE_SETUP -#line 812 "scan.l" +#line 810 "scan.l" sf_set_dot_all(1); YY_BREAK case 178: YY_RULE_SETUP -#line 813 "scan.l" +#line 811 "scan.l" sf_set_skip_ws(1); YY_BREAK case 179: YY_RULE_SETUP -#line 816 "scan.l" +#line 814 "scan.l" BEGIN(SECT2); YY_BREAK case 180: YY_RULE_SETUP -#line 817 "scan.l" +#line 815 "scan.l" sf_set_case_ins(0); YY_BREAK case 181: YY_RULE_SETUP -#line 818 "scan.l" +#line 816 "scan.l" sf_set_dot_all(0); YY_BREAK case 182: YY_RULE_SETUP -#line 819 "scan.l" +#line 817 "scan.l" sf_set_skip_ws(0); YY_BREAK @@ -3644,7 +3662,7 @@ case 183: (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 823 "scan.l" +#line 821 "scan.l" BEGIN(CCL); return '^'; YY_BREAK case 184: @@ -3652,12 +3670,12 @@ case 184: (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 824 "scan.l" +#line 822 "scan.l" return '^'; YY_BREAK case 185: YY_RULE_SETUP -#line 825 "scan.l" +#line 823 "scan.l" BEGIN(CCL); RETURNCHAR; YY_BREAK @@ -3667,23 +3685,23 @@ case 186: (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 829 "scan.l" +#line 827 "scan.l" return '-'; YY_BREAK case 187: YY_RULE_SETUP -#line 830 "scan.l" +#line 828 "scan.l" RETURNCHAR; YY_BREAK case 188: YY_RULE_SETUP -#line 831 "scan.l" +#line 829 "scan.l" BEGIN(SECT2); return ']'; YY_BREAK case 189: /* rule 189 can match eol */ YY_RULE_SETUP -#line 832 "scan.l" +#line 830 "scan.l" { synerr( _( "bad character class" ) ); BEGIN(SECT2); @@ -3694,127 +3712,127 @@ YY_RULE_SETUP case 190: YY_RULE_SETUP -#line 840 "scan.l" +#line 838 "scan.l" BEGIN(CCL); return CCE_ALNUM; YY_BREAK case 191: YY_RULE_SETUP -#line 841 "scan.l" +#line 839 "scan.l" BEGIN(CCL); return CCE_ALPHA; YY_BREAK case 192: YY_RULE_SETUP -#line 842 "scan.l" +#line 840 "scan.l" BEGIN(CCL); return CCE_BLANK; YY_BREAK case 193: YY_RULE_SETUP -#line 843 "scan.l" +#line 841 "scan.l" BEGIN(CCL); return CCE_CNTRL; YY_BREAK case 194: YY_RULE_SETUP -#line 844 "scan.l" +#line 842 "scan.l" BEGIN(CCL); return CCE_DIGIT; YY_BREAK case 195: YY_RULE_SETUP -#line 845 "scan.l" +#line 843 "scan.l" BEGIN(CCL); return CCE_GRAPH; YY_BREAK case 196: YY_RULE_SETUP -#line 846 "scan.l" +#line 844 "scan.l" BEGIN(CCL); return CCE_LOWER; YY_BREAK case 197: YY_RULE_SETUP -#line 847 "scan.l" +#line 845 "scan.l" BEGIN(CCL); return CCE_PRINT; YY_BREAK case 198: YY_RULE_SETUP -#line 848 "scan.l" +#line 846 "scan.l" BEGIN(CCL); return CCE_PUNCT; YY_BREAK case 199: YY_RULE_SETUP -#line 849 "scan.l" +#line 847 "scan.l" BEGIN(CCL); return CCE_SPACE; YY_BREAK case 200: YY_RULE_SETUP -#line 850 "scan.l" +#line 848 "scan.l" BEGIN(CCL); return CCE_UPPER; YY_BREAK case 201: YY_RULE_SETUP -#line 851 "scan.l" +#line 849 "scan.l" BEGIN(CCL); return CCE_XDIGIT; YY_BREAK case 202: YY_RULE_SETUP -#line 853 "scan.l" +#line 851 "scan.l" BEGIN(CCL); return CCE_NEG_ALNUM; YY_BREAK case 203: YY_RULE_SETUP -#line 854 "scan.l" +#line 852 "scan.l" BEGIN(CCL); return CCE_NEG_ALPHA; YY_BREAK case 204: YY_RULE_SETUP -#line 855 "scan.l" +#line 853 "scan.l" BEGIN(CCL); return CCE_NEG_BLANK; YY_BREAK case 205: YY_RULE_SETUP -#line 856 "scan.l" +#line 854 "scan.l" BEGIN(CCL); return CCE_NEG_CNTRL; YY_BREAK case 206: YY_RULE_SETUP -#line 857 "scan.l" +#line 855 "scan.l" BEGIN(CCL); return CCE_NEG_DIGIT; YY_BREAK case 207: YY_RULE_SETUP -#line 858 "scan.l" +#line 856 "scan.l" BEGIN(CCL); return CCE_NEG_GRAPH; YY_BREAK case 208: YY_RULE_SETUP -#line 859 "scan.l" +#line 857 "scan.l" BEGIN(CCL); return CCE_NEG_LOWER; YY_BREAK case 209: YY_RULE_SETUP -#line 860 "scan.l" +#line 858 "scan.l" BEGIN(CCL); return CCE_NEG_PRINT; YY_BREAK case 210: YY_RULE_SETUP -#line 861 "scan.l" +#line 859 "scan.l" BEGIN(CCL); return CCE_NEG_PUNCT; YY_BREAK case 211: YY_RULE_SETUP -#line 862 "scan.l" +#line 860 "scan.l" BEGIN(CCL); return CCE_NEG_SPACE; YY_BREAK case 212: YY_RULE_SETUP -#line 863 "scan.l" +#line 861 "scan.l" BEGIN(CCL); return CCE_NEG_UPPER; YY_BREAK case 213: YY_RULE_SETUP -#line 864 "scan.l" +#line 862 "scan.l" BEGIN(CCL); return CCE_NEG_XDIGIT; YY_BREAK case 214: YY_RULE_SETUP -#line 865 "scan.l" +#line 863 "scan.l" { format_synerr( _( "bad character class expression: %s" ), @@ -3826,7 +3844,7 @@ YY_RULE_SETUP case 215: YY_RULE_SETUP -#line 874 "scan.l" +#line 872 "scan.l" { yylval = myctoi( yytext ); return NUMBER; @@ -3834,12 +3852,12 @@ YY_RULE_SETUP YY_BREAK case 216: YY_RULE_SETUP -#line 879 "scan.l" +#line 877 "scan.l" return ','; YY_BREAK case 217: YY_RULE_SETUP -#line 880 "scan.l" +#line 878 "scan.l" { BEGIN(SECT2); if ( lex_compat || posix_compat ) @@ -3850,7 +3868,7 @@ YY_RULE_SETUP YY_BREAK case 218: YY_RULE_SETUP -#line 888 "scan.l" +#line 886 "scan.l" { synerr( _( "bad character inside {}'s" ) ); BEGIN(SECT2); @@ -3860,7 +3878,7 @@ YY_RULE_SETUP case 219: /* rule 219 can match eol */ YY_RULE_SETUP -#line 894 "scan.l" +#line 892 "scan.l" { synerr( _( "missing }" ) ); BEGIN(SECT2); @@ -3872,52 +3890,54 @@ YY_RULE_SETUP case 220: YY_RULE_SETUP -#line 904 "scan.l" +#line 902 "scan.l" bracelevel = 0; YY_BREAK case 221: YY_RULE_SETUP -#line 906 "scan.l" +#line 904 "scan.l" ACTION_ECHO; yy_push_state( CODE_COMMENT ); YY_BREAK case 222: YY_RULE_SETUP -#line 909 "scan.l" +#line 907 "scan.l" { - ACTION_ECHO; - CHECK_REJECT(yytext); - } + ACTION_ECHO; + CHECK_REJECT(yytext); + } YY_BREAK case 223: YY_RULE_SETUP -#line 913 "scan.l" +#line 911 "scan.l" { - ACTION_ECHO; - CHECK_YYMORE(yytext); - } + ACTION_ECHO; + CHECK_YYMORE(yytext); + } YY_BREAK case 224: YY_RULE_SETUP -#line 919 "scan.l" +#line 917 "scan.l" ACTION_ECHO; YY_BREAK case 225: /* rule 225 can match eol */ YY_RULE_SETUP -#line 920 "scan.l" +#line 918 "scan.l" { - ++linenum; - ACTION_ECHO; - if (bracelevel <= 0 || (doing_codeblock && indented_code)) { - if ( doing_rule_action ) - add_action( "\tYY_BREAK]""]\n" ); - - doing_rule_action = doing_codeblock = false; - BEGIN(SECT2); - } - } + ++linenum; + ACTION_ECHO; + if ( bracelevel == 0 || + (doing_codeblock && indented_code) ) + { + if ( doing_rule_action ) + add_action( "\tYY_BREAK]""]\n" ); + + doing_rule_action = doing_codeblock = false; + BEGIN(SECT2); + } + } YY_BREAK /* Reject and YYmore() are checked for above, in PERCENT_BRACE_ACTION */ @@ -3945,86 +3965,85 @@ ACTION_ECHO; case 230: YY_RULE_SETUP #line 940 "scan.l" -ACTION_ECHO; /* character constant */ +ACTION_ECHO; YY_BREAK case 231: YY_RULE_SETUP #line 941 "scan.l" -ACTION_ECHO; BEGIN(CHARACTER_CONSTANT); +ACTION_ECHO; /* character constant */ YY_BREAK case 232: YY_RULE_SETUP #line 942 "scan.l" -ACTION_ECHO; BEGIN(ACTION_STRING); +ACTION_ECHO; yy_push_state(CHARACTER_CONSTANT); YY_BREAK case 233: -/* rule 233 can match eol */ YY_RULE_SETUP #line 943 "scan.l" +ACTION_ECHO; BEGIN(ACTION_STRING); + YY_BREAK +case 234: +/* rule 234 can match eol */ +YY_RULE_SETUP +#line 944 "scan.l" { - ++linenum; - ACTION_ECHO; - if (bracelevel <= 0) { - if ( doing_rule_action ) - add_action( "\tYY_BREAK]""]\n" ); + ++linenum; + ACTION_ECHO; + if ( bracelevel == 0 ) + { + if ( doing_rule_action ) + add_action( "\tYY_BREAK]""]\n" ); - doing_rule_action = false; - BEGIN(SECT2); - } - } + doing_rule_action = false; + BEGIN(SECT2); + } + } YY_BREAK -case 234: +case 235: YY_RULE_SETUP -#line 954 "scan.l" +#line 956 "scan.l" ACTION_ECHO; YY_BREAK -case 235: +case 236: YY_RULE_SETUP -#line 958 "scan.l" +#line 960 "scan.l" ACTION_ECHO; YY_BREAK -case 236: +case 237: YY_RULE_SETUP -#line 959 "scan.l" +#line 961 "scan.l" ACTION_ECHO; BEGIN(ACTION); YY_BREAK -case 237: +case 238: YY_RULE_SETUP -#line 962 "scan.l" +#line 964 "scan.l" ACTION_ECHO; YY_BREAK -case 238: +case 239: YY_RULE_SETUP -#line 963 "scan.l" -ACTION_ECHO; BEGIN(ACTION); +#line 965 "scan.l" +ACTION_ECHO; yy_pop_state(); YY_BREAK -case 239: -/* rule 239 can match eol */ -YY_RULE_SETUP -#line 966 "scan.l" -ACTION_ECHO; - YY_BREAK case 240: -/* rule 240 can match eol */ YY_RULE_SETUP -#line 967 "scan.l" +#line 968 "scan.l" ACTION_ECHO; YY_BREAK case 241: /* rule 241 can match eol */ YY_RULE_SETUP -#line 968 "scan.l" -++linenum; ACTION_ECHO; if (bracelevel <= 0) { BEGIN(SECT2); } else { BEGIN(ACTION); } +#line 969 "scan.l" +++linenum; ACTION_ECHO; YY_BREAK case 242: YY_RULE_SETUP -#line 969 "scan.l" +#line 970 "scan.l" ACTION_ECHO; YY_BREAK @@ -4034,7 +4053,7 @@ case YY_STATE_EOF(COMMENT_DISCARD): case YY_STATE_EOF(ACTION): case YY_STATE_EOF(ACTION_STRING): case YY_STATE_EOF(CHARACTER_CONSTANT): -#line 972 "scan.l" +#line 973 "scan.l" { synerr( _( "EOF encountered inside an action" ) ); yyterminate(); @@ -4043,7 +4062,7 @@ case YY_STATE_EOF(CHARACTER_CONSTANT): case YY_STATE_EOF(EXTENDED_COMMENT): case YY_STATE_EOF(GROUP_WITH_PARAMS): case YY_STATE_EOF(GROUP_MINUS_PARAMS): -#line 977 "scan.l" +#line 978 "scan.l" { synerr( _( "EOF encountered inside pattern" ) ); yyterminate(); @@ -4051,7 +4070,7 @@ case YY_STATE_EOF(GROUP_MINUS_PARAMS): YY_BREAK case 243: YY_RULE_SETUP -#line 982 "scan.l" +#line 983 "scan.l" { yylval = myesc( (unsigned char *) yytext ); @@ -4064,27 +4083,28 @@ YY_RULE_SETUP case 244: YY_RULE_SETUP -#line 992 "scan.l" +#line 993 "scan.l" fputs(escaped_qstart, yyout); YY_BREAK case 245: YY_RULE_SETUP -#line 993 "scan.l" +#line 994 "scan.l" fputs(escaped_qend, yyout); YY_BREAK case 246: /* rule 246 can match eol */ YY_RULE_SETUP -#line 994 "scan.l" +#line 995 "scan.l" ECHO; YY_BREAK case 247: +/* rule 247 can match eol */ YY_RULE_SETUP -#line 995 "scan.l" +#line 996 "scan.l" ECHO; YY_BREAK case YY_STATE_EOF(SECT3): -#line 996 "scan.l" +#line 997 "scan.l" { sectnum = 0; yyterminate(); @@ -4094,27 +4114,28 @@ case YY_STATE_EOF(SECT3): case 248: YY_RULE_SETUP -#line 1002 "scan.l" +#line 1003 "scan.l" fprintf(yyout, "[""[%s]""]", escaped_qstart); YY_BREAK case 249: YY_RULE_SETUP -#line 1003 "scan.l" +#line 1004 "scan.l" fprintf(yyout, "[""[%s]""]", escaped_qend); YY_BREAK case 250: /* rule 250 can match eol */ YY_RULE_SETUP -#line 1004 "scan.l" +#line 1005 "scan.l" ECHO; YY_BREAK case 251: +/* rule 251 can match eol */ YY_RULE_SETUP -#line 1005 "scan.l" +#line 1006 "scan.l" ECHO; YY_BREAK case YY_STATE_EOF(SECT3_NOESCAPE): -#line 1006 "scan.l" +#line 1007 "scan.l" { sectnum = 0; yyterminate(); @@ -4124,15 +4145,15 @@ case YY_STATE_EOF(SECT3_NOESCAPE): case 252: /* rule 252 can match eol */ YY_RULE_SETUP -#line 1011 "scan.l" +#line 1012 "scan.l" format_synerr( _( "bad character: %s" ), yytext ); YY_BREAK case 253: YY_RULE_SETUP -#line 1013 "scan.l" +#line 1014 "scan.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 4135 "scan.c" +#line 4156 "scan.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(SECT2): case YY_STATE_EOF(CODEBLOCK): @@ -4223,7 +4244,7 @@ case YY_STATE_EOF(LINEDIR): { (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap( ) ) + if ( yywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -4355,8 +4376,7 @@ static int yy_get_next_buffer (void) b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yyrealloc( (void *) b->yy_ch_buf, - (yy_size_t) (b->yy_buf_size + 2) ); + yyrealloc((void *) b->yy_ch_buf,(yy_size_t) (b->yy_buf_size + 2) ); } else /* Can't grow it, we don't own it. */ @@ -4388,7 +4408,7 @@ static int yy_get_next_buffer (void) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + yyrestart(yyin ); } else @@ -4405,12 +4425,9 @@ static int yy_get_next_buffer (void) if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( - (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size ); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,(yy_size_t) new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } (yy_n_chars) += number_to_move; @@ -4443,7 +4460,7 @@ static int yy_get_next_buffer (void) 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 >= 1114 ) + if ( yy_current_state >= 1115 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -4471,11 +4488,11 @@ static int yy_get_next_buffer (void) 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 >= 1114 ) + if ( yy_current_state >= 1115 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 1113); + yy_is_jam = (yy_current_state == 1114); return yy_is_jam ? 0 : yy_current_state; } @@ -4562,13 +4579,13 @@ static int yy_get_next_buffer (void) */ /* Reset buffer status. */ - yyrestart( yyin ); + yyrestart(yyin ); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap( ) ) + if ( yywrap( ) ) return 0; if ( ! (yy_did_buffer_switch_on_eof) ) @@ -4608,11 +4625,11 @@ static int yy_get_next_buffer (void) if ( ! YY_CURRENT_BUFFER ){ yyensure_buffer_stack (); YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE ); + yy_create_buffer(yyin,YY_BUF_SIZE ); } - yy_init_buffer( YY_CURRENT_BUFFER, input_file ); - yy_load_buffer_state( ); + yy_init_buffer(YY_CURRENT_BUFFER,input_file ); + yy_load_buffer_state( ); } /** Switch to a different input buffer. @@ -4640,7 +4657,7 @@ static int yy_get_next_buffer (void) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( ); + yy_load_buffer_state( ); /* We don't actually know whether we did this switch during * EOF (yywrap()) processing, but the only time this flag @@ -4668,7 +4685,7 @@ static void yy_load_buffer_state (void) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); @@ -4677,13 +4694,13 @@ static void yy_load_buffer_state (void) /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) ); + b->yy_ch_buf = (char *) yyalloc((yy_size_t) (b->yy_buf_size + 2) ); if ( ! b->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + yy_init_buffer(b,file ); return b; } @@ -4702,9 +4719,9 @@ static void yy_load_buffer_state (void) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yyfree( (void *) b->yy_ch_buf ); + yyfree((void *) b->yy_ch_buf ); - yyfree( (void *) b ); + yyfree((void *) b ); } /* Initializes or reinitializes a buffer. @@ -4716,7 +4733,7 @@ static void yy_load_buffer_state (void) { int oerrno = errno; - yy_flush_buffer( b ); + yy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; @@ -4759,7 +4776,7 @@ static void yy_load_buffer_state (void) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( ); + yy_load_buffer_state( ); } /** Pushes the new state onto the stack. The new state becomes @@ -4790,7 +4807,7 @@ void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) YY_CURRENT_BUFFER_LVALUE = new_buffer; /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } @@ -4809,7 +4826,7 @@ void yypop_buffer_state (void) --(yy_buffer_stack_top); if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( ); + yy_load_buffer_state( ); (yy_did_buffer_switch_on_eof) = 1; } } @@ -4833,9 +4850,9 @@ static void yyensure_buffer_stack (void) ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -4864,7 +4881,7 @@ static void yyensure_buffer_stack (void) * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -4876,7 +4893,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) /* They forgot to leave room for the EOB's. */ return NULL; - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); @@ -4890,7 +4907,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + yy_switch_to_buffer(b ); return b; } @@ -4906,7 +4923,7 @@ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) YY_BUFFER_STATE yy_scan_string (const char * yystr ) { - return yy_scan_bytes( yystr, (int) strlen(yystr) ); + return yy_scan_bytes(yystr,(int) strlen(yystr) ); } /** Setup the input buffer state to scan the given bytes. The next call to yylex() will @@ -4925,7 +4942,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) /* Get memory for full buffer, including space for trailing EOB's. */ n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc( n ); + buf = (char *) yyalloc(n ); if ( ! buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); @@ -4934,7 +4951,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = yy_scan_buffer(buf,n ); if ( ! b ) YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); @@ -4956,11 +4973,10 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) new_size = (yy_size_t) (yy_start_stack_depth) * sizeof( int ); if ( ! (yy_start_stack) ) - (yy_start_stack) = (int *) yyalloc( new_size ); + (yy_start_stack) = (int *) yyalloc(new_size ); else - (yy_start_stack) = (int *) yyrealloc( - (void *) (yy_start_stack), new_size ); + (yy_start_stack) = (int *) yyrealloc((void *) (yy_start_stack),new_size ); if ( ! (yy_start_stack) ) YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); @@ -4985,7 +5001,7 @@ YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len ) static void yynoreturn yy_fatal_error (const char* msg ) { - fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -5013,7 +5029,7 @@ static void yynoreturn yy_fatal_error (const char* msg ) */ int yyget_lineno (void) { - + return yylineno; } @@ -5124,7 +5140,7 @@ int yylex_destroy (void) /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_delete_buffer(YY_CURRENT_BUFFER ); YY_CURRENT_BUFFER_LVALUE = NULL; yypop_buffer_state(); } @@ -5134,7 +5150,7 @@ int yylex_destroy (void) (yy_buffer_stack) = NULL; /* Destroy the start condition stack. */ - yyfree( (yy_start_stack) ); + yyfree((yy_start_stack) ); (yy_start_stack) = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time @@ -5194,7 +5210,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 1013 "scan.l" +#line 1014 "scan.l" diff --git a/src/scan.l b/src/scan.l index 66db864..d5fe347 100644 --- a/src/scan.l +++ b/src/scan.l @@ -74,7 +74,7 @@ extern const char *escaped_qstart, *escaped_qend; #define RETURNNAME \ if(yyleng < MAXLINE) \ { \ - strncpy( nmstr, yytext, sizeof(nmstr) ); \ + strcpy( nmstr, yytext ); \ return NAME; \ } \ else \ @@ -102,22 +102,20 @@ extern const char *escaped_qstart, *escaped_qend; posix_compat = true; #define START_CODEBLOCK(x) do { \ - /* Emit the needed line directive... */\ - if (indented_code == false) { \ - linenum++; \ - line_directive_out(NULL, 1); \ - } \ - add_action(M4QSTART); \ - yy_push_state(CODEBLOCK); \ - if ((indented_code = x)) ACTION_ECHO; \ -} while(0) - + /* Emit the needed line directive... */\ + if (indented_code == false) { \ + linenum++; \ + line_directive_out(NULL, 1); \ + } \ + add_action(M4QSTART); \ + yy_push_state(CODEBLOCK); \ + if ((indented_code = x)) ACTION_ECHO; \ + } while(0) #define END_CODEBLOCK do { \ - yy_pop_state();\ + yy_pop_state();\ add_action(M4QEND); \ - if (!indented_code) line_directive_out(NULL, 0);\ -} while (0) - + if (!indented_code) line_directive_out(NULL, 0);\ + } while (0) %} %option caseless nodefault noreject stack noyy_top_state @@ -207,7 +205,7 @@ M4QEND "]""]" ^{NAME} { if(yyleng < MAXLINE) { - strncpy( nmstr, yytext, sizeof(nmstr) ); + strcpy( nmstr, yytext ); } else { @@ -263,7 +261,8 @@ M4QEND "]""]" } . /* ignore spurious characters */ } -{ +{ {M4QSTART} ACTION_ECHO_QSTART; {M4QEND} ACTION_ECHO_QEND; } @@ -318,7 +317,7 @@ M4QEND "]""]" {NOT_WS}[^\r\n]* { if(yyleng < MAXLINE) { - strncpy( nmdef, yytext, sizeof(nmdef) ); + strcpy( nmdef, yytext ); } else { @@ -460,7 +459,7 @@ M4QEND "]""]" \"[^"\n]*\" { if(yyleng-1 < MAXLINE) { - strncpy( nmstr, yytext + 1, sizeof(nmstr) ); + strcpy( nmstr, yytext + 1 ); } else { @@ -487,18 +486,17 @@ M4QEND "]""]" ^{WS} START_CODEBLOCK(true); /* indented code in prolog */ - ^{NOT_WS}.* { - /* non-indented code */ - if ( bracelevel <= 0 ) { - /* not in %{ ... %} */ - yyless( 0 ); /* put it all back */ - yy_set_bol( 1 ); - mark_prolog(); - BEGIN(SECT2); - } else { - START_CODEBLOCK(true); - } - } + ^{NOT_WS}.* { /* non-indented code */ + if ( bracelevel <= 0 ) + { /* not in %{ ... %} */ + yyless( 0 ); /* put it all back */ + yy_set_bol( 1 ); + mark_prolog(); + BEGIN(SECT2); + } + else + ACTION_ECHO; + } . ACTION_ECHO; {NL} ++linenum; ACTION_ECHO; @@ -637,7 +635,7 @@ M4QEND "]""]" if(yyleng < MAXLINE) { - strncpy( nmstr, yytext, sizeof(nmstr) ); + strcpy( nmstr, yytext ); } else { @@ -695,7 +693,7 @@ M4QEND "]""]" if(yyleng-1 < MAXLINE) { - strncpy( nmstr, yytext + 1, sizeof(nmstr) ); + strcpy( nmstr, yytext + 1 ); } else { @@ -905,28 +903,30 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ "/*" ACTION_ECHO; yy_push_state( CODE_COMMENT ); { - "reject" { - ACTION_ECHO; - CHECK_REJECT(yytext); - } - "yymore" { - ACTION_ECHO; - CHECK_YYMORE(yytext); - } + "reject" { + ACTION_ECHO; + CHECK_REJECT(yytext); + } + "yymore" { + ACTION_ECHO; + CHECK_YYMORE(yytext); + } } - . ACTION_ECHO; - {NL} { - ++linenum; - ACTION_ECHO; - if (bracelevel <= 0 || (doing_codeblock && indented_code)) { - if ( doing_rule_action ) - add_action( "\tYY_BREAK]""]\n" ); - - doing_rule_action = doing_codeblock = false; - BEGIN(SECT2); - } - } + . ACTION_ECHO; + {NL} { + ++linenum; + ACTION_ECHO; + if ( bracelevel == 0 || + (doing_codeblock && indented_code) ) + { + if ( doing_rule_action ) + add_action( "\tYY_BREAK]""]\n" ); + + doing_rule_action = doing_codeblock = false; + BEGIN(SECT2); + } + } } @@ -935,37 +935,38 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ "{" ACTION_ECHO; ++bracelevel; "}" ACTION_ECHO; --bracelevel; [^[:alpha:]_{}\"'/\n\[\]]+ ACTION_ECHO; - {NAME} ACTION_ECHO; + [\[\]] ACTION_ECHO; + {NAME} ACTION_ECHO; "'"([^\'\\\n]|\\.)"'" ACTION_ECHO; /* character constant */ - "'" ACTION_ECHO; BEGIN(CHARACTER_CONSTANT); + "'" ACTION_ECHO; yy_push_state(CHARACTER_CONSTANT); \" ACTION_ECHO; BEGIN(ACTION_STRING); - {NL} { - ++linenum; - ACTION_ECHO; - if (bracelevel <= 0) { - if ( doing_rule_action ) - add_action( "\tYY_BREAK]""]\n" ); + {NL} { + ++linenum; + ACTION_ECHO; + if ( bracelevel == 0 ) + { + if ( doing_rule_action ) + add_action( "\tYY_BREAK]""]\n" ); - doing_rule_action = false; - BEGIN(SECT2); - } - } - . ACTION_ECHO; + doing_rule_action = false; + BEGIN(SECT2); + } + } + . ACTION_ECHO; } { - [^\[\]\"\\\n]+ ACTION_ECHO; + [^\]\"\\\n\[MmY]+ ACTION_ECHO; \" ACTION_ECHO; BEGIN(ACTION); } { - [^\[\]\'\\\n]+ ACTION_ECHO; - \' ACTION_ECHO; BEGIN(ACTION); + [^\[\]\'\\\nMmY]+ ACTION_ECHO; + \' ACTION_ECHO; yy_pop_state(); } { - (\\\n)* ACTION_ECHO; - \\(\\\n)*. ACTION_ECHO; - {NL} ++linenum; ACTION_ECHO; if (bracelevel <= 0) { BEGIN(SECT2); } else { BEGIN(ACTION); } - . ACTION_ECHO; + \\. ACTION_ECHO; + {NL} ++linenum; ACTION_ECHO; + . ACTION_ECHO; } <> { @@ -990,8 +991,8 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ { {M4QSTART} fputs(escaped_qstart, yyout); {M4QEND} fputs(escaped_qend, yyout); - [^\[\]]* ECHO; - [][] ECHO; + [^\[\]\n]*(\n?) ECHO; + .|\n ECHO; <> { sectnum = 0; yyterminate(); @@ -1000,8 +1001,8 @@ nmstr[yyleng - 2 - end_is_ws] = '\0'; /* chop trailing brace */ { {M4QSTART} fprintf(yyout, "[""[%s]""]", escaped_qstart); {M4QEND} fprintf(yyout, "[""[%s]""]", escaped_qend); - [^][]* ECHO; - [][] ECHO; + [^\[\]\n]*(\n?) ECHO; + (.|\n) ECHO; <> { sectnum = 0; yyterminate(); diff --git a/src/skel.c b/src/skel.c index 4943bfc..844533e 100644 --- a/src/skel.c +++ b/src/skel.c @@ -3,14 +3,62 @@ #include "flexdef.h" const char *skel[] = { + "%# -*-C-*- vi: set ft=c:", + "%# This file is processed in several stages.", + "%# Here are the stages, as best as I can describe:", + "%#", + "%# 1. flex.skl is processed through GNU m4 during the", + "%# pre-compilation stage of flex. Only macros starting", + "%# with `m4preproc_' are processed, and quoting is normal.", + "%#", + "%# 2. The preprocessed skeleton is translated verbatim into a", + "%# C array, saved as \"skel.c\" and compiled into the flex binary.", + "%#", + "%# 3. At runtime, the skeleton is generated and filtered (again)", + "%# through m4. Macros beginning with `m4_' will be processed.", + "%# The quoting is \"[[\" and \"]]\" so we don't interfere with", + "%# user code.", + "%# ", + "%# All generate macros for the m4 stage contain the text \"m4\" or \"M4\"", + "%# in them. This is to distinguish them from CPP macros.", + "%# The exception to this rule is YY_G, which is an m4 macro, ", + "%# but it needs to be remain short because it is used everywhere.", + "%#", "/* A lexical scanner generated by flex */", "", + "%# Macros for preproc stage.", "", "", + "%# Macros for runtime processing stage.", "m4_changecom", "m4_changequote", "m4_changequote([[, ]])", "", + "%# ", + "%# Lines in this skeleton starting with a \"%\" character are \"control lines\"", + "%# and affect the generation of the scanner. The possible control codes are", + "%# listed and processed in misc.c.", + "%#", + "%# %# - A comment. The current line is omitted from the generated scanner.", + "%# %if-c++-only - The following lines are printed for C++ scanners ONLY.", + "%# %if-c-only - The following lines are NOT printed for C++ scanners.", + "%# %if-c-or-c++ - The following lines are printed in BOTH C and C++ scanners.", + "%# %if-reentrant - Print for reentrant scanners.(push)", + "%# %if-not-reentrant - Print for non-reentrant scanners. (push)", + "%# %if-bison-bridge - Print for bison-bridge. (push)", + "%# %if-not-bison-bridge - Print for non-bison-bridge. (push)", + "%# %endif - pop from the previous if code.", + "%# %% - A stop-point, where code is inserted by flex.", + "%# Each stop-point is numbered here and also in the code generator.", + "%# (See gen.c, etc. for details.)", + "%# %not-for-header - Begin code that should NOT appear in a \".h\" file.", + "%# %ok-for-header - %c and %e are used for building a header file.", + "%# %if-tables-serialization", + "%#", + "%# All control-lines EXCEPT comment lines (\"%#\") will be inserted into", + "%# the generated scanner as a C-style comment. This is to aid those who", + "%# edit the skeleton.", + "%#", "", "%not-for-header", "%if-c-only", @@ -18,17 +66,11 @@ const char *skel[] = { "m4_ifelse(M4_YY_PREFIX,yy,,", "#define yy_create_buffer M4_YY_PREFIX[[_create_buffer]]", "#define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]]", - "#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]]", - "#define yy_scan_string M4_YY_PREFIX[[_scan_string]]", - "#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]]", + "#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]", "#define yy_init_buffer M4_YY_PREFIX[[_init_buffer]]", "#define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]]", "#define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]]", "#define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]]", - "#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]]", - "#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]]", - "#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]]", - "#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]]", "#define yyin M4_YY_PREFIX[[in]]", "#define yyleng M4_YY_PREFIX[[leng]]", "#define yylex M4_YY_PREFIX[[lex]]", @@ -48,17 +90,22 @@ const char *skel[] = { "#define FLEX_SCANNER", "#define YY_FLEX_MAJOR_VERSION 2", "#define YY_FLEX_MINOR_VERSION 6", - "#define YY_FLEX_SUBMINOR_VERSION 4", + "#define YY_FLEX_SUBMINOR_VERSION 2", "#if YY_FLEX_SUBMINOR_VERSION > 0", "#define FLEX_BETA", "#endif", "", + "%# Some negated symbols", "m4_ifdef( [[M4_YY_IN_HEADER]], , [[m4_define([[M4_YY_NOT_IN_HEADER]], [[]])]])", "m4_ifdef( [[M4_YY_REENTRANT]], , [[m4_define([[M4_YY_NOT_REENTRANT]], [[]])]])", "", + "%# This is the m4 way to say \"(stack_used || is_reentrant)", "m4_ifdef( [[M4_YY_STACK_USED]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]])", "m4_ifdef( [[M4_YY_REENTRANT]], [[m4_define([[M4_YY_HAS_START_STACK_VARS]])]])", "", + "%# Prefixes.", + "%# The complexity here is necessary so that m4 preserves", + "%# the argument lists to each C function.", "", "", "m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]])", @@ -76,372 +123,78 @@ const char *skel[] = { "%endif", "", "%if-c-only", - "m4_ifelse(M4_YY_PREFIX,yy,,", - " ", - "[[#ifdef yy_create_buffer", - "#define ]]M4_YY_PREFIX[[_create_buffer_ALREADY_DEFINED", - "#else", - "#define yy_create_buffer ]]M4_YY_PREFIX[[_create_buffer", - "#endif]]", - "", - " ", - "[[#ifdef yy_delete_buffer", - "#define ]]M4_YY_PREFIX[[_delete_buffer_ALREADY_DEFINED", - "#else", - "#define yy_delete_buffer ]]M4_YY_PREFIX[[_delete_buffer", - "#endif]]", - "", - " ", - "[[#ifdef yy_scan_buffer", - "#define ]]M4_YY_PREFIX[[_scan_buffer_ALREADY_DEFINED", - "#else", - "#define yy_scan_buffer ]]M4_YY_PREFIX[[_scan_buffer", - "#endif]]", - "", - " ", - "[[#ifdef yy_scan_string", - "#define ]]M4_YY_PREFIX[[_scan_string_ALREADY_DEFINED", - "#else", - "#define yy_scan_string ]]M4_YY_PREFIX[[_scan_string", - "#endif]]", - "", - " ", - "[[#ifdef yy_scan_bytes", - "#define ]]M4_YY_PREFIX[[_scan_bytes_ALREADY_DEFINED", - "#else", - "#define yy_scan_bytes ]]M4_YY_PREFIX[[_scan_bytes", - "#endif]]", - "", - " ", - "[[#ifdef yy_init_buffer", - "#define ]]M4_YY_PREFIX[[_init_buffer_ALREADY_DEFINED", - "#else", - "#define yy_init_buffer ]]M4_YY_PREFIX[[_init_buffer", - "#endif]]", - "", - " ", - "[[#ifdef yy_flush_buffer", - "#define ]]M4_YY_PREFIX[[_flush_buffer_ALREADY_DEFINED", - "#else", - "#define yy_flush_buffer ]]M4_YY_PREFIX[[_flush_buffer", - "#endif]]", - "", - " ", - "[[#ifdef yy_load_buffer_state", - "#define ]]M4_YY_PREFIX[[_load_buffer_state_ALREADY_DEFINED", - "#else", - "#define yy_load_buffer_state ]]M4_YY_PREFIX[[_load_buffer_state", - "#endif]]", - "", - " ", - "[[#ifdef yy_switch_to_buffer", - "#define ]]M4_YY_PREFIX[[_switch_to_buffer_ALREADY_DEFINED", - "#else", - "#define yy_switch_to_buffer ]]M4_YY_PREFIX[[_switch_to_buffer", - "#endif]]", - "", - " ", - "[[#ifdef yypush_buffer_state", - "#define ]]M4_YY_PREFIX[[push_buffer_state_ALREADY_DEFINED", - "#else", - "#define yypush_buffer_state ]]M4_YY_PREFIX[[push_buffer_state", - "#endif]]", - "", - " ", - "[[#ifdef yypop_buffer_state", - "#define ]]M4_YY_PREFIX[[pop_buffer_state_ALREADY_DEFINED", - "#else", - "#define yypop_buffer_state ]]M4_YY_PREFIX[[pop_buffer_state", - "#endif]]", - "", - " ", - "[[#ifdef yyensure_buffer_stack", - "#define ]]M4_YY_PREFIX[[ensure_buffer_stack_ALREADY_DEFINED", - "#else", - "#define yyensure_buffer_stack ]]M4_YY_PREFIX[[ensure_buffer_stack", - "#endif]]", - "", - " ", - "[[#ifdef yylex", - "#define ]]M4_YY_PREFIX[[lex_ALREADY_DEFINED", - "#else", - "#define yylex ]]M4_YY_PREFIX[[lex", - "#endif]]", - "", - " ", - "[[#ifdef yyrestart", - "#define ]]M4_YY_PREFIX[[restart_ALREADY_DEFINED", - "#else", - "#define yyrestart ]]M4_YY_PREFIX[[restart", - "#endif]]", - "", - " ", - "[[#ifdef yylex_init", - "#define ]]M4_YY_PREFIX[[lex_init_ALREADY_DEFINED", - "#else", - "#define yylex_init ]]M4_YY_PREFIX[[lex_init", - "#endif]]", - "", - " ", - "[[#ifdef yylex_init_extra", - "#define ]]M4_YY_PREFIX[[lex_init_extra_ALREADY_DEFINED", - "#else", - "#define yylex_init_extra ]]M4_YY_PREFIX[[lex_init_extra", - "#endif]]", - "", - " ", - "[[#ifdef yylex_destroy", - "#define ]]M4_YY_PREFIX[[lex_destroy_ALREADY_DEFINED", - "#else", - "#define yylex_destroy ]]M4_YY_PREFIX[[lex_destroy", - "#endif]]", - "", - " ", - "[[#ifdef yyget_debug", - "#define ]]M4_YY_PREFIX[[get_debug_ALREADY_DEFINED", - "#else", - "#define yyget_debug ]]M4_YY_PREFIX[[get_debug", - "#endif]]", - "", - " ", - "[[#ifdef yyset_debug", - "#define ]]M4_YY_PREFIX[[set_debug_ALREADY_DEFINED", - "#else", - "#define yyset_debug ]]M4_YY_PREFIX[[set_debug", - "#endif]]", - "", - " ", - "[[#ifdef yyget_extra", - "#define ]]M4_YY_PREFIX[[get_extra_ALREADY_DEFINED", - "#else", - "#define yyget_extra ]]M4_YY_PREFIX[[get_extra", - "#endif]]", - "", - " ", - "[[#ifdef yyset_extra", - "#define ]]M4_YY_PREFIX[[set_extra_ALREADY_DEFINED", - "#else", - "#define yyset_extra ]]M4_YY_PREFIX[[set_extra", - "#endif]]", - "", - " ", - "[[#ifdef yyget_in", - "#define ]]M4_YY_PREFIX[[get_in_ALREADY_DEFINED", - "#else", - "#define yyget_in ]]M4_YY_PREFIX[[get_in", - "#endif]]", - "", - " ", - "[[#ifdef yyset_in", - "#define ]]M4_YY_PREFIX[[set_in_ALREADY_DEFINED", - "#else", - "#define yyset_in ]]M4_YY_PREFIX[[set_in", - "#endif]]", - "", - " ", - "[[#ifdef yyget_out", - "#define ]]M4_YY_PREFIX[[get_out_ALREADY_DEFINED", - "#else", - "#define yyget_out ]]M4_YY_PREFIX[[get_out", - "#endif]]", - "", - " ", - "[[#ifdef yyset_out", - "#define ]]M4_YY_PREFIX[[set_out_ALREADY_DEFINED", - "#else", - "#define yyset_out ]]M4_YY_PREFIX[[set_out", - "#endif]]", - "", - " ", - "[[#ifdef yyget_leng", - "#define ]]M4_YY_PREFIX[[get_leng_ALREADY_DEFINED", - "#else", - "#define yyget_leng ]]M4_YY_PREFIX[[get_leng", - "#endif]]", - "", - " ", - "[[#ifdef yyget_text", - "#define ]]M4_YY_PREFIX[[get_text_ALREADY_DEFINED", - "#else", - "#define yyget_text ]]M4_YY_PREFIX[[get_text", - "#endif]]", - "", - " ", - "[[#ifdef yyget_lineno", - "#define ]]M4_YY_PREFIX[[get_lineno_ALREADY_DEFINED", - "#else", - "#define yyget_lineno ]]M4_YY_PREFIX[[get_lineno", - "#endif]]", - "", - " ", - "[[#ifdef yyset_lineno", - "#define ]]M4_YY_PREFIX[[set_lineno_ALREADY_DEFINED", - "#else", - "#define yyset_lineno ]]M4_YY_PREFIX[[set_lineno", - "#endif]]", - "", + " m4_define(yy[[_create_buffer]], [[M4_YY_PREFIX[[_create_buffer]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_delete_buffer]], [[M4_YY_PREFIX[[_delete_buffer]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_scan_buffer]], [[M4_YY_PREFIX[[_scan_buffer]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_scan_string]], [[M4_YY_PREFIX[[_scan_string]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_scan_bytes]], [[M4_YY_PREFIX[[_scan_bytes]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_init_buffer]], [[M4_YY_PREFIX[[_init_buffer]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_flush_buffer]], [[M4_YY_PREFIX[[_flush_buffer]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_load_buffer_state]], [[M4_YY_PREFIX[[_load_buffer_state]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_switch_to_buffer]], [[M4_YY_PREFIX[[_switch_to_buffer]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[push_buffer_state]], [[M4_YY_PREFIX[[push_buffer_state]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[pop_buffer_state]], [[M4_YY_PREFIX[[pop_buffer_state]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[ensure_buffer_stack]], [[M4_YY_PREFIX[[ensure_buffer_stack]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[lex]], [[M4_YY_PREFIX[[lex]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[restart]], [[M4_YY_PREFIX[[restart]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[lex_init]], [[M4_YY_PREFIX[[lex_init]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[lex_init_extra]], [[M4_YY_PREFIX[[lex_init_extra]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[lex_destroy]], [[M4_YY_PREFIX[[lex_destroy]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_debug]], [[M4_YY_PREFIX[[get_debug]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_debug]], [[M4_YY_PREFIX[[set_debug]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_extra]], [[M4_YY_PREFIX[[get_extra]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_extra]], [[M4_YY_PREFIX[[set_extra]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_in]], [[M4_YY_PREFIX[[get_in]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_in]], [[M4_YY_PREFIX[[set_in]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_out]], [[M4_YY_PREFIX[[get_out]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_out]], [[M4_YY_PREFIX[[set_out]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_leng]], [[M4_YY_PREFIX[[get_leng]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_text]], [[M4_YY_PREFIX[[get_text]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[get_lineno]], [[M4_YY_PREFIX[[get_lineno]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_lineno]], [[M4_YY_PREFIX[[set_lineno]]m4_ifelse($#,0,,[[($@)]])]])", " m4_ifdef( [[M4_YY_REENTRANT]],", " [[", - " ", - "[[#ifdef yyget_column", - "#define ]]M4_YY_PREFIX[[get_column_ALREADY_DEFINED", - "#else", - "#define yyget_column ]]M4_YY_PREFIX[[get_column", - "#endif]]", - "", - " ", - "[[#ifdef yyset_column", - "#define ]]M4_YY_PREFIX[[set_column_ALREADY_DEFINED", - "#else", - "#define yyset_column ]]M4_YY_PREFIX[[set_column", - "#endif]]", - "", + " m4_define(yy[[get_column]], [[M4_YY_PREFIX[[get_column]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_column]], [[M4_YY_PREFIX[[set_column]]m4_ifelse($#,0,,[[($@)]])]])", " ]])", - " ", - "[[#ifdef yywrap", - "#define ]]M4_YY_PREFIX[[wrap_ALREADY_DEFINED", - "#else", - "#define yywrap ]]M4_YY_PREFIX[[wrap", - "#endif]]", - "", - ")", + " m4_define(yy[[wrap]], [[M4_YY_PREFIX[[wrap]]m4_ifelse($#,0,,[[($@)]])]])", "%endif", "", "m4_ifdef( [[M4_YY_BISON_LVAL]],", "[[", - " ", - "[[#ifdef yyget_lval", - "#define ]]M4_YY_PREFIX[[get_lval_ALREADY_DEFINED", - "#else", - "#define yyget_lval ]]M4_YY_PREFIX[[get_lval", - "#endif]]", - "", - " ", - "[[#ifdef yyset_lval", - "#define ]]M4_YY_PREFIX[[set_lval_ALREADY_DEFINED", - "#else", - "#define yyset_lval ]]M4_YY_PREFIX[[set_lval", - "#endif]]", - "", + " m4_define(yy[[get_lval]], [[M4_YY_PREFIX[[get_lval]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_lval]], [[M4_YY_PREFIX[[set_lval]]m4_ifelse($#,0,,[[($@)]])]])", "]])", "", "m4_ifdef( [[]],", "[[", - " ", - "[[#ifdef yyget_lloc", - "#define ]]M4_YY_PREFIX[[get_lloc_ALREADY_DEFINED", - "#else", - "#define yyget_lloc ]]M4_YY_PREFIX[[get_lloc", - "#endif]]", - "", - " ", - "[[#ifdef yyset_lloc", - "#define ]]M4_YY_PREFIX[[set_lloc_ALREADY_DEFINED", - "#else", - "#define yyset_lloc ]]M4_YY_PREFIX[[set_lloc", - "#endif]]", - "", + " m4_define(yy[[get_lloc]], [[M4_YY_PREFIX[[get_lloc]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[set_lloc]], [[M4_YY_PREFIX[[set_lloc]]m4_ifelse($#,0,,[[($@)]])]])", "]])", "", "", - "m4_ifelse(M4_YY_PREFIX,yy,,", - " ", - "[[#ifdef yyalloc", - "#define ]]M4_YY_PREFIX[[alloc_ALREADY_DEFINED", - "#else", - "#define yyalloc ]]M4_YY_PREFIX[[alloc", - "#endif]]", - "", - " ", - "[[#ifdef yyrealloc", - "#define ]]M4_YY_PREFIX[[realloc_ALREADY_DEFINED", - "#else", - "#define yyrealloc ]]M4_YY_PREFIX[[realloc", - "#endif]]", - "", - " ", - "[[#ifdef yyfree", - "#define ]]M4_YY_PREFIX[[free_ALREADY_DEFINED", - "#else", - "#define yyfree ]]M4_YY_PREFIX[[free", - "#endif]]", - "", - ")", + " m4_define(yy[[alloc]], [[M4_YY_PREFIX[[alloc]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[realloc]], [[M4_YY_PREFIX[[realloc]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[free]], [[M4_YY_PREFIX[[free]]m4_ifelse($#,0,,[[($@)]])]])", "", "%if-c-only", - "m4_ifelse(M4_YY_PREFIX,yy,,", "m4_ifdef( [[M4_YY_NOT_REENTRANT]],", "[[", - " ", - "[[#ifdef yytext", - "#define ]]M4_YY_PREFIX[[text_ALREADY_DEFINED", - "#else", - "#define yytext ]]M4_YY_PREFIX[[text", - "#endif]]", - "", - " ", - "[[#ifdef yyleng", - "#define ]]M4_YY_PREFIX[[leng_ALREADY_DEFINED", - "#else", - "#define yyleng ]]M4_YY_PREFIX[[leng", - "#endif]]", - "", - " ", - "[[#ifdef yyin", - "#define ]]M4_YY_PREFIX[[in_ALREADY_DEFINED", - "#else", - "#define yyin ]]M4_YY_PREFIX[[in", - "#endif]]", - "", - " ", - "[[#ifdef yyout", - "#define ]]M4_YY_PREFIX[[out_ALREADY_DEFINED", - "#else", - "#define yyout ]]M4_YY_PREFIX[[out", - "#endif]]", - "", - " ", - "[[#ifdef yy_flex_debug", - "#define ]]M4_YY_PREFIX[[_flex_debug_ALREADY_DEFINED", - "#else", - "#define yy_flex_debug ]]M4_YY_PREFIX[[_flex_debug", - "#endif]]", - "", - " ", - "[[#ifdef yylineno", - "#define ]]M4_YY_PREFIX[[lineno_ALREADY_DEFINED", - "#else", - "#define yylineno ]]M4_YY_PREFIX[[lineno", - "#endif]]", - "", + " m4_define(yy[[text]], [[M4_YY_PREFIX[[text]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[leng]], [[M4_YY_PREFIX[[leng]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[in]], [[M4_YY_PREFIX[[in]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[out]], [[M4_YY_PREFIX[[out]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[_flex_debug]], [[M4_YY_PREFIX[[_flex_debug]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[lineno]], [[M4_YY_PREFIX[[lineno]]m4_ifelse($#,0,,[[($@)]])]])", "]])", - ")", "%endif", "", "", "m4_ifdef( [[M4_YY_TABLES_EXTERNAL]],", "[[", - " ", - "[[#ifdef yytables_fload", - "#define ]]M4_YY_PREFIX[[tables_fload_ALREADY_DEFINED", - "#else", - "#define yytables_fload ]]M4_YY_PREFIX[[tables_fload", - "#endif]]", - "", - " ", - "[[#ifdef yytables_destroy", - "#define ]]M4_YY_PREFIX[[tables_destroy_ALREADY_DEFINED", - "#else", - "#define yytables_destroy ]]M4_YY_PREFIX[[tables_destroy", - "#endif]]", - "", - " ", - "[[#ifdef yyTABLES_NAME", - "#define ]]M4_YY_PREFIX[[TABLES_NAME_ALREADY_DEFINED", - "#else", - "#define yyTABLES_NAME ]]M4_YY_PREFIX[[TABLES_NAME", - "#endif]]", - "", + " m4_define(yy[[tables_fload]], [[M4_YY_PREFIX[[tables_fload]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[tables_destroy]], [[M4_YY_PREFIX[[tables_destroy]]m4_ifelse($#,0,,[[($@)]])]])", + " m4_define(yy[[TABLES_NAME]], [[M4_YY_PREFIX[[TABLES_NAME]]m4_ifelse($#,0,,[[($@)]])]])", "]])", "", "/* First, we deal with platform-specific or compiler-specific issues. */", @@ -521,19 +274,15 @@ const char *skel[] = { "#define UINT32_MAX (4294967295U)", "#endif", "", - "#ifndef SIZE_MAX", - "#define SIZE_MAX (~(size_t)0)", - "#endif", - "", "#endif /* ! C99 */", "", "#endif /* ! FLEXINT_H */", "", "%endif", "", - "/* begin standard C++ headers. */", "%if-c++-only", - "#include ", + "/* begin standard C++ headers. */", + "#include ", "#include ", "#include ", "#include ", @@ -572,10 +321,14 @@ const char *skel[] = { "typedef void* yyscan_t;", "#endif", "", + "%# Declare yyguts variable", "m4_define( [[M4_YY_DECL_GUTS_VAR]], [[struct yyguts_t * yyg = (struct yyguts_t*)yyscanner]])", + "%# Perform a noop access on yyguts to prevent unused variable complains", "m4_define( [[M4_YY_NOOP_GUTS_VAR]], [[(void)yyg]])", + "%# For use wherever a Global is accessed or assigned.", "m4_define( [[YY_G]], [[yyg->$1]])", "", + "%# For use in function prototypes to append the additional argument.", "m4_define( [[M4_YY_PROTO_LAST_ARG]], [[, yyscan_t yyscanner]])", "m4_define( [[M4_YY_PROTO_ONLY_ARG]], [[yyscan_t yyscanner]])", "", @@ -583,9 +336,11 @@ const char *skel[] = { "m4_define( [[M4_YY_DEF_ONLY_ARG]], [[yyscan_t yyscanner]])", "m4_define( [[M4_YY_DECL_LAST_ARG]], [[yyscan_t yyscanner;]])", "", + "%# For use in function calls to pass the additional argument.", "m4_define( [[M4_YY_CALL_LAST_ARG]], [[, yyscanner]])", "m4_define( [[M4_YY_CALL_ONLY_ARG]], [[yyscanner]])", "", + "%# For use in function documentation to adjust for additional argument.", "m4_define( [[M4_YY_DOC_PARAM]], [[@param yyscanner The scanner object.]])", "", "/* For convenience, these vars (plus the bison vars far below)", @@ -600,7 +355,7 @@ const char *skel[] = { "#define yy_flex_debug YY_G(yy_flex_debug_r)", "", "m4_define( [[M4_YY_INCR_LINENO]],", - "[[", + "[[ ", " do{ yylineno++;", " yycolumn=0;", " }while(0)", @@ -613,10 +368,11 @@ const char *skel[] = { "%if-not-reentrant", "", "m4_define( [[M4_YY_INCR_LINENO]],", - "[[", + "[[ ", " yylineno++;", "]])", "", + "%# Define these macros to be no-ops.", "m4_define( [[M4_YY_DECL_GUTS_VAR]], [[m4_dnl]])", "m4_define( [[M4_YY_NOOP_GUTS_VAR]], [[m4_dnl]])", "m4_define( [[YY_G]], [[($1)]])", @@ -633,6 +389,7 @@ const char *skel[] = { "%endif", "", "", + "%# Generate C99 function defs.", "m4_define( [[YYFARGS1]], [[($1 $2 M4_YY_DEF_LAST_ARG)]])", "m4_define( [[YYFARGS2]], [[($1 $2, $3 $4 M4_YY_DEF_LAST_ARG)]])", "m4_define( [[YYFARGS3]], [[($1 $2, $3 $4, $5 $6 M4_YY_DEF_LAST_ARG)]])", @@ -707,7 +464,7 @@ const char *skel[] = { " [[", " /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires", " * access to the local variable yy_act. Since yyless() is a macro, it would break", - " * existing scanners that call yyless() from OUTSIDE yylex.", + " * existing scanners that call yyless() from OUTSIDE yylex. ", " * One obvious solution it to make yy_act a global. I tried that, and saw", " * a 5% performance hit in a non-yylineno scanner, because yy_act is", " * normally declared as a register variable-- so it is not worth it.", @@ -756,7 +513,7 @@ const char *skel[] = { "%endif", "", "%if-c++-only", - " std::streambuf* yy_input_file;", + " std::streambuf* yy_input_file; ", "%endif", "", "", @@ -794,7 +551,7 @@ const char *skel[] = { "", " int yy_bs_lineno; /**< The line count. */", " int yy_bs_column; /**< The column count. */", - "", + " ", "", " /* Whether to try to fill the input buffer when we reach the", " * end of it.", @@ -1242,6 +999,7 @@ const char *skel[] = { "", "", "%if-c-only", + "%# TODO: This is messy.", "m4_ifdef( [[M4_YY_STACK_USED]],", "[[", "", @@ -1507,7 +1265,7 @@ const char *skel[] = { "", "/** Describes a mapping from a serialized table id to its deserialized state in", " * this scanner. This is the bridge between our \"generic\" deserialization code", - " * and the specifics of this scanner.", + " * and the specifics of this scanner. ", " */", "struct yytbl_dmap {", " enum yytbl_id dm_id;/**< table identifier */", @@ -2116,8 +1874,6 @@ const char *skel[] = { " (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size M4_YY_CALL_LAST_ARG );", " if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )", " YY_FATAL_ERROR( \"out of dynamic memory in yy_get_next_buffer()\" );", - " /* \"- 2\" to take care of EOB's */", - " YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);", " }", "", " YY_G(yy_n_chars) += number_to_move;", @@ -2350,9 +2106,6 @@ const char *skel[] = { " */", "void yyFlexLexer::yyrestart( std::istream* input_file )", "{", - " if( ! input_file ) {", - " input_file = &yyin;", - " }", " yyrestart( *input_file );", "}", "%endif", @@ -2514,7 +2267,7 @@ const char *skel[] = { " b->yy_input_file = file;", "%endif", "%if-c++-only", - " b->yy_input_file = file.rdbuf();", + " b->yy_input_file = (&file == 0) ? NULL : file.rdbuf();", "%endif", " b->yy_fill_buffer = 1;", "", @@ -2677,10 +2430,10 @@ const char *skel[] = { " M4_YY_CALL_LAST_ARG);", " if ( ! YY_G(yy_buffer_stack) )", " YY_FATAL_ERROR( \"out of dynamic memory in yyensure_buffer_stack()\" );", - "", - "", + " ", + " ", " memset(YY_G(yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));", - "", + " ", " YY_G(yy_buffer_stack_max) = num_to_alloc;", " YY_G(yy_buffer_stack_top) = 0;", " return;", @@ -2716,7 +2469,7 @@ const char *skel[] = { " * @param base the character buffer", " * @param size the size in bytes of the character buffer", " * M4_YY_DOC_PARAM", - " * @return the newly allocated buffer state object.", + " * @return the newly allocated buffer state object. ", " */", "YY_BUFFER_STATE yy_scan_buffer YYFARGS2( char *,base, yy_size_t ,size)", "{", @@ -2892,7 +2645,7 @@ const char *skel[] = { "{", " M4_YY_DECL_GUTS_VAR();", " M4_YY_NOOP_GUTS_VAR();", - " fprintf( stderr, \"%s\\n\", msg );", + " (void) fprintf( stderr, \"%s\\n\", msg );", " exit( YY_EXIT_FAILURE );", "}", "%endif", @@ -2949,7 +2702,7 @@ const char *skel[] = { "int yyget_lineno (M4_YY_DEF_ONLY_ARG)", "{", " M4_YY_DECL_GUTS_VAR();", - "", + " ", " m4_ifdef( [[M4_YY_REENTRANT]],", " [[", " if (! YY_CURRENT_BUFFER)", @@ -2969,7 +2722,7 @@ const char *skel[] = { "int yyget_column (M4_YY_DEF_ONLY_ARG)", "{", " M4_YY_DECL_GUTS_VAR();", - "", + " ", " m4_ifdef( [[M4_YY_REENTRANT]],", " [[", " if (! YY_CURRENT_BUFFER)", @@ -3221,24 +2974,25 @@ const char *skel[] = { " errno = EINVAL;", " return 1;", " }", - "", + " ", " *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );", - "", + " ", " if (*ptr_yy_globals == NULL){", " errno = ENOMEM;", " return 1;", " }", - "", + " ", " /* By setting to 0xAA, we expose bugs in", " yy_init_globals. Leave at 0x00 for releases. */", " memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));", - "", + " ", " yyset_extra (yy_user_defined, *ptr_yy_globals);", - "", + " ", " return yy_init_globals ( *ptr_yy_globals );", "}", "", "%endif if-c-only", + "%# Actually, that ended an if-rentrant section", "", "%if-c-only", "static int yy_init_globals (M4_YY_DEF_ONLY_ARG)", @@ -3591,7 +3345,7 @@ const char *skel[] = { " return NULL;", "}", "", - "/** Read a table while mapping its contents to the local array.", + "/** Read a table while mapping its contents to the local array. ", " * @param dmap used to performing mapping", " * @return 0 on success", " */", @@ -3636,7 +3390,7 @@ const char *skel[] = { "", " if(M4_YY_TABLES_VERIFY)", " /* We point to the array itself */", - " p = dmap->dm_arr;", + " p = dmap->dm_arr; ", " else", " /* We point to the address of a pointer. */", " *dmap->dm_arr = p = (void *) yyalloc (bytes M4_YY_CALL_LAST_ARG);", @@ -3683,7 +3437,7 @@ const char *skel[] = { " rv = yytbl_read8 (&t8, rd);", " t32 = t8;", " break;", - " default:", + " default: ", " YY_FATAL_ERROR( \"invalid td_flags\" ); /* TODO: not fatal. */", " return -1;", " }", @@ -3740,7 +3494,7 @@ const char *skel[] = { " YY_FATAL_ERROR( \"transition table not found\" ); /* TODO: not fatal. */", " return -1;", " }", - "", + " ", " if( M4_YY_TABLES_VERIFY)", " v = &(((struct yy_trans_info *) (transdmap->dm_arr))[t32]);", " else", @@ -3751,7 +3505,7 @@ const char *skel[] = { " YY_FATAL_ERROR( \"tables verification failed at YYTD_PTRANS\" );", " }else", " ((struct yy_trans_info **) p)[0] = v;", - "", + " ", " /* increment p */", " p = (struct yy_trans_info **) p + 1;", " }", @@ -3867,7 +3621,7 @@ const char *skel[] = { "", "/** Destroy the loaded tables, freeing memory, etc.. */", "int yytables_destroy (M4_YY_DEF_ONLY_ARG)", - "{", + "{ ", " struct yytbl_dmap *dmap=0;", "", " if(!M4_YY_TABLES_VERIFY){", @@ -3924,151 +3678,6 @@ const char *skel[] = { "#undef YY_DECL_IS_OURS", "#undef YY_DECL", "#endif", - "", - "[[#ifndef ]]M4_YY_PREFIX[[_create_buffer_ALREADY_DEFINED", - "#undef yy_create_buffer", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_delete_buffer_ALREADY_DEFINED", - "#undef yy_delete_buffer", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_scan_buffer_ALREADY_DEFINED", - "#undef yy_scan_buffer", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_scan_string_ALREADY_DEFINED", - "#undef yy_scan_string", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_scan_bytes_ALREADY_DEFINED", - "#undef yy_scan_bytes", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_init_buffer_ALREADY_DEFINED", - "#undef yy_init_buffer", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_flush_buffer_ALREADY_DEFINED", - "#undef yy_flush_buffer", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_load_buffer_state_ALREADY_DEFINED", - "#undef yy_load_buffer_state", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_switch_to_buffer_ALREADY_DEFINED", - "#undef yy_switch_to_buffer", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[push_buffer_state_ALREADY_DEFINED", - "#undef yypush_buffer_state", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[pop_buffer_state_ALREADY_DEFINED", - "#undef yypop_buffer_state", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[ensure_buffer_stack_ALREADY_DEFINED", - "#undef yyensure_buffer_stack", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[lex_ALREADY_DEFINED", - "#undef yylex", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[restart_ALREADY_DEFINED", - "#undef yyrestart", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[lex_init_ALREADY_DEFINED", - "#undef yylex_init", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[lex_init_extra_ALREADY_DEFINED", - "#undef yylex_init_extra", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[lex_destroy_ALREADY_DEFINED", - "#undef yylex_destroy", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_debug_ALREADY_DEFINED", - "#undef yyget_debug", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_debug_ALREADY_DEFINED", - "#undef yyset_debug", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_extra_ALREADY_DEFINED", - "#undef yyget_extra", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_extra_ALREADY_DEFINED", - "#undef yyset_extra", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_in_ALREADY_DEFINED", - "#undef yyget_in", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_in_ALREADY_DEFINED", - "#undef yyset_in", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_out_ALREADY_DEFINED", - "#undef yyget_out", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_out_ALREADY_DEFINED", - "#undef yyset_out", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_leng_ALREADY_DEFINED", - "#undef yyget_leng", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_text_ALREADY_DEFINED", - "#undef yyget_text", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_lineno_ALREADY_DEFINED", - "#undef yyget_lineno", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_lineno_ALREADY_DEFINED", - "#undef yyset_lineno", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_column_ALREADY_DEFINED", - "#undef yyget_column", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_column_ALREADY_DEFINED", - "#undef yyset_column", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[wrap_ALREADY_DEFINED", - "#undef yywrap", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_lval_ALREADY_DEFINED", - "#undef yyget_lval", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_lval_ALREADY_DEFINED", - "#undef yyset_lval", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[get_lloc_ALREADY_DEFINED", - "#undef yyget_lloc", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[set_lloc_ALREADY_DEFINED", - "#undef yyset_lloc", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[alloc_ALREADY_DEFINED", - "#undef yyalloc", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[realloc_ALREADY_DEFINED", - "#undef yyrealloc", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[free_ALREADY_DEFINED", - "#undef yyfree", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[text_ALREADY_DEFINED", - "#undef yytext", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[leng_ALREADY_DEFINED", - "#undef yyleng", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[in_ALREADY_DEFINED", - "#undef yyin", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[out_ALREADY_DEFINED", - "#undef yyout", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[_flex_debug_ALREADY_DEFINED", - "#undef yy_flex_debug", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[lineno_ALREADY_DEFINED", - "#undef yylineno", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[tables_fload_ALREADY_DEFINED", - "#undef yytables_fload", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[tables_destroy_ALREADY_DEFINED", - "#undef yytables_destroy", - "#endif]]", - "[[#ifndef ]]M4_YY_PREFIX[[TABLES_NAME_ALREADY_DEFINED", - "#undef yyTABLES_NAME", - "#endif]]", "]])", 0 }; diff --git a/tests/Makefile.am b/tests/Makefile.am index 2cb51df..0c8df6a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,28 +31,28 @@ TESTS = $(check_PROGRAMS) options.cn TEST_EXTENSIONS = .reject .table .direct .cn .i3 .pthread .one .opt .ser .ver -LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +LOG_COMPILER = $(srcdir)/testwrapper.sh AM_LOG_FLAGS = -d $(srcdir) -r -REJECT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r -TABLE_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t -DIRECT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper-direct.sh +DIRECT_LOG_COMPILER=$(srcdir)/testwrapper-direct.sh AM_DIRECT_LOG_FLAGS = -b $(abs_builddir) -s $(srcdir) -CN_LOG_COMPILER = $(SHELL) $(srcdir)/options.cn -AM_CN_LOG_FLAGS = $(FLEX) +CN_LOG_COMPILER=$(srcdir)/options.cn +AM_CN_LOG_FLAGS=$(FLEX) -I3_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_I3_LOG_FLAGS = -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt +I3_LOG_COMPILER=$(srcdir)/testwrapper.sh +AM_I3_LOG_FLAGS=-i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -PTHREAD_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh -AM_PTHREAD_LOG_FLAGS = -i $(srcdir)/pthread_1.txt -i $(srcdir)/pthread_2.txt -i $(srcdir)/pthread_3.txt -i $(srcdir)/pthread_4.txt -i $(srcdir)/pthread_5.txt +PTHREAD_LOG_COMPILER=$(srcdir)/testwrapper.sh +AM_PTHREAD_LOG_FLAGS=-i $(srcdir)/pthread_1.txt -i $(srcdir)/pthread_2.txt -i $(srcdir)/pthread_3.txt -i $(srcdir)/pthread_4.txt -i $(srcdir)/pthread_5.txt -ONE_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +ONE_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_ONE_LOG_FLAGS = -1 -d $(srcdir) AM_YFLAGS = -d -p test @@ -88,7 +88,6 @@ simple_tests = \ posixly_correct \ prefix_nr \ prefix_r \ - quote_in_comment \ quotes \ string_nr \ string_r \ @@ -113,32 +112,24 @@ DIRECT_TESTS = \ I3_TESTS = \ cxx_yywrap.i3 +if want_pthread PTHREAD_TESTS = \ pthread.pthread +endif ONE_TESTS = \ lineno_nr.one \ lineno_r.one \ lineno_trailing.one -quote_in_comment_SOURCES = quote_in_comment.l alloc_extra_SOURCES = alloc_extra.l array_nr_SOURCES = array_nr.l array_r_SOURCES = array_r.l basic_nr_SOURCES = basic_nr.l basic_r_SOURCES = basic_r.l -if HAVE_BISON bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c -nodist_bison_nr_SOURCES = bison_nr_parser.h bison_nr_scanner.h bison_yylloc_SOURCES = bison_yylloc_scanner.l bison_yylloc_parser.y bison_yylloc_main.c -nodist_bison_yylloc_SOURCES = bison_yylloc_parser.h bison_yylloc_scanner.h bison_yylval_SOURCES = bison_yylval_scanner.l bison_yylval_parser.y bison_yylval_main.c -nodist_bison_yylval_SOURCES = bison_yylval_parser.h bison_yylval_scanner.h -else -bison_nr_SOURCES = no_bison_stub.c -bison_yylloc_SOURCES = no_bison_stub.c -bison_yylval_SOURCES = no_bison_stub.c -endif c_cxx_nr_SOURCES = c_cxx_nr.lll c_cxx_r_SOURCES = c_cxx_r.lll ccl_SOURCES = ccl.l @@ -150,9 +141,7 @@ debug_nr_SOURCES = debug_nr.l debug_r_SOURCES = debug_r.l extended_SOURCES = extended.l header_nr_SOURCES = header_nr_scanner.l header_nr_main.c -nodist_header_nr_SOURCES = header_nr_scanner.h header_r_SOURCES = header_r_scanner.l header_r_main.c -nodist_header_r_SOURCES = header_r_scanner.h include_by_buffer_direct_SOURCES = include_by_buffer.direct.l include_by_push_direct_SOURCES = include_by_push.direct.l include_by_reentrant_direct_SOURCES = include_by_reentrant.direct.l @@ -162,9 +151,7 @@ lineno_trailing_one_SOURCES = lineno_trailing.l mem_nr_SOURCES = mem_nr.l mem_r_SOURCES = mem_r.l multiple_scanners_nr_SOURCES = multiple_scanners_nr_main.c multiple_scanners_nr_1.l multiple_scanners_nr_2.l -nodist_multiple_scanners_nr_SOURCES = multiple_scanners_nr_1.h multiple_scanners_nr_2.h multiple_scanners_r_SOURCES = multiple_scanners_r_main.c multiple_scanners_r_1.l multiple_scanners_r_2.l -nodist_multiple_scanners_r_SOURCES = multiple_scanners_nr_1.h multiple_scanners_nr_2.h posix_SOURCES = posix.l posixly_correct_SOURCES = posixly_correct.l prefix_nr_SOURCES = prefix_nr.l @@ -180,9 +167,23 @@ rescan_r_direct_SOURCES = rescan_r.direct.l string_nr_SOURCES = string_nr.l string_r_SOURCES = string_r.l top_SOURCES = top.l top_main.c -nodist_top_SOURCES = top.h yyextra_SOURCES = yyextra.l +BUILT_SOURCES = \ + bison_nr_parser.h \ + bison_nr_scanner.h \ + bison_yylloc_parser.h \ + bison_yylloc_scanner.h \ + bison_yylval_parser.h \ + bison_yylval_scanner.h \ + header_nr_scanner.h \ + header_r_scanner.h \ + multiple_scanners_nr_1.h \ + multiple_scanners_nr_2.h \ + multiple_scanners_r_1.h \ + multiple_scanners_r_2.h \ + top.h + # Normally, automake would distribute files built by flex. Since the # point of the test suite is to test the files that flex builds, and # since anyone who has the flex distribution can build a flex binary @@ -193,7 +194,6 @@ yyextra_SOURCES = yyextra.l # it. CLEANFILES = \ - alloc_extra.c \ array_nr.c \ array_r.c \ basic_nr.c \ @@ -246,7 +246,6 @@ CLEANFILES = \ prefix_nr.c \ prefix_r.c \ pthread.c \ - quote_in_comment.c \ quotes.c \ reject_nr.reject.c \ reject_r.reject.c \ @@ -261,6 +260,7 @@ CLEANFILES = \ top.c \ top.h \ yyextra.c \ +alloc_extra.c \ $(tableopts_c) \ $(tableopts_tables) @@ -315,7 +315,6 @@ EXTRA_DIST = \ reject.txt \ rescan_nr.direct.txt \ rescan_r.direct.txt \ - quote_in_comment.txt \ quotes.txt \ top.txt \ yyextra.txt \ @@ -329,112 +328,82 @@ dist_check_SCRIPTS = \ testwrapper-direct.sh \ testwrapper.sh -pthread_pthread_LDADD = @LIBPTHREAD@ +pthread_pthread_LDADD = -lpthread # specify how to process .l files in order to test the flex built by make all FLEX = $(top_builddir)/src/flex .l.c: $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ $< + $(FLEX) -o $@ $< .ll.cc: $(FLEX) - $(AM_V_LEX)$(FLEX) -+ -o $@ $< - -bison_nr_main.$(OBJEXT): bison_nr_parser.h bison_nr_scanner.h -bison_nr_scanner.$(OBJEXT): bison_nr_parser.h + $(FLEX) -+ -o $@ $< +bison_nr_main.($OBJEXT): bison_nr_parser.h bison_nr_scanner.h bison_nr_scanner.h: bison_nr_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h -bison_yylloc_scanner.$(OBJEXT): bison_yylloc_parser.h - bison_yylloc_scanner.h: bison_yylloc_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h -bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h - bison_yylval_scanner.h: bison_yylval_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi # automake does not support compiling flex scanners output in C as C++ # so we explicitly sayhow, using the .lll suffix for the lex input file .lll.cc: $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ $< + $(FLEX) -o $@ $< header_nr_main.$(OBJEXT): header_nr_scanner.h - header_nr_scanner.h: header_nr_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi header_r_main.$(OBJEXT): header_r_scanner.h - header_r_scanner.h: header_r_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi multiple_scanners_nr_main.$(OBJEXT): multiple_scanners_nr_1.h multiple_scanners_nr_2.h - multiple_scanners_nr_1.h: multiple_scanners_nr_1.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi - multiple_scanners_nr_2.h: multiple_scanners_nr_2.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi multiple_scanners_r_main.$(OBJEXT): multiple_scanners_r_1.h multiple_scanners_r_2.h - multiple_scanners_r_1.h: multiple_scanners_r_1.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi - multiple_scanners_r_2.h: multiple_scanners_r_2.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi posixly_correct.c: posixly_correct.l $(FLEX) - $(AM_V_LEX)POSIXLY_CORRECT=1 $(FLEX) -o $@ $< + POSIXLY_CORRECT=1 $(FLEX) -o $@ $< reject_nr.reject.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -o $@ $< reject_nr.reject$(EXEEXT): reject_nr.reject.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ reject_r.reject.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape --reentrant -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape --reentrant -o $@ $< reject_r.reject.$(OBJEXT): reject_r.reject.c - $(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< reject_r.reject$(EXEEXT): reject_r.reject.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ reject_ver.table.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -o $@ --tables-verify --tables-file=$(basename $@).tables $< + $(FLEX) --unsafe-no-m4-sect3-escape -o $@ --tables-verify --tables-file=$(basename $@).tables $< reject_ver.table.$(OBJEXT): reject_ver.table.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< reject_ver.table$(EXEEXT): reject_ver.table.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ reject_ser.table.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ --unsafe-no-m4-sect3-escape --tables-file=$(basename $@).tables $< + $(FLEX) -o $@ --unsafe-no-m4-sect3-escape --tables-file=$(basename $@).tables $< reject_ser.table.$(OBJEXT): reject_ser.table.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< reject_ser.table$(EXEEXT): reject_ser.table.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ top_main.$(OBJEXT): top.h top.h: top.c @@ -446,7 +415,7 @@ top.h: top.c # it can be / is generated by a shell script, tableopts.sh. tableopts.am: tableopts.sh - $(SHELL) $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am + $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am include $(srcdir)/tableopts.am @@ -458,50 +427,50 @@ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sert tableopts_c := $(addsuffix .c,$(tableopts_tests)) -OPT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r tableopts_opt_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $* -o $@ $< tableopts_opt_nr%.$(OBJEXT): tableopts_opt_nr%.c - $(AM_V_CC)$(COMPILE) -c -o $@ $< + $(COMPILE) -c -o $@ $< tableopts_opt_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $* -o $@ $< tableopts_opt_r%.$(OBJEXT): tableopts_opt_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< -SER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +SER_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t tableopts_ser_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $* -o $@ $< tableopts_ser_nr%.$(OBJEXT): tableopts_ser_nr%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< tableopts_ser_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $* -o $@ $< tableopts_ser_r%.$(OBJEXT): tableopts_ser_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< -VER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +VER_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_VER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t tableopts_ver_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $* -o $@ $< tableopts_ver_nr%.$(OBJEXT): tableopts_ver_nr%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< tableopts_ver_nr%.ver$(EXEEXT): tableopts_ver_nr%.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $^ + $(LINK) -o $@ $^ tableopts_ver_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ver_r$*.ver.tables" --tables-verify $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ver_r$*.ver.tables" --tables-verify $* -o $@ $< tableopts_ver_r%.$(OBJEXT): tableopts_ver_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< diff --git a/tests/Makefile.in b/tests/Makefile.in index 63976e4..3d72ab3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -114,15 +114,14 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ $(am__EXEEXT_7) $(am__EXEEXT_8) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_check_SCRIPTS) \ @@ -141,8 +140,8 @@ am__EXEEXT_1 = alloc_extra$(EXEEXT) array_nr$(EXEEXT) array_r$(EXEEXT) \ mem_r$(EXEEXT) multiple_scanners_nr$(EXEEXT) \ multiple_scanners_r$(EXEEXT) posix$(EXEEXT) \ posixly_correct$(EXEEXT) prefix_nr$(EXEEXT) prefix_r$(EXEEXT) \ - quote_in_comment$(EXEEXT) quotes$(EXEEXT) string_nr$(EXEEXT) \ - string_r$(EXEEXT) top$(EXEEXT) yyextra$(EXEEXT) + quotes$(EXEEXT) string_nr$(EXEEXT) string_r$(EXEEXT) \ + top$(EXEEXT) yyextra$(EXEEXT) am__EXEEXT_2 = reject_nr.reject$(EXEEXT) reject_r.reject$(EXEEXT) am__EXEEXT_3 = reject_ver.table$(EXEEXT) reject_ser.table$(EXEEXT) am__EXEEXT_4 = include_by_buffer.direct$(EXEEXT) \ @@ -150,7 +149,7 @@ am__EXEEXT_4 = include_by_buffer.direct$(EXEEXT) \ include_by_reentrant.direct$(EXEEXT) rescan_nr.direct$(EXEEXT) \ rescan_r.direct$(EXEEXT) am__EXEEXT_5 = cxx_yywrap.i3$(EXEEXT) -am__EXEEXT_6 = pthread.pthread$(EXEEXT) +@want_pthread_TRUE@am__EXEEXT_6 = pthread.pthread$(EXEEXT) am__EXEEXT_7 = lineno_nr.one$(EXEEXT) lineno_r.one$(EXEEXT) \ lineno_trailing.one$(EXEEXT) am__EXEEXT_8 = tableopts_opt_nr-Ca.opt$(EXEEXT) \ @@ -238,36 +237,17 @@ basic_nr_LDADD = $(LDADD) am_basic_r_OBJECTS = basic_r.$(OBJEXT) basic_r_OBJECTS = $(am_basic_r_OBJECTS) basic_r_LDADD = $(LDADD) -am__bison_nr_SOURCES_DIST = no_bison_stub.c bison_nr_scanner.l \ - bison_nr_parser.y bison_nr_main.c -@HAVE_BISON_FALSE@am_bison_nr_OBJECTS = no_bison_stub.$(OBJEXT) -@HAVE_BISON_TRUE@am_bison_nr_OBJECTS = bison_nr_scanner.$(OBJEXT) \ -@HAVE_BISON_TRUE@ bison_nr_parser.$(OBJEXT) \ -@HAVE_BISON_TRUE@ bison_nr_main.$(OBJEXT) -nodist_bison_nr_OBJECTS = -bison_nr_OBJECTS = $(am_bison_nr_OBJECTS) $(nodist_bison_nr_OBJECTS) +am_bison_nr_OBJECTS = bison_nr_scanner.$(OBJEXT) \ + bison_nr_parser.$(OBJEXT) bison_nr_main.$(OBJEXT) +bison_nr_OBJECTS = $(am_bison_nr_OBJECTS) bison_nr_LDADD = $(LDADD) -am__bison_yylloc_SOURCES_DIST = no_bison_stub.c bison_yylloc_scanner.l \ - bison_yylloc_parser.y bison_yylloc_main.c -@HAVE_BISON_FALSE@am_bison_yylloc_OBJECTS = no_bison_stub.$(OBJEXT) -@HAVE_BISON_TRUE@am_bison_yylloc_OBJECTS = \ -@HAVE_BISON_TRUE@ bison_yylloc_scanner.$(OBJEXT) \ -@HAVE_BISON_TRUE@ bison_yylloc_parser.$(OBJEXT) \ -@HAVE_BISON_TRUE@ bison_yylloc_main.$(OBJEXT) -nodist_bison_yylloc_OBJECTS = -bison_yylloc_OBJECTS = $(am_bison_yylloc_OBJECTS) \ - $(nodist_bison_yylloc_OBJECTS) +am_bison_yylloc_OBJECTS = bison_yylloc_scanner.$(OBJEXT) \ + bison_yylloc_parser.$(OBJEXT) bison_yylloc_main.$(OBJEXT) +bison_yylloc_OBJECTS = $(am_bison_yylloc_OBJECTS) bison_yylloc_LDADD = $(LDADD) -am__bison_yylval_SOURCES_DIST = no_bison_stub.c bison_yylval_scanner.l \ - bison_yylval_parser.y bison_yylval_main.c -@HAVE_BISON_FALSE@am_bison_yylval_OBJECTS = no_bison_stub.$(OBJEXT) -@HAVE_BISON_TRUE@am_bison_yylval_OBJECTS = \ -@HAVE_BISON_TRUE@ bison_yylval_scanner.$(OBJEXT) \ -@HAVE_BISON_TRUE@ bison_yylval_parser.$(OBJEXT) \ -@HAVE_BISON_TRUE@ bison_yylval_main.$(OBJEXT) -nodist_bison_yylval_OBJECTS = -bison_yylval_OBJECTS = $(am_bison_yylval_OBJECTS) \ - $(nodist_bison_yylval_OBJECTS) +am_bison_yylval_OBJECTS = bison_yylval_scanner.$(OBJEXT) \ + bison_yylval_parser.$(OBJEXT) bison_yylval_main.$(OBJEXT) +bison_yylval_OBJECTS = $(am_bison_yylval_OBJECTS) bison_yylval_LDADD = $(LDADD) am_c_cxx_nr_OBJECTS = c_cxx_nr.$(OBJEXT) c_cxx_nr_OBJECTS = $(am_c_cxx_nr_OBJECTS) @@ -304,14 +284,11 @@ extended_OBJECTS = $(am_extended_OBJECTS) extended_LDADD = $(LDADD) am_header_nr_OBJECTS = header_nr_scanner.$(OBJEXT) \ header_nr_main.$(OBJEXT) -nodist_header_nr_OBJECTS = -header_nr_OBJECTS = $(am_header_nr_OBJECTS) \ - $(nodist_header_nr_OBJECTS) +header_nr_OBJECTS = $(am_header_nr_OBJECTS) header_nr_LDADD = $(LDADD) am_header_r_OBJECTS = header_r_scanner.$(OBJEXT) \ header_r_main.$(OBJEXT) -nodist_header_r_OBJECTS = -header_r_OBJECTS = $(am_header_r_OBJECTS) $(nodist_header_r_OBJECTS) +header_r_OBJECTS = $(am_header_r_OBJECTS) header_r_LDADD = $(LDADD) am_include_by_buffer_direct_OBJECTS = \ include_by_buffer.direct.$(OBJEXT) @@ -344,16 +321,12 @@ mem_r_LDADD = $(LDADD) am_multiple_scanners_nr_OBJECTS = multiple_scanners_nr_main.$(OBJEXT) \ multiple_scanners_nr_1.$(OBJEXT) \ multiple_scanners_nr_2.$(OBJEXT) -nodist_multiple_scanners_nr_OBJECTS = -multiple_scanners_nr_OBJECTS = $(am_multiple_scanners_nr_OBJECTS) \ - $(nodist_multiple_scanners_nr_OBJECTS) +multiple_scanners_nr_OBJECTS = $(am_multiple_scanners_nr_OBJECTS) multiple_scanners_nr_LDADD = $(LDADD) am_multiple_scanners_r_OBJECTS = multiple_scanners_r_main.$(OBJEXT) \ multiple_scanners_r_1.$(OBJEXT) \ multiple_scanners_r_2.$(OBJEXT) -nodist_multiple_scanners_r_OBJECTS = -multiple_scanners_r_OBJECTS = $(am_multiple_scanners_r_OBJECTS) \ - $(nodist_multiple_scanners_r_OBJECTS) +multiple_scanners_r_OBJECTS = $(am_multiple_scanners_r_OBJECTS) multiple_scanners_r_LDADD = $(LDADD) am_posix_OBJECTS = posix.$(OBJEXT) posix_OBJECTS = $(am_posix_OBJECTS) @@ -370,9 +343,6 @@ prefix_r_LDADD = $(LDADD) am_pthread_pthread_OBJECTS = pthread.$(OBJEXT) pthread_pthread_OBJECTS = $(am_pthread_pthread_OBJECTS) pthread_pthread_DEPENDENCIES = -am_quote_in_comment_OBJECTS = quote_in_comment.$(OBJEXT) -quote_in_comment_OBJECTS = $(am_quote_in_comment_OBJECTS) -quote_in_comment_LDADD = $(LDADD) am_quotes_OBJECTS = quotes.$(OBJEXT) quotes_OBJECTS = $(am_quotes_OBJECTS) quotes_LDADD = $(LDADD) @@ -650,8 +620,7 @@ am_tableopts_ver_r_Cm_ver_OBJECTS = tableopts_ver_r_Cm_ver_OBJECTS = $(am_tableopts_ver_r_Cm_ver_OBJECTS) tableopts_ver_r_Cm_ver_LDADD = $(LDADD) am_top_OBJECTS = top.$(OBJEXT) top_main.$(OBJEXT) -nodist_top_OBJECTS = -top_OBJECTS = $(am_top_OBJECTS) $(nodist_top_OBJECTS) +top_OBJECTS = $(am_top_OBJECTS) top_LDADD = $(LDADD) am_yyextra_OBJECTS = yyextra.$(OBJEXT) yyextra_OBJECTS = $(am_yyextra_OBJECTS) @@ -728,32 +697,26 @@ am__v_YACC_0 = @echo " YACC " $@; am__v_YACC_1 = SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \ $(array_r_SOURCES) $(basic_nr_SOURCES) $(basic_r_SOURCES) \ - $(bison_nr_SOURCES) $(nodist_bison_nr_SOURCES) \ - $(bison_yylloc_SOURCES) $(nodist_bison_yylloc_SOURCES) \ - $(bison_yylval_SOURCES) $(nodist_bison_yylval_SOURCES) \ - $(c_cxx_nr_SOURCES) $(c_cxx_r_SOURCES) $(ccl_SOURCES) \ - $(cxx_basic_SOURCES) $(cxx_multiple_scanners_SOURCES) \ - $(cxx_restart_SOURCES) $(cxx_yywrap_i3_SOURCES) \ - $(debug_nr_SOURCES) $(debug_r_SOURCES) $(extended_SOURCES) \ - $(header_nr_SOURCES) $(nodist_header_nr_SOURCES) \ - $(header_r_SOURCES) $(nodist_header_r_SOURCES) \ - $(include_by_buffer_direct_SOURCES) \ + $(bison_nr_SOURCES) $(bison_yylloc_SOURCES) \ + $(bison_yylval_SOURCES) $(c_cxx_nr_SOURCES) $(c_cxx_r_SOURCES) \ + $(ccl_SOURCES) $(cxx_basic_SOURCES) \ + $(cxx_multiple_scanners_SOURCES) $(cxx_restart_SOURCES) \ + $(cxx_yywrap_i3_SOURCES) $(debug_nr_SOURCES) \ + $(debug_r_SOURCES) $(extended_SOURCES) $(header_nr_SOURCES) \ + $(header_r_SOURCES) $(include_by_buffer_direct_SOURCES) \ $(include_by_push_direct_SOURCES) \ $(include_by_reentrant_direct_SOURCES) \ $(lineno_nr_one_SOURCES) $(lineno_r_one_SOURCES) \ $(lineno_trailing_one_SOURCES) $(mem_nr_SOURCES) \ $(mem_r_SOURCES) $(multiple_scanners_nr_SOURCES) \ - $(nodist_multiple_scanners_nr_SOURCES) \ - $(multiple_scanners_r_SOURCES) \ - $(nodist_multiple_scanners_r_SOURCES) $(posix_SOURCES) \ + $(multiple_scanners_r_SOURCES) $(posix_SOURCES) \ $(posixly_correct_SOURCES) $(prefix_nr_SOURCES) \ $(prefix_r_SOURCES) $(pthread_pthread_SOURCES) \ - $(quote_in_comment_SOURCES) $(quotes_SOURCES) \ - $(reject_nr_reject_SOURCES) $(reject_r_reject_SOURCES) \ - $(reject_ser_table_SOURCES) $(reject_ver_table_SOURCES) \ - $(rescan_nr_direct_SOURCES) $(rescan_r_direct_SOURCES) \ - $(string_nr_SOURCES) $(string_r_SOURCES) \ - $(tableopts_opt_nr_CF_opt_SOURCES) \ + $(quotes_SOURCES) $(reject_nr_reject_SOURCES) \ + $(reject_r_reject_SOURCES) $(reject_ser_table_SOURCES) \ + $(reject_ver_table_SOURCES) $(rescan_nr_direct_SOURCES) \ + $(rescan_r_direct_SOURCES) $(string_nr_SOURCES) \ + $(string_r_SOURCES) $(tableopts_opt_nr_CF_opt_SOURCES) \ $(tableopts_opt_nr_Ca_opt_SOURCES) \ $(tableopts_opt_nr_Cae_opt_SOURCES) \ $(tableopts_opt_nr_CaeF_opt_SOURCES) \ @@ -819,12 +782,12 @@ SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \ $(tableopts_ver_r_Cem_ver_SOURCES) \ $(tableopts_ver_r_Cf_ver_SOURCES) \ $(tableopts_ver_r_Cm_ver_SOURCES) $(top_SOURCES) \ - $(nodist_top_SOURCES) $(yyextra_SOURCES) + $(yyextra_SOURCES) DIST_SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \ $(array_r_SOURCES) $(basic_nr_SOURCES) $(basic_r_SOURCES) \ - $(am__bison_nr_SOURCES_DIST) $(am__bison_yylloc_SOURCES_DIST) \ - $(am__bison_yylval_SOURCES_DIST) $(c_cxx_nr_SOURCES) \ - $(c_cxx_r_SOURCES) $(ccl_SOURCES) $(cxx_basic_SOURCES) \ + $(bison_nr_SOURCES) $(bison_yylloc_SOURCES) \ + $(bison_yylval_SOURCES) $(c_cxx_nr_SOURCES) $(c_cxx_r_SOURCES) \ + $(ccl_SOURCES) $(cxx_basic_SOURCES) \ $(cxx_multiple_scanners_SOURCES) $(cxx_restart_SOURCES) \ $(cxx_yywrap_i3_SOURCES) $(debug_nr_SOURCES) \ $(debug_r_SOURCES) $(extended_SOURCES) $(header_nr_SOURCES) \ @@ -837,12 +800,11 @@ DIST_SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \ $(multiple_scanners_r_SOURCES) $(posix_SOURCES) \ $(posixly_correct_SOURCES) $(prefix_nr_SOURCES) \ $(prefix_r_SOURCES) $(pthread_pthread_SOURCES) \ - $(quote_in_comment_SOURCES) $(quotes_SOURCES) \ - $(reject_nr_reject_SOURCES) $(reject_r_reject_SOURCES) \ - $(reject_ser_table_SOURCES) $(reject_ver_table_SOURCES) \ - $(rescan_nr_direct_SOURCES) $(rescan_r_direct_SOURCES) \ - $(string_nr_SOURCES) $(string_r_SOURCES) \ - $(tableopts_opt_nr_CF_opt_SOURCES) \ + $(quotes_SOURCES) $(reject_nr_reject_SOURCES) \ + $(reject_r_reject_SOURCES) $(reject_ser_table_SOURCES) \ + $(reject_ver_table_SOURCES) $(rescan_nr_direct_SOURCES) \ + $(rescan_r_direct_SOURCES) $(string_nr_SOURCES) \ + $(string_r_SOURCES) $(tableopts_opt_nr_CF_opt_SOURCES) \ $(tableopts_opt_nr_Ca_opt_SOURCES) \ $(tableopts_opt_nr_Cae_opt_SOURCES) \ $(tableopts_opt_nr_CaeF_opt_SOURCES) \ @@ -1187,9 +1149,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/tableopts.am \ lineno_trailing.c mem_nr.c mem_r.c multiple_scanners_nr_1.c \ multiple_scanners_nr_2.c multiple_scanners_r_1.c \ multiple_scanners_r_2.c posix.c posixly_correct.c prefix_nr.c \ - prefix_r.c pthread.c quote_in_comment.c quotes.c \ - rescan_nr.direct.c rescan_r.direct.c string_nr.c string_r.c \ - top.c yyextra.c + prefix_r.c pthread.c quotes.c rescan_nr.direct.c \ + rescan_r.direct.c string_nr.c string_r.c top.c yyextra.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -1200,17 +1161,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -1242,14 +1198,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -1301,7 +1255,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -1359,21 +1312,21 @@ TESTS = $(check_PROGRAMS) options.cn # automake knows how to distinguish between the various kinds of tests # we have. TEST_EXTENSIONS = .reject .table .direct .cn .i3 .pthread .one .opt .ser .ver -LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +LOG_COMPILER = $(srcdir)/testwrapper.sh AM_LOG_FLAGS = -d $(srcdir) -r -REJECT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r -TABLE_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t -DIRECT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper-direct.sh +DIRECT_LOG_COMPILER = $(srcdir)/testwrapper-direct.sh AM_DIRECT_LOG_FLAGS = -b $(abs_builddir) -s $(srcdir) -CN_LOG_COMPILER = $(SHELL) $(srcdir)/options.cn +CN_LOG_COMPILER = $(srcdir)/options.cn AM_CN_LOG_FLAGS = $(FLEX) -I3_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +I3_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_I3_LOG_FLAGS = -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -i $(srcdir)/cxx_yywrap.txt -PTHREAD_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +PTHREAD_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_PTHREAD_LOG_FLAGS = -i $(srcdir)/pthread_1.txt -i $(srcdir)/pthread_2.txt -i $(srcdir)/pthread_3.txt -i $(srcdir)/pthread_4.txt -i $(srcdir)/pthread_5.txt -ONE_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +ONE_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_ONE_LOG_FLAGS = -1 -d $(srcdir) AM_YFLAGS = -d -p test AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src @@ -1405,7 +1358,6 @@ simple_tests = \ posixly_correct \ prefix_nr \ prefix_r \ - quote_in_comment \ quotes \ string_nr \ string_r \ @@ -1430,29 +1382,22 @@ DIRECT_TESTS = \ I3_TESTS = \ cxx_yywrap.i3 -PTHREAD_TESTS = \ - pthread.pthread +@want_pthread_TRUE@PTHREAD_TESTS = \ +@want_pthread_TRUE@ pthread.pthread ONE_TESTS = \ lineno_nr.one \ lineno_r.one \ lineno_trailing.one -quote_in_comment_SOURCES = quote_in_comment.l alloc_extra_SOURCES = alloc_extra.l array_nr_SOURCES = array_nr.l array_r_SOURCES = array_r.l basic_nr_SOURCES = basic_nr.l basic_r_SOURCES = basic_r.l -@HAVE_BISON_FALSE@bison_nr_SOURCES = no_bison_stub.c -@HAVE_BISON_TRUE@bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c -@HAVE_BISON_TRUE@nodist_bison_nr_SOURCES = bison_nr_parser.h bison_nr_scanner.h -@HAVE_BISON_FALSE@bison_yylloc_SOURCES = no_bison_stub.c -@HAVE_BISON_TRUE@bison_yylloc_SOURCES = bison_yylloc_scanner.l bison_yylloc_parser.y bison_yylloc_main.c -@HAVE_BISON_TRUE@nodist_bison_yylloc_SOURCES = bison_yylloc_parser.h bison_yylloc_scanner.h -@HAVE_BISON_FALSE@bison_yylval_SOURCES = no_bison_stub.c -@HAVE_BISON_TRUE@bison_yylval_SOURCES = bison_yylval_scanner.l bison_yylval_parser.y bison_yylval_main.c -@HAVE_BISON_TRUE@nodist_bison_yylval_SOURCES = bison_yylval_parser.h bison_yylval_scanner.h +bison_nr_SOURCES = bison_nr_scanner.l bison_nr_parser.y bison_nr_main.c +bison_yylloc_SOURCES = bison_yylloc_scanner.l bison_yylloc_parser.y bison_yylloc_main.c +bison_yylval_SOURCES = bison_yylval_scanner.l bison_yylval_parser.y bison_yylval_main.c c_cxx_nr_SOURCES = c_cxx_nr.lll c_cxx_r_SOURCES = c_cxx_r.lll ccl_SOURCES = ccl.l @@ -1464,9 +1409,7 @@ debug_nr_SOURCES = debug_nr.l debug_r_SOURCES = debug_r.l extended_SOURCES = extended.l header_nr_SOURCES = header_nr_scanner.l header_nr_main.c -nodist_header_nr_SOURCES = header_nr_scanner.h header_r_SOURCES = header_r_scanner.l header_r_main.c -nodist_header_r_SOURCES = header_r_scanner.h include_by_buffer_direct_SOURCES = include_by_buffer.direct.l include_by_push_direct_SOURCES = include_by_push.direct.l include_by_reentrant_direct_SOURCES = include_by_reentrant.direct.l @@ -1476,9 +1419,7 @@ lineno_trailing_one_SOURCES = lineno_trailing.l mem_nr_SOURCES = mem_nr.l mem_r_SOURCES = mem_r.l multiple_scanners_nr_SOURCES = multiple_scanners_nr_main.c multiple_scanners_nr_1.l multiple_scanners_nr_2.l -nodist_multiple_scanners_nr_SOURCES = multiple_scanners_nr_1.h multiple_scanners_nr_2.h multiple_scanners_r_SOURCES = multiple_scanners_r_main.c multiple_scanners_r_1.l multiple_scanners_r_2.l -nodist_multiple_scanners_r_SOURCES = multiple_scanners_nr_1.h multiple_scanners_nr_2.h posix_SOURCES = posix.l posixly_correct_SOURCES = posixly_correct.l prefix_nr_SOURCES = prefix_nr.l @@ -1494,8 +1435,22 @@ rescan_r_direct_SOURCES = rescan_r.direct.l string_nr_SOURCES = string_nr.l string_r_SOURCES = string_r.l top_SOURCES = top.l top_main.c -nodist_top_SOURCES = top.h yyextra_SOURCES = yyextra.l +BUILT_SOURCES = \ + bison_nr_parser.h \ + bison_nr_scanner.h \ + bison_yylloc_parser.h \ + bison_yylloc_scanner.h \ + bison_yylval_parser.h \ + bison_yylval_scanner.h \ + header_nr_scanner.h \ + header_r_scanner.h \ + multiple_scanners_nr_1.h \ + multiple_scanners_nr_2.h \ + multiple_scanners_r_1.h \ + multiple_scanners_r_2.h \ + top.h + # Normally, automake would distribute files built by flex. Since the # point of the test suite is to test the files that flex builds, and @@ -1506,7 +1461,6 @@ yyextra_SOURCES = yyextra.l # automake doesn't know about the whacky ways in which we're abusing # it. CLEANFILES = \ - alloc_extra.c \ array_nr.c \ array_r.c \ basic_nr.c \ @@ -1559,7 +1513,6 @@ CLEANFILES = \ prefix_nr.c \ prefix_r.c \ pthread.c \ - quote_in_comment.c \ quotes.c \ reject_nr.reject.c \ reject_r.reject.c \ @@ -1574,6 +1527,7 @@ CLEANFILES = \ top.c \ top.h \ yyextra.c \ +alloc_extra.c \ $(tableopts_c) \ $(tableopts_tables) @@ -1623,7 +1577,6 @@ EXTRA_DIST = \ reject.txt \ rescan_nr.direct.txt \ rescan_r.direct.txt \ - quote_in_comment.txt \ quotes.txt \ top.txt \ yyextra.txt \ @@ -1637,7 +1590,7 @@ dist_check_SCRIPTS = \ testwrapper-direct.sh \ testwrapper.sh -pthread_pthread_LDADD = @LIBPTHREAD@ +pthread_pthread_LDADD = -lpthread # specify how to process .l files in order to test the flex built by make all FLEX = $(top_builddir)/src/flex @@ -1775,13 +1728,14 @@ tableopts_sertests := $(foreach opt,$(tableopts), tableopts_ser_nr$(opt) tableop tableopts_vertests := $(foreach opt,$(tableopts), tableopts_ver_nr$(opt) tableopts_ver_r$(opt)) tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sertests) tableopts_c := $(addsuffix .c,$(tableopts_tests)) -OPT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r -SER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +SER_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t -VER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh +VER_LOG_COMPILER = $(srcdir)/testwrapper.sh AM_VER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t -all: all-am +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .cc .cn .cn$(EXEEXT) .direct .direct$(EXEEXT) .i3 .i3$(EXEEXT) .l .ll .lll .lo .log .o .obj .one .one$(EXEEXT) .opt .opt$(EXEEXT) .pthread .pthread$(EXEEXT) .reject .reject$(EXEEXT) .ser .ser$(EXEEXT) .table .table$(EXEEXT) .trs .ver .ver$(EXEEXT) .y @@ -1974,10 +1928,6 @@ pthread.pthread$(EXEEXT): $(pthread_pthread_OBJECTS) $(pthread_pthread_DEPENDENC @rm -f pthread.pthread$(EXEEXT) $(AM_V_CCLD)$(LINK) $(pthread_pthread_OBJECTS) $(pthread_pthread_LDADD) $(LIBS) -quote_in_comment$(EXEEXT): $(quote_in_comment_OBJECTS) $(quote_in_comment_DEPENDENCIES) $(EXTRA_quote_in_comment_DEPENDENCIES) - @rm -f quote_in_comment$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(quote_in_comment_OBJECTS) $(quote_in_comment_LDADD) $(LIBS) - quotes$(EXEEXT): $(quotes_OBJECTS) $(quotes_DEPENDENCIES) $(EXTRA_quotes_DEPENDENCIES) @rm -f quotes$(EXEEXT) $(AM_V_CCLD)$(LINK) $(quotes_OBJECTS) $(quotes_LDADD) $(LIBS) @@ -2056,13 +2006,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no_bison_stub.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posixly_correct.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefix_nr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefix_r.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote_in_comment.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotes.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rescan_nr.direct.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rescan_r.direct.Po@am__quote@ @@ -2073,49 +2021,43 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yyextra.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< .cc.o: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< .cc.obj: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ -@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .cc.lo: -@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ -@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ -@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $< @@ -2511,13 +2453,6 @@ prefix_r.log: prefix_r$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -quote_in_comment.log: quote_in_comment$(EXEEXT) - @p='quote_in_comment$(EXEEXT)'; \ - b='quote_in_comment'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) quotes.log: quotes$(EXEEXT) @p='quotes$(EXEEXT)'; \ b='quotes'; \ @@ -2731,10 +2666,12 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) \ $(dist_check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(SCRIPTS) installdirs: -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -2810,7 +2747,6 @@ maintainer-clean-generic: -rm -f prefix_nr.c -rm -f prefix_r.c -rm -f pthread.c - -rm -f quote_in_comment.c -rm -f quotes.c -rm -f rescan_nr.direct.c -rm -f rescan_r.direct.c @@ -2818,6 +2754,7 @@ maintainer-clean-generic: -rm -f string_r.c -rm -f top.c -rm -f yyextra.c + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ @@ -2889,7 +2826,7 @@ ps-am: uninstall-am: -.MAKE: check-am install-am install-strip +.MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ @@ -2914,105 +2851,75 @@ dist-hook: ; done .l.c: $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ $< + $(FLEX) -o $@ $< .ll.cc: $(FLEX) - $(AM_V_LEX)$(FLEX) -+ -o $@ $< - -bison_nr_main.$(OBJEXT): bison_nr_parser.h bison_nr_scanner.h -bison_nr_scanner.$(OBJEXT): bison_nr_parser.h + $(FLEX) -+ -o $@ $< +bison_nr_main.($OBJEXT): bison_nr_parser.h bison_nr_scanner.h bison_nr_scanner.h: bison_nr_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi bison_yylloc_main.$(OBJEXT): bison_yylloc_parser.h bison_yylloc_scanner.h -bison_yylloc_scanner.$(OBJEXT): bison_yylloc_parser.h - bison_yylloc_scanner.h: bison_yylloc_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi bison_yylval_main.$(OBJEXT): bison_yylval_parser.h bison_yylval_scanner.h -bison_yylval_scanner.$(OBJEXT): bison_yylval_parser.h - bison_yylval_scanner.h: bison_yylval_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi # automake does not support compiling flex scanners output in C as C++ # so we explicitly sayhow, using the .lll suffix for the lex input file .lll.cc: $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ $< + $(FLEX) -o $@ $< header_nr_main.$(OBJEXT): header_nr_scanner.h - header_nr_scanner.h: header_nr_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi header_r_main.$(OBJEXT): header_r_scanner.h - header_r_scanner.h: header_r_scanner.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi multiple_scanners_nr_main.$(OBJEXT): multiple_scanners_nr_1.h multiple_scanners_nr_2.h - multiple_scanners_nr_1.h: multiple_scanners_nr_1.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi - multiple_scanners_nr_2.h: multiple_scanners_nr_2.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi multiple_scanners_r_main.$(OBJEXT): multiple_scanners_r_1.h multiple_scanners_r_2.h - multiple_scanners_r_1.h: multiple_scanners_r_1.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi - multiple_scanners_r_2.h: multiple_scanners_r_2.c - @if test ! -f $@; then rm -f $<; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) $<; else :; fi posixly_correct.c: posixly_correct.l $(FLEX) - $(AM_V_LEX)POSIXLY_CORRECT=1 $(FLEX) -o $@ $< + POSIXLY_CORRECT=1 $(FLEX) -o $@ $< reject_nr.reject.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -o $@ $< reject_nr.reject$(EXEEXT): reject_nr.reject.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ reject_r.reject.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape --reentrant -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape --reentrant -o $@ $< reject_r.reject.$(OBJEXT): reject_r.reject.c - $(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< reject_r.reject$(EXEEXT): reject_r.reject.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ reject_ver.table.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -o $@ --tables-verify --tables-file=$(basename $@).tables $< + $(FLEX) --unsafe-no-m4-sect3-escape -o $@ --tables-verify --tables-file=$(basename $@).tables $< reject_ver.table.$(OBJEXT): reject_ver.table.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< reject_ver.table$(EXEEXT): reject_ver.table.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ reject_ser.table.c: reject.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) -o $@ --unsafe-no-m4-sect3-escape --tables-file=$(basename $@).tables $< + $(FLEX) -o $@ --unsafe-no-m4-sect3-escape --tables-file=$(basename $@).tables $< reject_ser.table.$(OBJEXT): reject_ser.table.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< reject_ser.table$(EXEEXT): reject_ser.table.$(OBJEXT) - $(AM_V_CCLD)$(LINK) $^ + $(LINK) $^ top_main.$(OBJEXT): top.h top.h: top.c @@ -3024,244 +2931,244 @@ top.h: top.c # it can be / is generated by a shell script, tableopts.sh. tableopts.am: tableopts.sh - $(SHELL) $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am + $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am tableopts_opt_nr-Ca.opt$(EXEEXT): tableopts_opt_nr-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Ce.opt$(EXEEXT): tableopts_opt_nr-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Cf.opt$(EXEEXT): tableopts_opt_nr-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-CF.opt$(EXEEXT): tableopts_opt_nr-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Cm.opt$(EXEEXT): tableopts_opt_nr-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Cem.opt$(EXEEXT): tableopts_opt_nr-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Cae.opt$(EXEEXT): tableopts_opt_nr-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Caef.opt$(EXEEXT): tableopts_opt_nr-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-CaeF.opt$(EXEEXT): tableopts_opt_nr-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Cam.opt$(EXEEXT): tableopts_opt_nr-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr-Caem.opt$(EXEEXT): tableopts_opt_nr-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Ca.opt$(EXEEXT): tableopts_opt_r-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Ce.opt$(EXEEXT): tableopts_opt_r-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Cf.opt$(EXEEXT): tableopts_opt_r-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-CF.opt$(EXEEXT): tableopts_opt_r-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Cm.opt$(EXEEXT): tableopts_opt_r-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Cem.opt$(EXEEXT): tableopts_opt_r-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Cae.opt$(EXEEXT): tableopts_opt_r-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Caef.opt$(EXEEXT): tableopts_opt_r-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-CaeF.opt$(EXEEXT): tableopts_opt_r-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Cam.opt$(EXEEXT): tableopts_opt_r-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r-Caem.opt$(EXEEXT): tableopts_opt_r-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Ca.ser$(EXEEXT): tableopts_ser_nr-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Ce.ser$(EXEEXT): tableopts_ser_nr-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Cf.ser$(EXEEXT): tableopts_ser_nr-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-CF.ser$(EXEEXT): tableopts_ser_nr-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Cm.ser$(EXEEXT): tableopts_ser_nr-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Cem.ser$(EXEEXT): tableopts_ser_nr-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Cae.ser$(EXEEXT): tableopts_ser_nr-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Caef.ser$(EXEEXT): tableopts_ser_nr-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-CaeF.ser$(EXEEXT): tableopts_ser_nr-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Cam.ser$(EXEEXT): tableopts_ser_nr-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr-Caem.ser$(EXEEXT): tableopts_ser_nr-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Ca.ser$(EXEEXT): tableopts_ser_r-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Ce.ser$(EXEEXT): tableopts_ser_r-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Cf.ser$(EXEEXT): tableopts_ser_r-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-CF.ser$(EXEEXT): tableopts_ser_r-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Cm.ser$(EXEEXT): tableopts_ser_r-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Cem.ser$(EXEEXT): tableopts_ser_r-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Cae.ser$(EXEEXT): tableopts_ser_r-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Caef.ser$(EXEEXT): tableopts_ser_r-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-CaeF.ser$(EXEEXT): tableopts_ser_r-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Cam.ser$(EXEEXT): tableopts_ser_r-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r-Caem.ser$(EXEEXT): tableopts_ser_r-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Ca.ver$(EXEEXT): tableopts_ver_nr-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Ce.ver$(EXEEXT): tableopts_ver_nr-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Cf.ver$(EXEEXT): tableopts_ver_nr-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-CF.ver$(EXEEXT): tableopts_ver_nr-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Cm.ver$(EXEEXT): tableopts_ver_nr-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Cem.ver$(EXEEXT): tableopts_ver_nr-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Cae.ver$(EXEEXT): tableopts_ver_nr-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Caef.ver$(EXEEXT): tableopts_ver_nr-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-CaeF.ver$(EXEEXT): tableopts_ver_nr-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Cam.ver$(EXEEXT): tableopts_ver_nr-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr-Caem.ver$(EXEEXT): tableopts_ver_nr-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Ca.ver$(EXEEXT): tableopts_ver_r-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Ce.ver$(EXEEXT): tableopts_ver_r-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Cf.ver$(EXEEXT): tableopts_ver_r-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-CF.ver$(EXEEXT): tableopts_ver_r-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Cm.ver$(EXEEXT): tableopts_ver_r-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Cem.ver$(EXEEXT): tableopts_ver_r-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Cae.ver$(EXEEXT): tableopts_ver_r-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Caef.ver$(EXEEXT): tableopts_ver_r-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-CaeF.ver$(EXEEXT): tableopts_ver_r-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Cam.ver$(EXEEXT): tableopts_ver_r-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r-Caem.ver$(EXEEXT): tableopts_ver_r-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $* -o $@ $< tableopts_opt_nr%.$(OBJEXT): tableopts_opt_nr%.c - $(AM_V_CC)$(COMPILE) -c -o $@ $< + $(COMPILE) -c -o $@ $< tableopts_opt_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $* -o $@ $< tableopts_opt_r%.$(OBJEXT): tableopts_opt_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $< tableopts_ser_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $* -o $@ $< tableopts_ser_nr%.$(OBJEXT): tableopts_ser_nr%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< tableopts_ser_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $* -o $@ $< tableopts_ser_r%.$(OBJEXT): tableopts_ser_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< tableopts_ver_nr%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $* -o $@ $< tableopts_ver_nr%.$(OBJEXT): tableopts_ver_nr%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $< tableopts_ver_nr%.ver$(EXEEXT): tableopts_ver_nr%.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $^ + $(LINK) -o $@ $^ tableopts_ver_r%.c: tableopts.l4 $(FLEX) - $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ver_r$*.ver.tables" --tables-verify $* -o $@ $< + $(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ver_r$*.ver.tables" --tables-verify $* -o $@ $< tableopts_ver_r%.$(OBJEXT): tableopts_ver_r%.c - $(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< + $(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $< # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tests/README b/tests/README index f1b9ba0..43387f4 100644 --- a/tests/README +++ b/tests/README @@ -50,8 +50,7 @@ stderr, which will have been redirected to the log file created by the automake test suite harness. ** If your test is skipped (e.g., because bison was not found), then - the test should return 77 (seventy-seven). This is the exit status that - would be recognized by automake's "test-driver" as _skipped_. + the test should return 2 (two). ** Once your work is done, submit a patch via the flex development mailing list, the github pull request mechanism or some other diff --git a/tests/array_r.l b/tests/array_r.l index 68a6299..e038f7c 100644 --- a/tests/array_r.l +++ b/tests/array_r.l @@ -49,13 +49,13 @@ main (void) { yyscan_t lexer; - yylex_init(&lexer); - yyset_in(stdin, lexer); - yyset_out(stdout, lexer); + testlex_init(&lexer); + testset_in(stdin, lexer); + testset_out(stdout, lexer); - yylex( lexer ); + testlex( lexer ); - yylex_destroy( lexer); + testlex_destroy( lexer); printf("TEST RETURNING OK.\n"); return 0; diff --git a/tests/no_bison_stub.c b/tests/no_bison_stub.c deleted file mode 100644 index 5fb3a9d..0000000 --- a/tests/no_bison_stub.c +++ /dev/null @@ -1,39 +0,0 @@ -/* This stub will be used when Bison is not available on the user's host. */ - -/* This file is part of flex. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE. - */ -#include - -int main (int argc, char *argv[]) -{ - (void)argc; - (void)argv; - puts( - "This test requires Bison. Install Bison and re-run \"configure && make check\"\n" - "to perform this test. (This file is stub code.)" - ); - - /* Exit status for a skipped test */ - return 77; -} - -/* vim:set tabstop=8 softtabstop=4 shiftwidth=4: */ diff --git a/tests/options.cn b/tests/options.cn index 5af60ea..2f592e9 100755 --- a/tests/options.cn +++ b/tests/options.cn @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Test that flex handles the grouped noop options -c and -n properly. diff --git a/tests/pthread.l b/tests/pthread.l index eb99778..3f449d2 100644 --- a/tests/pthread.l +++ b/tests/pthread.l @@ -27,7 +27,7 @@ We create N_THREADS number of threads. Each thread has it's own scanner. Each thread selects one of the files specified in ARGV, scans it, then - closes it. This is repeated N_SCANS number of times for each thread. + closes it. This is repeated N_SCANS numebr of times for each thread. The idea is to press the scanner to break under threads. If we see "Scanner Jammed", then we know @@ -90,18 +90,18 @@ static int process_text(char* s, yyscan_t scanner) int main(int ARGC, char *ARGV[]); -#ifndef HAVE_PTHREAD_H -int main (int ARGC, char *ARGV[]) { - puts( +#ifndef HAVE_LIBPTHREAD + int main (int ARGC, char *ARGV[]) { + printf( "TEST ABORTED because pthread library not available \n" - "-- This is expected on some systems. It is not a flex error."); - /* Exit status for a skipped test */ - return 77; -} + "-- This is expected on some systems. It is not a flex error.\n" ); + return 0; + } #else #define N_THREADS 4 #define N_SCANS 20 +#define INPUT_FILE "test.input" /* Each thread selects the next file to scan in round-robin fashion. If there are less files than threads, some threads may block. */ @@ -204,5 +204,5 @@ int main (int ARGC, char *ARGV[]) return 0; } -#endif /* HAVE_PTHREAD_H */ +#endif /* HAVE_LIBPTHREAD */ diff --git a/tests/quote_in_comment.l b/tests/quote_in_comment.l deleted file mode 100644 index a5743c2..0000000 --- a/tests/quote_in_comment.l +++ /dev/null @@ -1,16 +0,0 @@ -%option 8bit noyywrap -%% -.|\n { ECHO; - //' " - } -%% -int -main (void) -{ - yyin = stdin; - yyout = stdout; - while (yylex()) - ; - printf("TEST RETURNING OK.\n"); - return 0; -} diff --git a/tests/quote_in_comment.txt b/tests/quote_in_comment.txt deleted file mode 100644 index 9daeafb..0000000 --- a/tests/quote_in_comment.txt +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/quotes.l b/tests/quotes.l index d1b97eb..62f4fb4 100644 --- a/tests/quotes.l +++ b/tests/quotes.l @@ -67,39 +67,19 @@ static int foo (int i){ /* indented code [[[ 3 ]]] */ /* indented code [[[[ 4 ]]]] */ /* indented code ]] unmatched [[ */ -%{ -// non-indented code [ 1 ] -// non-indented code [[ 2 ]] -// non-indented code [[[ 3 ]]] -// non-indented code [[[[ 4 ]]]] -%} - a /* action comment [ 1 ] */ ; b /* action comment [[ 2 ]] */ ; c /* action comment [[[ 3 ]]] */ ; d /* action comment [[[[ 4 ]]]] */ ; e /* action comment ]] unmatched [[ */ ; f return 1+foo(a[b[c[0]]]); -.|\n { - -#if 0 - action code [ 1 ] TEST_XXX - action code [[ 2 ]] TEST_XXX - action code [[[ 3 ]]] TEST_XXX - action code [[[[ 4 ]]]] TEST_XXX - action code ]] unmatched [[ TEST_XXX -#endif +.|\n { /* action block [ 1 ] TEST_XXX */ /* action block [[ 2 ]] TEST_XXX */ /* action block [[[ 3 ]]] TEST_XXX */ /* action block [[[[ 4 ]]]] TEST_XXX */ /* action block ]] unmatched [[ TEST_XXX */ - assert(!strcmp("[[ 2 ]]", "[""[ 2 ]""]")); - assert(!strcmp("[[[ 3 ]]]", "[""[""[ 3 ]""]""]")); - assert(!strcmp("[[[[ 4 ]]]]", "[""[""[""[ 4 ]""]""]""]")); - assert(!strcmp("]] unmatched [[", "]""] unmatched [""[")); - assert(!strcmp("]]m4_define(alpha, beta)[[", - "]""]m4_""define(alpha, beta)[""[")); + assert(!strcmp("m4_define(alpha, beta)", "m4_""define(alpha, beta)")); return 1+foo(a[b[c[0]]]); /* TEST_XXX */ } %% diff --git a/tests/tableopts.am b/tests/tableopts.am index 099870b..bbb20d0 100644 --- a/tests/tableopts.am +++ b/tests/tableopts.am @@ -1,332 +1,332 @@ tableopts_opt_nr_Ca_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Ca.opt$(EXEEXT): tableopts_opt_nr-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Ce_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Ce.opt$(EXEEXT): tableopts_opt_nr-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Cf_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Cf.opt$(EXEEXT): tableopts_opt_nr-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_CF_opt_SOURCES = tableopts.l4 tableopts_opt_nr-CF.opt$(EXEEXT): tableopts_opt_nr-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Cm_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Cm.opt$(EXEEXT): tableopts_opt_nr-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Cem_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Cem.opt$(EXEEXT): tableopts_opt_nr-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Cae_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Cae.opt$(EXEEXT): tableopts_opt_nr-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Caef_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Caef.opt$(EXEEXT): tableopts_opt_nr-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_CaeF_opt_SOURCES = tableopts.l4 tableopts_opt_nr-CaeF.opt$(EXEEXT): tableopts_opt_nr-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Cam_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Cam.opt$(EXEEXT): tableopts_opt_nr-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_nr_Caem_opt_SOURCES = tableopts.l4 tableopts_opt_nr-Caem.opt$(EXEEXT): tableopts_opt_nr-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Ca_opt_SOURCES = tableopts.l4 tableopts_opt_r-Ca.opt$(EXEEXT): tableopts_opt_r-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Ce_opt_SOURCES = tableopts.l4 tableopts_opt_r-Ce.opt$(EXEEXT): tableopts_opt_r-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Cf_opt_SOURCES = tableopts.l4 tableopts_opt_r-Cf.opt$(EXEEXT): tableopts_opt_r-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_CF_opt_SOURCES = tableopts.l4 tableopts_opt_r-CF.opt$(EXEEXT): tableopts_opt_r-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Cm_opt_SOURCES = tableopts.l4 tableopts_opt_r-Cm.opt$(EXEEXT): tableopts_opt_r-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Cem_opt_SOURCES = tableopts.l4 tableopts_opt_r-Cem.opt$(EXEEXT): tableopts_opt_r-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Cae_opt_SOURCES = tableopts.l4 tableopts_opt_r-Cae.opt$(EXEEXT): tableopts_opt_r-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Caef_opt_SOURCES = tableopts.l4 tableopts_opt_r-Caef.opt$(EXEEXT): tableopts_opt_r-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_CaeF_opt_SOURCES = tableopts.l4 tableopts_opt_r-CaeF.opt$(EXEEXT): tableopts_opt_r-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Cam_opt_SOURCES = tableopts.l4 tableopts_opt_r-Cam.opt$(EXEEXT): tableopts_opt_r-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_opt_r_Caem_opt_SOURCES = tableopts.l4 tableopts_opt_r-Caem.opt$(EXEEXT): tableopts_opt_r-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Ca_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Ca.ser$(EXEEXT): tableopts_ser_nr-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Ce_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Ce.ser$(EXEEXT): tableopts_ser_nr-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Cf_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Cf.ser$(EXEEXT): tableopts_ser_nr-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_CF_ser_SOURCES = tableopts.l4 tableopts_ser_nr-CF.ser$(EXEEXT): tableopts_ser_nr-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Cm_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Cm.ser$(EXEEXT): tableopts_ser_nr-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Cem_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Cem.ser$(EXEEXT): tableopts_ser_nr-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Cae_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Cae.ser$(EXEEXT): tableopts_ser_nr-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Caef_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Caef.ser$(EXEEXT): tableopts_ser_nr-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_CaeF_ser_SOURCES = tableopts.l4 tableopts_ser_nr-CaeF.ser$(EXEEXT): tableopts_ser_nr-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Cam_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Cam.ser$(EXEEXT): tableopts_ser_nr-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_nr_Caem_ser_SOURCES = tableopts.l4 tableopts_ser_nr-Caem.ser$(EXEEXT): tableopts_ser_nr-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Ca_ser_SOURCES = tableopts.l4 tableopts_ser_r-Ca.ser$(EXEEXT): tableopts_ser_r-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Ce_ser_SOURCES = tableopts.l4 tableopts_ser_r-Ce.ser$(EXEEXT): tableopts_ser_r-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Cf_ser_SOURCES = tableopts.l4 tableopts_ser_r-Cf.ser$(EXEEXT): tableopts_ser_r-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_CF_ser_SOURCES = tableopts.l4 tableopts_ser_r-CF.ser$(EXEEXT): tableopts_ser_r-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Cm_ser_SOURCES = tableopts.l4 tableopts_ser_r-Cm.ser$(EXEEXT): tableopts_ser_r-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Cem_ser_SOURCES = tableopts.l4 tableopts_ser_r-Cem.ser$(EXEEXT): tableopts_ser_r-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Cae_ser_SOURCES = tableopts.l4 tableopts_ser_r-Cae.ser$(EXEEXT): tableopts_ser_r-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Caef_ser_SOURCES = tableopts.l4 tableopts_ser_r-Caef.ser$(EXEEXT): tableopts_ser_r-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_CaeF_ser_SOURCES = tableopts.l4 tableopts_ser_r-CaeF.ser$(EXEEXT): tableopts_ser_r-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Cam_ser_SOURCES = tableopts.l4 tableopts_ser_r-Cam.ser$(EXEEXT): tableopts_ser_r-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ser_r_Caem_ser_SOURCES = tableopts.l4 tableopts_ser_r-Caem.ser$(EXEEXT): tableopts_ser_r-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Ca_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Ca.ver$(EXEEXT): tableopts_ver_nr-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Ce_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Ce.ver$(EXEEXT): tableopts_ver_nr-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Cf_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Cf.ver$(EXEEXT): tableopts_ver_nr-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_CF_ver_SOURCES = tableopts.l4 tableopts_ver_nr-CF.ver$(EXEEXT): tableopts_ver_nr-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Cm_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Cm.ver$(EXEEXT): tableopts_ver_nr-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Cem_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Cem.ver$(EXEEXT): tableopts_ver_nr-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Cae_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Cae.ver$(EXEEXT): tableopts_ver_nr-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Caef_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Caef.ver$(EXEEXT): tableopts_ver_nr-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_CaeF_ver_SOURCES = tableopts.l4 tableopts_ver_nr-CaeF.ver$(EXEEXT): tableopts_ver_nr-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Cam_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Cam.ver$(EXEEXT): tableopts_ver_nr-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_nr_Caem_ver_SOURCES = tableopts.l4 tableopts_ver_nr-Caem.ver$(EXEEXT): tableopts_ver_nr-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Ca_ver_SOURCES = tableopts.l4 tableopts_ver_r-Ca.ver$(EXEEXT): tableopts_ver_r-Ca.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Ce_ver_SOURCES = tableopts.l4 tableopts_ver_r-Ce.ver$(EXEEXT): tableopts_ver_r-Ce.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Cf_ver_SOURCES = tableopts.l4 tableopts_ver_r-Cf.ver$(EXEEXT): tableopts_ver_r-Cf.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_CF_ver_SOURCES = tableopts.l4 tableopts_ver_r-CF.ver$(EXEEXT): tableopts_ver_r-CF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Cm_ver_SOURCES = tableopts.l4 tableopts_ver_r-Cm.ver$(EXEEXT): tableopts_ver_r-Cm.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Cem_ver_SOURCES = tableopts.l4 tableopts_ver_r-Cem.ver$(EXEEXT): tableopts_ver_r-Cem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Cae_ver_SOURCES = tableopts.l4 tableopts_ver_r-Cae.ver$(EXEEXT): tableopts_ver_r-Cae.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Caef_ver_SOURCES = tableopts.l4 tableopts_ver_r-Caef.ver$(EXEEXT): tableopts_ver_r-Caef.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_CaeF_ver_SOURCES = tableopts.l4 tableopts_ver_r-CaeF.ver$(EXEEXT): tableopts_ver_r-CaeF.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Cam_ver_SOURCES = tableopts.l4 tableopts_ver_r-Cam.ver$(EXEEXT): tableopts_ver_r-Cam.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< tableopts_ver_r_Caem_ver_SOURCES = tableopts.l4 tableopts_ver_r-Caem.ver$(EXEEXT): tableopts_ver_r-Caem.$(OBJEXT) - $(AM_V_CCLD)$(LINK) -o $@ $< + $(LINK) -o $@ $< TABLEOPTS_TESTS = tableopts_opt_nr-Ca.opt tableopts_opt_nr-Ce.opt tableopts_opt_nr-Cf.opt tableopts_opt_nr-CF.opt tableopts_opt_nr-Cm.opt tableopts_opt_nr-Cem.opt tableopts_opt_nr-Cae.opt tableopts_opt_nr-Caef.opt tableopts_opt_nr-CaeF.opt tableopts_opt_nr-Cam.opt tableopts_opt_nr-Caem.opt tableopts_opt_r-Ca.opt tableopts_opt_r-Ce.opt tableopts_opt_r-Cf.opt tableopts_opt_r-CF.opt tableopts_opt_r-Cm.opt tableopts_opt_r-Cem.opt tableopts_opt_r-Cae.opt tableopts_opt_r-Caef.opt tableopts_opt_r-CaeF.opt tableopts_opt_r-Cam.opt tableopts_opt_r-Caem.opt tableopts_ser_nr-Ca.ser tableopts_ser_nr-Ce.ser tableopts_ser_nr-Cf.ser tableopts_ser_nr-CF.ser tableopts_ser_nr-Cm.ser tableopts_ser_nr-Cem.ser tableopts_ser_nr-Cae.ser tableopts_ser_nr-Caef.ser tableopts_ser_nr-CaeF.ser tableopts_ser_nr-Cam.ser tableopts_ser_nr-Caem.ser tableopts_ser_r-Ca.ser tableopts_ser_r-Ce.ser tableopts_ser_r-Cf.ser tableopts_ser_r-CF.ser tableopts_ser_r-Cm.ser tableopts_ser_r-Cem.ser tableopts_ser_r-Cae.ser tableopts_ser_r-Caef.ser tableopts_ser_r-CaeF.ser tableopts_ser_r-Cam.ser tableopts_ser_r-Caem.ser tableopts_ver_nr-Ca.ver tableopts_ver_nr-Ce.ver tableopts_ver_nr-Cf.ver tableopts_ver_nr-CF.ver tableopts_ver_nr-Cm.ver tableopts_ver_nr-Cem.ver tableopts_ver_nr-Cae.ver tableopts_ver_nr-Caef.ver tableopts_ver_nr-CaeF.ver tableopts_ver_nr-Cam.ver tableopts_ver_nr-Caem.ver tableopts_ver_r-Ca.ver tableopts_ver_r-Ce.ver tableopts_ver_r-Cf.ver tableopts_ver_r-CF.ver tableopts_ver_r-Cm.ver tableopts_ver_r-Cem.ver tableopts_ver_r-Cae.ver tableopts_ver_r-Caef.ver tableopts_ver_r-CaeF.ver tableopts_ver_r-Cam.ver tableopts_ver_r-Caem.ver diff --git a/tests/tableopts.sh b/tests/tableopts.sh index c1ac19e..63a36d3 100755 --- a/tests/tableopts.sh +++ b/tests/tableopts.sh @@ -1,15 +1,12 @@ -#!/bin/sh -set -eu -# IFS=$'\n\t' -IFS=' -'' ' +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' # This script is present to generate the automake _SOURCES variables # for the tableopts_* tests. It also generates the linking rules for # each test since automake isn't able to handle the pattern rules that # would be natural to use. Output is written to standard output for -# inclusion in a Makefile.am, typically by redirecting the output and -# then an automake include directive. +# inclusion in a Makefile.am, typically by redirecting the output and then an automake include directive. TABLEOPTS_TESTS="" tableopts_tables="" @@ -20,12 +17,12 @@ for kind in opt ser ver ; do testname=tableopts_${kind}_${threading}${opt}.${kind} if [ "${TABLEOPTS_TESTS}" = "" ] ;then TABLEOPTS_TESTS=${testname} - if [ "$kind" = "ser" ] || [ "$kind" = "ver" ] ; then + if [ "$kind" = "ser" -o "$kind" = "ver" ] ; then tableopts_tables=${testname}.tables fi else TABLEOPTS_TESTS="${TABLEOPTS_TESTS} ${testname}" - if [ "$kind" = "ser" ] || [ "$kind" = "ver" ] ; then + if [ "$kind" = "ser" -o "$kind" = "ver" ] ; then tableopts_tables="${tableopts_tables} ${testname}.tables" fi fi @@ -35,7 +32,7 @@ for kind in opt ser ver ; do tableopts_${kind}_${threading}_${bare_opt}_${kind}_SOURCES = tableopts.l4 ${testname}\$(EXEEXT): tableopts_${kind}_${threading}${opt}.\$(OBJEXT) - \$(AM_V_CCLD)\$(LINK) -o \$@ \$< + \$(LINK) -o \$@ \$< EOF done diff --git a/tests/testwrapper-direct.sh b/tests/testwrapper-direct.sh index 589ad33..e0e7fd9 100755 --- a/tests/testwrapper-direct.sh +++ b/tests/testwrapper-direct.sh @@ -1,20 +1,17 @@ -#!/bin/sh -set -vx -set -euvx +#!/bin/bash -vx +set -euo pipefail -# testwrapper-direct.sh: run some specialized flex tests that care where -# they're run from. +# testwrapper-direct.sh: run some specialized flex tests that care where they're run from. while getopts :b:s: OPTION ; do case $OPTION in - b) BINARY_DIR=$OPTARG ;; + b) BINARY_DIR=$OPTARG ;; s) SOURCE_DIR=$OPTARG ;; esac done -shift $(($OPTIND-1)) -TESTNAME=$1 +TESTNAME="${!OPTIND}" -INPUT_NAME=`basename "${TESTNAME%.exe}"`.txt +INPUT_NAME=`basename ${TESTNAME%.exe}`.txt cd ${SOURCE_DIR} && ${BINARY_DIR}/${TESTNAME} ${INPUT_NAME} diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh index 6a7e666..e18062f 100755 --- a/tests/testwrapper.sh +++ b/tests/testwrapper.sh @@ -1,11 +1,9 @@ -#!/bin/sh -set -vx -set -euvx +#!/bin/bash -vx +set -euo pipefail # testwrapper.sh: run a flex test, typically called by a Makefile -# Each test will exercise some feature or aspect of flex. Run the test with any -# input it may need. +# Each test will exercise some feature or aspect of flex. Run the test with any input it may need. INPUT_DIRECTORY="" INPUT_NAME="" @@ -17,7 +15,7 @@ while getopts :d:i:rt1 OPTION ; do case $OPTION in d) INPUT_DIRECTORY=$OPTARG ;; i) - if [ "$INPUT_NAME" = "" ] ; then + if [ "$INPUT_NAME" == "" ] ; then INPUT_NAME="$OPTARG" else INPUT_NAME="$INPUT_NAME $OPTARG" @@ -28,27 +26,24 @@ while getopts :d:i:rt1 OPTION ; do t) USE_TABLES=1 ;; 1) DO_COMPARISON=1 ;; esac -done + done -shift $(($OPTIND-1)) -TESTNAME=$1 +TESTNAME="${!OPTIND}" -INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename "${TESTNAME%.exe}"`.txt} +INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename ${TESTNAME%.exe}`.txt} -if [ $DO_COMPARISON = 1 ] ; then - TEST_OUTPUT=`$TESTNAME < $INPUT_NAME` - REF_OUTPUT=`$TESTNAME 1 < $INPUT_NAME` - test "$TEST_OUTPUT" -eq "$REF_OUTPUT" +if [ "$DO_COMPARISON" -eq "1" ] ; then + test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME` exit $? -fi + fi if [ $INPUT_COUNT -gt 1 ] ; then $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME%.exe}.tables} ${INPUT_NAME} exit $? -fi + fi if [ -f ${INPUT_NAME} ] ; then - if [ $USE_REDIRECT = 1 ] ; then + if [ $USE_REDIRECT == 1 ] ; then $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME%.exe}.tables} < $INPUT_NAME else $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME%.exe}.tables} $INPUT_NAME diff --git a/tools/Makefile.in b/tools/Makefile.in index 3e2ddff..8961afa 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -89,15 +89,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = tools ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -136,17 +135,12 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ +BISON = @BISON@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ CXX = @CXX@ CXXCPP = @CXXCPP@ CXXDEPMODE = @CXXDEPMODE@ @@ -178,14 +172,12 @@ INTLLIBS = @INTLLIBS@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ -LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBOBJS = @LIBOBJS@ -LIBPTHREAD = @LIBPTHREAD@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ @@ -237,7 +229,6 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@