Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add lambda-terms to FOL #231

Draft
wants to merge 98 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
26e3b86
Reimplemented syntax and OL equivalence checker.
SimonGuilloud Oct 8, 2024
690a9de
Added Sequent calculus and proofs, but not yet proof checking.
SimonGuilloud Oct 8, 2024
8747557
Finished proof checker, have to deal with definitions and beta reduti…
SimonGuilloud Oct 9, 2024
f62a926
Mostly finished Kernel, left with Beta and epsilon rules.
SimonGuilloud Oct 9, 2024
414f027
Update Kernel helper, serialization, and more.
SimonGuilloud Oct 11, 2024
1486fa3
refactor and move temp files
SimonGuilloud Oct 12, 2024
f38067f
add missing files
SimonGuilloud Oct 12, 2024
bbeffa5
update the sctptp parser
SimonGuilloud Oct 12, 2024
256fd44
POrted most of top-level syntax
SimonGuilloud Oct 13, 2024
2b790af
Finished top-level syntax, including sequents. Next: Prooflib
SimonGuilloud Oct 14, 2024
b6ffb85
Mosly finished with prooflib, currently doing definitions. Remains Ba…
SimonGuilloud Oct 15, 2024
ccbe7f0
At this stage, compiles but many things left commented to track the bug.
SimonGuilloud Oct 16, 2024
02665e8
all of utils except for UnificationUtils ported. Next, tests.
SimonGuilloud Oct 17, 2024
22c3de6
Seal `fol.Expr`
sankalpgambhir Oct 18, 2024
9239dce
Basic matching
sankalpgambhir Oct 18, 2024
7a9e672
Document matchExpr
sankalpgambhir Oct 18, 2024
a01ac26
Implement Substitution
sankalpgambhir Oct 18, 2024
b5c8bd2
Define a rewrite context
sankalpgambhir Oct 18, 2024
db8f973
Use OL eq, correctly check whether subst respects bound vars
sankalpgambhir Oct 18, 2024
c76eb21
scalafmt
sankalpgambhir Oct 18, 2024
1eec816
typo
sankalpgambhir Oct 18, 2024
aa4045d
lisa-utils tests compile
SimonGuilloud Oct 18, 2024
c9f37c6
Merge branch 'lambdafol' of github.com:SimonGuilloud/lisa into lambdafol
SimonGuilloud Oct 18, 2024
6e06964
Some tests pass.
SimonGuilloud Oct 20, 2024
ee6d5b6
utils tests passing. Left to do:
SimonGuilloud Oct 21, 2024
3ebc3a8
ongoing work on tautology
SimonGuilloud Oct 21, 2024
e4c3036
Tautology and Tableaux compile. Experiments with unapply paterns in l…
SimonGuilloud Oct 22, 2024
248059c
Change depth to not recalculate
sankalpgambhir Oct 23, 2024
1f671c4
small corrections to subst steps in basic step tactics and kernel, on…
SimonGuilloud Oct 23, 2024
d69ffe4
Merge branch 'lambdafol' of github.com:SimonGuilloud/lisa into lambdafol
SimonGuilloud Oct 23, 2024
f0935cf
Continued work on congruence actic.
SimonGuilloud Oct 23, 2024
3bfce57
Return substitution to first and second order only.
SimonGuilloud Oct 23, 2024
516ef5b
general improvements, update to congruence.
SimonGuilloud Oct 24, 2024
ea67c79
Change memoized internals to be protected instead of private
sankalpgambhir Oct 24, 2024
146c074
Readd collectFirstDefined function, make utils.collection
sankalpgambhir Oct 24, 2024
2d04ee9
Make Substitution class more reliable
sankalpgambhir Oct 24, 2024
8917298
Make LeftForall and RightExists use new matching
sankalpgambhir Oct 24, 2024
47c1035
Congruence.scala compiles
SimonGuilloud Oct 24, 2024
261a9cb
update SetTheoryLibrary, small improvement to Syntax.scala unapply.
SimonGuilloud Oct 24, 2024
f62d9cc
debugging pettern matching
SimonGuilloud Oct 24, 2024
343b810
clean to sets2.
SimonGuilloud Oct 24, 2024
874c3ce
fix bugs in equivalence checker and Tableau.
SimonGuilloud Oct 24, 2024
d147215
Rewrite Substitution.Apply
sankalpgambhir Oct 25, 2024
2c23d19
Add toOptionSeq extension method
sankalpgambhir Oct 25, 2024
7e6e89a
Add andAll / orAll methods
sankalpgambhir Oct 25, 2024
c14b35f
Switch tactic inputs to use Seq instead of List
sankalpgambhir Oct 25, 2024
792f904
Extend RewriteContext with rules
sankalpgambhir Oct 25, 2024
d3a6d26
Better matching documentation and naming
sankalpgambhir Oct 25, 2024
4e621fc
Rewrite method and classes scaffolds
sankalpgambhir Oct 25, 2024
fc29f49
Minor corrections
sankalpgambhir Oct 25, 2024
1ea1a11
Upgrade to scala 3.5.2
sankalpgambhir Oct 25, 2024
5089f70
Merge branch 'lambdafol2' into lambdafol
SimonGuilloud Oct 25, 2024
1d1cbc3
add some @unchecked, git add new lisa-sets2 folder.
SimonGuilloud Oct 25, 2024
cd05987
reestablish a vompilation crash for tests.
SimonGuilloud Oct 25, 2024
d369a7e
small fix
SimonGuilloud Oct 25, 2024
929d8e4
Add new Vector backed order-preserving Set
sankalpgambhir Oct 25, 2024
5ab7342
Expand rewrite result types
sankalpgambhir Oct 25, 2024
5f6de32
Improve pretty printing
SimonGuilloud Oct 25, 2024
17e1dfb
Merge branch 'lambdafol' of github.com:SimonGuilloud/lisa into lambdafol
SimonGuilloud Oct 25, 2024
131e1ea
fixed dome bugs in tautology.
SimonGuilloud Oct 26, 2024
fd7e312
add eta-reduction, corect autologies and definitions.
SimonGuilloud Oct 26, 2024
287ec1a
various fixes and improvements
SimonGuilloud Oct 27, 2024
2f0ae90
rename setInfix in printInfix
SimonGuilloud Oct 27, 2024
5cde9a0
more bug fix and improvements
SimonGuilloud Oct 27, 2024
080acc2
Fix substitution types
sankalpgambhir Oct 28, 2024
d6f61ea
fix tptp printing and goeland tactic
SimonGuilloud Oct 28, 2024
40d95bf
Specialize VecSet conversions to Seq and Vector
sankalpgambhir Oct 29, 2024
b17708d
Fix rewriting to carry instantiations around properly
sankalpgambhir Oct 29, 2024
7bce89d
Fix proof reconstruction to use instantiated rewrite rules
sankalpgambhir Oct 29, 2024
13a6946
Update proof parser to handle substitution step. Correct bug in equiv…
SimonGuilloud Oct 29, 2024
b92ae33
Merge branch 'lambdafol' of github.com:SimonGuilloud/lisa into lambdafol
SimonGuilloud Oct 29, 2024
91ee02b
add goeland files in sets2
SimonGuilloud Nov 1, 2024
f624c6a
small improvements.
SimonGuilloud Nov 3, 2024
bce732c
Merge branch 'lambdafol' of github.com:SimonGuilloud/lisa into lambdafol
SimonGuilloud Nov 3, 2024
7c8aa45
Add ID counter
sankalpgambhir Oct 29, 2024
a497bb6
Fully qualify Definition for now
sankalpgambhir Nov 4, 2024
7d2a95c
Add new WIP extensionality and upair theorems
sankalpgambhir Nov 4, 2024
09de0ed
fix bug in Tautology
SimonGuilloud Nov 4, 2024
879d83d
Only compute base sequent once in extensionality
sankalpgambhir Nov 4, 2024
24b9329
Save wip set theory library
sankalpgambhir Nov 4, 2024
f16e268
Add emptiness check for max id calculation in rewriting
sankalpgambhir Nov 4, 2024
794fcf8
Remove print in singleton
sankalpgambhir Nov 5, 2024
ccc5e17
Add comprehension
sankalpgambhir Nov 5, 2024
bb7ebb5
Add simple list printer
sankalpgambhir Nov 5, 2024
c0b391c
Add quantifyAll tactic
sankalpgambhir Nov 5, 2024
b3818cf
Remove unused targetName import
sankalpgambhir Nov 5, 2024
2e5dcd3
Add transitivity proof
sankalpgambhir Nov 5, 2024
f9f64cf
Add replacement definition
sankalpgambhir Nov 5, 2024
4f6f28d
Add replacement proofs
sankalpgambhir Nov 5, 2024
75f4c74
Add parenthesies to fix equality parsing
sankalpgambhir Nov 5, 2024
ff40c93
Clean up quantifyAll documentation
sankalpgambhir Nov 5, 2024
d39c480
Add RightEpsilon scaffold
sankalpgambhir Nov 5, 2024
2a72d75
Remove subproof for uniformity
sankalpgambhir Nov 5, 2024
ef9c12c
Remove unnecessary condition in RightEpsilon docs
sankalpgambhir Nov 5, 2024
87f5e45
Add RightEpsilon.withParameters
sankalpgambhir Nov 5, 2024
cb318da
Clarify type in Binder.unapply
sankalpgambhir Nov 5, 2024
4659dfe
Parameter inference for RightEpsilon
sankalpgambhir Nov 5, 2024
ef31631
Change _ to null per compiler warning suggestion
sankalpgambhir Nov 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ThisBuild / semanticdbEnabled := true
ThisBuild / semanticdbVersion := scalafixSemanticdb.revision

val scala2 = "2.13.8"
val scala3 = "3.5.1"
val scala3 = "3.5.2"
val commonSettings = Seq(
crossScalaVersions := Seq(scala3),

Expand All @@ -32,7 +32,8 @@ val commonSettings3 = commonSettings ++ Seq(
scalacOptions ++= Seq(
"-language:implicitConversions",
//"-rewrite", "-source", "3.4-migration",
"-Wconf:msg=.*will never be selected.*:silent"
"-Wconf:msg=.*will never be selected.*:silent",
"-language:experimental.modularity"

),
javaOptions += "-Xmx10G",
Expand Down Expand Up @@ -75,6 +76,13 @@ lazy val sets = Project(
.settings(commonSettings3)
.dependsOn(kernel, withTests(utils))

lazy val sets2 = Project(
id = "lisa-sets2",
base = file("lisa-sets2")
)
.settings(commonSettings3)
.dependsOn(kernel, withTests(utils))

lazy val utils = Project(
id = "lisa-utils",
base = file("lisa-utils")
Expand Down
57 changes: 0 additions & 57 deletions lisa-kernel/src/main/scala/lisa/kernel/fol/CommonDefinitions.scala

This file was deleted.

Loading
Loading