# HG changeset patch # User Sylvain Thénault <sylvain.thenault@logilab.fr> # Date 1269871542 -7200 # Mon Mar 29 16:05:42 2010 +0200 # Branch stable # Node ID 53d60b57e69aabbdc2f81caf1bed395535d212cb # Parent 4782681bd56bfffae63a52f386bdf238733cfced grammar: relation types may start by an underscore (_) diff --git a/parser.g b/parser.g --- a/parser.g +++ b/parser.g @@ -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+' diff --git a/parser.py b/parser.py --- a/parser.py +++ b/parser.py @@ -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+')),