Mercurial > octave
changeset 23127:5a91168a30be
avoid including parse tree headers in other header files unnecessarily
* interpreter.h: Use forward decl instead of including pt-eval.h.
* oct-lvalue.h: Use forward decl instead of including pt-idx.h.
* data.cc, debug.cc, error.cc, input.cc, interpreter.cc, symtab.cc,
ov-classdef.cc, ov-fcn-handle.cc, pt-arg-list.cc: Include parse tree
headers as needed.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 31 Jan 2017 18:04:11 -0500 |
| parents | 2eb7d330eb7f |
| children | 982042b59c0a |
| files | libinterp/corefcn/data.cc libinterp/corefcn/debug.cc libinterp/corefcn/error.cc libinterp/corefcn/input.cc libinterp/corefcn/interpreter.cc libinterp/corefcn/interpreter.h libinterp/corefcn/oct-lvalue.h libinterp/corefcn/symtab.cc libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-fcn-handle.cc libinterp/parse-tree/pt-arg-list.cc |
| diffstat | 11 files changed, 19 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/data.cc Tue Jan 31 18:04:11 2017 -0500 @@ -57,7 +57,6 @@ #include "ov-cx-mat.h" #include "ov-flt-cx-mat.h" #include "ov-cx-sparse.h" -#include "parse.h" #include "pt-mat.h" #include "utils.h" #include "variables.h"
--- a/libinterp/corefcn/debug.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/debug.cc Tue Jan 31 18:04:11 2017 -0500 @@ -53,8 +53,6 @@ #include "ov-usr-fcn.h" #include "ov-fcn.h" #include "ov-struct.h" -#include "pt-pr-code.h" -#include "pt-bp.h" #include "pt-eval.h" #include "pt-exp.h" #include "pt-stmt.h"
--- a/libinterp/corefcn/error.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/error.cc Tue Jan 31 18:04:11 2017 -0500 @@ -45,8 +45,6 @@ #include "ov.h" #include "ov-usr-fcn.h" #include "pt-eval.h" -#include "pt-pr-code.h" -#include "pt-stmt.h" #include "interpreter.h" #include "unwind-prot.h" #include "variables.h"
--- a/libinterp/corefcn/input.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/input.cc Tue Jan 31 18:04:11 2017 -0500 @@ -60,10 +60,9 @@ #include "octave-link.h" #include "ovl.h" #include "ov-fcn-handle.h" +#include "ov-usr-fcn.h" #include "pager.h" #include "parse.h" -#include "pt.h" -#include "pt-const.h" #include "pt-eval.h" #include "pt-stmt.h" #include "sighandlers.h"
--- a/libinterp/corefcn/interpreter.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/interpreter.cc Tue Jan 31 18:04:11 2017 -0500 @@ -62,6 +62,7 @@ #include "parse.h" #include "pt-eval.h" #include "pt-jump.h" +#include "pt-mat.h" #include "pt-stmt.h" #include "sighandlers.h" #include "sysdep.h"
--- a/libinterp/corefcn/interpreter.h Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/interpreter.h Tue Jan 31 18:04:11 2017 -0500 @@ -30,8 +30,6 @@ #include "quit.h" #include "str-vec.h" -#include "pt-eval.h" - extern OCTINTERP_API bool quit_allowed; // TRUE means we are ready to interpret commands, but not everything @@ -43,6 +41,8 @@ namespace octave { + class tree_evaluator; + extern tree_evaluator *current_evaluator; // The application object contains a pointer to the current
--- a/libinterp/corefcn/oct-lvalue.h Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/oct-lvalue.h Tue Jan 31 18:04:11 2017 -0500 @@ -31,7 +31,6 @@ #include <string> #include "ovl.h" -#include "pt-idx.h" #include "symtab.h" class
--- a/libinterp/corefcn/symtab.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/corefcn/symtab.cc Tue Jan 31 18:04:11 2017 -0500 @@ -43,7 +43,6 @@ #include "ov-usr-fcn.h" #include "pager.h" #include "parse.h" -#include "pt-arg-list.h" #include "pt-pr-code.h" #include "symtab.h" #include "unwind-prot.h"
--- a/libinterp/octave-value/ov-classdef.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/octave-value/ov-classdef.cc Tue Jan 31 18:04:11 2017 -0500 @@ -28,6 +28,7 @@ #include "call-stack.h" #include "defun.h" +#include "interpreter.h" #include "load-path.h" #include "ov-builtin.h" #include "ov-classdef.h" @@ -37,12 +38,12 @@ #include "pt-assign.h" #include "pt-classdef.h" #include "pt-funcall.h" +#include "pt-idx.h" #include "pt-misc.h" #include "pt-stmt.h" #include "pt-walk.h" #include "singleton-cleanup.h" #include "symtab.h" -#include "interpreter.h" // Define to 1 to enable debugging statements. #define DEBUG_TRACE 0
--- a/libinterp/octave-value/ov-fcn-handle.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/octave-value/ov-fcn-handle.cc Tue Jan 31 18:04:11 2017 -0500 @@ -35,31 +35,32 @@ #include "oct-locbuf.h" #include "call-stack.h" +#include "defaults.h" #include "defun.h" #include "error.h" #include "errwarn.h" +#include "file-stat.h" #include "input.h" #include "interpreter.h" +#include "load-path.h" +#include "oct-env.h" #include "oct-hdf5.h" #include "oct-map.h" #include "ov-base.h" #include "ov-fcn-handle.h" #include "ov-usr-fcn.h" +#include "parse.h" #include "pr-output.h" -#include "pt-pr-code.h" -#include "pt-misc.h" -#include "pt-stmt.h" +#include "pt-arg-list.h" +#include "pt-assign.h" #include "pt-cmd.h" #include "pt-exp.h" -#include "pt-assign.h" -#include "pt-arg-list.h" -#include "variables.h" -#include "parse.h" +#include "pt-idx.h" +#include "pt-misc.h" +#include "pt-pr-code.h" +#include "pt-stmt.h" #include "unwind-prot.h" -#include "defaults.h" -#include "file-stat.h" -#include "load-path.h" -#include "oct-env.h" +#include "variables.h" #include "byte-swap.h" #include "ls-ascii-helper.h"
--- a/libinterp/parse-tree/pt-arg-list.cc Tue Jan 31 17:43:58 2017 -0500 +++ b/libinterp/parse-tree/pt-arg-list.cc Tue Jan 31 18:04:11 2017 -0500 @@ -39,6 +39,7 @@ #include "pt-arg-list.h" #include "pt-exp.h" #include "pt-id.h" +#include "pt-idx.h" #include "pt-pr-code.h" #include "pt-walk.h" #include "interpreter.h"