1.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Jan 26 11:20:19 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties Wed Jan 26 13:45:25 2011 -0800
1.3 @@ -23,260 +23,440 @@
1.4 # questions.
1.5 #
1.6
1.7 +# Messages in this file which use "placeholders" for values (e.g. {0}, {1})
1.8 +# are preceded by a stylized comment describing the type of the corresponding
1.9 +# values.
1.10 +# The types currently in use are
1.11 +#
1.12 +# boolean true or false
1.13 +# file name the name of an input file; e.g. MyFile.java
1.14 +# message segment a sub-message; see compiler.misc.*
1.15 +# modifier a Java modifier; e.g. public, private, protected
1.16 +# name a name, typically a Java identifier
1.17 +# number an integer
1.18 +# option name the name of a command line option
1.19 +# source version a source version number, such as 1.5, 1.6, 1.7
1.20 +# string a general string
1.21 +# symbol the name of a declared type
1.22 +# symbol kind a description of the kind of a declaration; see compiler.misc.kindname.*
1.23 +# token the name of a non-terminal in source code; see compiler.misc.token.*
1.24 +# type a Java type; e.g. int, X, X<T>
1.25 +# unused the value is not used in this message
1.26 +#
1.27 +# list of X a comma-separated list of items; e.g. list of type
1.28 +# X or Y alternation; e.g. message segment or type
1.29 +# set of X a comma-separated collection of items; e.g. set of modifier
1.30 +#
1.31 +# These may be composed: e.g. list of type or message segment
1.32 +#
1.33 +# These comments are verified by the jtreg test test/tools/javac/diags/MessageInfo,
1.34 +# using info derived from the collected set of examples in test/tools/javac/diags/examples.
1.35 +# MessageInfo can also be run as a standalone utility providing more facilities
1.36 +# for manipulating this file. For more details, see MessageInfo.java.
1.37 +
1.38 ##
1.39 ## errors
1.40 ##
1.41
1.42 +# 0: symbol
1.43 compiler.err.abstract.cant.be.instantiated=\
1.44 {0} is abstract; cannot be instantiated
1.45 +
1.46 compiler.err.abstract.meth.cant.have.body=\
1.47 abstract methods cannot have a body
1.48 +
1.49 compiler.err.already.annotated=\
1.50 {0} {1} has already been annotated
1.51 +
1.52 +# 0: symbol, 1: symbol
1.53 compiler.err.already.defined=\
1.54 {0} is already defined in {1}
1.55 +
1.56 +# 0: string
1.57 compiler.err.already.defined.single.import=\
1.58 {0} is already defined in a single-type import
1.59 +
1.60 +# 0: string
1.61 compiler.err.already.defined.static.single.import=\
1.62 {0} is already defined in a static single-type import
1.63 +
1.64 compiler.err.already.defined.this.unit=\
1.65 {0} is already defined in this compilation unit
1.66 +
1.67 +# 0: type, 1: list of name
1.68 compiler.err.annotation.missing.default.value=\
1.69 annotation {0} is missing value for the attribute {1}
1.70 +
1.71 +# 0: type, 1: list of name
1.72 compiler.err.annotation.missing.default.value.1=\
1.73 annotation {0} is missing values for attributes {1}
1.74 +
1.75 +# 0: type
1.76 compiler.err.annotation.not.valid.for.type=\
1.77 annotation not valid for a value of type {0}
1.78 +
1.79 compiler.err.annotation.type.not.applicable=\
1.80 annotation type not applicable to this kind of declaration
1.81 +
1.82 compiler.err.annotation.value.must.be.annotation=\
1.83 annotation value must be an annotation
1.84 +
1.85 compiler.err.annotation.value.must.be.class.literal=\
1.86 annotation value must be a class literal
1.87 +
1.88 compiler.err.annotation.value.must.be.name.value=\
1.89 annotation values must be of the form ''name=value''
1.90 +
1.91 compiler.err.annotation.value.not.allowable.type=\
1.92 annotation value not of an allowable type
1.93 +
1.94 compiler.err.anon.class.impl.intf.no.args=\
1.95 anonymous class implements interface; cannot have arguments
1.96 +
1.97 compiler.err.anon.class.impl.intf.no.typeargs=\
1.98 anonymous class implements interface; cannot have type arguments
1.99 +
1.100 compiler.err.anon.class.impl.intf.no.qual.for.new=\
1.101 anonymous class implements interface; cannot have qualifier for new
1.102 +
1.103 +# 0: symbol, 1: symbol, 2: symbol
1.104 compiler.err.array.and.varargs=\
1.105 cannot declare both {0} and {1} in {2}
1.106 +
1.107 compiler.err.array.dimension.missing=\
1.108 array dimension missing
1.109 +
1.110 +# 0: type
1.111 compiler.err.array.req.but.found=\
1.112 array required, but {0} found
1.113
1.114 compiler.err.assignment.from.super-bound=\
1.115 assigning from wildcard {0}
1.116 +
1.117 compiler.err.assignment.to.extends-bound=\
1.118 assigning to wildcard {0}
1.119 +
1.120 compiler.err.attribute.value.must.be.constant=\
1.121 attribute value must be constant
1.122
1.123 compiler.err.break.outside.switch.loop=\
1.124 break outside switch or loop
1.125
1.126 +# 0: name
1.127 compiler.err.call.must.be.first.stmt.in.ctor=\
1.128 call to {0} must be first statement in constructor
1.129 +
1.130 compiler.err.cant.apply.symbol=\
1.131 {0} {1} in {4} {5} cannot be applied to given types\n\
1.132 required: {2}\n\
1.133 found: {3}
1.134 +
1.135 +# 0: symbol kind, 1: name, 2: list of type or message segment, 3: list of type or message segment, 4: symbol kind, 5: type, 6: message segment
1.136 compiler.err.cant.apply.symbol.1=\
1.137 {0} {1} in {4} {5} cannot be applied to given types;\n\
1.138 required: {2}\n\
1.139 found: {3}\n\
1.140 reason: {6}
1.141 +
1.142 +# 0: symbol kind, 1: name, 2: list of type
1.143 compiler.err.cant.apply.symbols=\
1.144 no suitable {0} found for {1}({2})
1.145 +
1.146 +# 0: symbol
1.147 compiler.err.cant.assign.val.to.final.var=\
1.148 cannot assign a value to final variable {0}
1.149 +
1.150 +# 0: type
1.151 compiler.err.cant.deref=\
1.152 {0} cannot be dereferenced
1.153 +
1.154 compiler.err.cant.extend.intf.annotation=\
1.155 ''extends'' not allowed for @interfaces
1.156 +
1.157 +# 0: symbol
1.158 compiler.err.cant.inherit.from.final=\
1.159 cannot inherit from final {0}
1.160 +
1.161 +# 0: symbol
1.162 compiler.err.cant.ref.before.ctor.called=\
1.163 cannot reference {0} before supertype constructor has been called
1.164 +
1.165 compiler.err.cant.ret.val.from.meth.decl.void=\
1.166 cannot return a value from method whose result type is void
1.167 +
1.168 compiler.err.cant.select.static.class.from.param.type=\
1.169 cannot select a static class from a parameterized type
1.170 +
1.171 +# 0: symbol, 1: string, 2: string
1.172 compiler.err.cant.inherit.diff.arg=\
1.173 {0} cannot be inherited with different arguments: <{1}> and <{2}>
1.174 +
1.175 compiler.err.catch.without.try=\
1.176 ''catch'' without ''try''
1.177 +
1.178 +# 0: symbol kind, 1: symbol
1.179 compiler.err.clash.with.pkg.of.same.name=\
1.180 {0} {1} clashes with package of same name
1.181 +
1.182 compiler.err.const.expr.req=\
1.183 constant expression required
1.184 +
1.185 compiler.err.cont.outside.loop=\
1.186 continue outside of loop
1.187 +
1.188 +# 0: symbol
1.189 compiler.err.cyclic.inheritance=\
1.190 cyclic inheritance involving {0}
1.191 +
1.192 compiler.err.cyclic.annotation.element=\
1.193 cyclic annotation element type
1.194 +
1.195 +# 0: unused
1.196 compiler.err.call.to.super.not.allowed.in.enum.ctor=\
1.197 call to super not allowed in enum constructor
1.198 +
1.199 +# 0: type
1.200 compiler.err.no.superclass=\
1.201 {0} has no superclass
1.202
1.203 compiler.err.wrong.target.for.polymorphic.signature.definition=\
1.204 MethodHandle API building requires -target 7 runtimes or better; current is -target {0}
1.205
1.206 +# 0: symbol, 1: type, 2: symbol, 3: type, 4: unused
1.207 compiler.err.concrete.inheritance.conflict=\
1.208 methods {0} from {1} and {2} from {3} are inherited with the same signature
1.209
1.210 compiler.err.default.allowed.in.intf.annotation.member=\
1.211 default value only allowed in an @interface member
1.212 +
1.213 +# 0: symbol
1.214 compiler.err.doesnt.exist=\
1.215 package {0} does not exist
1.216 +
1.217 compiler.err.duplicate.annotation=\
1.218 duplicate annotation
1.219 +
1.220 +# 0: name, 1: type
1.221 compiler.err.duplicate.annotation.member.value=\
1.222 duplicate annotation member value {0} in {1}
1.223 +
1.224 +# 0: name
1.225 compiler.err.duplicate.class=\
1.226 duplicate class: {0}
1.227 +
1.228 compiler.err.duplicate.case.label=\
1.229 duplicate case label
1.230 +
1.231 compiler.err.duplicate.default.label=\
1.232 duplicate default label
1.233
1.234 compiler.err.else.without.if=\
1.235 ''else'' without ''if''
1.236 +
1.237 compiler.err.empty.char.lit=\
1.238 empty character literal
1.239 +
1.240 +# 0: symbol
1.241 compiler.err.encl.class.required=\
1.242 an enclosing instance that contains {0} is required
1.243 +
1.244 compiler.err.enum.annotation.must.be.enum.constant=\
1.245 an enum annotation value must be an enum constant
1.246
1.247 compiler.err.enum.cant.be.instantiated=\
1.248 enum types may not be instantiated
1.249 +
1.250 compiler.err.enum.label.must.be.unqualified.enum=\
1.251 an enum switch case label must be the unqualified name of an enumeration constant
1.252 +
1.253 compiler.err.enum.no.subclassing=\
1.254 classes cannot directly extend java.lang.Enum
1.255 +
1.256 compiler.err.enum.types.not.extensible=\
1.257 enum types are not extensible
1.258 +
1.259 compiler.err.enum.no.finalize=\
1.260 enums cannot have finalize methods
1.261 +
1.262 +# 0: file name, 1: string
1.263 compiler.err.error.reading.file=\
1.264 error reading {0}; {1}
1.265 +
1.266 +# 0: type
1.267 compiler.err.except.already.caught=\
1.268 exception {0} has already been caught
1.269 +
1.270 +# 0: type
1.271 compiler.err.except.never.thrown.in.try=\
1.272 exception {0} is never thrown in body of corresponding try statement
1.273
1.274 +# 0: symbol
1.275 compiler.err.final.parameter.may.not.be.assigned=\
1.276 final parameter {0} may not be assigned
1.277 +
1.278 +# 0: symbol
1.279 compiler.err.try.resource.may.not.be.assigned=\
1.280 auto-closeable resource {0} may not be assigned
1.281 +
1.282 compiler.err.try.resource.trailing.semi=\
1.283 illegal trailing semicolon in resources declaration
1.284 +
1.285 +# 0: symbol
1.286 compiler.err.multicatch.parameter.may.not.be.assigned=\
1.287 multi-catch parameter {0} may not be assigned
1.288 +
1.289 compiler.err.finally.without.try=\
1.290 ''finally'' without ''try''
1.291 +
1.292 +# 0: type, 1: message segment
1.293 compiler.err.foreach.not.applicable.to.type=\
1.294 for-each not applicable to expression type\n\
1.295 required: {1}\n\
1.296 found: {0}
1.297 +
1.298 compiler.err.fp.number.too.large=\
1.299 floating point number too large
1.300 +
1.301 compiler.err.fp.number.too.small=\
1.302 floating point number too small
1.303
1.304 compiler.err.generic.array.creation=\
1.305 generic array creation
1.306 +
1.307 compiler.err.generic.throwable=\
1.308 a generic class may not extend java.lang.Throwable
1.309
1.310 +# 0: symbol
1.311 compiler.err.icls.cant.have.static.decl=\
1.312 Illegal static declaration in inner class {0}\n\
1.313 modifier \''static\'' is only allowed in constant variable declarations
1.314 +
1.315 +# 0: string
1.316 compiler.err.illegal.char=\
1.317 illegal character: \\{0}
1.318 +
1.319 compiler.err.illegal.char.for.encoding=\
1.320 unmappable character for encoding {0}
1.321 +
1.322 +# 0: set of modifier, 1: set of modifier
1.323 compiler.err.illegal.combination.of.modifiers=\
1.324 illegal combination of modifiers: {0} and {1}
1.325 +
1.326 compiler.err.illegal.enum.static.ref=\
1.327 illegal reference to static field from initializer
1.328 +
1.329 compiler.err.illegal.esc.char=\
1.330 illegal escape character
1.331 +
1.332 compiler.err.illegal.forward.ref=\
1.333 illegal forward reference
1.334 +
1.335 +# 0: symbol
1.336 compiler.warn.forward.ref=\
1.337 reference to variable ''{0}'' before it has been initialized
1.338 +
1.339 compiler.err.illegal.self.ref=\
1.340 self-reference in initializer
1.341 +
1.342 +# 0: symbol
1.343 compiler.warn.self.ref=\
1.344 self-reference in initializer of variable ''{0}''
1.345 +
1.346 compiler.err.illegal.generic.type.for.instof=\
1.347 illegal generic type for instanceof
1.348 +
1.349 +# 0: type
1.350 compiler.err.illegal.initializer.for.type=\
1.351 illegal initializer for {0}
1.352 +
1.353 compiler.err.illegal.line.end.in.char.lit=\
1.354 illegal line end in character literal
1.355 +
1.356 compiler.err.illegal.nonascii.digit=\
1.357 illegal non-ASCII digit
1.358 +
1.359 compiler.err.illegal.underscore=\
1.360 illegal underscore
1.361 +
1.362 +# 0: symbol
1.363 compiler.err.illegal.qual.not.icls=\
1.364 illegal qualifier; {0} is not an inner class
1.365 +
1.366 compiler.err.illegal.start.of.expr=\
1.367 illegal start of expression
1.368 +
1.369 compiler.err.illegal.start.of.type=\
1.370 illegal start of type
1.371 +
1.372 compiler.err.illegal.unicode.esc=\
1.373 illegal unicode escape
1.374 +
1.375 +# 0: symbol
1.376 compiler.err.import.requires.canonical=\
1.377 import requires canonical name for {0}
1.378 +
1.379 compiler.err.improperly.formed.type.param.missing=\
1.380 improperly formed type, some parameters are missing
1.381 +
1.382 compiler.err.improperly.formed.type.inner.raw.param=\
1.383 improperly formed type, type arguments given on a raw type
1.384 +
1.385 +# 0: type, 1: type
1.386 compiler.err.incomparable.types=\
1.387 incomparable types: {0} and {1}
1.388 +
1.389 +# 0: number
1.390 compiler.err.int.number.too.large=\
1.391 integer number too large: {0}
1.392 +
1.393 compiler.err.internal.error.cant.instantiate=\
1.394 internal error; cannot instantiate {0} at {1} to ({2})
1.395 +
1.396 compiler.err.intf.annotation.members.cant.have.params=\
1.397 @interface members may not have parameters
1.398 +
1.399 compiler.err.intf.annotation.cant.have.type.params=\
1.400 @interface may not have type parameters
1.401 +
1.402 compiler.err.intf.annotation.members.cant.have.type.params=\
1.403 @interface members may not have type parameters
1.404 +
1.405 +# 0: symbol, 1: type
1.406 compiler.err.intf.annotation.member.clash=\
1.407 @interface member clashes with method ''{0}'' in {1}
1.408 +
1.409 compiler.err.intf.expected.here=\
1.410 interface expected here
1.411 +
1.412 compiler.err.intf.meth.cant.have.body=\
1.413 interface methods cannot have body
1.414 +
1.415 compiler.err.invalid.annotation.member.type=\
1.416 invalid type for annotation member
1.417 +
1.418 compiler.err.invalid.binary.number=\
1.419 binary numbers must contain at least one binary digit
1.420 +
1.421 compiler.err.invalid.hex.number=\
1.422 hexadecimal numbers must contain at least one hexadecimal digit
1.423 +
1.424 compiler.err.invalid.meth.decl.ret.type.req=\
1.425 invalid method declaration; return type required
1.426 +
1.427 compiler.err.varargs.and.old.array.syntax=\
1.428 legacy array notation not allowed on variable-arity parameter
1.429
1.430 +# 0: name
1.431 compiler.err.label.already.in.use=\
1.432 label {0} already in use
1.433 +
1.434 +# 0: symbol
1.435 compiler.err.local.var.accessed.from.icls.needs.final=\
1.436 local variable {0} is accessed from within inner class; needs to be declared final
1.437 +
1.438 compiler.err.local.enum=\
1.439 enum types must not be local
1.440 +
1.441 compiler.err.cannot.create.array.with.type.arguments=\
1.442 cannot create array with type arguments
1.443
1.444 @@ -287,79 +467,121 @@
1.445 #
1.446 compiler.err.limit.code=\
1.447 code too large
1.448 +
1.449 compiler.err.limit.code.too.large.for.try.stmt=\
1.450 code too large for try statement
1.451 +
1.452 compiler.err.limit.dimensions=\
1.453 array type has too many dimensions
1.454 +
1.455 compiler.err.limit.locals=\
1.456 too many local variables
1.457 +
1.458 compiler.err.limit.parameters=\
1.459 too many parameters
1.460 +
1.461 compiler.err.limit.pool=\
1.462 too many constants
1.463 +
1.464 compiler.err.limit.pool.in.class=\
1.465 too many constants in class {0}
1.466 +
1.467 compiler.err.limit.stack=\
1.468 code requires too much stack
1.469 +
1.470 compiler.err.limit.string=\
1.471 constant string too long
1.472 +
1.473 compiler.err.limit.string.overflow=\
1.474 UTF8 representation for string \"{0}...\" is too long for the constant pool
1.475
1.476 compiler.err.malformed.fp.lit=\
1.477 malformed floating point literal
1.478 +
1.479 compiler.err.method.does.not.override.superclass=\
1.480 method does not override or implement a method from a supertype
1.481 +
1.482 compiler.err.missing.meth.body.or.decl.abstract=\
1.483 missing method body, or declare abstract
1.484 +
1.485 compiler.err.missing.ret.stmt=\
1.486 missing return statement
1.487 +
1.488 compiler.err.missing.ret.val=\
1.489 missing return value
1.490 +
1.491 +# 0: set of modifier
1.492 compiler.err.mod.not.allowed.here=\
1.493 modifier {0} not allowed here
1.494 +
1.495 compiler.err.intf.not.allowed.here=\
1.496 interface not allowed here
1.497 +
1.498 compiler.err.enums.must.be.static=\
1.499 enum declarations allowed only in static contexts
1.500
1.501 +# 0: symbol, 1: symbol
1.502 compiler.err.name.clash.same.erasure=\
1.503 name clash: {0} and {1} have the same erasure
1.504 +
1.505 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.506 compiler.err.name.clash.same.erasure.no.override=\
1.507 name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither overrides the other
1.508 +
1.509 compiler.err.name.reserved.for.internal.use=\
1.510 {0} is reserved for internal use
1.511 +
1.512 compiler.err.native.meth.cant.have.body=\
1.513 native methods cannot have a body
1.514 +
1.515 +# 0: type, 1: type
1.516 compiler.err.neither.conditional.subtype=\
1.517 -incompatible types for ?: neither is a subtype of the other\n\
1.518 -second operand: {0}\n\
1.519 -third operand : {1}
1.520 + incompatible types for ?: neither is a subtype of the other\n\
1.521 + second operand: {0}\n\
1.522 + third operand : {1}
1.523 +
1.524 compiler.err.new.not.allowed.in.annotation=\
1.525 ''new'' not allowed in an annotation
1.526 +
1.527 compiler.err.no.annotation.member=\
1.528 no annotation member {0} in {1}
1.529 +
1.530 compiler.err.no.encl.instance.of.type.in.scope=\
1.531 no enclosing instance of type {0} is in scope
1.532 +
1.533 compiler.err.no.intf.expected.here=\
1.534 no interface expected here
1.535 +
1.536 compiler.err.no.match.entry=\
1.537 {0} has no match in entry in {1}; required {2}
1.538 +
1.539 compiler.err.not.annotation.type=\
1.540 {0} is not an annotation type
1.541 +
1.542 +# 0: symbol, 1: symbol
1.543 compiler.err.not.def.access.class.intf.cant.access=\
1.544 {0} in {1} is defined in an inaccessible class or interface
1.545 +
1.546 +# 0: symbol, 1: symbol
1.547 compiler.err.not.def.public.cant.access=\
1.548 {0} is not public in {1}; cannot be accessed from outside package
1.549 +
1.550 +# 0: name
1.551 compiler.err.not.loop.label=\
1.552 not a loop label: {0}
1.553 +
1.554 compiler.err.not.stmt=\
1.555 not a statement
1.556 +
1.557 +# 0: symbol
1.558 compiler.err.not.encl.class=\
1.559 not an enclosing class: {0}
1.560
1.561 +# 0: name, 1: type, 2: unused
1.562 compiler.err.operator.cant.be.applied=\
1.563 bad operand type {1} for unary operator ''{0}''
1.564 +
1.565 +# 0: name, 1: type, 2: type
1.566 compiler.err.operator.cant.be.applied.1=\
1.567 bad operand types for binary operator ''{0}''\n\
1.568 first type: {1}\n\
1.569 @@ -367,6 +589,8 @@
1.570
1.571 compiler.err.pkg.annotations.sb.in.package-info.java=\
1.572 package annotations should be in file package-info.java
1.573 +
1.574 +# 0: symbol
1.575 compiler.err.pkg.clashes.with.class.of.same.name=\
1.576 package {0} clashes with class of same name
1.577
1.578 @@ -376,18 +600,21 @@
1.579 # Errors related to annotation processing
1.580
1.581 compiler.err.proc.cant.access=\
1.582 -cannot access {0}\n\
1.583 -{1}\n\
1.584 -Consult the following stack trace for details.\n\
1.585 -{2}
1.586 + cannot access {0}\n\
1.587 + {1}\n\
1.588 + Consult the following stack trace for details.\n\
1.589 + {2}
1.590
1.591 +# 0: string
1.592 compiler.err.proc.cant.find.class=\
1.593 Could not find class file for ''{0}''.
1.594
1.595 # Print a client-generated error message; assumed to be localized, no translation required
1.596 +# 0: string
1.597 compiler.err.proc.messager=\
1.598 {0}
1.599
1.600 +# 0: list of string
1.601 compiler.err.proc.no.explicit.annotation.processing.requested=\
1.602 Class names, ''{0}'', are only accepted if annotation processing is explicitly requested
1.603
1.604 @@ -398,15 +625,18 @@
1.605 compiler.err.proc.processor.bad.option.name=\
1.606 Bad option name ''{0}'' provided by processor ''{1}''
1.607
1.608 +# 0: string
1.609 compiler.err.proc.processor.cant.instantiate=\
1.610 Could not instantiate an instance of processor ''{0}''
1.611
1.612 compiler.err.proc.processor.constructor.error=\
1.613 Exception thrown while constructing Processor object: {0}
1.614
1.615 +# 0: string
1.616 compiler.err.proc.processor.not.found=\
1.617 Annotation processor ''{0}'' not found
1.618
1.619 +# 0: string
1.620 compiler.err.proc.processor.wrong.type=\
1.621 Annotation processor ''{0}'' does not implement javax.annotation.processing.Processor
1.622
1.623 @@ -419,127 +649,197 @@
1.624 compiler.err.proc.cant.create.loader=\
1.625 Could not create class loader for annotation processors: {0}
1.626
1.627 +# 0: unused
1.628 compiler.err.qualified.new.of.static.class=\
1.629 qualified new of static class
1.630
1.631 compiler.err.recursive.ctor.invocation=\
1.632 recursive constructor invocation
1.633 +
1.634 +# 0: name, 1: symbol kind, 2: symbol, 3: symbol, 4: symbol kind, 5: symbol, 6: symbol
1.635 compiler.err.ref.ambiguous=\
1.636 reference to {0} is ambiguous, both {1} {2} in {3} and {4} {5} in {6} match
1.637 +
1.638 compiler.err.repeated.annotation.target=\
1.639 repeated annotation target
1.640 +
1.641 compiler.err.repeated.interface=\
1.642 repeated interface
1.643 +
1.644 compiler.err.repeated.modifier=\
1.645 repeated modifier
1.646 +
1.647 +# 0: symbol, 1: set of modifier, 2: symbol
1.648 compiler.err.report.access=\
1.649 {0} has {1} access in {2}
1.650 +
1.651 compiler.err.ret.outside.meth=\
1.652 return outside method
1.653
1.654 compiler.err.signature.doesnt.match.supertype=\
1.655 signature does not match {0}; incompatible supertype
1.656 +
1.657 compiler.err.signature.doesnt.match.intf=\
1.658 signature does not match {0}; incompatible interfaces
1.659 +
1.660 +# 0: symbol, 1: symbol, 2: symbol
1.661 compiler.err.does.not.override.abstract=\
1.662 {0} is not abstract and does not override abstract method {1} in {2}
1.663 +
1.664 compiler.err.source.cant.overwrite.input.file=\
1.665 error writing source; cannot overwrite input file {0}
1.666 +
1.667 compiler.err.stack.sim.error=\
1.668 Internal error: stack sim error on {0}
1.669 +
1.670 compiler.err.static.imp.only.classes.and.interfaces=\
1.671 static import only from classes and interfaces
1.672 +
1.673 compiler.err.string.const.req=\
1.674 constant string expression required
1.675 +
1.676 +# 0: symbol, 1: symbol
1.677 compiler.err.synthetic.name.conflict=\
1.678 the symbol {0} conflicts with a compiler-synthesized symbol in {1}
1.679 +
1.680 +# 0: symbol, 1: symbol
1.681 compiler.warn.synthetic.name.conflict=\
1.682 the symbol {0} conflicts with a compiler-synthesized symbol in {1}
1.683
1.684 compiler.err.throws.not.allowed.in.intf.annotation=\
1.685 throws clause not allowed in @interface members
1.686 +
1.687 compiler.err.try.without.catch.or.finally=\
1.688 ''try'' without ''catch'' or ''finally''
1.689 +
1.690 compiler.err.try.without.catch.finally.or.resource.decls=\
1.691 ''try'' without ''catch'', ''finally'' or resource declarations
1.692 +
1.693 +# 0: symbol
1.694 compiler.err.type.doesnt.take.params=\
1.695 type {0} does not take parameters
1.696 +
1.697 compiler.err.type.var.cant.be.deref=\
1.698 cannot select from a type variable
1.699 +
1.700 compiler.err.type.var.may.not.be.followed.by.other.bounds=\
1.701 a type variable may not be followed by other bounds
1.702 +
1.703 compiler.err.type.var.more.than.once=\
1.704 type variable {0} occurs more than once in result type of {1}; cannot be left uninstantiated
1.705 +
1.706 compiler.err.type.var.more.than.once.in.result=\
1.707 type variable {0} occurs more than once in type of {1}; cannot be left uninstantiated
1.708 +
1.709 +# 0: type, 1: type, 2: string
1.710 compiler.err.types.incompatible.diff.ret=\
1.711 types {0} and {1} are incompatible; both define {2}, but with unrelated return types
1.712
1.713 compiler.err.unclosed.char.lit=\
1.714 unclosed character literal
1.715 +
1.716 compiler.err.unclosed.comment=\
1.717 unclosed comment
1.718 +
1.719 compiler.err.unclosed.str.lit=\
1.720 unclosed string literal
1.721 +
1.722 compiler.err.unknown.enum.constant=\
1.723 in class file {0}: unknown enum constant {1}.{2}
1.724 +
1.725 +# 0: name
1.726 compiler.err.unsupported.encoding=\
1.727 unsupported encoding: {0}
1.728 +
1.729 compiler.err.io.exception=\
1.730 error reading source file: {0}
1.731 +
1.732 +# 0: name
1.733 compiler.err.undef.label=\
1.734 undefined label: {0}
1.735 +
1.736 compiler.err.undetermined.type=\
1.737 cannot infer type arguments for {0}
1.738 +
1.739 +# 0: type, 1: message segment
1.740 compiler.err.undetermined.type.1=\
1.741 cannot infer type arguments for {0};\n\
1.742 reason: {1}
1.743 +
1.744 +# 0: list of type, 1: message segment
1.745 compiler.err.invalid.inferred.types=\
1.746 invalid inferred types for {0}; {1}
1.747 +
1.748 +# 0: message segment, 1: unused
1.749 compiler.err.cant.apply.diamond=\
1.750 cannot infer type arguments for {0}
1.751 +
1.752 +# 0: message segment, 1: message segment
1.753 compiler.err.cant.apply.diamond.1=\
1.754 cannot infer type arguments for {0};\n\
1.755 reason: {1}
1.756 +
1.757 compiler.err.unreachable.stmt=\
1.758 unreachable statement
1.759 +
1.760 compiler.err.initializer.must.be.able.to.complete.normally=\
1.761 initializer must be able to complete normally
1.762 +
1.763 +# 0: type
1.764 compiler.err.unreported.exception.need.to.catch.or.throw=\
1.765 unreported exception {0}; must be caught or declared to be thrown
1.766 +
1.767 +# 0: type
1.768 compiler.err.unreported.exception.default.constructor=\
1.769 unreported exception {0} in default constructor
1.770 +
1.771 compiler.err.unsupported.cross.fp.lit=\
1.772 hexadecimal floating-point literals are not supported on this VM
1.773 +
1.774 compiler.err.void.not.allowed.here=\
1.775 ''void'' type not allowed here
1.776
1.777 +# 0: string
1.778 compiler.err.wrong.number.type.args=\
1.779 wrong number of type arguments; required {0}
1.780
1.781 +# 0: symbol
1.782 compiler.err.var.might.already.be.assigned=\
1.783 variable {0} might already have been assigned
1.784 +
1.785 +# 0: symbol
1.786 compiler.err.var.might.not.have.been.initialized=\
1.787 variable {0} might not have been initialized
1.788 +
1.789 +# 0: symbol
1.790 compiler.err.var.might.be.assigned.in.loop=\
1.791 variable {0} might be assigned in loop
1.792
1.793 +# 0: symbol, 1: message segment
1.794 compiler.err.varargs.invalid.trustme.anno=\
1.795 Invalid {0} annotation. {1}
1.796 +
1.797 +# 0: type
1.798 compiler.misc.varargs.trustme.on.reifiable.varargs=\
1.799 Varargs element type {0} is reifiable.
1.800 +
1.801 +# 0: symbol
1.802 compiler.misc.varargs.trustme.on.non.varargs.meth=\
1.803 Method {0} is not a varargs method.
1.804 +
1.805 +# 0: symbol
1.806 compiler.misc.varargs.trustme.on.virtual.varargs=\
1.807 Instance method {0} is not final.
1.808
1.809 # In the following string, {1} will always be the detail message from
1.810 # java.io.IOException.
1.811 +# 0: symbol, 1: string
1.812 compiler.err.class.cant.write=\
1.813 error while writing {0}: {1}
1.814
1.815 # In the following string, {0} is the name of the class in the Java source.
1.816 # It really should be used two times..
1.817 +# 0: name
1.818 compiler.err.class.public.should.be.in.file=\
1.819 class {0} is public, should be declared in a file named {0}.java
1.820
1.821 @@ -558,12 +858,16 @@
1.822
1.823 compiler.misc.fatal.err.no.java.lang=\
1.824 Fatal Error: Unable to find package java.lang in classpath or bootclasspath
1.825 +
1.826 compiler.misc.fatal.err.cant.locate.meth=\
1.827 Fatal Error: Unable to find method {0}
1.828 +
1.829 compiler.misc.fatal.err.cant.locate.field=\
1.830 Fatal Error: Unable to find field {0}
1.831 +
1.832 compiler.misc.fatal.err.cant.locate.ctor=\
1.833 Fatal Error: Unable to find constructor for {0}
1.834 +
1.835 compiler.misc.fatal.err.cant.close.loader=\
1.836 Fatal Error: Cannot close class loader for annotation processors
1.837
1.838 @@ -575,10 +879,15 @@
1.839
1.840 compiler.misc.source.unavailable=\
1.841 (source unavailable)
1.842 +
1.843 compiler.misc.base.membership=\
1.844 all your base class are belong to us
1.845 +
1.846 +# 0: string, 1: string, 2: boolean
1.847 compiler.misc.x.print.processor.info=\
1.848 Processor {0} matches {1} and returns {2}.
1.849 +
1.850 +# 0: number, 1: string, 2: set of symbol, 3: boolean
1.851 compiler.misc.x.print.rounds=\
1.852 Round {0}:\n\tinput files: {1}\n\tannotations: {2}\n\tlast round: {3}
1.853
1.854 @@ -589,61 +898,84 @@
1.855 compiler.note.note=\
1.856 Note:\u0020
1.857
1.858 +# 0: file name
1.859 compiler.note.deprecated.filename=\
1.860 {0} uses or overrides a deprecated API.
1.861 +
1.862 compiler.note.deprecated.plural=\
1.863 Some input files use or override a deprecated API.
1.864 +
1.865 # The following string may appear after one of the above deprecation
1.866 # messages.
1.867 compiler.note.deprecated.recompile=\
1.868 Recompile with -Xlint:deprecation for details.
1.869
1.870 +# 0: file name
1.871 compiler.note.deprecated.filename.additional=\
1.872 {0} has additional uses or overrides of a deprecated API.
1.873 +
1.874 compiler.note.deprecated.plural.additional=\
1.875 Some input files additionally use or override a deprecated API.
1.876
1.877 +# 0: file name
1.878 compiler.note.unchecked.filename=\
1.879 {0} uses unchecked or unsafe operations.
1.880 +
1.881 compiler.note.unchecked.plural=\
1.882 Some input files use unchecked or unsafe operations.
1.883 +
1.884 # The following string may appear after one of the above deprecation
1.885 # messages.
1.886 compiler.note.unchecked.recompile=\
1.887 Recompile with -Xlint:unchecked for details.
1.888
1.889 +# 0: file name
1.890 compiler.note.unchecked.filename.additional=\
1.891 {0} has additional unchecked or unsafe operations.
1.892 +
1.893 compiler.note.unchecked.plural.additional=\
1.894 Some input files additionally use unchecked or unsafe operations.
1.895
1.896 +# 0: file name
1.897 compiler.note.sunapi.filename=\
1.898 {0} uses internal proprietary API that may be removed in a future release.
1.899 +
1.900 compiler.note.sunapi.plural=\
1.901 Some input files use internal proprietary API that may be removed in a future release.
1.902 +
1.903 # The following string may appear after one of the above sunapi messages.
1.904 compiler.note.sunapi.recompile=\
1.905 Recompile with -Xlint:sunapi for details.
1.906
1.907 +# 0: file name
1.908 compiler.note.sunapi.filename.additional=\
1.909 {0} uses additional internal proprietary API that may be removed in a future release.
1.910 +
1.911 compiler.note.sunapi.plural.additional=\
1.912 Some input files additionally use internal proprietary API that may be removed in a future release.
1.913
1.914 # Notes related to annotation processing
1.915
1.916 # Print a client-generated note; assumed to be localized, no translation required
1.917 +# 0: string
1.918 compiler.note.proc.messager=\
1.919 {0}
1.920
1.921 #####
1.922
1.923 +# 0: number
1.924 compiler.misc.count.error=\
1.925 {0} error
1.926 +
1.927 +# 0: number
1.928 compiler.misc.count.error.plural=\
1.929 {0} errors
1.930 +
1.931 +# 0: number
1.932 compiler.misc.count.warn=\
1.933 {0} warning
1.934 +
1.935 +# 0: number
1.936 compiler.misc.count.warn.plural=\
1.937 {0} warnings
1.938
1.939 @@ -652,38 +984,53 @@
1.940
1.941 ## extra output when using -verbose (JavaCompiler)
1.942
1.943 +# 0: symbol
1.944 compiler.misc.verbose.checking.attribution=\
1.945 [checking {0}]
1.946 +
1.947 +# 0: string
1.948 compiler.misc.verbose.parsing.done=\
1.949 [parsing completed {0}ms]
1.950 +
1.951 +# 0: file name
1.952 compiler.misc.verbose.parsing.started=\
1.953 [parsing started {0}]
1.954 +
1.955 +# 0: string
1.956 compiler.misc.verbose.total=\
1.957 [total {0}ms]
1.958 +
1.959 +# 0: file name
1.960 compiler.misc.verbose.wrote.file=\
1.961 [wrote {0}]
1.962
1.963 ## extra output when using -verbose (Retro)
1.964 compiler.misc.verbose.retro=\
1.965 [retrofitting {0}]
1.966 +
1.967 compiler.misc.verbose.retro.with=\
1.968 \tretrofitting {0} with {1}
1.969 +
1.970 compiler.misc.verbose.retro.with.list=\
1.971 \tretrofitting {0} with type parameters {1}, supertype {2}, interfaces {3}
1.972
1.973 ## extra output when using -verbose (code/ClassReader)
1.974 +# 0: string
1.975 compiler.misc.verbose.loading=\
1.976 [loading {0}]
1.977
1.978 +# 0: string
1.979 compiler.misc.verbose.sourcepath=\
1.980 [search path for source files: {0}]
1.981
1.982 +# 0: string
1.983 compiler.misc.verbose.classpath=\
1.984 [search path for class files: {0}]
1.985
1.986 ## extra output when using -checkclassfile (code/ClassReader)
1.987 compiler.misc.ccf.found.later.version=\
1.988 class file has later version than expected: {0}
1.989 +
1.990 compiler.misc.ccf.unrecognized.attribute=\
1.991 unrecognized attribute: {0}
1.992
1.993 @@ -703,103 +1050,135 @@
1.994
1.995 ## Warning messages may also include the following prefix to identify a
1.996 ## lint option
1.997 +# 0: option name
1.998 compiler.warn.lintOption=\
1.999 [{0}]\u0020
1.1000
1.1001 +# 0: symbol
1.1002 compiler.warn.constant.SVUID=\
1.1003 serialVersionUID must be constant in class {0}
1.1004
1.1005 +# 0: file name
1.1006 compiler.warn.dir.path.element.not.found=\
1.1007 bad path element "{0}": no such directory
1.1008
1.1009 compiler.warn.finally.cannot.complete=\
1.1010 finally clause cannot complete normally
1.1011
1.1012 +# 0: symbol, 1: symbol
1.1013 compiler.warn.has.been.deprecated=\
1.1014 {0} in {1} has been deprecated
1.1015
1.1016 +# 0: symbol
1.1017 compiler.warn.sun.proprietary=\
1.1018 {0} is internal proprietary API and may be removed in a future release
1.1019
1.1020 compiler.warn.illegal.char.for.encoding=\
1.1021 unmappable character for encoding {0}
1.1022
1.1023 +# 0: symbol
1.1024 compiler.warn.improper.SVUID=\
1.1025 serialVersionUID must be declared static final in class {0}
1.1026
1.1027 +# 0: type, 1: type
1.1028 compiler.warn.inexact.non-varargs.call=\
1.1029 -non-varargs call of varargs method with inexact argument type for last parameter;\n\
1.1030 -cast to {0} for a varargs call\n\
1.1031 -cast to {1} for a non-varargs call and to suppress this warning
1.1032 + non-varargs call of varargs method with inexact argument type for last parameter;\n\
1.1033 + cast to {0} for a varargs call\n\
1.1034 + cast to {1} for a non-varargs call and to suppress this warning
1.1035
1.1036 +# 0: symbol
1.1037 compiler.warn.long.SVUID=\
1.1038 serialVersionUID must be of type long in class {0}
1.1039
1.1040 +# 0: symbol
1.1041 compiler.warn.missing.SVUID=\
1.1042 serializable class {0} has no definition of serialVersionUID
1.1043
1.1044 +# 0: message segment
1.1045 compiler.warn.override.varargs.missing=\
1.1046 {0}; overridden method has no ''...''
1.1047 +
1.1048 +# 0: message segment
1.1049 compiler.warn.override.varargs.extra=\
1.1050 {0}; overriding method is missing ''...''
1.1051 +
1.1052 compiler.warn.override.bridge=\
1.1053 {0}; overridden method is a bridge method
1.1054
1.1055 +# 0: symbol
1.1056 compiler.warn.pkg-info.already.seen=\
1.1057 a package-info.java file has already been seen for package {0}
1.1058
1.1059 +# 0: file name
1.1060 compiler.warn.path.element.not.found=\
1.1061 bad path element "{0}": no such file or directory
1.1062
1.1063 compiler.warn.possible.fall-through.into.case=\
1.1064 possible fall-through into case
1.1065
1.1066 +# 0: type
1.1067 compiler.warn.redundant.cast=\
1.1068 redundant cast to {0}
1.1069
1.1070 +# 0: number
1.1071 compiler.warn.position.overflow=\
1.1072 Position encoding overflows at line {0}
1.1073
1.1074 +# 0: file name, 1: number, 2: number
1.1075 compiler.warn.big.major.version=\
1.1076 {0}: major version {1} is newer than {2}, the highest major version supported by this compiler.\n\
1.1077 It is recommended that the compiler be upgraded.
1.1078
1.1079 +# 0: symbol kind, 1: symbol
1.1080 compiler.warn.static.not.qualified.by.type=\
1.1081 static {0} should be qualified by type name, {1}, instead of by an expression
1.1082
1.1083 +# 0: string
1.1084 compiler.warn.source.no.bootclasspath=\
1.1085 bootstrap class path not set in conjunction with -source {0}
1.1086
1.1087 +# 0: name, 1: number, 2: number, 3: number, 4: number
1.1088 compiler.warn.future.attr=\
1.1089 {0} attribute introduced in version {1}.{2} class files is ignored in version {3}.{4} class files
1.1090
1.1091 # Warnings related to annotation processing
1.1092 +# 0: name
1.1093 compiler.warn.proc.package.does.not.exist=\
1.1094 package {0} does not exist
1.1095 +
1.1096 +# 0: name
1.1097 compiler.warn.proc.file.reopening=\
1.1098 Attempt to create a file for ''{0}'' multiple times
1.1099
1.1100 +# 0: name
1.1101 compiler.warn.proc.type.already.exists=\
1.1102 A file for type ''{0}'' already exists on the sourcepath or classpath
1.1103
1.1104 +# 0: name
1.1105 compiler.warn.proc.type.recreate=\
1.1106 Attempt to create a file for type ''{0}'' multiple times
1.1107
1.1108 +# 0: string
1.1109 compiler.warn.proc.illegal.file.name=\
1.1110 Cannot create file for illegal name ''{0}''.
1.1111
1.1112 +# 0: string, 1: string
1.1113 compiler.warn.proc.suspicious.class.name=\
1.1114 Creating file for a type whose name ends in {1}: ''{0}''
1.1115
1.1116 +# 0: name
1.1117 compiler.warn.proc.file.create.last.round=\
1.1118 File for type ''{0}'' created in the last round will not be subject to annotation processing.
1.1119
1.1120 +# 0: string, 1: string
1.1121 compiler.warn.proc.malformed.supported.string=\
1.1122 Malformed string ''{0}'' for a supported annotation type returned by processor ''{1}''
1.1123
1.1124 +# 0: set of string
1.1125 compiler.warn.proc.annotations.without.processors=\
1.1126 No processor claimed any of these annotations: {0}
1.1127
1.1128 +# 0: source version, 1: string, 2: string
1.1129 compiler.warn.proc.processor.incompatible.source.version=\
1.1130 Supported source version ''{0}'' from annotation processor ''{1}'' less than -source ''{2}''
1.1131
1.1132 @@ -807,46 +1186,62 @@
1.1133 Annotation processing without compilation requested but no processors were found.
1.1134
1.1135 compiler.warn.proc.use.implicit=\
1.1136 -Implicitly compiled files were not subject to annotation processing.\n\
1.1137 -Use -implicit to specify a policy for implicit compilation.
1.1138 + Implicitly compiled files were not subject to annotation processing.\n\
1.1139 + Use -implicit to specify a policy for implicit compilation.
1.1140
1.1141 compiler.warn.proc.use.proc.or.implicit=\
1.1142 -Implicitly compiled files were not subject to annotation processing.\n\
1.1143 -Use -proc:none to disable annotation processing or -implicit to specify a policy for implicit compilation.
1.1144 + Implicitly compiled files were not subject to annotation processing.\n\
1.1145 + Use -proc:none to disable annotation processing or -implicit to specify a policy for implicit compilation.
1.1146
1.1147 # Print a client-generated warning; assumed to be localized, no translation required
1.1148 +# 0: string
1.1149 compiler.warn.proc.messager=\
1.1150 {0}
1.1151
1.1152 +# 0: set of name
1.1153 compiler.warn.proc.unclosed.type.files=\
1.1154 Unclosed files for the types ''{0}''; these types will not undergo annotation processing
1.1155
1.1156 +# 0: string
1.1157 compiler.warn.proc.unmatched.processor.options=\
1.1158 The following options were not recognized by any processor: ''{0}''
1.1159
1.1160 compiler.warn.try.explicit.close.call=\
1.1161 explicit call to close() on an auto-closeable resource
1.1162 +
1.1163 +# 0: symbol
1.1164 compiler.warn.try.resource.not.referenced=\
1.1165 auto-closeable resource {0} is never referenced in body of corresponding try statement
1.1166 +
1.1167 compiler.warn.unchecked.assign=\
1.1168 unchecked assignment: {0} to {1}
1.1169 +
1.1170 +# 0: symbol, 1: type
1.1171 compiler.warn.unchecked.assign.to.var=\
1.1172 unchecked assignment to variable {0} as member of raw type {1}
1.1173 +
1.1174 +# 0: symbol, 1: type
1.1175 compiler.warn.unchecked.call.mbr.of.raw.type=\
1.1176 unchecked call to {0} as a member of the raw type {1}
1.1177 +
1.1178 compiler.warn.unchecked.cast.to.type=\
1.1179 unchecked cast to type {0}
1.1180 +
1.1181 +# 0: symbol kind, 1: name, 2: list of type, 3: list of type, 4: symbol kind, 5: symbol
1.1182 compiler.warn.unchecked.meth.invocation.applied=\
1.1183 unchecked method invocation: {0} {1} in {4} {5} is applied to given types\n\
1.1184 required: {2}\n\
1.1185 found: {3}
1.1186
1.1187 +# 0: type
1.1188 compiler.warn.unchecked.generic.array.creation=\
1.1189 unchecked generic array creation for varargs parameter of type {0}
1.1190
1.1191 +# 0: type
1.1192 compiler.warn.unchecked.varargs.non.reifiable.type=\
1.1193 Possible heap pollution from parameterized vararg type {0}
1.1194
1.1195 +# 0: symbol
1.1196 compiler.warn.varargs.unsafe.use.varargs.param=\
1.1197 Varargs method could cause heap pollution from non-reifiable varargs parameter {0}
1.1198
1.1199 @@ -871,17 +1266,22 @@
1.1200 compiler.warn.annotation.method.not.found.reason=\
1.1201 Cannot find annotation method ''{1}()'' in type ''{0}'': {2}
1.1202
1.1203 +# 0: type, 1: type
1.1204 compiler.warn.raw.class.use=\
1.1205 found raw type: {0}\n\
1.1206 missing type arguments for generic class {1}
1.1207
1.1208 +# 0: unused, 1: unused
1.1209 compiler.warn.diamond.redundant.args=\
1.1210 redundant type arguments in new expression (use diamond operator instead).
1.1211 +
1.1212 +# 0: type, 1: type
1.1213 compiler.warn.diamond.redundant.args.1=\
1.1214 redundant type arguments in new expression (use diamond operator instead).\n\
1.1215 explicit: {0}\n\
1.1216 inferred: {1}
1.1217
1.1218 +# 0: symbol, 1: message segment
1.1219 compiler.warn.varargs.redundant.trustme.anno=\
1.1220 Redundant {0} annotation. {1}
1.1221
1.1222 @@ -891,20 +1291,28 @@
1.1223 ## be named as JLS3 calls them when translated to the appropriate language.
1.1224 compiler.misc.token.identifier=\
1.1225 <identifier>
1.1226 +
1.1227 compiler.misc.token.character=\
1.1228 <character>
1.1229 +
1.1230 compiler.misc.token.string=\
1.1231 <string>
1.1232 +
1.1233 compiler.misc.token.integer=\
1.1234 <integer>
1.1235 +
1.1236 compiler.misc.token.long-integer=\
1.1237 <long integer>
1.1238 +
1.1239 compiler.misc.token.float=\
1.1240 <float>
1.1241 +
1.1242 compiler.misc.token.double=\
1.1243 <double>
1.1244 +
1.1245 compiler.misc.token.bad-symbol=\
1.1246 <bad symbol>
1.1247 +
1.1248 compiler.misc.token.end-of-input=\
1.1249 <end of input>
1.1250
1.1251 @@ -917,10 +1325,15 @@
1.1252 ## 6. an operator (JLS3.12)
1.1253 ##
1.1254 ## This is the only place these tokens will be used.
1.1255 +# 0: token
1.1256 compiler.err.expected=\
1.1257 {0} expected
1.1258 +
1.1259 +# 0: token, 1: token
1.1260 compiler.err.expected2=\
1.1261 {0} or {1} expected
1.1262 +
1.1263 +# 0: token, 1: token, 2: token
1.1264 compiler.err.expected3=\
1.1265 {0}, {1}, or {2} expected
1.1266
1.1267 @@ -932,12 +1345,15 @@
1.1268 ''.class'' expected
1.1269
1.1270 ## The argument to this string will always be either 'case' or 'default'.
1.1271 +# 0: token
1.1272 compiler.err.orphaned=\
1.1273 orphaned {0}
1.1274
1.1275 +# 0: name
1.1276 compiler.misc.anonymous.class=\
1.1277 <anonymous {0}>
1.1278
1.1279 +# 0: name, 1: type
1.1280 compiler.misc.type.captureof=\
1.1281 capture#{0} of {1}
1.1282
1.1283 @@ -952,54 +1368,73 @@
1.1284
1.1285 #####
1.1286
1.1287 +# 0: symbol, 1: message segment
1.1288 compiler.err.cant.access=\
1.1289 -cannot access {0}\n\
1.1290 -{1}
1.1291 + cannot access {0}\n\
1.1292 + {1}
1.1293
1.1294 compiler.misc.bad.class.file.header=\
1.1295 -bad class file: {0}\n\
1.1296 -{1}\n\
1.1297 -Please remove or make sure it appears in the correct subdirectory of the classpath.
1.1298 + bad class file: {0}\n\
1.1299 + {1}\n\
1.1300 + Please remove or make sure it appears in the correct subdirectory of the classpath.
1.1301 +
1.1302 +# 0: file name, 1: message segment
1.1303 compiler.misc.bad.source.file.header=\
1.1304 -bad source file: {0}\n\
1.1305 -{1}\n\
1.1306 -Please remove or make sure it appears in the correct subdirectory of the sourcepath.
1.1307 + bad source file: {0}\n\
1.1308 + {1}\n\
1.1309 + Please remove or make sure it appears in the correct subdirectory of the sourcepath.
1.1310
1.1311 ## The following are all possible strings for the second argument ({1}) of the
1.1312 ## above strings.
1.1313 compiler.misc.bad.class.signature=\
1.1314 bad class signature: {0}
1.1315 +
1.1316 compiler.misc.bad.enclosing.method=\
1.1317 bad enclosing method attribute: {0}
1.1318 +
1.1319 compiler.misc.bad.runtime.invisible.param.annotations=\
1.1320 bad RuntimeInvisibleParameterAnnotations attribute: {0}
1.1321 +
1.1322 compiler.misc.bad.const.pool.tag=\
1.1323 bad constant pool tag: {0}
1.1324 +
1.1325 compiler.misc.bad.const.pool.tag.at=\
1.1326 bad constant pool tag: {0} at {1}
1.1327 +
1.1328 compiler.misc.bad.signature=\
1.1329 bad signature: {0}
1.1330 +
1.1331 compiler.misc.class.file.wrong.class=\
1.1332 class file contains wrong class: {0}
1.1333 +
1.1334 compiler.misc.class.file.not.found=\
1.1335 class file for {0} not found
1.1336 +
1.1337 +# 0: name
1.1338 compiler.misc.file.doesnt.contain.class=\
1.1339 file does not contain class {0}
1.1340 +
1.1341 compiler.misc.file.does.not.contain.package=\
1.1342 file does not contain package {0}
1.1343 +
1.1344 compiler.misc.illegal.start.of.class.file=\
1.1345 illegal start of class file
1.1346 +
1.1347 compiler.misc.unable.to.access.file=\
1.1348 unable to access file: {0}
1.1349 +
1.1350 compiler.misc.unicode.str.not.supported=\
1.1351 unicode string in class file not supported
1.1352 +
1.1353 compiler.misc.undecl.type.var=\
1.1354 undeclared type variable: {0}
1.1355 +
1.1356 compiler.misc.wrong.version=\
1.1357 class file has wrong version {0}.{1}, should be {2}.{3}
1.1358
1.1359 #####
1.1360
1.1361 +# 0: type, 1: type or symbol
1.1362 compiler.err.not.within.bounds=\
1.1363 type argument {0} is not within bounds of type-variable {1}
1.1364
1.1365 @@ -1010,32 +1445,41 @@
1.1366
1.1367 #####
1.1368
1.1369 +# 0: message segment, 1: type, 2: type
1.1370 compiler.err.prob.found.req=\
1.1371 -{0}\n\
1.1372 -required: {2}\n\
1.1373 -found: {1}
1.1374 + {0}\n\
1.1375 + required: {2}\n\
1.1376 + found: {1}
1.1377 +
1.1378 +# 0: message segment, 1: type, 2: type
1.1379 compiler.warn.prob.found.req=\
1.1380 -{0}\n\
1.1381 -required: {2}\n\
1.1382 -found: {1}
1.1383 + {0}\n\
1.1384 + required: {2}\n\
1.1385 + found: {1}
1.1386 +
1.1387 compiler.err.prob.found.req.1=\
1.1388 -{0} {3}\n\
1.1389 -required: {2}\n\
1.1390 -found: {1}
1.1391 + {0} {3}\n\
1.1392 + required: {2}\n\
1.1393 + found: {1}
1.1394
1.1395 ## The following are all possible strings for the first argument ({0}) of the
1.1396 ## above strings.
1.1397 compiler.misc.incompatible.types=\
1.1398 incompatible types
1.1399 +
1.1400 +# 0: message segment
1.1401 compiler.misc.incompatible.types.1=\
1.1402 incompatible types; {0}
1.1403 +
1.1404 compiler.misc.inconvertible.types=\
1.1405 inconvertible types
1.1406 +
1.1407 compiler.misc.possible.loss.of.precision=\
1.1408 possible loss of precision
1.1409
1.1410 compiler.misc.unchecked.assign=\
1.1411 unchecked conversion
1.1412 +
1.1413 # compiler.misc.storecheck=\
1.1414 # assignment might cause later store checks to fail
1.1415 # compiler.misc.unchecked=\
1.1416 @@ -1045,8 +1489,10 @@
1.1417
1.1418 compiler.misc.assignment.from.super-bound=\
1.1419 assignment from super-bound type {0}
1.1420 +
1.1421 compiler.misc.assignment.to.extends-bound=\
1.1422 assignment to extends-bound type {0}
1.1423 +
1.1424 # compiler.err.star.expected=\
1.1425 # ''*'' expected
1.1426 # compiler.err.no.elem.type=\
1.1427 @@ -1057,23 +1503,30 @@
1.1428
1.1429 #####
1.1430
1.1431 +# 0: message segment or type, 1: message segment
1.1432 compiler.err.type.found.req=\
1.1433 -unexpected type\n\
1.1434 -required: {1}\n\
1.1435 -found: {0}
1.1436 + unexpected type\n\
1.1437 + required: {1}\n\
1.1438 + found: {0}
1.1439
1.1440 ## The following are all possible strings for the first argument ({0}) of the
1.1441 ## above string.
1.1442 compiler.misc.type.req.class=\
1.1443 class
1.1444 +
1.1445 compiler.misc.type.req.class.array=\
1.1446 class or array
1.1447 +
1.1448 compiler.misc.type.req.array.or.iterable=\
1.1449 array or java.lang.Iterable
1.1450 +
1.1451 compiler.misc.type.req.ref=\
1.1452 reference
1.1453 +
1.1454 compiler.misc.type.req.exact=\
1.1455 class or interface without bounds
1.1456 +
1.1457 +# 0: type
1.1458 compiler.misc.type.parameter=\
1.1459 type parameter {0}
1.1460
1.1461 @@ -1083,87 +1536,119 @@
1.1462 ## diagnostics whose key ends in ".1"
1.1463 compiler.misc.undetermined.type=\
1.1464 undetermined type
1.1465 +
1.1466 compiler.misc.type.variable.has.undetermined.type=\
1.1467 type variable {0} has undetermined type
1.1468 +
1.1469 +# 0: type, 1: list of type
1.1470 compiler.misc.no.unique.maximal.instance.exists=\
1.1471 no unique maximal instance exists for type variable {0} with upper bounds {1}
1.1472 +
1.1473 compiler.misc.no.unique.minimal.instance.exists=\
1.1474 no unique minimal instance exists for type variable {0} with lower bounds {1}
1.1475 +
1.1476 +# 0: list of type, 1: type, 2: type
1.1477 compiler.misc.infer.no.conforming.instance.exists=\
1.1478 no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
1.1479 +
1.1480 +# 0: list of type, 1: type, 2: type
1.1481 compiler.misc.infer.no.conforming.assignment.exists=\
1.1482 no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
1.1483 +
1.1484 compiler.misc.infer.arg.length.mismatch=\
1.1485 cannot instantiate from arguments because actual and formal argument lists differ in length
1.1486 +
1.1487 +# 0: type, 1: list of type
1.1488 compiler.misc.inferred.do.not.conform.to.bounds=\
1.1489 inferred type does not conform to declared bound(s)\n\
1.1490 inferred: {0}\n\
1.1491 bound(s): {1}
1.1492 +
1.1493 compiler.misc.inferred.do.not.conform.to.params=\
1.1494 actual arguments do not conform to inferred formal arguments\n\
1.1495 required: {0}\n\
1.1496 found: {1}
1.1497 +
1.1498 +# 0: symbol
1.1499 compiler.misc.diamond=\
1.1500 {0}<>
1.1501 +
1.1502 +# 0: list of type, 1: message segment
1.1503 compiler.misc.diamond.invalid.arg=\
1.1504 type argument {0} inferred for {1} is not allowed in this context
1.1505 +
1.1506 +# 0: list of type, 1: message segment
1.1507 compiler.misc.diamond.invalid.args=\
1.1508 type arguments {0} inferred for {1} are not allowed in this context
1.1509
1.1510 +# 0: type, 1: list of type
1.1511 compiler.misc.explicit.param.do.not.conform.to.bounds=\
1.1512 explicit type argument {0} does not conform to declared bound(s) {1}
1.1513
1.1514 compiler.misc.arg.length.mismatch=\
1.1515 actual and formal argument lists differ in length
1.1516 +
1.1517 +# 0: type, 1: type
1.1518 compiler.misc.no.conforming.assignment.exists=\
1.1519 actual argument {0} cannot be converted to {1} by method invocation conversion
1.1520 +
1.1521 +# 0: type, 1: type
1.1522 compiler.misc.varargs.argument.mismatch=\
1.1523 argument type {0} does not conform to vararg element type {1}
1.1524 +
1.1525 #####
1.1526
1.1527 ## The first argument ({0}) is a "kindname".
1.1528 +# 0: symbol kind, 1: symbol, 2: symbol
1.1529 compiler.err.abstract.cant.be.accessed.directly=\
1.1530 abstract {0} {1} in {2} cannot be accessed directly
1.1531
1.1532 ## The first argument ({0}) is a "kindname".
1.1533 +# 0: symbol kind, 1: symbol
1.1534 compiler.err.non-static.cant.be.ref=\
1.1535 non-static {0} {1} cannot be referenced from a static context
1.1536
1.1537 ## Both arguments ({0}, {1}) are "kindname"s. {0} is a comma-separated list
1.1538 ## of kindnames (the list should be identical to that provided in source.
1.1539 compiler.err.unexpected.type=\
1.1540 -unexpected type\n\
1.1541 -required: {0}\n\
1.1542 -found: {1}
1.1543 + unexpected type\n\
1.1544 + required: {0}\n\
1.1545 + found: {1}
1.1546
1.1547 ## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
1.1548 ## The second argument {1} is the non-resolved symbol
1.1549 ## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
1.1550 ## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
1.1551 +# 0: symbol kind, 1: name, 2: unused, 3: unused
1.1552 compiler.err.cant.resolve=\
1.1553 cannot find symbol\n\
1.1554 symbol: {0} {1}
1.1555
1.1556 +# 0: symbol kind, 1: name, 2: unused, 3: list of type
1.1557 compiler.err.cant.resolve.args=\
1.1558 cannot find symbol\n\
1.1559 symbol: {0} {1}({3})
1.1560
1.1561 +# 0: symbol kind, 1: name, 2: list of type, 3: list of type
1.1562 compiler.err.cant.resolve.args.params=\
1.1563 cannot find symbol\n\
1.1564 symbol: {0} <{2}>{1}({3})
1.1565
1.1566 ## arguments from {0} to {3} have the same meaning as above
1.1567 ## The fifth argument {4} is a location subdiagnostic (see below)
1.1568 +# 0: symbol kind, 1: name, 2: unused, 3: unused, 4: message segment
1.1569 compiler.err.cant.resolve.location=\
1.1570 cannot find symbol\n\
1.1571 symbol: {0} {1}\n\
1.1572 location: {4}
1.1573
1.1574 +# 0: symbol kind, 1: name, 2: unused, 3: list of type, 4: message segment
1.1575 compiler.err.cant.resolve.location.args=\
1.1576 cannot find symbol\n\
1.1577 symbol: {0} {1}({3})\n\
1.1578 location: {4}
1.1579
1.1580 +# 0: symbol kind, 1: name, 2: list of type, 3: list, 4: message segment
1.1581 compiler.err.cant.resolve.location.args.params=\
1.1582 cannot find symbol\n\
1.1583 symbol: {0} <{2}>{1}({3})\n\
1.1584 @@ -1174,8 +1659,11 @@
1.1585 ## The second argument {1} is the location name
1.1586 ## The third argument {2} is the location type (only when {1} is a variable name)
1.1587
1.1588 +# 0: symbol kind, 1: symbol, 2: unused
1.1589 compiler.misc.location=\
1.1590 {0} {1}
1.1591 +
1.1592 +# 0: symbol kind, 1: symbol, 2: type
1.1593 compiler.misc.location.1=\
1.1594 {0} {1} of type {2}
1.1595
1.1596 @@ -1186,85 +1674,124 @@
1.1597 # static member
1.1598 compiler.misc.kindname.annotation=\
1.1599 @interface
1.1600 +
1.1601 compiler.misc.kindname.constructor=\
1.1602 constructor
1.1603 +
1.1604 compiler.misc.kindname.enum=\
1.1605 enum
1.1606 +
1.1607 compiler.misc.kindname.interface=\
1.1608 interface
1.1609 +
1.1610 compiler.misc.kindname.static=\
1.1611 static
1.1612 +
1.1613 compiler.misc.kindname.type.variable=\
1.1614 type variable
1.1615 +
1.1616 compiler.misc.kindname.type.variable.bound=\
1.1617 bound of type variable
1.1618 +
1.1619 compiler.misc.kindname.variable=\
1.1620 variable
1.1621 +
1.1622 compiler.misc.kindname.value=\
1.1623 value
1.1624 +
1.1625 compiler.misc.kindname.method=\
1.1626 method
1.1627 +
1.1628 compiler.misc.kindname.class=\
1.1629 class
1.1630 +
1.1631 compiler.misc.kindname.package=\
1.1632 package
1.1633 +
1.1634 #####
1.1635
1.1636 compiler.misc.no.args=\
1.1637 no arguments
1.1638
1.1639 +# 0: message segment
1.1640 compiler.err.override.static=\
1.1641 {0}\n\
1.1642 overriding method is static
1.1643 +
1.1644 +# 0: message segment, 1: set of modifier
1.1645 compiler.err.override.meth=\
1.1646 {0}\n\
1.1647 overridden method is {1}
1.1648
1.1649 +# 0: message segment, 1: type
1.1650 compiler.err.override.meth.doesnt.throw=\
1.1651 {0}\n\
1.1652 overridden method does not throw {1}
1.1653
1.1654 # In the following string {1} is a space separated list of Java Keywords, as
1.1655 # they would have been declared in the source code
1.1656 +# 0: message segment, 1: set of modifier
1.1657 compiler.err.override.weaker.access=\
1.1658 {0}\n\
1.1659 attempting to assign weaker access privileges; was {1}
1.1660
1.1661 +# 0: message segment, 1: type, 2: type
1.1662 compiler.err.override.incompatible.ret=\
1.1663 {0}\n\
1.1664 return type {1} is not compatible with {2}
1.1665
1.1666 +# 0: message segment, 1: type, 2: type
1.1667 compiler.warn.override.unchecked.ret=\
1.1668 {0}\n\
1.1669 return type requires unchecked conversion from {1} to {2}
1.1670
1.1671 +# 0: message segment, 1: type
1.1672 compiler.warn.override.unchecked.thrown=\
1.1673 {0}\n\
1.1674 overridden method does not throw {1}
1.1675
1.1676 ## The following are all possible strings for the first argument ({0}) of the
1.1677 ## above strings.
1.1678 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1679 compiler.misc.cant.override=\
1.1680 {0} in {1} cannot override {2} in {3}
1.1681 +
1.1682 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1683 compiler.misc.cant.implement=\
1.1684 {0} in {1} cannot implement {2} in {3}
1.1685 +
1.1686 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1687 compiler.misc.clashes.with=\
1.1688 {0} in {1} clashes with {2} in {3}
1.1689 +
1.1690 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1691 compiler.misc.unchecked.override=\
1.1692 {0} in {1} overrides {2} in {3}
1.1693 +
1.1694 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1695 compiler.misc.unchecked.implement=\
1.1696 {0} in {1} implements {2} in {3}
1.1697 +
1.1698 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1699 compiler.misc.unchecked.clash.with=\
1.1700 {0} in {1} overrides {2} in {3}
1.1701 +
1.1702 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1703 compiler.misc.varargs.override=\
1.1704 {0} in {1} overrides {2} in {3}
1.1705 +
1.1706 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1707 compiler.misc.varargs.implement=\
1.1708 {0} in {1} implements {2} in {3}
1.1709 +
1.1710 +# 0: symbol, 1: symbol, 2: symbol, 3: symbol
1.1711 compiler.misc.varargs.clash.with=\
1.1712 {0} in {1} overrides {2} in {3}
1.1713 +
1.1714 compiler.misc.non.denotable.type=\
1.1715 Non-denotable type {0} not allowed here
1.1716
1.1717 +# 0: symbol kind, 1: symbol, 2: symbol, 3: message segment
1.1718 compiler.misc.inapplicable.method=\
1.1719 {0} {1}.{2} is not applicable\n\
1.1720 ({3})
1.1721 @@ -1272,77 +1799,90 @@
1.1722 ########################################
1.1723 # Diagnostics for language feature changes
1.1724 ########################################
1.1725 +# 0: string
1.1726 compiler.err.unsupported.fp.lit=\
1.1727 hexadecimal floating point literals are not supported in -source {0}\n\
1.1728 -(use -source 5 or higher to enable hexadecimal floating point literals)
1.1729 + (use -source 5 or higher to enable hexadecimal floating point literals)
1.1730
1.1731 +# 0: string
1.1732 compiler.err.unsupported.binary.lit=\
1.1733 binary literals are not supported in -source {0}\n\
1.1734 -(use -source 7 or higher to enable binary literals)
1.1735 + (use -source 7 or higher to enable binary literals)
1.1736
1.1737 +# 0: string
1.1738 compiler.err.unsupported.underscore.lit=\
1.1739 underscores in literals are not supported in -source {0}\n\
1.1740 -(use -source 7 or higher to enable underscores in literals)
1.1741 + (use -source 7 or higher to enable underscores in literals)
1.1742
1.1743 +# 0: string
1.1744 compiler.err.try.with.resources.not.supported.in.source=\
1.1745 try-with-resources is not supported in -source {0}\n\
1.1746 -(use -source 7 or higher to enable try-with-resources)
1.1747 + (use -source 7 or higher to enable try-with-resources)
1.1748
1.1749 compiler.warn.enum.as.identifier=\
1.1750 as of release 5, ''enum'' is a keyword, and may not be used as an identifier\n\
1.1751 -(use -source 5 or higher to use ''enum'' as a keyword)
1.1752 + (use -source 5 or higher to use ''enum'' as a keyword)
1.1753
1.1754 compiler.warn.assert.as.identifier=\
1.1755 as of release 1.4, ''assert'' is a keyword, and may not be used as an identifier\n\
1.1756 -(use -source 1.4 or higher to use ''assert'' as a keyword)
1.1757 + (use -source 1.4 or higher to use ''assert'' as a keyword)
1.1758
1.1759 compiler.err.enum.as.identifier=\
1.1760 as of release 5, ''enum'' is a keyword, and may not be used as an identifier\n\
1.1761 -(use -source 1.4 or lower to use ''enum'' as an identifier)
1.1762 + (use -source 1.4 or lower to use ''enum'' as an identifier)
1.1763
1.1764 compiler.err.assert.as.identifier=\
1.1765 as of release 1.4, ''assert'' is a keyword, and may not be used as an identifier\n\
1.1766 -(use -source 1.3 or lower to use ''assert'' as an identifier)
1.1767 + (use -source 1.3 or lower to use ''assert'' as an identifier)
1.1768
1.1769 +# 0: string
1.1770 compiler.err.generics.not.supported.in.source=\
1.1771 generics are not supported in -source {0}\n\
1.1772 -(use -source 5 or higher to enable generics)
1.1773 + (use -source 5 or higher to enable generics)
1.1774
1.1775 +# 0: string
1.1776 compiler.err.varargs.not.supported.in.source=\
1.1777 variable-arity methods are not supported in -source {0}\n\
1.1778 -(use -source 5 or higher to enable variable-arity methods)
1.1779 + (use -source 5 or higher to enable variable-arity methods)
1.1780
1.1781 +# 0: string
1.1782 compiler.err.annotations.not.supported.in.source=\
1.1783 annotations are not supported in -source {0}\n\
1.1784 -(use -source 5 or higher to enable annotations)
1.1785 + (use -source 5 or higher to enable annotations)
1.1786
1.1787 #308 compiler.err.type.annotations.not.supported.in.source=\
1.1788 #308 type annotations are not supported in -source {0}\n\
1.1789 #308 (use -source 7 or higher to enable type annotations)
1.1790
1.1791 +# 0: string
1.1792 compiler.err.foreach.not.supported.in.source=\
1.1793 for-each loops are not supported in -source {0}\n\
1.1794 -(use -source 5 or higher to enable for-each loops)
1.1795 + (use -source 5 or higher to enable for-each loops)
1.1796
1.1797 +# 0: string
1.1798 compiler.err.static.import.not.supported.in.source=\
1.1799 static import declarations are not supported in -source {0}\n\
1.1800 -(use -source 5 or higher to enable static import declarations)
1.1801 + (use -source 5 or higher to enable static import declarations)
1.1802
1.1803 +# 0: string
1.1804 compiler.err.enums.not.supported.in.source=\
1.1805 enums are not supported in -source {0}\n\
1.1806 -(use -source 5 or higher to enable enums)
1.1807 + (use -source 5 or higher to enable enums)
1.1808
1.1809 +# 0: string
1.1810 compiler.err.diamond.not.supported.in.source=\
1.1811 diamond operator is not supported in -source {0}\n\
1.1812 -(use -source 7 or higher to enable diamond operator)
1.1813 + (use -source 7 or higher to enable diamond operator)
1.1814
1.1815 +# 0: string
1.1816 compiler.err.multicatch.not.supported.in.source=\
1.1817 multi-catch statement is not supported in -source {0}\n\
1.1818 -(use -source 7 or higher to enable multi-catch statement)
1.1819 + (use -source 7 or higher to enable multi-catch statement)
1.1820
1.1821 +# 0: string
1.1822 compiler.err.string.switch.not.supported.in.source=\
1.1823 strings in switch are not supported in -source {0}\n\
1.1824 -(use -source 7 or higher to enable strings in switch)
1.1825 + (use -source 7 or higher to enable strings in switch)
1.1826
1.1827 ########################################
1.1828 # Diagnostics for where clause implementation
1.1829 @@ -1353,29 +1893,35 @@
1.1830 <null>
1.1831
1.1832 # X#n (where n is an int id) is disambiguated tvar name
1.1833 +# 0: name, 1: number
1.1834 compiler.misc.type.var=\
1.1835 {0}#{1}
1.1836
1.1837 # CAP#n (where n is an int id) is an abbreviation for 'captured type'
1.1838 +# 0: number
1.1839 compiler.misc.captured.type=\
1.1840 CAP#{0}
1.1841
1.1842 # <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
1.1843 +# 0: number
1.1844 compiler.misc.intersection.type=\
1.1845 INT#{0}
1.1846
1.1847 # where clause for captured type: contains upper ('extends {1}') and lower
1.1848 # ('super {2}') bound along with the wildcard that generated this captured type ({3})
1.1849 +# 0: type, 1: type, 2: type, 3: type
1.1850 compiler.misc.where.captured=\
1.1851 {0} extends {1} super: {2} from capture of {3}
1.1852
1.1853 # compact where clause for captured type: contains upper ('extends {1}') along
1.1854 # with the wildcard that generated this captured type ({3})
1.1855 +# 0: type, 1: type, 2: unused, 3: type
1.1856 compiler.misc.where.captured.1=\
1.1857 {0} extends {1} from capture of {3}
1.1858
1.1859 # where clause for type variable: contains upper bound(s) ('extends {1}') along with
1.1860 # the kindname ({2}) and location ({3}) in which the typevar has been declared
1.1861 +# 0: type, 1: list of type, 2: symbol kind, 3: symbol
1.1862 compiler.misc.where.typevar=\
1.1863 {0} extends {1} declared in {2} {3}
1.1864
1.1865 @@ -1386,20 +1932,30 @@
1.1866
1.1867 # where clause for type variable: contains all the upper bound(s) ('extends {1}')
1.1868 # of this intersection type
1.1869 +# 0: type, 1: list of type
1.1870 compiler.misc.where.intersection=\
1.1871 {0} extends {1}
1.1872
1.1873 ### Where clause headers ###
1.1874 compiler.misc.where.description.captured=\
1.1875 where {0} is a fresh type-variable:
1.1876 +
1.1877 +# 0: set of type
1.1878 compiler.misc.where.description.typevar=\
1.1879 where {0} is a type-variable:
1.1880 +
1.1881 +# 0: set of type
1.1882 compiler.misc.where.description.intersection=\
1.1883 where {0} is an intersection type:
1.1884 +
1.1885 +# 0: set of type
1.1886 compiler.misc.where.description.captured.1=\
1.1887 where {0} are fresh type-variables:
1.1888 +
1.1889 +# 0: set of type
1.1890 compiler.misc.where.description.typevar.1=\
1.1891 where {0} are type-variables:
1.1892 +
1.1893 compiler.misc.where.description.intersection.1=\
1.1894 where {0} are intersection types:
1.1895
