Mercurial > pytave
view Makefile.am @ 422:8247f298fd16
Raise Octave errors instead of exceptions for conversion errors
* Makefile.am (COMMON_SOURCE_FILES): Include oct-py-error.cc in the list.
(PYTAVE_HEADER_FILES): Include oct-py-error.h in the list.
* oct-py-error.cc, oct-py-error.h: New files defining error conditions.
* oct-py-types.cc (pytave::extract_py_bool, pytave::extract_py_complex,
pytave::extract_py_float, pytave::make_py_array, pytave::extract_py_scalar_map,
pytave::extract_py_int64, pytave::extract_py_uint64, pytave::extract_py_str):
Use new error condition functions instead of throwing exceptions.
(pytave::make_py_array, pytave::make_py_numeric_value, pytave::make_py_tuple):
Raise Octave error instead of throwing exceptions.
* __py_struct_from_dict__.cc (F__py_int64_scalar_value__,
F__py_uint64_scalar_value__): Remove exception handling logic.
* pycall.cc (Fpycall): Remove conversion exception handlers.
* pyeval.cc (Fpyeval): Likewise.
* pyexec.cc (Fpyexec): Likewise.
* exceptions.h (pytave::pytave_exception, pytave::octave_error_exception,
pytave::octave_parse_exception, pytave::value_convert_exception,
pytave::object_convert_exception, pytave::variable_name_exception): Delete
no longer used exception types.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Thu, 04 May 2017 17:13:38 -0700 |
parents | 7864849e84c2 |
children | 6b9de18b4bdd |
line wrap: on
line source
# Makefile for Pytave # # Copyright (C) 2015-2016 Mike Miller # Copyright (C) 2008 David Grundberg, HÃ¥kan Fors Nilsson # Copyright (C) 2009 Jaroslav Hajek, VZLU Prague # # 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/>. ACLOCAL_AMFLAGS = -I m4 AM_CPPFLAGS = $(OCTAVE_CPPFLAGS) $(PYTHON_CPPFLAGS) AM_CXXFLAGS = -W -Wall INCFLAGS = $(DEFAULT_INCLUDES) export INCFLAGS COMMON_SOURCE_FILES = \ exceptions.cc \ oct-py-error.cc \ oct-py-eval.cc \ oct-py-init.cc \ oct-py-types.cc \ oct-py-util.cc DOC_FILES = \ INSTALL.md \ README.md M_FILES = \ @py/py.m \ @py/subsref.m \ @pyobject/cell.m \ @pyobject/char.m \ @pyobject/display.m \ @pyobject/dummy.m \ @pyobject/fieldnames.m \ @pyobject/methods.m \ @pyobject/pyobject.m \ @pyobject/subsasgn.m \ @pyobject/subsref.m \ __py_tests__.m \ pyargs.m \ pyversion.m OCT_FILES = \ __py_struct_from_dict__.oct \ pycall.oct \ pyeval.oct \ pyexec.oct OCT_SOURCE_FILES = $(patsubst %.oct, %.cc, $(OCT_FILES)) PYTAVE_HEADER_FILES = \ config.h \ exceptions.h \ oct-py-error.h \ oct-py-eval.h \ oct-py-init.h \ oct-py-object.h \ oct-py-types.h \ oct-py-util.h TST_FILES = $(addsuffix -tst,$(OCT_SOURCE_FILES)) EXTRA_DIST = $(DOC_FILES) $(M_FILES) $(OCT_SOURCE_FILES) noinst_LTLIBRARIES = liboctpython.la liboctpython_la_CPPFLAGS = $(AM_CPPFLAGS) liboctpython_la_SOURCES = $(COMMON_SOURCE_FILES) $(PYTAVE_HEADER_FILES) CLEANFILES = *.oct *-tst PKG_ADD PKG_DEL fntests.log SUFFIXES = .oct AM_V_MKOCTFILE = $(am__v_MKOCTFILE_$(V)) am__v_MKOCTFILE_ = $(am__v_MKOCTFILE_$(AM_DEFAULT_VERBOSITY)) am__v_MKOCTFILE_0 = @echo " MKOCTFIL" $@; am__v_MKOCTFILE_1 = OCT_LIBS = liboctpython.la $(PYTHON_LIBS) OCT_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(MKOCTFILE) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ %.oct: %.cc liboctpython.la $(PYTAVE_HEADER_FILES) $(AM_V_MKOCTFILE)$(OCT_LINK) $< $(OCT_LIBS) %.cc-tst: %.cc $(AM_V_GEN)rm -f $@-t $@ && \ ( echo "## DO NOT EDIT! Generated automatically from $(<F) by Make."; \ $(GREP) '^%!' $< \ ) > $@-t && \ mv $@-t $@ PKG_ADD: $(OCT_SOURCE_FILES) $(AM_V_GEN)for f in $(OCT_SOURCE_FILES); do \ b=$${f%.cc}; \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ funcs=`$(SED) -n 's/^DEFUN.*(\(\w\+\),.*/\1/p' $$d/$$f | grep -v $$b`; \ if test -n "$$funcs"; then \ echo "$$funcs" | $(SED) "s/.*/autoload (\"&\", \"$$b.oct\");/" > $@-t && \ mv $@-t $@ || exit $?; \ fi; \ done PKG_DEL: $(OCT_SOURCE_FILES) $(AM_V_GEN)for f in $(OCT_SOURCE_FILES); do \ b=$${f%.cc}; \ if test -f $$f; then d=.; else d=$(srcdir); fi; \ funcs=`$(SED) -n 's/^DEFUN.*(\(\w\+\),.*/\1/p' $$d/$$f | grep -v $$b`; \ if test -n "$$funcs"; then \ echo "$$funcs" | $(SED) "s/.*/autoload (\"&\", which (\"&\"), \"remove\");/" > $@-t && \ mv $@-t $@ || exit $?; \ fi; \ done all-local: $(OCT_FILES) PKG_ADD PKG_DEL @echo "" @echo "Pytave successfully built. Now choose from the following:" @echo "" @echo " * run the test suite" @echo " make check" @echo "" @echo " * run an Octave session with py* functions" @echo " octave --path=\"\$$(pwd)\"" @echo "" check-local: $(M_FILES) $(TST_FILES) $(OCTAVE) --no-gui-libs --no-history --no-window-system --norc \ --path="$(abs_builddir)" --path="$(abs_srcdir)" \ $(srcdir)/__py_tests__.m $(M_FILES) $(TST_FILES)