Support for all the various Boolean left arithmetic left and so on subscript and so on

Author: mpourmpoulis

library/info.py

@@ -284,6 +284,13 @@ def get_with_items(root):
 		root.items if match_node(root,ast.With) else None
 	)
 
+#########################################################################
+# stuff for small regions
+#########################################################################
+
+# Extracting things from subscript
+def get_subscript_body(root):
+	return  root.value if match_node(root,ast.Subscript) else None
 
 def get_subscript_key(root):
 	return (
@@ -325,8 +332,66 @@ def get_comparison_middle(root):
 	return root.comparators[0] if match_node(root,ast.Compare) and len(root.comparators)==2 else None
 
 
+# Extract Left Middle and Right from arithmetical operations
+def get_arithmetic_left(root):
+	if not match_node(root,ast.BinOp):
+		return None
+	items = get_sub_index(root,None)
+	if len(items)>=1:
+		return items[0]
+	return None
+
+def get_arithmetic_right(root):
+	if not match_node(root,ast.BinOp):
+		return None
+	items = get_sub_index(root,None)
+	if len(items)>=2:
+		return items[-1]
+	return None
+
+def get_arithmetic_middle(root):
+	if not match_node(root,ast.BinOp):
+		return None
+	items = get_sub_index(root,None)
+	if len(items)==3:
+		return items[1]
+	return None
+
+
+# Extract Left Middle Right from Boolean expressions
+
+def get_boolean_left(root):
+	if not match_node(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):
+		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):
+		return None
+	items = root.values
+	if len(items)==3:
+		return items[1]
+	return None
+
+def get_boolean_and(root):
+	return root if match_node(root,ast.BoolOp) and match_node(root.op,ast.And) else None
+
 
+def get_boolean_or(root):
+	return root if match_node(root,ast.BoolOp) and match_node(root.op,ast.Or) else None
 
+##########################################################################
 # need to revisit this
 def get_body(root):
 	return (

queries/big_roi.py

@@ -109,14 +109,19 @@ def standard(x):
             "set":((ast.Set),(),standard),
             "tuple":((ast.Tuple),(),standard),
             "list":((ast.List),(),standard),
+
+            "subscript":((ast.Subscript),(),standard),
+            "subscript body":((ast.Subscript),(),get_subscript_body),
             "key":((ast.Subscript),(),get_subscript_key),
             "lower":((ast.Slice),(),get_slice_lower),
             "upper":((ast.Slice),(),get_slice_upper),
             "step":((ast.Slice),(),get_slice_step),
+            
             "attribute":((ast.Attribute),(),standard),
             "comparison":((ast.Compare),(),standard),
             "arithmetic":((ast.BinOp),(),standard),
             "boolean":((ast.BoolOp),(),standard),
+
             "container":((ast.Compare),(),get_container_check),
             "member":((ast.Compare),(),get_member_check),
             "membership":((ast.Compare),(),get_membership),
@@ -125,6 +130,17 @@ def standard(x):
             "right side":((ast.Compare),(),get_comparison_right_side),
             "middle":((ast.Compare),(),get_comparison_middle),
 
+            "arithmetic left":((ast.BinOp),(),get_arithmetic_left),
+            "arithmetic right":((ast.BinOp),(),get_arithmetic_right),
+            "arithmetic middle":((ast.BinOp),(),get_arithmetic_middle),
+
+            "boolean left":((ast.BoolOp),(),get_boolean_left),
+            "boolean right":((ast.BoolOp),(),get_boolean_right),
+            "boolean middle":((ast.BoolOp),(),get_boolean_middle),
+
+            "boolean and":((ast.BoolOp),(),get_boolean_and),
+            "boolean or":((ast.BoolOp),(),get_boolean_or),
+
 
 
 		}