Mercurial > hg > octave-nkf
view src/shared-fcns.h @ 18484:bcd71a2531d3
Support disp/display overloading in classdef
* ov-classdef.h (octave_classdef::print, octave_classdef::print_raw):
Move definition to C++ file.
(octave_classdef::print_as_scalar): Removed method.
(octave_classdef::print_name_tag, octave_classdef::print_with_name):
New methods.
* ov-classdef.cc (octave_classdef::print): Moved from header.
(octave_classdef::print_raw): Likewise. Call overloaded disp, if
defined and not called from builtin.
(octave_classdef::print_name_tag): New method.
(octave_classdef::print_with_name): New method, calls overloaded
"display" if defined.
* pr-output.cc (octave_print_internal(std::ostream, bool): Avoid
compilation warning.
(Frats, Fdisp, Ffdisp): Allow to call non-const octave_value::print.
* ov.h (octave_value::print): Make non-const.
* ov-base.h (octave_base_value::print): Likewise.
* ov-base.cc (octave_base_value::print): Likewise.
* ov-base-diag.h (octave_base_diag::print): Likewise.
* ov-base-diag.cc (octave_base_diag::print): Likewise.
* ov-base-mat.h (octave_base_matrix::print): Likewise.
* ov-base-mat.cc (octave_base_matrix::print): Likewise.
* ov-base-scalar.h (octave_base_scalar::print): Likewise.
* ov-base-scalar.cc (octave_base_scalar::print): Likewise.
* ov-base-sparse.h (octave_base_sparse::print): Likewise.
* ov-base-sparse.cc (octave_base_sparse::print): Likewise.
* ov-cell.h (octave_cell::print): Likewise.
* ov-cell.cc (octave_cell::print): Likewise.
* ov-class.h (octave_class::print): Likewise.
* ov-class.cc (octave_class::print): Likewise.
* ov-colon.h (octave_magic_colon::print): Likewise.
* ov-colon.cc (octave_magic_colon::print): Likewise.
* ov-fcn-handle.h (octave_fcn_handle::print): Likewise.
* ov-fcn-handle.cc (octave_fcn_handle::print): Likewise.
* ov-fcn-inline.h (octave_fcn_inline::print): Likewise.
* ov-fcn-inline.cc (octave_fcn_inline::print): Likewise.
* ov-java.h (octave_java::print): Likewise.
* ov-java.cc (octave_java::print): Likewise.
* ov-lazy-idx.h (octave_lazy_index::print): Likewise.
* ov-oncleanup.h (octave_oncleanup::print): Likewise.
* ov-oncleanup.cc (octave_oncleanup::print): Likewise.
* ov-perm.h (octave_perm_matrix::print): Likewise.
* ov-perm.cc (octave_perm_matrix::print): Likewise.
* ov-range.h (octave_range::print): Likewise.
* ov-range.cc (octave_range::print): Likewise.
* ov-struct.h (octave_struct::print, octave_scalar_struct): Likewise.
* ov-struct.cc (octave_struct::print, octave_scalar_struct): Likewise.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Fri, 31 Jan 2014 11:41:19 -0500 |
parents | e0b96a751afc |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 2008-2013 Michael Goffioul 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/>. */ #if defined (__WIN32__) && ! defined (_POSIX_VERSION) #include <windows.h> #include <tlhelp32.h> #ifdef _MSC_VER #define popen _popen #define pclose _pclose #endif static std::string w32_get_octave_home (void) { std::string retval; std::string bin_dir; HANDLE h = CreateToolhelp32Snapshot (TH32CS_SNAPMODULE #ifdef TH32CS_SNAPMODULE32 | TH32CS_SNAPMODULE32 #endif , 0); if (h != INVALID_HANDLE_VALUE) { MODULEENTRY32 mod_info; ZeroMemory (&mod_info, sizeof (mod_info)); mod_info.dwSize = sizeof (mod_info); if (Module32First (h, &mod_info)) { do { std::string mod_name (mod_info.szModule); if (mod_name.find ("octave") != std::string::npos) { bin_dir = mod_info.szExePath; if (bin_dir[bin_dir.length () - 1] != '\\') bin_dir.append (1, '\\'); break; } } while (Module32Next (h, &mod_info)); } CloseHandle (h); } if (! bin_dir.empty ()) { size_t pos = bin_dir.rfind ("\\bin\\"); if (pos != std::string::npos) retval = bin_dir.substr (0, pos); } return retval; } #endif // Find the directory where the octave binary is supposed to be // installed. #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) \ && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM)) static const char dir_sep_char = '\\'; #else static const char dir_sep_char = '/'; #endif static std::string octave_getenv (const std::string& name) { char *value = ::getenv (name.c_str ()); return value ? value : ""; } static std::string get_octave_home (void) { std::string oh = octave_getenv ("OCTAVE_HOME"); #if defined (__WIN32__) && ! defined (_POSIX_VERSION) if (oh.empty ()) oh = w32_get_octave_home (); #endif return oh.empty () ? std::string (OCTAVE_PREFIX) : oh; } static std::string subst_octave_home (const std::string& s) { std::string retval; std::string octave_home = get_octave_home (); std::string prefix = OCTAVE_PREFIX; retval = s; if (octave_home != prefix) { octave_idx_type len = prefix.length (); if (s.substr (0, len) == prefix) retval.replace (0, len, octave_home); } if (dir_sep_char != '/') std::replace (retval.begin (), retval.end (), '/', dir_sep_char); return retval; }