Initial support for using color as positional description argument queries

Addresses #48

SelectionQuery had to be modified In order to pass "index" as an extra When handling multiple inputs. These may have to change in the future as it may not be enough

Author: mpourmpoulis

CHANGELOG.md

@@ -11,8 +11,16 @@
 
 - add cut action
 
+- Support for using negative indices to pick up arguments from the end of the function call
+
+- Queries of the form `<color> argument 2`
+
 ### Code related
 
+#### Changed
+
+- The default implementation for handling selection queries that do not define handle_multiple, now sets in the extra dictionary not only "selection" but"index" as well
+
 ## [0.1.3]
 
 Various stability issues resolved

queries/abstract/selection_query.py

@@ -67,9 +67,10 @@ def __call__(self,view_information,query_description,extra = {}):
 					return None,None
 				self.result = []
 				self.alternatives = []
-				for s in selection:
+				for i,s in enumerate(selection):
 					temporary_extra = deepcopy(extra)
 					temporary_extra["selection"] = s
+					temporary_extra["index"] = i
 					r,a = self.handle_single(view_information,query_description,temporary_extra)
 					if not isinstance(r,list):
 						r =[r]

queries/argument.py

@@ -10,13 +10,17 @@
 from PythonVoiceCodingPlugin.library.LCA import LCA
 from PythonVoiceCodingPlugin.library.level_info import LevelVisitor
 from PythonVoiceCodingPlugin.library.partial import partially_parse, line_partial
-from PythonVoiceCodingPlugin.library.traverse import search_upwards,search_upwards_log, find_matching,match_node, find_all_nodes,search_upwards_for_parent
+from PythonVoiceCodingPlugin.library.traverse import (
+	search_upwards,search_upwards_log, find_matching,match_node, find_all_nodes,search_upwards_for_parent
+)
 
 from PythonVoiceCodingPlugin.queries.abstract import SelectionQuery
 from PythonVoiceCodingPlugin.queries.tiebreak import tiebreak_on_lca,tiebreak_on_visual
-from PythonVoiceCodingPlugin.queries.strategies import adjective_strategy,decode_abstract_vertical,translate_adjective,obtain_result
+from PythonVoiceCodingPlugin.queries.strategies import (
+	adjective_strategy,decode_abstract_vertical,translate_adjective,obtain_result,
+	decode_item_selection,result_alternatives_sequence
+)
 
-# 
 # a lot of this code needs rewriting at some point
 # it is a mess indeed but it works, mostly :)
 #
@@ -175,7 +179,8 @@ def process_line(self,q, root ,atok, origin  = None, select_node = None,tiebreak
 	def handle_single(self,view_information,query_description,extra = {}):
 		f = query_description["format"]
 		possibilities = {
-			1: self.case_one,2: self.case_two,3: self.case_three,4: self.case_four,5:self.case_five,
+			1: self.case_one,2: self.case_two,3: self.case_three,
+			4: self.case_four,5:self.case_five,6:self.case_six
 		}
 		return  possibilities[f](view_information,query_description, extra)
 
@@ -409,4 +414,35 @@ def case_five(self,view_information,query_description, extra = {}):
 		return self._backward_result(result, alternatives,build)
 
 
+	def case_six(self,view_information,query_description, extra = {}):
+		################################################################	
+		#		<adjective> argument <argument_index> 
+		###############################################################	
+		state = extra["state"]
+		index = extra.get("index",0)
+		candidates = result_alternatives_sequence(state,location=True)
+		if state["mode"]=="single":
+			colorful_region = decode_item_selection(candidates,query_description,"individual","color",decrement=False)
+		else:
+			colorful_region = decode_item_selection(candidates[index],query_description,"individual","color",decrement=False)
+		selection = colorful_region[0]
 
+		build = self.general_build if self.general_build else line_partial(self.code,selection[0])
+		if not build  or not build[0] :
+			return None,None
+		root,atok,m,r  = build
+		selection = m.forward(selection)
+		
+		
+		origin = nearest_node_from_offset(root,atok, selection[0]) if selection[0]==selection[1] else node_from_range(root,atok, selection)
+		statement_node = self.get_statement(origin,atok)
+		result, alternatives = self.process_line(
+			q = query_description,
+			root = statement_node,
+			atok = atok,
+			origin = origin,
+			select_node = origin if selection[0]!=selection[1] else None,
+			tiebreaker = lambda x: tiebreak_on_lca(statement_node,origin,x),
+			constrained_space = selection
+		)
+		return self._backward_result(result, alternatives,build)