Mercurial > octave-nkf
changeset 17861:870f3e12e163
maint: Use phrase "FIXME:" for problem areas in code.
* libinterp/corefcn/betainc.cc, libinterp/corefcn/bitfcns.cc,
libinterp/corefcn/display.cc, libinterp/corefcn/gammainc.cc,
libinterp/corefcn/gl2ps-renderer.cc, libinterp/corefcn/graphics.cc,
libinterp/corefcn/load-save.cc, libinterp/corefcn/ls-hdf5.cc,
libinterp/corefcn/ls-mat5.cc, libinterp/corefcn/ls-oct-binary.cc,
libinterp/corefcn/luinc.cc, libinterp/corefcn/mex.cc,
libinterp/corefcn/regexp.cc, libinterp/corefcn/sighandlers.cc,
libinterp/corefcn/sparse-xpow.cc, libinterp/corefcn/urlwrite.cc,
libinterp/corefcn/variables.cc, libinterp/dldfcn/__init_fltk__.cc,
libinterp/dldfcn/__magick_read__.cc, libinterp/dldfcn/chol.cc,
libinterp/octave-value/ov-bool-sparse.cc,
libinterp/octave-value/ov-fcn-inline.cc,
libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-re-mat.cc,
libinterp/octave-value/ov-str-mat.cc, libinterp/parse-tree/lex.ll,
liboctave/numeric/SparseCmplxQR.cc, liboctave/numeric/SparseQR.cc,
liboctave/numeric/sparse-dmsolve.cc, liboctave/util/lo-utils.cc,
liboctave/util/sparse-util.cc, liboctave/util/url-transfer.cc:
maint: Use phrase "FIXME:" for problem areas in code.
line wrap: on
line diff
--- a/libinterp/corefcn/betainc.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/betainc.cc Wed Nov 06 11:42:35 2013 -0800 @@ -75,7 +75,7 @@ octave_value a_arg = args(1); octave_value b_arg = args(2); - // FIXME Can we make a template version of the duplicated code below + // FIXME: Can we make a template version of the duplicated code below if (x_arg.is_single_type () || a_arg.is_single_type () || b_arg.is_single_type ()) {
--- a/libinterp/corefcn/bitfcns.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/bitfcns.cc Wed Nov 06 11:42:35 2013 -0800 @@ -517,7 +517,7 @@ \n\ bitshift (10, [-2, -1, 0, 1, 2])\n\ @result{} 2 5 10 20 40\n\ -@c FIXME -- restore this example when third arg is allowed to be an array.\n\ +@c FIXME: restore this example when third arg is allowed to be an array.\n\ @c\n\ @c\n\ @c bitshift ([1, 10], 2, [3,4])\n\
--- a/libinterp/corefcn/display.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/display.cc Wed Nov 06 11:42:35 2013 -0800 @@ -42,7 +42,7 @@ display_info *display_info::instance = 0; #if defined (HAVE_FRAMEWORK_CARBON) && ! defined (HAVE_CARBON_CGDISPLAYBITSPERPIXEL) -// FIXME - This will only work for MacOS > 10.5. For earlier versions +// FIXME: This will only work for MacOS > 10.5. For earlier versions // this code is not needed (use CGDisplayBitsPerPixel instead). size_t DisplayBitsPerPixel (CGDirectDisplayID display) {
--- a/libinterp/corefcn/gammainc.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/gammainc.cc Wed Nov 06 11:42:35 2013 -0800 @@ -101,7 +101,7 @@ octave_value x_arg = args(0); octave_value a_arg = args(1); - // FIXME Can we make a template version of the duplicated code below + // FIXME: Can we make a template version of the duplicated code below if (x_arg.is_single_type () || a_arg.is_single_type ()) { if (x_arg.is_scalar_type ())
--- a/libinterp/corefcn/gl2ps-renderer.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/gl2ps-renderer.cc Wed Nov 06 11:42:35 2013 -0800 @@ -157,8 +157,8 @@ gl2psTextOpt (txt.c_str (), fontname.c_str (), fontsize, alignment_to_mode (ha, va), rotation); - // FIXME? -- we have no way of getting a bounding box from gl2ps, so - // we use freetype + // FIXME? + // We have no way of getting a bounding box from gl2ps, so we use freetype. Matrix bbox; uint8NDArray pixels; text_to_pixels (txt, pixels, bbox, 0, 0, rotation);
--- a/libinterp/corefcn/graphics.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/graphics.cc Wed Nov 06 11:42:35 2013 -0800 @@ -3130,7 +3130,7 @@ } } -// FIXME This should update monitorpositions and pointerlocation, but +// FIXME: This should update monitorpositions and pointerlocation, but // as these properties are yet used, and so it doesn't matter that they // aren't set yet. void @@ -6206,7 +6206,7 @@ min_val = -1; max_val = 1; } - // FIXME -- maybe this test should also be relative? + // FIXME: maybe this test should also be relative? else if (std::abs (min_val - max_val) < sqrt (std::numeric_limits<double>::epsilon ())) { @@ -6246,7 +6246,7 @@ double hi = (lims.get ().matrix_value ()) (1); bool is_negative = lo < 0 && hi < 0; double tmp; - // FIXME should this be checked for somewhere else? (i.e. set{x,y,z}lim) + // FIXME: should this be checked for somewhere else? (i.e. set{x,y,z}lim) if (hi < lo) { tmp = hi; @@ -6273,7 +6273,7 @@ if (is_logscale && ! (xisinf (hi) || xisinf (lo))) { - // FIXME - what if (hi-lo) < tick_sep? + // FIXME: what if (hi-lo) < tick_sep? // ex: loglog ([1 1.1]) tick_sep = std::max (tick_sep, 1.); tick_sep = std::ceil (tick_sep);
--- a/libinterp/corefcn/load-save.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/load-save.cc Wed Nov 06 11:42:35 2013 -0800 @@ -766,10 +766,10 @@ #endif /* HAVE_HDF5 */ if (format != LS_UNKNOWN) { - // FIXME -- if we have already seen EOF on a - // previous call, how do we fix up the state of std::cin so - // that we can get additional input? I'm afraid that we - // can't fix this using std::cin only. + // FIXME: if we have already seen EOF on a previous call, + // how do we fix up the state of std::cin so that we can get + // additional input? I'm afraid that we can't fix this + // using std::cin only. retval = do_load (std::cin, orig_fname, format, flt_fmt, list_only, swap, verbose, argv, i, argc, @@ -1713,7 +1713,7 @@ #ifdef HAVE_HDF5 if (format == LS_HDF5) { - // FIXME. It should be possible to append to HDF5 files. + // FIXME: It should be possible to append to HDF5 files. if (append) { error ("save: appending to HDF5 files is not implemented");
--- a/libinterp/corefcn/ls-hdf5.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/ls-hdf5.cc Wed Nov 06 11:42:35 2013 -0800 @@ -398,7 +398,7 @@ // What integer type do we really have.. std::string int_typ; #ifdef HAVE_H5T_GET_NATIVE_TYPE - // FIXME test this code and activated with an autoconf + // FIXME: test this code and activated with an autoconf // test!! It is also incorrect for 64-bit indexing!! switch (H5Tget_native_type (type_id, H5T_DIR_ASCEND))
--- a/libinterp/corefcn/ls-mat5.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/ls-mat5.cc Wed Nov 06 11:42:35 2013 -0800 @@ -172,7 +172,7 @@ case miRESERVE3: break; - // FIXME -- how are the 64-bit cases supposed to work here? + // FIXME: how are the 64-bit cases supposed to work here? case miINT64: read_doubles (is, data, LS_LONG, count, swap, flt_fmt); break; @@ -237,7 +237,7 @@ case miRESERVE3: break; - // FIXME -- how are the 64-bit cases supposed to work here? + // FIXME: how are the 64-bit cases supposed to work here? case miINT64: read_floats (is, data, LS_LONG, count, swap, flt_fmt); break;
--- a/libinterp/corefcn/ls-oct-binary.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/ls-oct-binary.cc Wed Nov 06 11:42:35 2013 -0800 @@ -205,7 +205,7 @@ case 5: { - // FIXMEX + // FIXME: // This is cruft, since its for a save type that is old. Maybe // this is taking backward compatability too far!! int32_t len;
--- a/libinterp/corefcn/luinc.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/luinc.cc Wed Nov 06 11:42:35 2013 -0800 @@ -186,7 +186,7 @@ } } - // FIXME Add code for zero-level factorization + // FIXME: Add code for zero-level factorization if (zero_level) error ("luinc: zero-level factorization not implemented");
--- a/libinterp/corefcn/mex.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/mex.cc Wed Nov 06 11:42:35 2013 -0800 @@ -1045,7 +1045,7 @@ cpr[i] = str[i]; } - // FIXME?? + // FIXME: ??? mxArray_number (mwSize m, const char **str) : mxArray_matlab (mxCHAR_CLASS, m, max_str_len (m, str)), pr (mxArray::calloc (get_number_of_elements (), get_element_size ())),
--- a/libinterp/corefcn/regexp.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/regexp.cc Wed Nov 06 11:42:35 2013 -0800 @@ -78,10 +78,10 @@ break; #if 0 -// FIXME : To be complete, we need to handle \oN, \o{N}. -// The PCRE library already handles \N where N -// is an octal number. New code needs to merely -// replace \oN or \o{N} with \N. +// FIXME: To be complete, we need to handle \oN, \o{N}. +// The PCRE library already handles \N where N +// is an octal number. New code needs to merely +// replace \oN or \o{N} with \N. case 'o': // octal number #endif
--- a/libinterp/corefcn/sighandlers.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/sighandlers.cc Wed Nov 06 11:42:35 2013 -0800 @@ -223,7 +223,7 @@ #if defined (SIGALRM) else #endif - // FIXME -- Do we also need to explicitly disable SA_RESTART? + // FIXME: Do we also need to explicitly disable SA_RESTART? if (restart_syscalls) act.sa_flags |= SA_RESTART; #endif
--- a/libinterp/corefcn/sparse-xpow.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/sparse-xpow.cc Wed Nov 06 11:42:35 2013 -0800 @@ -325,9 +325,9 @@ octave_value elem_xpow (const SparseMatrix& a, double b) { - // FIXME What should a .^ 0 give?? Matlab gives a + // FIXME: What should a .^ 0 give? Matlab gives a // sparse matrix with same structure as a, which is strictly - // incorrect. Keep compatiability. + // incorrect. Keep compatibility. octave_value retval;
--- a/libinterp/corefcn/urlwrite.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/urlwrite.cc Wed Nov 06 11:42:35 2013 -0800 @@ -1055,7 +1055,7 @@ } else { - // FIXME Does ascii mode need to be flagged here? + // FIXME: Does ascii mode need to be flagged here? std::ifstream ifile (file.c_str (), std::ios::in | std::ios::binary);
--- a/libinterp/corefcn/variables.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/corefcn/variables.cc Wed Nov 06 11:42:35 2013 -0800 @@ -1563,7 +1563,7 @@ { if (argv[i] == "-file") { - // FIXME. This is an inefficient manner to implement this as the + // FIXME: This is an inefficient manner to implement this as the // variables are loaded in to a temporary context and then treated. // It would be better to refecat symbol_info_list to not store the // symbol records and then use it in load-save.cc (do_load) to
--- a/libinterp/dldfcn/__init_fltk__.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/dldfcn/__init_fltk__.cc Wed Nov 06 11:42:35 2013 -0800 @@ -821,7 +821,7 @@ { if (!uimenu->is_visible ()) { - // FIXME - Toolbar and menubar do not update + // FIXME: Toolbar and menubar do not update uimenu->show (); mark_modified (); } @@ -831,7 +831,7 @@ { if (uimenu->is_visible ()) { - // FIXME - Toolbar and menubar do not update + // FIXME: Toolbar and menubar do not update uimenu->hide (); mark_modified (); } @@ -1219,7 +1219,7 @@ void draw (void) { - // FIXME - Toolbar and menubar do not update properly + // FIXME: Toolbar and menubar do not update properly Matrix pos = fp.get_boundingbox (true); int canvas_h = pos(3); int canvas_w = pos(2); @@ -2050,7 +2050,7 @@ input_event_hook_fcn_id = octave_value_list (); - // FIXME ??? + // FIXME: ??? Fl::wait (fltk_maxtime); } }
--- a/libinterp/dldfcn/__magick_read__.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/dldfcn/__magick_read__.cc Wed Nov 06 11:42:35 2013 -0800 @@ -1458,7 +1458,7 @@ } } - // FIXME - LoopCount or animationIterations + // FIXME: LoopCount or animationIterations // How it should work: // // This value is only set for the first image in the sequence. Trying
--- a/libinterp/dldfcn/chol.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/dldfcn/chol.cc Wed Nov 06 11:42:35 2013 -0800 @@ -160,8 +160,8 @@ if (tmp.compare ("vector") == 0) vecout = true; else if (tmp.compare ("lower") == 0) - // FIXME currently the option "lower" is handled by transposing the - // matrix, factorizing it with the lapack function + // FIXME: currently the option "lower" is handled by transposing + // the matrix, factorizing it with the lapack function // DPOTRF ('U', ...) and finally transposing the factor. It would // be more efficient to use DPOTRF ('L', ...) in this case. LLt = true;
--- a/libinterp/octave-value/ov-bool-sparse.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/octave-value/ov-bool-sparse.cc Wed Nov 06 11:42:35 2013 -0800 @@ -144,7 +144,7 @@ return tmp.convert_to_str (pad, force, type); } -// FIXME These are inefficient ways of creating full matrices +// FIXME: These are inefficient ways of creating full matrices Matrix octave_sparse_bool_matrix::matrix_value (bool) const
--- a/libinterp/octave-value/ov-fcn-inline.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/octave-value/ov-fcn-inline.cc Wed Nov 06 11:42:35 2013 -0800 @@ -294,8 +294,8 @@ hid_t space_hid = -1, data_hid = -1, type_hid = -1;; bool retval = true; - // FIXME Is there a better way of saving string vectors, than a - // null padded matrix? + // FIXME: Is there a better way of saving string vectors, + // than a null padded matrix? OCTAVE_LOCAL_BUFFER (hsize_t, hdims, 2);
--- a/libinterp/octave-value/ov-flt-re-mat.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Wed Nov 06 11:42:35 2013 -0800 @@ -241,8 +241,8 @@ SparseComplexMatrix octave_float_matrix::sparse_complex_matrix_value (bool) const { - // FIXME Need a SparseComplexMatrix (Matrix) constructor to make - // this function more efficient. Then this should become + // FIXME: Need a SparseComplexMatrix (Matrix) constructor to make + // this function more efficient. Then this should become // return SparseComplexMatrix (matrix.matrix_value ()); return SparseComplexMatrix (sparse_matrix_value ()); }
--- a/libinterp/octave-value/ov-re-mat.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/octave-value/ov-re-mat.cc Wed Nov 06 11:42:35 2013 -0800 @@ -250,8 +250,8 @@ SparseComplexMatrix octave_matrix::sparse_complex_matrix_value (bool) const { - // FIXME Need a SparseComplexMatrix (Matrix) constructor to make - // this function more efficient. Then this should become + // FIXME: Need a SparseComplexMatrix (Matrix) constructor to make + // this function more efficient. Then this should become // return SparseComplexMatrix (matrix.matrix_value ()); return SparseComplexMatrix (sparse_matrix_value ()); }
--- a/libinterp/octave-value/ov-str-mat.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/octave-value/ov-str-mat.cc Wed Nov 06 11:42:35 2013 -0800 @@ -235,7 +235,7 @@ { charMatrix chm = matrix.matrix_value (); - retval = chm.row_as_string (0); // FIXME??? + retval = chm.row_as_string (0); // FIXME? } else error ("invalid conversion of charNDArray to string"); @@ -279,7 +279,7 @@ { retval = string_value (); - // FIXME -- should this be configurable? + // FIXME: should this be configurable? if (retval.length () > 100) retval = retval.substr (0, 100);
--- a/libinterp/parse-tree/lex.ll Wed Nov 06 11:14:40 2013 -0800 +++ b/libinterp/parse-tree/lex.ll Wed Nov 06 11:42:35 2013 -0800 @@ -371,7 +371,7 @@ // It's also a pain in the ass to decide whether to insert a comma // after seeing a ']' character... -// FIXME -- we need to handle block comments here. +// FIXME: we need to handle block comments here. %} <MATRIX_START>\] { @@ -388,7 +388,7 @@ } %{ -// FIXME -- we need to handle block comments here. +// FIXME: we need to handle block comments here. %} <MATRIX_START>\} {
--- a/liboctave/numeric/SparseCmplxQR.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/liboctave/numeric/SparseCmplxQR.cc Wed Nov 06 11:42:35 2013 -0800 @@ -99,7 +99,7 @@ { #ifdef HAVE_CXSPARSE // Drop zeros from V and sort - // FIXME Is the double transpose to sort necessary? + // FIXME: Is the double transpose to sort necessary? BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_dropzeros) (N->L); CXSPARSE_ZNAME () *D = CXSPARSE_ZNAME (_transpose) (N->L, 1); @@ -163,7 +163,7 @@ { #ifdef HAVE_CXSPARSE // Drop zeros from R and sort - // FIXME Is the double transpose to sort necessary? + // FIXME: Is the double transpose to sort necessary? BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_ZNAME (_dropzeros) (N->U); CXSPARSE_ZNAME () *D = CXSPARSE_ZNAME (_transpose) (N->U, 1);
--- a/liboctave/numeric/SparseQR.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/liboctave/numeric/SparseQR.cc Wed Nov 06 11:42:35 2013 -0800 @@ -79,7 +79,7 @@ { #ifdef HAVE_CXSPARSE // Drop zeros from V and sort - // FIXME Is the double transpose to sort necessary? + // FIXME: Is the double transpose to sort necessary? BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_dropzeros) (N->L); CXSPARSE_DNAME () *D = CXSPARSE_DNAME (_transpose) (N->L, 1); @@ -143,7 +143,7 @@ { #ifdef HAVE_CXSPARSE // Drop zeros from R and sort - // FIXME Is the double transpose to sort necessary? + // FIXME: Is the double transpose to sort necessary? BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; CXSPARSE_DNAME (_dropzeros) (N->U); CXSPARSE_DNAME () *D = CXSPARSE_DNAME (_transpose) (N->U, 1);
--- a/liboctave/numeric/sparse-dmsolve.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/liboctave/numeric/sparse-dmsolve.cc Wed Nov 06 11:42:35 2013 -0800 @@ -437,7 +437,7 @@ } // Structurally non-singular blocks - // FIXME Should use fine Dulmange-Mendelsohn decomposition here. + // FIXME: Should use fine Dulmange-Mendelsohn decomposition here. if (dm->rr[1] < dm->rr[2] && dm->cc[2] < dm->cc[3] && !info) { ST m = dmsolve_extract (a, pinv, q, dm->rr[1], dm->rr[2],
--- a/liboctave/util/lo-utils.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/liboctave/util/lo-utils.cc Wed Nov 06 11:42:35 2013 -0800 @@ -90,8 +90,7 @@ // This function was adapted from xputenv from Karl Berry's kpathsearch // library. -// FIXME -- make this do the right thing if we don't have a -// SMART_PUTENV. +// FIXME: make this do the right thing if we don't have a SMART_PUTENV. void octave_putenv (const std::string& name, const std::string& value)
--- a/liboctave/util/sparse-util.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/liboctave/util/sparse-util.cc Wed Nov 06 11:42:35 2013 -0800 @@ -31,7 +31,7 @@ #include "oct-sparse.h" #include "sparse-util.h" -// FIXME this overload is here due to API change in SuiteSparse (3.1 -> 3.2) +// FIXME: this overload is here due to API change in SuiteSparse (3.1 -> 3.2) #ifdef HAVE_CHOLMOD
--- a/liboctave/util/url-transfer.cc Wed Nov 06 11:14:40 2013 -0800 +++ b/liboctave/util/url-transfer.cc Wed Nov 06 11:42:35 2013 -0800 @@ -180,7 +180,7 @@ } else { - // FIXME Does ascii mode need to be flagged here? + // FIXME: Does ascii mode need to be flagged here? std::ifstream ifile (realfile.c_str (), std::ios::in | std::ios::binary);