diff options
| author | ZipCPU <dgisselq@ieee.org> | 2018-06-06 14:55:20 -0400 |
|---|---|---|
| committer | ZipCPU <dgisselq@ieee.org> | 2018-06-06 14:55:20 -0400 |
| commit | 795cf4f3a329925141b10b0f4f7695188f655184 (patch) | |
| tree | adac8b9e0b8cbcae15cf9a95e5539fccddf89808 /frontend | |
| parent | 16b9a2f1b5ad10aa0b426183b4e071d3afb09e88 (diff) | |
| download | nextpnr-795cf4f3a329925141b10b0f4f7695188f655184.tar.gz nextpnr-795cf4f3a329925141b10b0f4f7695188f655184.tar.bz2 nextpnr-795cf4f3a329925141b10b0f4f7695188f655184.zip | |
String fixes to json parser
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/json/jsonparse.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/frontend/json/jsonparse.cc b/frontend/json/jsonparse.cc index 45edabad..25b01e44 100644 --- a/frontend/json/jsonparse.cc +++ b/frontend/json/jsonparse.cc @@ -377,7 +377,7 @@ void json_import_cell_ports(Design *design, string &modname, CellInfo *cell, log_error("JSON no connection match " "for port_direction \'%s\' of node \'%s\' " "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); @@ -546,7 +546,7 @@ void json_import_cell(Design *design, string modname, JsonNode *cell_node, param_node = cell_node->data_dict.at("parameters"); 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 @@ -646,7 +646,7 @@ struct JsonFrontend { virtual void help() { } - virtual void execute(std::istream *&f, std::string filename, + virtual void execute(std::istream *&f, std::string &filename, Design *design) { // log_header(design, "Executing JSON frontend.\n"); @@ -671,7 +671,7 @@ struct JsonFrontend { }; // 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(); parser->execute(f, filename, design); } |