feat(core): ldml repertoire test, initial ICU integration 🙀

core/cross-mac-arm64.build

@@ -12,4 +12,5 @@ ar = 'ar'
 ld = 'ld'
 strip = 'strip'
 lipo = 'lipo'
-ranlib = 'ranlib'
+ranlib = 'ranlib'
+pkgconfig = 'pkg-config'

core/cross-mac-x86_64.build

@@ -12,4 +12,5 @@ ar = 'ar'
 ld = 'ld'
 strip = 'strip'
 lipo = 'lipo'
-ranlib = 'ranlib'
+ranlib = 'ranlib'
+pkgconfig = 'pkg-config'

core/src/debuglog.h

@@ -50,4 +50,4 @@ void write_console(KMX_BOOL error, const wchar_t *fmt, ...);
 
 }
 }
-}
+}

core/src/kmx/kmx_plus.cpp

@@ -670,14 +670,24 @@ COMP_KMXPLUS_KEYS_Helper::getKeys(KMX_DWORD i) const {
 
 const COMP_KMXPLUS_KEYS_KEY*
 COMP_KMXPLUS_KEYS_Helper::findKeyByStringId(KMX_DWORD strId, KMX_DWORD &i) const {
-  for (i = 0; i < key2->keyCount; i++) {
+  for (; i < key2->keyCount; i++) {
     if (keys[i].id == strId) {
       return &keys[i];
     }
   }
   return nullptr;
 }
 
+const COMP_KMXPLUS_KEYS_KEY*
+COMP_KMXPLUS_KEYS_Helper::findKeyByStringTo(KMX_DWORD strId, KMX_DWORD &i) const {
+  for (; i < key2->keyCount; i++) {
+    if (keys[i].to == strId) {
+      return &keys[i];
+    }
+  }
+  return nullptr;
+}
+
 const COMP_KMXPLUS_KEYS_FLICK_LIST *
 COMP_KMXPLUS_KEYS_Helper::getFlickLists(KMX_DWORD i) const {
   if (!valid() || i >= key2->flicksCount) {

core/src/kmx/kmx_plus.h

@@ -506,10 +506,17 @@ class COMP_KMXPLUS_KEYS_Helper {
   /**
    * Search for a key by string id.
    * @param strID id to search for
-   * @param index on exit, index of item if found. Undefined otherwise.
+   * @param index on entry, id to start with such as 0. On exit, index of item if found. Undefined otherwise.
    * @return pointer to key or nullptr
    */
   const COMP_KMXPLUS_KEYS_KEY *findKeyByStringId(KMX_DWORD strId, KMX_DWORD &index) const;
+  /**
+   * Search for a key by 'to' string id
+   * @param strID id to search for
+   * @param index on entry, id to start with such as 0. On exit, index of item if found. Undefined otherwise.
+   * @return pointer to key or nullptr
+   */
+  const COMP_KMXPLUS_KEYS_KEY *findKeyByStringTo(KMX_DWORD strId, KMX_DWORD &index) const;
 
 private:
   const COMP_KMXPLUS_KEYS *key2;

core/subprojects/.gitignore

@@ -0,0 +1,4 @@
+/icu
+/*.zip
+/*.tgz
+/packagecache

core/subprojects/README.md

@@ -0,0 +1,12 @@
+# core/subprojects
+
+## What's this? What _is_ this?
+
+- These are subprojects accessible to the `core` meson project.
+
+## icu
+
+- When building for Linux, [ICU](https://icu.unicode.org) must already be installed. The system ICU will be used instead of the subproject.
+- Patches for icu (i.e. meson build files) are in [`packagefiles/icu`](./packagefiles/icu/)
+- It would be preferable to use meson's [wrapdb](https://mesonbuild.com/Wrapdb-projects.html), and in fact the patchfiles here are sourced from that project.
+- However, having our own patchfiles allows for slimming down ICU, at least until the wrapdb version is more configurable [mesonbuild/wrapdb#950](https://github.com/mesonbuild/wrapdb/issues/950)

core/subprojects/icu-minimal.wrap

@@ -0,0 +1,14 @@
+[wrap-file]
+directory = icu
+source_url = https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz
+source_filename = icu4c-73_1-src.tgz
+source_hash = a457431de164b4aa7eca00ed134d00dfbf88a77c6986a10ae7774fc076bb8c45
+## TODO-LDML: Note, need meson 0.55.0 to use patch_directory
+patch_directory = icu
+
+# Based on: wrapdb_version = 72.1-3
+
+[provide]
+icu-uc = icuuc_dep
+# TODO-LDML: not including i18n at present
+#icu-i18n = icui18n_dep

core/subprojects/packagefiles/icu/LICENSE.meson

@@ -0,0 +1,19 @@
+Copyright (c) 2021 The Meson development team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

core/subprojects/packagefiles/icu/meson.build

@@ -0,0 +1,98 @@
+project(
+  'icu',
+  'c',
+  'cpp',
+  version: '73.1',
+  meson_version: '>=0.57.0',  # TODO-LDML: Too high for debian
+  default_options: [ 'cpp_std=c++17' ],
+)
+
+U_ICU_VERSION = meson.project_version()
+PACKAGE_ICU_DESCRIPTION = 'International Components for Unicode'
+PACKAGE_ICU_URL = 'http://icu-project.org'
+
+cpp = meson.get_compiler('cpp')
+# cpp_native = meson.get_compiler('cpp', native: true)
+
+have_elf_h = cpp.has_header('elf.h')
+
+if host_machine.system() == 'windows'
+  add_project_arguments('-DU_PLATFORM_USES_ONLY_WIN32_API', language: 'cpp')
+  add_project_arguments('-DWIN32', '-DWIN64', '-D_MBCS', language: 'cpp')
+  add_project_arguments('-DU_PLATFORM_USES_ONLY_WIN32_API', language: 'c')
+  add_project_arguments('-DWIN32', '-DWIN64', '-D_MBCS', language: 'c')
+endif
+
+
+# per icudefs.mk.in:
+# "U_ATTRIBUTE_DEPRECATED is defined to hide warnings about deprecated API warnings."
+add_project_arguments('-DU_ATTRIBUTE_DEPRECATED=', '-DUCONFIG_USE_LOCAL=1', language: 'c')
+
+add_project_arguments('-DU_NOEXCEPT=', language: 'c')
+
+uconfig = configuration_data()
+
+uconfig.set('U_ENABLE_DYLOAD', 0) # no DLL
+uconfig.set('U_CHECK_DYLOAD', 0) # no DLL
+uconfig.set('UCONFIG_NO_FILE_IO', 1)
+uconfig.set('UCONFIG_NO_LEGACY_CONVERSION', 1) # turn off file based codepage conversion
+uconfig.set('UCONFIG_NO_NORMALIZATION', 1) # TODO-LDML: may want this
+uconfig.set('UCONFIG_NO_BREAK_ITERATION', 1) # TODO-LDML: may want this
+uconfig.set('UCONFIG_NO_IDNA', 1)
+uconfig.set('UCONFIG_NO_COLLATION', 1)
+uconfig.set('UCONFIG_NO_FORMATTING', 1)
+uconfig.set('UCONFIG_NO_TRANSLITERATION', 1)
+uconfig.set('UCONFIG_NO_REGULAR_EXPRESSIONS', 1) # TODO-LDML: Will probably want this for transforms #7375
+uconfig.set('UCONFIG_NO_SERVICE', 1)
+
+
+uconfig_local = configure_file(
+  configuration : uconfig,
+  # dir : 'source/common/unicode',
+  output : 'uconfig_local.h',
+)
+
+
+if cpp.get_argument_syntax() == 'msvc'
+# TODO-LDML:   cl : Command line error D8016 : '/utf-8' and '/source-charset:utf-8' command-line options are incompatible
+# see note in core/meson.build
+  # add_project_arguments('/utf-8', language: 'cpp')
+  # add_project_arguments('/utf-8', language: 'c')
+endif
+
+# TODO-LDML: skip this check
+# if meson.version().version_compare('>= 0.62')
+#   dl_dep = dependency('dl', required: false)
+#   dl_native_dep = dependency('dl', required: false, native: true)
+# else
+#   dl_dep = cpp.find_library('dl', required: false)
+#   dl_native_dep = cpp_native.find_library('dl', required: false, native: true)
+# endif
+
+windows = import('windows')
+pkg = import('pkgconfig')
+
+# Compiler flags the users of this library must use.
+usage_args = []
+
+if get_option('default_library') == 'static'
+  add_project_arguments('-DU_STATIC_IMPLEMENTATION', language: 'c')
+  add_project_arguments('-DU_STATIC_IMPLEMENTATION', language: 'cpp')
+  usage_args = ['-DU_STATIC_IMPLEMENTATION']
+  if cpp.get_argument_syntax() == 'msvc'
+    library_prefix = ''
+    library_suffix = ''
+  else
+    library_prefix = 's'
+    if get_option('buildtype') == 'debug'
+      library_suffix = 'd'
+    else
+      library_suffix = ''
+    endif
+  endif
+else
+  library_prefix = ''
+  library_suffix = ''
+endif
+
+subdir('source')