From 2b7b05a0ce9376e2eeed4211fddd4303fc70dd66 Mon Sep 17 00:00:00 2001
From: SimonGuilloud <sim-guilloud@bluewin.ch>
Date: Mon, 3 Oct 2022 23:33:19 +0200
Subject: [PATCH] Trying to satisfy the CI, 7.
---
lisa-examples/src/main/scala/Example.scala | 2 +-
lisa-front/src/main/scala/lisa/front/package.scala | 6 +++---
.../src/main/scala/lisa/front/parser/FrontMacro.scala | 10 +++++-----
.../src/test/scala/lisa/front/FrontMacroTests.scala | 2 +-
.../src/test/scala/lisa/front/UnificationTests.scala | 2 +-
lisa-theories/src/main/scala/lisa/Main.scala | 2 +-
.../scala/lisa/settheory/SetTheoryDefinitions.scala | 2 +-
.../main/scala/lisa/settheory/SetTheoryTGAxioms.scala | 2 +-
.../main/scala/lisa/settheory/SetTheoryZAxioms.scala | 2 +-
.../main/scala/lisa/settheory/SetTheoryZFAxioms.scala | 2 +-
lisa-utils/src/main/scala/lisa/utils/Library.scala | 2 +-
lisa-utils/src/test/scala/lisa/kernel/FolTests.scala | 2 +-
.../test/scala/lisa/kernel/InvalidProofPathTests.scala | 2 +-
lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala | 2 +-
.../src/test/scala/lisa/test/ProofCheckerSuite.scala | 2 +-
.../src/test/scala/lisa/test/TestTheoryAxioms.scala | 2 +-
.../test/scala/lisa/utils/SCProofStepFinderTests.scala | 2 +-
.../scala/lisa/automation/kernel/ProofTactics.scala | 2 +-
src/main/scala/lisa/proven/peano_example/Peano.scala | 4 ++--
.../lisa/proven/peano_example/PeanoArithmetics.scala | 2 +-
20 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/lisa-examples/src/main/scala/Example.scala b/lisa-examples/src/main/scala/Example.scala
index 6d83de49..d494a522 100644
--- a/lisa-examples/src/main/scala/Example.scala
+++ b/lisa-examples/src/main/scala/Example.scala
@@ -8,7 +8,7 @@ import lisa.automation.kernel.SimplePropositionalSolver.solveSequent
import lisa.tptp.KernelParser.*
import lisa.tptp.ProblemGatherer.*
import lisa.tptp.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
import lisa.utils.Printer.*
/**
diff --git a/lisa-front/src/main/scala/lisa/front/package.scala b/lisa-front/src/main/scala/lisa/front/package.scala
index 575808bd..e5b62a2a 100644
--- a/lisa-front/src/main/scala/lisa/front/package.scala
+++ b/lisa-front/src/main/scala/lisa/front/package.scala
@@ -1,7 +1,7 @@
package lisa.front
-export lisa.front.fol.FOL.{*, given}
-export lisa.front.proof.Proof.{*, given}
+export lisa.front.fol.FOL.{_, given}
+export lisa.front.proof.Proof.{_, given}
export lisa.front.parser.FrontReader.*
-export lisa.front.parser.FrontMacro.{*, given}
+export lisa.front.parser.FrontMacro.{_, given}
export lisa.front.printer.FrontPositionedPrinter.*
diff --git a/lisa-front/src/main/scala/lisa/front/parser/FrontMacro.scala b/lisa-front/src/main/scala/lisa/front/parser/FrontMacro.scala
index ed3f0ff1..dbca0a4a 100644
--- a/lisa-front/src/main/scala/lisa/front/parser/FrontMacro.scala
+++ b/lisa-front/src/main/scala/lisa/front/parser/FrontMacro.scala
@@ -163,7 +163,7 @@ object FrontMacro {
Map[VariableLabel, VariableLabel]
)
] = {
- import LiftFOL.{*, given}
+ import LiftFOL.{_, given}
def substMap[T, U](seq: Seq[(Expr[T], Expr[U])])(using Quotes, Type[T], Type[U]): Expr[Map[T, U]] = {
val list: Seq[Expr[(T, U)]] = seq.map { case (k, v) =>
@@ -274,7 +274,7 @@ object FrontMacro {
private def termApplyMacro[P <: Tuple](parts: Expr[P], args: Expr[Seq[Any]])(using Quotes, Type[P]): Expr[Term] = {
import quotes.reflect.*
- import LiftFOL.{*, given}
+ import LiftFOL.{_, given}
val interpolator = toTokens(parts, args)
val resolved = FrontResolver.resolveTerm(FrontParser.parseTopTermOrFormula(interpolator.tokens))
@@ -288,7 +288,7 @@ object FrontMacro {
}
private def formulaApplyMacro[P <: Tuple](parts: Expr[P], args: Expr[Seq[Any]])(using Quotes, Type[P]): Expr[Formula] = {
import quotes.reflect.*
- import LiftFOL.{*, given}
+ import LiftFOL.{_, given}
val interpolator = toTokens(parts, args)
val resolved = FrontResolver.resolveFormula(FrontParser.parseTopTermOrFormula(interpolator.tokens))
@@ -302,7 +302,7 @@ object FrontMacro {
}
private def sequentApplyMacro[P <: Tuple](parts: Expr[P], args: Expr[Seq[Any]])(using Quotes, Type[P]): Expr[Sequent] = {
import quotes.reflect.*
- import LiftFOL.{*, given}
+ import LiftFOL.{_, given}
val interpolator = toTokens(parts, args)
val resolved = FrontResolver.resolveSequent(FrontParser.parseSequent(interpolator.tokens))
@@ -318,7 +318,7 @@ object FrontMacro {
}
private def partialSequentApplyMacro[P <: Tuple](parts: Expr[P], args: Expr[Seq[Any]])(using Quotes, Type[P]): Expr[PartialSequent] = {
import quotes.reflect.*
- import LiftFOL.{*, given}
+ import LiftFOL.{_, given}
val interpolator = toTokens(parts, args)
val resolved = FrontResolver.resolvePartialSequent(FrontParser.parsePartialSequent(interpolator.tokens))
diff --git a/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala b/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala
index 1f13351e..0c50fac4 100644
--- a/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala
+++ b/lisa-front/src/test/scala/lisa/front/FrontMacroTests.scala
@@ -1,6 +1,6 @@
package lisa.front
-import lisa.front.{*, given}
+import lisa.front.{_, given}
import org.scalatest.funsuite.AnyFunSuite
import scala.language.adhocExtensions
diff --git a/lisa-front/src/test/scala/lisa/front/UnificationTests.scala b/lisa-front/src/test/scala/lisa/front/UnificationTests.scala
index 3c399541..26103982 100644
--- a/lisa-front/src/test/scala/lisa/front/UnificationTests.scala
+++ b/lisa-front/src/test/scala/lisa/front/UnificationTests.scala
@@ -4,7 +4,7 @@ import lisa.front.fol.FOL.LabelType
import lisa.front.fol.FOL.WithArityType
import lisa.front.printer.FrontPositionedPrinter
import lisa.front.printer.FrontPrintStyle
-import lisa.front.{*, given}
+import lisa.front.{_, given}
import org.scalatest.Ignore
import org.scalatest.funsuite.AnyFunSuite
diff --git a/lisa-theories/src/main/scala/lisa/Main.scala b/lisa-theories/src/main/scala/lisa/Main.scala
index a0782ed4..f4e9dcfd 100644
--- a/lisa-theories/src/main/scala/lisa/Main.scala
+++ b/lisa-theories/src/main/scala/lisa/Main.scala
@@ -4,7 +4,7 @@ package lisa
* The parent trait of all theory files containing mathematical development
*/
trait Main {
- export lisa.settheory.SetTheoryLibrary.{*, given}
+ export lisa.settheory.SetTheoryLibrary.{_, given}
private val realOutput: String => Unit = println
private var outString: List[String] = List()
diff --git a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryDefinitions.scala b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryDefinitions.scala
index d831a756..4a9c4892 100644
--- a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryDefinitions.scala
+++ b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryDefinitions.scala
@@ -2,7 +2,7 @@ package lisa.settheory
import lisa.kernel.fol.FOL.*
import lisa.kernel.proof.RunningTheory
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
/**
* Base trait for set theoretical axiom systems.
diff --git a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryTGAxioms.scala b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryTGAxioms.scala
index 944b63bf..3208b7b2 100644
--- a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryTGAxioms.scala
+++ b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryTGAxioms.scala
@@ -1,7 +1,7 @@
package lisa.settheory
import lisa.kernel.fol.FOL.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_{_, given}
/**
* Axioms for the Tarski-Grothendieck theory (TG)
diff --git a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZAxioms.scala b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZAxioms.scala
index bdd4915f..b60d2f55 100644
--- a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZAxioms.scala
+++ b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZAxioms.scala
@@ -2,7 +2,7 @@ package lisa.settheory
import lisa.kernel.fol.FOL.*
import lisa.kernel.proof.RunningTheory
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
/**
* Axioms for the Zermelo theory (Z)
diff --git a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZFAxioms.scala b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZFAxioms.scala
index e4379ea9..bd95ad45 100644
--- a/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZFAxioms.scala
+++ b/lisa-theories/src/main/scala/lisa/settheory/SetTheoryZFAxioms.scala
@@ -1,7 +1,7 @@
package lisa.settheory
import lisa.kernel.fol.FOL.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
/**
* Axioms for the Zermelo-Fraenkel theory (ZF)
diff --git a/lisa-utils/src/main/scala/lisa/utils/Library.scala b/lisa-utils/src/main/scala/lisa/utils/Library.scala
index 489b930b..cfcb6846 100644
--- a/lisa-utils/src/main/scala/lisa/utils/Library.scala
+++ b/lisa-utils/src/main/scala/lisa/utils/Library.scala
@@ -13,7 +13,7 @@ abstract class Library(val theory: RunningTheory) {
export lisa.kernel.proof.SequentCalculus.*
export lisa.kernel.proof.SCProof as Proof
export theory.{Justification, Theorem, Definition, Axiom, PredicateDefinition, FunctionDefinition}
- export lisa.utils.Helpers.{*, given}
+ export lisa.utils.Helpers.{_, given}
import lisa.kernel.proof.RunningTheoryJudgement as Judgement
/**
diff --git a/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala b/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala
index 3de689b8..c3e944f3 100644
--- a/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala
+++ b/lisa-utils/src/test/scala/lisa/kernel/FolTests.scala
@@ -6,7 +6,7 @@ import lisa.kernel.proof.RunningTheory.*
import lisa.kernel.proof.SCProof
import lisa.kernel.proof.SCProofChecker
import lisa.kernel.proof.SequentCalculus.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
import lisa.utils.Printer
import org.scalatest.funsuite.AnyFunSuite
diff --git a/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala b/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala
index d62ef6ad..1bf566e3 100644
--- a/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala
+++ b/lisa-utils/src/test/scala/lisa/kernel/InvalidProofPathTests.scala
@@ -4,7 +4,7 @@ import lisa.kernel.proof.SCProofCheckerJudgement.SCInvalidProof
import lisa.kernel.proof.SequentCalculus.*
import lisa.kernel.proof.*
import lisa.test.ProofCheckerSuite
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
class InvalidProofPathTests extends ProofCheckerSuite {
def checkPath(invalidProof: SCProof, expectedPath: Seq[Int]): Unit = {
diff --git a/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala b/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala
index c5ba765c..d00afd89 100644
--- a/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala
+++ b/lisa-utils/src/test/scala/lisa/kernel/ProofTests.scala
@@ -6,7 +6,7 @@ import lisa.kernel.proof.RunningTheory.*
import lisa.kernel.proof.SCProof
import lisa.kernel.proof.SCProofChecker
import lisa.kernel.proof.SequentCalculus.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
import lisa.utils.Printer
import org.scalatest.funsuite.AnyFunSuite
diff --git a/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala b/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala
index 50212e1a..4a989fa2 100644
--- a/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala
+++ b/lisa-utils/src/test/scala/lisa/test/ProofCheckerSuite.scala
@@ -6,7 +6,7 @@ import lisa.kernel.proof.SCProofCheckerJudgement
import lisa.kernel.proof.SCProofCheckerJudgement.SCInvalidProof
import lisa.kernel.proof.SequentCalculus.Sequent
import lisa.kernel.proof.SequentCalculus.isSameSequent
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
import lisa.utils.Printer
import org.scalatest.funsuite.AnyFunSuite
diff --git a/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala b/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala
index fe7678b8..151fdbb1 100644
--- a/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala
+++ b/lisa-utils/src/test/scala/lisa/test/TestTheoryAxioms.scala
@@ -2,7 +2,7 @@ package lisa.test
import lisa.kernel.fol.FOL.*
import lisa.kernel.proof.RunningTheory
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
trait TestTheoryAxioms {
final val p1 = ConstantPredicateLabel("p1", 1)
diff --git a/lisa-utils/src/test/scala/lisa/utils/SCProofStepFinderTests.scala b/lisa-utils/src/test/scala/lisa/utils/SCProofStepFinderTests.scala
index 7890b4dd..bc5b1da0 100644
--- a/lisa-utils/src/test/scala/lisa/utils/SCProofStepFinderTests.scala
+++ b/lisa-utils/src/test/scala/lisa/utils/SCProofStepFinderTests.scala
@@ -12,7 +12,7 @@ import lisa.kernel.proof.SequentCalculus.*
import lisa.settheory.AxiomaticSetTheory.*
import lisa.kernel.proof.SCProofCheckerJudgement.*
import org.scalatest.funsuite.AnyFunSuite
-import me.cassayre.florian.masterproject.util.SCProofBuilder.{_, given}
+import me.cassayre.florian.masterproject.util.SCProofBuilder.{_{_, given}
import util.chaining.*
import scala.util.{Failure, Success, Try}
diff --git a/src/main/scala/lisa/automation/kernel/ProofTactics.scala b/src/main/scala/lisa/automation/kernel/ProofTactics.scala
index 43bc2695..d90b8208 100644
--- a/src/main/scala/lisa/automation/kernel/ProofTactics.scala
+++ b/src/main/scala/lisa/automation/kernel/ProofTactics.scala
@@ -3,7 +3,7 @@ package lisa.automation.kernel
import lisa.kernel.fol.FOL.*
import lisa.kernel.proof.SCProof
import lisa.kernel.proof.SequentCalculus.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
import lisa.utils.Printer.*
/**
diff --git a/src/main/scala/lisa/proven/peano_example/Peano.scala b/src/main/scala/lisa/proven/peano_example/Peano.scala
index ff1020a8..90479702 100644
--- a/src/main/scala/lisa/proven/peano_example/Peano.scala
+++ b/src/main/scala/lisa/proven/peano_example/Peano.scala
@@ -5,12 +5,12 @@ import lisa.kernel.fol.FOL.*
import lisa.kernel.proof.RunningTheory
import lisa.kernel.proof.SCProof
import lisa.kernel.proof.SequentCalculus.*
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
import lisa.utils.Library
import lisa.utils.Printer
object Peano {
- export PeanoArithmeticsLibrary.{*, given}
+ export PeanoArithmeticsLibrary.{_, given}
/////////////////////////// OUTPUT CONTROL //////////////////////////
given output: (String => Unit) = println
diff --git a/src/main/scala/lisa/proven/peano_example/PeanoArithmetics.scala b/src/main/scala/lisa/proven/peano_example/PeanoArithmetics.scala
index 0200f11b..86fb9467 100644
--- a/src/main/scala/lisa/proven/peano_example/PeanoArithmetics.scala
+++ b/src/main/scala/lisa/proven/peano_example/PeanoArithmetics.scala
@@ -2,7 +2,7 @@ package lisa.proven.peano_example
import lisa.kernel.fol.FOL.*
import lisa.kernel.proof.RunningTheory
-import lisa.utils.Helpers.{*, given}
+import lisa.utils.Helpers.{_, given}
object PeanoArithmetics {
final val (x, y, z) =
--
GitLab