view oct-py-types.h @ 337:d3d355dc44ad

Overhaul Python numeric type creation from Octave scalar types * oct-py-types.cc, oct-py-types.h (pytave::make_py_bool, pytave::make_py_complex, pytave::make_py_float, pytave::make_py_int): New functions to construct Python numeric types. (pytave::make_py_numeric_value): New function to construct the appropriate Python type for a given Octave scalar value. * octave_to_python.cc (pytave::octvalue_to_pyobj): Use make_py_numeric_value. (pytave::octscalar_to_pyobject, pytave::python_integer_value): Delete.
author Mike Miller <mtmiller@octave.org>
date Mon, 15 Aug 2016 21:53:16 -0700
parents c081e30c2f64
children 832ee1f14862
line wrap: on
line source

/*

Copyright (C) 2016 Mike Miller

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.

Pytave 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 Pytave; see the file COPYING.  If not, see
<http://www.gnu.org/licenses/>.

*/

#if ! defined (pytave_oct_py_types_h)
#define pytave_oct_py_types_h 1

#include <Python.h>
#include <complex>
#include <string>

class Cell;
class octave_scalar_map;
class octave_value;

namespace pytave
{

PyObject *
make_py_bool (bool value);

PyObject *
make_py_complex (std::complex<double> value);

PyObject *
make_py_float (double value);

PyObject *
make_py_dict (const octave_scalar_map& map);

int64_t
extract_py_int64 (PyObject *obj);

PyObject *
make_py_int (int32_t value);

PyObject *
make_py_int (uint32_t value);

PyObject *
make_py_int (int64_t value);

PyObject *
make_py_int (uint64_t value);

PyObject *
make_py_list (const Cell& cell);

PyObject *
make_py_numeric_value (const octave_value& value);

std::string
extract_py_str (PyObject *obj);

PyObject *
make_py_str (const std::string& str);

}

#endif