Renamed variables

tiobe · Apr 13, 2023 · 3196469 · 3196469
1 parent f0518f1
commit 3196469
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java b/pmd-cpp/src/main/java/net/sourceforge/pmd/cpd/CPPTokenizer.java
@@ -27,7 +27,7 @@ public class CPPTokenizer extends JavaCCTokenizer {
     private boolean skipBlocks = true;
     private String skipBlocksStart;
     private String skipBlocksEnd;
-    private boolean ignoreIdentifiersAndLiteralsInSeqence = false;
+    private boolean ignoreIdentifierAndLiteralSeqences = false;
     private boolean ignoreLiteralSequences = false;
 
     /**
@@ -51,7 +51,7 @@ public void setProperties(Properties properties) {
             }
         }
         ignoreLiteralSequences = Boolean.parseBoolean(properties.getProperty(OPTION_IGNORE_LITERAL_SEQUENCES, Boolean.FALSE.toString()));
-        ignoreIdentifiersAndLiteralsInSeqence = 
+        ignoreIdentifierAndLiteralSeqences = 
             Boolean.parseBoolean(properties.getProperty(OPTION_IGNORE_IDENTIFIER_AND_LITERAL_SEQUENCES, Boolean.FALSE.toString()));
     }
 
@@ -92,18 +92,18 @@ protected TokenManager getLexerForSource(SourceCode sourceCode) {
 
     @Override
     protected TokenFilter getTokenFilter(final TokenManager tokenManager) {
-        return new CppTokenFilter(tokenManager, ignoreLiteralSequences, ignoreIdentifiersAndLiteralsInSeqence);
+        return new CppTokenFilter(tokenManager, ignoreLiteralSequences, ignoreIdentifierAndLiteralSeqences);
     }
 
     private static class CppTokenFilter extends JavaCCTokenFilter {
         private final boolean ignoreLiteralSequences;
-        private final boolean ignoreIdentifiersAndLiteralsInSeqence;
+        private final boolean ignoreIdentifierAndLiteralSeqences;
         private GenericToken discardingTokensUntil = null;
         private boolean discardCurrent = false;
 
-        CppTokenFilter(final TokenManager tokenManager, final boolean ignoreLiteralSequences, final boolean ignoreIdentifiersInSeqence) {
+        CppTokenFilter(final TokenManager tokenManager, final boolean ignoreLiteralSequences, final boolean ignoreIdentifierAndLiteralSeqences) {
             super(tokenManager);
-            this.ignoreIdentifiersAndLiteralsInSeqence = ignoreIdentifiersInSeqence;
+            this.ignoreIdentifierAndLiteralSeqences = ignoreIdentifierAndLiteralSeqences;
             this.ignoreLiteralSequences = ignoreLiteralSequences;
         }
 
@@ -114,21 +114,21 @@ protected void analyzeTokens(final GenericToken currentToken, final Iterable<Gen
         }
 
         private void skipSequences(final GenericToken currentToken, final Iterable<GenericToken> remainingTokens) {
-            if (ignoreLiteralSequences || ignoreIdentifiersAndLiteralsInSeqence) {
+            if (ignoreLiteralSequences || ignoreIdentifierAndLiteralSeqences) {
                 final int kind = currentToken.getKind();
                 if (isDiscardingToken()) {
                     if (currentToken == discardingTokensUntil) { // NOPMD - intentional check for reference equality
                         discardingTokensUntil = null;
                         discardCurrent = true;
                     }
                 } else if (kind == CppParserConstants.LCURLYBRACE) {
-                    final GenericToken finalToken = findEndOfSequenceToDiscard(remainingTokens, ignoreIdentifiersAndLiteralsInSeqence);
+                    final GenericToken finalToken = findEndOfSequenceToDiscard(remainingTokens, ignoreIdentifierAndLiteralSeqences);
                     discardingTokensUntil = finalToken;
                 }
             }
         }
 
-        private static GenericToken findEndOfSequenceToDiscard(final Iterable<GenericToken> remainingTokens, boolean ignoreIdentifiersAndLiteralsInSeqence) {
+        private static GenericToken findEndOfSequenceToDiscard(final Iterable<GenericToken> remainingTokens, boolean ignoreIdentifierAndLiteralSeqences) {
             boolean seenAllowedToken = false;
             int braceCount = 0;
             for (final GenericToken token : remainingTokens) {
@@ -144,7 +144,7 @@ private static GenericToken findEndOfSequenceToDiscard(final Iterable<GenericTok
                     break; // can be skipped; continue to the next token
                 case CppParserConstants.ID:
                     // Ignore identifiers if instructed
-                    if (ignoreIdentifiersAndLiteralsInSeqence) {
+                    if (ignoreIdentifierAndLiteralSeqences) {
                         seenAllowedToken = true;
                         break; // can be skipped; continue to the next token
                     } else {