Merge pull request chipsalliance#1983 from IEncinas10/dff-name-style

Add dff-name-style
hzeller · Oct 7, 2024 · 32b2456 · 32b2456
2 parents 14eed6a + a2e4faa
commit 32b2456
Show file tree

Hide file tree

Showing 14 changed files with 1,408 additions and 51 deletions.
diff --git a/verilog/CST/BUILD b/verilog/CST/BUILD
@@ -299,6 +299,7 @@ cc_test(
     deps = [
         ":expression",
         ":match-test-utils",
+        ":verilog-matchers",  # fixdeps: keep
         ":verilog-nonterminals",
         "//common/analysis:syntax-tree-search",
         "//common/analysis:syntax-tree-search-test-utils",
@@ -748,13 +749,15 @@ cc_test(
     deps = [
         ":match-test-utils",
         ":statement",
+        ":verilog-matchers",
         ":verilog-nonterminals",
         "//common/analysis:syntax-tree-search",
         "//common/analysis:syntax-tree-search-test-utils",
         "//common/analysis/matcher:matcher-builders",
         "//common/text:concrete-syntax-tree",
         "//common/text:symbol",
         "//common/text:text-structure",
+        "//common/text:tree-utils",
         "//common/util:logging",
         "//verilog/analysis:verilog-analyzer",
         "@com_google_absl//absl/strings:string_view",

diff --git a/verilog/CST/expression.cc b/verilog/CST/expression.cc
@@ -183,4 +183,33 @@ const verible::TokenInfo *ReferenceIsSimpleIdentifier(
   return ReferenceBaseIsSimple(base_node);
 }
 
+const verible::SyntaxTreeLeaf *GetIncrementDecrementOperator(
+    const verible::Symbol &expr) {
+  if (expr.Kind() != SymbolKind::kNode) return nullptr;
+
+  const SyntaxTreeNode &node = verible::SymbolCastToNode(expr);
+
+  if (!node.MatchesTag(NodeEnum::kIncrementDecrementExpression)) return nullptr;
+
+  // Structure changes depending on the type of IncrementDecrement
+  bool is_post = node.front().get()->Kind() == SymbolKind::kNode;
+
+  return verible::GetSubtreeAsLeaf(
+      expr, NodeEnum::kIncrementDecrementExpression, is_post ? 1 : 0);
+}
+
+const verible::SyntaxTreeNode *GetIncrementDecrementOperand(
+    const verible::Symbol &expr) {
+  if (expr.Kind() != SymbolKind::kNode) return nullptr;
+
+  const SyntaxTreeNode &node = verible::SymbolCastToNode(expr);
+
+  if (!node.MatchesTag(NodeEnum::kIncrementDecrementExpression)) return nullptr;
+
+  // Structure changes depending on the type of IncrementDecrement
+  bool is_post = node.front().get()->Kind() == SymbolKind::kNode;
+  return verible::GetSubtreeAsNode(
+      expr, NodeEnum::kIncrementDecrementExpression, is_post ? 0 : 1);
+}
+
 }  // namespace verilog
diff --git a/verilog/CST/expression.h b/verilog/CST/expression.h
@@ -116,6 +116,16 @@ std::vector<verible::TreeSearchMatch> FindAllReferenceFullExpressions(
 const verible::TokenInfo *ReferenceIsSimpleIdentifier(
     const verible::Symbol &reference);
 
+// Return the operator for a kIncrementDecrementExpression
+// This function would extract the leaf containing '++' from expression '++a'
+const verible::SyntaxTreeLeaf *GetIncrementDecrementOperator(
+    const verible::Symbol &expr);
+
+// Return the operator for a kIncrementDecrementExpression
+// This function would extract the leaf containing 'a' from expression '++a'
+const verible::SyntaxTreeNode *GetIncrementDecrementOperand(
+    const verible::Symbol &expr);
+
 }  // namespace verilog
 
 #endif  // VERIBLE_VERILOG_CST_EXPRESSION_H_