Merge remote-tracking branch 'refs/remotes/origin/master'

src/unilib/CHANGES

@@ -1,3 +1,8 @@
+Version 3.3.1 [12 Sep 2023]
+---------------------------
+- Stop using the std::iterator deprecated in C++17.
+
+
 Version 3.3.0 [13 Sep 2022]
 ---------------------------
 - Update Unicode data to 15.0.0.

src/unilib/Makefile.include

@@ -7,7 +7,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNILIB_VERSION := 3.3.0
+UNILIB_VERSION := 3.3.1
 UNILIB_UNICODE_VERSION := 15.0.0
 
 UNILIB_OBJECTS := unicode uninorms unistrip utf8 utf16 version

src/unilib/unicode.cpp

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #include "unicode.h"

src/unilib/unicode.h

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #pragma once

src/unilib/uninorms.cpp

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #include "uninorms.h"

src/unilib/uninorms.h

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #pragma once

src/unilib/unistrip.cpp

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #include "unistrip.h"

src/unilib/unistrip.h

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #pragma once

src/unilib/utf16.cpp

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #include "utf16.h"

src/unilib/utf16.h

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #pragma once
@@ -113,8 +113,13 @@ void utf16::decode(const std::u16string& str, std::u32string& decoded) {
   decode(str.c_str(), decoded);
 }
 
-class utf16::string_decoder::iterator : public std::iterator<std::input_iterator_tag, char32_t> {
+class utf16::string_decoder::iterator {
  public:
+  using iterator_category = std::input_iterator_tag;
+  using value_type = char32_t;
+  using difference_type = ptrdiff_t;
+  using pointer = char32_t*;
+  using reference = char32_t&;
   iterator(const char16_t* str) : codepoint(0), next(str) { operator++(); }
   iterator(const iterator& it) : codepoint(it.codepoint), next(it.next) {}
   iterator& operator++() { if (next) { codepoint = decode(next); if (!codepoint) next = nullptr; } return *this; }
@@ -145,8 +150,13 @@ utf16::string_decoder utf16::decoder(const std::u16string& str) {
   return string_decoder(str.c_str());
 }
 
-class utf16::buffer_decoder::iterator : public std::iterator<std::input_iterator_tag, char32_t> {
+class utf16::buffer_decoder::iterator {
  public:
+  using iterator_category = std::input_iterator_tag;
+  using value_type = char32_t;
+  using difference_type = ptrdiff_t;
+  using pointer = char32_t*;
+  using reference = char32_t&;
   iterator(const char16_t* str, size_t len) : codepoint(0), next(str), len(len) { operator++(); }
   iterator(const iterator& it) : codepoint(it.codepoint), next(it.next), len(it.len) {}
   iterator& operator++() { if (!len) next = nullptr; if (next) codepoint = decode(next, len); return *this; }

src/unilib/utf8.cpp

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #include "utf8.h"

src/unilib/utf8.h

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #pragma once
@@ -145,8 +145,13 @@ void utf8::decode(const std::string& str, std::u32string& decoded) {
   decode(str.c_str(), decoded);
 }
 
-class utf8::string_decoder::iterator : public std::iterator<std::input_iterator_tag, char32_t> {
+class utf8::string_decoder::iterator {
  public:
+  using iterator_category = std::input_iterator_tag;
+  using value_type = char32_t;
+  using difference_type = ptrdiff_t;
+  using pointer = char32_t*;
+  using reference = char32_t&;
   iterator(const char* str) : codepoint(0), next(str) { operator++(); }
   iterator(const iterator& it) : codepoint(it.codepoint), next(it.next) {}
   iterator& operator++() { if (next) { codepoint = decode(next); if (!codepoint) next = nullptr; } return *this; }
@@ -177,8 +182,13 @@ utf8::string_decoder utf8::decoder(const std::string& str) {
   return string_decoder(str.c_str());
 }
 
-class utf8::buffer_decoder::iterator : public std::iterator<std::input_iterator_tag, char32_t> {
+class utf8::buffer_decoder::iterator {
  public:
+  using iterator_category = std::input_iterator_tag;
+  using value_type = char32_t;
+  using difference_type = ptrdiff_t;
+  using pointer = char32_t*;
+  using reference = char32_t&;
   iterator(const char* str, size_t len) : codepoint(0), next(str), len(len) { operator++(); }
   iterator(const iterator& it) : codepoint(it.codepoint), next(it.next), len(it.len) {}
   iterator& operator++() { if (!len) next = nullptr; if (next) codepoint = decode(next, len); return *this; }

src/unilib/version.cpp

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #include "version.h"
@@ -18,7 +18,7 @@ namespace unilib {
 
 // Returns current version.
 version version::current() {
-  return {3, 3, 0, ""};
+  return {3, 3, 1, ""};
 }
 
 } // namespace unilib

src/unilib/version.h

@@ -7,7 +7,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
-// UniLib version: 3.3.0
+// UniLib version: 3.3.1
 // Unicode version: 15.0.0
 
 #pragma once

src/utils/CHANGES

@@ -1,3 +1,9 @@
+Version 3.5.3 [8 Sep 2023]
+--------------------------
+- Add explicit initialization to silence false positive valgrind
+  report in compressor_save.cpp.
+
+
 Version 3.5.2 [07 Sep 2022]
 ---------------------------
 - Fix warning on clang in compressor_save.cpp.

src/utils/compressor_save.cpp

@@ -445,6 +445,8 @@ void MatchFinder_Construct(CMatchFinder *p)
   p->bufferBase = 0;
   p->directInput = 0;
   p->hash = 0;
+  p->hashSizeSum = 0;
+  p->numSons = 0;
   MatchFinder_SetDefaultSettings(p);
 
   for (i = 0; i < 256; i++)

web/lindat-service/run.php

@@ -305,7 +305,8 @@ function updateModels() {
       <div class="form-group row">
         <label class="col-sm-2 control-label">Model:</label>
         <div class="col-sm-10">
-          <label class="radio-inline" data-udpipe="2"><input name="family" type="radio" value="-ud-2.10-" onchange="updateModels()" checked />UD 2.10 (<a href="http://ufal.mff.cuni.cz/udpipe/2/models#universal_dependencies_210_models">description</a>)</label>
+          <label class="radio-inline" data-udpipe="2"><input name="family" type="radio" value="-ud-2.12-" onchange="updateModels()" checked />UD 2.12 (<a href="http://ufal.mff.cuni.cz/udpipe/2/models#universal_dependencies_212_models">description</a>)</label>
+          <label class="radio-inline" data-udpipe="2"><input name="family" type="radio" value="-ud-2.10-" onchange="updateModels()" />UD 2.10 (<a href="http://ufal.mff.cuni.cz/udpipe/2/models#universal_dependencies_210_models">description</a>)</label>
           <label class="radio-inline" data-udpipe="2"><input name="family" type="radio" value="-ud-2.6-" onchange="updateModels()" />UD 2.6 (<a href="http://ufal.mff.cuni.cz/udpipe/2/models#universal_dependencies_26_models">description</a>)</label>
           <label class="radio-inline" data-udpipe="2"><input name="family" type="radio" value="-evalatin20-" onchange="updateModels()" />EvaLatin20 (<a href="http://ufal.mff.cuni.cz/udpipe/2/models#evalatin20_models">description</a>)</label>
           <label class="radio-inline" data-udpipe="1" style="display: none"><input name="family" type="radio" value="-ud-2.5-" onchange="updateModels()" />UD 2.5 (<a href="http://ufal.mff.cuni.cz/udpipe/1/models#universal_dependencies_25_models">description</a>)</label>