Skip to content

Commit 417afa2

Browse files
authored
Rename error key "createsmustcallfor.target.unparseable" to "...unparsable"
1 parent 80402f1 commit 417afa2

130 files changed

Lines changed: 297 additions & 278 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ public static void main(String[] args) throws IOException {
795795
// of the line being inserted onto. This puts the annotation on its own line aligned
796796
// with the contents of the next line.
797797

798-
// Number of whitespace characters preceeding the insertion position on the same line
798+
// Number of whitespace characters preceding the insertion position on the same line
799799
// (tabs count as one).
800800
int indentation = 0;
801801
while ((pos - indentation != 0)

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/find/AnnotationInsertion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class AnnotationInsertion extends Insertion {
1616
/**
1717
* The fully-qualified name of the annotation to be inserted.
1818
*
19-
* <p>E.g. Given an annotation {@code com.foo.Bar(baz)}, its fully quailified name would be {@code
19+
* <p>E.g. Given an annotation {@code com.foo.Bar(baz)}, its fully qualified name would be {@code
2020
* com.foo.Bar}.
2121
*/
2222
private final String fullyQualifiedAnnotationName;

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/find/InMethodCriterion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public boolean isSatisfiedBy(@Nullable TreePath path) {
7676
path = path.getParentPath();
7777
} while (path != null && path.getLeaf() != null);
7878

79-
// We didn't find the method. Return true if in a varable declarator,
79+
// We didn't find the method. Return true if in a variable declarator,
8080
// which is initialization code that will go in <init> or <clinit>.
8181
boolean result = inDecl && (staticDecl ? "<clinit>()V" : "<init>()V").equals(name);
8282
Criteria.dbug.debug("InMethodCriterion.isSatisfiedBy => %s%n", result);

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/find/IsSigMethodCriterion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private boolean matchTypeParam(
125125
if (!typeParamToClassMap.isEmpty()) {
126126
for (Map.Entry<String, String> p : typeParamToClassMap.entrySet()) {
127127
@SuppressWarnings(
128-
"regex:assignment") // a type parameter name is an identifer, which is a valid regex
128+
"regex:assignment") // a type parameter name is an identifier, which is a valid regex
129129
@Regex String typeParamName = p.getKey();
130130
// Pattern.quote() is gratuitous because key is a type parameter name, which is an
131131
// identifier with no special characters. Matcher.quoteReplacement is gratuitous because

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/find/NewInsertion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class NewInsertion extends TypedInsertion {
1515
/**
1616
* Construct a NewInsertion.
1717
*
18-
* <p>If "new" already exists in the initializer, then pass a {@link DeclaredType} thats name is
18+
* <p>If "new" already exists in the initializer, then pass a {@link DeclaredType} whose name is
1919
* the empty String. This will only insert an annotation on the existing type.
2020
*
2121
* <p>To insert the annotation along with "new" and the type (for example, {@code @Anno new Type[]

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/find/TreeFinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ public IPair<ASTRecord, Integer> visitNewClass(NewClassTree node, Insertion ins)
423423
// For style 3, we need to count the brackets and get to the right one.
424424
//
425425
// The AST depth of the initializer is correct unless all arrays are
426-
// empty, in which case it is arbitary. This is legal:
426+
// empty, in which case it is arbitrary. This is legal:
427427
// String[][][][][] names4 = new String[][][][][] { { {} } };
428428
//
429429
// Array initializers can also be multi-dimensional, but this is not
@@ -1179,7 +1179,7 @@ Integer findPosition(TreePath path, Insertion i) {
11791179
// created) receiver.
11801180
Map<Tree, ASTRecord> astIndex = ASTIndex.indexOf(tree);
11811181
ASTRecord insertRecord = astIndex.get(node);
1182-
dbug.debug("TreeFinder.scan: node=%s%n critera=%s%n", node, i.getCriteria());
1182+
dbug.debug("TreeFinder.scan: node=%s%n criteria=%s%n", node, i.getCriteria());
11831183

11841184
if (TreePathUtil.hasClassKind(node)
11851185
&& i.getCriteria().isOnTypeDeclarationExtendsClause()

annotation-file-utilities/src/main/java/org/checkerframework/afu/annotator/specification/IndexFileSpecification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ public static boolean isOnNew(Criteria criteria) {
599599
* returns false.
600600
*
601601
* @param criteria the Criteria
602-
* @return true if the Criteria is on a synthethic constructor
602+
* @return true if the Criteria is on an implicit default constructor
603603
*/
604604
private static boolean isOnImplicitDefaultConstructor(Criteria criteria) {
605605
if (!criteria.isOnMethod("<init>()V")) {

annotation-file-utilities/src/main/java/org/checkerframework/afu/scenelib/el/AnnotationDef.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public AnnotationDef(
165165
setFieldTypes(fieldTypes);
166166
}
167167

168-
// This ovverride is necessary because AnnotationDef extends AElement, which implements Cloneable.
168+
// This override is necessary because AnnotationDef extends AElement, which implements Cloneable.
169169
@Override
170170
public AnnotationDef clone() {
171171
throw new UnsupportedOperationException("Can't duplicate an AnnotationDef");
@@ -296,7 +296,7 @@ public boolean equals(AnnotationDef o) {
296296
@Override
297297
public int hashCode() {
298298
return name.hashCode()
299-
// Omit tlAnnotationsHere, becase it should be unique and, more
299+
// Omit tlAnnotationsHere, because it should be unique and, more
300300
// importantly, including it causes an infinite loop.
301301
// + tlAnnotationsHere.hashCode()
302302
+ fieldTypes.hashCode();

annotation-file-utilities/src/main/java/org/checkerframework/afu/scenelib/field/BasicAFT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ public void format(StringBuilder sb, Object o) {
9090
sb.append(o.toString());
9191
sb.append("L");
9292
} else if (type == double.class && Double.isNaN((double) o)) {
93-
// Don't use "Double.NaN" because it is not parseable if the code imports a `Double` class
93+
// Don't use "Double.NaN" because it is not parsable if the code imports a `Double` class
9494
// other than `java.lang.Double`.
9595
sb.append("0.0/0.0");
9696
} else if (type == float.class && Float.isNaN((float) o)) {
97-
// Don't use "Float.NaN" because it is not parseable if the code imports a `Float` class
97+
// Don't use "Float.NaN" because it is not parsable if the code imports a `Float` class
9898
// other than `java.lang.Float`.
9999
sb.append("0.0f/0.0f");
100100
} else {

annotation-file-utilities/src/main/java/org/checkerframework/afu/scenelib/io/IndexFileParser.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,11 @@ private int matchNNInteger() throws IOException {
390390
* "java.util.Map" for Map.class
391391
* }</pre>
392392
*
393-
* Thes use fully-qualified names, i.e. "Object" alone won't work.
393+
* These use fully-qualified names, i.e. "Object" alone won't work.
394+
*
395+
* @return the class name that was read, in Class.forName format
396+
* @throws IOException if there is trouble reading
397+
* @throws ParseException if there is trouble parsing
394398
*/
395399
private @ClassGetName String expectClassGetName() throws IOException, ParseException {
396400
int arrays = 0;

0 commit comments

Comments
 (0)