changeset 5246:8a4cae8ee7b7

[project @ 2005-03-26 00:17:01 by jwe]
author jwe
date Sat, 26 Mar 2005 00:17:01 +0000
parents 3589aff4a35d
children 3d5b7114da82
files src/ChangeLog src/pt-loop.cc src/toplev.cc
diffstat 3 files changed, 14 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Mar 25 03:36:35 2005 +0000
+++ b/src/ChangeLog	Sat Mar 26 00:17:01 2005 +0000
@@ -1,3 +1,10 @@
+2005-03-25  John W. Eaton  <jwe@octave.org>
+
+	* toplev.cc (main_loop): Don't use octave_set_current_context here.
+
+	* pt-loop.cc (simple_for_loop::eval): In for i = matrix ... end,
+	skip loop if matrix is empty.
+
 2005-03-24  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/__glpk__.cc (F__glpk__): Texinfoize doc string.
--- a/src/pt-loop.cc	Fri Mar 25 03:36:35 2005 +0000
+++ b/src/pt-loop.cc	Sat Mar 26 00:17:01 2005 +0000
@@ -381,10 +381,13 @@
 	if (error_state)
 	  goto cleanup;
 
-	if (rhs.is_real_type ())
-	  DO_ND_LOOP(m_tmp);
-	else
-	  DO_ND_LOOP(cm_tmp);
+	if (dv.numel () > 0)
+	  {
+	    if (rhs.is_real_type ())
+	      DO_ND_LOOP(m_tmp);
+	    else
+	      DO_ND_LOOP(cm_tmp);
+	  }
       }
     else if (rhs.is_map ())
       {
--- a/src/toplev.cc	Fri Mar 25 03:36:35 2005 +0000
+++ b/src/toplev.cc	Sat Mar 26 00:17:01 2005 +0000
@@ -115,18 +115,6 @@
 {
   octave_save_signal_mask ();
 
-  if (octave_set_current_context)
-    {
-#if defined (USE_EXCEPTIONS_FOR_INTERRUPTS)
-      panic_impossible ();
-#else
-      unwind_protect::run_all ();
-      raw_mode (0);
-      std::cout << "\n";
-      octave_restore_signal_mask ();
-#endif
-    }
-
   can_interrupt = true;
 
   octave_signal_hook = octave_signal_handler;