From 875004d300eb4b85e13c026378e39b31b6922f93 Mon Sep 17 00:00:00 2001 From: gatecat Date: Mon, 7 Jun 2021 21:02:43 +0100 Subject: gui: Don't destroy context when loading JSON Signed-off-by: gatecat --- common/command.cc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'common/command.cc') diff --git a/common/command.cc b/common/command.cc index 27e59260..3341b521 100644 --- a/common/command.cc +++ b/common/command.cc @@ -473,19 +473,24 @@ int CommandHandler::exec() } } -std::unique_ptr CommandHandler::load_json(std::string filename) +void CommandHandler::load_json(Context *ctx, std::string filename) { - dict values; - std::unique_ptr ctx = createContext(values); - setupContext(ctx.get()); - setupArchContext(ctx.get()); + ctx->cells.clear(); + ctx->nets.clear(); + ctx->net_aliases.clear(); + ctx->ports.clear(); + ctx->hierarchy.clear(); + ctx->settings.erase(ctx->id("pack")); + ctx->settings.erase(ctx->id("place")); + ctx->settings.erase(ctx->id("route")); + + setupContext(ctx); + setupArchContext(ctx); { std::ifstream f(filename); - if (!parse_json(f, filename, ctx.get())) + if (!parse_json(f, filename, ctx)) log_error("Loading design failed.\n"); } - customAfterLoad(ctx.get()); - return ctx; } void CommandHandler::clear() { vm.clear(); } -- cgit v1.2.3