Lubos had directed to link identifiers of length=1

Missed a few because they were in-flight with
enhancements -- or just plain missed, as with
PlainSymbolTokenizer.

Author: idodeclare

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ada/AdaAnalyzer.java

@@ -51,11 +51,11 @@ protected AdaAnalyzer(AnalyzerFactory factory) {
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different
      * from the current implementation.
-     * @return 20190118_00
+     * @return 20190118_01
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20190118_00; // Edit comment above too!
+        return 20190118_01; // Edit comment above too!
     }
 
     /**

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/fortran/FortranAnalyzer.java

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2017-2019, Chris Fraire <cfraire@me.com>.
  */
 package org.opengrok.indexer.analysis.fortran;
 
@@ -45,11 +45,11 @@ public class FortranAnalyzer extends AbstractSourceCodeAnalyzer {
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different
      * from the current implementation.
-     * @return 20180208_00
+     * @return 20190118_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20180208_00; // Edit comment above too!
+        return 20190118_00; // Edit comment above too!
     }
 
     /**

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/perl/PerlAnalyzer.java

@@ -49,11 +49,11 @@ protected PerlAnalyzer(AnalyzerFactory factory) {
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different
      * from the current implementation.
-     * @return 20190118_00
+     * @return 20190118_01
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20190118_00; // Edit comment above too!
+        return 20190118_01; // Edit comment above too!
     }
 
     /**

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ruby/RubyAnalyzer.java

@@ -50,11 +50,11 @@ protected RubyAnalyzer(AnalyzerFactory factory) {
      * Gets a version number to be used to tag processed documents so that
      * re-analysis can be re-done later if a stored version number is different
      * from the current implementation.
-     * @return 20190118_00
+     * @return 20190118_01
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20190118_00; // Edit comment above too!
+        return 20190118_01; // Edit comment above too!
     }
 
     /**

opengrok-indexer/src/main/resources/analysis/ada/AdaXref.lex

@@ -29,6 +29,7 @@
 package org.opengrok.indexer.analysis.ada;
 
 import java.io.IOException;
+import java.util.Set;
 import org.opengrok.indexer.web.HtmlConsts;
 %%
 %public
@@ -51,18 +52,9 @@ import org.opengrok.indexer.web.HtmlConsts;
 
     @Override
     public boolean offerSymbol(String value, int captureOffset,
-        boolean ignoreKwd)
-            throws IOException {
-        if (ignoreKwd) {
-            if (value.length() > 1) {
-                return onFilteredSymbolMatched(value, yychar, null, false);
-            } else {
-                onNonSymbolMatched(value, yychar);
-                return false;
-            }
-        } else {
-            return onFilteredSymbolMatched(value, yychar, Consts.kwd, false);
-        }
+            boolean ignoreKwd) throws IOException {
+        Set<String> keywords = ignoreKwd ? null : Consts.kwd;
+        return onFilteredSymbolMatched(value, yychar, keywords, false);
     }
 
     @Override

opengrok-indexer/src/main/resources/analysis/fortran/FortranXref.lex

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2017, 2019, Chris Fraire <cfraire@me.com>.
  */
 
 /*
@@ -86,13 +86,7 @@ File = [a-zA-Z]{FNameChar}* ".inc"
 
 {Identifier} {
     chkLOC();
-    String id = yytext();
-    // For historical reasons, FortranXref doesn't link identifiers of length=1
-    if (id.length() > 1) {
-        onFilteredSymbolMatched(id, yychar, Consts.kwd, false);
-    } else {
-        onNonSymbolMatched(id, yychar);
-    }
+    onFilteredSymbolMatched(yytext(), yychar, Consts.kwd, false);
 }
 
 "<" ({File}|{FPath}) ">" {

opengrok-indexer/src/main/resources/analysis/perl/PerlXref.lex

@@ -29,6 +29,7 @@
 package org.opengrok.indexer.analysis.perl;
 
 import java.io.IOException;
+import java.util.Set;
 import java.util.regex.Pattern;
 import org.opengrok.indexer.web.HtmlConsts;
 %%
@@ -51,18 +52,9 @@ import org.opengrok.indexer.web.HtmlConsts;
 
     @Override
     public boolean offerSymbol(String value, int captureOffset,
-        boolean ignoreKwd)
-            throws IOException {
-        if (ignoreKwd) {
-            if (value.length() > 1) {
-                return onFilteredSymbolMatched(value, yychar, null);
-            } else {
-                onNonSymbolMatched(value, yychar);
-                return false;
-            }
-        } else {
-            return onFilteredSymbolMatched(value, yychar, Consts.kwd);
-        }
+            boolean ignoreKwd) throws IOException {
+        Set<String> keywords = ignoreKwd ? null : Consts.kwd;
+        return onFilteredSymbolMatched(value, yychar, keywords);
     }
 
     @Override

opengrok-indexer/src/main/resources/analysis/plain/PlainSymbolTokenizer.lex

@@ -19,7 +19,7 @@
 
 /*
  * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- * Portions Copyright (c) 2017, Chris Fraire <cfraire@me.com>.
+ * Portions Copyright (c) 2017, 2019, Chris Fraire <cfraire@me.com>.
  */
 
 package org.opengrok.indexer.analysis.plain;
@@ -39,8 +39,7 @@ import org.opengrok.indexer.analysis.JFlexSymbolMatcher;
 %char
 
 %%
-//TODO decide if we should let one char symbols
-[a-zA-Z_] [a-zA-Z0-9_]+ {
+[a-zA-Z_] [a-zA-Z0-9_]* {
     onSymbolMatched(yytext(), yychar);
     return yystate();
 }

opengrok-indexer/src/main/resources/analysis/ruby/RubySymbolTokenizer.lex

@@ -64,7 +64,7 @@ import org.opengrok.indexer.web.HtmlConsts;
     public boolean offerSymbol(String value, int captureOffset,
         boolean ignoreKwd)
             throws IOException {
-        if (nameLength(value) <= 1) {
+        if (nameLength(value) <= 0) {
             lastSymbol = null;
         } else if (ignoreKwd || !Consts.kwd.contains(value)) {
             lastSymbol = value;

opengrok-indexer/src/main/resources/analysis/ruby/RubyXref.lex

@@ -29,6 +29,7 @@
 package org.opengrok.indexer.analysis.ruby;
 
 import java.io.IOException;
+import java.util.Set;
 import java.util.regex.Pattern;
 import org.opengrok.indexer.web.HtmlConsts;
 %%
@@ -51,16 +52,13 @@ import org.opengrok.indexer.web.HtmlConsts;
 
     @Override
     public boolean offerSymbol(String value, int captureOffset,
-        boolean ignoreKwd)
-            throws IOException {
-        if (nameLength(value) <= 1) {
+            boolean ignoreKwd) throws IOException {
+        if (nameLength(value) <= 0) {
             onNonSymbolMatched(value, yychar);
             return false;
-        } else if (ignoreKwd) {
-            return onFilteredSymbolMatched(value, yychar, null);
-        } else {
-            return onFilteredSymbolMatched(value, yychar, Consts.kwd);
         }
+        Set<String> keywords = ignoreKwd ? null : Consts.kwd;
+        return onFilteredSymbolMatched(value, yychar, keywords);
     }
 
     @Override