Mercurial > jwe > octave
comparison libinterp/parse-tree/oct-parse.in.yy @ 21159:4aa8e4b868c9
Handle interrupt thrown by dbquit (bug #46931)
* oct-parse.in.yy (run): rethrow octave_interrupt_exception
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Tue, 19 Jan 2016 12:31:06 +1100 |
parents | 538b57866b90 |
children | 3d375b0905a0 |
comparison
equal
deleted
inserted
replaced
21158:65827e9cccb8 | 21159:4aa8e4b868c9 |
---|---|
4030 if (file.empty ()) | 4030 if (file.empty ()) |
4031 error (e, "parse error"); | 4031 error (e, "parse error"); |
4032 else | 4032 else |
4033 error (e, "parse error in %s", file.c_str ()); | 4033 error (e, "parse error in %s", file.c_str ()); |
4034 } | 4034 } |
4035 catch (octave_interrupt_exception &) | |
4036 { | |
4037 throw; | |
4038 } | |
4035 catch (...) | 4039 catch (...) |
4036 { | 4040 { |
4037 std::string file = lexer.fcn_file_full_name; | 4041 std::string file = lexer.fcn_file_full_name; |
4038 | 4042 |
4039 if (file.empty ()) | 4043 if (file.empty ()) |
4085 | 4089 |
4086 if (file.empty ()) | 4090 if (file.empty ()) |
4087 error (e, "parse error"); | 4091 error (e, "parse error"); |
4088 else | 4092 else |
4089 error (e, "parse error in %s", file.c_str ()); | 4093 error (e, "parse error in %s", file.c_str ()); |
4094 } | |
4095 catch (octave_interrupt_exception &) | |
4096 { | |
4097 throw; | |
4090 } | 4098 } |
4091 catch (...) | 4099 catch (...) |
4092 { | 4100 { |
4093 std::string file = lexer.fcn_file_full_name; | 4101 std::string file = lexer.fcn_file_full_name; |
4094 | 4102 |