summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'fix-yy-n-char-size-t'Manoj Srivastava2016-02-24
|\
| * Changed type of yy_n_chars to int; gh#53, sf#160.Will Estes2016-02-24
| | | | | | | | | | | | | | The variable yy_n_chars had been of type yy_size_t which is incorrect given its use in read(). While it might be adviseable to look at defining a yy_ssize_t, there might be some issues doing this and so, for now, at least, we'll punt back to int.
* | Fixed size of buffer allocationManoj Srivastava2016-02-24
| | | | | | | | | | | | | | | | | | | | | | The value of n_alloc was a count, not a size. Multiplying the value by the element size was incorrect. That multiplication was already being done and having it done twice was incorrect. Bug fix: "n_alloc has wrong value in buf_append function", thanks to Howard Gong (Closes: #761250). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Merge branch 'fix-buffer-allocation'Manoj Srivastava2016-02-24
|\ \
| * | Fixed size of bufferallocation, resolved gh#54.Will Estes2016-02-24
| |/ | | | | | | The value of n_alloc was a count, not a size. Multiplying the value by the element size was incorrect. That multiplication was already being done and having it done twice was incorrect.
* | [master]: Fix undeclared variable tsz.debian/2.6.0-10Manoj Srivastava2016-02-24
| | | | | | | | Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Emit no #line directives if gen_line_dirs is falseManoj Srivastava2016-02-24
| | | | | | | | | | | | | | | | | | | | | | There are two instances in the code which will print a #line directive to the resulting lexer, regardless of the value of gen_line_dirs. Fix them, so they also respect gen_line_dirs. Bug fix: "flex --noline outputs a #line directive", thanks to Arthur Schwarz (Closes: #729927). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Merge branch 'fix-line-directives'Manoj Srivastava2016-02-24
|\ \
| * | Emit no #line directives if gen_line_dirs is false, resolves igh#55.Tobias Klauser2016-02-24
| |/ | | | | | | | | | | | | | | | | | | | | | | There are two instances in the code which will print a #line directive to the resulting lexer, regardless of the value of gen_line_dirs. Fix them, so they also respect gen_line_dirs. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Manoj Srivastava <srivasta@debian.org> # Conflicts: # src/buf.c
* | Allow '%option noline' in flex input fileManoj Srivastava2016-02-24
| | | | | | | | | | | | | | | | | | | | Allow specifying '%option noline' in the input file, leading to the same effect as calling flex with the command line option --noline. Bug fix: "%option noline generates and error message", thanks to Arthur Schwarz (Closes: #729693). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Merge branch 'fix-option-noline'Manoj Srivastava2016-02-24
|\ \
| * | Allow '%option noline' in flex input file, resolves gh#56.Tobias Klauser2016-02-24
| |/ | | | | | | | | | | | | Allow specifying '%option noline' in the input file, leading to the same effect as calling flex with the command line option --noline. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
* | Updated for cross compilation supportdebian/2.6.0-9Manoj Srivastava2016-02-18
| | | | | | | | | | | | | | | | | | | | | | | | Updated standards version to 3.9.7. No changes needed. Bug fix: "[src:flex] FTCBFS: runs host arch binaries during build", thanks to Helmut Grohne. Make the tests use either the installed flex or the newly built flex to generate test soureces, depending on whether or not we are cross compiling. Also added a build depends flex <cross> Hope this works. This has not broken the common case. (Closes: #762180). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Run native binary via help2mandebian/2.6.0-8Manoj Srivastava2016-02-16
| | | | | | | | | | | | | | | | Bug fix: "runs host arch binaries during build via help2man", thanks to Helmut Grohne. The change from the previous patch is that the flex binary now is created in ./src/ (Closes: #762180). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Honour nockeck in DEB_BUILD_OPTIONSManoj Srivastava2016-02-16
| | | | | | | | | | | | | | | | | | Bug fix: "flex FTCBFS: runs tests even when DEB_BUILD_OPTIONS contains nocheck", thanks to Helmut Grohne. Added an AM_CONDITIONAL that tests DEB_BUILD_OPTIONS in configure.ac, and use that in tests/Makefile.am. Seems to work fine. (Closes: #812659). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Really fix C++ comments in C parsers bug.debian/2.6.0-7Manoj Srivastava2016-02-13
| | | | | | | | | | | | | | | | | | | | | | | | So, when we applied the upstream patch, it only fixed the skeleton file, flex.skl, and not the generated files skel.c and scan.c;. Added a feature branch that fixes the generated files, the need for this will go away with the next upstream release. I hope. For what it is worth, the diff in upstream seems to be the same one that was in the NMU; and I have no explanations for why the -6 would behave diferently from the NMU. (Closes: #813256). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Merge branch 'fix-c-plus-comment'Manoj Srivastava2016-02-13
|\ \
| * | [fix-c-plus-comment]: Update generated files after "Commented in C style in ↵Manoj Srivastava2016-02-13
| |/ | | | | | | | | | | skeleton;" Signed-off-by: Manoj Srivastava <srivasta@debian.org>
| * Commented in C style in skeleton; fixed sf#195Will Estes2016-02-05
| |
* | [master]: Set the libfl-dev package to be MA: same in the interim.debian/2.6.0-6Manoj Srivastava2016-02-09
| | | | | | | | Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Potential fix for the multi-arch issuedebian/2.6.0-5Manoj Srivastava2016-02-08
| | | | | | | | | | | | | | | | | | | | | | Flex no longer automatically pulls in libfl-dev, so at the very least packages using C++ lexers will need to pull in libfl-dev in build depends. libfl-dev is now demoted to a suggestion. This will impact compilation where there was an implicit dependency on the C++ header files provided by libfl-dev; please install libfl-dev explicitly if that is the case. Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | A bug fixing releasedebian/2.6.0-4Manoj Srivastava2016-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug fix: "C++ style comment in C output", thanks to Tim Rühsen There is a fix uploaded to deferred by Salvatore Bonaccorso <carnil@debian.org>. I am uploading this fix instead, since this variant has the same fix applied by a signed cherry pick from upstream, which will make the upgrade to the next version somewhat simpler. (Closes: #813256). Bug fix: "wrongly declares Multi-Arch:foreign", thanks to Helmut Grohne. While we discuss the correct solution for this, I have removed the MA package tags. I am not quite happy with the proposed solution (swapping names of the packages seems icky, but I'll defer to the experts if there is no better way) (Closes: #761449). Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Commented in C style in skeleton; fixed sf#195Will Estes2016-02-05
| |
* | revert previous changesdebian/2.6.0-3Manoj Srivastava2016-01-25
| | | | | | | | Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Changes to let flex crosscompiledebian/2.6.0-2Manoj Srivastava2016-01-25
| | | | | | | | Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | A bug fixing point releaseManoj Srivastava2016-01-25
| | | | | | | | | | | | Drop patch from upstream about line numbering that is not working Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Revert "[fix-off-by-one-error]: generatred line numbers are off by one"Manoj Srivastava2016-01-25
| | | | | | | | | | This reverts commit d78a3072cf6268d48110735485f163e1588c23aa. The error seems to have been independently fixed.
* | New upstream version 2.6.0debian/2.6.0-1Manoj Srivastava2016-01-24
| | | | | | | | | | | | | | | | Updated the VCS-Git field of the control file to use HTTPS transport Updated the copyright file to DEP-5 format. Reverted to source format 1.0 , and use dgit Signed-off-by: Manoj Srivastava <srivasta@debian.org>
* | Merge branch 'upstream'Manoj Srivastava2016-01-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Manoj Srivastava <srivasta@debian.org> # Conflicts: # INSTALL # Makefile.in # aclocal.m4 # build-aux/compile # build-aux/config.guess # build-aux/config.sub # build-aux/depcomp # build-aux/install-sh # build-aux/mdate-sh # build-aux/texinfo.tex # configure # doc/Makefile.in # doc/flex.1 # doc/flex.info # doc/flex.info-1 # doc/flex.info-2 # doc/flex.pdf # doc/stamp-vti # doc/version.texi # examples/Makefile.in # examples/fastwc/Makefile.in # examples/manual/Makefile.in # src/config.h.in # tests/Makefile.in # tests/test-bison-nr/Makefile.am # tests/test-bison-yylloc/Makefile.am # tests/test-bison-yylval/Makefile.am # tools/Makefile.in
| * Imported Upstream version 2.6.0Manoj Srivastava2016-01-22
| |
| * Merge tag 'v2.6.0' into upstreamManoj Srivastava2016-01-22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flex v2.6.0 release Signed-off-by: Manoj Srivastava <srivasta@debian.org> # gpg: Signature made Sat 05 Dec 2015 11:42:31 AM PST using RSA key ID 4F8BC9A4 # gpg: requesting key 4F8BC9A4 from hkp server pool.sks-keyservers.net # gpg: no valid OpenPGP data found. # gpg: Total number processed: 0 # gpg: keyserver communications error: key not found # gpg: keyserver communications error: bad public key # gpg: Can't check signature: public key not found # Conflicts: # Makefile.am # NEWS # autogen.sh # configure.ac # doc/Makefile.am # doc/flex.texi # examples/fastwc/mywc.c # lib/Makefile.am # lib/malloc.c # lib/realloc.c # po/POTFILES.in # 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 # tests/Makefile.am # tests/README
| | * Declared version 2.6.0Will Estes2015-11-17
| | |
| | * Dated, described flex release 2.6.0Will Estes2015-11-17
| | |
| | * Declared version 2.6.0rc1Will Estes2015-11-13
| | |
| | * Supplied versioning information in flex libraries.lukeallardyce2015-11-13
| | | | | | | | | | | | Resolves sourceforge bug #182. On OSX, and possibly other platforms, building the libfl libraries without versioning information caused a build failures.
| | * Cleaned up more precisely after make check.Will Estes2015-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILT_SOURCES is now just the list of headers built as per the automake manual. We provide the list of files to clean to make rebuilding the test suite programs easier. We then use the CLEANFILES list in a dist-hook to clean up the distribution that automake gathers since not distributing flex generated files is foreign to automake's mindset, but we need exactly that. Additionally, we locate inputs to the tables-related tests more precisely. Some files are in srcdir and some are in builddir, which the arguments to the log compiler are now made aware of.
| | * Pulled out scripts in tests/Makefile.amWill Estes2015-11-11
| | |
| | * Added srcdir to tableopts.am includeWill Estes2015-11-11
| | |
| | * Changed man page dependencies.Will Estes2015-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The man page is just the --help output as reformatted by help2man. The --help option is most likely to change when the flex skeleton changes or one of the option parsing files changes or the configure.ac script itself changes. The dependencies reflect this now. It is still necessary, under some circumstances, to rebuild flex explicitly before building the man page. In theory, it's possible to have automake arrange to do this all the time, but doing so works out to be fragile, given the rest of the build system.
| | * Called libtoolize directly because autoreconf fails to pick up LT_INIT properlyWill Estes2015-11-10
| | |
| | * Added tableopts.sh to EXTRA_DISTWill Estes2015-11-10
| | |
| | * Made tests depend on the built flex binary.Mightyjo2015-11-10
| | |
| | * Merge branch 'master' into streamrefsMightyjo2015-11-08
| | |\
| | | * Cleaned more generated sources.Mightyjo2015-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added skel.c explicitly to MAINTAINERCLEANFILES in src/Makefile.am. Added a bunch of files to built_SOURCES in tests/Makefile.am so that the suite is easier to clean up.
| | * | Updated documentation to reflect the revisions to FlexLexer.hMightyjo2015-11-07
| | | |
| | * | Changed several pointers to istream (and ostream) to references in c++-only ↵Mightyjo2015-11-07
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sections of the skeleton. Patched up a variety of expected errors caused by changing istream* to istream&. Added a stray 'make' at line 545. Oops. Changed the buffer_state struct to store std::streambuf* instead of std::istream* for C++ mode. Changed interfaces in FlexLexer.h to take std::istream& instead of *. Backward compatibility temporarily broken. Patched up backward compatibility with reasonable behavior in the presence of null pointers. Re-added backward-compatible versions of the yyFlexLexer methods that take iostream pointers. All tests passing.
| | * new zh_CN translation from the translation projectTranslation Project2015-09-29
| | |
| | * fix possible resource leak with yynultrans_tblJaska Uimonen2015-08-06
| | |
| | * fix possible uninitialized array valuesJaska Uimonen2015-08-06
| | |
| | * add %{...%} block to example in manualWill Estes2015-08-05
| | |