Update to error reporting.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>

2 files changed, 21 insertions, 16 deletions

diff --git a/collect_indices.rb b/collect_indices.rb
index 8d981cb..39cf54a 100644
--- a/collect_indices.rb
+++ b/collect_indices.rb
@@ -7,20 +7,22 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    raise(Puppet::ParseError, "Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
+    raise(Puppet::ParseError, "collect_indices(): Wrong number of " +
+      "arguments given (#{arguments.size} for 2)") if arguments.size < 2
 
     array      = arguments.shift
     array_size = array.size
 
     if not array.is_a?(Array)
-      raise(Puppet::ParseError, 'Requires an array to work with')
+      raise(Puppet::ParseError, 'collect_indices(): Requires an array ' +
+        'to work with')
     end
 
     indices = *arguments # Get them all ... Pokemon ...
 
     if not indices or indices.empty?
-      raise(Puppet::ParseError, 'You must provide indices to collect')
+      raise(Puppet::ParseError, 'collect_indices(): You must provide ' +
+        'indices to collect')
     end
 
     indices_list = []
@@ -31,25 +33,27 @@ module Puppet::Parser::Functions
         stop  = m[2].to_i
 
         if start > stop
-          raise(Puppet::ParseError, 'Stop index in given indices range ' +
-            'is smaller than the start index')
+          raise(Puppet::ParseError, 'collect_indices(): Stop index in ' +
+            'given indices range is smaller than the start index')
         elsif stop > array_size - 1 # First element is at index 0 is it not?
-          raise(Puppet::ParseError, 'Stop index in given indices range ' +
-            'exceeds array size')
+          raise(Puppet::ParseError, 'collect_indices(): Stop index in ' +
+            'given indices range exceeds array size')
         end
 
         (start .. stop).each { |i| indices_list << i.to_i }
       else
         # Only positive numbers allowed ...
         if not i.match(/^\d+$/)
-          raise(Puppet::ParseError, 'Unknown format of given index')
+          raise(Puppet::ParseError, 'collect_indices(): Unknown format ' +
+            'of given index')
         end
 
         # In Puppet numbers are often string-encoded ...
         i = i.to_i
 
         if i > array_size - 1 # Same story.  First element is at index 0 ...
-          raise(Puppet::ParseError, 'Given index exceeds array size')
+          raise(Puppet::ParseError, 'collect_indices(): Given index ' +
+            'exceeds array size')
         end
 
         indices_list << i
diff --git a/join.rb b/join.rb
index 4522d23..1d2e55d 100644
--- a/join.rb
+++ b/join.rb
@@ -7,24 +7,25 @@ module Puppet::Parser::Functions
     EOS
   ) do |arguments|
 
-    # Technically we support three arguments but only first two are mandatory ....
-    raise(Puppet::ParseError, "Wrong number of arguments " +
+    # Technically we support three arguments but only first two are mandatory ...
+    raise(Puppet::ParseError, "join(): Wrong number of arguments " +
       "given (#{arguments.size} for 2)") if arguments.size < 2
 
     array = arguments[0]
 
     if not array.is_a?(Array)
-      raise(Puppet::ParseError, 'Requires an array to work with')
+      raise(Puppet::ParseError, 'join(): Requires an array to work with')
     end
 
     suffix = arguments[1]
-    prefix = arguments[2]
+    prefix = arguments[2] if arguments[2]
 
-    raise(Puppet::ParseError, 'You must provide suffix ' +
+    raise(Puppet::ParseError, 'join(): You must provide suffix ' +
       'to join array elements with') if suffix.empty?
 
     if prefix and prefix.empty?
-      raise(Puppet::ParseError, 'You must provide prefix to add to join')
+      raise(Puppet::ParseError, 'join(): You must provide prefix ' +
+        'to add to join')
     end
 
     if prefix and not prefix.empty?