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

The Removal of Recoder #3120

Draft
wants to merge 258 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 209 commits
Commits
Show all changes
258 commits
Select commit Hold shift + click to select a range
b01424c
fix
wadoon Mar 8, 2022
9f10ff9
Renamed some classes from KeyXXX to KeYXXX
unp1 Mar 11, 2022
5133985
work on ProgModelInfo
wadoon Mar 20, 2022
0aa1e4e
Merge remote-tracking branch 'origin' into weigl/key-javaparser3
wadoon Apr 16, 2023
2ac9029
fix mark and name resolution for test case
wadoon Mar 8, 2022
b1f53db
test all redux classes for parsability
wadoon Apr 17, 2023
5900542
test redux classes for transmutability
wadoon Apr 18, 2023
d054696
Merge branch 'main' into weigl/key-javaparser3
wadoon Apr 18, 2023
3175277
Merge branch 'main' into weigl/key-javaparser3
wadoon Apr 18, 2023
fd7b544
Null check
wadoon Apr 20, 2023
c34ee64
clean up JavaInfo from unused methods
wadoon Apr 20, 2023
1e6ea21
Merge branch 'main' into weigl/key-javaparser3
wadoon Apr 20, 2023
d096652
Implement type converter
jwiesler Apr 27, 2023
f22cce5
Formatting
jwiesler Apr 27, 2023
4a4137b
Some work
jwiesler May 2, 2023
b684deb
Variable declarations
jwiesler May 2, 2023
0fe6976
Field and parameter declarations, super()
jwiesler May 3, 2023
cc92b58
Add missing sorts in tests
jwiesler May 3, 2023
7cf7160
Fix pretty printing exc
jwiesler May 3, 2023
0c16493
New
jwiesler May 3, 2023
969421c
TypeConverter errors
jwiesler May 3, 2023
385bbee
Pretty printing of compilation units
jwiesler May 4, 2023
d8527cd
Remove unused methods
jwiesler May 9, 2023
96102bc
Fix method declaration handling
jwiesler May 9, 2023
72ece92
JavaInfo
jwiesler May 9, 2023
87c2185
Unused code
jwiesler May 10, 2023
41e748a
Add javaparser to todos
jwiesler May 11, 2023
5232cb0
Unused
jwiesler May 11, 2023
74ad52b
Move files
jwiesler May 11, 2023
42c5f75
Fix some references
jwiesler May 11, 2023
77f3e02
Replace File with Path
jwiesler May 16, 2023
ccc6602
Remove recoder completely
jwiesler May 19, 2023
b5f29a0
Fix MIN_INT parsing issue
jwiesler May 19, 2023
282c643
getCompileTimeConstantInitializer
jwiesler May 19, 2023
f268d28
upgrade wrapper because of Java 20
wadoon May 19, 2023
81968f6
remove ParseExceptionInFile
wadoon May 19, 2023
3266e0b
make key compilable again
wadoon May 20, 2023
62e2456
Format
jwiesler May 22, 2023
b2bd6c5
Remove ConstantExpressionEvaluator field
jwiesler May 22, 2023
7b0d7c7
Minor changes
jwiesler May 22, 2023
ab71405
Minor changes
jwiesler May 22, 2023
60b4db1
Comment out some tests
jwiesler May 22, 2023
152cf64
Fixing package translation hopefully
wadoon May 23, 2023
248648f
pushing interpretation further
wadoon May 23, 2023
57a6337
Minor changes
jwiesler May 23, 2023
0d43f2e
Fix usage of activateJava
jwiesler May 23, 2023
01b6cd1
Fix usage of activateJava
jwiesler May 23, 2023
fdb4a1c
Minor changes
jwiesler May 23, 2023
448021c
Fix field pretty printing
jwiesler May 24, 2023
8296f70
Minor changes
jwiesler May 24, 2023
5c9848c
new version of key-javaparser with fixed bugs
wadoon May 24, 2023
d76652c
Comment out test rules
jwiesler May 26, 2023
2e368d7
Fix some schema variable usages
jwiesler May 27, 2023
00fa6b1
fix bugs during loading with JavaParser
wadoon May 28, 2023
66d6422
compromises on the javaRules.key
wadoon May 28, 2023
b3b1a59
Merge branch 'main' into weigl/key-javaparser3
wadoon May 28, 2023
986b430
Missed Path changes
jwiesler Jun 2, 2023
94d3ccc
Spotless
jwiesler Jun 2, 2023
4d4e32f
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Jun 3, 2023
d41dc21
try to fix symbol resolution of java.lang.Object#$initialized
wadoon Jun 3, 2023
c2a119a
new key-javaparser version
wadoon Jun 3, 2023
fcc13b4
new key-javaparser version
wadoon Jun 3, 2023
7aadaf0
fixing stuff in pre-transformation, incl. storage for CUnits
wadoon Jun 3, 2023
56195f4
repair TypeExpr & lazy KJT for Object, Cloneable, Serializable
wadoon Jun 3, 2023
1a1842c
Fix Clinit
jwiesler Jun 7, 2023
ace0c95
Fix Integer parsing
jwiesler Jun 7, 2023
e4883a1
Spotless
jwiesler Jun 7, 2023
82bf47d
Fix multiple errors around KeYProgModelInfo
jwiesler Jun 7, 2023
8157e8b
set java 17
wadoon Jun 7, 2023
03c681b
fix KeY context creation (primitive values)
wadoon Jun 7, 2023
58383c0
fix test case input with parens
wadoon Jun 7, 2023
6135de9
repairing constructor of AST nodes
wadoon Jun 7, 2023
09f3aba
reactivate useSystemClassLoaderInResolution for fast testing
wadoon Jun 7, 2023
fe22161
resolved: testFindAttributesLocallyDeclaredOnly
wadoon Jun 7, 2023
f78b19c
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Jun 7, 2023
4ae24f1
Merge branch 'main' into weigl/key-javaparser3
jwiesler Jun 9, 2023
1e5ca9e
Fix NewArray partially
jwiesler Jun 9, 2023
399c8ac
Fix TestJavaInfo
jwiesler Jun 9, 2023
cae3359
Cleanup TestTermLabelManager
jwiesler Jun 9, 2023
c10f855
Fix JAVALANG file not found
jwiesler Jun 9, 2023
fcb8fd3
clean up
wadoon Jun 9, 2023
7f04632
fixing symbol resolution. JavaRedux is needed!
wadoon Jun 10, 2023
afaf80a
fix A.class (MetaClassReference) and new A {} (ObjectCreationExpr)
wadoon Jun 10, 2023
d7d8c08
remove dead code
wadoon Jun 10, 2023
21d777c
fix NPE in KeYProgModelInfo.java
wadoon Jun 10, 2023
ff401a8
Fix Path.of
jwiesler Jun 12, 2023
1b9efac
Spotless
jwiesler Jun 12, 2023
1c0c4ab
Fix TestJP2KeY.testJBlocks
jwiesler Jun 12, 2023
d29316c
Fix some more tests
jwiesler Jun 12, 2023
8af832a
Fix parseInternalClasses file filter
jwiesler Jun 12, 2023
807fdba
Maybe fix method reference
jwiesler Jun 12, 2023
6871bb8
Fix some issues around prepare functions and implicit fields
jwiesler Jun 12, 2023
22da969
Fix JP2KeYTypeConverter null as parent class
jwiesler Jun 12, 2023
4423f10
Remove more "this String is a file path" issues
jwiesler Jun 13, 2023
e8d8fa7
Major cleanup of JavaService
jwiesler Jun 13, 2023
0beb6da
Fix some initialization issues in tests
jwiesler Jun 13, 2023
0d9a7cc
repair JavaRedux finding
wadoon Jun 10, 2023
5a22094
add ctx to exceptions
wadoon Jun 10, 2023
f11fbd4
adapt syntax for testRuleMatch.txt
wadoon Jun 14, 2023
cc0211a
implement MethodFrame translation
wadoon Jun 14, 2023
7edb430
implement Name translation (at least for schema variables)
wadoon Jun 14, 2023
7950e14
fix missing source path in JavaFactory
wadoon Jun 14, 2023
c9c07ac
Missing commit
jwiesler Jun 15, 2023
d35693c
Merge remote-tracking branch 'origin/weigl/key-javaparser3' into weig…
jwiesler Jun 15, 2023
2d00e09
Minor test refactoring
jwiesler Jun 15, 2023
4b4d28a
Fix project classes not being loaded
jwiesler Jun 15, 2023
109980e
Minor fixes
jwiesler Jun 15, 2023
b3f729e
Fix attribute resolution failure
jwiesler Jun 15, 2023
49e0e51
Fix npe
jwiesler Jun 15, 2023
a722eb0
fix for most test cases on TestTermParser.
wadoon Jun 15, 2023
2e933a6
Make Z3 Test slow since it takes 10 minutes
jwiesler Jun 16, 2023
472ed3e
Logback full ex for all test console appenders
jwiesler Jun 16, 2023
0184619
Cleanup
jwiesler Jun 16, 2023
d4784b3
Remove duplicate methods
jwiesler Jun 16, 2023
d3d5dee
Fix jp mapping
jwiesler Jun 16, 2023
286770e
Comments
jwiesler Jun 16, 2023
8c75ff9
Small refactoring
jwiesler Jun 16, 2023
02eb22d
readability
wadoon Jun 16, 2023
fb642cc
activate JMLTransformer
wadoon Jun 16, 2023
c17ad35
Merge branch 'main' into weigl/key-javaparser3
wadoon Jun 16, 2023
aaad615
Method resolution
jwiesler Jun 16, 2023
19d6440
Minor changes
jwiesler Jun 16, 2023
2a86edc
Error handling shenanigans
jwiesler Jun 16, 2023
1722504
Minor changes
jwiesler Jun 19, 2023
e82a943
Transformer WIP
jwiesler Jun 20, 2023
cebf473
isPackage based on the filesystem
wadoon Jun 20, 2023
6beb1f8
Transformer
jwiesler Jun 21, 2023
d91f62b
NPE
jwiesler Jun 21, 2023
c468e3f
Fix positioning of concat comment
jwiesler Jun 21, 2023
776dd3c
Minor changes
jwiesler Jun 21, 2023
1137333
Don't comment out code
jwiesler Jun 21, 2023
a3fbd76
Fix isPackage
jwiesler Jun 21, 2023
6a136a1
Don't catchall
jwiesler Jun 21, 2023
ff4333f
establish sortness on comments
wadoon Jun 23, 2023
ca081d8
resolution of \bigint
wadoon Jun 23, 2023
2926e00
Rename all <> field references in KeY to $
jwiesler Jun 21, 2023
87ea301
Refactoring
jwiesler Jun 22, 2023
3d2cfa2
Minor changes
jwiesler Jun 26, 2023
bd442b1
Fix program variable duplication
jwiesler Jun 26, 2023
9513d00
Fix FieldAccessExpr
jwiesler Jun 26, 2023
f2b8be1
Fix schema block not being parsed into correct type
jwiesler Jun 26, 2023
5f7d3b5
Method resolution issue
jwiesler Jun 26, 2023
54bae25
Copy issues
jwiesler Jun 26, 2023
7f15efb
Fix more class context issues
jwiesler Jun 26, 2023
2330c28
Fix two small tests
jwiesler Jun 26, 2023
11d1a1f
Minor changes
jwiesler Jun 26, 2023
eec8eb1
Forward spec correctly
jwiesler Jun 27, 2023
cd6cbb3
Fix loading of additional key files in redux
jwiesler Jun 27, 2023
4a17e92
Fix type resolution and asReference crashes
jwiesler Jun 27, 2023
ff92f38
Speed up some tests
jwiesler Jun 27, 2023
4ac7edb
Cleanup
jwiesler Jun 28, 2023
167b9b4
Fix Ccatch, method reference scopes, lots of errors in TacletEquality
jwiesler Jun 28, 2023
ec67767
StatementBlock prefix length and loop init/guard/updates schema worka…
jwiesler Jun 28, 2023
1449600
Cleanup
jwiesler Jun 29, 2023
940afe8
Fix jml modifier extraction
jwiesler Jun 29, 2023
127dde9
@Nonnull
jwiesler Jun 29, 2023
a10e1c0
new javaparser version
wadoon Jun 29, 2023
9b3e9c8
Merge branch 'main' into weigl/key-javaparser3
wadoon Jun 29, 2023
07253f2
Fix 3 tests
jwiesler Jun 30, 2023
b199fb0
Field names in javadl
jwiesler Jun 30, 2023
29bbaf8
Use buffered streams to write files
jwiesler Jun 30, 2023
6dcd461
Don't use "bootclasspath" as boot class path when writing bundles
jwiesler Jun 30, 2023
22af113
Fix wrong method being resolved
jwiesler Jun 30, 2023
473b680
Refactoring
jwiesler Jul 3, 2023
05d3ad2
Class loading
jwiesler Jul 3, 2023
455fea1
Compile errors
jwiesler Jul 3, 2023
4da1bda
Fix heapRules.key
jwiesler Jul 3, 2023
ad7c119
Fix multiple path issues, JavaService clone
jwiesler Jul 3, 2023
9f38ec8
Fix test
jwiesler Jul 5, 2023
b1c9762
Workaround for method resolution with context
jwiesler Jul 5, 2023
f3ffb2c
Fix missing package names and array.length
jwiesler Jul 5, 2023
71ebe1c
Minor changes
jwiesler Jul 10, 2023
0801dc6
Fix testQueryInheritance
jwiesler Jul 10, 2023
2401620
Minor changes
jwiesler Jul 10, 2023
218efda
Remove catchall
jwiesler Jul 10, 2023
f6cf9b3
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Jul 10, 2023
d0a81ad
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Jul 10, 2023
bb8e5cf
set jdk to 17
wadoon Jul 10, 2023
98f5790
reformat
wadoon Jul 10, 2023
21d28b1
Fix two matching issues
jwiesler Jul 12, 2023
7ed2d02
Fix label pretty printing
jwiesler Jul 12, 2023
a51366f
try to fix <created> access
wadoon Jul 12, 2023
548bbcb
try to fix jml exception tests
wadoon Jul 12, 2023
7f5a33d
Missing schema variables not being translated
jwiesler Jul 12, 2023
28a9fe6
Dirty fix for Jml Comment Transformer
jwiesler Jul 13, 2023
06d0bbf
fix smt lemma test, new attribute syntax
wadoon Jul 13, 2023
8de0b05
add diff for find terms
wadoon Jul 17, 2023
674a4d4
repair ADT functions
wadoon Jul 17, 2023
3bc6ee8
avoid unnecessary loop init and update.
wadoon Jul 17, 2023
23914fa
Spotless
jwiesler Jul 17, 2023
08bb930
Pretty printing fail
jwiesler Jul 17, 2023
23d8a64
Fix non SV exec contexts
jwiesler Jul 17, 2023
0144aed
Fix TestTacletEquality
jwiesler Jul 17, 2023
e063bfa
Add missing label schema variable lookup
jwiesler Jul 17, 2023
f327685
JMLAssert src files
jwiesler Jul 17, 2023
01d5716
New field syntax
jwiesler Jul 17, 2023
c65d654
Minor fixes
jwiesler Jul 17, 2023
6c231c1
Fix represents contract containing '#'
jwiesler Jul 17, 2023
14a0ac6
Move inner class and report field access not resolved
jwiesler Jul 17, 2023
150a51c
Field access
jwiesler Jul 18, 2023
3da3422
KeYProgModelInfo#getConstructor implemented
wadoon Jul 22, 2023
209349f
repair normalform, wip
wadoon Jul 22, 2023
d57d6d3
$init repaired, a little bit.
wadoon Jul 22, 2023
d927f17
reformat
wadoon Jul 22, 2023
46e7442
try to make a matcher translator regression test
wadoon Aug 13, 2023
982a24a
Merge branch 'weigl/sjrt' into weigl/key-javaparser3
wadoon Aug 13, 2023
9383237
Merge branch 'main' into weigl/key-javaparser3
wadoon Aug 14, 2023
f699d45
trying to repair loading order ...
wadoon Aug 14, 2023
16ca38a
apply new spotless license header
wadoon Aug 21, 2023
66925e5
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Aug 21, 2023
12438e8
gradle again
wadoon Aug 21, 2023
d0ffa83
fix merge compilation errors
wadoon Aug 22, 2023
3913ec5
spotless
wadoon Aug 27, 2023
9069689
Merge branch 'main' into weigl/key-javaparser3
wadoon Aug 27, 2023
b8bf681
Merge branch 'main' into weigl/key-javaparser3
wadoon Aug 27, 2023
0725053
spotless reformat
wadoon Aug 27, 2023
c3eb99b
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Oct 13, 2023
a8535ce
Merge branch 'main' into weigl/key-javaparser3
wadoon Oct 17, 2023
ae91627
fix merge errors
wadoon Oct 17, 2023
fe64a4f
Merge branch 'main' into weigl/key-javaparser3
wadoon Oct 23, 2023
0c6acea
fix merge errors
wadoon Oct 23, 2023
2a23b07
Merge branch 'main' into weigl/key-javaparser3
wadoon Oct 24, 2023
0b4927b
Merge branch 'main' into weigl/key-javaparser3
wadoon Oct 28, 2023
3b47441
fix merge errors
wadoon Oct 28, 2023
ec71101
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Nov 18, 2023
508587d
spotless + merge errors
wadoon Nov 18, 2023
e63b658
Merge branch 'main' into weigl/key-javaparser3
wadoon Nov 19, 2023
1f8cf9a
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Dec 7, 2023
a1581bf
Merge branch 'main' into weigl/key-javaparser3
wadoon Dec 16, 2023
8fb85f9
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Dec 29, 2023
7dfa87c
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Dec 29, 2023
b01fb6a
Merge branch 'main' into weigl/key-javaparser3
wadoon Feb 3, 2024
4672d52
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Feb 22, 2024
2b8df2e
fix errors after merge, cleaning
wadoon Feb 22, 2024
49068e6
Merge branch 'main' into weigl/key-javaparser3
wadoon Mar 17, 2024
247bd92
Merge branch 'refs/heads/main' into weigl/key-javaparser3
wadoon Apr 5, 2024
39684ce
fix merge errors
wadoon Apr 7, 2024
4e3b31b
wip
wadoon Apr 20, 2024
0a459f9
Merge branch 'refs/heads/main' into weigl/key-javaparser3
wadoon Apr 20, 2024
1e7a1d6
wip ghost fields
wadoon Apr 21, 2024
886508f
update spotless to newer eclipse version
wadoon Apr 21, 2024
3942ec9
Merge branch 'main' into weigl/key-javaparser3
wadoon May 9, 2024
b82de8c
Merge branch 'refs/heads/main' into weigl/key-javaparser3
wadoon May 23, 2024
f919085
Merge branch 'refs/heads/main' into weigl/key-javaparser3
wadoon May 26, 2024
78286a3
Merge branch 'refs/heads/main' into weigl/key-javaparser3
wadoon Jun 21, 2024
37255eb
Remove Ctrl+C handling, see #3456
wadoon Jul 20, 2024
d0435b5
Merge branch 'refs/heads/main' into weigl/key-javaparser3
wadoon Aug 3, 2024
00bc77a
Merge branch 'refs/heads/weigl/rmsigterm' into weigl/key-javaparser3
wadoon Aug 4, 2024
4be61dd
fix merge issues
wadoon Aug 4, 2024
3a2d05a
Merge remote-tracking branch 'origin/main' into weigl/key-javaparser3
wadoon Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/opttest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
java: [11, 17]
java: [17]
tests: [":key.core.proof_references:test", ":key.core.symbolic_execution:test"]
runs-on: ${{matrix.os}}
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:
branches: [ "main" ]
merge_group:

permissions:
contents: write
issues: write
Expand All @@ -21,7 +21,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
java: [11, 17]
java: [17]
continue-on-error: true
runs-on: ${{ matrix.os }}
env:
Expand All @@ -44,7 +44,7 @@ jobs:
name: pr-number
path: pr/
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
Expand Down Expand Up @@ -76,11 +76,11 @@ jobs:
matrix:
test: [testProveRules, testRunAllFunProofs, testRunAllInfProofs]
os: [ubuntu-latest]
java: [11]
java: [17]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ subprojects {
group = rootProject.group
version = rootProject.version

sourceCompatibility = 11
targetCompatibility = 11
sourceCompatibility = 20
targetCompatibility = 20

repositories {
mavenCentral()
Expand Down Expand Up @@ -98,7 +98,7 @@ subprojects {
// Setting UTF-8 as the java source encoding.
options.encoding = "UTF-8"
// Setting the release to Java 11
options.release = 11
options.release = 17
}

tasks.withType(Javadoc) {
Expand Down Expand Up @@ -439,7 +439,7 @@ task alldoc(type: Javadoc) {
docTitle = "KeY JavaDoc ($project.version) -- ${getDate()}"
bottom = "Copyright &copy; 2003-2022 <a href=\"http://key-project.org\">The KeY-Project</a>."
use = true
links += "https://docs.oracle.com/en/java/javase/11/docs/api/"
links += "https://docs.oracle.com/en/java/javase/17/docs/api/"
links += "http://www.antlr2.org/javadoc/"
links += "http://www.antlr3.org/api/Java/"
links += "https://www.antlr.org/api/Java/"
Expand Down
Loading
Loading