summaryrefslogtreecommitdiff
path: root/testsuite/gtk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-07-07 15:54:05 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-07-13 22:02:33 -0400
commit45d39c2802eb682e95cdf25ca0094a29ef150814 (patch)
treeb2d02bed293a21ce7e67babfae88d7eac21aa1e4 /testsuite/gtk
parent3b4b1c68781aad61fc6b91c9dff75b5790b4d8e4 (diff)
downloadgtk+-45d39c2802eb682e95cdf25ca0094a29ef150814.tar.gz
composetable: Switch to using a hash table
This lets us naturally replace matching sequences while parsing. That means that the semantics are now "last one wins" if the parser sees multiple entries for the same sequence. Add a testcase that checks the new replacement semantics.
Diffstat (limited to 'testsuite/gtk')
-rw-r--r--testsuite/gtk/compose/include2
-rw-r--r--testsuite/gtk/compose/include.expected5
-rw-r--r--testsuite/gtk/compose/included2
3 files changed, 4 insertions, 5 deletions
diff --git a/testsuite/gtk/compose/include b/testsuite/gtk/compose/include
index a4769355a4..10abadf446 100644
--- a/testsuite/gtk/compose/include
+++ b/testsuite/gtk/compose/include
@@ -1,3 +1,3 @@
include "testsuite/gtk/compose/included" # see if this works
-<Multi_key> <s> <e> <q> : "!"
+<Multi_key> <s> <s> <s> : "!"
diff --git a/testsuite/gtk/compose/include.expected b/testsuite/gtk/compose/include.expected
index 10fbc4418c..b2145d544b 100644
--- a/testsuite/gtk/compose/include.expected
+++ b/testsuite/gtk/compose/include.expected
@@ -1,4 +1,3 @@
-# n_seqs: 2
+# n_seqs: 1
# max_seq_len: 4
-<Uff20> <U73> <U61> <U73> : "\"\\"
-<Uff20> <U73> <U65> <U71> : "!" # U21
+<Uff20> <U73> <U73> <U73> : "!" # U21
diff --git a/testsuite/gtk/compose/included b/testsuite/gtk/compose/included
index 0d29359189..d5d3a68adc 100644
--- a/testsuite/gtk/compose/included
+++ b/testsuite/gtk/compose/included
@@ -1 +1 @@
-<Multi_key> <s> <a> <s> : "\"\\"
+<Multi_key> <s> <s> <s> : "XO"