Mercurial > pytave

annotate __py_struct_from_dict__.cc @ 420:7864849e84c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate some compiler warnings * Makefile.am (AM_CXXFLAGS): Build with -W -Wall by default. * __py_struct_from_dict__.cc (F__py_int64_scalar_value__, F__py_uint64_scalar_value__, F__py_is_none__, F__py_isinstance__, F__py_objstore_del__, F__py_objstore_get__, F__py_objstore_put__, F__py_string_value__, F__py_struct_from_dict__): Remove unused parameter to eliminate -Wunused-parameter warning. * pyexec.cc (Fpyexec): Likewise. * oct-py-init.cc (pytave::py_init): Declare argv array correctly to eliminate -Wwrite-strings warning. * oct-py-types.cc (pytave::make_py_bool): Explicitly increment and return value to eliminate -Wstrict-aliasing warning. (pytave::make_py_complex, pytave::extract_py_complex): Copy complex values between C++ and Python types to eliminate -Wstrict-aliasing warning. (pytave::extract_py_int64): Add braces to nested if block to eliminate -Wparentheses warning.
author Mike Miller <mtmiller@octave.org>
date Thu, 04 May 2017 12:31:07 -0700
parents 9bf8ba050122
children 8247f298fd16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
345
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
1 /*
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
2
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
3 Copyright (C) 2016 Mike Miller
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
4
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
5 This file is part of Pytave.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
6
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
7 Pytave is free software: you can redistribute it and/or modify it
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
8 under the terms of the GNU General Public License as published by the
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
9 Free Software Foundation, either version 3 of the License, or (at your
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
10 option) any later version.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
11
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
12 Pytave is distributed in the hope that it will be useful, but WITHOUT
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
15 for more details.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
16
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
18 along with Pytave; see the file COPYING. If not, see
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
19 <http://www.gnu.org/licenses/>.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
20
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
21 */
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
22
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
23 #if defined (HAVE_CONFIG_H)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
24 # include <config.h>
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
25 #endif
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
26
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
27 #include <Python.h>
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
28 #include <octave/oct.h>
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
29
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
30 #include "exceptions.h"
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
31 #include "oct-py-init.h"
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
32 #include "oct-py-object.h"
345
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
33 #include "oct-py-types.h"
358
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
34 #include "oct-py-util.h"
411
3613ffbd52b2 Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents: 409
diff changeset
35
373
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
36 DEFUN_DLD (__py_class_name__, args, ,
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
37 "-*- texinfo -*-\n\
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
38 @deftypefn {} {} __py_class_name__ (@var{obj})\n\
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
39 Return the name of the class of the Python object @var{obj}.\n\
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
40 \n\
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
41 This is a private internal function not intended for direct use.\n\
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
42 @end deftypefn")
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
43 {
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
44 if (args.length () != 1)
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
45 print_usage ();
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
46
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
47 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
48 error ("__py_class_name__: argument must be a valid Python object");
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
49
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
50 pytave::py_init ();
373
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
51
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
52 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
373
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
53 std::string name = pytave::py_object_class_name (obj);
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
54
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
55 return ovl (name);
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
56 }
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
57
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
58 /*
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
59 %!assert (__py_class_name__ (pyeval ("None")), "NoneType")
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
60 %!assert (__py_class_name__ (pyeval ("'Octave'")), "str")
375
d0a7f66393fc Fix __py_class_name__ tests to work with Python 2
Mike Miller <mtmiller@octave.org>
parents: 374
diff changeset
61 %!assert (__py_class_name__ (pyeval ("{}")), "dict")
373
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
62 %!assert (__py_class_name__ (pyeval ("[]")), "list")
375
d0a7f66393fc Fix __py_class_name__ tests to work with Python 2
Mike Miller <mtmiller@octave.org>
parents: 374
diff changeset
63 %!assert (__py_class_name__ (pyeval ("()")), "tuple")
373
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
64 %!assert (__py_class_name__ (pyeval ("__import__('array').array('d')")), "array.array")
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
65
386
668fcb0f68ef Fix extraction of class name for Python types without a module (fixes issue #79)
Mike Miller <mtmiller@octave.org>
parents: 375
diff changeset
66 %% Test an anonymous class with its __module__ property set to None
668fcb0f68ef Fix extraction of class name for Python types without a module (fixes issue #79)
Mike Miller <mtmiller@octave.org>
parents: 375
diff changeset
67 %!assert (__py_class_name__ (pyeval ("[[t() for t.__module__ in (None,)][0] for t in (type('foo', (), {}),)][0]")), "foo")
668fcb0f68ef Fix extraction of class name for Python types without a module (fixes issue #79)
Mike Miller <mtmiller@octave.org>
parents: 375
diff changeset
68
373
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
69 %!error __py_class_name__ ()
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
70 %!error __py_class_name__ (1)
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
71 %!error __py_class_name__ (1, 2)
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
72 */
0e4097c66788 Report a Python object's fully qualified class name correctly
Mike Miller <mtmiller@octave.org>
parents: 368
diff changeset
73
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
74 DEFUN_DLD (__py_int64_scalar_value__, args, ,
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
75 "-*- texinfo -*-\n\
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
76 @deftypefn {} {} __py_int64_scalar_value__ (@var{x})\n\
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
77 Extract a scalar int64 value from the Python integer @var{x}.\n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
78 \n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
79 This is a private internal function not intended for direct use.\n\
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
80 @end deftypefn")
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
81 {
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
82 if (args.length () != 1)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
83 print_usage ();
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
84
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
85 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
86 error ("pyobject.int64: argument must be a Python object");
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
87
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
88 pytave::py_init ();
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
89
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
90 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
91 if (! obj)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
92 error ("pyobject.int64: argument must be a valid Python object");
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
93
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
94 octave_int64 retval;
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
95
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
96 try
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
97 {
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
98 retval = pytave::extract_py_int64 (obj);
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
99 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
100 catch (pytave::object_convert_exception const &)
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
101 {
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
102 error ("pyobject.int64: argument must be a Python int or long object");
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
103 }
415
9bf8ba050122 Replace all remaining Boost.Python references
Mike Miller <mtmiller@octave.org>
parents: 411
diff changeset
104 catch (pytave::error_already_set const &)
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
105 {
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
106 std::string message = pytave::fetch_exception_message ();
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
107 error ("pyobject.int64: %s", message.c_str ());
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
108 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
109
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
110 return ovl (retval);
356
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
111 }
6cd581661176 pyobject.int64: New method to convert integer object to Octave int64
Mike Miller <mtmiller@octave.org>
parents: 345
diff changeset
112
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
113 /*
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
114 %!assert (__py_int64_scalar_value__ (pyobject (pyeval ("0"))), int64 (0))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
115 %!assert (__py_int64_scalar_value__ (pyobject (pyeval ("2**62"))), int64 (2^62))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
116 %!assert (__py_int64_scalar_value__ (pyobject (pyeval ("-2**62"))), int64 (-2^62))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
117 %!assert (__py_int64_scalar_value__ (pyobject (pyeval ("2**128"))), intmax ("int64"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
118 %!assert (__py_int64_scalar_value__ (pyobject (pyeval ("-2**128"))), intmin ("int64"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
119
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
120 %!error __py_int64_scalar_value__ ()
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
121 %!error __py_int64_scalar_value__ (1)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
122 %!error __py_int64_scalar_value__ (pyeval ("None"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
123 %!error __py_int64_scalar_value__ (1, 2)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
124 */
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
125
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
126 DEFUN_DLD (__py_uint64_scalar_value__, args, ,
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
127 "-*- texinfo -*-\n\
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
128 @deftypefn {} {} __py_uint64_scalar_value__ (@var{x})\n\
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
129 Extract a scalar uint64 value from the Python integer @var{x}.\n\
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
130 \n\
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
131 This is a private internal function not intended for direct use.\n\
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
132 @end deftypefn")
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
133 {
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
134 if (args.length () != 1)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
135 print_usage ();
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
136
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
137 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
138 error ("pyobject.uint64: argument must be a Python object");
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
139
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
140 pytave::py_init ();
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
141
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
142 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
143 if (! obj)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
144 error ("pyobject.uint64: argument must be a valid Python object");
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
145
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
146 octave_uint64 retval;
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
147
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
148 try
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
149 {
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
150 retval = pytave::extract_py_uint64 (obj);
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
151 }
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
152 catch (pytave::object_convert_exception const &)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
153 {
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
154 error ("pyobject.uint64: argument must be a Python int or long object");
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
155 }
415
9bf8ba050122 Replace all remaining Boost.Python references
Mike Miller <mtmiller@octave.org>
parents: 411
diff changeset
156 catch (pytave::error_already_set const &)
374
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
157 {
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
158 std::string message = pytave::fetch_exception_message ();
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
159 error ("pyobject.uint64: %s", message.c_str ());
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
160 }
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
161
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
162 return ovl (retval);
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
163 }
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
164
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
165 /*
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
166 %!assert (__py_uint64_scalar_value__ (pyobject (pyeval ("0"))), uint64 (0))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
167 %!assert (__py_uint64_scalar_value__ (pyobject (pyeval ("2**62"))), uint64 (2^62))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
168 %!assert (__py_uint64_scalar_value__ (pyobject (pyeval ("2**128"))), intmax ("uint64"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
169 %!assert (__py_uint64_scalar_value__ (pyobject (pyeval ("-2**128"))), intmin ("uint64"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
170
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
171 %!error __py_uint64_scalar_value__ ()
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
172 %!error __py_uint64_scalar_value__ (1)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
173 %!error __py_uint64_scalar_value__ (pyeval ("None"))
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
174 %!error __py_uint64_scalar_value__ (1, 2)
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
175 */
d362cdd1ddeb pyobject: add conversion methods for single, intX, and uintX types
Mike Miller <mtmiller@octave.org>
parents: 373
diff changeset
176
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
177 DEFUN_DLD (__py_is_none__, args, ,
368
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
178 "-*- texinfo -*-\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
179 @deftypefn {} {} __py_is_none__ (@var{x})\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
180 Check whether the Python object @var{obj} is the @code{None} object.\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
181 \n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
182 This is a private internal function not intended for direct use.\n\
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
183 @end deftypefn")
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
184 {
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
185 if (args.length () != 1)
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
186 print_usage ();
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
187
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
188 pytave::py_init ();
368
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
189
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
190 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
368
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
191
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
192 return ovl (obj.is_none ());
368
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
193 }
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
194
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
195 /*
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
196 %!assert (__py_is_none__ (pyobject ()))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
197 %!assert (__py_is_none__ (pyeval ("None")))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
198 %!assert (! __py_is_none__ (1))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
199 %!assert (! __py_is_none__ ("None"))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
200 %!assert (! __py_is_none__ (pyobject (1)))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
201 %!assert (! __py_is_none__ (pyobject ("None")))
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
202
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
203 %!error __py_is_none__ ()
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
204 %!error __py_is_none__ (1, 2)
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
205 */
4d54fb68de71 __py_is_none__: new compiled function to test whether an object is None
Mike Miller <mtmiller@octave.org>
parents: 365
diff changeset
206
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
207 DEFUN_DLD (__py_isinstance__, args, ,
358
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
208 "-*- texinfo -*-\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
209 @deftypefn {} {} __py_isinstance__ (@var{x})\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
210 Check whether the Python object @var{obj} is an instance of a Python type\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
211 specified by the string @var{type}.\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
212 \n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
213 This is a private internal function not intended for direct use.\n\
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
214 @end deftypefn")
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
215 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
216 octave_value_list retval;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
217
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
218 int nargin = args.length ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
219 if (nargin != 2)
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
220 {
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
221 print_usage ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
222 return retval;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
223 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
224
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
225 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
226 error ("pyobject.isa: OBJ must be a Python object");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
227
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
228 if (! args(1).is_string ())
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
229 error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
230
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
231 std::string typestr = args(1).string_value ();
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
232 if (! ((typestr.size () > 3) && (typestr.compare (0, 3, "py.") == 0)))
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
233 error ("pyobject.isa: TYPE must be a string naming a Python type (py.*)");
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
234
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
235 typestr = typestr.substr (3);
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
236
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
237 pytave::py_init ();
358
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
238
408
f833e29b2c12 Simplify conversion where existing Python object argument expected (fixes issue #67)
Mike Miller <mtmiller@octave.org>
parents: 405
diff changeset
239 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
409
b9b8790d1082 Add overload of py_isinstance taking a string decribing a type
Mike Miller <mtmiller@octave.org>
parents: 408
diff changeset
240 retval(0) = pytave::py_isinstance (obj, typestr);
358
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
241
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
242 return retval;
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
243 }
d41fc23d4b9f pyobject.isa: New overload method to handle Python types (fixes issue #49)
Mike Miller <mtmiller@octave.org>
parents: 356
diff changeset
244
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
245 DEFUN_DLD (__py_objstore_del__, args, ,
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
246 "-*- texinfo -*-\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
247 @deftypefn {} {} __py_objstore_del__ (@var{key})\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
248 Delete the Python object stored under @var{key} from the object store.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
249 \n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
250 This is a private internal function not intended for direct use.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
251 @end deftypefn")
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
252 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
253 if (args.length () != 1)
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
254 print_usage ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
255
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
256 pytave::py_init ();
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
257
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
258 uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_del__: KEY must be an integer");
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
259 pytave::py_objstore_del (key);
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
260
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
261 return ovl ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
262 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
263
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
264 DEFUN_DLD (__py_objstore_get__, args, ,
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
265 "-*- texinfo -*-\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
266 @deftypefn {} {} __py_objstore_get__ (@var{key})\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
267 Get the Python object stored under @var{key} from the object store.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
268 \n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
269 This is a private internal function not intended for direct use.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
270 @end deftypefn")
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
271 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
272 if (args.length () != 1)
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
273 print_usage ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
274
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
275 pytave::py_init ();
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
276
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
277 uint64_t key = args(0).xuint64_scalar_value ("__py_objstore_get__: KEY must be an integer");
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
278 PyObject *obj = pytave::py_objstore_get (key);
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
279
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
280 if (! obj)
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
281 error ("__py_objstore_get__: no existing Python object found for key %ju", key);
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
282
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
283 octave_value retval = pytave::pyobject_wrap_object (obj);
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
284
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
285 return ovl (retval);
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
286 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
287
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
288 DEFUN_DLD (__py_objstore_put__, args, ,
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
289 "-*- texinfo -*-\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
290 @deftypefn {} {} __py_objstore_put__ (@var{value})\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
291 Convert @var{value} to a Python value and store in the object store.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
292 \n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
293 This is a private internal function not intended for direct use.\n\
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
294 @end deftypefn")
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
295 {
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
296 if (args.length () != 1)
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
297 print_usage ();
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
298
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
299 pytave::py_init ();
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
300
411
3613ffbd52b2 Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents: 409
diff changeset
301 pytave::python_object obj = pytave::py_implicitly_convert_argument (args(0));
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
302
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
303 if (! obj)
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
304 error ("__py_objstore_put__: VALUE must be convertible to a Python value");
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
305
411
3613ffbd52b2 Overhaul implicit conversion of arguments and return values
Mike Miller <mtmiller@octave.org>
parents: 409
diff changeset
306 uint64_t key = pytave::py_objstore_put (obj.release ());
362
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
307
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
308 return ovl (octave_uint64 (key));
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
309 }
b0677c492655 Overhaul Python object storage and wrapping in pyobject
Mike Miller <mtmiller@octave.org>
parents: 358
diff changeset
310
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
311 DEFUN_DLD (__py_string_value__, args, ,
365
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
312 "-*- texinfo -*-\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
313 @deftypefn {} {} __py_string_value__ (@var{obj})\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
314 Return the string value or representation of the Python object @var{obj}.\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
315 \n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
316 This is a private internal function not intended for direct use.\n\
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
317 @end deftypefn")
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
318 {
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
319 if (args.length () != 1)
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
320 print_usage ();
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
321
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
322 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
323 error ("pyobject.char: argument must be a valid Python object");
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
324
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
325 pytave::py_init ();
365
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
326
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
327 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
365
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
328 if (! obj)
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
329 error ("pyobject.char: argument must be a valid Python object");
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
330
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
331 std::string str;
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
332
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
333 if (PyBytes_Check (obj) || PyUnicode_Check (obj))
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
334 str = pytave::extract_py_str (obj);
403
3644df6564bc maint: use C++11 nullptr rather than 0 or NULL
Mike Miller <mtmiller@octave.org>
parents: 386
diff changeset
335 else if (Py_TYPE (obj)->tp_str != nullptr)
365
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
336 {
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
337 pytave::python_object s = PyObject_Str (obj);
365
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
338 str = pytave::extract_py_str (s);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
339 }
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
340 else
404
aef165ff92b0 Adopt pytave::python_object where objects are local or created and returned
Mike Miller <mtmiller@octave.org>
parents: 403
diff changeset
341 error ("pyobject.char: cannot convert Python object to string");
365
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
342
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
343 return ovl (str);
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
344 }
087e7bc3697f Do not automatically convert Python strings to Octave strings (fixes issue #65)
Mike Miller <mtmiller@octave.org>
parents: 362
diff changeset
345
420
7864849e84c2 Eliminate some compiler warnings
Mike Miller <mtmiller@octave.org>
parents: 415
diff changeset
346 DEFUN_DLD (__py_struct_from_dict__, args, ,
345
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
347 "-*- texinfo -*-\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
348 @deftypefn {} {} __py_struct_from_dict__ (@var{dict})\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
349 Extract a scalar struct from the Python dict @var{dict}.\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
350 \n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
351 This is a private internal function not intended for direct use.\n\
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
352 @end deftypefn")
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
353 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
354 octave_value_list retval;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
355 std::string id;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
356
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
357 int nargin = args.length ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
358
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
359 if (nargin != 1)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
360 {
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
361 print_usage ();
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
362 return retval;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
363 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
364
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
365 if (! (args(0).is_object () && args(0).class_name () == "pyobject"))
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
366 error ("pyobject.struct: argument must be a Python object");
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
367
405
478d83448b0b Refactor Python initialization into a common function
Mike Miller <mtmiller@octave.org>
parents: 404
diff changeset
368 pytave::py_init ();
345
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
369
408
f833e29b2c12 Simplify conversion where existing Python object argument expected (fixes issue #67)
Mike Miller <mtmiller@octave.org>
parents: 405
diff changeset
370 pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
f833e29b2c12 Simplify conversion where existing Python object argument expected (fixes issue #67)
Mike Miller <mtmiller@octave.org>
parents: 405
diff changeset
371 retval(0) = pytave::extract_py_scalar_map (obj);
345
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
372
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
373 return retval;
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
374 }
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
375
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
376 /*
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
377 ## No test needed for internal helper function.
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
378 %!assert (1)
baff3b90dcb1 __py_struct_from_dict__: new private compiled conversion function
Mike Miller <mtmiller@octave.org>
parents:
diff changeset
379 */