[Modeling-cvs] ProjectModeling/Modeling QualifierParser.py,1.14,1.15

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26503/Modeling

Modified Files:
	QualifierParser.py 
Log Message:
Fixed bug #938096: QualifierParser fails when an attribute's name begins w/ a keyword, such as AND, OR (e.g. attribute 'origin'), etc.


Index: QualifierParser.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/QualifierParser.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** QualifierParser.py	22 Mar 2004 20:30:28 -0000	1.14
--- QualifierParser.py	22 May 2004 10:56:45 -0000	1.15
***************
*** 174,185 ****
        
    def t_operator(self, s):
!     r' AND | and | OR | or '
      trace('Token Operator: %s',s)
!     self.rv.append(Token(type=s.upper()))
        
    def t_not_operator(self, s):
!     r' NOT | not '
      trace('Token NOT: %s',s)
!     self.rv.append(Token(type=s.upper()))
        
    def t_comp_op(self, s):
--- 174,189 ----
        
    def t_operator(self, s):
!     r' AND[ (] | and[ (] | OR[ (] | or[ (] '
      trace('Token Operator: %s',s)
!     self.rv.append(Token(type=s[:-1].upper()))
!     if s[-1]=='(':
!       self.t_paren_open(s[-1])
        
    def t_not_operator(self, s):
!     r' NOT[ (]  | not[ (] '
      trace('Token NOT: %s',s)
!     self.rv.append(Token(type=s[:-1].upper()))
!     if s[-1]=='(':
!       self.t_paren_open(s[-1])
        
    def t_comp_op(self, s):
***************
*** 189,196 ****
        
    def t_comp_op2(self, s):
!     r' in | IN '
      trace('Token COMP_OP2: %s',s)
!     self.rv.append(Token(type=s.lower()))
!       
    def t_number(self, s):
      r' \d+ '
--- 193,202 ----
        
    def t_comp_op2(self, s):
!     r' in[ [] | IN[ [] '
      trace('Token COMP_OP2: %s',s)
!     self.rv.append(Token(type=s[:-1].lower()))
!     if s[-1]=='[':
!       self.t_square_bracket_open(s[-1])
! 
    def t_number(self, s):
      r' \d+ '