fix incredibly wrong same len code. Not sure how that happened

kelloggm · Feb 6, 2017 · 43b5812 · 43b5812
1 parent 2138887
commit 43b5812
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/checker/src/org/checkerframework/checker/index/samelen/SameLenAnnotatedTypeFactory.java b/checker/src/org/checkerframework/checker/index/samelen/SameLenAnnotatedTypeFactory.java
@@ -214,4 +214,8 @@ public AnnotationMirror createSameLen(String... val) {
         builder.setValue("value", val);
         return builder.build();
     }
+
+    public AnnotationMirror createSameLenUnknown() {
+        return UNKNOWN;
+    }
 }
diff --git a/...ker/src/org/checkerframework/checker/index/upperbound/UpperBoundAnnotatedTypeFactory.java b/...ker/src/org/checkerframework/checker/index/upperbound/UpperBoundAnnotatedTypeFactory.java
@@ -22,15 +22,7 @@
 import org.checkerframework.checker.index.lowerbound.LowerBoundChecker;
 import org.checkerframework.checker.index.minlen.MinLenAnnotatedTypeFactory;
 import org.checkerframework.checker.index.minlen.MinLenChecker;
-import org.checkerframework.checker.index.qual.IndexFor;
-import org.checkerframework.checker.index.qual.IndexOrHigh;
-import org.checkerframework.checker.index.qual.IndexOrLow;
-import org.checkerframework.checker.index.qual.LTEqLengthOf;
-import org.checkerframework.checker.index.qual.LTLengthOf;
-import org.checkerframework.checker.index.qual.LTOMLengthOf;
-import org.checkerframework.checker.index.qual.MinLen;
-import org.checkerframework.checker.index.qual.UpperBoundBottom;
-import org.checkerframework.checker.index.qual.UpperBoundUnknown;
+import org.checkerframework.checker.index.qual.*;
 import org.checkerframework.checker.index.samelen.SameLenAnnotatedTypeFactory;
 import org.checkerframework.checker.index.samelen.SameLenChecker;
 import org.checkerframework.common.basetype.BaseAnnotatedTypeFactory;
@@ -200,8 +192,9 @@ public int minLenFromExpressionTree(ExpressionTree tree) {
      * given expression tree.
      */
     public AnnotationMirror sameLenAnnotationFromExpressionTree(ExpressionTree tree) {
-        AnnotatedTypeMirror sameLenType = getMinLenAnnotatedTypeFactory().getAnnotatedType(tree);
-        return sameLenType.getAnnotationInHierarchy(UNKNOWN);
+        AnnotatedTypeMirror sameLenType = getSameLenAnnotatedTypeFactory().getAnnotatedType(tree);
+        return sameLenType.getAnnotationInHierarchy(
+                getSameLenAnnotatedTypeFactory().createSameLenUnknown());
     }
 
     /** Get the list of possible values from a value checker type. May return null. */