# HG changeset patch # User John W. Eaton # Date 1348083255 14400 # Node ID 53d073233fa44f81ab0c8224feda0376c6b39ea2 # Parent 57e685d135ec727685b6f23a9f33c9c4f0294b8c call more built-in functions directly * __init_gnuplot__.cc (gnuplot_graphics_toolkit::send_quit): Call built-in functions directly. * graphics.cc (gh_manager::do_process_events): Likewise. * sysdep.cc (Fkbhit, Fpause, Fsleep, Fusleep): Likewise. diff -r 57e685d135ec -r 53d073233fa4 libinterp/dldfcn/__init_gnuplot__.cc --- a/libinterp/dldfcn/__init_gnuplot__.cc Wed Sep 19 15:28:10 2012 -0400 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Wed Sep 19 15:34:15 2012 -0400 @@ -33,6 +33,7 @@ #include #endif +#include "builtins.h" #include "defun-dld.h" #include "error.h" #include "graphics.h" @@ -148,24 +149,17 @@ if (! error_state) { - args(1) = "\nquit;\n"; - args(0) = fids(0); - feval ("fputs", args); + Ffputs (ovl (fids(0), "\nquit;\n")); - args.resize (1); - feval ("fflush", args); - feval ("pclose", args); + Ffflush (ovl (fids(0))); + Fpclose (ovl (fids(0))); if (fids.numel () > 1) { - args(0) = fids(1); - feval ("pclose", args); + Fpclose (ovl (fids(1))); if (fids.numel () > 2) - { - args(0) = fids(2); - feval ("waitpid", args); - } + Fwaitpid (ovl (fids(2))); } } } diff -r 57e685d135ec -r 53d073233fa4 libinterp/interpfcn/graphics.cc --- a/libinterp/interpfcn/graphics.cc Wed Sep 19 15:28:10 2012 -0400 +++ b/libinterp/interpfcn/graphics.cc Wed Sep 19 15:34:15 2012 -0400 @@ -42,6 +42,7 @@ #include "oct-locbuf.h" #include "singleton-cleanup.h" +#include "builtins.h" #include "cutils.h" #include "defun.h" #include "display.h" @@ -8202,7 +8203,7 @@ if (Vdrawnow_requested && ! old_Vdrawnow_requested) { - feval ("drawnow"); + Fdrawnow (); Vdrawnow_requested = false; } diff -r 57e685d135ec -r 53d073233fa4 libinterp/interpfcn/sysdep.cc --- a/libinterp/interpfcn/sysdep.cc Wed Sep 19 15:28:10 2012 -0400 +++ b/libinterp/interpfcn/sysdep.cc Wed Sep 19 15:34:15 2012 -0400 @@ -69,6 +69,7 @@ #include "quit.h" #include "Cell.h" +#include "builtins.h" #include "defun.h" #include "error.h" #include "input.h" @@ -645,7 +646,7 @@ if (interactive || forced_interactive) { - feval ("drawnow"); + Fdrawnow (); int c = octave_kbhit (args.length () == 0); @@ -697,7 +698,7 @@ { if (! xisnan (dval)) { - feval ("drawnow"); + Fdrawnow (); if (xisinf (dval)) { @@ -713,7 +714,7 @@ } else { - feval ("drawnow"); + Fdrawnow (); flush_octave_stdout (); octave_kbhit (); } @@ -746,7 +747,7 @@ warning ("sleep: NaN is an invalid delay"); else { - feval ("drawnow"); + Fdrawnow (); octave_sleep (dval); } } @@ -786,7 +787,7 @@ warning ("usleep: NaN is an invalid delay"); else { - feval ("drawnow"); + Fdrawnow (); int delay = NINT (dval);