Merge branch 'gqtech' into jsonparser

This commit is contained in:
ZipCPU 2018-06-06 14:56:02 -04:00
commit 01e705189b

View File

@ -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);
} }