Skip to content

normalize fortran identifiers like gfortran #1957

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

normalize fortran identifiers like gfortran #1957

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3232b2e
normalize fortran variables like gfortran
gridaphobe Nov 30, 2017
5bc375b
increase charCmpEndOffset to 1 to ignore fortran subroutine context tags
gridaphobe Apr 18, 2018
c20f159
ctags instance is shared, set normalization per reader instead
gridaphobe Apr 18, 2018
b2187d2
pass non-normalized symbol to bestIndexForTag
gridaphobe Apr 18, 2018
31882fe
fix normalization of references
gridaphobe Apr 18, 2018
60ffb94
fix tests
gridaphobe Apr 18, 2018
6aaceaa
clean up
gridaphobe Apr 18, 2018
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
Prev Previous commit
Next Next commit
pass non-normalized symbol to bestIndexForTag
  • Loading branch information
@gridaphobe
gridaphobe committed Apr 18, 2018
commit b2187d234f036e6a46c6b518a40e4fba56b96d92
6 changes: 4 additions & 2 deletions src/org/opensolaris/opengrok/analysis/CtagsReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public void readLine(String tagLine) {
//log.fine("SKIPPING LINE - NO TAB");
return;
}
String def = normalizeIdentifier.apply(tagLine.substring(0, p));
String def = tagLine.substring(0, p);
int mstart = tagLine.indexOf('\t', p + 1);

String kind = null;
Expand Down Expand Up @@ -286,8 +286,10 @@ public void readLine(String tagLine) {
" I will continue with line # 0) for symbol {0}", def);
}

// NOTE: bestIndexOfTag searches the source, so it needs the
// precise, non-nomralized symbol.
CpatIndex cidx = bestIndexOfTag(lineno, whole, def);
addTag(defs, cidx.lineno, def, type, match, classInher, signature,
addTag(defs, cidx.lineno, normalizeIdentifier.apply(def), type, match, classInher, signature,
cidx.lineStart, cidx.lineEnd);

String[] args;
Expand Down