From 9f346d31aaf5d80e481a3d58404ee5d79fe5d250 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Sun, 11 Jul 2021 09:21:14 -0700 Subject: [PATCH] `override` is a valid identifier in Java, not a keyword --- compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala | 2 +- tests/pos/i13046/A.java | 3 +++ tests/pos/i13046/B.scala | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tests/pos/i13046/A.java create mode 100644 tests/pos/i13046/B.scala diff --git a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala index 79dd549cdf0d..5c333f8646e5 100644 --- a/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala +++ b/compiler/src/dotty/tools/dotc/parsing/JavaTokens.scala @@ -10,7 +10,7 @@ object JavaTokens extends TokensCommon { final val javaOnlyKeywords: TokenSet = tokenRange(INSTANCEOF, ASSERT) final val sharedKeywords: BitSet = BitSet( IF, FOR, ELSE, THIS, NULL, NEW, SUPER, ABSTRACT, FINAL, PRIVATE, PROTECTED, - OVERRIDE, EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN ) + EXTENDS, TRUE, FALSE, CLASS, IMPORT, PACKAGE, DO, THROW, TRY, CATCH, FINALLY, WHILE, RETURN ) final val primTypes: TokenSet = tokenRange(VOID, DOUBLE) final val keywords: BitSet = sharedKeywords | javaOnlyKeywords | primTypes diff --git a/tests/pos/i13046/A.java b/tests/pos/i13046/A.java new file mode 100644 index 000000000000..bed1b0be2576 --- /dev/null +++ b/tests/pos/i13046/A.java @@ -0,0 +1,3 @@ +interface A { + public boolean override(); +} diff --git a/tests/pos/i13046/B.scala b/tests/pos/i13046/B.scala new file mode 100644 index 000000000000..902105e97723 --- /dev/null +++ b/tests/pos/i13046/B.scala @@ -0,0 +1,3 @@ +class B extends A { + override def `override`: Boolean = true +}