Merge branch 'master' of https://github.com/ahmedirfan1983/yosys into btor

3 files changed, 11 insertions, 11 deletions

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index 40caf7801..23d93353f 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -470,7 +470,7 @@ struct DfflibmapPass : public Pass {
 		FILE *f = fopen(liberty_file.c_str(), "r");
 		if (f == NULL)
 			log_cmd_error("Can't open liberty file `%s': %s\n", liberty_file.c_str(), strerror(errno));
-		LibertyParer libparser(f);
+		LibertyParser libparser(f);
 		fclose(f);
 
 		find_cell(libparser.ast, "$_DFF_N_", false, false, false, false);
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 8fc03b5c9..8f4a1a5fa 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -79,7 +79,7 @@ void LibertyAst::dump(FILE *f, std::string indent, std::string path, bool path_o
 		fprintf(f, " ;\n");
 }
 
-int LibertyParer::lexer(std::string &str)
+int LibertyParser::lexer(std::string &str)
 {
 	int c;
 
@@ -87,11 +87,11 @@ int LibertyParer::lexer(std::string &str)
 		c = fgetc(f);
 	} while (c == ' ' || c == '\t' || c == '\r');
 
-	if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_' || c == '-' || c == '.') {
+	if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_' || c == '-' || c == '+' || c == '.') {
 		str = c;
 		while (1) {
 			c = fgetc(f);
-			if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_' || c == '-' || c == '.')
+			if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_' || c == '-' || c == '+' || c == '.')
 				str += c;
 			else
 				break;
@@ -154,7 +154,7 @@ int LibertyParer::lexer(std::string &str)
 	return c;
 }
 
-LibertyAst *LibertyParer::parse()
+LibertyAst *LibertyParser::parse()
 {
 	std::string str;
 
@@ -219,14 +219,14 @@ LibertyAst *LibertyParer::parse()
 
 #ifndef FILTERLIB
 
-void LibertyParer::error()
+void LibertyParser::error()
 {
 	log_error("Syntax error in line %d.\n", line);
 }
 
 #else
 
-void LibertyParer::error()
+void LibertyParser::error()
 {
 	fprintf(stderr, "Syntax error in line %d.\n", line);
 	exit(1);
@@ -611,7 +611,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	LibertyParer parser(f);
+	LibertyParser parser(f);
 	if (parser.ast) {
 		if (flag_verilogsim)
 			gen_verilogsim(parser.ast);
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index 8c4a2f5ca..eff268bbb 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -39,13 +39,13 @@ namespace PASS_DFFLIBMAP
 		static std::set<std::string> whitelist;
 	};
 
-	struct LibertyParer
+	struct LibertyParser
 	{
 		FILE *f;
 		int line;
 		LibertyAst *ast;
-		LibertyParer(FILE *f) : f(f), line(1), ast(parse()) {}
-		~LibertyParer() { if (ast) delete ast; }
+		LibertyParser(FILE *f) : f(f), line(1), ast(parse()) {}
+		~LibertyParser() { if (ast) delete ast; }
 		int lexer(std::string &str);
 		LibertyAst *parse();
 		void error();