From d82cd9879fb778dc4cca89a4811e23a6d3e13195 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Techet?= Date: Mon, 11 Apr 2022 16:58:51 +0200 Subject: [PATCH] Update unit tests Update qualified_types.f90 and members.f90 to remove the "kind" and "len" specifiers after integers. I haven't seen this usage documented anywhere and the syntax, when used should include braces such as integer(len=5). The previous Geany Fortran parser used to parse these but since I don't think it's a valid syntax, I didn't submit the corresponding patch upstream. The rest of the tests is mostly added function arguments and different names for anonymous tags. --- tests/ctags/bug565813.f90.tags | 4 ++-- tests/ctags/bug670433.f90.tags | 2 +- tests/ctags/bug726712.f90.tags | 6 +++--- tests/ctags/enum.f90.tags | 26 +++++++++++++------------- tests/ctags/forall_module.f90.tags | 2 +- tests/ctags/fortran_associate.f90.tags | 2 +- tests/ctags/members.f90.tags | 2 +- tests/ctags/numlib.f90.tags | 1 + tests/ctags/procedure_pointer_module.f90.tags | 2 +- tests/ctags/qualified_types.f90 | 4 ++-- tests/ctags/square_parens.f90.tags | 2 +- tests/ctags/stdcall.f.tags | 4 ++-- tests/ctags/structure.f.tags | 2 +- 13 files changed, 30 insertions(+), 29 deletions(-) diff --git a/tests/ctags/bug565813.f90.tags b/tests/ctags/bug565813.f90.tags index d19d26b3f..769f138ec 100644 --- a/tests/ctags/bug565813.f90.tags +++ b/tests/ctags/bug565813.f90.tags @@ -3,6 +3,6 @@ N barÌ64Îfoo_tÖ0 ctags_bugÌ256Ö0 foo_getbarÌ16Îctags_bugÖ0 -foo_set_barÌ128Îctags_bugÖ0 -foo_setbarÌ128Îctags_bugÖ0 +foo_set_barÌ128Í(f, b)Îctags_bugÖ0 +foo_setbarÌ128Í(f, b)Îctags_bugÖ0 foo_tÌ1Îctags_bugÖ0 diff --git a/tests/ctags/bug670433.f90.tags b/tests/ctags/bug670433.f90.tags index 0835587a4..dee96c641 100644 --- a/tests/ctags/bug670433.f90.tags +++ b/tests/ctags/bug670433.f90.tags @@ -1,5 +1,5 @@ # format=tagmanager -barÌ128ÎfoobarÖ0 +barÌ128Í(n)ÎfoobarÖ0 fÌ16ÎfooÖ0 fooÌ16ÎfoobarÖ0 foobarÌ256Ö0 diff --git a/tests/ctags/bug726712.f90.tags b/tests/ctags/bug726712.f90.tags index 4dd84a8f2..9556489e7 100644 --- a/tests/ctags/bug726712.f90.tags +++ b/tests/ctags/bug726712.f90.tags @@ -1,4 +1,4 @@ # format=tagmanager -sub1Ì128Ö0 -sub2Ì128Ö0 -tagstest_ctrlÌ128Ö0 +sub1Ì128Í(a)Ö0 +sub2Ì128Í(a)Ö0 +tagstest_ctrlÌ128Í()Ö0 diff --git a/tests/ctags/enum.f90.tags b/tests/ctags/enum.f90.tags index b19130516..2dbcb3b7e 100644 --- a/tests/ctags/enum.f90.tags +++ b/tests/ctags/enum.f90.tags @@ -8,22 +8,22 @@ Named4 Named5Ì2ÎConstantsÖ0 Named6Ì2ÎConstantsÖ0 Named7Ì2ÎConstantsÖ0 -aÌ4ÎEnum#1Ö0 +aÌ4Îanon_enum_2Ö0 anon_enum_1Ì2ÎConstantsÖ1 anon_enum_2Ì2ÎConstantsÖ1 -bÌ4ÎEnum#1Ö0 -blackÌ4ÎEnum#0Ö0 -blueÌ4ÎEnum#0Ö0 -bronzeÌ4ÎEnum#0Ö0 -cÌ4ÎEnum#1Ö0 -goldÌ4ÎEnum#0Ö0 +bÌ4Îanon_enum_2Ö0 +blackÌ4Îanon_enum_1Ö0 +blueÌ4Îanon_enum_1Ö0 +bronzeÌ4Îanon_enum_1Ö0 +cÌ4Îanon_enum_2Ö0 +goldÌ4Îanon_enum_1Ö0 hcÌ16384ÎConstantsÖ0 -lavenderÌ4ÎEnum#0Ö0 +lavenderÌ4Îanon_enum_1Ö0 piÌ16384ÎConstantsÖ0 -pinkÌ4ÎEnum#0Ö0 -purpleÌ4ÎEnum#0Ö0 -redÌ4ÎEnum#0Ö0 -silverÌ4ÎEnum#0Ö0 +pinkÌ4Îanon_enum_1Ö0 +purpleÌ4Îanon_enum_1Ö0 +redÌ4Îanon_enum_1Ö0 +silverÌ4Îanon_enum_1Ö0 x1Ì4ÎNamed1Ö0 x2Ì4ÎNamed2Ö0 x3Ì4ÎNamed3Ö0 @@ -38,7 +38,7 @@ y4 y5Ì4ÎNamed5Ö0 y6Ì4ÎNamed6Ö0 y7Ì4ÎNamed7Ö0 -yellowÌ4ÎEnum#0Ö0 +yellowÌ4Îanon_enum_1Ö0 z1Ì4ÎNamed1Ö0 z2Ì4ÎNamed2Ö0 z3Ì4ÎNamed3Ö0 diff --git a/tests/ctags/forall_module.f90.tags b/tests/ctags/forall_module.f90.tags index 2b37238a6..9283cd98e 100644 --- a/tests/ctags/forall_module.f90.tags +++ b/tests/ctags/forall_module.f90.tags @@ -1,5 +1,5 @@ # format=tagmanager aÌ16384Îwith_forallÖ0 -sub_with_forallÌ128Îwith_forallÖ0 +sub_with_forallÌ128Í(x)Îwith_forallÖ0 twoÌ16Îwith_forallÖ0 with_forallÌ256Ö0 diff --git a/tests/ctags/fortran_associate.f90.tags b/tests/ctags/fortran_associate.f90.tags index 6a8e38db1..a5514505d 100644 --- a/tests/ctags/fortran_associate.f90.tags +++ b/tests/ctags/fortran_associate.f90.tags @@ -1,5 +1,5 @@ # format=tagmanager aÌ16384Îwith_associateÖ0 -do_other_stuffÌ128Îwith_associateÖ0 +do_other_stuffÌ128Í(a)Îwith_associateÖ0 do_stuffÌ16Îwith_associateÖ0 with_associateÌ256Ö0 diff --git a/tests/ctags/members.f90.tags b/tests/ctags/members.f90.tags index 28d718905..8d464c3d0 100644 --- a/tests/ctags/members.f90.tags +++ b/tests/ctags/members.f90.tags @@ -2,7 +2,7 @@ HasMembersÌ1ÎMembersÖ0 MembersÌ256Ö0 MyMethodÌ64ÎHasMembersÖ0 -MySubroutineÌ128ÎMembersÖ0 +MySubroutineÌ128Í(arg)ÎMembersÖ0 kind_memberÌ64ÎHasMembersÖ0 len_memberÌ64ÎHasMembersÖ0 memberÌ64ÎHasMembersÖ0 diff --git a/tests/ctags/numlib.f90.tags b/tests/ctags/numlib.f90.tags index ba5154c63..c482c1ce8 100644 --- a/tests/ctags/numlib.f90.tags +++ b/tests/ctags/numlib.f90.tags @@ -1,3 +1,4 @@ # format=tagmanager anon_interface_1Ì32Înumerical_librariesÖ1 +anon_interface_2Ì32Îb2lsfÖ1 numerical_librariesÌ256Ö0 diff --git a/tests/ctags/procedure_pointer_module.f90.tags b/tests/ctags/procedure_pointer_module.f90.tags index 1e76a272d..4a184bb06 100644 --- a/tests/ctags/procedure_pointer_module.f90.tags +++ b/tests/ctags/procedure_pointer_module.f90.tags @@ -2,4 +2,4 @@ aÌ16384Îproc_pointerÖ0 my_pointerÌ16384Îproc_pointerÖ0 proc_pointerÌ256Ö0 -subÌ128Îproc_pointerÖ0 +subÌ128Í(x)Îproc_pointerÖ0 diff --git a/tests/ctags/qualified_types.f90 b/tests/ctags/qualified_types.f90 index 2ebe8a274..63f7a98f5 100644 --- a/tests/ctags/qualified_types.f90 +++ b/tests/ctags/qualified_types.f90 @@ -2,8 +2,8 @@ module test implicit none type goodtype(p1, p2, p3, p4) ! the stuff in brackets after the name of the type shouldn't appear in the type's name ! this is already correctly handled, so that's fine - integer, kind :: p1, p3 - integer, len :: p2, p4 ! the question is whether or not these "kind" and "len"s should be shown as members + integer, kind :: p1, p3 ! the question is whether or not these "kind" and "len"s should be shown as members + integer, len :: p2, p4 real(kind=p1) :: c1 character(len=p2) :: c2 complex :: c3(p3) diff --git a/tests/ctags/square_parens.f90.tags b/tests/ctags/square_parens.f90.tags index b1b6bac28..13e9fdd4d 100644 --- a/tests/ctags/square_parens.f90.tags +++ b/tests/ctags/square_parens.f90.tags @@ -1,7 +1,7 @@ # format=tagmanager SymmetryÌ1ÎsquaretestÖ0 assigneeÌ16384ÎsquaretestÖ0 -executeÌ128ÎsquaretestÖ0 +executeÌ128Í(state)ÎsquaretestÖ0 invisibleÌ16384ÎsquaretestÖ0 invisible_fourÌ16384ÎsquaretestÖ0 invisible_threeÌ16384ÎsquaretestÖ0 diff --git a/tests/ctags/stdcall.f.tags b/tests/ctags/stdcall.f.tags index 36c9525a1..deadbfe6a 100644 --- a/tests/ctags/stdcall.f.tags +++ b/tests/ctags/stdcall.f.tags @@ -1,6 +1,6 @@ # format=tagmanager D02CJWÌ16384Ö0 -FCNÌ128Ö0 +FCNÌ128Í(T, Y, F)Ö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Ì128Ö0 +OUTÌ128Í(X, Y)Ö0 PIÌ16384Ö0 RELABSÌ16384Ö0 TOLÌ16384Ö0 diff --git a/tests/ctags/structure.f.tags b/tests/ctags/structure.f.tags index 479c2d9e0..5f1f3216a 100644 --- a/tests/ctags/structure.f.tags +++ b/tests/ctags/structure.f.tags @@ -1,5 +1,5 @@ # format=tagmanager -aÌ64ÎStructure#0Ö0 +aÌ64Îanon_type_1Ö0 anon_type_1Ì1ÎnestedÖ1 cloudsÌ64ÎweatherÖ0 dayÌ64ÎweatherÖ0 -- 2.11.4.GIT