Merging the code over from the oscar branch. I will now be doing all development in the trunk again, except for larger changes, which will still get their own branch. This is a merge of the changes from revision 1826 to revision 1834.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1835 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 3 insertions, 10 deletions

diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra
index 6fcc4b1d7..aea9b404d 100644
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@ -487,16 +487,9 @@ import: IMPORT quotedtext {
                 )
                 next
             end
-            # push the results into the main result array
-            # We always return an array when we parse.
-            ast = parser.parse
-
-            # Things that just get added to the classtable or whatever return nil
-            if ast
-                ast.each do |child|
-                    result.push child
-                end
-            end
+
+            # This will normally add code to the 'main' class.
+            parser.parse
         }
     }
 }