Tarantula updated

listTupleLogic.py

@@ -0,0 +1,26 @@
+class listTupleLogic:
+
+	def __init__(self):
+		self.lists = {}
+		self.tuples = {}
+		self.startList = []
+		self.startTuple = []
+
+	def pushList(self, index):
+		self.startList.append(index)
+
+
+	def popList(self, index):
+		i = self.startList[len(self.startList)-1]
+		self.lists[i] = index
+		del self.startList[-1]
+
+
+	def pushTuple(self, index):
+		self.startTuple.append(index)
+
+
+	def popTuple(self, index):
+		i = self.startTuple[len(self.startTuple)-1]
+		self.tuples[i] = index
+		del self.startTuple[-1]

parseArg.py

@@ -0,0 +1,68 @@
+# How would I handle an input casewith list, tuple as input
+import ast
+from listTupleLogic import listTupleLogic
+
+
+def appendArg(slice, collection, index, arguments):
+
+
+	if index >= len(slice):
+		return
+
+	if slice[index] == '[':
+		temp = collection.lists[index] # gives me index of ending parenthesis
+		result = ast.literal_eval(slice[index:temp+1]) # converts into a list
+		arguments.append(result)
+		index = temp + 2
+		return appendArg(slice, collection, index, arguments)
+
+	elif slice[index] == '(':
+		temp = collection.tuples[index]
+		result = ast.literal_eval(slice[index:temp+1])
+		arguments.append(result)
+		index = temp + 2
+		return appendArg(slice, collection, index, arguments)
+
+	else:
+		i = slice.find(',', index)
+		if i is not -1:
+			result = ast.literal_eval(slice[index:i])
+			index = i+1
+			arguments.append(result)
+			return appendArg(slice, collection, index, arguments)
+		else:
+			result = ast.literal_eval(slice[index:])
+			arguments.append(result)
+			return
+
+
+
+
+def logic(str): 
+	text = "".join(str.split())
+	reg = listTupleLogic()
+
+	for i in range(len(text)):
+		if text[i] == '[':
+			reg.pushList(i)
+
+		elif text[i] == ']':
+			reg.popList(i)
+
+		elif text[i] == '(':
+			reg.pushTuple(i)
+
+		elif text[i] == ')':
+			reg.popTuple(i)
+
+
+	return [reg, text]
+
+
+
+
+def getArgs(str):
+	[a, text] = logic(str)
+	arguments = []
+	appendArg(text,a,0, arguments)
+	return arguments

tarantula.py

@@ -5,6 +5,7 @@
 import linecache
 import os
 from optparse import OptionParser
+from parseArg import getArgs
 
 class Line:
 	def __init__(self, score=0.0, rank=0, text= "", lineNo=0):
@@ -49,7 +50,9 @@ def importResultsFile():
 			line = file.readline()
 			# print line
 			try:
-				numbers = tuple([int(num) for num in line.split(',')])
+				numbers = tuple(getArgs(line))
+				if numbers == ():
+					break
 				tests.append(numbers)
 			except ValueError:
 				break