From 14f32028ec878b8ba7324584631523f5b571b39f Mon Sep 17 00:00:00 2001
From: Peter <peter@crozier.com>
Date: Thu, 27 Feb 2020 16:57:35 +0000
Subject: Parser changes to support typedef.

---
 frontends/verilog/verilog_lexer.l | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'frontends/verilog/verilog_lexer.l')

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index d22a18458..74e8dce7f 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -372,9 +372,33 @@ supply1 { return TOK_SUPPLY1; }
 "$signed"   { return TOK_TO_SIGNED; }
 "$unsigned" { return TOK_TO_UNSIGNED; }
 
+[a-zA-Z_][a-zA-Z0-9_]*::[a-zA-Z_$][a-zA-Z0-9_$]* {
+	// package qualifier
+	auto s = std::string("\\") + yytext;
+	if (pkg_user_types.count(s) > 0) {
+		// found it
+		yylval->string = new std::string(s);
+		return TOK_USER_TYPE;
+	}
+	else {
+		// backup before :: just return first part
+		size_t len = strchr(yytext, ':') - yytext;
+		yyless(len);
+		yylval->string = new std::string(std::string("\\") + yytext);
+		return TOK_ID;
+	}
+}
+
 [a-zA-Z_$][a-zA-Z0-9_$]* {
-	yylval->string = new std::string(std::string("\\") + yytext);
-	return TOK_ID;
+	auto s = std::string("\\") + yytext;
+	if (user_types.count(s) > 0) {
+		yylval->string = new std::string(s);
+		return TOK_USER_TYPE;
+	}
+	else {
+		yylval->string = new std::string(std::string("\\") + yytext);
+		return TOK_ID;
+	}
 }
 
 [a-zA-Z_$][a-zA-Z0-9_$\.]* {
-- 
cgit v1.2.3


From ecc22f7fedfa639482dbc55a05709da85116a60f Mon Sep 17 00:00:00 2001
From: Peter Crozier <peter@crozier.com>
Date: Mon, 23 Mar 2020 20:07:22 +0000
Subject: Support module/package/interface/block scope for typedef names.

---
 frontends/verilog/verilog_lexer.l | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'frontends/verilog/verilog_lexer.l')

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 74e8dce7f..bccdf4841 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -99,6 +99,18 @@ YYLTYPE old_location;
 #define YY_BUF_SIZE 65536
 
 extern int frontend_verilog_yylex(YYSTYPE *yylval_param, YYLTYPE *yyloc_param);
+
+static bool isUserType(std::string &s)
+{
+	// check current scope then outer scopes for a name
+	for (auto it = user_type_stack.rbegin(); it != user_type_stack.rend(); ++it) {
+		if ((*it)->count(s) > 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
 %}
 
 %option yylineno
@@ -376,7 +388,7 @@ supply1 { return TOK_SUPPLY1; }
 	// package qualifier
 	auto s = std::string("\\") + yytext;
 	if (pkg_user_types.count(s) > 0) {
-		// found it
+		// package qualified typedefed name
 		yylval->string = new std::string(s);
 		return TOK_USER_TYPE;
 	}
@@ -391,7 +403,8 @@ supply1 { return TOK_SUPPLY1; }
 
 [a-zA-Z_$][a-zA-Z0-9_$]* {
 	auto s = std::string("\\") + yytext;
-	if (user_types.count(s) > 0) {
+	if (isUserType(s)) {
+		// previously typedefed name
 		yylval->string = new std::string(s);
 		return TOK_USER_TYPE;
 	}
-- 
cgit v1.2.3


From 9a8a644ad11e6fd95b6a1800e357e9cf282f5275 Mon Sep 17 00:00:00 2001
From: Peter Crozier <peter@crozier.com>
Date: Tue, 24 Mar 2020 14:35:21 +0000
Subject: Error duplicate declarations of a typedef name in the same scope.

---
 frontends/verilog/verilog_lexer.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontends/verilog/verilog_lexer.l')

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index bccdf4841..f6a3ac4db 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -390,7 +390,7 @@ supply1 { return TOK_SUPPLY1; }
 	if (pkg_user_types.count(s) > 0) {
 		// package qualified typedefed name
 		yylval->string = new std::string(s);
-		return TOK_USER_TYPE;
+		return TOK_PKG_USER_TYPE;
 	}
 	else {
 		// backup before :: just return first part
-- 
cgit v1.2.3