arnekeller/Typicalc
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/typicalc.git synced 2024-11-08 18:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistency due to merge

Browse Source
This commit is contained in:
Johanna Stuber 2021-01-31 17:13:39 +01:00
parent b3e6514bb8
commit e31cb5efeb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -63,7 +63,7 @@
"webpack-dev-server": "3.11.0", "webpack-dev-server": "3.11.0",
"extract-loader": "5.1.0" "extract-loader": "5.1.0"
}, },
"hash": "76239929559a31ed723a76c78e7c2e75d64de46a237e99dd95361916eb0c4d96" "hash": "8a8bb65418f58834b30cd258cd47da52573731720ea8967d4078487cb1253498"
}, },
"dependencies": { "dependencies": {
"lit-element": "2.3.1", "lit-element": "2.3.1",
@ -105,8 +105,7 @@
"@vaadin/vaadin-tabs": "3.2.0", "@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.0", "@vaadin/vaadin-lumo-styles": "1.6.0",
"@vaadin/vaadin-material-styles": "1.3.2", "@vaadin/vaadin-material-styles": "1.3.2",
"open": "^7.2.1", "open": "^7.2.1"
"@vaadin-component-factory/vcf-tooltip": "1.3.13"
}, },
"devDependencies": { "devDependencies": {
"compression-webpack-plugin": "4.0.1", "compression-webpack-plugin": "4.0.1",

4
src/main/java/edu/kit/typicalc/model/TypeInferenceResult.java
View File

@ -25,11 +25,13 @@ public class TypeInferenceResult {
* *
* @param substitutions the substitutions to generate the mgu and the final type * @param substitutions the substitutions to generate the mgu and the final type
* @param typeVar the type variable belonging to the original lambda term * @param typeVar the type variable belonging to the original lambda term
* @throws IllegalStateException if the given list of substitutions contains two substitutions for the same
* type variable; or if the calculated mgu contains no substitution for the given type variable
*/ */
protected TypeInferenceResult(List<Substitution> substitutions, TypeVariable typeVar) { protected TypeInferenceResult(List<Substitution> substitutions, TypeVariable typeVar) {
mgu = new ArrayList<>(substitutions); mgu = new ArrayList<>(substitutions);
findMGU(); findMGU();
MGU.sort(Comparator.comparingInt((Substitution o) -> mgu.sort(Comparator.comparingInt((Substitution o) ->
o.getVariable().getIndex()).thenComparing(o -> o.getVariable().getKind())); o.getVariable().getIndex()).thenComparing(o -> o.getVariable().getKind()));
finalType = findFinalType(typeVar); finalType = findFinalType(typeVar);
} }

1
src/main/java/edu/kit/typicalc/model/TypeInfererLet.java
View File

@ -36,6 +36,7 @@ public class TypeInfererLet extends TypeInferer {
*/ */
public List<Constraint> getLetConstraints() { public List<Constraint> getLetConstraints() {
return new ArrayList<>(); return new ArrayList<>();
// TODO
} }
} }