Skip to content

Commit e2f583a

Browse files
Scott-GuestBaltoli
Scott-Guest
and
Baltoli
authored
Miscellaneous Scala cleanup (#1006)
This PR makes a couple quick changes analogous to runtimeverification/k#4055: - Update `scala-maven-plugin` to its latest version - Set the Java version by relying on `<release>` in `maven-compiler-plugin` inherited from the parent POM, rather than manually setting `-source` and `-target` for `javac` - Disable various Scala language extensions and enable `-Werror` - One warning about pattern matching on an erased type - Remaining warnings were exhaustiveness issues fixed with a `case _ => ???`. This is poor style and an abuse of `???` IMO, but it's already pervasive throughout our codebase. --------- Co-authored-by: Bruce Collie <[email protected]>
1 parent 2c2a35d commit e2f583a

File tree

9 files changed

+45
-31
lines changed

9 files changed

+45
-31
lines changed

‎matching/pom.xml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,26 @@
7575
<version>1.4</version>
7676
<classifier>linux64</classifier>
7777
</dependency>
78+
<dependency>
79+
<groupId>org.scala-sbt</groupId>
80+
<artifactId>compiler-bridge_2.12</artifactId>
81+
<version>1.8.0</version>
82+
</dependency>
7883
</dependencies>
7984

8085
<build>
8186
<plugins>
8287
<plugin>
8388
<artifactId>maven-compiler-plugin</artifactId>
84-
<version>3.7.0</version>
89+
<version>3.12.1</version>
8590
<configuration>
86-
<source>${java.version}</source>
87-
<target>${java.version}</target>
91+
<release>${java.version}</release>
8892
</configuration>
8993
</plugin>
9094
<plugin>
9195
<groupId>net.alchim31.maven</groupId>
9296
<artifactId>scala-maven-plugin</artifactId>
93-
<version>3.3.1</version>
97+
<version>4.8.1</version>
9498
<executions>
9599
<execution>
96100
<id>scala-compile-first</id>
@@ -110,18 +114,10 @@
110114
</executions>
111115
<configuration>
112116
<args>
113-
<arg>-Xexperimental</arg>
117+
<arg>-Werror</arg>
114118
<arg>-feature</arg>
115119
<arg>-deprecation</arg>
116-
<arg>-language:implicitConversions</arg>
117-
<arg>-language:postfixOps</arg>
118120
</args>
119-
<javacArgs>
120-
<javacArg>-source</javacArg>
121-
<javacArg>${java.version}</javacArg>
122-
<javacArg>-target</javacArg>
123-
<javacArg>${java.version}</javacArg>
124-
</javacArgs>
125121
</configuration>
126122
</plugin>
127123
<plugin>

‎matching/src/main/scala/org/kframework/backend/llvm/matching/Constructor.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ case class Empty() extends Constructor {
1919
f.sortInfo.category match {
2020
case SetS() => SetP(Seq(), None, symbol, SymbolP(symbol, Seq()))
2121
case MapS() => MapP(Seq(), Seq(), None, symbol, SymbolP(symbol, Seq()))
22+
case _ => ???
2223
}
2324
}
2425
override lazy val hashCode: Int = scala.runtime.ScalaRunTime._hashCode(this)
@@ -118,6 +119,7 @@ case class HasKey(isSet: Boolean, element: SymbolOrAlias, key: Option[Pattern[Op
118119
concat(element(key, value), child)
119120
)
120121
}
122+
case _ => ???
121123
}
122124
}
123125
override lazy val hashCode: Int = scala.runtime.ScalaRunTime._hashCode(this)
@@ -166,6 +168,7 @@ case class HasNoKey(isSet: Boolean, key: Option[Pattern[Option[Occurrence]]]) ex
166168
concat(element(wildcard, wildcard), child)
167169
)
168170
}
171+
case _ => ???
169172
}
170173
}
171174
override lazy val hashCode: Int = scala.runtime.ScalaRunTime._hashCode(this)

‎matching/src/main/scala/org/kframework/backend/llvm/matching/Matrix.scala

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -781,18 +781,20 @@ class Matrix private (
781781
)
782782
}
783783
// fill out the bindings for list range variables
784-
val withRanges = row.clause.listRanges.foldRight(sc) { case ((o @ Num(_, o2), hd, tl), dt) =>
785-
Function(
786-
"hook_LIST_range_long",
787-
o,
788-
Seq(
789-
(o2, "LIST.List"),
790-
(Lit(hd.toString, "MINT.MInt 64"), "MINT.MInt 64"),
791-
(Lit(tl.toString, "MINT.MInt 64"), "MINT.MInt 64")
792-
),
793-
"LIST.List",
794-
dt
795-
)
784+
val withRanges = row.clause.listRanges.foldRight(sc) {
785+
case ((o @ Num(_, o2), hd, tl), dt) =>
786+
Function(
787+
"hook_LIST_range_long",
788+
o,
789+
Seq(
790+
(o2, "LIST.List"),
791+
(Lit(hd.toString, "MINT.MInt 64"), "MINT.MInt 64"),
792+
(Lit(tl.toString, "MINT.MInt 64"), "MINT.MInt 64")
793+
),
794+
"LIST.List",
795+
dt
796+
)
797+
case _ => ???
796798
}
797799
val withOverloads = row.clause.overloadChildren.foldRight(withRanges) {
798800
case ((SymbolC(inj), f, v), dt) =>
@@ -810,6 +812,7 @@ class Matrix private (
810812
),
811813
dt
812814
)
815+
case _ => ???
813816
}
814817
val withSpecials = row.clause.specializedVars.foldRight(withOverloads) { case ((o, p), dt) =>
815818
MakePattern(o, p._1.hookAtt, p._2, dt)

‎matching/src/main/scala/org/kframework/backend/llvm/matching/Parser.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ object Parser {
429429

430430
val heuristicMap: Map[Char, Heuristic] = {
431431
import scala.reflect.runtime.universe
432+
import universe.LiteralTag
432433

433434
val heuristicType = universe.typeOf[Heuristic]
434435
val heuristicClass = heuristicType.typeSymbol.asClass

‎matching/src/main/scala/org/kframework/backend/llvm/matching/pattern/Pattern.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.runtimeverification.k.kore
44
import com.runtimeverification.k.kore.implementation.{ DefaultBuilders => B }
55
import com.runtimeverification.k.kore.SymbolOrAlias
66
import org.kframework.backend.llvm.matching._
7-
import scala.math.min
87

98
sealed trait Pattern[T] {
109
def signature(clause: Clause): Seq[Constructor]
@@ -365,6 +364,7 @@ case class MapP[T] private (
365364
case (HasNoKey(_, Some(p)), _) => !keys.map(_.canonicalize(clause)).contains(p)
366365
case (HasKey(_, _, None), None) => keys.nonEmpty && clause.action.priority <= maxPriority
367366
case (HasNoKey(_, None), _) => keys.nonEmpty && clause.action.priority > maxPriority
367+
case _ => ???
368368
}
369369
def score(
370370
h: Heuristic,
@@ -419,6 +419,7 @@ case class MapP[T] private (
419419
} else {
420420
Seq(keys.head, values.head, MapP(keys.tail, values.tail, frame, ctr, orig))
421421
}
422+
case _ => ???
422423
}
423424
def expandOr: Seq[Pattern[T]] = {
424425
val withKeys = keys.indices.foldLeft(Seq(this))((accum, ix) =>
@@ -593,6 +594,7 @@ case class SetP[T] private (
593594
case (HasNoKey(_, Some(p)), _) => !elements.map(_.canonicalize(clause)).contains(p)
594595
case (HasKey(_, _, None), None) => elements.nonEmpty && clause.action.priority <= maxPriority
595596
case (HasNoKey(_, None), _) => elements.nonEmpty && clause.action.priority > maxPriority
597+
case _ => ???
596598
}
597599
def score(
598600
h: Heuristic,
@@ -640,6 +642,7 @@ case class SetP[T] private (
640642
} else {
641643
Seq(elements.head, SetP(elements.tail, frame, ctr, orig))
642644
}
645+
case _ => ???
643646
}
644647
def expandOr: Seq[Pattern[T]] = {
645648
val withElements = elements.indices.foldLeft(Seq(this))((accum, ix) =>

‎matching/src/main/scala/org/kframework/backend/llvm/matching/pattern/SortCategory.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ object SortCategory {
4949
MatchingException.Type.COMPILER_ERROR,
5050
"LLVM Backend does not support multisets. If you are seeing this error due to a configuration cell tagged with multiplicity=\"*\", please add either type=\"Map\" or type=\"Set\". If you still need the collection to not contain duplicates, it is recommended you also add a unique identifier each time a cell is created. You can do this with !X:Int."
5151
);
52+
case _ => ???
5253
}
5354

5455
private def getBitwidth(s: Sort, symlib: Parser.SymLib): Int =

‎nix/build-maven-package.nix

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ let
2626
mvn dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2
2727
done
2828
29-
for artifactId in ${builtins.toString manualMvnSourceArtifacts}
29+
for artifact in ${builtins.toString manualMvnSourceArtifacts}
3030
do
31-
group=$(echo $artifactId | cut -d':' -f1)
32-
artifact=$(echo $artifactId | cut -d':' -f2)
31+
groupId=$(echo $artifact | cut -d':' -f1)
32+
artifactId=$(echo $artifact | cut -d':' -f2)
33+
version=$(echo $artifact | cut -d':' -f3)
3334
echo "downloading manual sources $artifactId"
34-
mvn dependency:sources -DincludeGroupIds=$group -DincludeArtifactIds=$artifact -Dmaven.repo.local=$out/.m2
35+
mvn dependency:get -Dclassifier=sources -DgroupId=$groupId -DartifactId=$artifactId -Dversion=$version -Dmaven.repo.local=$out/.m2
3536
done
3637
'' + lib.optionalString (!buildOffline) ''
3738
mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters}

‎nix/llvm-backend-matching.nix

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,17 @@ let self = maven.buildMavenPackage rec {
1212
"org.apache.maven.plugins:maven-compiler-plugin:3.7.0"
1313
];
1414

15+
manualMvnSourceArtifacts = [
16+
"org.scala-sbt:compiler-bridge_2.12:1.8.0"
17+
];
18+
1519
passthru = {
1620
jar =
1721
"${self}/share/java/llvm-backend-matching-1.0-SNAPSHOT-jar-with-dependencies.jar";
1822
};
1923

24+
mvnParameters = "-DsecondaryCacheDir=secondary-cache";
25+
2026
installPhase = ''
2127
mkdir -p $out/share/java
2228
install -Dm644 target/*.jar $out/share/java

‎nix/overlay.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ let
2121

2222
llvm-backend-matching = import ./llvm-backend-matching.nix {
2323
src = prev.llvm-backend-matching-src;
24-
mvnHash = "sha256-HF6BXeCnV5I7+oRVGK8DGHjaAtHWLfEaCwtkVcQHoGU";
24+
mvnHash = "sha256-2X8G3T05Pk1apA0f04Mdu/8DAB89oB9XwTBQ3KVoc/A=";
2525
inherit (final) maven;
2626
};
2727

0 commit comments

Comments
 (0)