Automatic compiler rewrites for Scala 3.7.0

Author: sankalpgambhir

src/main/scala/smtlib/common/Positions.scala

@@ -32,7 +32,7 @@ case class Position(line: Int, col: Int) extends Ordered[Position] {
   */
 trait Positioned {
 
-  private[this] var _pos: Option[Position] = None
+  private var _pos: Option[Position] = None
 
   def setPos(pos: Position): this.type = {
     _pos = Some(pos)

src/main/scala/smtlib/parser/ParserCommands.scala

@@ -7,7 +7,7 @@ import trees.Commands._
 
 import scala.collection.mutable.ListBuffer
 
-trait ParserCommands { this: ParserCommon with ParserTerms =>
+trait ParserCommands { this: ParserCommon & ParserTerms =>
 
   import Parser._
 

src/main/scala/smtlib/parser/ParserCommandsResponses.scala

@@ -7,7 +7,7 @@ import trees.CommandsResponses._
 
 import scala.collection.mutable.ListBuffer
 
-trait ParserCommandsResponses { this: ParserCommon with ParserTerms with ParserCommands =>
+trait ParserCommandsResponses { this: ParserCommon & ParserTerms & ParserCommands =>
 
   import Parser._
 

src/main/scala/smtlib/parser/ParserCommon.scala

@@ -164,7 +164,7 @@ trait ParserCommon {
       case Tokens.StringLitKind => parseString
       case Tokens.SymbolLitKind => parseSymbol
       case Tokens.OParen => parseSList
-      case _ => expected(peekToken, attributeValuesTokenKinds:_*)
+      case _ => expected(peekToken, attributeValuesTokenKinds*)
     }
   }
   def tryParseAttributeValue: Option[AttributeValue] = {

src/main/scala/smtlib/theories/FixedSizeBitVectors.scala

@@ -48,7 +48,7 @@ object FixedSizeBitVectors {
       case QualifiedIdentifier(
         Identifier(SSymbol(cst), Seq(SNumeral(size))),
         None
-      ) if cst startsWith "bv" =>
+      ) if cst `startsWith` "bv" =>
         Some(BigInt(cst drop 2) -> size)
 
       case _ => None

src/main/scala/smtlib/trees/TermsOps.scala

@@ -22,7 +22,7 @@ object TermsOps {
     * @return the new sort after applying the mapping
     */
   def postMap(f: (Sort) => Option[Sort])(sort: Sort): Sort = {
-    val rec = postMap(f) _
+    val rec = postMap(f)
     val Sort(id, subSorts) = sort
 
     val recSorts = subSorts.map(rec)
@@ -51,7 +51,7 @@ object TermsOps {
     * @note this operation can diverge if f is not well formed
     */
   def preMap(f: (Sort) => Option[Sort])(sort: Sort): Sort = {
-    val rec = preMap(f) _
+    val rec = preMap(f)
     val newSort = f(sort).getOrElse(sort)
     val Sort(id, subSorts) = newSort
 
@@ -65,22 +65,22 @@ object TermsOps {
 
 
   def postTraversal(f: (Sort) => Unit)(sort: Sort): Unit = {
-    val rec = postTraversal(f) _
+    val rec = postTraversal(f)
     val Sort(_, subSorts) = sort
     subSorts.foreach(rec)
     f(sort)
   }
 
   def preTraversal(f: (Sort) => Unit)(sort: Sort): Unit = {
-    val rec = preTraversal(f) _
+    val rec = preTraversal(f)
     val Sort(_, subSorts) = sort
     f(sort)
     subSorts.foreach(rec)
   }
 
 
   def fold[T](f: (Sort, Seq[T]) => T)(sort: Sort): T = {
-    val rec = fold(f) _
+    val rec = fold(f)
     val Sort(_, ss) = sort
     f(sort, ss.map(rec))
   }

src/main/scala/smtlib/trees/Trees.scala

@@ -81,7 +81,7 @@ object Terms {
 
   case class SList(sexprs: List[SExpr]) extends SExpr with AttributeValue
   object SList {
-    def apply(sexprs: SExpr*): SList = SList(List(sexprs:_*))
+    def apply(sexprs: SExpr*): SList = SList(List(sexprs*))
   }
   case class SKeyword(name: String) extends SExpr
   case class SSymbol(name: String) extends SExpr with AttributeValue with Index

src/test/scala/smtlib/theories/StringsTests.scala

@@ -136,22 +136,22 @@ class StringsTests extends AnyFunSuite with Matchers {
     }
 
 
-    "\"abc\"" shouldParseTo
+    "\"abc\"" `shouldParseTo`
     StringLit("abc")
 
-    "(str.++ \"a\" \"bc\" )" shouldParseTo
+    "(str.++ \"a\" \"bc\" )" `shouldParseTo`
     Concat(StringLit("a"), StringLit("bc"))
 
-    "(str.++ \"a\" \"bc\" \"def\" )" shouldParseTo
+    "(str.++ \"a\" \"bc\" \"def\" )" `shouldParseTo`
     Concat(StringLit("a"), StringLit("bc"), StringLit("def"))
 
-    "(str.len \"abcd\")" shouldParseTo
+    "(str.len \"abcd\")" `shouldParseTo`
     Length(StringLit("abcd"))
 
-    "(str.at \"abcd\" 1)" shouldParseTo
+    "(str.at \"abcd\" 1)" `shouldParseTo`
     At(StringLit("abcd"), NumeralLit(1))
 
-    "(str.substr \"abcdef\" 2 5)" shouldParseTo
+    "(str.substr \"abcdef\" 2 5)" `shouldParseTo`
     Substring(StringLit("abcdef"), NumeralLit(2), NumeralLit(5))
   }
 }