Mercurial > octave-nkf

changeset 16004:1045790f9be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in Juan Pablo's changes
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 06 Feb 2013 10:36:38 -0500
parents cddf9103a566 (current diff) 3b3321f9db9f (diff)
children a60b6911842c
files libinterp/corefcn/cellfun.cc
diffstat 1 files changed, 16 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/cellfun.cc	Tue Feb 05 10:56:46 2013 -0500
+++ b/libinterp/corefcn/cellfun.cc	Wed Feb 06 10:36:38 2013 -0500
@@ -1141,7 +1141,8 @@
 
   if (nargin < 2)
     {
-      error ("arrayfun: function requires at least 2 arguments");
+      error_with_id ("Octave:invalid-fun-call", 
+                           "arrayfun: function requires at least 2 arguments");
       print_usage ();
       return retval;
     }
@@ -1172,7 +1173,8 @@
           func = symbol_table::find_function (name);
 
           if (func.is_undefined ())
-            error ("arrayfun: invalid function NAME: %s", name.c_str ());
+            error_with_id ("Octave:invalid-input-arg",
+                         "arrayfun: invalid function NAME: %s", name.c_str ());
 
           symbol_table_lookup = true;
         }
@@ -1250,7 +1252,8 @@
                 {
                   if (mask[i] && inputs[i].dims () != fdims)
                     {
-                      error ("arrayfun: dimensions mismatch");
+                      error_with_id ("Octave:invalid-input-arg", 
+                                              "arrayfun: dimensions mismatch");
                       return retval;
                     }
                 }
@@ -1297,7 +1300,8 @@
 
               if (nargout > 0 && tmp.length () < nargout)
                 {
-                  error ("arrayfun: function returned fewer than nargout values");
+                  error_with_id ("Octave:invalid-fun-call", 
+                      "arrayfun: function returned fewer than nargout values");
                   return retval;
                 }
 
@@ -1322,7 +1326,8 @@
                                 retv[j] = val.resize (fdims);
                               else
                                 {
-                                  error ("arrayfun: all values must be scalars when UniformOutput = true");
+                                  error_with_id ("Octave:invalid-fun-call",
+             "arrayfun: all values must be scalars when UniformOutput = true");
                                   break;
                                 }
                             }
@@ -1349,7 +1354,8 @@
                                     }
                                   else
                                     {
-                                      error ("arrayfun: all values must be scalars when UniformOutput = true");
+                                      error_with_id ("Octave:invalid-fun-call",
+              "arrayfun: all values must be scalars when UniformOutput = true");
                                       break;
                                     }
                                 }
@@ -1407,7 +1413,8 @@
 
               if (nargout > 0 && tmp.length () < nargout)
                 {
-                  error ("arrayfun: function returned fewer than nargout values");
+                  error_with_id ("Octave:invalid-fun-call", 
+                      "arrayfun: function returned fewer than nargout values");
                   return retval;
                 }
 
@@ -1438,7 +1445,8 @@
         }
     }
   else
-    error ("arrayfun: argument NAME must be a string or function handle");
+    error_with_id ("Octave:invalid-fun-call", 
+                "arrayfun: argument NAME must be a string or function handle");
 
   return retval;
 }