Skip to content

Add support for $ in fortran identifiers and clickable .i include files. #4642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 4, 2024
+110 −42
Merged

Add support for $ in fortran identifiers and clickable .i include files. #4642

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a4797e
Add support for $ in fortran identifiers and clickable .i include files.
navinp0304 Aug 17, 2024
d5710e7
Merge branch 'master' into master
navinp0304 Aug 21, 2024
1a75e38
Merge branch 'master' into master
navinp0304 Aug 30, 2024
7e4f3e8
Update opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/f…
navinp0304 Sep 12, 2024
41deffe
Merge branch 'master' into master
navinp0304 Sep 12, 2024
bd9eefb
Merge branch 'oracle:master' into master
navinp0304 Sep 26, 2024
65a89a3
Implement changes suggested by vladk
navinp0304 Oct 1, 2024
84c1728
fix the onNonSymbolMatched() arguments based on vladk review comment
navinp0304 Oct 3, 2024
d74a502
Space around binary operators. Review comment by vladak
navinp0304 Oct 4, 2024
6519dc3
add space after comma
vladak Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...k-indexer/src/main/java/org/opengrok/indexer/analysis/fortran/FortranAnalyzerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ public class FortranAnalyzerFactory extends FileAnalyzerFactory {
"F95",
"F03",
"F08",
"F15"};
"F15",
"F77",
"I"};

public FortranAnalyzerFactory() {
super(null, null, SUFFIXES, null, null, "text/plain", AbstractAnalyzer.Genre.PLAIN, NAME, true);
Expand Down
2 changes: 1 addition & 1 deletion opengrok-indexer/src/main/jflex/analysis/fortran/Fortran.lexh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* Portions Copyright (c) 2017, Chris Fraire <[email protected]>.
*/

Identifier = [a-zA-Z_] [a-zA-Z0-9_]*
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]+)?
2 changes: 2 additions & 0 deletions opengrok-indexer/src/main/jflex/analysis/fortran/FortranSymbolTokenizer.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ import org.opengrok.indexer.analysis.JFlexSymbolMatcher;
return yystate(); }
}

{WhspChar}* "include" {WhspChar}* (\'[^\'\n\r]+\'| \"[^\"\n\r]+\") {}
{Number} {}

\" { yybegin(STRING); }
\' { yybegin(QSTRING); }
\! { yybegin(SCOMMENT); }
"C" { yybegin(SCOMMENT); }
}

<STRING> {
Expand Down
10 changes: 9 additions & 1 deletion opengrok-indexer/src/main/jflex/analysis/fortran/FortranXref.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import org.opengrok.indexer.web.HtmlConsts;
}
%}

File = [a-zA-Z]{FNameChar}* ".inc"
File = [a-zA-Z]{FNameChar}* "." ("i"|"inc")

%state STRING SCOMMENT QSTRING LCOMMENT

Expand Down Expand Up @@ -95,6 +95,14 @@ File = [a-zA-Z]{FNameChar}* ".inc"
onNonSymbolMatched(">", yychar + 1 + file.length());
}

"'" ({File}|{FPath}) "'" {
chkLOC();
onNonSymbolMatched("'", yychar);
String file = yytext();
file = file.substring(1, file.length() - 1);
onFilelikeMatched(file, yychar + 1);
onNonSymbolMatched("'", yychar + 1 + file.length());
}
/*{Hier}
{ onPathlikeMatched(yytext(), '.', false, yychar); }
*/
Expand Down