From a2b5d1fb653ea1a1cc00d123c5e526e13dca3be4 Mon Sep 17 00:00:00 2001
From: Florian Cassayre <florian.cassayre@gmail.com>
Date: Sat, 11 Jun 2022 17:14:11 +0200
Subject: [PATCH] Fix CI
---
.github/{workflow => workflows}/ci.yml | 0
.gitignore | 1 +
src/main/scala/lisa/kernel/fol/CommonDefinitions.scala | 2 +-
src/main/scala/lisa/kernel/fol/FormulaLabelDefinitions.scala | 2 +-
src/main/scala/lisa/kernel/fol/TermLabelDefinitions.scala | 2 +-
5 files changed, 4 insertions(+), 3 deletions(-)
rename .github/{workflow => workflows}/ci.yml (100%)
diff --git a/.github/workflow/ci.yml b/.github/workflows/ci.yml
similarity index 100%
rename from .github/workflow/ci.yml
rename to .github/workflows/ci.yml
diff --git a/.gitignore b/.gitignore
index 711604d3..06fc7d9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ project/metals.sbt
.bsp
.bloop
target
+*.scala.semanticdb
*.iml
diff --git a/src/main/scala/lisa/kernel/fol/CommonDefinitions.scala b/src/main/scala/lisa/kernel/fol/CommonDefinitions.scala
index c701d239..f1d01c42 100644
--- a/src/main/scala/lisa/kernel/fol/CommonDefinitions.scala
+++ b/src/main/scala/lisa/kernel/fol/CommonDefinitions.scala
@@ -16,7 +16,7 @@ private[fol] trait CommonDefinitions {
/**
* An labelled node for tree-like structures.
*/
- protected trait Label[A <: Label[A]] extends Ordered[A] {
+ protected trait Label {
val id: String
}
diff --git a/src/main/scala/lisa/kernel/fol/FormulaLabelDefinitions.scala b/src/main/scala/lisa/kernel/fol/FormulaLabelDefinitions.scala
index 1f40fb69..28b6c869 100644
--- a/src/main/scala/lisa/kernel/fol/FormulaLabelDefinitions.scala
+++ b/src/main/scala/lisa/kernel/fol/FormulaLabelDefinitions.scala
@@ -10,7 +10,7 @@ private[fol] trait FormulaLabelDefinitions extends CommonDefinitions {
* It similar as with terms; they denote the Predicates and logical connector themselves, and not the terms they help forming.
* They label the nodes of a tree that defines a formula.
*/
- sealed abstract class FormulaLabel extends Label[FormulaLabel] {
+ sealed abstract class FormulaLabel extends Label with Ordered[FormulaLabel] {
def priority: Int = this match {
case _: ConstantPredicateLabel => 1
case _: SchematicPredicateLabel => 2
diff --git a/src/main/scala/lisa/kernel/fol/TermLabelDefinitions.scala b/src/main/scala/lisa/kernel/fol/TermLabelDefinitions.scala
index c08080f2..4d36c247 100644
--- a/src/main/scala/lisa/kernel/fol/TermLabelDefinitions.scala
+++ b/src/main/scala/lisa/kernel/fol/TermLabelDefinitions.scala
@@ -11,7 +11,7 @@ private[fol] trait TermLabelDefinitions extends CommonDefinitions {
* For example, Powerset is not a term itself, it's a label for a node with a single child in a tree corresponding to a term.
* In logical terms, those labels are essentially symbols of sme language.
*/
- sealed abstract class TermLabel extends Label[TermLabel] {
+ sealed abstract class TermLabel extends Label with Ordered[TermLabel] {
def priority: Int = this match {
case _: VariableLabel => 1
case _: ConstantFunctionLabel => 2
--
GitLab