Mercurial > octave

changeset 26423:6e698f4606db stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rewrite eval_string wrappers to silence deprecation warnings (bug #55266) * oct-parse.yy, parse.h (eval_string): Rewrite eval_string deprecation wrapper functions from Octave 4.4 to use octave::interpreter::eval_string.
author Mike Miller <mtmiller@octave.org>
date Sun, 30 Dec 2018 13:28:18 -0800
parents 26be3dc2900f
children c10bf34bf1f3 6bfed6e4e9e9
files libinterp/parse-tree/oct-parse.yy libinterp/parse-tree/parse.h
diffstat 2 files changed, 26 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.yy	Thu Jan 03 21:43:42 2019 -0800
+++ b/libinterp/parse-tree/oct-parse.yy	Sun Dec 30 13:28:18 2018 -0800
@@ -5402,6 +5402,23 @@
   }
 }
 
+octave_value_list
+eval_string (const std::string& str, bool silent, int& parse_status,
+             int nargout)
+{
+  octave::interpreter& interp = octave::__get_interpreter__ ("eval_string");
+
+  return interp.eval_string (str, silent, parse_status, nargout);
+}
+
+octave_value
+eval_string (const std::string& str, bool silent, int& parse_status)
+{
+  octave::interpreter& interp = octave::__get_interpreter__ ("eval_string");
+
+  return interp.eval_string (str, silent, parse_status);
+}
+
 DEFMETHOD (eval, interp, args, nargout,
            doc: /* -*- texinfo -*-
 @deftypefn  {} {} eval (@var{try})
--- a/libinterp/parse-tree/parse.h	Thu Jan 03 21:43:42 2019 -0800
+++ b/libinterp/parse-tree/parse.h	Sun Dec 30 13:28:18 2018 -0800
@@ -592,6 +592,15 @@
   cleanup_statement_list (tree_statement_list **lst);
 }
 
+OCTAVE_DEPRECATED (4.4, "use 'octave::interpreter::eval_string' instead")
+extern OCTINTERP_API octave_value_list
+eval_string (const std::string& str, bool silent, int& parse_status,
+             int nargout);
+
+OCTAVE_DEPRECATED (4.4, "use 'octave::interpreter::eval_string' instead")
+extern OCTINTERP_API octave_value
+eval_string (const std::string& str, bool silent, int& parse_status);
+
 #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS)
 
 OCTAVE_DEPRECATED (4.4, "use 'octave::get_help_from_file' instead")
@@ -665,21 +674,6 @@
   return octave::feval (args, nargout);
 }
 
-OCTAVE_DEPRECATED (4.4, "use 'octave::eval_string' instead")
-static inline octave_value_list
-eval_string (const std::string& str, bool silent, int& parse_status,
-             int nargout)
-{
-  return octave::eval_string (str, silent, parse_status, nargout);
-}
-
-OCTAVE_DEPRECATED (4.4, "use 'octave::eval_string' instead")
-static inline octave_value
-eval_string (const std::string& str, bool silent, int& parse_status)
-{
-  return octave::eval_string (str, silent, parse_status);
-}
-
 OCTAVE_DEPRECATED (4.4, "use 'octave::cleanup_statement_list' instead")
 static inline void
 cleanup_statement_list (octave::tree_statement_list **lst)