Fix #1999 : REFS aren't indexed if DEFS is empty

idodeclare · Vladimir Kotal · commit 80c1d9662d9b · 2019-01-31T17:31:45.000+01:00
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ada/AdaAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ada/AdaAnalyzer.java
@@ -51,11 +51,11 @@ protected AdaAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/c/CAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/c/CAnalyzer.java
@@ -52,11 +52,11 @@ protected CAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/c/CxxAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/c/CxxAnalyzer.java
@@ -50,11 +50,11 @@ protected CxxAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/clojure/ClojureAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/clojure/ClojureAnalyzer.java
@@ -41,11 +41,11 @@ protected ClojureAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/csharp/CSharpAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/csharp/CSharpAnalyzer.java
@@ -45,11 +45,11 @@ protected CSharpAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/eiffel/EiffelAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/eiffel/EiffelAnalyzer.java
@@ -48,11 +48,11 @@ protected EiffelAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/erlang/ErlangAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/erlang/ErlangAnalyzer.java
@@ -46,11 +46,11 @@ protected ErlangAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/fortran/FortranAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/fortran/FortranAnalyzer.java
@@ -40,7 +40,18 @@ public class FortranAnalyzer extends AbstractSourceCodeAnalyzer {
         super(factory, new JFlexTokenizer(new FortranSymbolTokenizer(
             FileAnalyzer.dummyReader)));
     }
-    
+
+    /**
+     * 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
+     */
+    @Override
+    protected int getSpecializedVersionNo() {
+        return 20180208_00; // Edit comment above too!
+    }
+
     /**
      * Creates a wrapped {@link FortranXref} instance.
      * @param reader the data to produce xref for
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/golang/GolangAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/golang/GolangAnalyzer.java
@@ -50,11 +50,11 @@ protected GolangAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/haskell/HaskellAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/haskell/HaskellAnalyzer.java
@@ -50,11 +50,11 @@ protected HaskellAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/java/JavaAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/java/JavaAnalyzer.java
@@ -49,11 +49,11 @@ protected JavaAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/javascript/JavaScriptAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/javascript/JavaScriptAnalyzer.java
@@ -50,11 +50,11 @@ protected JavaScriptAnalyzer(FileAnalyzerFactory 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 20180118_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20180118_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/json/JsonAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/json/JsonAnalyzer.java
@@ -50,11 +50,11 @@ protected JsonAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/kotlin/KotlinAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/kotlin/KotlinAnalyzer.java
@@ -49,11 +49,11 @@ protected KotlinAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/lisp/LispAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/lisp/LispAnalyzer.java
@@ -45,11 +45,11 @@ protected LispAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/lua/LuaAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/lua/LuaAnalyzer.java
@@ -50,11 +50,11 @@ protected LuaAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/pascal/PascalAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/pascal/PascalAnalyzer.java
@@ -49,11 +49,11 @@ protected PascalAnalyzer(FileAnalyzerFactory 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 20180125_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20180125_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/perl/PerlAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/perl/PerlAnalyzer.java
@@ -49,11 +49,11 @@ protected PerlAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/php/PhpAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/php/PhpAnalyzer.java
@@ -49,11 +49,11 @@ protected PhpAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/PlainAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/plain/PlainAnalyzer.java
@@ -73,11 +73,11 @@ protected PlainAnalyzer(FileAnalyzerFactory 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 20180112_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20180112_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
@@ -108,15 +108,18 @@ public void analyze(Document doc, StreamSource src, Writer xrefOut)
             defs = ctags.doCtags(fullpath);
             if (defs != null && defs.numberOfSymbols() > 0) {
                 tryAddingDefs(doc, defs, src, fullpath);
-                //this is to explicitly use appropriate analyzers tokenstream to workaround #1376 symbols search works like full text search 
-                OGKTextField ref = new OGKTextField(QueryBuilder.REFS,
-                    this.symbolTokenizer);
-                this.symbolTokenizer.setReader(getReader(src.getStream()));
-                doc.add(ref);
                 byte[] tags = defs.serialize();
                 doc.add(new StoredField(QueryBuilder.TAGS, tags));                
             }
         }
+        /*
+         * This is to explicitly use appropriate analyzer's token stream to
+         * work around #1376: symbols search works like full text search.
+         */
+        OGKTextField ref = new OGKTextField(QueryBuilder.REFS,
+                this.symbolTokenizer);
+        this.symbolTokenizer.setReader(getReader(src.getStream()));
+        doc.add(ref);
         
         if (scopesEnabled && xrefOut == null) {
             /*
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/powershell/PowershellAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/powershell/PowershellAnalyzer.java
@@ -50,11 +50,11 @@ protected PowershellAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     @Override
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/python/PythonAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/python/PythonAnalyzer.java
@@ -49,11 +49,11 @@ protected PythonAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ruby/RubyAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/ruby/RubyAnalyzer.java
@@ -50,11 +50,11 @@ protected RubyAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/rust/RustAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/rust/RustAnalyzer.java
@@ -52,11 +52,11 @@ protected RustAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/scala/ScalaAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/scala/ScalaAnalyzer.java
@@ -49,11 +49,11 @@ protected ScalaAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/sh/ShAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/sh/ShAnalyzer.java
@@ -50,11 +50,11 @@ protected ShAnalyzer(FileAnalyzerFactory 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 20171218_00
+     * @return 20180208_00
      */
     @Override
     protected int getSpecializedVersionNo() {
-        return 20171218_00; // Edit comment above too!
+        return 20180208_00; // Edit comment above too!
     }
 
     /**
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/sql/PLSQLAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/sql/PLSQLAnalyzer.java
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/sql/SQLAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/sql/SQLAnalyzer.java
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/swift/SwiftAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/swift/SwiftAnalyzer.java
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/tcl/TclAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/tcl/TclAnalyzer.java
diff --git a/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/vb/VBAnalyzer.java b/opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/vb/VBAnalyzer.java
