comparison Makefile.am @ 423:6b9de18b4bdd

Eliminate remaining custom exception handling in favor of Octave errors * oct-py-error.cc, oct-py-error.h (pytave::error_python_exception): New function to generate an Octave error from an active Python error condition, based on pytave::fetch_exception_message. * oct-py-eval.cc (pytave::py_call_function, pytave::py_run_string_safe): Use it. * oct-py-types.cc (pytave::make_py_dict): Likewise. * oct-py-util.cc (pytave::py_objstore): Likewise. * pycall.cc (Fpycall): Remove exception handling logic. * pyeval.cc (Fpyeval): Likewise. * pyexec.cc (Fpyexec): Likewise. * exceptions.cc, exceptions.h: Delete. * Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Remove them.
author Mike Miller <mtmiller@octave.org>
date Thu, 04 May 2017 21:15:07 -0700
parents 8247f298fd16
children 14b134ffdc24
comparison
equal deleted inserted replaced
422:8247f298fd16 423:6b9de18b4bdd
27 27
28 INCFLAGS = $(DEFAULT_INCLUDES) 28 INCFLAGS = $(DEFAULT_INCLUDES)
29 export INCFLAGS 29 export INCFLAGS
30 30
31 COMMON_SOURCE_FILES = \ 31 COMMON_SOURCE_FILES = \
32 exceptions.cc \
33 oct-py-error.cc \ 32 oct-py-error.cc \
34 oct-py-eval.cc \ 33 oct-py-eval.cc \
35 oct-py-init.cc \ 34 oct-py-init.cc \
36 oct-py-types.cc \ 35 oct-py-types.cc \
37 oct-py-util.cc 36 oct-py-util.cc
64 63
65 OCT_SOURCE_FILES = $(patsubst %.oct, %.cc, $(OCT_FILES)) 64 OCT_SOURCE_FILES = $(patsubst %.oct, %.cc, $(OCT_FILES))
66 65
67 PYTAVE_HEADER_FILES = \ 66 PYTAVE_HEADER_FILES = \
68 config.h \ 67 config.h \
69 exceptions.h \
70 oct-py-error.h \ 68 oct-py-error.h \
71 oct-py-eval.h \ 69 oct-py-eval.h \
72 oct-py-init.h \ 70 oct-py-init.h \
73 oct-py-object.h \ 71 oct-py-object.h \
74 oct-py-types.h \ 72 oct-py-types.h \