From 3279870976094aeeef3039cc387d34a46cf55b00 Mon Sep 17 00:00:00 2001 From: txiang61 Date: Fri, 27 Mar 2020 03:24:22 -0400 Subject: [PATCH] revert unrelated changes --- default.jaif | 21 ------------------- .../inference/InferenceTypeHierarchy.java | 4 +++- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 default.jaif diff --git a/default.jaif b/default.jaif deleted file mode 100644 index 4d85184ed..000000000 --- a/default.jaif +++ /dev/null @@ -1,21 +0,0 @@ -package interning.qual: - annotation @UnknownInterned: - -package interning.qual: - annotation @PolyInterned: - -package interning.qual: - annotation @Interned: - -package : -class MapAssignment: -field a: -insert-annotation Variable.type, ParameterizedType.type: @interning.qual.UnknownInterned - -field b: -insert-annotation Variable.type, ParameterizedType.type: @interning.qual.UnknownInterned -insert-annotation Variable.type, ParameterizedType.typeArgument 1: @interning.qual.Interned - -method ()V: - - diff --git a/src/checkers/inference/InferenceTypeHierarchy.java b/src/checkers/inference/InferenceTypeHierarchy.java index c16b79797..4b4cadb2c 100644 --- a/src/checkers/inference/InferenceTypeHierarchy.java +++ b/src/checkers/inference/InferenceTypeHierarchy.java @@ -9,9 +9,10 @@ import org.checkerframework.framework.type.SubtypeVisitHistory; import org.checkerframework.javacutil.BugInCF; +import javax.lang.model.element.AnnotationMirror; + import checkers.inference.model.Slot; -import javax.lang.model.element.AnnotationMirror; /** * The InferenceTypeHierarchy along with the InferenceQualifierHierarchy is responsible for @@ -27,6 +28,7 @@ public class InferenceTypeHierarchy extends DefaultTypeHierarchy { private final AnnotationMirror varAnnot; // TODO: Think this through, add any missing constraints + /** * Constructs an instance of {@code TypeHierarchy} for the type system * whose qualifiers represented in qualifierHierarchy.