# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1318273728 14400
# Node ID d590d9df5596caef2b1d74f7bcc3f52ecc98cadd
# Parent  583940a28bfd1cd6ce3dec5a6f06de8ff8ea02a8
regexprep: only return cell array if first arg is cell array

* regexp.cc (Fregexprep): Only return cell array if first argument
is originally a cell array.

diff -r 583940a28bfd -r d590d9df5596 src/DLD-FUNCTIONS/regexp.cc
--- a/src/DLD-FUNCTIONS/regexp.cc	Mon Oct 10 15:01:56 2011 -0400
+++ b/src/DLD-FUNCTIONS/regexp.cc	Mon Oct 10 15:08:48 2011 -0400
@@ -1703,7 +1703,8 @@
             }
 
           if (!error_state)
-            retval = octave_value (ret);
+            retval = args(0).is_cell ()
+              ? octave_value (ret) : octave_value (ret(0));
         }
     }
   else
@@ -1759,7 +1760,7 @@
 %!assert(regexprep("abc","(b)","$1.."),"ab..c");
 
 ## Test cell array arguments
-%!assert(regexprep("abc",{"b","a"},"?"),{"??c"})
+%!assert(regexprep("abc",{"b","a"},"?"),"??c")
 %!assert(regexprep({"abc","cba"},"b","?"),{"a?c","c?a"})
 %!assert(regexprep({"abc","cba"},{"b","a"},{"?","!"}),{"!?c","c?!"})