Mercurial > octave-nkf

changeset 20582:235d059cf329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation error introduced in 52ce821a52fd. * oct-parse.in.yy: Declare fcn variable outside of try/catch block since it is used later in the function. catch "octave_execution_exception&" rather than "octave_execution_error" which doesn't seem to exist.
author Rik <rik@octave.org>
date Sun, 04 Oct 2015 08:01:12 -0700
parents e368ce72a844
children d746695bf494
files libinterp/parse-tree/oct-parse.in.yy
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/oct-parse.in.yy	Sat Oct 03 22:10:45 2015 -0700
+++ b/libinterp/parse-tree/oct-parse.in.yy	Sun Oct 04 08:01:12 2015 -0700
@@ -4487,16 +4487,16 @@
       frame.add_fcn (octave_call_stack::pop);
     }
 
+  octave_function *fcn;
   try
     {
-      octave_function *fcn = parse_fcn_file (file_full_name, file_name,
-                                             "", "", require_file, true,
-                                             false, false, warn_for);
+      fcn = parse_fcn_file (file_full_name, file_name,
+                            "", "", require_file, true,
+                            false, false, warn_for);
     }
-  catch (const octave_execution_error)
+  catch (const octave_execution_exception&)
     {
-      error ("source: error sourcing file '%s'",
-             file_full_name.c_str ());
+      error ("source: error sourcing file '%s'", file_full_name.c_str ());
     }
 
   if (fcn && fcn->is_user_script ())