--- a/debian/changelog	Tue Apr 20 11:14:07 2010 +0200
+++ b/debian/changelog	Tue Apr 20 11:14:31 2010 +0200
@@ -10,6 +10,12 @@
 
  -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Tue, 16 Mar 2010 13:41:03 +0100
 
+rql (0.24.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Thu, 04 Mar 2010 12:08:01 +0100
+
 rql (0.24.0-1) unstable; urgency=low
 
   * new upstream release

--- a/parser.g	Tue Apr 20 11:14:07 2010 +0200
+++ b/parser.g	Tue Apr 20 11:14:31 2010 +0200
@@ -92,7 +92,7 @@
     token ADD_OP:      r'\+|-'
     token MUL_OP:      r'\*|/'
     token FUNCTION:    r'[A-Za-z_]+\s*(?=\()'
-    token R_TYPE:      r'[a-z][a-z0-9_]*'
+    token R_TYPE:      r'[a-z_][a-z0-9_]*'
     token E_TYPE:      r'[A-Z][A-Za-z0-9]*[a-z]+[0-9]*'
     token VARIABLE:    r'[A-Z][A-Z0-9_]*'
     token COLALIAS:    r'[A-Z][A-Z0-9_]*\.\d+'

--- a/parser.py	Tue Apr 20 11:14:07 2010 +0200
+++ b/parser.py	Tue Apr 20 11:14:31 2010 +0200
@@ -98,7 +98,7 @@
         ('ADD_OP', re.compile('\\+|-')),
         ('MUL_OP', re.compile('\\*|/')),
         ('FUNCTION', re.compile('[A-Za-z_]+\\s*(?=\\()')),
-        ('R_TYPE', re.compile('[a-z][a-z0-9_]*')),
+        ('R_TYPE', re.compile('[a-z_][a-z0-9_]*')),
         ('E_TYPE', re.compile('[A-Z][A-Za-z0-9]*[a-z]+[0-9]*')),
         ('VARIABLE', re.compile('[A-Z][A-Z0-9_]*')),
         ('COLALIAS', re.compile('[A-Z][A-Z0-9_]*\\.\\d+')),