support of multiple commands on the same line in *.vis file

Author: ingvagabund

HTMLVisualizer.py

@@ -226,37 +226,38 @@ def printPage(self, file, destination):
 				self.ln_subs = {}
 
 				if (index + 1) in self.vis_lines:
-					command = self.vis_lines[index + 1]
-					if command['command'] == 'comment':
-						prefix = ""
-						if len(line) > 0:
-							prefix = 3*" "
-						# put comment at the end of the current line
-						clm = len(oline) + 1
-						self.add2lnSubs(clm, len(command['value']), prefix + command['value'])
-
-					elif command['command'] == 'fold':
-						fold = True
-						fold_start = index + 1
-						fold_end = command['endline']
-						fold_text = self.pretokenize(command['value'])
-						folded = command['folded']
-					elif command['command'] == 'highlight':
-						v_keyword = command['keyword']
-						if v_keyword in self.src_keywords and (index + 1) in self.src_keywords[ v_keyword ]:
-							clm = self.src_keywords[ v_keyword ][ index + 1 ]
-							for clm_item in clm:
-								self.add2lnSubs(clm_item, len(v_keyword), self.highlightBox(v_keyword))
-								comment = self.highlightLabel( self.pretokenize(command['value']) )
-								self.add2lnSubs(len(oline)+1, len(comment), comment)
-					elif command['command'] == 'needinfo':
-						v_keyword = command['keyword']
-						if v_keyword in self.src_keywords and (index + 1) in self.src_keywords[ v_keyword ]:
-                                                        clm = self.src_keywords[ v_keyword ][ index + 1 ]
-                                                        for clm_item in clm:
-								self.add2lnSubs(clm_item, len(v_keyword), self.needinfoBox(v_keyword, command['attrs']))
-								comment = self.needinfoLabel( self.pretokenize(command['value']) )
-								self.add2lnSubs(len(oline)+1, len(comment), comment)
+					commands = self.vis_lines[index + 1]
+					for command in commands:
+						if command['command'] == 'comment':
+							prefix = ""
+							if len(line) > 0:
+								prefix = 3*" "
+							# put comment at the end of the current line
+							clm = len(oline) + 1
+							self.add2lnSubs(clm, len(command['value']), prefix + command['value'])
+
+						elif command['command'] == 'fold':
+							fold = True
+							fold_start = index + 1
+							fold_end = command['endline']
+							fold_text = self.pretokenize(command['value'])
+							folded = command['folded']
+						elif command['command'] == 'highlight':
+							v_keyword = command['keyword']
+							if v_keyword in self.src_keywords and (index + 1) in self.src_keywords[ v_keyword ]:
+								clm = self.src_keywords[ v_keyword ][ index + 1 ]
+								for clm_item in clm:
+									self.add2lnSubs(clm_item, len(v_keyword), self.highlightBox(v_keyword))
+									comment = self.highlightLabel( self.pretokenize(command['value']) )
+									self.add2lnSubs(len(oline)+1, len(comment), comment)
+						elif command['command'] == 'needinfo':
+							v_keyword = command['keyword']
+							if v_keyword in self.src_keywords and (index + 1) in self.src_keywords[ v_keyword ]:
+	                                                        clm = self.src_keywords[ v_keyword ][ index + 1 ]
+	                                                        for clm_item in clm:
+									self.add2lnSubs(clm_item, len(v_keyword), self.needinfoBox(v_keyword, command['attrs']))
+									comment = self.needinfoLabel( self.pretokenize(command['value']) )
+									self.add2lnSubs(len(oline)+1, len(comment), comment)
 
 				for keyword in self.keyworddb:
 					if keyword in line:

VisualizationParser.py

@@ -4,14 +4,20 @@ class VisualizationParser(object):
 
 	def __init__(self, file):
 		self.file = file
+		self.lines = {}
 		self.parse()
 
+	def addCommand(self, line_number, command):
+		if line_number not in self.lines:
+			self.lines[line_number] = [command]
+		else:
+			self.lines[line_number].append(command)
+
 	def parse(self):
 		vis_content = ""
 		with open(self.file, "r") as file:
         		vis_content = file.read()
 
-		self.lines = {}
 		line_counter = 0
 		for line in vis_content.split("\n"):
 			line_counter = line_counter + 1
@@ -36,12 +42,15 @@ def parse(self):
 					sys.stderr.write("line %s: '%s' not recognized, wrong format" % (line_counter, line))
 	                                continue
 
-				self.lines[ int(items[0]) ] = {'command': items[1], 'endline': int(items[2]), 'folded': int(items[3]), 'value': ":".join(items[4:])}
+				self.addCommand(int(items[0]), {'command': items[1], 'endline': int(items[2]), 'folded': int(items[3]), 'value': ":".join(items[4:])})
+				#self.lines[ int(items[0]) ] = {'command': items[1], 'endline': int(items[2]), 'folded': int(items[3]), 'value': ":".join(items[4:])}
 			elif command == 'highlight':
 				if len(items) < 3:
 					sys.stderr.write("line %s: '%s' not recognized, wrong format" % (line_counter, line))
                                         continue
-				self.lines[ int(items[0]) ] = {'command': items[1], 'keyword': items[2], 'value': items[3:][0]}
+
+				self.addCommand(int(items[0]), {'command': items[1], 'keyword': items[2], 'value': items[3:][0]})
+				#self.lines[ int(items[0]) ] = {'command': items[1], 'keyword': items[2], 'value': items[3:][0]}
 			elif command.startswith('needinfo', 0, 8):
 				if len(items) < 3:
 					sys.stderr.write("line %s: '%s' not recognized, wrong format" % (line_counter, line))
@@ -60,9 +69,11 @@ def parse(self):
 
 						attrs_db[ pair[0] ] = pair[1]
 
-				self.lines[ int(items[0]) ] = {'command': 'needinfo', 'keyword': items[2], 'value': items[3:][0], 'attrs': attrs_db }
+				self.addCommand( int(items[0]), {'command': 'needinfo', 'keyword': items[2], 'value': items[3:][0], 'attrs': attrs_db } )
+				#self.lines[ int(items[0]) ] = {'command': 'needinfo', 'keyword': items[2], 'value': items[3:][0], 'attrs': attrs_db }
 			else:	
-				self.lines[ int(items[0]) ] = {'command': items[1], 'value': "// " + ":".join(items[2:])}
+				self.addCommand( int(items[0]), {'command': items[1], 'value': "// " + ":".join(items[2:])} )
+				#self.lines[ int(items[0]) ] = {'command': items[1], 'value': "// " + ":".join(items[2:])}
 
 	def getCommands(self):
 		return self.lines