Fix FortranSymbolTokenizer number bug

Author: idodeclare

src/org/opensolaris/opengrok/analysis/fortran/Fortran.lexh

@@ -0,0 +1,28 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").  
+ * You may not use this file except in compliance with the License.
+ *
+ * See LICENSE.txt included in this distribution for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at LICENSE.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
+ */
+
+Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
+Label = [0-9]+
+
+Number = ([0-9]+\.[0-9]+|[0-9][0-9]* | [0][xX] [0-9a-fA-F]+ )([uUdDlL]+)?

src/org/opensolaris/opengrok/analysis/fortran/FortranSymbolTokenizer.lex

@@ -40,13 +40,11 @@ super(in);
 %include CommonTokenizer.lexh
 %char
 
-Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
-Label = [0-9]+
-
 // (OK to exclude LSTRING state used in FortranXref.)
 %state STRING COMMENT SCOMMENT QSTRING
 
 %include Common.lexh
+%include Fortran.lexh
 %%
 
 <YYINITIAL> {
@@ -57,14 +55,17 @@ Label = [0-9]+
                         setAttribs(id, yychar, yychar + yylength());
                         return yystate(); }
               }
+
+ {Number}        {}
+
  \"     { yybegin(STRING); }
  \'     { yybegin(QSTRING); }
  \!     { yybegin(SCOMMENT); }
 }
 
 <STRING> {
- \"     { yybegin(YYINITIAL); }
  \\[\"\\]    {}
+ \"     { yybegin(YYINITIAL); }
 }
 
 <QSTRING> {

src/org/opensolaris/opengrok/analysis/fortran/FortranXref.lex

@@ -47,18 +47,14 @@ import org.opensolaris.opengrok.web.Util;
   protected void setLineNumber(int x) { yyline = x; }
 %}
 
-Identifier = [a-zA-Z_] [a-zA-Z0-9_]+
-Label = [0-9]+
-
 File = [a-zA-Z]{FNameChar}* ".inc"
 
-Number = ([0-9]+\.[0-9]+|[0-9][0-9]*|"0x" [0-9a-fA-F]+ )([udl]+)?
-
 %state  STRING COMMENT SCOMMENT QSTRING LCOMMENT
 
 %include Common.lexh
 %include CommonURI.lexh
 %include CommonPath.lexh
+%include Fortran.lexh
 %%
 <YYINITIAL>{
  ^{Label} {
@@ -73,7 +69,12 @@ Number = ([0-9]+\.[0-9]+|[0-9][0-9]*|"0x" [0-9a-fA-F]+ )([udl]+)?
 
 {Identifier} {
     String id = yytext();
-    writeSymbol(id, Consts.kwd, yyline, false);
+    // For historical reasons, FortranXref doesn't link identifiers of length=1
+    if (id.length() > 1) {
+        writeSymbol(id, Consts.kwd, yyline, false);
+    } else {
+        out.write(id);
+    }
 }
 
 "<" ({File}|{FPath}) ">" {
@@ -110,16 +111,16 @@ Number = ([0-9]+\.[0-9]+|[0-9][0-9]*|"0x" [0-9a-fA-F]+ )([udl]+)?
 }
 
 <STRING> {
+ \\[\"\\] |
  \" {WhiteSpace} \"  { out.write(htmlize(yytext()));}
  \"     {
     out.write(htmlize(yytext()));
     yypop();
  }
- \\[\"\\]    { out.write(htmlize(yytext())); }
 }
 
 <QSTRING> {
- \\[\'\\]    { out.write(htmlize(yytext())); }
+ \\[\'\\] |
  \' {WhiteSpace} \' { out.write(htmlize(yytext())); }
  \'     {
     out.write(htmlize(yytext()));

test/org/opensolaris/opengrok/analysis/fortran/sample.f

@@ -197,7 +197,7 @@ SUBROUTINE DGESV( N, NRHS, A, LDA, IPIV, B, LDB, INFO )
 *
 *     Test the input parameters.
 *
-      INFO = 0
+      INFO = 0 + 0xFFFF - 0XFF - 0xFF00
       IF( N.LT.0 ) THEN
          INFO = -1
       ELSE IF( NRHS.LT.0 ) THEN

test/org/opensolaris/opengrok/analysis/fortran/sample_xref.html

@@ -205,7 +205,7 @@
 <a class="l" name="197" href="#197">197</a><span class="c">*</span>
 <a class="l" name="198" href="#198">198</a><span class="c">*     Test the input parameters.</span>
 <a class="l" name="199" href="#199">199</a><span class="c">*</span>
-<a class="hl" name="200" href="#200">200</a>      <a href="/source/s?defs=INFO" class="intelliWindow-symbol" data-definition-place="undefined-in-file">INFO</a> = <span class="n">0</span>
+<a class="hl" name="200" href="#200">200</a>      <a href="/source/s?defs=INFO" class="intelliWindow-symbol" data-definition-place="undefined-in-file">INFO</a> = <span class="n">0</span> + <span class="n">0xFFFF</span> - <span class="n">0XFF</span> - <span class="n">0xFF00</span>
 <a class="l" name="201" href="#201">201</a>      <b>IF</b>( N.<b>LT</b>.<span class="n">0</span> ) <b>THEN</b>
 <a class="l" name="202" href="#202">202</a>         <a href="/source/s?defs=INFO" class="intelliWindow-symbol" data-definition-place="undefined-in-file">INFO</a> = -<span class="n">1</span>
 <a class="l" name="203" href="#203">203</a>      <b>ELSE</b> <b>IF</b>( <a href="/source/s?defs=NRHS" class="intelliWindow-symbol" data-definition-place="undefined-in-file">NRHS</a>.<b>LT</b>.<span class="n">0</span> ) <b>THEN</b>