Mercurial > octave-nkf
diff src/ov-fcn-inline.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 20 Jan 2011 17:24:59 -0500 |
| parents | fd0a3ac60b0e |
| children | 7a5aacf65f81 |
line wrap: on
line diff
--- a/src/ov-fcn-inline.cc Thu Jan 20 17:21:27 2011 -0500 +++ b/src/ov-fcn-inline.cc Thu Jan 20 17:24:59 2011 -0500 @@ -104,7 +104,7 @@ if (parent_scope < 0) parent_scope = curr_fcn->scope (); - + uf->stash_parent_fcn_scope (parent_scope); } } @@ -364,7 +364,7 @@ return false; } #if HAVE_HDF5_18 - data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, + data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); #else data_hid = H5Dcreate (group_hid, "nm", type_hid, space_hid, H5P_DEFAULT); @@ -673,7 +673,7 @@ bool in_string = false; std::string tmp_arg; size_t i = 0; - + while (i < fun.length ()) { bool terminate_arg = false; @@ -700,7 +700,7 @@ // Before we do anything remove trailing whitespaces. while (i < fun.length () && isspace (c)) c = fun[i++]; - + // Do we have a variable or a function? if (c != '(') terminate_arg = true; @@ -719,17 +719,17 @@ if (terminate_arg || (i == fun.length () && is_arg)) { bool have_arg = false; - + for (int j = 0; j < fargs.length (); j++) if (tmp_arg == fargs (j)) { have_arg = true; break; } - + if (! have_arg && tmp_arg != "i" && tmp_arg != "j" && - tmp_arg != "NaN" && tmp_arg != "nan" && - tmp_arg != "Inf" && tmp_arg != "inf" && + tmp_arg != "NaN" && tmp_arg != "nan" && + tmp_arg != "Inf" && tmp_arg != "inf" && tmp_arg != "NA" && tmp_arg != "pi" && tmp_arg != "eps") fargs.append (tmp_arg); @@ -933,7 +933,7 @@ if (func_is_string) retval = octave_value (new_func); else - retval = octave_value (new octave_fcn_inline + retval = octave_value (new octave_fcn_inline (new_func, old->fcn_arg_names ())); } }