Commit ed2ca04
committed
Merge remote-tracking branch 'origin/main' into pfeifer/3683hidePackageOptionFix
# By Alexander Weigl (48) and others
# Via GitHub (35) and others
* origin/main: (117 commits)
Add containsGenerics method to sort
spotless
look in top-level project.key for includes to allow for dl escapes in Java files
Simplify
Remove tokens file
Fix inst with sort depending fn
Fix parsing of proof files
Fix proof loading/storing when generics are instantiated in NoFindTaclets
Some documentation
Fix test classes
Slightly improve error messages
Fix taclets for datatypes w/ polymorphic params
Prepare datatype handling
Spotless
Finish example; slight fixes
Fix fns and preds parsing; add test
Fix SortDepFn and add test
Start on polymorphic sorts and functions
directly creating issues in Github inside KeY
Bump the gradle-deps group across 1 directory with 9 updates
...
# Conflicts:
# key.core/src/main/java/de/uka/ilkd/key/pp/LogicPrinter.java748 files changed
Lines changed: 16051 additions & 11837 deletions
File tree
- .github/workflows
- gradle/wrapper
- key.core.example
- src/main/java/org/key_project
- key.core.infflow
- src
- main
- java/de/uka/ilkd/key
- informationflow
- impl
- macros
- po
- snippet
- proof
- init
- rule
- executor
- tacletbuilder
- resources/META-INF/services
- test/java/de/uka/ilkd/key/informationflow
- key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution
- model/impl
- profile
- key.core.wd
- src
- main
- java/de/uka/ilkd/key/wd
- macro
- po
- resources
- META-INF/services
- de/uka/ilkd/key/proof/rules
- test/java/de/uka/ilkd/key/wd
- key.core
- src
- main
- antlr4
- java/de/uka/ilkd/key
- control
- instantiation_model
- informationflow/po
- java
- declaration
- recoderext
- logic
- op
- sort
- nparser/builder
- parser
- pp
- proof
- init
- io
- mgt
- replay
- rules
- rule
- conditions
- inst
- match/vm
- instructions
- merge
- scripts
- settings
- smt
- lang
- newsmt2
- solvertypes
- speclang
- dl/translation
- infflow
- jml/translation
- strategy
- util
- properties
- resources
- META-INF/services
- de/uka/ilkd/key
- proof/rules
- smt/solvertypes
- test
- java/de/uka/ilkd/key
- logic/sort
- pp
- proof
- proverules
- replay
- runallproofs
- proofcollection
- rule
- smt
- newsmt2
- solvertypes
- test
- strategy/quantifierHeuristics
- util
- resources/de/uka/ilkd/key/smt/newsmt2/cases
- key.ncore.calculus
- src/main/java/org/key_project/prover
- engine/impl
- proof
- rules
- sequent
- key.ncore/src/main/java/org/key_project/logic/sort
- key.removegenerics
- src/main/java/de/uka/ilkd/key/util/removegenerics
- key.ui
- examples
- InformationFlow
- BlockContracts
- ConditionalConfidential
- LoopInvariants
- MethodContracts
- MiniExamples
- NewObjects
- SimpleEvoting
- Sum
- ToyBanking
- ToyVoting
- firstTouch
- 05-ReverseArray
- 06-BinarySearch
- 08-Java5
- 09-Quicktour
- 10-SITA
- heap
- block_contracts
- fm12_01_LRS
- fm12_02_PrefixSum
- list_recursiveSpec
- list_seq
- observer
- permutedSum
- saddleback_search
- vacid0_01_SparseArray
- vstte10_01_SumAndMax
- vstte10_03_LinkedList
- vstte10_04_Queens
- vstte10_05_Queue
- proofLoadRepair
- standard_key
- GhostSetInLoop
- adt
- polymorphic
- src/main
- java/de/uka/ilkd/key
- core
- gui
- actions
- useractions
- colors
- docking
- extension/impl
- help
- keyshortcuts
- lemmatagenerator
- mergerule
- nodeviews
- prooftree
- settings
- utilities
- proof/io
- resources/META-INF/services
- key.util/src/main/java/org/key_project/util
- collection
- java
- keyext.caching/src/test/java/de/uka/ilkd/key/proof/reference
- keyext.isabelletranslation
- src/main/java/org/key_project/isabelletranslation
- automation
- gui
- keyext.proofmanagement
- src/main/java/org/key_project/proofmanagement
- check
- io
- keyext.slicing/src/test/java/org/key_project/slicing
- recoder/src/main/java/recoder
- java
- reference
- kit/transformation
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
12 | 15 | | |
13 | 16 | | |
14 | | - | |
| 17 | + | |
15 | 18 | | |
16 | 19 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | 20 | | |
27 | | - | |
| 21 | + | |
28 | 22 | | |
29 | 23 | | |
30 | | - | |
| 24 | + | |
31 | 25 | | |
| 26 | + | |
32 | 27 | | |
33 | 28 | | |
34 | 29 | | |
| 30 | + | |
35 | 31 | | |
36 | 32 | | |
37 | 33 | | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
38 | 71 | | |
39 | 72 | | |
40 | 73 | | |
| |||
50 | 83 | | |
51 | 84 | | |
52 | 85 | | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| |||
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
105 | | - | |
| 105 | + | |
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
| 89 | + | |
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| |||
0 commit comments