annotate @pyobject/display.m @ 224:7feece80fbfa

pyobject: Octave-style formatting, minor edits * @pyobject/pyobject.m: reformat, add test * @pyobject/dummy.m: reformat, xfail a test * @pyobject/display.m: reformat
author Colin Macdonald <cbm@m.fsf.org>
date Fri, 17 Jun 2016 22:15:28 -0700
parents 3b2b7db7d709
children c56b85f405ba
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
1 ## Copyright (C) 2016 Colin B. Macdonald
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
2 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
3 ## This file is part of PyTave.
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
4 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
5 ## OctSymPy is free software; you can redistribute it and/or modify
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
6 ## it under the terms of the GNU General Public License as published
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
7 ## by the Free Software Foundation; either version 3 of the License,
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
8 ## or (at your option) any later version.
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
9 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
10 ## This software is distributed in the hope that it will be useful,
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
11 ## but WITHOUT ANY WARRANTY; without even the implied warranty
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
12 ## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
13 ## the GNU General Public License for more details.
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
14 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
15 ## You should have received a copy of the GNU General Public
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
16 ## License along with this software; see the file COPYING.
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
17 ## If not, see <http://www.gnu.org/licenses/>.
216
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
18
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
19 ## -*- texinfo -*-
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
20 ## @documentencoding UTF-8
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
21 ## @defmethod @@pyobject display (@var{x})
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
22 ## Custom display for pyobjects.
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
23 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
24 ## Example:
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
25 ## @example
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
26 ## @group
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
27 ## pyexec('import sys')
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
28 ## sysmodule = pyeval('sys')
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
29 ## @result{} sysmodule = [pyobject ...]
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
30 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
31 ## <module 'sys' (built-in)>
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
32 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
33 ## @end group
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
34 ## @end example
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
35 ##
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
36 ## @seealso{@@pyobject/disp}
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
37 ## @end defmethod
216
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
38
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
39
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
40 function display (x)
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
41
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
42 loose = ! __compactformat__ ();
216
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
43
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
44 printf ("%s = [pyobject %s]\n", inputname (1), getid (x));
216
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
45 s = disp (x);
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
46 s = make_indented (s);
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
47 if (loose), printf("\n"); endif
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
48 disp (s)
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
49 if (loose), printf("\n"); endif
216
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
50
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
51 endfunction
216
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
52
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
53
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
54 function s = make_indented(s, n)
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
55 if (nargin == 1)
3b2b7db7d709 Improve display
Colin Macdonald <cbm@m.fsf.org>
parents:
diff changeset
56 n = 2;
224
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
57 endif
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
58 pad = char (double (" ")*ones (1,n));
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
59 s = strrep (s, "\n", ["\n" pad]);
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
60 s = [pad s]; # first line
7feece80fbfa pyobject: Octave-style formatting, minor edits
Colin Macdonald <cbm@m.fsf.org>
parents: 216
diff changeset
61 endfunction