Mercurial > octave-nkf

comparison libinterp/corefcn/cellfun.cc @ 16010:c5d548e4101f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* cellfun.cc: Style fixes.
author John W. Eaton <jwe@octave.org>
date Thu, 07 Feb 2013 11:58:40 -0500
parents 1045790f9be4
children a1e67cf915ba
comparison
equal deleted inserted replaced
16009:ba304d49d2b2 16010:c5d548e4101f
1140 int nargout1 = (nargout < 1 ? 1 : nargout); 1140 int nargout1 = (nargout < 1 ? 1 : nargout);
1141 1141
1142 if (nargin < 2) 1142 if (nargin < 2)
1143 { 1143 {
1144 error_with_id ("Octave:invalid-fun-call", 1144 error_with_id ("Octave:invalid-fun-call",
1145 "arrayfun: function requires at least 2 arguments"); 1145 "arrayfun: function requires at least 2 arguments");
1146 print_usage (); 1146 print_usage ();
1147 return retval; 1147 return retval;
1148 } 1148 }
1149 1149
1150 octave_value func = args(0); 1150 octave_value func = args(0);
1172 { 1172 {
1173 func = symbol_table::find_function (name); 1173 func = symbol_table::find_function (name);
1174 1174
1175 if (func.is_undefined ()) 1175 if (func.is_undefined ())
1176 error_with_id ("Octave:invalid-input-arg", 1176 error_with_id ("Octave:invalid-input-arg",
1177 "arrayfun: invalid function NAME: %s", name.c_str ()); 1177 "arrayfun: invalid function NAME: %s",
1178 name.c_str ());
1178 1179
1179 symbol_table_lookup = true; 1180 symbol_table_lookup = true;
1180 } 1181 }
1181 1182
1182 if (error_state) 1183 if (error_state)
1251 for (int i = j+1; i < nargin; i++) 1252 for (int i = j+1; i < nargin; i++)
1252 { 1253 {
1253 if (mask[i] && inputs[i].dims () != fdims) 1254 if (mask[i] && inputs[i].dims () != fdims)
1254 { 1255 {
1255 error_with_id ("Octave:invalid-input-arg", 1256 error_with_id ("Octave:invalid-input-arg",
1256 "arrayfun: dimensions mismatch"); 1257 "arrayfun: dimensions mismatch");
1257 return retval; 1258 return retval;
1258 } 1259 }
1259 } 1260 }
1260 break; 1261 break;
1261 } 1262 }
1299 return retval; 1300 return retval;
1300 1301
1301 if (nargout > 0 && tmp.length () < nargout) 1302 if (nargout > 0 && tmp.length () < nargout)
1302 { 1303 {
1303 error_with_id ("Octave:invalid-fun-call", 1304 error_with_id ("Octave:invalid-fun-call",
1304 "arrayfun: function returned fewer than nargout values"); 1305 "arrayfun: function returned fewer than nargout values");
1305 return retval; 1306 return retval;
1306 } 1307 }
1307 1308
1308 if (nargout > 0 1309 if (nargout > 0
1309 || (nargout == 0 1310 || (nargout == 0
1325 if (val.numel () == 1) 1326 if (val.numel () == 1)
1326 retv[j] = val.resize (fdims); 1327 retv[j] = val.resize (fdims);
1327 else 1328 else
1328 { 1329 {
1329 error_with_id ("Octave:invalid-fun-call", 1330 error_with_id ("Octave:invalid-fun-call",
1330 "arrayfun: all values must be scalars when UniformOutput = true"); 1331 "arrayfun: all values must be scalars when UniformOutput = true");
1331 break; 1332 break;
1332 } 1333 }
1333 } 1334 }
1334 } 1335 }
1335 } 1336 }
1353 break; 1354 break;
1354 } 1355 }
1355 else 1356 else
1356 { 1357 {
1357 error_with_id ("Octave:invalid-fun-call", 1358 error_with_id ("Octave:invalid-fun-call",
1358 "arrayfun: all values must be scalars when UniformOutput = true"); 1359 "arrayfun: all values must be scalars when UniformOutput = true");
1359 break; 1360 break;
1360 } 1361 }
1361 } 1362 }
1362 } 1363 }
1363 } 1364 }
1412 return retval; 1413 return retval;
1413 1414
1414 if (nargout > 0 && tmp.length () < nargout) 1415 if (nargout > 0 && tmp.length () < nargout)
1415 { 1416 {
1416 error_with_id ("Octave:invalid-fun-call", 1417 error_with_id ("Octave:invalid-fun-call",
1417 "arrayfun: function returned fewer than nargout values"); 1418 "arrayfun: function returned fewer than nargout values");
1418 return retval; 1419 return retval;
1419 } 1420 }
1420 1421
1421 if (nargout > 0 1422 if (nargout > 0
1422 || (nargout == 0 1423 || (nargout == 0
1444 } 1445 }
1445 } 1446 }
1446 } 1447 }
1447 else 1448 else
1448 error_with_id ("Octave:invalid-fun-call", 1449 error_with_id ("Octave:invalid-fun-call",
1449 "arrayfun: argument NAME must be a string or function handle"); 1450 "arrayfun: argument NAME must be a string or function handle");
1450 1451
1451 return retval; 1452 return retval;
1452 } 1453 }
1453 1454
1454 /* 1455 /*