RC release 3.7.0; Decouple library name and version from main version; Require and use C++17, and use string_view where possible; Snip superfluous const

Author: TinoDidriksen

.gitignore

@@ -1,5 +1,6 @@
 *.pyc
 **/*.deps/
+/build/
 /.ccls-cache/
 /*.pc
 /aclocal.m4
@@ -60,6 +61,7 @@
 
 /compile_commands.json
 /lttoolbox/lt-comp
+/lttoolbox/lt-compose
 /lttoolbox/lt-proc
 /lttoolbox/lt-trim
 /lttoolbox/Makefile

CMakeLists.txt

@@ -1,13 +1,11 @@
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
 project(lttoolbox
-	VERSION 3.5.2
+	VERSION 3.7.0
 	LANGUAGES CXX C
 	)
 set(VERSION ${PROJECT_VERSION})
-set(VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(VERSION_API "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
-set(SOVERSION 1.0.0)
+set(VERSION_ABI 3)
 set(PACKAGE_BUGREPORT "[email protected]")
 
 add_definitions("-DPACKAGE_VERSION=\"${PROJECT_VERSION}\"")
@@ -68,7 +66,7 @@ else()
 	endforeach()
 
 	# Require latest possible C++ standard
-	foreach(flag "-std=c++20" "-std=c++2a" "-std=c++17" "-std=c++1z" "-std=c++14" "-std=c++1y")
+	foreach(flag "-std=c++23" "-std=c++2b"  "-std=c++20" "-std=c++2a" "-std=c++17")
 		string(REGEX REPLACE "[^a-z0-9]" "-" _flag ${flag})
 		CHECK_CXX_COMPILER_FLAG(${flag} COMPILER_SUPPORTS_${_flag})
 		if(COMPILER_SUPPORTS_${_flag})
@@ -78,7 +76,7 @@ else()
 		endif()
 	endforeach()
 	if(NOT _ENABLED_CXX)
-		message(FATAL_ERROR "Could not enable at least C++14 (C++1y) - upgrade your compiler")
+		message(FATAL_ERROR "Could not enable at least C++17 - upgrade your compiler")
 	endif()
 
 	# Generate pkg-config file
@@ -106,6 +104,10 @@ else()
 	add_definitions(-D_POSIX_C_SOURCE=200112 -D_GNU_SOURCE)
 endif()
 
+if(NOT APPLE)
+	find_package(Threads REQUIRED)
+endif()
+
 # Unlocked I/O functions
 include(CheckSymbolExists)
 set(CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200112 -D_GNU_SOURCE)
@@ -128,6 +130,9 @@ else()
 	set(GETOPT_LIB)
 endif()
 
+# ICU
+find_package(ICU COMPONENTS i18n io uc REQUIRED)
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 if(BUILD_TESTING)

configure.ac

@@ -1,22 +1,20 @@
 AC_PREREQ(2.52)
 
 m4_define([PKG_VERSION_MAJOR], [3])
-m4_define([PKG_VERSION_MINOR], [6])
-m4_define([PKG_VERSION_PATCH], [10])
-m4_include([m4/ax_pthread.m4])
+m4_define([PKG_VERSION_MINOR], [7])
+m4_define([PKG_VERSION_PATCH], [0])
+
+# Bump if the ABI (not API) changed in a backwards-incompatible manner
+m4_define([PKG_VERSION_ABI], [3])
 
 AC_INIT([lttoolbox], [PKG_VERSION_MAJOR.PKG_VERSION_MINOR.PKG_VERSION_PATCH], [[email protected]], [lttoolbox], [https://wiki.apertium.org/wiki/Lttoolbox])
 
 VERSION=$PACKAGE_VERSION
-VERSION_MAJOR=PKG_VERSION_MAJOR
-VERSION_API=PKG_VERSION_MAJOR.PKG_VERSION_MINOR
-SOVERSION=1:0:0
+VERSION_ABI=PKG_VERSION_ABI
 
 AC_SUBST(PACKAGE_NAME)
 AC_SUBST(PACKAGE_VERSION)
-AC_SUBST(VERSION_MAJOR)
-AC_SUBST(VERSION_API)
-AC_SUBST(SOVERSION)
+AC_SUBST(VERSION_ABI)
 
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
@@ -72,12 +70,12 @@ AM_CONDITIONAL([WINDOWS], [test x$version_type = xwindows])
 
 # Require highest supported C++ standard
 AC_LANG(C++)
-for version in 23 2b 20 2a 17 1z 14 1y; do
+for version in 23 2b 20 2a 17; do
   version_flag="-std=c++${version}"
   AX_CHECK_COMPILE_FLAG([${version_flag}], [break], [version_flag=none])
 done
 AS_IF([test "$version_flag" == none], [
-  AC_MSG_ERROR([Could not enable at least C++1y (C++14) - upgrade your compiler])
+  AC_MSG_ERROR([Could not enable at least C++17 - upgrade your compiler])
 ])
 CXXFLAGS="$CXXFLAGS ${version_flag}"
 

lttoolbox.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: lttoolbox
 Description: Augmented letter transducer tools for natural language processing
 Version: @VERSION@
-Libs: -L${libdir} -llttoolbox@VERSION_MAJOR@
-Cflags: -I${includedir}/lttoolbox-@VERSION_API@
+Cflags: -I${includedir}
+Libs: -L${libdir} -l@PACKAGE_NAME@

lttoolbox/CMakeLists.txt

@@ -1,16 +1,19 @@
 set(LIBLTTOOLBOX_HEADERS
+	acx.h
 	alphabet.h
 	att_compiler.h
 	buffer.h
+	cli.h
 	compiler.h
 	compression.h
 	deserialiser.h
 	entry_token.h
 	exception.h
 	expander.h
+	file_utils.h
 	fst_processor.h
+	input_file.h
 	lt_locale.h
-	ltstr.h
 	match_exe.h
 	match_node.h
 	match_state.h
@@ -20,21 +23,28 @@ set(LIBLTTOOLBOX_HEADERS
 	regexp_compiler.h
 	serialiser.h
 	sorted_vector.h
+	sorted_vector.hpp
 	state.h
-	string_to_wostream.h
+	string_utils.h
 	tmx_compiler.h
-	trans_exe.h
 	transducer.h
+	trans_exe.h
+	ustring.h
 	xml_parse_util.h
+	xml_walk_util.h
 	)
 set(LIBLTTOOLBOX_SOURCES
+	acx.cc
 	alphabet.cc
 	att_compiler.cc
+	cli.cc
 	compiler.cc
 	compression.cc
 	entry_token.cc
 	expander.cc
+	file_utils.cc
 	fst_processor.cc
+	input_file.cc
 	lt_locale.cc
 	match_exe.cc
 	match_node.cc
@@ -44,10 +54,13 @@ set(LIBLTTOOLBOX_SOURCES
 	regexp_compiler.cc
 	sorted_vector.cc
 	state.cc
+	string_utils.cc
 	tmx_compiler.cc
-	trans_exe.cc
 	transducer.cc
+	trans_exe.cc
+	ustring.cc
 	xml_parse_util.cc
+	xml_walk_util.cc
 	${LIBLTTOOLBOX_HEADERS}
 	)
 if(WIN32)
@@ -70,42 +83,41 @@ else()
 	set(GETOPT)
 endif()
 
-set(LibLttoolbox "lttoolbox${PROJECT_VERSION_MAJOR}-${VERSION_API}")
-add_library(${LibLttoolbox} ${LIBLTTOOLBOX_SOURCES})
-target_compile_definitions(${LibLttoolbox} PRIVATE LTTOOLBOX_EXPORTS)
-set_target_properties(${LibLttoolbox} PROPERTIES SOVERSION ${SOVERSION} VERSION ${VERSION})
-target_link_libraries(${LibLttoolbox} ${LIBXML2_LIBRARIES})
+add_library(lttoolbox ${LIBLTTOOLBOX_SOURCES})
+target_compile_definitions(lttoolbox PRIVATE LTTOOLBOX_EXPORTS)
+set_target_properties(lttoolbox PROPERTIES SOVERSION ${VERSION_ABI})
+target_link_libraries(lttoolbox ${LIBXML2_LIBRARIES} ${ICU_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 
 add_executable(lt-print lt_print.cc)
-target_link_libraries(lt-print ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-print lttoolbox ${GETOPT_LIB})
 
 add_executable(lt-trim lt_trim.cc)
-target_link_libraries(lt-trim ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-trim lttoolbox ${GETOPT_LIB})
 
 add_executable(lt-comp lt_comp.cc)
-target_link_libraries(lt-comp ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-comp lttoolbox ${GETOPT_LIB})
 
 add_executable(lt-proc lt_proc.cc)
-target_link_libraries(lt-proc ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-proc lttoolbox ${GETOPT_LIB})
 
 add_executable(lt-expand lt_expand.cc)
-target_link_libraries(lt-expand ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-expand lttoolbox ${GETOPT_LIB})
 
 add_executable(lt-tmxcomp lt_tmxcomp.cc)
-target_link_libraries(lt-tmxcomp ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-tmxcomp lttoolbox ${GETOPT_LIB})
 
 add_executable(lt-tmxproc lt_tmxproc.cc)
-target_link_libraries(lt-tmxproc ${LibLttoolbox} ${GETOPT_LIB})
+target_link_libraries(lt-tmxproc lttoolbox ${GETOPT_LIB})
 
 if(BUILD_TESTING)
 	add_test(NAME tests COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/tests/run_tests.py" $<TARGET_FILE_DIR:lt-comp>)
 	set_tests_properties(tests PROPERTIES FAIL_REGULAR_EXPRESSION "FAILED")
 endif()
 
-install(TARGETS ${LibLttoolbox}
+install(TARGETS lttoolbox
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 install(FILES ${LIBLTTOOLBOX_HEADERS}
-	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lttoolbox-${VERSION_API}/lttoolbox)
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lttoolbox)
 install(TARGETS lt-print lt-trim lt-comp lt-proc lt-expand lt-tmxcomp lt-tmxproc
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 

lttoolbox/Makefile.am

@@ -11,25 +11,25 @@ cc_sources = acx.cc alphabet.cc att_compiler.cc cli.cc compiler.cc compression.c
              regexp_compiler.cc sorted_vector.cc state.cc string_utils.cc transducer.cc \
              trans_exe.cc xml_parse_util.cc xml_walk_util.cc tmx_compiler.cc ustring.cc
 
-library_includedir = $(includedir)/$(PACKAGE_NAME)-$(VERSION_API)/$(PACKAGE_NAME)
+library_includedir = $(includedir)/$(PACKAGE_NAME)
 library_include_HEADERS = $(h_sources)
 
 bin_PROGRAMS = lt-comp lt-proc lt-expand lt-paradigm lt-tmxcomp lt-tmxproc lt-print lt-trim lt-compose lt-append lsx-comp lt-invert lt-restrict lt-apply-acx
 instdir = lttoolbox
 
-lib_LTLIBRARIES= liblttoolbox3.la
-liblttoolbox3_la_SOURCES= $(h_sources) $(cc_sources)
-liblttoolbox3_la_LDFLAGS= -version-info $(SOVERSION) -release $(VERSION_API)
-liblttoolbox3_la_LIBADD= $(ICU_LIBS)
+lib_LTLIBRARIES= liblttoolbox.la
+liblttoolbox_la_SOURCES= $(h_sources) $(cc_sources)
+liblttoolbox_la_LDFLAGS= -version-info $(VERSION_ABI)
+liblttoolbox_la_LIBADD= $(ICU_LIBS)
 
 lttoolboxdir = $(prefix)/share/lttoolbox
 lttoolboxinclude = $(prefix)/include
 lttoolboxlib = $(prefix)/lib
 
 lttoolbox_DATA = dix.dtd dix.rng dix.rnc acx.rng xsd/dix.xsd xsd/acx.xsd
 
-LDADD = liblttoolbox$(VERSION_MAJOR).la $(PTHREAD_LIBS)
-AM_LDFLAGS = -llttoolbox$(VERSION_MAJOR) $(LIBXML_LIBS) $(ICU_LIBS)
+LDADD = liblttoolbox.la $(PTHREAD_LIBS)
+AM_LDFLAGS = -llttoolbox $(LIBXML_LIBS) $(ICU_LIBS)
 
 lt_append_SOURCES = lt_append.cc
 lt_print_SOURCES = lt_print.cc

lttoolbox/acx.cc

@@ -54,7 +54,7 @@ std::map<int32_t, sorted_vector<int32_t>> readACX(const char* file)
       vec.insert(get_val(equiv_node));
     }
     if (!vec.empty()) {
-      acx.insert(std::make_pair(key, vec));
+      acx.insert({key, vec});
     }
   }
   return acx;