From fc5cee6fb896bc4d7a8b79dcde789e03c787bd89 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 8 Aug 2018 18:17:34 +0200 Subject: clangformat --- common/command.cc | 4 ++-- common/project.cc | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'common') diff --git a/common/command.cc b/common/command.cc index 9c2cc840..cf12df3a 100644 --- a/common/command.cc +++ b/common/command.cc @@ -35,8 +35,8 @@ #include "design_utils.h" #include "jsonparse.h" #include "log.h" +#include "timing.h" #include "version.h" -#include NEXTPNR_NAMESPACE_BEGIN @@ -244,7 +244,7 @@ int CommandHandler::exec() if (executeBeforeContext()) return 0; - + std::unique_ptr ctx; if (vm.count("load")) { ctx = project.load(vm["load"].as()); diff --git a/common/project.cc b/common/project.cc index 8e043f36..244ca761 100644 --- a/common/project.cc +++ b/common/project.cc @@ -17,12 +17,12 @@ * */ +#include "project.h" #include #include -#include "project.h" -#include "log.h" -#include "jsonparse.h" #include +#include "jsonparse.h" +#include "log.h" NEXTPNR_NAMESPACE_BEGIN @@ -34,10 +34,10 @@ void ProjectHandler::save(Context *ctx, std::string filename) root.put("project.name", boost::filesystem::basename(filename)); root.put("project.arch.name", ctx->archId().c_str(ctx)); root.put("project.arch.type", ctx->archArgsToId(ctx->archArgs()).c_str(ctx)); -/* root.put("project.input.json", );*/ + /* root.put("project.input.json", );*/ root.put("project.params.freq", int(ctx->target_freq / 1e6)); root.put("project.params.seed", ctx->rngstate); - saveArch(ctx,root); + saveArch(ctx, root); pt::write_json(f, root); } @@ -55,7 +55,6 @@ std::unique_ptr ProjectHandler::load(std::string filename) if (version != 1) log_error("Wrong project format version.\n"); - ctx = createContext(root); std::string arch_name = root.get("project.arch.name"); @@ -77,7 +76,7 @@ std::unique_ptr ProjectHandler::load(std::string filename) if (params.count("seed")) ctx->rngseed(params.get("seed")); } - loadArch(ctx.get(),root, proj.parent_path().string()); + loadArch(ctx.get(), root, proj.parent_path().string()); } catch (...) { log_error("Error loading project file.\n"); } -- cgit v1.2.3