changeset 2897:64ff56723e75

[project @ 1997-04-28 20:38:58 by jwe]
author jwe
date Mon, 28 Apr 1997 20:41:15 +0000
parents cbe70c49b0b7
children 8303749672be
files src/oct-hist.cc src/octave.cc src/pt-cmd.cc src/toplev.h
diffstat 4 files changed, 21 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/oct-hist.cc
+++ b/src/oct-hist.cc
@@ -471,7 +471,7 @@
   Vecho_executing_commands = ECHO_CMD_LINE;
   input_from_tmp_history_file = 1;
 
-  parse_and_execute (name, 1);
+  parse_and_execute (name);
 
   run_unwind_frame ("do_edit_history");
 
@@ -498,7 +498,7 @@
   Vecho_executing_commands = ECHO_CMD_LINE;
   input_from_tmp_history_file = 1;
 
-  parse_and_execute (name, 1);
+  parse_and_execute (name);
 
   run_unwind_frame ("do_run_history");
 
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -262,9 +262,9 @@
       // (if it exists), then from the file
       // $(prefix)/lib/octave/$(version)/m/octaverc (if it exists).
 
-      parse_and_execute (Vlocal_site_defaults_file, 0, verbose);
+      parse_and_execute (Vlocal_site_defaults_file, verbose);
 
-      parse_and_execute (Vsite_defaults_file, 0, verbose);
+      parse_and_execute (Vsite_defaults_file, verbose);
     }
 
   if (read_init_files)
@@ -285,7 +285,7 @@
 
       if (! Vhome_directory.empty ())
 	{
-	  parse_and_execute (home_rc, 0, verbose);
+	  parse_and_execute (home_rc, verbose);
 
 	  // Names alone are not enough.
 
@@ -301,7 +301,7 @@
 	}
 
       if (! home_rc_already_executed)
-	parse_and_execute (local_rc, 0, verbose);
+	parse_and_execute (local_rc, verbose);
     }
 
   run_unwind_frame ("execute_startup_files");
--- a/src/pt-cmd.cc
+++ b/src/pt-cmd.cc
@@ -198,7 +198,8 @@
 	{
 	  if (list)
 	    {
-	      list->eval (true);
+	      list->eval ();
+
 	      if (error_state)
 		{
 		  eval_error ();
@@ -256,7 +257,8 @@
 
   if (list)
     {
-      list->eval (true);
+      list->eval ();
+
       if (error_state)
 	{
 	  eval_error ();
@@ -286,7 +288,8 @@
 
   if (list)
     {
-      list->eval (true);
+      list->eval ();
+
       if (error_state)
 	{
 	  eval_error ();
@@ -316,7 +319,8 @@
 
   if (list)
     {
-      list->eval (true);
+      list->eval ();
+
       if (error_state)
 	{
 	  eval_error ();
@@ -673,7 +677,7 @@
   breaking = 0;
 
   if (list)
-    list->eval (true);
+    list->eval ();
 
   // This is the one for breaking.  (The unwind_protects are popped
   // off the stack in the reverse of the order they are pushed on).
@@ -710,7 +714,7 @@
     }
 
   if (try_code)
-    try_code->eval (true);
+    try_code->eval ();
 
   if (catch_code && error_state)
     {
@@ -763,7 +767,7 @@
   breaking = 0;
 
   if (list)
-    list->eval (true);
+    list->eval ();
 
   // This is the one for breaking.  (The unwind_protects are popped
   // off the stack in the reverse of the order they are pushed on).
@@ -799,7 +803,7 @@
   add_unwind_protect (do_unwind_protect_cleanup_code, cleanup_code);
 
   if (unwind_protect_code)
-    unwind_protect_code->eval (true);
+    unwind_protect_code->eval ();
 
   run_unwind_protect ();
 }
--- a/src/toplev.h
+++ b/src/toplev.h
@@ -37,14 +37,14 @@
 clean_up_and_exit (int) GCC_ATTR_NORETURN;
 
 extern void
-parse_and_execute (FILE *f, bool print = false);
+parse_and_execute (FILE *f);
 
 extern void
-parse_and_execute (const string& s, bool print = false, bool verbose = false,
+parse_and_execute (const string& s, bool verbose = false,
 		   const char *warn_for = 0);
 
 extern octave_value
-eval_string (const string&, bool print, int& parse_status);
+eval_string (const string&, bool silent, int& parse_status);
 
 extern int
 main_loop (void);