From da8c738584a142ca2f34cceed95ff446a97f8d6a Mon Sep 17 00:00:00 2001
From: Diego Nieto Cid <dnietoc@gmail.com>
Date: Mon, 19 Jul 2010 21:26:43 -0300
Subject: Lexer support for keycodes with +/- symbols and arbitrary level
 numbers.

---
 console-client/xkb/lex.l | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'console-client')

diff --git a/console-client/xkb/lex.l b/console-client/xkb/lex.l
index 37b88c3f..6ef9134c 100644
--- a/console-client/xkb/lex.l
+++ b/console-client/xkb/lex.l
@@ -30,7 +30,7 @@
 %option nodebug
 
 %option UNPUT
-KEYCODE		"<"[A-Z][A-Z0-9]*">"
+KEYCODE		"<"[A-Z][-+A-Z0-9]*">"
 DIGIT		[0-9]
 NUM		{DIGIT}{DIGIT}*
 FLOAT		{DIGIT}{DIGIT}*\.{DIGIT}{DIGIT}*
@@ -91,6 +91,7 @@ level1			{ yylval.val = 1; return LEVEL; }
 level2			{ yylval.val = 2; return LEVEL; }
 level3			{ yylval.val = 3; return LEVEL; }
 level4			{ yylval.val = 4; return LEVEL; }
+level[1-9][0-9]*	{ yylval.val = atoi(yytext + 5); return LEVEL; }
 
 			/* Groups.  */
 group1			{ yylval.val = 1; return GROUPNUM; }
-- 
cgit v1.2.3