Fortran: accept $ as parts of names

Close universal-ctags#4043. The test case is taken from universal-ctags#4033 submitted by @navinp0304. Signed-off-by: Masatake YAMATO <[email protected]>
masatake · Jul 22, 2024 · d562e26 · d562e26
1 parent a5137d6
commit d562e26
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 1 deletion.
diff --git a/Units/parser-fortran.r/dollars-in-names.d/args.ctags b/Units/parser-fortran.r/dollars-in-names.d/args.ctags
@@ -0,0 +1,2 @@
+--sort=no
+--kinds-Fortran=+L
diff --git a/Units/parser-fortran.r/dollars-in-names.d/expected.tags b/Units/parser-fortran.r/dollars-in-names.d/expected.tags
@@ -0,0 +1,4 @@
+name$	input.f	/^      function name$(/;"	f
+name$	input.f	/^      integer name\$$/;"	L	function:name$	file:
+main	input.f	/^      program main$/;"	p
+ret$	input.f	/^      integer ret\$$/;"	v	program:main
diff --git a/Units/parser-fortran.r/dollars-in-names.d/input.f b/Units/parser-fortran.r/dollars-in-names.d/input.f
@@ -0,0 +1,11 @@
+C     Taken from #4033 submitted by @navinp0304.
+      function name$()
+      integer name$
+      name$ = 42
+      end function
+
+      program main
+      integer ret$
+      ret$=name$()
+      print *,ret$
+      end program
diff --git a/Units/parser-fortran.r/dollars-in-names.d/validator b/Units/parser-fortran.r/dollars-in-names.d/validator
@@ -0,0 +1 @@
+fortran+dollar-ok
diff --git a/parsers/fortran.c b/parsers/fortran.c
@@ -31,7 +31,7 @@
 /*
 *   MACROS
 */
-#define isident(c)              (isalnum(c) || (c) == '_')
+#define isident(c)              (isalnum(c) || (c) == '_' || (c) == '$')
 #define isBlank(c)              (bool) (c == ' ' || c == '\t')
 #define isType(token,t)         (bool) ((token)->type == (t))
 #define isKeyword(token,k)      (bool) ((token)->keyword == (k))