From 826639fab2b213af1dc5c00d3b1ab5b5187e30fe Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 2 Aug 2022 12:18:18 -0600 Subject: [PATCH] [src] Add test-use-table Fixes https://github.com/harfbuzz/harfbuzz/issues/3758 --- src/Makefile.am | 5 +++++ src/gen-use-table.py | 21 --------------------- src/hb-ot-shaper-use-table.hh | 21 --------------------- src/meson.build | 1 + src/test-use-table.cc | 18 ++++++++++++++++++ 5 files changed, 24 insertions(+), 42 deletions(-) create mode 100644 src/test-use-table.cc diff --git a/src/Makefile.am b/src/Makefile.am index 83cda8f85..1dc938630 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -321,6 +321,7 @@ noinst_PROGRAMS = \ test-ot-glyphname \ test-gpos-size-params \ test-gsub-would-substitute \ + test-use-table \ $(NULL) bin_PROGRAMS = @@ -348,6 +349,10 @@ test_ot_glyphname_SOURCES = test-ot-glyphname.cc test_ot_glyphname_CPPFLAGS = $(HBCFLAGS) test_ot_glyphname_LDADD = libharfbuzz.la $(HBLIBS) +test_use_table_SOURCES = test-use-table.cc +test_use_table_CPPFLAGS = $(HBCFLAGS) +test_use_table_LDADD = libharfbuzz.la $(HBLIBS) + test_gpos_size_params_SOURCES = test-gpos-size-params.cc test_gpos_size_params_CPPFLAGS = $(HBCFLAGS) test_gpos_size_params_LDADD = libharfbuzz.la $(HBLIBS) diff --git a/src/gen-use-table.py b/src/gen-use-table.py index 65afea99f..5e6a3b02f 100755 --- a/src/gen-use-table.py +++ b/src/gen-use-table.py @@ -497,27 +497,6 @@ for k,v in sorted(use_positions.items()): tag = k + suf print ("#undef %s" % tag) print () -print (r""" -#ifdef HB_USE_TABLE_MAIN -int main (int argc, char **argv) -{ - if (argc != 2) - { - for (unsigned u = 0; u < 0x10FFFFu; u++) - printf ("U+%04X %d\n", u, hb_use_get_category (u)); - return 0; - } - - hb_codepoint_t u; - sscanf (argv[1], "%x", &u); - - printf ("%d\n", hb_use_get_category (u)); - - return 0; -} - -#endif -""") print () print ("#endif /* HB_OT_SHAPER_USE_TABLE_HH */") print ("/* == End of generated table == */") diff --git a/src/hb-ot-shaper-use-table.hh b/src/hb-ot-shaper-use-table.hh index e45ea30e6..63614d653 100644 --- a/src/hb-ot-shaper-use-table.hh +++ b/src/hb-ot-shaper-use-table.hh @@ -393,26 +393,5 @@ hb_use_get_category (unsigned u) #undef VMPre -#ifdef HB_USE_TABLE_MAIN -int main (int argc, char **argv) -{ - if (argc != 2) - { - for (unsigned u = 0; u < 0x10FFFFu; u++) - printf ("U+%04X %d\n", u, hb_use_get_category (u)); - return 0; - } - - hb_codepoint_t u; - sscanf (argv[1], "%x", &u); - - printf ("%d\n", hb_use_get_category (u)); - - return 0; -} - -#endif - - #endif /* HB_OT_SHAPER_USE_TABLE_HH */ /* == End of generated table == */ diff --git a/src/meson.build b/src/meson.build index 1f1105cae..cd41f5f4d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -558,6 +558,7 @@ if get_option('tests').enabled() 'test-ot-glyphname': 'test-ot-glyphname.cc', 'test-ot-gpos-size-params': 'test-gpos-size-params.cc', 'test-ot-gsub-would-substitute': 'test-gsub-would-substitute.cc', + 'test-use-table': 'test-use-table.cc', } foreach name, source : noinst_programs executable(name, source, diff --git a/src/test-use-table.cc b/src/test-use-table.cc new file mode 100644 index 000000000..70d2d41f4 --- /dev/null +++ b/src/test-use-table.cc @@ -0,0 +1,18 @@ +#include "hb-ot-shaper-use-table.hh" + +int main (int argc, char **argv) +{ + if (argc != 2) + { + for (unsigned u = 0; u < 0x10FFFFu; u++) + printf ("U+%04X %d\n", u, hb_use_get_category (u)); + return 0; + } + + hb_codepoint_t u; + sscanf (argv[1], "%x", &u); + + printf ("%d\n", hb_use_get_category (u)); + + return 0; +}