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

String fixes to json parser

Browse Source
This commit is contained in:
ZipCPU 2018-06-06 14:55:20 -04:00
parent 16b9a2f1b5
commit 795cf4f3a3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/json/jsonparse.cc
View File

@ -377,7 +377,7 @@ void json_import_cell_ports(Design *design, string &modname, CellInfo *cell,
log_error("JSON no connection match " log_error("JSON no connection match "
"for port_direction \'%s\' of node \'%s\' " "for port_direction \'%s\' of node \'%s\' "
"in module \'%s\'\n", "in module \'%s\'\n",
port_name, cell->name.c_str(), modname.c_str()); port_name.c_str(), cell->name.c_str(), modname.c_str());
assert(wire_group_node); assert(wire_group_node);
@ -546,7 +546,7 @@ void json_import_cell(Design *design, string modname, JsonNode *cell_node,
param_node = cell_node->data_dict.at("parameters"); param_node = cell_node->data_dict.at("parameters");
if (param_node->type != 'D') if (param_node->type != 'D')
log_error("JSON parameter list of \'%s\' is not a data dictionary\n", cell->name); log_error("JSON parameter list of \'%s\' is not a data dictionary\n", cell->name.c_str());
// //
// Loop through all parameters, adding them into the // Loop through all parameters, adding them into the
@ -646,7 +646,7 @@ struct JsonFrontend {
virtual void help() virtual void help()
{ {
} }
virtual void execute(std::istream *&f, std::string filename, virtual void execute(std::istream *&f, std::string &filename,
Design *design) Design *design)
{ {
// log_header(design, "Executing JSON frontend.\n"); // log_header(design, "Executing JSON frontend.\n");
@ -671,7 +671,7 @@ struct JsonFrontend {
}; // End Namespace JsonParser }; // End Namespace JsonParser
void parse_json_file(std::istream *&f, std::string filename, Design *design){ void parse_json_file(std::istream *&f, std::string &filename, Design *design){
auto *parser = new JsonParser::JsonFrontend(); auto *parser = new JsonParser::JsonFrontend();
parser->execute(f, filename, design); parser->execute(f, filename, design);
} }