The package rpms/cbmc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cbmc.git/commit/?id=bba9eeaa9cb83....
Change:
+%ifarch i686
Thanks.
Full change:
============
commit bba9eeaa9cb8386d9e8c19515be513bae6c74690
Author: Vincent Mihalkovic <vmihalko(a)redhat.com>
Date: Wed May 12 22:35:10 2021 +0200
New upstream release
diff --git a/cbmc-32bit-arch-fix.patch b/cbmc-32bit-arch-fix.patch
deleted file mode 100644
index 491859c..0000000
--- a/cbmc-32bit-arch-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git src/ansi-c/library/gcc.c src/ansi-c/library/gcc.c
-index e38167e81..96a2739bc 100644
---- src/ansi-c/library/gcc.c
-+++ src/ansi-c/library/gcc.c
-@@ -1,3 +1,4 @@
-+#define _XOPEN_SOURCE
- /* FUNCTION: __builtin_ia32_sfence */
-
- inline void __builtin_ia32_sfence(void)
-@@ -65,8 +66,10 @@ inline int __builtin_clzl(unsigned long int x)
- x = x | (x >> 8);
- if(sizeof(x) >= 4)
- x = x | (x >> 16);
-+ #if LONG_BIT > 32
- if(sizeof(x) >= 8)
- x = x | (x >> 32);
-+ #endif
-
- return __builtin_popcountl(~x);
- }
diff --git a/cbmc-errno-realpath.patch b/cbmc-errno-realpath.patch
deleted file mode 100644
index e4e5e88..0000000
--- a/cbmc-errno-realpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git src/util/tempdir.cpp src/util/tempdir.cpp
-index d61636b..c1fb7a9 100644
---- src/util/tempdir.cpp
-+++ src/util/tempdir.cpp
-@@ -93,7 +93,8 @@ std::string get_temporary_directory(const std::string
&name_template)
- errno = 0;
- char *wd = realpath(td, nullptr);
-
-- if(wd == nullptr || errno != 0)
-+ // Comment out due to the
https://bugzilla.redhat.com/show_bug.cgi?id=1916968
-+ if(wd == nullptr /* || errno != 0 */)
- throw system_exceptiont(
- std::string("realpath failed: ") + std::strerror(errno));
-
diff --git a/cbmc-f35-deprecated-python.patch b/cbmc-f35-deprecated-python.patch
new file mode 100644
index 0000000..e753f55
--- /dev/null
+++ b/cbmc-f35-deprecated-python.patch
@@ -0,0 +1,24 @@
+diff --git regression/CMakeLists.txt regression/CMakeLists.txt
+index 42c772a..e9b8807 100644
+--- regression/CMakeLists.txt
++++ regression/CMakeLists.txt
+@@ -73,7 +73,6 @@ add_subdirectory(validate-trace-xml-schema)
+ add_subdirectory(cbmc-primitives)
+ add_subdirectory(goto-interpreter)
+ add_subdirectory(cbmc-sequentialization)
+-add_subdirectory(cpp-linter)
+
+ if(WITH_MEMORY_ANALYZER)
+ add_subdirectory(snapshot-harness)
+diff --git regression/Makefile regression/Makefile
+index b344727..a53ef45 100644
+--- regression/Makefile
++++ regression/Makefile
+@@ -46,7 +46,6 @@ DIRS = cbmc \
+ cbmc-primitives \
+ goto-interpreter \
+ cbmc-sequentialization \
+- cpp-linter \
+ # Empty last line
+
+ ifeq ($(OS),Windows_NT)
diff --git a/cbmc-f35-enable_sse2.patch b/cbmc-f35-enable_sse2.patch
new file mode 100644
index 0000000..6c995ec
--- /dev/null
+++ b/cbmc-f35-enable_sse2.patch
@@ -0,0 +1,15 @@
+diff --git src/ansi-c/library_check.sh src/ansi-c/library_check.sh
+index bb362dc..3c64fba 100755
+--- src/ansi-c/library_check.sh
++++ src/ansi-c/library_check.sh
+@@ -10,8 +10,8 @@ for f in "$@"; do
+ perl -p -i -e 's/(_mm_.fence)/s$1/' __libcheck.c
+ perl -p -i -e 's/(__sync_)/s$1/' __libcheck.c
+ perl -p -i -e 's/(__atomic_)/s$1/' __libcheck.c
+- "$CC" -std=gnu99 -E -include library/cprover.h -D__CPROVER_bool=_Bool
-D__CPROVER_thread_local=__thread -DLIBRARY_CHECK -o __libcheck.i __libcheck.c
+- "$CC" -S -Wall -Werror -pedantic -Wextra -std=gnu99 __libcheck.i \
++ "$CC" -std=gnu99 -msse2 -E -include library/cprover.h
-D__CPROVER_bool=_Bool -D__CPROVER_thread_local=__thread -DLIBRARY_CHECK -o __libcheck.i
__libcheck.c
++ "$CC" -S -Wall -Werror -pedantic -Wextra -std=gnu99 -msse2 __libcheck.i \
+ -o __libcheck.s -Wno-unused-label -Wno-unknown-pragmas
+ ec="${?}"
+ rm __libcheck.s __libcheck.i __libcheck.c
diff --git a/cbmc-goto-cc-type-change.patch b/cbmc-goto-cc-type-change.patch
deleted file mode 100644
index abd3bb8..0000000
--- a/cbmc-goto-cc-type-change.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git src/goto-cc/ms_link_cmdline.cpp src/goto-cc/ms_link_cmdline.cpp
-index 771b45c..e0a8a06 100644
---- src/goto-cc/ms_link_cmdline.cpp
-+++ src/goto-cc/ms_link_cmdline.cpp
-@@ -333,7 +333,7 @@ void ms_link_cmdlinet::process_link_option(const std::string &s)
- return;
- }
-
-- for(const std::string &ms_link_option : ms_link_options)
-+ for(const std::string ms_link_option : ms_link_options)
- {
- // These are case insensitive.
- if(
diff --git a/cbmc-signed-char.patch b/cbmc-signed-char.patch
deleted file mode 100644
index a871f96..0000000
--- a/cbmc-signed-char.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff --git unit/util/string_utils/escape_non_alnum.cpp
unit/util/string_utils/escape_non_alnum.cpp
-index 147ef17..ebc1f8f 100644
---- unit/util/string_utils/escape_non_alnum.cpp
-+++ unit/util/string_utils/escape_non_alnum.cpp
-@@ -20,267 +20,267 @@ TEST_CASE(
- "escape_non_alnum should work with any single byte signed character (part
1)",
- "[core][utils][string_utils][escape_non_alnum]")
- {
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x00)}) ==
"_00");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x01)}) ==
"_01");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x02)}) ==
"_02");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x03)}) ==
"_03");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x04)}) ==
"_04");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x05)}) ==
"_05");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x06)}) ==
"_06");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x07)}) ==
"_07");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x08)}) ==
"_08");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x09)}) ==
"_09");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x0A)}) ==
"_0a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x0B)}) ==
"_0b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x0C)}) ==
"_0c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x0D)}) ==
"_0d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x0E)}) ==
"_0e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x0F)}) ==
"_0f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x10)}) ==
"_10");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x11)}) ==
"_11");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x12)}) ==
"_12");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x13)}) ==
"_13");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x14)}) ==
"_14");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x15)}) ==
"_15");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x16)}) ==
"_16");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x17)}) ==
"_17");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x18)}) ==
"_18");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x19)}) ==
"_19");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x1A)}) ==
"_1a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x1B)}) ==
"_1b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x1C)}) ==
"_1c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x1D)}) ==
"_1d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x1E)}) ==
"_1e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x1F)}) ==
"_1f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x20)}) ==
"_20");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x21)}) ==
"_21");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x22)}) ==
"_22");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x23)}) ==
"_23");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x24)}) ==
"_24");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x25)}) ==
"_25");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x26)}) ==
"_26");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x27)}) ==
"_27");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x28)}) ==
"_28");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x29)}) ==
"_29");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2A)}) ==
"_2a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2B)}) ==
"_2b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2B)}) ==
"_2b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2C)}) ==
"_2c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2D)}) ==
"_2d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2E)}) ==
"_2e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x2F)}) ==
"_2f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x30)}) ==
"0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x31)}) ==
"1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x32)}) ==
"2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x33)}) ==
"3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x34)}) ==
"4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x35)}) ==
"5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x36)}) ==
"6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x37)}) ==
"7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x38)}) ==
"8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x39)}) ==
"9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x3A)}) ==
"_3a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x3B)}) ==
"_3b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x3C)}) ==
"_3c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x3D)}) ==
"_3d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x3E)}) ==
"_3e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x3F)}) ==
"_3f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x40)}) ==
"_40");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x41)}) ==
"A");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x42)}) ==
"B");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x43)}) ==
"C");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x44)}) ==
"D");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x45)}) ==
"E");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x46)}) ==
"F");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x47)}) ==
"G");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x48)}) ==
"H");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x49)}) ==
"I");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x4A)}) ==
"J");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x4B)}) ==
"K");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x4C)}) ==
"L");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x4D)}) ==
"M");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x4E)}) ==
"N");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x4F)}) ==
"O");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x50)}) ==
"P");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x51)}) ==
"Q");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x52)}) ==
"R");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x53)}) ==
"S");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x54)}) ==
"T");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x55)}) ==
"U");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x56)}) ==
"V");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x57)}) ==
"W");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x58)}) ==
"X");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x59)}) ==
"Y");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x5A)}) ==
"Z");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x5B)}) ==
"_5b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x5C)}) ==
"_5c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x5D)}) ==
"_5d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x5E)}) ==
"_5e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x5F)}) ==
"__");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x60)}) ==
"_60");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x61)}) ==
"a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x62)}) ==
"b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x63)}) ==
"c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x64)}) ==
"d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x65)}) ==
"e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x66)}) ==
"f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x67)}) ==
"g");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x68)}) ==
"h");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x69)}) ==
"i");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x6A)}) ==
"j");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x6B)}) ==
"k");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x6C)}) ==
"l");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x6D)}) ==
"m");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x6E)}) ==
"n");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x6F)}) ==
"o");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x70)}) ==
"p");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x71)}) ==
"q");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x72)}) ==
"r");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x73)}) ==
"s");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x74)}) ==
"t");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x75)}) ==
"u");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x76)}) ==
"v");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x77)}) ==
"w");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x78)}) ==
"x");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x79)}) ==
"y");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x7A)}) ==
"z");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x7B)}) ==
"_7b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x7C)}) ==
"_7c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x7D)}) ==
"_7d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x7E)}) ==
"_7e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x7F)}) ==
"_7f");
-+ CHECK(escape_non_alnum({'\x00'}) == "_00");
-+ CHECK(escape_non_alnum({'\x01'}) == "_01");
-+ CHECK(escape_non_alnum({'\x02'}) == "_02");
-+ CHECK(escape_non_alnum({'\x03'}) == "_03");
-+ CHECK(escape_non_alnum({'\x04'}) == "_04");
-+ CHECK(escape_non_alnum({'\x05'}) == "_05");
-+ CHECK(escape_non_alnum({'\x06'}) == "_06");
-+ CHECK(escape_non_alnum({'\x07'}) == "_07");
-+ CHECK(escape_non_alnum({'\x08'}) == "_08");
-+ CHECK(escape_non_alnum({'\x09'}) == "_09");
-+ CHECK(escape_non_alnum({'\x0A'}) == "_0a");
-+ CHECK(escape_non_alnum({'\x0B'}) == "_0b");
-+ CHECK(escape_non_alnum({'\x0C'}) == "_0c");
-+ CHECK(escape_non_alnum({'\x0D'}) == "_0d");
-+ CHECK(escape_non_alnum({'\x0E'}) == "_0e");
-+ CHECK(escape_non_alnum({'\x0F'}) == "_0f");
-+ CHECK(escape_non_alnum({'\x10'}) == "_10");
-+ CHECK(escape_non_alnum({'\x11'}) == "_11");
-+ CHECK(escape_non_alnum({'\x12'}) == "_12");
-+ CHECK(escape_non_alnum({'\x13'}) == "_13");
-+ CHECK(escape_non_alnum({'\x14'}) == "_14");
-+ CHECK(escape_non_alnum({'\x15'}) == "_15");
-+ CHECK(escape_non_alnum({'\x16'}) == "_16");
-+ CHECK(escape_non_alnum({'\x17'}) == "_17");
-+ CHECK(escape_non_alnum({'\x18'}) == "_18");
-+ CHECK(escape_non_alnum({'\x19'}) == "_19");
-+ CHECK(escape_non_alnum({'\x1A'}) == "_1a");
-+ CHECK(escape_non_alnum({'\x1B'}) == "_1b");
-+ CHECK(escape_non_alnum({'\x1C'}) == "_1c");
-+ CHECK(escape_non_alnum({'\x1D'}) == "_1d");
-+ CHECK(escape_non_alnum({'\x1E'}) == "_1e");
-+ CHECK(escape_non_alnum({'\x1F'}) == "_1f");
-+ CHECK(escape_non_alnum({'\x20'}) == "_20");
-+ CHECK(escape_non_alnum({'\x21'}) == "_21");
-+ CHECK(escape_non_alnum({'\x22'}) == "_22");
-+ CHECK(escape_non_alnum({'\x23'}) == "_23");
-+ CHECK(escape_non_alnum({'\x24'}) == "_24");
-+ CHECK(escape_non_alnum({'\x25'}) == "_25");
-+ CHECK(escape_non_alnum({'\x26'}) == "_26");
-+ CHECK(escape_non_alnum({'\x27'}) == "_27");
-+ CHECK(escape_non_alnum({'\x28'}) == "_28");
-+ CHECK(escape_non_alnum({'\x29'}) == "_29");
-+ CHECK(escape_non_alnum({'\x2A'}) == "_2a");
-+ CHECK(escape_non_alnum({'\x2B'}) == "_2b");
-+ CHECK(escape_non_alnum({'\x2B'}) == "_2b");
-+ CHECK(escape_non_alnum({'\x2C'}) == "_2c");
-+ CHECK(escape_non_alnum({'\x2D'}) == "_2d");
-+ CHECK(escape_non_alnum({'\x2E'}) == "_2e");
-+ CHECK(escape_non_alnum({'\x2F'}) == "_2f");
-+ CHECK(escape_non_alnum({'\x30'}) == "0");
-+ CHECK(escape_non_alnum({'\x31'}) == "1");
-+ CHECK(escape_non_alnum({'\x32'}) == "2");
-+ CHECK(escape_non_alnum({'\x33'}) == "3");
-+ CHECK(escape_non_alnum({'\x34'}) == "4");
-+ CHECK(escape_non_alnum({'\x35'}) == "5");
-+ CHECK(escape_non_alnum({'\x36'}) == "6");
-+ CHECK(escape_non_alnum({'\x37'}) == "7");
-+ CHECK(escape_non_alnum({'\x38'}) == "8");
-+ CHECK(escape_non_alnum({'\x39'}) == "9");
-+ CHECK(escape_non_alnum({'\x3A'}) == "_3a");
-+ CHECK(escape_non_alnum({'\x3B'}) == "_3b");
-+ CHECK(escape_non_alnum({'\x3C'}) == "_3c");
-+ CHECK(escape_non_alnum({'\x3D'}) == "_3d");
-+ CHECK(escape_non_alnum({'\x3E'}) == "_3e");
-+ CHECK(escape_non_alnum({'\x3F'}) == "_3f");
-+ CHECK(escape_non_alnum({'\x40'}) == "_40");
-+ CHECK(escape_non_alnum({'\x41'}) == "A");
-+ CHECK(escape_non_alnum({'\x42'}) == "B");
-+ CHECK(escape_non_alnum({'\x43'}) == "C");
-+ CHECK(escape_non_alnum({'\x44'}) == "D");
-+ CHECK(escape_non_alnum({'\x45'}) == "E");
-+ CHECK(escape_non_alnum({'\x46'}) == "F");
-+ CHECK(escape_non_alnum({'\x47'}) == "G");
-+ CHECK(escape_non_alnum({'\x48'}) == "H");
-+ CHECK(escape_non_alnum({'\x49'}) == "I");
-+ CHECK(escape_non_alnum({'\x4A'}) == "J");
-+ CHECK(escape_non_alnum({'\x4B'}) == "K");
-+ CHECK(escape_non_alnum({'\x4C'}) == "L");
-+ CHECK(escape_non_alnum({'\x4D'}) == "M");
-+ CHECK(escape_non_alnum({'\x4E'}) == "N");
-+ CHECK(escape_non_alnum({'\x4F'}) == "O");
-+ CHECK(escape_non_alnum({'\x50'}) == "P");
-+ CHECK(escape_non_alnum({'\x51'}) == "Q");
-+ CHECK(escape_non_alnum({'\x52'}) == "R");
-+ CHECK(escape_non_alnum({'\x53'}) == "S");
-+ CHECK(escape_non_alnum({'\x54'}) == "T");
-+ CHECK(escape_non_alnum({'\x55'}) == "U");
-+ CHECK(escape_non_alnum({'\x56'}) == "V");
-+ CHECK(escape_non_alnum({'\x57'}) == "W");
-+ CHECK(escape_non_alnum({'\x58'}) == "X");
-+ CHECK(escape_non_alnum({'\x59'}) == "Y");
-+ CHECK(escape_non_alnum({'\x5A'}) == "Z");
-+ CHECK(escape_non_alnum({'\x5B'}) == "_5b");
-+ CHECK(escape_non_alnum({'\x5C'}) == "_5c");
-+ CHECK(escape_non_alnum({'\x5D'}) == "_5d");
-+ CHECK(escape_non_alnum({'\x5E'}) == "_5e");
-+ CHECK(escape_non_alnum({'\x5F'}) == "__");
-+ CHECK(escape_non_alnum({'\x60'}) == "_60");
-+ CHECK(escape_non_alnum({'\x61'}) == "a");
-+ CHECK(escape_non_alnum({'\x62'}) == "b");
-+ CHECK(escape_non_alnum({'\x63'}) == "c");
-+ CHECK(escape_non_alnum({'\x64'}) == "d");
-+ CHECK(escape_non_alnum({'\x65'}) == "e");
-+ CHECK(escape_non_alnum({'\x66'}) == "f");
-+ CHECK(escape_non_alnum({'\x67'}) == "g");
-+ CHECK(escape_non_alnum({'\x68'}) == "h");
-+ CHECK(escape_non_alnum({'\x69'}) == "i");
-+ CHECK(escape_non_alnum({'\x6A'}) == "j");
-+ CHECK(escape_non_alnum({'\x6B'}) == "k");
-+ CHECK(escape_non_alnum({'\x6C'}) == "l");
-+ CHECK(escape_non_alnum({'\x6D'}) == "m");
-+ CHECK(escape_non_alnum({'\x6E'}) == "n");
-+ CHECK(escape_non_alnum({'\x6F'}) == "o");
-+ CHECK(escape_non_alnum({'\x70'}) == "p");
-+ CHECK(escape_non_alnum({'\x71'}) == "q");
-+ CHECK(escape_non_alnum({'\x72'}) == "r");
-+ CHECK(escape_non_alnum({'\x73'}) == "s");
-+ CHECK(escape_non_alnum({'\x74'}) == "t");
-+ CHECK(escape_non_alnum({'\x75'}) == "u");
-+ CHECK(escape_non_alnum({'\x76'}) == "v");
-+ CHECK(escape_non_alnum({'\x77'}) == "w");
-+ CHECK(escape_non_alnum({'\x78'}) == "x");
-+ CHECK(escape_non_alnum({'\x79'}) == "y");
-+ CHECK(escape_non_alnum({'\x7A'}) == "z");
-+ CHECK(escape_non_alnum({'\x7B'}) == "_7b");
-+ CHECK(escape_non_alnum({'\x7C'}) == "_7c");
-+ CHECK(escape_non_alnum({'\x7D'}) == "_7d");
-+ CHECK(escape_non_alnum({'\x7E'}) == "_7e");
-+ CHECK(escape_non_alnum({'\x7F'}) == "_7f");
- }
-
- TEST_CASE(
- "escape_non_alnum should work with any single byte signed character (part
2)",
- "[core][utils][string_utils][escape_non_alnum]")
- {
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x80)}) ==
"_80");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x81)}) ==
"_81");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x82)}) ==
"_82");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x83)}) ==
"_83");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x84)}) ==
"_84");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x85)}) ==
"_85");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x86)}) ==
"_86");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x87)}) ==
"_87");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x88)}) ==
"_88");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x89)}) ==
"_89");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x8A)}) ==
"_8a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x8B)}) ==
"_8b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x8C)}) ==
"_8c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x8D)}) ==
"_8d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x8E)}) ==
"_8e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x8F)}) ==
"_8f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x90)}) ==
"_90");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x91)}) ==
"_91");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x92)}) ==
"_92");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x93)}) ==
"_93");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x94)}) ==
"_94");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x95)}) ==
"_95");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x96)}) ==
"_96");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x97)}) ==
"_97");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x98)}) ==
"_98");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x99)}) ==
"_99");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x9A)}) ==
"_9a");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x9B)}) ==
"_9b");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x9C)}) ==
"_9c");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x9D)}) ==
"_9d");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x9E)}) ==
"_9e");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0x9F)}) ==
"_9f");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA0)}) ==
"_a0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA1)}) ==
"_a1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA2)}) ==
"_a2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA3)}) ==
"_a3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA4)}) ==
"_a4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA5)}) ==
"_a5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA6)}) ==
"_a6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA7)}) ==
"_a7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA8)}) ==
"_a8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xA9)}) ==
"_a9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xAA)}) ==
"_aa");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xAB)}) ==
"_ab");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xAC)}) ==
"_ac");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xAD)}) ==
"_ad");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xAE)}) ==
"_ae");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xAF)}) ==
"_af");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB0)}) ==
"_b0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB1)}) ==
"_b1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB2)}) ==
"_b2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB3)}) ==
"_b3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB4)}) ==
"_b4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB5)}) ==
"_b5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB6)}) ==
"_b6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB7)}) ==
"_b7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB8)}) ==
"_b8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xB9)}) ==
"_b9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xBA)}) ==
"_ba");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xBB)}) ==
"_bb");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xBC)}) ==
"_bc");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xBD)}) ==
"_bd");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xBE)}) ==
"_be");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xBF)}) ==
"_bf");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC0)}) ==
"_c0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC1)}) ==
"_c1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC2)}) ==
"_c2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC3)}) ==
"_c3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC4)}) ==
"_c4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC5)}) ==
"_c5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC6)}) ==
"_c6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC7)}) ==
"_c7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC8)}) ==
"_c8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xC9)}) ==
"_c9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xCA)}) ==
"_ca");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xCB)}) ==
"_cb");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xCC)}) ==
"_cc");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xCD)}) ==
"_cd");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xCE)}) ==
"_ce");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xCF)}) ==
"_cf");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD0)}) ==
"_d0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD1)}) ==
"_d1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD2)}) ==
"_d2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD3)}) ==
"_d3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD4)}) ==
"_d4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD5)}) ==
"_d5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD6)}) ==
"_d6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD7)}) ==
"_d7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD8)}) ==
"_d8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xD9)}) ==
"_d9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xDA)}) ==
"_da");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xDB)}) ==
"_db");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xDC)}) ==
"_dc");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xDD)}) ==
"_dd");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xDE)}) ==
"_de");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xDF)}) ==
"_df");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE0)}) ==
"_e0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE1)}) ==
"_e1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE2)}) ==
"_e2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE3)}) ==
"_e3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE4)}) ==
"_e4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE5)}) ==
"_e5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE6)}) ==
"_e6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE7)}) ==
"_e7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE8)}) ==
"_e8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xE9)}) ==
"_e9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xEA)}) ==
"_ea");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xEB)}) ==
"_eb");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xEC)}) ==
"_ec");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xED)}) ==
"_ed");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xEE)}) ==
"_ee");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xEF)}) ==
"_ef");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF0)}) ==
"_f0");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF1)}) ==
"_f1");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF2)}) ==
"_f2");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF3)}) ==
"_f3");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF4)}) ==
"_f4");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF5)}) ==
"_f5");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF6)}) ==
"_f6");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF7)}) ==
"_f7");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF8)}) ==
"_f8");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xF9)}) ==
"_f9");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xFA)}) ==
"_fa");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xFB)}) ==
"_fb");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xFC)}) ==
"_fc");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xFD)}) ==
"_fd");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xFE)}) ==
"_fe");
-- CHECK(escape_non_alnum(std::string{static_cast<signed char>(0xFF)}) ==
"_ff");
-+ CHECK(escape_non_alnum({'\x80'}) == "_80");
-+ CHECK(escape_non_alnum({'\x81'}) == "_81");
-+ CHECK(escape_non_alnum({'\x82'}) == "_82");
-+ CHECK(escape_non_alnum({'\x83'}) == "_83");
-+ CHECK(escape_non_alnum({'\x84'}) == "_84");
-+ CHECK(escape_non_alnum({'\x85'}) == "_85");
-+ CHECK(escape_non_alnum({'\x86'}) == "_86");
-+ CHECK(escape_non_alnum({'\x87'}) == "_87");
-+ CHECK(escape_non_alnum({'\x88'}) == "_88");
-+ CHECK(escape_non_alnum({'\x89'}) == "_89");
-+ CHECK(escape_non_alnum({'\x8A'}) == "_8a");
-+ CHECK(escape_non_alnum({'\x8B'}) == "_8b");
-+ CHECK(escape_non_alnum({'\x8C'}) == "_8c");
-+ CHECK(escape_non_alnum({'\x8D'}) == "_8d");
-+ CHECK(escape_non_alnum({'\x8E'}) == "_8e");
-+ CHECK(escape_non_alnum({'\x8F'}) == "_8f");
-+ CHECK(escape_non_alnum({'\x90'}) == "_90");
-+ CHECK(escape_non_alnum({'\x91'}) == "_91");
-+ CHECK(escape_non_alnum({'\x92'}) == "_92");
-+ CHECK(escape_non_alnum({'\x93'}) == "_93");
-+ CHECK(escape_non_alnum({'\x94'}) == "_94");
-+ CHECK(escape_non_alnum({'\x95'}) == "_95");
-+ CHECK(escape_non_alnum({'\x96'}) == "_96");
-+ CHECK(escape_non_alnum({'\x97'}) == "_97");
-+ CHECK(escape_non_alnum({'\x98'}) == "_98");
-+ CHECK(escape_non_alnum({'\x99'}) == "_99");
-+ CHECK(escape_non_alnum({'\x9A'}) == "_9a");
-+ CHECK(escape_non_alnum({'\x9B'}) == "_9b");
-+ CHECK(escape_non_alnum({'\x9C'}) == "_9c");
-+ CHECK(escape_non_alnum({'\x9D'}) == "_9d");
-+ CHECK(escape_non_alnum({'\x9E'}) == "_9e");
-+ CHECK(escape_non_alnum({'\x9F'}) == "_9f");
-+ CHECK(escape_non_alnum({'\xA0'}) == "_a0");
-+ CHECK(escape_non_alnum({'\xA1'}) == "_a1");
-+ CHECK(escape_non_alnum({'\xA2'}) == "_a2");
-+ CHECK(escape_non_alnum({'\xA3'}) == "_a3");
-+ CHECK(escape_non_alnum({'\xA4'}) == "_a4");
-+ CHECK(escape_non_alnum({'\xA5'}) == "_a5");
-+ CHECK(escape_non_alnum({'\xA6'}) == "_a6");
-+ CHECK(escape_non_alnum({'\xA7'}) == "_a7");
-+ CHECK(escape_non_alnum({'\xA8'}) == "_a8");
-+ CHECK(escape_non_alnum({'\xA9'}) == "_a9");
-+ CHECK(escape_non_alnum({'\xAA'}) == "_aa");
-+ CHECK(escape_non_alnum({'\xAB'}) == "_ab");
-+ CHECK(escape_non_alnum({'\xAC'}) == "_ac");
-+ CHECK(escape_non_alnum({'\xAD'}) == "_ad");
-+ CHECK(escape_non_alnum({'\xAE'}) == "_ae");
-+ CHECK(escape_non_alnum({'\xAF'}) == "_af");
-+ CHECK(escape_non_alnum({'\xB0'}) == "_b0");
-+ CHECK(escape_non_alnum({'\xB1'}) == "_b1");
-+ CHECK(escape_non_alnum({'\xB2'}) == "_b2");
-+ CHECK(escape_non_alnum({'\xB3'}) == "_b3");
-+ CHECK(escape_non_alnum({'\xB4'}) == "_b4");
-+ CHECK(escape_non_alnum({'\xB5'}) == "_b5");
-+ CHECK(escape_non_alnum({'\xB6'}) == "_b6");
-+ CHECK(escape_non_alnum({'\xB7'}) == "_b7");
-+ CHECK(escape_non_alnum({'\xB8'}) == "_b8");
-+ CHECK(escape_non_alnum({'\xB9'}) == "_b9");
-+ CHECK(escape_non_alnum({'\xBA'}) == "_ba");
-+ CHECK(escape_non_alnum({'\xBB'}) == "_bb");
-+ CHECK(escape_non_alnum({'\xBC'}) == "_bc");
-+ CHECK(escape_non_alnum({'\xBD'}) == "_bd");
-+ CHECK(escape_non_alnum({'\xBE'}) == "_be");
-+ CHECK(escape_non_alnum({'\xBF'}) == "_bf");
-+ CHECK(escape_non_alnum({'\xC0'}) == "_c0");
-+ CHECK(escape_non_alnum({'\xC1'}) == "_c1");
-+ CHECK(escape_non_alnum({'\xC2'}) == "_c2");
-+ CHECK(escape_non_alnum({'\xC3'}) == "_c3");
-+ CHECK(escape_non_alnum({'\xC4'}) == "_c4");
-+ CHECK(escape_non_alnum({'\xC5'}) == "_c5");
-+ CHECK(escape_non_alnum({'\xC6'}) == "_c6");
-+ CHECK(escape_non_alnum({'\xC7'}) == "_c7");
-+ CHECK(escape_non_alnum({'\xC8'}) == "_c8");
-+ CHECK(escape_non_alnum({'\xC9'}) == "_c9");
-+ CHECK(escape_non_alnum({'\xCA'}) == "_ca");
-+ CHECK(escape_non_alnum({'\xCB'}) == "_cb");
-+ CHECK(escape_non_alnum({'\xCC'}) == "_cc");
-+ CHECK(escape_non_alnum({'\xCD'}) == "_cd");
-+ CHECK(escape_non_alnum({'\xCE'}) == "_ce");
-+ CHECK(escape_non_alnum({'\xCF'}) == "_cf");
-+ CHECK(escape_non_alnum({'\xD0'}) == "_d0");
-+ CHECK(escape_non_alnum({'\xD1'}) == "_d1");
-+ CHECK(escape_non_alnum({'\xD2'}) == "_d2");
-+ CHECK(escape_non_alnum({'\xD3'}) == "_d3");
-+ CHECK(escape_non_alnum({'\xD4'}) == "_d4");
-+ CHECK(escape_non_alnum({'\xD5'}) == "_d5");
-+ CHECK(escape_non_alnum({'\xD6'}) == "_d6");
-+ CHECK(escape_non_alnum({'\xD7'}) == "_d7");
-+ CHECK(escape_non_alnum({'\xD8'}) == "_d8");
-+ CHECK(escape_non_alnum({'\xD9'}) == "_d9");
-+ CHECK(escape_non_alnum({'\xDA'}) == "_da");
-+ CHECK(escape_non_alnum({'\xDB'}) == "_db");
-+ CHECK(escape_non_alnum({'\xDC'}) == "_dc");
-+ CHECK(escape_non_alnum({'\xDD'}) == "_dd");
-+ CHECK(escape_non_alnum({'\xDE'}) == "_de");
-+ CHECK(escape_non_alnum({'\xDF'}) == "_df");
-+ CHECK(escape_non_alnum({'\xE0'}) == "_e0");
-+ CHECK(escape_non_alnum({'\xE1'}) == "_e1");
-+ CHECK(escape_non_alnum({'\xE2'}) == "_e2");
-+ CHECK(escape_non_alnum({'\xE3'}) == "_e3");
-+ CHECK(escape_non_alnum({'\xE4'}) == "_e4");
-+ CHECK(escape_non_alnum({'\xE5'}) == "_e5");
-+ CHECK(escape_non_alnum({'\xE6'}) == "_e6");
-+ CHECK(escape_non_alnum({'\xE7'}) == "_e7");
-+ CHECK(escape_non_alnum({'\xE8'}) == "_e8");
-+ CHECK(escape_non_alnum({'\xE9'}) == "_e9");
-+ CHECK(escape_non_alnum({'\xEA'}) == "_ea");
-+ CHECK(escape_non_alnum({'\xEB'}) == "_eb");
-+ CHECK(escape_non_alnum({'\xEC'}) == "_ec");
-+ CHECK(escape_non_alnum({'\xED'}) == "_ed");
-+ CHECK(escape_non_alnum({'\xEE'}) == "_ee");
-+ CHECK(escape_non_alnum({'\xEF'}) == "_ef");
-+ CHECK(escape_non_alnum({'\xF0'}) == "_f0");
-+ CHECK(escape_non_alnum({'\xF1'}) == "_f1");
-+ CHECK(escape_non_alnum({'\xF2'}) == "_f2");
-+ CHECK(escape_non_alnum({'\xF3'}) == "_f3");
-+ CHECK(escape_non_alnum({'\xF4'}) == "_f4");
-+ CHECK(escape_non_alnum({'\xF5'}) == "_f5");
-+ CHECK(escape_non_alnum({'\xF6'}) == "_f6");
-+ CHECK(escape_non_alnum({'\xF7'}) == "_f7");
-+ CHECK(escape_non_alnum({'\xF8'}) == "_f8");
-+ CHECK(escape_non_alnum({'\xF9'}) == "_f9");
-+ CHECK(escape_non_alnum({'\xFA'}) == "_fa");
-+ CHECK(escape_non_alnum({'\xFB'}) == "_fb");
-+ CHECK(escape_non_alnum({'\xFC'}) == "_fc");
-+ CHECK(escape_non_alnum({'\xFD'}) == "_fd");
-+ CHECK(escape_non_alnum({'\xFE'}) == "_fe");
-+ CHECK(escape_non_alnum({'\xFF'}) == "_ff");
- }
diff --git a/cbmc.spec b/cbmc.spec
index f3cbe33..25ea933 100644
--- a/cbmc.spec
+++ b/cbmc.spec
@@ -5,7 +5,7 @@
%define _lto_cflags %{nil}
Name: cbmc
-Version: 5.25.0
+Version: 5.29.0
Release: 1%{?dist}
Summary: Bounded Model Checker for ANSI-C and C++ programs
@@ -21,34 +21,33 @@ Patch0: %{name}-5.9-glpk.patch
Patch1: %{name}-5.12-fix-f33.patch
# Use minisat from Fedora repos
Patch2: %{name}-minisat.patch
-# Fix compilation on 32 bit architectures
-Patch3: %{name}-32bit-arch-fix.patch
-# Fix compilation of tests
-Patch4: %{name}-signed-char.patch
-# /src/goto-cc/ms_link_cmdline.cpp, use non-reference type 'const string'
-Patch5: %{name}-goto-cc-type-change.patch
-# Fix imcompatibility with glibc 2.33+
-Patch6: %{name}-errno-realpath.patch
# Skip some c++ tests as cbmc cannot parse some GCC 11 headers
-Patch7: %{name}-f34-fix-build.patch
-# from
https://src.fedoraproject.org/rpms/catch/c/771d2
-Patch8: %{name}-catch2.patch
+Patch3: %{name}-f34-fix-build.patch
+# From
https://src.fedoraproject.org/rpms/catch/c/771d2
+Patch4: %{name}-catch2.patch
+# Revert
https://github.com/diffblue/cbmc/commit/a5b3008411f89a7800fde9003017242a8...
+# due deprecated python2 in fedora
+Patch5: %{name}-f35-deprecated-python.patch
+# Enable SSE2
(
https://fedoraproject.org/wiki/Changes/Update_i686_architectural_baseline...)
+Patch6: %{name}-f35-enable_sse2.patch
-BuildRequires: bash
BuildRequires: bison
BuildRequires: cmake
BuildRequires: doxygen-latex
BuildRequires: flex
BuildRequires: gcc-c++
-BuildRequires: gdb
BuildRequires: glpk-devel
-BuildRequires: graphviz
BuildRequires: make
BuildRequires: minisat2-devel
BuildRequires: ninja-build
BuildRequires: zlib-devel
+# for the test
+BuildRequires: jq
+BuildRequires: gdb
+BuildRequires: perl
+BuildRequires: python3
+BuildRequires: z3
-Requires: clang
Requires: gcc-c++
Requires: sed
@@ -79,16 +78,14 @@ Output conversion utilities for CBMC (GCC like format)
%patch1 -p0
%endif
%patch2 -p0
-%ifarch armv7hl i686
+%if 0%{?fedora} > 33
%patch3 -p0
%endif
%patch4 -p0
%patch5 -p0
+%ifarch i686
%patch6 -p0
-%if 0%{?fedora} > 33
-%patch7 -p0
%endif
-%patch8 -p0
%build
%cmake -GNinja -DWITH_JBMC:BOOL=OFF -DWITH_SYSTEM_SAT_SOLVER:BOOL=ON
-DBUILD_SHARED_LIBS:BOOL=OFF
@@ -121,7 +118,7 @@ ln -s xml_y.tab.h src/xmllang/xml_y.tab.hpp
%endif
%files
-%doc CHANGELOG README.md
+%doc README.md
%license LICENSE
%{_bindir}/*
%{_mandir}/man1/*
@@ -137,6 +134,9 @@ ln -s xml_y.tab.h src/xmllang/xml_y.tab.hpp
%changelog
+* Wed May 12 2021 Vincent Mihalkovic <vmihalko(a)redhat.com> - 5.29.0-1
+- New upstream release
+
* Wed Mar 10 2021 Vincent Mihalkovic <vmihalko(a)redhat.com> - 5.25.0-1
- Add csexec-cbmc.sh script
- New upstream release
diff --git a/sources b/sources
index 860bf0d..86311bc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cbmc-5.25.0.tar.gz) =
90fbaaaf9189be67a52b3e88f6165d3b9dc791c2d86b50ea2b4405f1f69071dadec404d0004a2e537cffbdf1a782e2b1a8240f21b259b114c8799fd2fe3a1a95
+SHA512 (cbmc-5.29.0.tar.gz) =
23402f72f13a04096d7a3cea8e570620558288118231833bf8cd4f3f47c85f11ed2719f5330f570b9263a5732999800017ec910dfe84b96dbd0326ad77ecf2c3
SHA512 (cbmc-utils-1.1.tar.gz) =
d6170e08cc8b8c6a116cc5db883f8d13dfa976087434468eae1e213c8aada3ebf1bf913e565ff971defbe06106ad4180a5cff1a32bbbb2ee3b035a7600b0183c