Mercurial > octave
changeset 21578:683a1beee538
maint: Use "FIXME:" for all code blocks needing further attention.
* files-dock-widget.cc, file-editor-tab.cc, file-editor-tab.h,
file-editor.cc, octave-qscintilla.cc, octave-qt-link.cc, __ilu__.cc, debug.h,
oct-stream.cc, pt-jit.cc, __magick_read__.cc, ov-classdef.cc, pt-stmt.cc,
oct-sort.cc, inputParser.m, validateattributes.m, fminunc.m, fsolve.m, fzero.m,
__scatter__.m, print.m:
Use "FIXME:" for all code blocks needing further attention.
line wrap: on
line diff
--- a/bootstrap Fri Apr 01 14:14:11 2016 -0700 +++ b/bootstrap Fri Apr 01 14:55:13 2016 -0700 @@ -944,8 +944,9 @@ # Some systems (RHEL 5) are using ancient autotools, for which the # --no-recursive option had not been invented. Detect that lack and -# omit the option when it's not supported. FIXME in 2017: remove this -# hack when RHEL 5 autotools are updated, or when they become irrelevant. +# omit the option when it's not supported. +# FIXME: in 2017, remove this hack when RHEL 5 autotools are updated, +# or when they become irrelevant. case $($AUTORECONF --help) in *--no-recursive*) AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive";; esac
--- a/libgui/src/files-dock-widget.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libgui/src/files-dock-widget.cc Fri Apr 01 14:55:13 2016 -0700 @@ -251,8 +251,8 @@ container->setLayout (vbox_layout); - // TODO: Add right-click contextual menus for copying, pasting, - // deleting files (and others). + // FIXME: Add right-click contextual menus for copying, pasting, + // deleting files (and others). connect (_current_directory->lineEdit (), SIGNAL (returnPressed ()), this, SLOT (accept_directory_line_edit ()));
--- a/libgui/src/m-editor/file-editor-tab.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libgui/src/m-editor/file-editor-tab.cc Fri Apr 01 14:55:13 2016 -0700 @@ -335,7 +335,7 @@ QString cond; bp_info info (_file_name, linenr+1); // Get function name & dir from filename. - // Search for previous condition. FIXME -- is there a more direct way? + // Search for previous condition. FIXME: is there a more direct way? if (_edit_area->markersAtLine (linenr) & (1 << marker::cond_break)) { emit report_marker_linenr (_bp_lines, _bp_conditions); @@ -350,8 +350,8 @@ // If text selected by the mouse, default to that instead // If both present, use the OR of them, to avoid accidental overwriting - // FIXME If both are present, show old condition unselected and - // the selection (in edit area) selected (in the dialog). + // FIXME: If both are present, show old condition unselected and + // the selection (in edit area) selected (in the dialog). if (_edit_area->hasSelectedText ()) { if (cond == "") @@ -1277,7 +1277,7 @@ void file_editor_tab::do_indent_selected_text (bool indent) { - // TODO + // FIXME: _edit_area->beginUndoAction (); if (_edit_area->hasSelectedText ()) @@ -1555,7 +1555,7 @@ update_eol_indicator (); - // TODO: (BREAKPOINTS) At this point it would be nice to put any set + // FIXME: (BREAKPOINTS) At this point it would be nice to put any set // breakpoints on the margin. In order to do this, somehow the // "dbstatus" command needs to be accessed. All it would require is a // routine that does "res = feval("dbstatus") and signals that result @@ -1640,7 +1640,7 @@ } } -// TODO: See patch #8016 for a general way to get Octave results from +// FIXME: See patch #8016 for a general way to get Octave results from // commands processed in the background, e.g., dbstatus. void file_editor_tab::handle_octave_result (QObject *requester, QString& command,
--- a/libgui/src/m-editor/file-editor-tab.h Fri Apr 01 14:14:11 2016 -0700 +++ b/libgui/src/m-editor/file-editor-tab.h Fri Apr 01 14:55:13 2016 -0700 @@ -174,7 +174,7 @@ void report_marker_linenr (QIntList& lines, QStringList& conditions); void remove_position_via_debugger_linenr (int debugger_linenr); void remove_all_positions (void); - // TODO: The following is similar to "process_octave_code" signal. However, + // FIXME: The following is similar to "process_octave_code" signal. However, // currently that signal is connected to something that simply focuses a // window and not actually communicate with Octave. // void evaluate_octave_command (const QString& command);
--- a/libgui/src/m-editor/file-editor.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libgui/src/m-editor/file-editor.cc Fri Apr 01 14:55:13 2016 -0700 @@ -905,7 +905,7 @@ emit fetab_remove_bookmark (_tab_widget->currentWidget ()); } -// FIXME What should this do with conditional breakpoints? +// FIXME: What should this do with conditional breakpoints? void file_editor::request_toggle_breakpoint (bool) {
--- a/libgui/src/m-editor/octave-qscintilla.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libgui/src/m-editor/octave-qscintilla.cc Fri Apr 01 14:55:13 2016 -0700 @@ -305,7 +305,7 @@ // wrappers for dbstop related context menu items -// FIXME Why can't the data be sent as the argument to the function??? +// FIXME: Why can't the data be sent as the argument to the function??? void octave_qscintilla::contextmenu_break_condition (bool) {
--- a/libgui/src/octave-qt-link.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libgui/src/octave-qt-link.cc Fri Apr 01 14:55:13 2016 -0700 @@ -382,7 +382,7 @@ // alternatively setting the path). // This uses a QMessageBox unlike other functions in this file, // because uiwidget_creator.waitcondition.wait hangs when called from -// file_editor_tab::handle_context_menu_break_condition(). (FIXME -- why hang?) +// file_editor_tab::handle_context_menu_break_condition(). (FIXME: why hang?) int octave_qt_link::do_debug_cd_or_addpath_error (const std::string& file, const std::string& dir,
--- a/libinterp/corefcn/__ilu__.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/corefcn/__ilu__.cc Fri Apr 01 14:55:13 2016 -0700 @@ -380,7 +380,7 @@ // the first working element of each row (Ufirst) are updated. Also the // arrays working as lists cols_list and rows_list are filled with // indices pointing to Ufirst and Lfirst respectively. - // TODO: Maybe the -1 indicating in Ufirst and Lfirst, that no elements + // FIXME: Maybe the -1 indicating in Ufirst and Lfirst, that no elements // have to be considered in a certain column or row in next iteration, // can be removed. It feels safer to me using such an indicator. if (k < (n - 1))
--- a/libinterp/corefcn/debug.h Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/corefcn/debug.h Fri Apr 01 14:55:13 2016 -0700 @@ -56,7 +56,7 @@ public: - // mapping from (arbitrary index?? FIXME) to line number of breakpoint + // mapping from (FIXME: arbitrary index??) to line number of breakpoint typedef std::map<int, int> intmap; typedef intmap::const_iterator const_intmap_iterator;
--- a/libinterp/corefcn/oct-stream.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/corefcn/oct-stream.cc Fri Apr 01 14:55:13 2016 -0700 @@ -1473,7 +1473,7 @@ // Ensure fast peek doesn't give valid char if (retval == std::istream::traits_type::eof ()) - *idx = '\0'; // FIXME - check that no TreatAsEmpty etc starts w. \0? + *idx = '\0'; // FIXME: check that no TreatAsEmpty etc starts w. \0? return retval; } @@ -1535,7 +1535,7 @@ else // Reading more than the whole buf; return it in buffer { retval = buffer; - // FIXME -- read bufsize at a time + // FIXME: read bufsize at a time int i; for (i = 0; i < size && ! eof (); i++) *buffer++ = get_undelim (); @@ -2598,7 +2598,7 @@ max_lookahead, buf_size); // Grow retval dynamically. "size" is half the initial size - // (FIXME -- Should we start smaller if ntimes is large?) + // (FIXME: Should we start smaller if ntimes is large?) octave_idx_type size = ((ntimes < 8 && ntimes >= 0) ? ntimes : 1); Array<octave_idx_type> row_idx (dim_vector (1,2)); row_idx(1) = 0; @@ -2697,7 +2697,7 @@ Array<octave_idx_type> ra_idx (dim_vector (1,2)); // (err & 1) means "error, and no columns read this row - // FIXME -- This may redundant now that done_after=0 says the same + // FIXME: This may redundant now that done_after=0 says the same if (err & 1) done_after = out.size () + 1; @@ -2825,12 +2825,12 @@ int i; if (width_left) - width_left--; // Consider width of '.' + width_left--; // Consider width of '.' if (precision == -1) - precision = 1<<30; // FIXME Should be MAXINT - - if (! valid) // if there was nothing before '.'... + precision = 1<<30; // FIXME: Should be MAXINT + + if (! valid) // if there was nothing before '.'... is.get (); // ...ch was a "peek", not "get". for (i = 0; i < precision; i++) @@ -3031,7 +3031,7 @@ is.clear (state); is.seekg (pos); // reset to position before look-ahead - // FIXME -- is.read could invalidate pos + // FIXME: is.read could invalidate pos for (int i = 0; i < treat_as_empty.numel (); i++) { @@ -3125,7 +3125,7 @@ { // find sequence ending with an ending char std::string next; scan_caret (is, ends.c_str (), next); - retval = retval + next; // FIXME -- could use repeated doubling of size + retval = retval + next; // FIXME: could use repeated doubling of size int last = (! is.eof () ? is.get_undelim () : std::istream::traits_type::eof ()); @@ -3439,7 +3439,7 @@ ov.internal_rep ()->fast_elem_insert (row (0), Cell (octave_value (vv))); - // FIXME -- why does failbit get set at EOF, instead of eofbit? + // FIXME: why does failbit get set at EOF, instead of eofbit? if (! vv.empty ()) is.clear (is.rdstate () & ~std::ios_base::failbit); } @@ -3519,7 +3519,7 @@ elem = fmt_list.next (); char *pos = is.tellg (); - // FIXME -- these conversions "ignore delimiters". Should they include + // FIXME: these conversions "ignore delimiters". Should they include // delimiters at the start of the conversion, or can those be skipped? if (elem->type != textscan_format_elt::literal_conversion // && elem->type != '[' && elem->type != '^' && elem->type != 'c' @@ -3669,7 +3669,7 @@ error ("%s: TreatAsEmpty must be either a string or cell array of one or two strings", who.c_str ()); - // FIXME Ensure none is a prefix of a later one. Sort by length? + // FIXME: Ensure none is a prefix of a later one. Sort by length? } else if (param == "collectoutput") {
--- a/libinterp/corefcn/pt-jit.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/corefcn/pt-jit.cc Fri Apr 01 14:55:13 2016 -0700 @@ -2327,7 +2327,7 @@ if (! function) return false; - // TODO figure out a way to delete ov_args so we avoid duplicating refcount + // FIXME: figure out a way to delete ov_args so we avoid duplicating refcount size_t nargs = ov_args.length (); std::vector<octave_base_value *> args (nargs); for (size_t i = 0; i < nargs; ++i)
--- a/libinterp/dldfcn/__magick_read__.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/dldfcn/__magick_read__.cc Fri Apr 01 14:55:13 2016 -0700 @@ -349,8 +349,8 @@ // the divisor is of type double. // uint64_t is used in expression because default 32-bit value overflows // when depth() is 32. - // TODO in the next release of GraphicsMagick, MaxRGB should be replaced - // with QuantumRange since MaxRGB is already deprecated in ImageMagick. + // FIXME: in the next release of GraphicsMagick, MaxRGB should be replaced + // with QuantumRange since MaxRGB is already deprecated in ImageMagick. double divisor; if (imvec[def_elem].depth () == 32) divisor = std::numeric_limits<uint32_t>::max ();
--- a/libinterp/octave-value/ov-classdef.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/octave-value/ov-classdef.cc Fri Apr 01 14:55:13 2016 -0700 @@ -2739,7 +2739,7 @@ // Look for all external methods visible on octave path at the // time of loading of the class. // - // TODO: This is an "extension" to Matlab behavior, which only + // FIXME: This is an "extension" to Matlab behavior, which only // looks in the @-folder containing the original classdef // file. However, this is easier to implement it that way at // the moment. @@ -2752,7 +2752,7 @@ it != external_methods.end (); ++it) { - // TODO: should we issue a warning if the method is already + // FIXME: should we issue a warning if the method is already // defined in the classdef file? if (*it != class_name
--- a/libinterp/parse-tree/pt-stmt.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/libinterp/parse-tree/pt-stmt.cc Fri Apr 01 14:55:13 2016 -0700 @@ -188,7 +188,7 @@ } // Create a "breakpoint" tree-walker, and get it to "walk" this statement list -// (TODO: What does that do???) +// (FIXME: What does that do???) int tree_statement_list::set_breakpoint (int line, const std::string& condition) { @@ -252,7 +252,7 @@ // Add breakpoints to file at multiple lines (the second arguments of line), // to stop only if condition is true. // Updates GUI via octave_link::update_breakpoint. -// TODO COME BACK TO ME +// FIXME: COME BACK TO ME. bp_table::intmap tree_statement_list::add_breakpoint (const std::string& file, const bp_table::intmap& line,
--- a/liboctave/util/oct-sort.cc Fri Apr 01 14:14:11 2016 -0700 +++ b/liboctave/util/oct-sort.cc Fri Apr 01 14:55:13 2016 -0700 @@ -1803,7 +1803,7 @@ octave_idx_type *idx, Comp comp) { // Use a sequence of binary lookups. - // TODO: Can this be sped up generally? The sorted merge case is dealt with + // FIXME: Can this be sped up generally? The sorted merge case is dealt with // elsewhere. for (octave_idx_type j = 0; j < nvalues; j++) idx[j] = lookup (data, nel, values[j], comp);
--- a/scripts/general/inputParser.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/general/inputParser.m Fri Apr 01 14:55:13 2016 -0700 @@ -245,12 +245,12 @@ classdef inputParser < handle properties - ## TODO set input checking for this properties + ## FIXME: set input checking for these properties CaseSensitive = false; FunctionName = ""; KeepUnmatched = false; - # PartialMatching = true; # TODO unimplemented - # StructExpand = true; # TODO unimplemented + # PartialMatching = true; # FIXME: unimplemented + # StructExpand = true; # FIXME: unimplemented endproperties properties (SetAccess = protected)
--- a/scripts/general/validateattributes.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/general/validateattributes.m Fri Apr 01 14:55:13 2016 -0700 @@ -242,7 +242,7 @@ idx = 1; problem = false; # becomes true when one of the tests fails while (idx <= numel (attr)) - ## TODO: once we use this in Octave core, it might be worthy to find + ## FIXME: once we use this in Octave core, it might be worthy to find ## which attributes are checked more often, and place them in that ## order inside the switch block. switch (tolower (attr{idx++}))
--- a/scripts/optimization/fminunc.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/optimization/fminunc.m Fri Apr 01 14:55:13 2016 -0700 @@ -433,8 +433,8 @@ ## Minimize 1/2*norm(r*x)^2 subject to the constraint norm(d.*x) <= delta, ## x being a convex combination of the gauss-newton and scaled gradient. -## TODO: error checks -## TODO: handle singularity, or leave it up to mldivide? +## FIXME: error checks +## FIXME: handle singularity, or leave it up to mldivide? function x = __doglegm__ (r, g, d, delta) ## Get Gauss-Newton direction.
--- a/scripts/optimization/fsolve.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/optimization/fsolve.m Fri Apr 01 14:55:13 2016 -0700 @@ -583,8 +583,8 @@ ## Minimize norm(r*x-b) subject to the constraint norm(d.*x) <= delta, ## x being a convex combination of the gauss-newton and scaled gradient. -## TODO: error checks -## TODO: handle singularity, or leave it up to mldivide? +## FIXME: error checks +## FIXME: handle singularity, or leave it up to mldivide? function x = __dogleg__ (r, b, d, delta) ## Get Gauss-Newton direction.
--- a/scripts/optimization/fzero.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/optimization/fzero.m Fri Apr 01 14:55:13 2016 -0700 @@ -118,7 +118,7 @@ fun = str2func (fun, "global"); endif - ## TODO + ## FIXME: ## displev = optimget (options, "Display", "notify"); funvalchk = strcmpi (optimget (options, "FunValCheck", "off"), "on"); outfcn = optimget (options, "OutputFcn");
--- a/scripts/plot/draw/private/__scatter__.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/plot/draw/private/__scatter__.m Fri Apr 01 14:55:13 2016 -0700 @@ -290,8 +290,8 @@ z = vert(:,3:end); toolkit = get (ancestor (hg, "figure"), "__graphics_toolkit__"); ## Does gnuplot only support triangles with different vertex colors ? - ## TODO: Verify gnuplot can only support one color. If RGB triplets - ## can be assigned to each vertex, then fix __gnuplot_draw_axes__.m + ## FIXME: Verify gnuplot can only support one color. If RGB triplets + ## can be assigned to each vertex, then fix __gnuplot_draw_axes__.m gnuplot_hack = (numel (x) > 1 && columns (c) == 3 && strcmp (toolkit, "gnuplot")); if (ischar (c) || ! isflat || gnuplot_hack)
--- a/scripts/plot/util/print.m Fri Apr 01 14:14:11 2016 -0700 +++ b/scripts/plot/util/print.m Fri Apr 01 14:55:13 2016 -0700 @@ -743,7 +743,7 @@ error ("print:errorclosingfile", "print.m: error closing file '%s'", latexfile); endif - ## TODO - should this be fixed in GL2PS? + ## FIXME: should this be fixed in GL2PS? latex = strrep (latex, "\\includegraphics{}", sprintf ("\\includegraphics{%s}", graphicsfile)); else