summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2013-11-27 13:43:57 +0200
committerRan Benita <ran234@gmail.com>2013-11-27 13:45:15 +0200
commitba7530fa90795e077e685346444ebe3a3c1595ee (patch)
tree84702669ee5c42b79d4539850e01484783d69edb
parent1651e5af465f45f9b6fff7e65ab958425ccda00b (diff)
downloadxorg-lib-libxkbcommon-ba7530fa90795e077e685346444ebe3a3c1595ee.tar.gz
scanner: restore lost DIVIDE token
I don't know how this could have happened. Luckily this token is completely useless. Signed-off-by: Ran Benita <ran234@gmail.com>
-rw-r--r--src/xkbcomp/scanner.c1
-rw-r--r--test/data/keymaps/divide-by-zero.xkb6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/xkbcomp/scanner.c b/src/xkbcomp/scanner.c
index 4e7d70b..591f1f5 100644
--- a/src/xkbcomp/scanner.c
+++ b/src/xkbcomp/scanner.c
@@ -156,6 +156,7 @@ skip_more_whitespace_and_comments:
if (chr(s, '+')) return PLUS;
if (chr(s, '-')) return MINUS;
if (chr(s, '*')) return TIMES;
+ if (chr(s, '/')) return DIVIDE;
if (chr(s, '!')) return EXCLAM;
if (chr(s, '~')) return INVERT;
diff --git a/test/data/keymaps/divide-by-zero.xkb b/test/data/keymaps/divide-by-zero.xkb
index 5ae7d44..9e3417f 100644
--- a/test/data/keymaps/divide-by-zero.xkb
+++ b/test/data/keymaps/divide-by-zero.xkb
@@ -1,6 +1,6 @@
xkb_keymap {
xkb_keycodes {
- <ESC> = 1 / 0;
+ <ESC> = 1;
};
xkb_types {
@@ -9,6 +9,10 @@ xkb_keymap {
xkb_compatibility {
virtual_modifiers NumLock;
+ interpret KP_1+AnyOfOrNone(all) {
+ repeat= True;
+ action= MovePtr(x=(1/0),y=+1);
+ };
};
xkb_symbols {