Mercurial > pytave

view @pyobject/display.m @ 362:b0677c492655

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Overhaul Python object storage and wrapping in pyobject * oct-py-util.cc, oct-py-util.h (pytave::py_objstore_del, pytave::py_objstore_get, pytave::py_objstore_put, pytave::pyobject_wrap_object, pytave::pyobject_unwrap_object): New functions. (pytave::get_object_from_python): Use pyobject_unwrap_object. * octave_to_python.cc (pytave::octvalue_to_pyobj): Use pyobject_unwrap_object. * python_to_octave.cc (pytave::pyobj_to_octvalue): Use pyobject_wrap_object. (pytave::pyobj_to_oct_pyobject): Delete. * __py_struct_from_dict__.cc (F__py_objstore_del__, F__py_objstore_get__, F__py_objstore_put__): New functions. * @pyobject/pyobject.m (pyobject.m_id): Rename from id. (pyobject.pyobject): Use __py_objstore_put__, simplify conditional logic. (pyobject.delete): Use __py_objstore_del__. (pyobject.id): Rename from getid. * @pyobject/display.m: Use pyobject.id method name, format as hex.
author Mike Miller <mtmiller@octave.org>
date Thu, 25 Aug 2016 09:51:58 -0700
parents 3bf799e80ca5
children c90d70aec553 24546b7021db
line wrap: on
line source

## Copyright (C) 2016 Colin B. Macdonald
##
## This file is part of Pytave
##
## Pytave 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.
##
## This software 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 this software; see the file COPYING.
## If not, see <http://www.gnu.org/licenses/>.

## -*- texinfo -*-
## @documentencoding UTF-8
## @defmethod @@pyobject display (@var{x})
## Custom display for pyobjects.
##
## Example:
## @example
## @group
## pyexec ("import sys")
## sysmodule = pyeval ("sys")
##   @result{} sysmodule = [pyobject ...]
##
##       <module 'sys' (built-in)>
##
## @end group
## @end example
##
## @seealso{@@pyobject/char, @@pyobject/disp}
## @end defmethod


function display (x)

  loose = ! __compactformat__ ();

  printf ("%s = [pyobject 0x%x]\n", inputname (1), id (x));
  s = char (x);
  s = make_indented (s);
  if (loose), printf ("\n"); endif
  disp (s)
  if (loose), printf ("\n"); endif

endfunction


function s = make_indented (s, n)
  if (nargin == 1)
    n = 2;
  endif
  pad = char (double (" ") * ones (1,n));
  s = strrep (s, "\n", ["\n" pad]);
  s = [pad s];  # first line
endfunction