From: Clifford Wolf Date: Tue, 4 Feb 2014 22:31:06 +0000 (+0100) Subject: Throw errors if non-existing selection variables are used X-Git-Tag: yosys-0.2.0~91 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fb8ba73bd09a7328e3523193a4f03a8ff87b5c9;p=yosys.git Throw errors if non-existing selection variables are used --- diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc index 253d8d68f..2561e8f64 100644 --- a/passes/cmds/select.cc +++ b/passes/cmds/select.cc @@ -384,7 +384,8 @@ static void select_op_expand(RTLIL::Design *design, std::string arg, char mode) for (auto i1 : design->selection_vars.at(str).selected_members) for (auto i2 : i1.second) limits.insert(i2); - } + } else + log_cmd_error("Selection %s is not defined!\n", RTLIL::id2cstr(str)); } else limits.insert(RTLIL::escape_id(str)); } @@ -521,7 +522,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg) if (design->selection_vars.count(set_name) > 0) work_stack.push_back(design->selection_vars[set_name]); else - work_stack.push_back(RTLIL::Selection(false)); + log_cmd_error("Selection @%s is not defined!\n", RTLIL::id2cstr(set_name)); select_filter_active_mod(design, work_stack.back()); return; } @@ -1016,7 +1017,7 @@ struct SelectPass : public Pass { if (!set_name.empty()) { if (work_stack.size() == 0) - design->selection_vars.erase(set_name); + design->selection_vars[set_name] = RTLIL::Selection(false); else design->selection_vars[set_name] = work_stack.back(); return;