riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow reading file input from stdin, improving REPL experience.

This commit is contained in:
Alberto Gonzalez 2020-04-10 19:30:22 +00:00
parent 7c06cb6157
commit b5ecbbef94
No known key found for this signature in database
GPG Key ID: 8395A8BA109708B2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/register.cc
View File

@ -479,26 +479,27 @@ void Frontend::extra_args(std::istream *&f, std::string &filename, std::vector<s
{ {
std::string arg = args[argidx]; std::string arg = args[argidx];
if (arg.compare(0, 1, "-") == 0) if (arg.compare(0, 1, "-") == 0 && arg != "-")
cmd_error(args, argidx, "Unknown option or option in arguments."); cmd_error(args, argidx, "Unknown option or option in arguments.");
if (f != NULL) if (f != NULL)
cmd_error(args, argidx, "Extra filename argument in direct file mode."); cmd_error(args, argidx, "Extra filename argument in direct file mode.");
filename = arg; filename = (arg == "-")? "<stdin>" : arg;
//Accommodate heredocs with EOT marker spaced out from "<<", e.g. "<< EOT" vs. "<<EOT"
if (filename == "<<" && argidx+1 < args.size()) if (filename == "<<" && argidx+1 < args.size())
filename += args[++argidx]; filename += args[++argidx];
if (filename.compare(0, 2, "<<") == 0) { if (filename.compare(0, 2, "<<") == 0 || filename == "<stdin>") {
if (Frontend::current_script_file == NULL) if (Frontend::current_script_file == NULL && filename != "<stdin>")
log_error("Unexpected here document '%s' outside of script!\n", filename.c_str()); log_error("Unexpected here document '%s' outside of script!\n", filename.c_str());
if (filename.size() <= 2) if (filename.size() <= 2)
log_error("Missing EOT marker in here document!\n"); log_error("Missing EOT marker in here document!\n");
std::string eot_marker = filename.substr(2); std::string eot_marker = filename == "<stdin>"? "EOT" : filename.substr(2); //"EOT" hardcoded as EOT marker when reading from stdin
last_here_document.clear(); last_here_document.clear();
while (1) { while (1) {
std::string buffer; std::string buffer;
char block[4096]; char block[4096];
while (1) { while (1) {
if (fgets(block, 4096, Frontend::current_script_file) == NULL) if (fgets(block, 4096, filename == "<stdin>"? stdin : Frontend::current_script_file) == NULL)
log_error("Unexpected end of file in here document '%s'!\n", filename.c_str()); log_error("Unexpected end of file in here document '%s'!\n", filename.c_str());
buffer += block; buffer += block;
if (buffer.size() > 0 && (buffer[buffer.size() - 1] == '\n' || buffer[buffer.size() - 1] == '\r')) if (buffer.size() > 0 && (buffer[buffer.size() - 1] == '\n' || buffer[buffer.size() - 1] == '\r'))