caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

json: Make the JSON parser deterministic

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-06-19 20:43:52 +02:00
parent 10785bd1cc
commit 1d34507937
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/json/jsonparse.cc
View File

@ -27,6 +27,7 @@
#include <iostream> #include <iostream>
#include <log.h> #include <log.h>
#include <string> #include <string>
#include <map>
#include "nextpnr.h" #include "nextpnr.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
@ -47,7 +48,7 @@ struct JsonNode
string data_string; string data_string;
int data_number; int data_number;
std::vector<JsonNode *> data_array; std::vector<JsonNode *> data_array;
std::unordered_map<string, JsonNode *> data_dict; std::map<string, JsonNode *> data_dict;
std::vector<string> data_dict_keys; std::vector<string> data_dict_keys;
JsonNode(std::istream &f) JsonNode(std::istream &f)
@ -748,11 +749,12 @@ void json_import(Context *ctx, string modname, JsonNode *node)
int netid = bits->data_array.at(i)->data_number; int netid = bits->data_array.at(i)->data_number;
if (netid >= netnames.size()) if (netid >= netnames.size())
netnames.resize(netid + 1); netnames.resize(netid + 1);
netnames.at(netid) = ctx->id( netnames.at(netid) =
basename + ctx->id(basename +
(num_bits == 1 ? "" : std::string("[") + (num_bits == 1 ? ""
std::to_string(i) + : std::string("[") +
std::string("]"))); std::to_string(i) +
std::string("]")));
} }
} }
} }