From: Niels Moseley <n.a.moseley@moseleyinstrumnets.com>
Date: Sat, 3 Nov 2018 17:38:49 +0000 (+0100)
Subject: Liberty file newline handling is more relaxed. More descriptive error message
X-Git-Tag: yosys-0.9~423^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=04cd17969657dc7402d79e054ea390f98e159083;p=yosys.git

Liberty file newline handling is more relaxed. More descriptive error message
---

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