From 0883b186ee2b8653b81f31671d6e0ef901173f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Mart=C3=ADn=20Sotuyo=20Dodero?= Date: Thu, 26 Jan 2023 19:36:37 -0300 Subject: [PATCH] Update token id - The grammar now produces IDENTIFIER as token 74, and TEXT_BLOCK as 72 --- .../ignoreIdentsPreservesClassLiteral.txt | 10 ++-- .../testdata/ignoreIdentsPreservesCtor.txt | 46 +++++++++---------- .../testdata/ignoreIdentsPreservesEnum.txt | 10 ++-- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesClassLiteral.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesClassLiteral.txt index ed8010193b..48b3ec5348 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesClassLiteral.txt +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesClassLiteral.txt @@ -2,7 +2,7 @@ L2 [public] 1 6 [class] 8 12 - [72] 14 16 + [74] 14 16 [{] 18 18 L3 [Foo] 5 7 @@ -14,16 +14,16 @@ L4 L5 [public] 5 10 [void] 12 15 - [72] 17 19 + [74] 17 19 [(] 20 20 [)] 21 21 [{] 23 23 L6 - [72] 9 11 + [74] 9 11 [.] 12 12 - [72] 13 15 + [74] 13 15 [(] 16 16 - [72] 17 19 + [74] 17 19 [.] 20 20 [class] 21 25 [Foo] 26 26 diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesCtor.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesCtor.txt index 4787505f6e..b0863579a6 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesCtor.txt +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesCtor.txt @@ -2,25 +2,25 @@ L2 [public] 1 6 [class] 8 12 - [72] 14 16 + [74] 14 16 [extends] 18 24 - [72] 26 28 + [74] 26 28 [{] 30 30 L4 [private] 5 11 - [72] 13 15 - [72] 17 31 + [74] 13 15 + [74] 17 31 L6 [public] 5 10 [Foo] 12 14 [(] 15 15 [int] 16 18 - [72] 20 20 + [74] 20 20 [)] 21 21 [{] 23 23 [super] 25 29 [(] 30 30 - [72] 31 31 + [74] 31 31 [)] 32 32 [}] 35 35 L8 @@ -28,57 +28,57 @@ L8 [Foo] 13 15 [(] 16 16 [int] 17 19 - [72] 21 21 + [74] 21 21 [,] 22 22 - [72] 24 29 - [72] 31 31 + [74] 24 29 + [74] 31 31 [)] 32 32 [{] 34 34 [super] 36 40 [(] 41 41 - [72] 42 42 + [74] 42 42 [,] 43 43 - [72] 45 45 + [74] 45 45 [)] 46 46 [}] 49 49 L10 [Foo] 19 21 [(] 22 22 [int] 23 25 - [72] 27 27 + [74] 27 27 [,] 28 28 - [72] 30 35 - [72] 37 37 + [74] 30 35 + [74] 37 37 [,] 38 38 - [72] 40 45 - [72] 47 47 + [74] 40 45 + [74] 47 47 [)] 48 48 [{] 50 50 [super] 52 56 [(] 57 57 - [72] 58 58 + [74] 58 58 [,] 59 59 - [72] 61 61 + [74] 61 61 [,] 62 62 - [72] 64 64 + [74] 64 64 [)] 65 65 [}] 68 68 L12 [private] 5 11 [static] 13 18 [class] 20 24 - [72] 26 30 + [74] 26 30 [{] 32 32 L14 [Inner] 9 13 [(] 14 14 [)] 15 15 [{] 17 17 - [72] 19 24 + [74] 19 24 [.] 25 25 - [72] 26 28 + [74] 26 28 [.] 29 29 - [72] 30 36 + [74] 30 36 [(] 37 37 ["Guess who?"] 38 49 [)] 50 50 diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesEnum.txt b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesEnum.txt index 43b287f1e0..518bf773f1 100644 --- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesEnum.txt +++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/cpd/testdata/ignoreIdentsPreservesEnum.txt @@ -1,17 +1,17 @@ [Image] or [Truncated image[ Bcol Ecol L2 [public] 1 6 - [72] 8 11 - [72] 13 15 + [74] 8 11 + [74] 13 15 [{] 17 17 L3 - [72] 5 7 + [74] 5 7 [(] 8 8 [1] 9 9 [)] 10 10 [,] 11 11 L4 - [72] 5 7 + [74] 5 7 [(] 8 8 [2] 9 9 [)] 10 10 @@ -19,7 +19,7 @@ L6 [Foo] 5 7 [(] 8 8 [int] 9 11 - [72] 13 15 + [74] 13 15 [)] 16 16 [{] 18 18 L7