Improve the string functionality

Author: BlankCanvasStudio

bashparser/ast.py

@@ -38,35 +38,46 @@ def apply_fn(node):
             if node.kind in self.passable_nodes: return CONT
             elif node.kind == 'operator': word = node.op
             elif node.kind == 'pipe': word = node.pipe
-            elif node.kind == 'redirect': word = node.type + ' '
+            elif node.kind == 'redirect': 
+                if type(node.input) == bashlex.ast.node:
+                    word += str(NodeVisitor(node.input))
+                elif node.input is not None: 
+                    word += str(node.input)
+                word += str(node.type)
+                if type(node.output) == bashlex.ast.node:
+                    word += str(NodeVisitor(node.output))
+                elif node.output is not None:
+                    word += str(node.output)
+                self._string = self._string + ' ' + word
+                return DONT_DESCEND
             elif node.kind == 'compound':
                 for part in node.list:
-                    word += str(NodeVisitor(part)) + ' '
+                    word += ' ' + str(NodeVisitor(part))
                 if hasattr(node, 'redirects'):
                     for part in node.redirects:
-                        word += str(NodeVisitor(part)) + ' '
-                self._string = self._string + word + ' '
+                        word += ' ' + str(NodeVisitor(part))
+                self._string = self._string + ' ' + word
                 return DONT_DESCEND
             elif node.kind == 'commandsubstitution': 
                 word = '$('
                 cmd = node.command
                 for part in cmd.parts:
                     word += str(NodeVisitor(part)) + ' '
                 word = word[:-1] + ')'
-                self._string = self._string + word + ' '
+                self._string = self._string + ' ' + word
                 return DONT_DESCEND
 
             elif hasattr(node, 'word'): 
                 word = node.word
-                self._string = self._string + word + ' '
+                self._string = self._string + ' ' + word
                 return DONT_DESCEND 
             else: 
                 raise ValueError('Error! Unsupported node kind encountered when converting NodeVisitor to string: ', node.kind)
-            self._string = self._string + word + ' '
+            self._string = self._string + ' ' + word
             return CONT
 
         self.apply(apply_fn)
-        return self._string[:-1]     # remove trailing space cause wrong
+        return self._string.strip() # remove surrounding spaces cause wrong
 
 
     def __type__(self):
@@ -243,8 +254,10 @@ def children(self, root = None):
         elif k == 'redirect':
             if isinstance(root.output, bashlex.ast.node):
                 return [ root.output ]
-            if root.heredoc:
+            elif root.heredoc:
                 return [ root.heredoc[child_num] ]
+            else:
+                return []
         elif hasattr(root, 'list'):
             return root.list
         else:

bashparser/test/test_ast.py

@@ -38,9 +38,14 @@ def test_str(self):
 		rebuilt_commands = str(NodeVisitor(nodes[0]))
 		expected_result = "for a in $n do wget that ; cd there ; mv here ; a=b ; done"
 		self.assertTrue(rebuilt_commands == expected_result)
-
 		self.assertTrue(str(NodeVisitor(None)) == '')
-
+		"""
+		node_string = 'history -n >/dev/null 2>&1'
+		node = bashlex.parse(node_string)[0]
+		rebuilt_command = str(NodeVisitor(node))
+		expected_result = 'history -n >/dev/null 2>&1'
+		self.assertTrue(rebuilt_command == expected_result)
+		"""
 
 	def test_apply(self):
 		# Build ast to test apply on