[geany/geany] f22c02: Merge branch 'aphirst/patch-1'

Colomban Wendling git-noreply at xxxxx
Fri Feb 14 18:32:17 UTC 2014


Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Fri, 14 Feb 2014 18:32:17 UTC
Commit:      f22c028ca4c4bdf1d0669023fe22aaaeab93d5f1
             https://github.com/geany/geany/commit/f22c028ca4c4bdf1d0669023fe22aaaeab93d5f1

Log Message:
-----------
Merge branch 'aphirst/patch-1'

Closes PR#209.


Modified Paths:
--------------
    tagmanager/ctags/fortran.c
    tests/ctags/Makefile.am
    tests/ctags/fortran_associate.f90
    tests/ctags/fortran_associate.f90.tags

Modified: tagmanager/ctags/fortran.c
5 files changed, 4 insertions(+), 1 deletions(-)
===================================================================
@@ -63,6 +63,7 @@
 	KEYWORD_NONE = -1,
 	KEYWORD_allocatable,
 	KEYWORD_assignment,
+	KEYWORD_associate,
 	KEYWORD_automatic,
 	KEYWORD_block,
 	KEYWORD_byte,
@@ -230,6 +231,7 @@
 	/* keyword          keyword ID */
 	{ "allocatable",    KEYWORD_allocatable  },
 	{ "assignment",     KEYWORD_assignment   },
+	{ "associate",      KEYWORD_associate    },
 	{ "automatic",      KEYWORD_automatic    },
 	{ "block",          KEYWORD_block        },
 	{ "byte",           KEYWORD_byte         },
@@ -2052,7 +2054,8 @@ static boolean parseExecutionPart (tokenInfo *const token)
 					isSecondaryKeyword (token, KEYWORD_if) ||
 					isSecondaryKeyword (token, KEYWORD_select) ||
 					isSecondaryKeyword (token, KEYWORD_where) ||
-					isSecondaryKeyword (token, KEYWORD_forall))
+					isSecondaryKeyword (token, KEYWORD_forall) ||
+					isSecondaryKeyword (token, KEYWORD_associate))
 				{
 					skipToNextStatement (token);
 					result = TRUE;


Modified: tests/ctags/Makefile.am
1 files changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -126,6 +126,7 @@ test_sources = \
 	extern_variable.h				\
 	forall_module.f90				\
 	format.pl						\
+	fortran_associate.f90			\
 	func_typedef.h					\
 	general.cs						\
 	hex2dec.sql						\


Modified: tests/ctags/fortran_associate.f90
20 files changed, 20 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,20 @@
+module with_associate
+  real :: a
+
+contains
+
+  function do_stuff(a) result(c)
+    real, intent(in) :: a
+
+    associate (b => a)
+      c = b
+    end associate
+  end function do_stuff
+
+  subroutine do_other_stuff(a)
+    real, intent(in out) :: a
+
+    a = 2 * a
+  end subroutine do_other_stuff
+
+end module with_associate


Modified: tests/ctags/fortran_associate.f90.tags
5 files changed, 5 insertions(+), 0 deletions(-)
===================================================================
@@ -0,0 +1,5 @@
+# format=tagmanager
+aÌ16384Îwith_associateÖ0
+do_other_stuffÌ64Îwith_associateÖ0
+do_stuffÌ16Îwith_associateÖ0
+with_associateÌ256Ö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