From 99cdfb31106cc399072f129d912fa8377d919e2e Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 7 Nov 2014 12:48:15 +0100 Subject: [PATCH] Fixed typo in "log_cmd_error_exception" --- kernel/log.cc | 2 +- kernel/log.h | 2 +- kernel/yosys.cc | 6 +++--- passes/cmds/tee.cc | 4 ++-- passes/cmds/trace.cc | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/log.cc b/kernel/log.cc index 1a21e9fe6..99e92e44d 100644 --- a/kernel/log.cc +++ b/kernel/log.cc @@ -194,7 +194,7 @@ void log_cmd_error(const char *format, ...) log("ERROR: "); logv(format, ap); log_flush(); - throw log_cmd_error_expection(); + throw log_cmd_error_exception(); } logv_error(format, ap); diff --git a/kernel/log.h b/kernel/log.h index a6f808922..707497a99 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -38,7 +38,7 @@ YOSYS_NAMESPACE_BEGIN #define S__LINE__sub1(x) S__LINE__sub2(x) #define S__LINE__ S__LINE__sub1(__LINE__) -struct log_cmd_error_expection { }; +struct log_cmd_error_exception { }; extern std::vector log_files; extern std::vector log_streams; diff --git a/kernel/yosys.cc b/kernel/yosys.cc index d4365ee00..6cc643152 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -668,9 +668,9 @@ void run_frontend(std::string filename, std::string command, RTLIL::Design *desi Pass::call(design, command); } } - catch (log_cmd_error_expection) { + catch (log_cmd_error_exception) { Frontend::current_script_file = backup_script_file; - throw log_cmd_error_expection(); + throw log_cmd_error_exception(); } Frontend::current_script_file = backup_script_file; @@ -852,7 +852,7 @@ void shell(RTLIL::Design *design) try { log_assert(design->selection_stack.size() == 1); Pass::call(design, command); - } catch (log_cmd_error_expection) { + } catch (log_cmd_error_exception) { while (design->selection_stack.size() > 1) design->selection_stack.pop_back(); log_reset_stack(); diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc index 8ef4c89e7..e83c93871 100644 --- a/passes/cmds/tee.cc +++ b/passes/cmds/tee.cc @@ -76,11 +76,11 @@ struct TeePass : public Pass { try { std::vector new_args(args.begin() + argidx, args.end()); Pass::call(design, new_args); - } catch (log_cmd_error_expection) { + } catch (log_cmd_error_exception) { for (auto cf : files_to_close) fclose(cf); log_files = backup_log_files; - throw log_cmd_error_expection(); + throw log_cmd_error_exception(); } for (auto cf : files_to_close) diff --git a/passes/cmds/trace.cc b/passes/cmds/trace.cc index ac61be081..10c67195f 100644 --- a/passes/cmds/trace.cc +++ b/passes/cmds/trace.cc @@ -85,9 +85,9 @@ struct TracePass : public Pass { try { std::vector new_args(args.begin() + argidx, args.end()); Pass::call(design, new_args); - } catch (log_cmd_error_expection) { + } catch (log_cmd_error_exception) { design->monitors.erase(&monitor); - throw log_cmd_error_expection(); + throw log_cmd_error_exception(); } design->monitors.erase(&monitor);