Skip to content

Commit

Permalink
ref #145, Update to Onigmo 6.1.0 => 6.2.0, Deprecation warnings are s…
Browse files Browse the repository at this point in the history
…ilenced (-Wdeprecated-non-prototype)
  • Loading branch information
gamecreature committed Jul 16, 2024
1 parent adbc544 commit 91fd16e
Show file tree
Hide file tree
Showing 105 changed files with 24,220 additions and 17,695 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

edbee.lib:

- (2024-07-16), fix #145, Update to Onigmo 6.1.0 => 6.2.0, Deprecation warnings are silenced (-Wdeprecated-non-prototype)
- fix, Autocomplete Improvements
- autocomplete is now really canceled with the escape key. It only appears again if the word becomes blank
- add Qt::NoFocus focus policy to TextEditorAutocompleteComponent, to hopefully solve focus issue (https://github.com/Mudlet/Mudlet/issues/5310)
Expand Down
14 changes: 14 additions & 0 deletions vendor/onig/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,30 @@
/build*/

# autotools generated files
/aclocal.m4
/autom4te.cache
/compile
/config.guess
/config.h
/config.h.in
/config.log
/config.status
/config.sub
/configure
/depcomp
/install-sh
/libtool
/ltmain.sh
/m4/*.m4
/missing
/onigmo-config
/onigmo.pc
/Makefile
/Makefile.in
/sample/Makefile
/sample/Makefile.in
/stamp-h1
/test-driver

# generated executable files
/enc/mktable
Expand Down
4 changes: 3 additions & 1 deletion vendor/onig/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ before_install:
- gem install lcoveralls

before_script:
- ./autogen.sh
- ./configure $CONFOPT && make

script:
- make test

after_success:
- lcov -c -d .libs -o coverage.info
- lcov -c -d .libs -d enc/.libs -o coverage.info
- lcoveralls --retry-count 5 coverage.info
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion vendor/onig/AUTHORS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kentkt AT csc DOT jp (K.Takata)
sndgk393 AT ybb DOT ne DOT jp (K.Kosako)
<kkosako0@gmail.com> (K.Kosako)
98 changes: 47 additions & 51 deletions vendor/onig/COPYING
Original file line number Diff line number Diff line change
@@ -1,63 +1,59 @@
Onigmo (Oniguruma-mod) LICENSE
------------------------------

/*-
* Copyright (c) 2002-2009 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
* Copyright (c) 2011-2014 K.Takata <kentkt AT csc DOT jp>
* All rights reserved.
*
* 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
Copyright (c) 2002-2018 K.Kosako <kkosako0@gmail.com>
Copyright (c) 2011-2019 K.Takata <kentkt AT csc DOT jp>
All rights reserved.

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.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.



Oniguruma LICENSE
-----------------

/*-
* Copyright (c) 2002-2009 K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
* All rights reserved.
*
* 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
Copyright (c) 2002-2018 K.Kosako <kkosako0@gmail.com>
All rights reserved.

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.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.



Expand Down
64 changes: 58 additions & 6 deletions vendor/onig/HISTORY
Original file line number Diff line number Diff line change
@@ -1,5 +1,57 @@
History of Onigmo (Oniguruma-mod)

2019/01/30: Version 6.2.0

2019/01/30: [dist] Update LTVERSION to "6:5:0".
2019/01/30: [dist] Delete all autotools generated files from the repository.
(PR #115)
2019/01/30: [test] Update tests. (PR #127)
2019/01/30: [impl] Add USE_CASE_MAP_API configuration. (PR #125)
2019/01/29: [test] Add some tests. (PR #124)
2019/01/29: [impl] Revise the code for searching. (PR #123)
2019/01/28: [bug] Fix initialization of the table for quick search.
This was caused by PR #113.
(Issue #120) (PR #121)
2019/01/26: [spec] (thanks omochimetaru)
Make it possible to extend UTF-8 to 31 bits. (PR #111)
2019/01/25: [dist] Remove minor version from the py command. (PR #119)
2019/01/25: [impl] Avoid negative character. (PR #118)
2019/01/25: [impl] Fix lgtm.com warnings. (PR #117)
2019/01/25: [bug] Fix that "ss" in look-behind causes syntax error.
(Issue #92) (PR #116)
2019/01/24: [bug] Fix performance regression if quantifier lower bound is 1.
(Issue #100) (PR #114)
2019/01/24: [bug] Fix performance problem with /k/i and /s/i.
(Issue #97) (PR #113)
2019/01/24: [new] Update Unicode data: Unicode 11.0.0, Emoji 11.0 (PR #112)
2019/01/24: [bug] Import the latest code from Ruby (PR #112)
2019/01/24: [impl] (thanks aycabta)
Support gperf 3.1 with backward compatibility. (PR #101)
2018/12/10: [dist] (thanks Xavier RENE-CORAIL)
Add LGTM.com code quality badges. (PR #108)
2018/11/10: [impl] (thanks Urabe, Shyouhei)
Avoid negative character. (PR #107)
2018/01/19: [impl] (thanks Tom Lord)
Remove unused variable. (PR #99)
2017/09/27: [spec] Import Ruby r58965
Change max byte length of UTF-8 to 4 bytes.
2017/09/26: [new] Update Unicode data: Unicode 10.0.0, Emoji 5.0 (PR #93)


2017/09/26: Version 6.1.3

2017/09/26: [dist] Update LTVERSION to "6:4:0".
2017/09/25: [bug] Add a declaration of onig_end() in onigmoposix.h
2017/09/25: [bug] Fix .*\b (Issue #96)
2017/07/17: [bug] Fix security issues (PR #91)
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9224
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9226
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9227
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9228
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9229
2017/05/18: [bug] Don't include shift_jis.c from windows_31j.c (Issue #88)


2017/05/15: Version 6.1.2

2017/05/15: [dist] Update LTVERSION to "6:3:0".
Expand Down Expand Up @@ -916,7 +968,7 @@ History of Oniguruma
Any, Assigned, C, Cc, L, Lm, Arabic, Greek etc...
2006/09/21: [impl] add USE_UNICODE_PROPERTIES into regenc.h.
2006/09/21: [impl] remove USE_UNICODE_FULL_RANGE_CTYPE.
2006/09/20: [impl] change ONIGENC_CTYPE_XXXX to sequencial values.
2006/09/20: [impl] change ONIGENC_CTYPE_XXXX to sequential values.
add BIT_CTYPE_XXXX bit flags to regenc.h.
update XXXX_CtypeTable[] for BIT_CTYPE_ALNUM.
2006/09/19: [memo] move from CVS to Subversion (1.3.2).
Expand Down Expand Up @@ -1378,7 +1430,7 @@ History of Oniguruma
2004/12/16: [test] success in ruby 1.9.0 (2004-12-16) [i686-linux].
2004/12/16: [dist] update hash.c.patch.
2004/12/15: [bug] (thanks matz)
char > 127 should be casted to unsigned char. (utf8.c)
char > 127 should be cast to unsigned char. (utf8.c)
2004/12/13: [impl] add HAVE_PROTOTYPES and HAVE_STDARG_PROTOTYPES definition
to oniguruma.h in the case __cplusplus.
2004/12/06: [dist] update doc/RE and doc/RE.ja.
Expand Down Expand Up @@ -2285,7 +2337,7 @@ History of Oniguruma
2003/03/08: [impl] remove check_backref_number().
2003/03/08: [bug] called group in 0-repeat should not be eliminated from
compile code. ex. /(?*n)(?<n>){0}/ (thanks akr)
add is_refered member to QualifierNode.
add is_referred member to QualifierNode.
2003/03/07: [impl] use hash table(st.[ch]) for implementation of name table.
(enable on Ruby in default)
2003/03/07: [new] add regex_foreach_names().
Expand Down Expand Up @@ -2338,7 +2390,7 @@ History of Oniguruma
if it is set, then error /(\1)/, /\1(..)/ etc...
2003/02/26: [spec] if backref number is greater than max group number,
then return compile error. (REGERR_INVALID_BACKREF_NUMBER)
2003/02/26: [tune] bad implemented N_ALT case in get_min_match_length().
2003/02/26: [tune] badly implemented N_ALT case in get_min_match_length().
2003/02/26: [dist] auto update testc.c and win32/testc.c in dist target.
2003/02/26: [impl] add -win option to testconv.rb.
2003/02/25: [spec] allow to assign same name to different group.
Expand Down Expand Up @@ -2433,7 +2485,7 @@ History of Oniguruma
2003/01/31: [impl] rename TTRANS() to TOLOWER().
2003/01/30: [bug] .c.o --> .c.obj in win32\Makefile.
2003/01/30: [impl] add -DNOT_RUBY to Makefile.in.
NOT_RUBY is refered in regint.h for escape double
NOT_RUBY is referred in regint.h for escape double
including config.h.
2003/01/30: [impl] when string hasn't case ambiguity, don't compile
to ignore case opcode.
Expand All @@ -2458,7 +2510,7 @@ History of Oniguruma
2003/01/18: [impl] change REGION_NOTPOS to REG_REGION_NOTPOS in regex.h.
2003/01/17: [dist] add sample/simple.c.
2003/01/17: [inst] add configure option --with-rubydir.
2003/01/17: [bug] bad implemeted POSIX API options.
2003/01/17: [bug] badly implemented POSIX API options.
default: /./ not match "\n", anchor not match "\n"
REG_NEWLINE: /./ not match "\n", anchor match "\n"
2003/01/16: [impl] rewrite POSIX API regexec() for speed up.
Expand Down
54 changes: 30 additions & 24 deletions vendor/onig/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@ libonigmo_la_SOURCES = regint.h regparse.h regenc.h st.h \
regerror.c regparse.c regext.c regcomp.c regexec.c reggnu.c \
regenc.c regsyntax.c regtrav.c regversion.c st.c \
regposix.c regposerr.c \
$(encdir)/unicode.c $(encdir)/ascii.c $(encdir)/utf_8.c \
$(encdir)/utf_16be.c $(encdir)/utf_16le.c \
$(encdir)/utf_32be.c $(encdir)/utf_32le.c \
$(encdir)/unicode/casefold.h $(encdir)/unicode/name2ctype.h \
$(encdir)/euc_jp.c $(encdir)/shift_jis.c $(encdir)/shift_jis.h \
$(encdir)/windows_31j.c \
$(encdir)/jis/props.h $(encdir)/jis/props.kwd \
$(encdir)/iso_8859.h $(encdir)/iso_8859_1.c \
$(encdir)/iso_8859_2.c $(encdir)/iso_8859_3.c \
$(encdir)/iso_8859_4.c $(encdir)/iso_8859_5.c \
$(encdir)/iso_8859_6.c $(encdir)/iso_8859_7.c \
$(encdir)/iso_8859_8.c $(encdir)/iso_8859_9.c \
$(encdir)/iso_8859_10.c $(encdir)/iso_8859_11.c \
$(encdir)/iso_8859_13.c $(encdir)/iso_8859_14.c \
$(encdir)/iso_8859_15.c $(encdir)/iso_8859_16.c \
$(encdir)/euc_tw.c $(encdir)/euc_kr.c $(encdir)/big5.c \
$(encdir)/gb18030.c $(encdir)/koi8_r.c $(encdir)/koi8_u.c \
$(encdir)/windows_1250.c $(encdir)/windows_1251.c \
$(encdir)/windows_1252.c $(encdir)/windows_1253.c \
$(encdir)/windows_1254.c $(encdir)/windows_1257.c
enc/unicode.c enc/ascii.c enc/utf_8.c \
enc/utf_16be.c enc/utf_16le.c \
enc/utf_32be.c enc/utf_32le.c \
enc/unicode/casefold.h enc/unicode/name2ctype.h \
enc/euc_jp.c enc/shift_jis.c enc/shift_jis.h \
enc/windows_31j.c \
enc/jis/props.h enc/jis/props.kwd \
enc/iso_8859.h enc/iso_8859_1.c \
enc/iso_8859_2.c enc/iso_8859_3.c \
enc/iso_8859_4.c enc/iso_8859_5.c \
enc/iso_8859_6.c enc/iso_8859_7.c \
enc/iso_8859_8.c enc/iso_8859_9.c \
enc/iso_8859_10.c enc/iso_8859_11.c \
enc/iso_8859_13.c enc/iso_8859_14.c \
enc/iso_8859_15.c enc/iso_8859_16.c \
enc/euc_tw.c enc/euc_kr.c enc/big5.c \
enc/gb18030.c enc/koi8_r.c enc/koi8_u.c \
enc/windows_1250.c enc/windows_1251.c \
enc/windows_1252.c enc/windows_1253.c \
enc/windows_1254.c enc/windows_1257.c

libonigmo_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined

Expand Down Expand Up @@ -81,18 +81,22 @@ mktable: $(encdir)/mktable.c $(srcdir)/regenc.h
# TEST
TESTS = testc testp testcu

check_PROGRAMS = testc testp testcu
check_PROGRAMS = testc testp testcu \
test_enc_utf8

test: atest pytest
$(MAKE) -C sample test

atest: testc$(EXEEXT) testp$(EXEEXT) testcu$(EXEEXT)
atest: testc$(EXEEXT) testp$(EXEEXT) testcu$(EXEEXT) \
test_enc_utf8$(EXEEXT)
@echo "[Onigmo API, ASCII/EUC-JP check]"
@$(top_builddir)/testc | grep RESULT
@echo "[POSIX API, ASCII/EUC-JP check]"
@$(top_builddir)/testp | grep RESULT
@echo "[Onigmo API, UTF-16 check]"
@$(top_builddir)/testcu | grep RESULT
@echo "[UTF-8 encoding check]"
@$(top_builddir)/test_enc_utf8 | grep RESULT

testc_SOURCES = testc.c
testc_LDADD = libonigmo.la
Expand All @@ -104,6 +108,8 @@ testp_CFLAGS = -DPOSIX_TEST
testcu_SOURCES = testu.c
testcu_LDADD = libonigmo.la

test_enc_utf8_SOURCES = test_enc_utf8.c
test_enc_utf8_LDADD = libonigmo.la

#$(srcdir)/testc.c: $(srcdir)/test.rb $(srcdir)/testconv.rb
$(srcdir)/testc.c:
Expand Down Expand Up @@ -133,8 +139,8 @@ pytest:
# Collect coverage data and write to coverage.info, then create HTML output
# in the coverage directory.
lcov:
if [ ! -f $(builddir)/enc/jis/props.kwd ]; then mkdir -p $(builddir)/enc/jis; cp $(srcdir)/enc/jis/props.kwd $(builddir)/enc/jis/props.kwd; fi
lcov -c -d .libs -o coverage.info
if [ ! -f $(builddir)/enc/jis/props.kwd ]; then mkdir -p $(builddir)/enc/jis; cp -p $(srcdir)/enc/jis/props.kwd $(builddir)/enc/jis/props.kwd; fi
lcov -c -d .libs -d enc/.libs -o coverage.info
genhtml -o coverage coverage.info

# Clear coverage data.
Expand Down
Loading

0 comments on commit 91fd16e

Please sign in to comment.