See https://github.com/universal-ctags/ctags/pull/4212, https://github.com/universal-ctags/ctags/pull/4097.
While applying the patches, I also noticed that some didn't apply because https://github.com/universal-ctags/ctags/pull/4223 added some preparation patches so I added some of these too. I had to apply some of the patches manually because they didn't apply cleanly but I'm reasonably confident I didn't introduce any mess on the way. The main affected file is `read.c` and when diffed against the current uctags version, it's more or less identical. Finally, I also added https://github.com/universal-ctags/ctags/pull/4231 as it seemed it might be related and also https://github.com/universal-ctags/ctags/commit/f3488d9bcfb882d30a6d97a4f87bacb328212202 which seemed to be worth having. I don't know what exactly triggers the crashes so someone (@etkaar @b4n) should check if it really Fixes #3939 Fixes https://github.com/geany/geany/issues/4270 You can view, comment on, or merge this pull request online at: https://github.com/geany/geany/pull/4303 -- Commit Summary -- * main,refactor: use the term "area" instead of "input stream" * main/read,comment: add description for "locations" * main/read,refactor: add callWithSavingPosition() helper function * main/read,refactor: replace term "lineOffset" with "column" * main,refactor: rename doesParserRunAsGuest to isAreaStacked * main/read: (potential bug fix) revise getInputColumnNumber for the where no data has been read yet * main/read: (potential bug fix) revise getInputColumnNumber for the general case * main/read: (potential bug fix) revise getInputColumnNumber for the EOF case * main/read: add a helper function, translateLineNumber * main/read: make getInputFilePositionForLine() return a pos in the current coordinate system * lxpath,yaml: (bug fix) adjust line numbers for tags if the parser runs as a guest * main/read,comment: update the markers for coordinate systems * php: Fix HTML promises ranges * html: Avoid infinite ping-pong loop with JSP tags * main/read: add a helper function, translateFileOffset * main/read: make getInputLineNumber work correctly in the case that a guest parser has read nothing yet * main: (bugfix) don't reset lineFposMap even in the 2nd pass when the parser runs as a guest * main/mio: clear MIOPos in mio_getpos to avoid errors reported by valgrind -- File Changes -- M ctags/main/entry.c (8) M ctags/main/entry.h (2) M ctags/main/lxpath.c (6) M ctags/main/mio.c (2) M ctags/main/parse.c (29) M ctags/main/parse_p.h (10) M ctags/main/promise.c (79) M ctags/main/promise.h (12) M ctags/main/promise_p.h (10) M ctags/main/read.c (404) M ctags/main/read.h (115) M ctags/main/read_p.h (60) M ctags/main/tokeninfo.h (2) M ctags/parsers/html.c (38) M ctags/parsers/php.c (16) M ctags/parsers/sql.c (24) -- Patch Links -- https://github.com/geany/geany/pull/4303.patch https://github.com/geany/geany/pull/4303.diff -- Reply to this email directly or view it on GitHub: https://github.com/geany/geany/pull/4303 You are receiving this because you are subscribed to this thread. Message ID: <geany/geany/pull/[email protected]>
