[geany/geany] 362a5c: Fortran: properly report scope for programs, subroutines and types
Colomban Wendling
git-noreply at xxxxx
Tue Feb 18 18:04:37 UTC 2014
Branch: refs/heads/master
Author: Colomban Wendling <ban at herbesfolles.org>
Committer: Colomban Wendling <ban at herbesfolles.org>
Date: Tue, 18 Feb 2014 18:04:37 UTC
Commit: 362a5cc6548982efa0898eaeabc353c089397580
https://github.com/geany/geany/commit/362a5cc6548982efa0898eaeabc353c089397580
Log Message:
-----------
Fortran: properly report scope for programs, subroutines and types
To do this we change the internal types to only use types matched by
symbols_get_current_scope(). This is a bit of a hack, but the tag
types were already questionable and simply mapped to ones the
TagManager know.
This however merges Functions and Subroutines under the same top-level
item in the symbol list.
Modified Paths:
--------------
src/symbols.c
tagmanager/ctags/fortran.c
tests/ctags/array-spec.f90.tags
tests/ctags/auto.f.tags
tests/ctags/bug565813.f90.tags
tests/ctags/bug670433.f90.tags
tests/ctags/bug726712.f90.tags
tests/ctags/bug734933.f90.tags
tests/ctags/bug858165.f90.tags
tests/ctags/bug877956.f90.tags
tests/ctags/byte.f.tags
tests/ctags/common.f.tags
tests/ctags/debian_432872.f90.tags
tests/ctags/forall_module.f90.tags
tests/ctags/fortran_associate.f90.tags
tests/ctags/invalid_name.f90.tags
tests/ctags/misc_types.f.tags
tests/ctags/misc_types.f90.tags
tests/ctags/namelist.f.tags
tests/ctags/procedure_pointer_module.f90.tags
tests/ctags/procpoint.f90.tags
tests/ctags/square_parens.f90.tags
tests/ctags/stdcall.f.tags
tests/ctags/structure.f.tags
tests/ctags/union.f.tags
tests/ctags/value.f.tags
Modified: src/symbols.c
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -972,11 +972,11 @@ static void add_top_level_items(GeanyDocument *doc)
{
tag_list_add_groups(tag_store,
&(tv_iters.tag_namespace), _("Module"), "classviewer-class",
+ &(tv_iters.tag_struct), _("Programs"), "classviewer-class",
&(tv_iters.tag_interface), _("Interfaces"), "classviewer-struct",
- &(tv_iters.tag_function), _("Functions"), "classviewer-method",
- &(tv_iters.tag_member), _("Subroutines"), "classviewer-method",
+ &(tv_iters.tag_function), _("Functions / Subroutines"), "classviewer-method",
&(tv_iters.tag_variable), _("Variables"), "classviewer-var",
- &(tv_iters.tag_type), _("Types"), "classviewer-namespace",
+ &(tv_iters.tag_class), _("Types"), "classviewer-class",
&(tv_iters.tag_macro), _("Blocks"), "classviewer-member",
&(tv_iters.tag_other), _("Other"), "classviewer-other",
NULL);
Modified: tagmanager/ctags/fortran.c
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -216,9 +216,9 @@
{ FALSE, 'L', "local", "local, common block, and namelist variables"},
{ TRUE, 'm', "namespace", "modules"},
{ TRUE, 'n', "namelist", "namelists"},
- { TRUE, 'p', "package", "programs"},
- { TRUE, 's', "member", "subroutines"},
- { TRUE, 't', "typedef", "derived types and structures"},
+ { TRUE, 'p', "struct", "programs"},
+ { TRUE, 's', "method", "subroutines"},
+ { TRUE, 't', "class", "derived types and structures"},
{ TRUE, 'v', "variable", "program (global) and module variables"}
};
Modified: tests/ctags/array-spec.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,3 +1,3 @@
# format=tagmanager
-df_typeÌ4096Îinm_dfÖ0
+df_typeÌ1Îinm_dfÖ0
inm_dfÌ256Ö0
Modified: tests/ctags/auto.f.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
-AUTO_TESTÌ512Ö0
+AUTO_TESTÌ2048Ö0
DÌ16384ÎAUTO_TESTÖ0
PÌ16384ÎAUTO_TESTÖ0
QÌ16384ÎAUTO_TESTÖ0
Modified: tests/ctags/bug565813.f90.tags
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -2,6 +2,6 @@
NÌ16384Îctags_bugÖ0
ctags_bugÌ256Ö0
foo_getbarÌ16Îctags_bugÖ0
-foo_set_barÌ64Îctags_bugÖ0
-foo_setbarÌ64Îctags_bugÖ0
-foo_tÌ4096Îctags_bugÖ0
+foo_set_barÌ128Îctags_bugÖ0
+foo_setbarÌ128Îctags_bugÖ0
+foo_tÌ1Îctags_bugÖ0
Modified: tests/ctags/bug670433.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
-barÌ64ÎfoobarÖ0
+barÌ128ÎfoobarÖ0
fÌ16ÎfooÖ0
fooÌ16ÎfoobarÖ0
foobarÌ256Ö0
Modified: tests/ctags/bug726712.f90.tags
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
-sub1Ì64Ö0
-sub2Ì64Ö0
-tagstest_ctrlÌ64Ö0
+sub1Ì128Ö0
+sub2Ì128Ö0
+tagstest_ctrlÌ128Ö0
Modified: tests/ctags/bug734933.f90.tags
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,10 +1,10 @@
# format=tagmanager
-ADD_COMPONENTSÌ64ÎMDCOMPONENTSÖ0
+ADD_COMPONENTSÌ128ÎMDCOMPONENTSÖ0
COMPÌ16384ÎMDCOMPONENTSÖ0
-COMPONENTÌ4096ÎMDCOMPONENTSÖ0
+COMPONENTÌ1ÎMDCOMPONENTSÖ0
COMPONENTSÌ16384ÎMDCOMPONENTSÖ0
COMPONENTS_TMPÌ16384ÎMDCOMPONENTSÖ0
-COMPONENT_POINTERÌ4096ÎMDCOMPONENTSÖ0
+COMPONENT_POINTERÌ1ÎMDCOMPONENTSÖ0
COMP_TMPÌ16384ÎMDCOMPONENTSÖ0
LIM_COMPONENTSÌ16384ÎMDCOMPONENTSÖ0
MDCOMPONENTSÌ256Ö0
Modified: tests/ctags/bug858165.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3,4 +3,4 @@ a
bÌ16384ÎtestÖ0
cÌ16384ÎtestÖ0
dÌ16384ÎtestÖ0
-testÌ512Ö0
+testÌ2048Ö0
Modified: tests/ctags/bug877956.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
c2Ì16384ÎtestÖ0
cm1Ì16384ÎtestÖ0
-testÌ512Ö0
+testÌ2048Ö0
Modified: tests/ctags/byte.f.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -8,4 +8,4 @@ B2
CÌ16384Îbyte_testÖ0
C1Ì16384Îbyte_testÖ0
C2Ì16384Îbyte_testÖ0
-byte_testÌ512Ö0
+byte_testÌ2048Ö0
Modified: tests/ctags/common.f.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,4 +2,4 @@
common1Ì65536ÎmainÖ0
common2Ì65536ÎmainÖ0
common3Ì65536ÎmainÖ0
-mainÌ512Ö0
+mainÌ2048Ö0
Modified: tests/ctags/debian_432872.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,3 +1,3 @@
# format=tagmanager
FOOÌ256Ö0
-FOOÌ64ÎFOOÖ0
+FOOÌ128ÎFOOÖ0
Modified: tests/ctags/forall_module.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
aÌ16384Îwith_forallÖ0
-sub_with_forallÌ64Îwith_forallÖ0
+sub_with_forallÌ128Îwith_forallÖ0
twoÌ16Îwith_forallÖ0
with_forallÌ256Ö0
Modified: tests/ctags/fortran_associate.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
aÌ16384Îwith_associateÖ0
-do_other_stuffÌ64Îwith_associateÖ0
+do_other_stuffÌ128Îwith_associateÖ0
do_stuffÌ16Îwith_associateÖ0
with_associateÌ256Ö0
Modified: tests/ctags/invalid_name.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
DR_FilenameÌ16384ÎTR_DetectionRecordingÖ0
DR_LunÌ16384ÎTR_DetectionRecordingÖ0
-Detection_RecordÌ4096ÎTR_DetectionRecordingÖ0
+Detection_RecordÌ1ÎTR_DetectionRecordingÖ0
TR_DetectionRecordingÌ256Ö0
Modified: tests/ctags/misc_types.f.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
INFOOBARÌ16384ÎspecsÖ0
MÌ16384ÎspecsÖ0
-specsÌ512Ö0
+specsÌ2048Ö0
Modified: tests/ctags/misc_types.f90.tags
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ i6
i7Ì16384ÎtestallocÖ0
i8Ì16384ÎtestallocÖ0
listÌ16384ÎtestallocÖ0
-my_structÌ4096ÎtestallocÖ0
+my_structÌ1ÎtestallocÖ0
statusÌ16384ÎtestallocÖ0
-testallocÌ512Ö0
+testallocÌ2048Ö0
the_structÌ16384ÎtestallocÖ0
Modified: tests/ctags/namelist.f.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,2 +1,2 @@
# format=tagmanager
-mainÌ512Ö0
+mainÌ2048Ö0
Modified: tests/ctags/procedure_pointer_module.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -2,4 +2,4 @@
aĚ16384Îproc_pointerÖ0
my_pointerĚ16384Îproc_pointerÖ0
proc_pointerĚ256Ö0
-subĚ64Îproc_pointerÖ0
+subĚ128Îproc_pointerÖ0
Modified: tests/ctags/procpoint.f90.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
# format=tagmanager
-MainÌ512Ö0
+MainÌ2048Ö0
MyOtherProcÌ16384ÎTestÖ0
MyProcÌ16384ÎTestÖ0
ProcOneÌ16ÎTestÖ0
Modified: tests/ctags/square_parens.f90.tags
6 files changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -1,12 +1,12 @@
# format=tagmanager
-SymmetryĚ4096ÎsquaretestÖ0
+SymmetryĚ1ÎsquaretestÖ0
assigneeĚ16384ÎsquaretestÖ0
-executeĚ64ÎsquaretestÖ0
+executeĚ128ÎsquaretestÖ0
invisibleĚ16384ÎsquaretestÖ0
invisible_fourĚ16384ÎsquaretestÖ0
invisible_threeĚ16384ÎsquaretestÖ0
invisible_twoĚ16384ÎsquaretestÖ0
-mainĚ512Ö0
+mainĚ2048Ö0
squaretestĚ256Ö0
stateĚ16384ÎsquaretestÖ0
state_twoĚ16384ÎsquaretestÖ0
Modified: tests/ctags/stdcall.f.tags
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,6 +1,6 @@
# format=tagmanager
D02CJWÌ16384Ö0
-FCNÌ64Ö0
+FCNÌ128Ö0
GÌ16Ö0
GÌ16384Ö0
HÌ16384Ö0
@@ -11,7 +11,7 @@ J
KÌ16384Ö0
NÌ16384Ö0
NOUTÌ16384Ö0
-OUTÌ64Ö0
+OUTÌ128Ö0
PIÌ16384Ö0
RELABSÌ16384Ö0
TOLÌ16384Ö0
Modified: tests/ctags/structure.f.tags
14 files changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -1,10 +1,10 @@
# format=tagmanager
-initialized_structureÌ512Ö0
+initialized_structureÌ2048Ö0
latestÌ16384Îinitialized_structureÖ0
latestÌ16384Îuninitialized_structureÖ0
-nestedÌ4096ÎtopÖ0
-nested_structureÌ512Ö0
-topÌ4096Înested_structureÖ0
-uninitialized_structureÌ512Ö0
-weatherÌ4096Îinitialized_structureÖ0
-weatherÌ4096Îuninitialized_structureÖ0
+nestedÌ1ÎtopÖ0
+nested_structureÌ2048Ö0
+topÌ1Înested_structureÖ0
+uninitialized_structureÌ2048Ö0
+weatherÌ1Îinitialized_structureÖ0
+weatherÌ1Îuninitialized_structureÖ0
Modified: tests/ctags/union.f.tags
4 files changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
sdateÌ16384ÎwritedateÖ0
-startÌ4096ÎwritedateÖ0
-writedateÌ512Ö0
+startÌ1ÎwritedateÖ0
+writedateÌ2048Ö0
Modified: tests/ctags/value.f.tags
2 files changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
# format=tagmanager
aaÌ16384ÎfigureÖ0
figÌ16384ÎfigureÖ0
-figureÌ512Ö0
+figureÌ2048Ö0
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list