CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug in tokenizer

Browse Source 
It would not work with relations named like "l3"
This commit is contained in:
Salvo 'LtWorf' Tomaselli 2015-09-09 16:48:17 +02:00
parent ab46ad2a54
commit 5f3564a398
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
relational/parser.py
View File

@ -342,7 +342,7 @@ def tokenize(expression):
# Removes the entire parentesis and content from the expression # Removes the entire parentesis and content from the expression
expression = expression[end + 1:].strip() expression = expression[end + 1:].strip()
elif expression.startswith((SELECTION, RENAME, PROJECTION)): # Unary 2 bytes elif expression.startswith((SELECTION, RENAME, PROJECTION)): # Unary operators
items.append(expression[0:1]) items.append(expression[0:1])
# Adding operator in the top of the list # Adding operator in the top of the list
expression = expression[ expression = expression[
@ -362,9 +362,6 @@ def tokenize(expression):
items.append(expression[0]) items.append(expression[0])
expression = expression[1:].strip() # 1 char from the expression expression = expression[1:].strip() # 1 char from the expression
state = 4 state = 4
elif re.match(rtypes.RELATION_NAME_REGEXP, expression[0]) == None: # At this point we only have relation names, so we raise errors for anything else
raise TokenizerException(
"Unexpected '%c' in '%s'" % (expression[0], expression))
else: # Relation (hopefully) else: # Relation (hopefully)
if state == 1: # Previous was a relation, appending to the last token if state == 1: # Previous was a relation, appending to the last token
i = items.pop() i = items.pop()