From: Clifford Wolf <clifford@clifford.at>
Date: Thu, 5 Dec 2013 11:53:49 +0000 (+0100)
Subject: Added AstNode::mkconst_str API
X-Git-Tag: yosys-0.2.0~257
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c39948eadbcda58d0b880dc162572838dad01a2;p=yosys.git

Added AstNode::mkconst_str API
---

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 10c7fc85b..7d5295a6c 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -658,6 +658,23 @@ AstNode *AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signe
 	return node;
 }
 
+// create an AST node for a constant (using a string as value)
+AstNode *AstNode::mkconst_str(const std::string &str)
+{
+	std::vector<RTLIL::State> data;
+	data.reserve(str.size() * 8);
+	for (size_t i = 0; i < str.size(); i++) {
+		unsigned char ch = str[str.size() - i - 1];
+		for (int j = 0; j < 8; j++) {
+			data.push_back((ch & 1) ? RTLIL::S1 : RTLIL::S0);
+			ch = ch >> 1;
+		}
+	}
+	AstNode *node = AstNode::mkconst_bits(data, false);
+	node->str = str;
+	return node;
+}
+
 RTLIL::Const AstNode::bitsAsConst(int width, bool is_signed)
 {
 	std::vector<RTLIL::State> bits = this->bits;
diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index ab1b9bec5..e9dfa5ace 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -213,6 +213,7 @@ namespace AST
 		// helper functions for creating AST nodes for constants
 		static AstNode *mkconst_int(uint32_t v, bool is_signed, int width = 32);
 		static AstNode *mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed);
+		static AstNode *mkconst_str(const std::string &str);
 
 		// helper function for creating sign-extended const objects
 		RTLIL::Const bitsAsConst(int width, bool is_signed);
diff --git a/frontends/verilog/parser.y b/frontends/verilog/parser.y
index 01c9a0095..f47d1785c 100644
--- a/frontends/verilog/parser.y
+++ b/frontends/verilog/parser.y
@@ -1053,18 +1053,7 @@ basic_expr:
 		delete $1;
 	} |
 	TOK_STRING {
-		std::string str = *$1;
-		std::vector<RTLIL::State> data;
-		data.reserve(str.size() * 8);
-		for (size_t i = 0; i < str.size(); i++) {
-			unsigned char ch = str[str.size() - i - 1];
-			for (int j = 0; j < 8; j++) {
-				data.push_back((ch & 1) ? RTLIL::S1 : RTLIL::S0);
-				ch = ch >> 1;
-			}
-		}
-		$$ = AstNode::mkconst_bits(data, false);
-		$$->str = str;
+		$$ = AstNode::mkconst_str(*$1);
 		delete $1;
 	} |
 	hierarchical_id attr {