Mercurial > octave
diff libinterp/corefcn/input.cc @ 27932:b018f553fd85
maint: Use Octave coding conventions in libinterp/
* __ftp__.cc, __ichol__.cc, call-stack.cc, error.h, event-manager.cc,
file-io.cc, gl-render.cc, graphics.cc, help.cc, input.cc, interpreter.cc,
load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, mex.cc, oct-hist.cc,
oct-stream.cc, sighandlers.h, stack-frame.cc, stack-frame.h, strfns.cc,
syminfo.cc, sysdep.cc, text-engine.h, url-handle-manager.h, urlwrite.cc,
xpow.cc, __init_fltk__.cc, __ode15__.cc, ccolamd.cc, colamd.cc, cdef-class.cc,
cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-object.cc,
cdef-package.h, cdef-property.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.h, ov-java.cc, ov-typeinfo.h,
bp-table.cc, jit-ir.h, jit-typeinfo.h, pt-classdef.h, pt-eval.cc, pt-eval.h,
pt-idx.cc: Use Octave coding conventions in libinterp.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 10 Jan 2020 17:25:12 -0800 |
parents | bd51beb6205e |
children | 376ca9022b7e f0a3f4527ba6 |
line wrap: on
line diff
--- a/libinterp/corefcn/input.cc Fri Jan 10 13:19:38 2020 -0800 +++ b/libinterp/corefcn/input.cc Fri Jan 10 17:25:12 2020 -0800 @@ -364,8 +364,9 @@ else retval = name; - char prev_char = command_editor::get_prev_char - (text.length ()); + char prev_char = + command_editor::get_prev_char (text.length ()); + if (matches == 1 && looks_like_struct (retval, prev_char)) { // Don't append anything, since we don't know @@ -402,38 +403,38 @@ { } - void input_system::initialize (bool line_editing) - { - // Force default line editor if we don't want readline editing. - if (! line_editing) - { - command_editor::force_default_editor (); - return; - } + void input_system::initialize (bool line_editing) + { + // Force default line editor if we don't want readline editing. + if (! line_editing) + { + command_editor::force_default_editor (); + return; + } - // If we are using readline, this allows conditional parsing of the - // .inputrc file. + // If we are using readline, this allows conditional parsing of the + // .inputrc file. - command_editor::set_name ("Octave"); + command_editor::set_name ("Octave"); - // FIXME: this needs to include a comma too, but that - // causes trouble for the new struct element completion code. + // FIXME: this needs to include a comma too, but that + // causes trouble for the new struct element completion code. - static const char *s = "\t\n !\"\'*+-/:;<=>(){}[\\]^`~"; + static const char *s = "\t\n !\"\'*+-/:;<=>(){}[\\]^`~"; - command_editor::set_basic_word_break_characters (s); + command_editor::set_basic_word_break_characters (s); - command_editor::set_completer_word_break_characters (s); + command_editor::set_completer_word_break_characters (s); - command_editor::set_basic_quote_characters (R"(")"); + command_editor::set_basic_quote_characters (R"(")"); - command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;|&()#$`?*[!:{"); + command_editor::set_filename_quote_characters (" \t\n\\\"'@<>=;|&()#$`?*[!:{"); - command_editor::set_completer_quote_characters (R"('")"); + command_editor::set_completer_quote_characters (R"('")"); - command_editor::set_completion_function (generate_completion); + command_editor::set_completion_function (generate_completion); - command_editor::set_quoting_function (quoting_filename); + command_editor::set_quoting_function (quoting_filename); } octave_value