Flatten out arithmetical and boolean operations

Author: mpourmpoulis

library/info.py

@@ -365,25 +365,30 @@ def get_arithmetic_middle(root):
 
 
 # Extract Left Middle Right from Boolean expressions
+def get_boolean(root):
+	if not match_node(root,ast.BoolOp)  or match_parent(root,ast.BoolOp):
+		return None
+	return root
+
 
 def get_boolean_left(root):
-	if not match_node(root,ast.BoolOp):
+	if not match_node(root,ast.BoolOp)  or match_parent(root,ast.BoolOp):
 		return None
 	items = root.values
 	if len(items)>=1:
 		return items[0]
 	return None
 
 def get_boolean_right(root):
-	if not match_node(root,ast.BoolOp):
+	if not match_node(root,ast.BoolOp)  or match_parent(root,ast.BoolOp):
 		return None
 	items = root.values
 	if len(items)>=2:
 		return items[-1]
 	return None
 
 def get_boolean_middle(root):
-	if not match_node(root,ast.BoolOp):
+	if not match_node(root,ast.BoolOp)  or match_parent(root,ast.BoolOp):
 		return None
 	items = root.values
 	if len(items)==3:

queries/big_roi.py

@@ -120,7 +120,7 @@ def standard(x):
             "attribute":((ast.Attribute),(),standard),
             "comparison":((ast.Compare),(),standard),
             "arithmetic":((ast.BinOp),(),get_arithmetic),
-            "boolean":((ast.BoolOp),(),standard),
+            "boolean":((ast.BoolOp),(),get_boolean),
 
             "container":((ast.Compare),(),get_container_check),
             "member":((ast.Compare),(),get_member_check),