Mercurial > hg > octave-nkf
view liboctave/cmd-hist.cc @ 14846:460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Example: func() => func ()
* dynamic.txi, func.txi, oop.txi, var.txi, embedded.cc, fortdemo.cc,
funcdemo.cc, paramdemo.cc, stringdemo.cc, unwinddemo.cc, Array.cc, Array.h,
CColVector.cc, CDiagMatrix.h, CMatrix.cc, CNDArray.cc, CRowVector.cc,
CSparse.cc, CmplxGEPBAL.cc, EIG.cc, MSparse.cc, MatrixType.cc,
Sparse-op-defs.h, Sparse-perm-op-defs.h, Sparse.cc, Sparse.h,
SparseCmplxCHOL.cc, SparseCmplxCHOL.h, SparseCmplxLU.cc, SparseCmplxQR.cc,
SparseCmplxQR.h, SparseQR.cc, SparseQR.h, SparsedbleCHOL.cc, SparsedbleCHOL.h,
SparsedbleLU.cc, SparsedbleLU.h, base-lu.cc, cmd-hist.cc, dColVector.cc,
dDiagMatrix.h, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, dbleCHOL.cc,
dbleGEPBAL.cc, dim-vector.cc, eigs-base.cc, f2c-main.c, fCColVector.cc,
fCDiagMatrix.h, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fCmplxGEPBAL.cc,
fColVector.cc, fDiagMatrix.h, fEIG.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc,
file-ops.cc, file-stat.cc, floatCHOL.cc, floatGEPBAL.cc, idx-vector.h,
lo-specfun.cc, lo-sysdep.cc, mx-inlines.cc, oct-binmap.h, oct-convn.cc,
oct-md5.cc, oct-mem.h, oct-rand.cc, oct-syscalls.cc, randgamma.c, randmtzig.c,
sparse-base-chol.cc, sparse-base-chol.h, sparse-base-lu.cc, sparse-dmsolve.cc,
tempname.c, curl.m, divergence.m, randi.m, dlmwrite.m, edit.m, getappdata.m,
what.m, getarchdir.m, install.m, installed_packages.m, repackage.m,
unload_packages.m, colorbar.m, figure.m, isosurface.m, legend.m, loglog.m,
plot.m, plot3.m, plotyy.m, polar.m, __errplot__.m, __ghostscript__.m,
__marching_cube__.m, __plt__.m, __scatter__.m, semilogx.m, semilogy.m,
trimesh.m, trisurf.m, demo.m, test.m, datetick.m, __delaunayn__.cc,
__dsearchn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, balance.cc,
bsxfun.cc, ccolamd.cc, cellfun.cc, chol.cc, daspk.cc, dasrt.cc, dassl.cc,
dmperm.cc, eig.cc, eigs.cc, fftw.cc, filter.cc, find.cc, kron.cc, lookup.cc,
lsode.cc, matrix_type.cc, md5sum.cc, mgorth.cc, qr.cc, quad.cc, rand.cc,
regexp.cc, symbfact.cc, tril.cc, urlwrite.cc, op-bm-bm.cc, op-cdm-cdm.cc,
op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-scm.cc,
op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-fcdm-fcdm.cc,
op-fcm-fcm.cc, op-fdm-fdm.cc, op-fm-fm.cc, op-int.h, op-m-m.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-scm.cc,
op-s-sm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-str.cc, op-struct.cc, bitfcns.cc,
data.cc, debug.cc, dynamic-ld.cc, error.cc, gl-render.cc, graphics.cc,
graphics.in.h, load-path.cc, ls-hdf5.cc, ls-mat5.cc, ls-mat5.h,
ls-oct-ascii.cc, ls-oct-ascii.h, mex.cc, mk-errno-list, oct-map.cc, oct-obj.h,
oct-parse.yy, octave-config.in.cc, ov-base-int.cc, ov-base-mat.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-cell.cc, ov-class.cc,
ov-class.h, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-flt-cx-mat.cc,
ov-flt-re-mat.cc, ov-intx.h, ov-range.h, ov-re-mat.cc, ov-re-sparse.cc,
ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.h, ov.h, pr-output.cc, pt-id.cc,
pt-id.h, pt-mat.cc, pt-select.cc, sparse.cc, symtab.cc, symtab.h, syscalls.cc,
toplev.cc, txt-eng-ft.cc, variables.cc, zfstream.cc, zfstream.h, Dork.m,
getStash.m, myStash.m, Gork.m, Pork.m, myStash.m, getStash.m, myStash.m,
getStash.m, myStash.m, fntests.m: Use Octave coding convention for
cuddled parenthis in function calls with empty argument lists.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Sun, 08 Jul 2012 11:28:50 -0700 |
parents | 72c96de7a403 |
children | 3d8ace26c5b4 |
line wrap: on
line source
/* Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <cstring> #include <iostream> #include <string> #include "cmd-edit.h" #include "cmd-hist.h" #include "file-ops.h" #include "lo-error.h" #include "singleton-cleanup.h" #include "str-vec.h" command_history *command_history::instance = 0; #if defined (USE_READLINE) #include <cstdlib> #include <sys/types.h> #include <unistd.h> #include <fcntl.h> #include "oct-rl-hist.h" #include "file-stat.h" class gnu_history : public command_history { public: gnu_history (void) : command_history (), mark (0) { } ~gnu_history (void) { } void do_process_histcontrol (const std::string&); std::string do_histcontrol (void) const; void do_add (const std::string&); void do_remove (int); int do_where (void) const; int do_length (void) const; int do_max_input_history (void) const; int do_base (void) const; int do_current_number (void) const; void do_stifle (int); int do_unstifle (void); int do_is_stifled (void) const; void do_set_mark (int); int do_goto_mark (void); void do_read (const std::string&, bool); void do_read_range (const std::string&, int, int, bool); void do_write (const std::string&) const; void do_append (const std::string&); void do_truncate_file (const std::string&, int) const; string_vector do_list (int, bool) const; std::string do_get_entry (int) const; void do_replace_entry (int, const std::string&); void do_clean_up_and_save (const std::string&, int); private: int mark; }; void gnu_history::do_process_histcontrol (const std::string& control_arg) { history_control = 0; size_t len = control_arg.length (); size_t beg = 0; while (beg < len) { if (control_arg[beg] == ':') beg++; else { size_t end = control_arg.find (":", beg); if (end == std::string::npos) end = len; std::string tmp = control_arg.substr (beg, end-beg); if (tmp == "erasedups") history_control |= HC_ERASEDUPS; else if (tmp == "ignoreboth") history_control |= HC_IGNDUPS|HC_IGNSPACE; else if (tmp == "ignoredups") history_control |= HC_IGNDUPS; else if (tmp == "ignorespace") history_control |= HC_IGNSPACE; else (*current_liboctave_warning_handler) ("unknown histcontrol directive %s", tmp.c_str ()); if (end != std::string::npos) beg = end + 1; } } } std::string gnu_history::do_histcontrol (void) const { // FIXME -- instead of reconstructing this value, should we just save // the string we were given when constructing the command_history // object? std::string retval; if (history_control & HC_IGNSPACE) retval.append ("ignorespace"); if (history_control & HC_IGNDUPS) { if (retval.length () > 0) retval.append (":"); retval.append ("ignoredups"); } if (history_control & HC_ERASEDUPS) { if (retval.length () > 0) retval.append (":"); retval.append ("erasedups"); } return retval; } void gnu_history::do_add (const std::string& s) { if (! do_ignoring_entries ()) { if (s.empty () || (s.length () == 1 && (s[0] == '\r' || s[0] == '\n'))) return; lines_this_session += ::octave_add_history (s.c_str (), history_control); } } void gnu_history::do_remove (int n) { ::octave_remove_history (n); } int gnu_history::do_where (void) const { return ::octave_where_history (); } int gnu_history::do_length (void) const { return ::octave_history_length (); } int gnu_history::do_max_input_history (void) const { return ::octave_max_input_history (); } int gnu_history::do_base (void) const { return ::octave_history_base (); } int gnu_history::do_current_number (void) const { return (xsize > 0) ? do_base () + do_where () : -1; } void gnu_history::do_stifle (int n) { ::octave_stifle_history (n); } int gnu_history::do_unstifle (void) { return ::octave_unstifle_history (); } int gnu_history::do_is_stifled (void) const { return ::octave_history_is_stifled (); } void gnu_history::do_set_mark (int n) { mark = n; } int gnu_history::do_goto_mark (void) { if (mark) { char *line = ::octave_history_goto_mark (mark); if (line) { command_editor::insert_text (line); command_editor::clear_undo_list (); } } mark = 0; // FIXME -- for operate_and_get_next. command_editor::remove_startup_hook (command_history::goto_mark); return 0; } void gnu_history::do_read (const std::string& f, bool must_exist) { if (! f.empty ()) { int status = ::octave_read_history (f.c_str ()); if (status != 0 && must_exist) error (status); else { lines_in_file = do_where (); ::octave_using_history (); } } else error ("gnu_history::read: missing file name"); } void gnu_history::do_read_range (const std::string& f, int from, int to, bool must_exist) { if (from < 0) from = lines_in_file; if (! f.empty ()) { int status = ::octave_read_history_range (f.c_str (), from, to); if (status != 0 && must_exist) error (status); else { lines_in_file = do_where (); ::octave_using_history (); } } else error ("gnu_history::read_range: missing file name"); } void gnu_history::do_write (const std::string& f_arg) const { if (initialized) { std::string f = f_arg; if (f.empty ()) f = xfile; if (! f.empty ()) { int status = ::octave_write_history (f.c_str ()); if (status != 0) error (status); } else error ("gnu_history::write: missing file name"); } } void gnu_history::do_append (const std::string& f_arg) { if (initialized) { if (lines_this_session) { if (lines_this_session < do_where ()) { // Create file if it doesn't already exist. std::string f = f_arg; if (f.empty ()) f = xfile; if (! f.empty ()) { file_stat fs (f); if (! fs) { int tem; tem = gnulib::open (f.c_str (), O_CREAT, 0666); gnulib::close (tem); } int status = ::octave_append_history (lines_this_session, f.c_str ()); if (status != 0) error (status); else lines_in_file += lines_this_session; lines_this_session = 0; } else error ("gnu_history::append: missing file name"); } } } } void gnu_history::do_truncate_file (const std::string& f_arg, int n) const { if (initialized) { std::string f = f_arg; if (f.empty ()) f = xfile; if (! f.empty ()) ::octave_history_truncate_file (f.c_str (), n); else error ("gnu_history::truncate_file: missing file name"); } } string_vector gnu_history::do_list (int limit, bool number_lines) const { string_vector retval; if (limit) retval = ::octave_history_list (limit, number_lines); return retval; } std::string gnu_history::do_get_entry (int n) const { std::string retval; char *line = ::octave_history_get (do_base () + n); if (line) retval = line; return retval; } void gnu_history::do_replace_entry (int which, const std::string& line) { ::octave_replace_history_entry (which, line.c_str ()); } void gnu_history::do_clean_up_and_save (const std::string& f_arg, int n) { if (initialized) { std::string f = f_arg; if (f.empty ()) f = xfile; if (! f.empty ()) { if (n < 0) n = xsize; stifle (n); do_write (f.c_str ()); } else error ("gnu_history::clean_up_and_save: missing file name"); } } #endif bool command_history::instance_ok (void) { bool retval = true; if (! instance) { make_command_history (); if (instance) singleton_cleanup_list::add (cleanup_instance); } if (! instance) { (*current_liboctave_error_handler) ("unable to create command history object!"); retval = false; } return retval; } void command_history::make_command_history (void) { #if defined (USE_READLINE) instance = new gnu_history (); #else instance = new command_history (); #endif } void command_history::initialize (bool read_history_file, const std::string& f_arg, int sz, const std::string & control_arg) { if (instance_ok ()) instance->do_initialize (read_history_file, f_arg, sz, control_arg); } bool command_history::is_initialized (void) { // We just want to check the status of an existing instance, not // create one. return instance && instance->do_is_initialized (); } void command_history::set_file (const std::string& f_arg) { if (instance_ok ()) { std::string f = file_ops::tilde_expand (f_arg); instance->do_set_file (f); } } std::string command_history::file (void) { return (instance_ok ()) ? instance->do_file () : std::string (); } void command_history::process_histcontrol (const std::string& control_arg) { if (instance_ok ()) instance->do_process_histcontrol(control_arg); } std::string command_history::histcontrol (void) { return (instance_ok ()) ? instance->do_histcontrol () : std::string (); } void command_history::set_size (int n) { if (instance_ok ()) instance->do_set_size (n); } int command_history::size (void) { return (instance_ok ()) ? instance->do_size () : 0; } void command_history::ignore_entries (bool flag) { if (instance_ok ()) instance->do_ignore_entries (flag); } bool command_history::ignoring_entries (void) { return (instance_ok ()) ? instance->do_ignoring_entries () : false; } void command_history::add (const std::string& s) { if (instance_ok ()) instance->do_add (s); } void command_history::remove (int n) { if (instance_ok ()) instance->do_remove (n); } int command_history::where (void) { return (instance_ok ()) ? instance->do_where () : 0; } int command_history::length (void) { return (instance_ok ()) ? instance->do_length () : 0; } int command_history::max_input_history (void) { return (instance_ok ()) ? instance->do_max_input_history () : 0; } int command_history::base (void) { return (instance_ok ()) ? instance->do_base () : 0; } int command_history::current_number (void) { return (instance_ok ()) ? instance->do_current_number () : 0; } void command_history::stifle (int n) { if (instance_ok ()) instance->do_stifle (n); } int command_history::unstifle (void) { return (instance_ok ()) ? instance->do_unstifle () : 0; } int command_history::is_stifled (void) { return (instance_ok ()) ? instance->do_is_stifled () : 0; } void command_history::set_mark (int n) { if (instance_ok ()) instance->do_set_mark (n); } int command_history::goto_mark (void) { return (instance_ok ()) ? instance->do_goto_mark () : 0; } void command_history::read (bool must_exist) { read (file (), must_exist); } void command_history::read (const std::string& f, bool must_exist) { if (instance_ok ()) instance->do_read (f, must_exist); } void command_history::read_range (int from, int to, bool must_exist) { read_range (file (), from, to, must_exist); } void command_history::read_range (const std::string& f, int from, int to, bool must_exist) { if (instance_ok ()) instance->do_read_range (f, from, to, must_exist); } void command_history::write (const std::string& f) { if (instance_ok ()) instance->do_write (f); } void command_history::append (const std::string& f) { if (instance_ok ()) instance->do_append (f); } void command_history::truncate_file (const std::string& f, int n) { if (instance_ok ()) instance->do_truncate_file (f, n); } string_vector command_history::list (int limit, bool number_lines) { return (instance_ok ()) ? instance->do_list (limit, number_lines) : string_vector (); } std::string command_history::get_entry (int n) { return (instance_ok ()) ? instance->do_get_entry (n) : std::string (); } void command_history::replace_entry (int which, const std::string& line) { if (instance_ok ()) instance->do_replace_entry (which, line); } void command_history::clean_up_and_save (const std::string& f, int n) { if (instance_ok ()) instance->do_clean_up_and_save (f, n); } void command_history::do_process_histcontrol (const std::string&) { (*current_liboctave_warning_handler) ("readline is not linked, so history control is not available"); } void command_history::do_initialize (bool read_history_file, const std::string& f_arg, int sz, const std::string & control_arg) { command_history::set_file (f_arg); command_history::set_size (sz); command_history::process_histcontrol (control_arg); if (read_history_file) command_history::read (false); initialized = true; } bool command_history::do_is_initialized (void) const { return initialized; } void command_history::do_set_file (const std::string& f) { xfile = f; } std::string command_history::do_file (void) { return xfile; } void command_history::do_set_size (int n) { xsize = n; } int command_history::do_size (void) const { return xsize; } void command_history::do_ignore_entries (bool flag) { ignoring_additions = flag; } bool command_history::do_ignoring_entries (void) const { return ignoring_additions; } void command_history::do_add (const std::string&) { } void command_history::do_remove (int) { } int command_history::do_where (void) const { return 0; } int command_history::do_length (void) const { return 0; } int command_history::do_max_input_history (void) const { return 0; } int command_history::do_base (void) const { return 0; } int command_history::do_current_number (void) const { return (xsize > 0) ? do_base () + do_where () : -1; } void command_history::do_stifle (int) { } int command_history::do_unstifle (void) { return -1; } int command_history::do_is_stifled (void) const { return 0; } void command_history::do_set_mark (int) { } int command_history::do_goto_mark (void) { return 0; } void command_history::do_read (const std::string& f, bool) { if (f.empty ()) error ("command_history::read: missing file name"); } void command_history::do_read_range (const std::string& f, int, int, bool) { if (f.empty ()) error ("command_history::read_range: missing file name"); } void command_history::do_write (const std::string& f_arg) const { if (initialized) { std::string f = f_arg; if (f.empty ()) f = xfile; if (f.empty ()) error ("command_history::write: missing file name"); } } void command_history::do_append (const std::string& f_arg) { if (initialized) { if (lines_this_session) { if (lines_this_session < do_where ()) { // Create file if it doesn't already exist. std::string f = f_arg; if (f.empty ()) f = xfile; if (f.empty ()) error ("command_history::append: missing file name"); } } } } void command_history::do_truncate_file (const std::string& f_arg, int) const { if (initialized) { std::string f = f_arg; if (f.empty ()) f = xfile; if (f.empty ()) error ("command_history::truncate_file: missing file name"); } } string_vector command_history::do_list (int, bool) const { return string_vector (); } std::string command_history::do_get_entry (int) const { return std::string (); } void command_history::do_replace_entry (int, const std::string&) { } void command_history::do_clean_up_and_save (const std::string& f_arg, int) { if (initialized) { std::string f = f_arg; if (f.empty ()) f = xfile; if (f.empty ()) error ("command_history::clean_up_and_save: missing file name"); } } void command_history::error (int err_num) const { (*current_liboctave_error_handler) ("%s", gnulib::strerror (err_num)); } void command_history::error (const std::string& s) const { (*current_liboctave_error_handler) ("%s", s.c_str ()); }