diff options
Diffstat (limited to 'src/core/lombok/javac/JavacResolution.java')
| -rw-r--r-- | src/core/lombok/javac/JavacResolution.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/lombok/javac/JavacResolution.java b/src/core/lombok/javac/JavacResolution.java index e21be4ae..a116b503 100644 --- a/src/core/lombok/javac/JavacResolution.java +++ b/src/core/lombok/javac/JavacResolution.java @@ -387,8 +387,8 @@ public class JavacResolution { // NB: There's such a thing as maker.Type(type), but this doesn't work very well; it screws up anonymous classes, captures, and adds an extra prefix dot for some reason too. // -- so we write our own take on that here. - if (type.tag == Javac.getCTCint(TypeTags.class, "BOT")) return createJavaLangObject(maker, ast); - if (type.tag == Javac.getCTCint(TypeTags.class, "VOID")) return allowVoid ? primitiveToJCTree(type.getKind(), maker) : createJavaLangObject(maker, ast); + if (type.tag == Javac.getCtcInt(TypeTags.class, "BOT")) return createJavaLangObject(maker, ast); + if (type.tag == Javac.getCtcInt(TypeTags.class, "VOID")) return allowVoid ? primitiveToJCTree(type.getKind(), maker) : createJavaLangObject(maker, ast); if (type.isPrimitive()) return primitiveToJCTree(type.getKind(), maker); if (type.isErroneous()) throw new TypeNotConvertibleException("Type cannot be resolved"); @@ -422,7 +422,7 @@ public class JavacResolution { upper = type.getUpperBound(); } if (allowCompound) { - if (lower == null || lower.tag == Javac.getCTCint(TypeTags.class, "BOT")) { + if (lower == null || lower.tag == Javac.getCtcInt(TypeTags.class, "BOT")) { if (upper == null || upper.toString().equals("java.lang.Object")) { return maker.Wildcard(maker.TypeBoundKind(BoundKind.UNBOUND), null); } @@ -459,23 +459,23 @@ public class JavacResolution { private static JCExpression primitiveToJCTree(TypeKind kind, TreeMaker maker) throws TypeNotConvertibleException { switch (kind) { case BYTE: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "BYTE")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "BYTE")); case CHAR: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "CHAR")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "CHAR")); case SHORT: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "SHORT")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "SHORT")); case INT: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "INT")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "INT")); case LONG: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "LONG")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "LONG")); case FLOAT: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "FLOAT")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "FLOAT")); case DOUBLE: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "DOUBLE")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "DOUBLE")); case BOOLEAN: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "BOOLEAN")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "BOOLEAN")); case VOID: - return maker.TypeIdent(Javac.getCTCint(TypeTags.class, "VOID")); + return maker.TypeIdent(Javac.getCtcInt(TypeTags.class, "VOID")); case NULL: case NONE: case OTHER: |