changeset 51546:df740011e563 switch

Adjusting output files.
author jlahoda
date Wed, 11 Jul 2018 11:04:50 +0200
parents a1b07c20ad81
children 39fb108ceec8
files test/langtools/tools/javac/switchexpr/BooleanNumericNonNumeric.out test/langtools/tools/javac/switchexpr/ExpressionSwitch-old.out test/langtools/tools/javac/switchexpr/ExpressionSwitchBreaks2.out test/langtools/tools/javac/switchexpr/ExpressionSwitchInfer.out test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.out test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.out test/langtools/tools/javac/switchexpr/ParserRecovery.out test/langtools/tools/javac/switchextra/MultipleLabelsExpression-old.out test/langtools/tools/javac/switchextra/MultipleLabelsStatement-old.out test/langtools/tools/javac/switchextra/SwitchNoExtraTypes.out test/langtools/tools/javac/switchextra/SwitchObject.out test/langtools/tools/javac/switchextra/SwitchStatementArrow-old.out test/langtools/tools/javac/switchextra/SwitchStatementBroken.out test/langtools/tools/javac/switchextra/SwitchStatementBroken2.out test/langtools/tools/javac/switchnull/SwitchNullDisabled.out
diffstat 15 files changed, 44 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/test/langtools/tools/javac/switchexpr/BooleanNumericNonNumeric.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/BooleanNumericNonNumeric.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,5 +1,5 @@
-BooleanNumericNonNumeric.java:9:20: compiler.err.operator.cant.be.applied.1: +, int, boolean
-BooleanNumericNonNumeric.java:17:15: compiler.err.cant.deref: int
+BooleanNumericNonNumeric.java:10:20: compiler.err.operator.cant.be.applied.1: +, int, boolean
+BooleanNumericNonNumeric.java:18:15: compiler.err.cant.deref: int
 - compiler.note.preview.filename: BooleanNumericNonNumeric.java
 - compiler.note.preview.recompile
 2 errors
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitch-old.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitch-old.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,3 +1,3 @@
-ExpressionSwitch.java:23:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.expressions)
-ExpressionSwitch.java:24:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
+ExpressionSwitch.java:24:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.expressions)
+ExpressionSwitch.java:25:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
 2 errors
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchBreaks2.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchBreaks2.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,15 +1,15 @@
-ExpressionSwitchBreaks2.java:15:25: compiler.err.break.missing.value
-ExpressionSwitchBreaks2.java:17:25: compiler.err.break.outside.switch.expression
-ExpressionSwitchBreaks2.java:21:37: compiler.warn.break.ambiguous.target: x
-ExpressionSwitchBreaks2.java:25:29: compiler.err.return.outside.switch.expression
-ExpressionSwitchBreaks2.java:26:29: compiler.err.continue.outside.switch.expression
+ExpressionSwitchBreaks2.java:16:25: compiler.err.break.missing.value
+ExpressionSwitchBreaks2.java:18:25: compiler.err.break.outside.switch.expression
+ExpressionSwitchBreaks2.java:22:37: compiler.warn.break.ambiguous.target: x
+ExpressionSwitchBreaks2.java:26:29: compiler.err.return.outside.switch.expression
 ExpressionSwitchBreaks2.java:27:29: compiler.err.continue.outside.switch.expression
-ExpressionSwitchBreaks2.java:28:29: compiler.err.undef.label: UNKNOWN
-ExpressionSwitchBreaks2.java:32:37: compiler.err.break.expr.not.immediate
-ExpressionSwitchBreaks2.java:38:17: compiler.err.break.complex.value.no.switch.expression
-ExpressionSwitchBreaks2.java:38:29: compiler.err.cant.resolve.location: kindname.variable, undef, , , (compiler.misc.location: kindname.class, ExpressionSwitchBreaks2, null)
-ExpressionSwitchBreaks2.java:42:22: compiler.warn.break.ambiguous.target: j
-ExpressionSwitchBreaks2.java:45:22: compiler.err.break.outside.switch.expression
+ExpressionSwitchBreaks2.java:28:29: compiler.err.continue.outside.switch.expression
+ExpressionSwitchBreaks2.java:29:29: compiler.err.undef.label: UNKNOWN
+ExpressionSwitchBreaks2.java:33:37: compiler.err.break.expr.not.immediate
+ExpressionSwitchBreaks2.java:39:17: compiler.err.break.complex.value.no.switch.expression
+ExpressionSwitchBreaks2.java:39:29: compiler.err.cant.resolve.location: kindname.variable, undef, , , (compiler.misc.location: kindname.class, ExpressionSwitchBreaks2, null)
+ExpressionSwitchBreaks2.java:43:22: compiler.warn.break.ambiguous.target: j
+ExpressionSwitchBreaks2.java:46:22: compiler.err.break.outside.switch.expression
 - compiler.note.preview.filename: ExpressionSwitchBreaks2.java
 - compiler.note.preview.recompile
 10 errors
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchInfer.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchInfer.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,6 +1,6 @@
-ExpressionSwitchInfer.java:16:95: compiler.err.cant.resolve.location.args: kindname.method, substring, , int, (compiler.misc.location: kindname.interface, java.lang.CharSequence, null)
-ExpressionSwitchInfer.java:25:38: compiler.err.cant.resolve.location.args: kindname.method, substring, , int, (compiler.misc.location: kindname.interface, java.lang.CharSequence, null)
-ExpressionSwitchInfer.java:29:23: compiler.err.prob.found.req: (compiler.misc.incompatible.type.in.switch.expression: (compiler.misc.inconvertible.types: int, java.lang.String))
+ExpressionSwitchInfer.java:17:95: compiler.err.cant.resolve.location.args: kindname.method, substring, , int, (compiler.misc.location: kindname.interface, java.lang.CharSequence, null)
+ExpressionSwitchInfer.java:26:38: compiler.err.cant.resolve.location.args: kindname.method, substring, , int, (compiler.misc.location: kindname.interface, java.lang.CharSequence, null)
+ExpressionSwitchInfer.java:30:23: compiler.err.prob.found.req: (compiler.misc.incompatible.type.in.switch.expression: (compiler.misc.inconvertible.types: int, java.lang.String))
 - compiler.note.preview.filename: ExpressionSwitchInfer.java
 - compiler.note.preview.recompile
 3 errors
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchNotExhaustive.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,6 +1,6 @@
-ExpressionSwitchNotExhaustive.java:8:16: compiler.err.not.exhaustive
-ExpressionSwitchNotExhaustive.java:14:16: compiler.err.not.exhaustive
-ExpressionSwitchNotExhaustive.java:27:23: compiler.err.var.might.not.have.been.initialized: s
+ExpressionSwitchNotExhaustive.java:9:16: compiler.err.not.exhaustive
+ExpressionSwitchNotExhaustive.java:15:16: compiler.err.not.exhaustive
+ExpressionSwitchNotExhaustive.java:28:23: compiler.err.var.might.not.have.been.initialized: s
 - compiler.note.preview.filename: ExpressionSwitchNotExhaustive.java
 - compiler.note.preview.recompile
 3 errors
--- a/test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/ExpressionSwitchUnreachable.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,9 +1,9 @@
-ExpressionSwitchUnreachable.java:13:17: compiler.err.unreachable.stmt
-ExpressionSwitchUnreachable.java:20:17: compiler.err.unreachable.stmt
-ExpressionSwitchUnreachable.java:28:17: compiler.err.unreachable.stmt
-ExpressionSwitchUnreachable.java:35:17: compiler.err.unreachable.stmt
-ExpressionSwitchUnreachable.java:43:17: compiler.err.unreachable.stmt
-ExpressionSwitchUnreachable.java:50:17: compiler.err.unreachable.stmt
+ExpressionSwitchUnreachable.java:14:17: compiler.err.unreachable.stmt
+ExpressionSwitchUnreachable.java:21:17: compiler.err.unreachable.stmt
+ExpressionSwitchUnreachable.java:29:17: compiler.err.unreachable.stmt
+ExpressionSwitchUnreachable.java:36:17: compiler.err.unreachable.stmt
+ExpressionSwitchUnreachable.java:44:17: compiler.err.unreachable.stmt
+ExpressionSwitchUnreachable.java:51:17: compiler.err.unreachable.stmt
 - compiler.note.preview.filename: ExpressionSwitchUnreachable.java
 - compiler.note.preview.recompile
 6 errors
\ No newline at end of file
--- a/test/langtools/tools/javac/switchexpr/ParserRecovery.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchexpr/ParserRecovery.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,5 +1,5 @@
-ParserRecovery.java:8:39: compiler.err.expected: :
-ParserRecovery.java:11:31: compiler.err.expected: :
+ParserRecovery.java:9:39: compiler.err.expected: :
+ParserRecovery.java:12:31: compiler.err.expected: :
 - compiler.note.preview.filename: ParserRecovery.java
 - compiler.note.preview.recompile
 2 errors
--- a/test/langtools/tools/javac/switchextra/MultipleLabelsExpression-old.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/MultipleLabelsExpression-old.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,4 +1,4 @@
-MultipleLabelsExpression.java:29:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.expressions)
-MultipleLabelsExpression.java:30:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
-MultipleLabelsExpression.java:31:19: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
+MultipleLabelsExpression.java:30:16: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.expressions)
+MultipleLabelsExpression.java:31:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
+MultipleLabelsExpression.java:32:19: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
 3 errors
--- a/test/langtools/tools/javac/switchextra/MultipleLabelsStatement-old.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/MultipleLabelsStatement-old.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,2 +1,2 @@
-MultipleLabelsStatement.java:33:21: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
+MultipleLabelsStatement.java:34:21: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
 1 error
--- a/test/langtools/tools/javac/switchextra/SwitchNoExtraTypes.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/SwitchNoExtraTypes.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,5 +1,5 @@
-SwitchNoExtraTypes.java:9:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: boolean, int)
-SwitchNoExtraTypes.java:15:16: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: long, int)
-SwitchNoExtraTypes.java:21:16: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: float, int)
-SwitchNoExtraTypes.java:27:16: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: double, int)
+SwitchNoExtraTypes.java:10:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: boolean, int)
+SwitchNoExtraTypes.java:16:16: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: long, int)
+SwitchNoExtraTypes.java:22:16: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: float, int)
+SwitchNoExtraTypes.java:28:16: compiler.err.prob.found.req: (compiler.misc.possible.loss.of.precision: double, int)
 4 errors
--- a/test/langtools/tools/javac/switchextra/SwitchObject.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/SwitchObject.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,2 +1,2 @@
-SwitchObject.java:8:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, int)
+SwitchObject.java:9:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.Object, int)
 1 error
--- a/test/langtools/tools/javac/switchextra/SwitchStatementArrow-old.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/SwitchStatementArrow-old.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,3 +1,3 @@
-SwitchStatementArrow.java:38:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
-SwitchStatementArrow.java:39:21: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
+SwitchStatementArrow.java:39:20: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.switch.rules)
+SwitchStatementArrow.java:40:21: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.multiple.case.labels)
 2 errors
--- a/test/langtools/tools/javac/switchextra/SwitchStatementBroken.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/SwitchStatementBroken.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,4 +1,4 @@
-SwitchStatementBroken.java:13:13: compiler.err.switch.mixing.case.types
+SwitchStatementBroken.java:14:13: compiler.err.switch.mixing.case.types
 - compiler.note.preview.filename: SwitchStatementBroken.java
 - compiler.note.preview.recompile
 1 error
--- a/test/langtools/tools/javac/switchextra/SwitchStatementBroken2.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchextra/SwitchStatementBroken2.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,7 +1,7 @@
-SwitchStatementBroken2.java:15:23: compiler.err.switch.case.unexpected.statement
 SwitchStatementBroken2.java:16:23: compiler.err.switch.case.unexpected.statement
 SwitchStatementBroken2.java:17:23: compiler.err.switch.case.unexpected.statement
-SwitchStatementBroken2.java:20:24: compiler.err.switch.case.unexpected.statement
+SwitchStatementBroken2.java:18:23: compiler.err.switch.case.unexpected.statement
+SwitchStatementBroken2.java:21:24: compiler.err.switch.case.unexpected.statement
 - compiler.note.preview.filename: SwitchStatementBroken2.java
 - compiler.note.preview.recompile
 4 errors
--- a/test/langtools/tools/javac/switchnull/SwitchNullDisabled.out	Tue Jul 10 17:14:40 2018 +0200
+++ b/test/langtools/tools/javac/switchnull/SwitchNullDisabled.out	Wed Jul 11 11:04:50 2018 +0200
@@ -1,2 +1,2 @@
-SwitchNullDisabled.java:9:18: compiler.err.switch.null.not.allowed
+SwitchNullDisabled.java:10:18: compiler.err.switch.null.not.allowed
 1 error