From 63f25ac4b4d7c9bd530ff1875ad38d835a82e051 Mon Sep 17 00:00:00 2001
From: mergify[bot]
Date: Fri, 3 Jun 2022 18:33:13 +0000
Subject: Deprecate implicit .U() and .S() syntax for literal bit extracts
 (backport #2534) (#2559)

* Deprecate .U() and .S() syntax for literal bit extracts (#2534)

(cherry picked from commit cadaf33a650ef898fdab2f81244e4ad6a07a9ea8)

# Conflicts:
#	macros/src/main/scala/chisel3/internal/sourceinfo/SourceInfoTransform.scala

* Fix backport conflict (#2560)

Co-authored-by: Jared Barocsi <82000041+jared-barocsi@users.noreply.github.com>---
 src/test/scala/chiselTests/SIntOps.scala | 15 ++++++++++++---
 src/test/scala/chiselTests/UIntOps.scala | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/test/scala/chiselTests/SIntOps.scala b/src/test/scala/chiselTests/SIntOps.scala
index 55b4c915..580a6e34 100644
--- a/src/test/scala/chiselTests/SIntOps.scala
+++ b/src/test/scala/chiselTests/SIntOps.scala
@@ -85,9 +85,18 @@ class SIntOpsTester(c: SIntOps) extends Tester(c) {
  */
 
 class SIntLitExtractTester extends BasicTester {
-  assert(-5.S(1) === true.B)
-  assert(-5.S(2) === false.B)
-  assert(-5.S(100) === true.B)
+  assert({
+    val lit = -5.S
+    lit(1) === true.B
+  })
+  assert({
+    val lit = -5.S
+    lit(2) === false.B
+  })
+  assert({
+    val lit = -5.S
+    lit(100) === true.B
+  })
   assert(-5.S(3, 0) === "b1011".U)
   assert(-5.S(9, 0) === "b1111111011".U)
   assert(-5.S(4.W)(1) === true.B)
diff --git a/src/test/scala/chiselTests/UIntOps.scala b/src/test/scala/chiselTests/UIntOps.scala
index 0010e9ac..6569c9e7 100644
--- a/src/test/scala/chiselTests/UIntOps.scala
+++ b/src/test/scala/chiselTests/UIntOps.scala
@@ -172,9 +172,18 @@ class MatchedRotateLeftAndRight(w: Int = 13) extends BasicTester {
 }
 
 class UIntLitExtractTester extends BasicTester {
-  assert("b101010".U(2) === false.B)
-  assert("b101010".U(3) === true.B)
-  assert("b101010".U(100) === false.B)
+  assert({
+    val lit = "b101010".U
+    lit(2) === false.B
+  })
+  assert({
+    val lit = "b101010".U
+    lit(3) === true.B
+  })
+  assert({
+    val lit = "b101010".U
+    lit(100) === false.B
+  })
   assert("b101010".U(3, 0) === "b1010".U)
   assert("b101010".U(9, 0) === "b0000101010".U)
 
-- 
cgit v1.2.3