diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-09-30 12:29:35 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-09-30 12:29:35 -0700 |
| commit | 8684b58bed2875ab67e9b12912d791f9d588f272 (patch) | |
| tree | e66d456aec1ffe83827ac7cb589bdbf1275cf67e /frontends/aiger | |
| parent | f6203e6bd65f7383f14a15e926fc4b8f5f9a3edf (diff) | |
| parent | a274b7cc86d4f64541d3d2903b4eeed4616ab1d8 (diff) | |
| download | yosys-8684b58bed2875ab67e9b12912d791f9d588f272.tar.gz yosys-8684b58bed2875ab67e9b12912d791f9d588f272.tar.bz2 yosys-8684b58bed2875ab67e9b12912d791f9d588f272.zip | |
Merge remote-tracking branch 'origin/master' into xaig_dff
Diffstat (limited to 'frontends/aiger')
| -rw-r--r-- | frontends/aiger/aigerparse.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc index 99029fb44..d40f33447 100644 --- a/frontends/aiger/aigerparse.cc +++ b/frontends/aiger/aigerparse.cc @@ -285,6 +285,8 @@ end_of_header: } else if (c == 'c') { f.ignore(1); + if (f.peek() == '\r') + f.ignore(1); if (f.peek() == '\n') break; // Else constraint (TODO) @@ -1094,13 +1096,15 @@ struct AigerFrontend : public Frontend { } break; } - extra_args(f, filename, args, argidx); + extra_args(f, filename, args, argidx, true); if (module_name.empty()) { #ifdef _WIN32 char fname[_MAX_FNAME]; _splitpath(filename.c_str(), NULL /* drive */, NULL /* dir */, fname, NULL /* ext */); - module_name = fname; + char* bn = strdup(fname); + module_name = RTLIL::escape_id(bn); + free(bn); #else char* bn = strdup(filename.c_str()); module_name = RTLIL::escape_id(bn); |