Mercurial > octave-nkf

changeset 9355:5e4da3b3747e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix context restoration in error state
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 16 Jun 2009 09:49:25 +0200
parents 52bde0edd23a
children b2133f97079d
files src/ChangeLog src/symtab.h
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jun 15 11:39:46 2009 -0400
+++ b/src/ChangeLog	Tue Jun 16 09:49:25 2009 +0200
@@ -1,3 +1,8 @@
+2009-06-16  Jaroslav Hajek  <highegg@gmail.com>
+
+	* symtab.h (symbol_table::set_scope_and_context): Avoid checking
+	error_state for setting context.
+
 2009-06-15  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-re-mat.h (octave_matrix::octave_matrix (const Array<octave_idx_type>&,
--- a/src/symtab.h	Mon Jun 15 11:39:46 2009 -0400
+++ b/src/symtab.h	Tue Jun 16 09:49:25 2009 +0200
@@ -939,11 +939,12 @@
 		instance = p->second;
 
 		xcurrent_scope = scope;
+
+                xcurrent_context = context;
 	      }
 	  }
-
-	if (! error_state)
-	  xcurrent_context = context;
+        else
+          xcurrent_context = context;
       }
   }