diff options
| author | Niels Moseley <n.a.moseley@moseleyinstrumnets.com> | 2018-11-03 18:38:49 +0100 |
|---|---|---|
| committer | Niels Moseley <n.a.moseley@moseleyinstrumnets.com> | 2018-11-03 18:38:49 +0100 |
| commit | 04cd17969657dc7402d79e054ea390f98e159083 (patch) | |
| tree | c5721db942fb3b2b38940166cfc90dfff5d956b7 /passes | |
| parent | d1e8249f9acd6e65e9804f5998906c6ce1915ec1 (diff) | |
| download | yosys-04cd17969657dc7402d79e054ea390f98e159083.tar.gz yosys-04cd17969657dc7402d79e054ea390f98e159083.tar.bz2 yosys-04cd17969657dc7402d79e054ea390f98e159083.zip | |
Liberty file newline handling is more relaxed. More descriptive error message
Diffstat (limited to 'passes')
| -rw-r--r-- | passes/techmap/libparse.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc index d3b1ff02f..bb09117e2 100644 --- a/passes/techmap/libparse.cc +++ b/passes/techmap/libparse.cc @@ -159,7 +159,7 @@ int LibertyParser::lexer(std::string &str) if (c == '\n') { line++; - return ';'; + return 'n'; } // if (c >= 32 && c < 255) @@ -175,7 +175,7 @@ LibertyAst *LibertyParser::parse() int tok = lexer(str); - while (tok == ';') + while (tok == 'n') tok = lexer(str); if (tok == '}' || tok < 0) @@ -194,6 +194,9 @@ LibertyAst *LibertyParser::parse() if (tok == ';') break; + if (tok == 'n') + continue; + if (tok == ':' && ast->value.empty()) { tok = lexer(ast->value); if (tok != 'v') @@ -249,14 +252,14 @@ LibertyAst *LibertyParser::parse() void LibertyParser::error() { - log_error("Syntax error in line %d.\n", line); + log_error("Syntax error in liberty file on line %d.\n", line); } #else void LibertyParser::error() { - fprintf(stderr, "Syntax error in line %d.\n", line); + fprintf(stderr, "Syntax error in liberty file on line %d.\n", line); exit(1); } |