Commit 03628f3a authored by Vladislav Perepelkin's avatar Vladislav Perepelkin
Browse files

Merge branch 'ops' into 'master'

Resolve "Не поддерживается несколько операций && или || в выражении"

Closes #14

See merge request luna/lo3!31
parents b6648bde 749b15c7
......@@ -246,7 +246,7 @@ def expr_type(x, scope):
return res['type']
else:
return 'value'
elif x['type'] in ['<', '<=', '==', '!=', '>=', '>']:
elif x['type'] in ['<', '<=', '==', '!=', '>=', '>', '&&', '||']:
return 'int'
else:
R(x, x['type'])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment