Mercurial > octave

changeset 26455:a85126bbc02d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: back out change accidentally merged in cset db5c5e6c2371 * oct-parse.yy, parse.h: Delete functions reintroduced by bad merge commit.
author Mike Miller <mtmiller@octave.org>
date Sat, 05 Jan 2019 10:29:30 -0800
parents dd81b92ce489
children c51e2f5cfce7
files libinterp/parse-tree/oct-parse.yy libinterp/parse-tree/parse.h
diffstat 2 files changed, 0 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.yy	Sat Jan 05 06:36:52 2019 -0800
+++ b/libinterp/parse-tree/oct-parse.yy	Sat Jan 05 10:29:30 2019 -0800
@@ -5399,23 +5399,6 @@
   }
 }
 
-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	Sat Jan 05 06:36:52 2019 -0800
+++ b/libinterp/parse-tree/parse.h	Sat Jan 05 10:29:30 2019 -0800
@@ -592,13 +592,4 @@
   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);
-
 #endif