composetable: Keep the number of sequences

And print it out in tests.

Update all tests for this.

diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
index eb1ceeeca14dcb81c0728e8b5237f1b09fbd4fbd..39ca2e3e9255544dedef33d41613e87e533d1fbc 100644 (file)
--- a/gtk/gtkcomposetable.c
+++ b/gtk/gtkcomposetable.c
@@ -879,6 +879,7 @@ parser_get_compose_table (GtkComposeParser *parser)
   int first_pos;
   int rest_pos;
   int index_rowstride;
+  int n_sequences;
   gunichar current_first;
 
   parser_remove_duplicates (parser);
@@ -899,6 +900,7 @@ parser_get_compose_table (GtkComposeParser *parser)
 
   char_data = g_string_new ("");
 
+  n_sequences = 0;
   current_first = 0;
   first_pos = 0;
   rest_pos = n_first * index_rowstride;
@@ -958,6 +960,8 @@ parser_get_compose_table (GtkComposeParser *parser)
       g_assert (encoded_value != 0);
       data[rest_pos + len - 1] = encoded_value;
 
+      n_sequences++;
+
       rest_pos += len;
 
       for (i = len; i <= max_compose_len; i++)
@@ -980,6 +984,7 @@ parser_get_compose_table (GtkComposeParser *parser)
   table->n_index_size = n_first;
   table->n_chars = char_data->len;
   table->char_data = g_string_free (char_data, FALSE);
+  table->n_sequences = n_sequences;
   table->id = g_str_hash (parser->compose_file);
 
   g_list_free (sequences);

diff --git a/gtk/gtkcomposetable.h b/gtk/gtkcomposetable.h
index 0e6c1aec9cc8d4ff8d2b7ba7454428bc92f61e7f..7a4c952f335bac307abad7691c20ccc2585558a0 100644 (file)
--- a/gtk/gtkcomposetable.h
+++ b/gtk/gtkcomposetable.h
@@ -53,6 +53,7 @@ struct _GtkComposeTable
   int n_index_size;
   int data_size;
   int n_chars;
+  int n_sequences;
   guint32 id;
 };
 

diff --git a/testsuite/gtk/compose/basic.expected b/testsuite/gtk/compose/basic.expected
index 96e2f4e0e36e2d7a50a8984661c50a56bb2a0bc3..465a4e37f8a148e90af29c0df8b432899c4cf289 100644 (file)
--- a/testsuite/gtk/compose/basic.expected
+++ b/testsuite/gtk/compose/basic.expected
@@ -1,3 +1,4 @@
+# n_sequences: 1
 # max_seq_len: 4
 # n_index_size: 1
 # data_size: 9

diff --git a/testsuite/gtk/compose/codepoint.expected b/testsuite/gtk/compose/codepoint.expected
index 295e71882fd6390943429e44abc9ec19b613ed86..c1d11e791ef441e0dda73985b6f7b10549a933b5 100644 (file)
--- a/testsuite/gtk/compose/codepoint.expected
+++ b/testsuite/gtk/compose/codepoint.expected
@@ -1,3 +1,4 @@
+# n_sequences: 1
 # max_seq_len: 4
 # n_index_size: 1
 # data_size: 9

diff --git a/testsuite/gtk/compose/comments.expected b/testsuite/gtk/compose/comments.expected
index 683486e499c120fee7361b4e48ccf0ef6d82f48b..891c490a1a537e6dfea8106b4f1549ee7531669f 100644 (file)
--- a/testsuite/gtk/compose/comments.expected
+++ b/testsuite/gtk/compose/comments.expected
@@ -1,3 +1,4 @@
+# n_sequences: 3
 # max_seq_len: 2
 # n_index_size: 1
 # data_size: 9

diff --git a/testsuite/gtk/compose/hex.expected b/testsuite/gtk/compose/hex.expected
index f753c5968863082e6d2970d4dd78309f31b6dd15..7d2d26af9849225208c7bc0ecbe09d37277a8ee2 100644 (file)
--- a/testsuite/gtk/compose/hex.expected
+++ b/testsuite/gtk/compose/hex.expected
@@ -1,3 +1,4 @@
+# n_sequences: 1
 # max_seq_len: 4
 # n_index_size: 1
 # data_size: 9

diff --git a/testsuite/gtk/compose/include.expected b/testsuite/gtk/compose/include.expected
index bb0bd50a9c2614fb9ba9474e13e390e29e41e642..8307b1c594d7214fe68724704301da868e8e09f5 100644 (file)
--- a/testsuite/gtk/compose/include.expected
+++ b/testsuite/gtk/compose/include.expected
@@ -1,3 +1,4 @@
+# n_sequences: 1
 # max_seq_len: 4
 # n_index_size: 1
 # data_size: 9

diff --git a/testsuite/gtk/compose/long.expected b/testsuite/gtk/compose/long.expected
index e50a95d39a629999bbe1b13f7382d99b3c29cdcf..0846c7f6e94d8477533b915a29b4e480d1522273 100644 (file)
--- a/testsuite/gtk/compose/long.expected
+++ b/testsuite/gtk/compose/long.expected
@@ -1,3 +1,4 @@
+# n_sequences: 1
 # max_seq_len: 11
 # n_index_size: 1
 # data_size: 23

diff --git a/testsuite/gtk/compose/match.expected b/testsuite/gtk/compose/match.expected
index 6a2deaa72465b131bec4af81dd5d225878889c5f..bed10c5a102d032822fa2f120e3efc07b070b610 100644 (file)
--- a/testsuite/gtk/compose/match.expected
+++ b/testsuite/gtk/compose/match.expected
@@ -1,7 +1,8 @@
+# n_sequences: 3
 # max_seq_len: 7
 # n_index_size: 1
 # data_size: 24
-# n_chars: 4
+# n_chars: 5
 <Uff20> <U73> <U65> <U71> : "!" # U21
 <Uff20> <U73> <U65> <U71> <U75> : "?" # U3f
-<Uff20> <U7a> <U77> <U69> <U6e> <U65> <U73> : "🥂"
+<Uff20> <U7a> <U77> <U69> <U6e> <U65> <U73> : "🥂" # U1f942

diff --git a/testsuite/gtk/compose/multi.expected b/testsuite/gtk/compose/multi.expected
index 72a9fbe92d05fe5b6ac58d6cb7767e1a4fc7500a..078f21f441b65fd7bf30a2985360c957fa5f3ff5 100644 (file)
--- a/testsuite/gtk/compose/multi.expected
+++ b/testsuite/gtk/compose/multi.expected
@@ -1,3 +1,4 @@
+# n_sequences: 3
 # max_seq_len: 5
 # n_index_size: 1
 # data_size: 19

diff --git a/testsuite/gtk/compose/octal.expected b/testsuite/gtk/compose/octal.expected
index 96e2f4e0e36e2d7a50a8984661c50a56bb2a0bc3..465a4e37f8a148e90af29c0df8b432899c4cf289 100644 (file)
--- a/testsuite/gtk/compose/octal.expected
+++ b/testsuite/gtk/compose/octal.expected
@@ -1,3 +1,4 @@
+# n_sequences: 1
 # max_seq_len: 4
 # n_index_size: 1
 # data_size: 9

diff --git a/testsuite/gtk/compose/strings.expected b/testsuite/gtk/compose/strings.expected
index 4eff96267a1c5ded0fef1028febe26540515e181..84f13c765bb9a1d5539175dc410631ca8a8cd179 100644 (file)
--- a/testsuite/gtk/compose/strings.expected
+++ b/testsuite/gtk/compose/strings.expected
@@ -1,3 +1,4 @@
+# n_sequences: 4
 # max_seq_len: 5
 # n_index_size: 1
 # data_size: 24

diff --git a/testsuite/gtk/compose/system.expected b/testsuite/gtk/compose/system.expected
index 04902d2c76bf1db07c9e102879d80eb468b8a0b1..aac5ac82eae9597d71e1812fd8d420401b4e3b62 100644 (file)
--- a/testsuite/gtk/compose/system.expected
+++ b/testsuite/gtk/compose/system.expected
@@ -1,3 +1,4 @@
+# n_sequences: 4909
 # max_seq_len: 5
 # n_index_size: 30
 # data_size: 16521

diff --git a/testsuite/gtk/composetable.c b/testsuite/gtk/composetable.c
index ca5a5c0eea9df38e8db19ad235dab7bac67f0e40..9c3a4a61424273b3f818b21b6c0716feae1db6c0 100644 (file)
--- a/testsuite/gtk/composetable.c
+++ b/testsuite/gtk/composetable.c
@@ -66,7 +66,8 @@ gtk_compose_table_print (GtkComposeTable *table)
 
   str = g_string_new ("");
 
-  g_string_append_printf (str, "# max_seq_len: %d\n# n_index_size: %d\n# data_size: %d\n# n_chars: %d\n",
+  g_string_append_printf (str, "# n_sequences: %d\n# max_seq_len: %d\n# n_index_size: %d\n# data_size: %d\n# n_chars: %d\n",
+                          table->n_sequences,
                           table->max_seq_len,
                           table->n_index_size,
                           table->data_size,