diff options
| author | Clifford Wolf <clifford@clifford.at> | 2013-04-01 14:12:17 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2013-04-01 14:12:17 +0200 |
| commit | 3ec9fa40486401814c6e3a7fd4b2b1b8fb3403b8 (patch) | |
| tree | 190efa2af44b1c5a7e6bb2fc6c11cb85056c2c31 /kernel/select.cc | |
| parent | 9b1ce98db6bdca93de194a1845c25409b96900c1 (diff) | |
| download | yosys-3ec9fa40486401814c6e3a7fd4b2b1b8fb3403b8.tar.gz yosys-3ec9fa40486401814c6e3a7fd4b2b1b8fb3403b8.tar.bz2 yosys-3ec9fa40486401814c6e3a7fd4b2b1b8fb3403b8.zip | |
Added -color <color> <selection> option to show command
Diffstat (limited to 'kernel/select.cc')
| -rw-r--r-- | kernel/select.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/kernel/select.cc b/kernel/select.cc index 3a91c1e40..730f47b43 100644 --- a/kernel/select.cc +++ b/kernel/select.cc @@ -586,20 +586,27 @@ static void select_stmt(RTLIL::Design *design, std::string arg) select_filter_active_mod(design, work_stack.back()); } -// used in kernel/register.cc -void handle_extra_select_args(Pass *pass, std::vector<std::string> args, size_t argidx, RTLIL::Design *design) +// used in kernel/register.cc and maybe other locations, extern decl. in register.h +void handle_extra_select_args(Pass *pass, std::vector<std::string> args, size_t argidx, size_t args_size, RTLIL::Design *design) { work_stack.clear(); - for (; argidx < args.size(); argidx++) { - if (args[argidx].substr(0, 1) == "-") - pass->cmd_error(args, argidx, "Unexpected option in selection arguments."); + for (; argidx < args_size; argidx++) { + if (args[argidx].substr(0, 1) == "-") { + if (pass != NULL) + pass->cmd_error(args, argidx, "Unexpected option in selection arguments."); + else + log_cmd_error("Unexpected option in selection arguments."); + } select_stmt(design, args[argidx]); } while (work_stack.size() > 1) { select_op_union(design, work_stack.front(), work_stack.back()); work_stack.pop_back(); } - design->selection_stack.push_back(work_stack.back()); + if (work_stack.size() > 0) + design->selection_stack.push_back(work_stack.back()); + else + design->selection_stack.push_back(RTLIL::Selection(false)); } struct SelectPass : public Pass { |