Merge pull request #3547 from masatake/mixed-option--no-trunc

masatake · web-flow · commit 6c57fc0f7c50 · 2022-12-01T01:01:24.000+09:00
Fortran:CPreProcessor: don't make patterns too short when truncating
diff --git a/Units/parser-c.r/c-digraphs.d/expected.tags b/Units/parser-c.r/c-digraphs.d/expected.tags
@@ -1,7 +1,7 @@
 A	input.c	/^%:define A /;"	d	file:
 B	input.c	/^%:define B /;"	d	file:
 M3_INIT	input.c	/^%:define M3_INIT(/;"	d	file:
-STRINGIFY	input.c	/^%:define STRINGIFY(/;"	d	file:
+STRINGIFY	input.c	/^%:define STRINGIFY(x) STRINGIFY_/;"	d	file:
 STRINGIFY_INTERN	input.c	/^%:define STRINGIFY_INTERN(/;"	d	file:
 buf	input.c	/^  char *buf;$/;"	m	struct:str	typeref:typename:char *	file:
 len	input.c	/^  unsigned int len, size;$/;"	m	struct:str	typeref:typename:unsigned int	file:
diff --git a/Units/parser-c.r/c-trigraphs.d/expected.tags b/Units/parser-c.r/c-trigraphs.d/expected.tags
@@ -4,7 +4,7 @@ D	input.c	/^??=define D /;"	d	file:
 E	input.c	/^??=define E /;"	d	file:
 F	input.c	/^??=define F /;"	d	file:
 M3_INIT	input.c	/^??=define M3_INIT(/;"	d	file:
-STRINGIFY	input.c	/^??=define STRINGIFY(/;"	d	file:
+STRINGIFY	input.c	/^??=define STRINGIFY(x) STRINGIFY_/;"	d	file:
 STRINGIFY_INTERN	input.c	/^??=define STRINGIFY_INTERN(/;"	d	file:
 buf	input.c	/^  char *buf;$/;"	m	struct:str	typeref:typename:char *	file:
 len	input.c	/^  unsigned int len, size;$/;"	m	struct:str	typeref:typename:unsigned int	file:
diff --git a/Units/parser-c.r/macrodef.d/expected.tags b/Units/parser-c.r/macrodef.d/expected.tags
@@ -9,5 +9,5 @@ SYSCALL_DEFINEx	input.c	/^#define SYSCALL_DEFINEx(/;"	d	language:C	file:	signatu
 __SYSCALL_DEFINEx	input.c	/^#define __SYSCALL_DEFINEx(/;"	d	language:C	file:	signature:(x,name,...)	macrodef:__diag_push(); __diag_ignore(GCC, 8, "-Wattribute-alias", "Type aliasing is used to sanitize syscall arguments"); asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) __attribute__((alias(__stringify(__se_sys##name)))); ALLOW_ERROR_INJECTION(sys##name, ERRNO); static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) { long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__)); __MAP(x,__SC_TEST,__VA_ARGS__); __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); return ret; } __diag_pop(); static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 __MAP1	input.c	/^#define __MAP1(/;"	d	language:C	file:	signature:(m,t,a,...)	macrodef:m(t,a)
 __MAP2	input.c	/^#define __MAP2(/;"	d	language:C	file:	signature:(m,t,a,...)	macrodef:m(t,a), __MAP1(m,__VA_ARGS__)
-__MAP	input.c	/^#define __MAP(/;"	d	language:C	file:	signature:(n,...)	macrodef:__MAP##n(__VA_ARGS__)
+__MAP	input.c	/^#define __MAP(n,...) __MAP#/;"	d	language:C	file:	signature:(n,...)	macrodef:__MAP##n(__VA_ARGS__)
 __SC_DECL	input.c	/^#define __SC_DECL(/;"	d	language:C	file:	signature:(t,a)	macrodef:t a
diff --git a/Units/parser-cpreprocessor.r/macrodef.d/expected.tags b/Units/parser-cpreprocessor.r/macrodef.d/expected.tags
@@ -9,7 +9,7 @@ SYSCALL_DEFINEx	input.h	/^#define SYSCALL_DEFINEx(/;"	d	language:CPreProcessor	s
 __SYSCALL_DEFINEx	input.h	/^#define __SYSCALL_DEFINEx(/;"	d	language:CPreProcessor	signature:(x,name,...)	macrodef:__diag_push(); __diag_ignore(GCC, 8, "-Wattribute-alias", "Type aliasing is used to sanitize syscall arguments"); asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) __attribute__((alias(__stringify(__se_sys##name)))); ALLOW_ERROR_INJECTION(sys##name, ERRNO); static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); asmlinkage long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) { long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__)); __MAP(x,__SC_TEST,__VA_ARGS__); __PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); return ret; } __diag_pop(); static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
 __MAP1	input.h	/^#define __MAP1(/;"	d	language:CPreProcessor	signature:(m,t,a,...)	macrodef:m(t,a)
 __MAP2	input.h	/^#define __MAP2(/;"	d	language:CPreProcessor	signature:(m,t,a,...)	macrodef:m(t,a), __MAP1(m,__VA_ARGS__)
-__MAP	input.h	/^#define __MAP(/;"	d	language:CPreProcessor	signature:(n,...)	macrodef:__MAP##n(__VA_ARGS__)
+__MAP	input.h	/^#define __MAP(n,...) __MAP#/;"	d	language:CPreProcessor	signature:(n,...)	macrodef:__MAP##n(__VA_ARGS__)
 __SC_DECL	input.h	/^#define __SC_DECL(/;"	d	language:CPreProcessor	signature:(t,a)	macrodef:t a
 slash_fn	input.h	/^#define slash_fn(/;"	d	language:CPreProcessor	signature:(t)	macrodef:t fn (t i, t j) { return i / j; }
 question_fn	input.h	/^#define question_fn(/;"	d	language:CPreProcessor	signature:(t)	macrodef:t fn (t i, t j) { return (i < j)? i: j; }
diff --git a/Units/parser-cpreprocessor.r/macroexpand.d/expected.tags b/Units/parser-cpreprocessor.r/macroexpand.d/expected.tags
@@ -16,5 +16,5 @@ T	input-0.c	/^#define T /;"	d	file:	macrodef:int
 mytype0	input-0.c	/^typedef T mytype0;$/;"	t	typeref:typename:int	file:
 S	input-0.c	/^#define S /;"	d	file:	macrodef:int
 mytype1	input-0.c	/^typedef S mytype1;$/;"	t	typeref:typename:float	file:
-IO7__POX_ERRSUM__UPE_ERROR	input-1.c	/^#define IO7__POX_ERRSUM__UPE_ERROR /;"	d	file:	macrodef:GEN_MASK(IO7__POX_ERRSUM__UPE_ERROR)
+IO7__POX_ERRSUM__UPE_ERROR	input-1.c	/^#define IO7__POX_ERRSUM__UPE_ERROR        GEN_MASK(IO7__POX_ERRSUM__UPE_ERROR)/;"	d	file:	macrodef:GEN_MASK(IO7__POX_ERRSUM__UPE_ERROR)
 f	input-1.c	/^f(int err_sum)$/;"	f	typeref:typename:int	signature:(int err_sum)
diff --git a/Units/parser-fortran.r/bug670433.f90.d/expected.tags b/Units/parser-fortran.r/bug670433.f90.d/expected.tags
@@ -1,4 +1,4 @@
 bar	input.f90	/^    subroutine bar /;"	s	module:foobar
-f	input.f90	/^        real fu/;"	f	function:foo
+f	input.f90	/^        real function f(/;"	f	function:foo
 foo	input.f90	/^    integer function foo /;"	f	module:foobar
 foobar	input.f90	/^module foobar$/;"	m
diff --git a/Units/parser-fortran.r/bug734933.f90.d/expected.tags b/Units/parser-fortran.r/bug734933.f90.d/expected.tags
@@ -1,7 +1,7 @@
 ADD_COMPONENTS	input.f90	/^      SUBROUTINE ADD_COMPONENTS$/;"	s	module:MDCOMPONENTS
-COMP	input.f90	/^      TYPE (COMPO/;"	v	module:MDCOMPONENTS
+COMP	input.f90	/^      TYPE (COMPONENT), POINTER :: COMP$/;"	v	module:MDCOMPONENTS
 COMPONENT	input.f90	/^      TYPE COMPONENT$/;"	t	module:MDCOMPONENTS
-COMPONENTS	input.f90	/^      TYPE (COMPONENT_POINTER), DIMENSION(LIM_COMPONENTS)/;"	v	module:MDCOMPONENTS
+COMPONENTS	input.f90	/^      TYPE (COMPONENT_POINTER), DIMENSION(LIM_COMPONENTS) :: COMPONENTS, COMPONENTS_/;"	v	module:MDCOMPONENTS
 COMPONENTS_TMP	input.f90	/^      TYPE (COMPONENT_POINTER), DIMENSION(LIM_COMPONENTS) :: COMPONENTS, COMPONENTS_TMP$/;"	v	module:MDCOMPONENTS
 COMPONENT_POINTER	input.f90	/^      TYPE COMPONENT_POINTER /;"	t	module:MDCOMPONENTS
 COMP_TMP	input.f90	/^      TYPE (COMPONENT_POINTER) :: COMP_TMP$/;"	v	module:MDCOMPONENTS
@@ -12,5 +12,5 @@ NAME	input.f90	/^        CHARACTER (LEN=30) :: NAME$/;"	k	type:COMPONENT
 NCOMP	input.f90	/^      INTEGER (INT4) :: NUM_COMPONENTS = 0, NCOMP;/;"	v	module:MDCOMPONENTS
 NUM_COMPONENTS	input.f90	/^      INTEGER (INT4) :: NUM_COMPONENTS /;"	v	module:MDCOMPONENTS
 NUM_PART	input.f90	/^        INTEGER (INT4) :: NUM_PART$/;"	k	type:COMPONENT
-P	input.f90	/^        TYPE/;"	k	type:COMPONENT_POINTER
+P	input.f90	/^        TYPE (COMPONENT), POINTER :: P$/;"	k	type:COMPONENT_POINTER
 PART_LIST	input.f90	/^        REAL (REAL8), DIMENSION(:), POINTER :: PART_LIST$/;"	k	type:COMPONENT
diff --git a/Units/parser-fortran.r/bug858165.f90.d/expected.tags b/Units/parser-fortran.r/bug858165.f90.d/expected.tags
@@ -1,5 +1,5 @@
-a	input.f90	/^integer :: a,/;"	v	program:test
-b	input.f90	/^           b,/;"	v	program:test
-c	input.f90	/^           c,/;"	v	program:test
-d	input.f90	/^           d /;"	v	program:test
+a	input.f90	/^integer :: a, &   !comment on variable a$/;"	v	program:test
+b	input.f90	/^           b, &   !comment on variable b$/;"	v	program:test
+c	input.f90	/^           c, &   !comment on variable c$/;"	v	program:test
+d	input.f90	/^           d      !comment on variable d$/;"	v	program:test
 test	input.f90	/^program test$/;"	p
diff --git a/Units/parser-fortran.r/byte.f.d/expected.tags b/Units/parser-fortran.r/byte.f.d/expected.tags
@@ -1,7 +1,7 @@
 A	input.f	/^	BYTE A,/;"	v	program:byte_test
 A1	input.f	/^	BYTE A1,/;"	v	program:byte_test
 A2	input.f	/^	BYTE A2 /;"	v	program:byte_test
-B	input.f	/^	BY/;"	v	program:byte_test
+B	input.f	/^	BYTE A, B,/;"	v	program:byte_test
 B1	input.f	/^	BYTE A1, B1,/;"	v	program:byte_test
 B2	input.f	/^	BYTE A2 \/'x'\/, B2 /;"	v	program:byte_test
 C	input.f	/^	BYTE A, B, C /;"	v	program:byte_test
diff --git a/Units/parser-fortran.r/continuation.f90.d/expected.tags b/Units/parser-fortran.r/continuation.f90.d/expected.tags
@@ -1,4 +1,4 @@
-para_a	input.f90	/^para_a,/;"	v	module:test
-para_b	input.f90	/^para_b,/;"	v	module:test
-para_c	input.f90	/^para_c /;"	v	module:test
+para_a	input.f90	/^para_a,       & ! para_a /;"	v	module:test
+para_b	input.f90	/^para_b,       & ! para_b /;"	v	module:test
+para_c	input.f90	/^para_c          ! para_c /;"	v	module:test
 test	input.f90	/^module test$/;"	m
diff --git a/Units/parser-fortran.r/fortran-associate.d/expected.tags b/Units/parser-fortran.r/fortran-associate.d/expected.tags
@@ -1,4 +1,4 @@
-a	input.f90	/^  real/;"	v	module:with_associate
+a	input.f90	/^  real :: a$/;"	v	module:with_associate
 do_other_stuff	input.f90	/^  subroutine do_other_stuff(/;"	s	module:with_associate
 do_stuff	input.f90	/^  function do_stuff(/;"	f	module:with_associate
 with_associate	input.f90	/^module with_associate$/;"	m
diff --git a/Units/parser-fortran.r/fortran-bind-c.d/expected.tags b/Units/parser-fortran.r/fortran-bind-c.d/expected.tags
@@ -1,5 +1,5 @@
 __anon73f11bcd0105	input.f90	/^  interface$/;"	i	module:test_bind_c
-a	input.f90	/^    real/;"	k	type:atype
+a	input.f90	/^    real(c_double) :: a$/;"	k	type:atype
 atype	input.f90	/^  type, bind(c) :: atype$/;"	t	module:test_bind_c
 global_flag	input.f90	/^  integer(C_INT), bind(C, name="_MyProject_flags") :: global_flag$/;"	v	module:test_bind_c
 print_c	input.f90	/^    subroutine print_c(/;"	P	interface:__anon73f11bcd0105
diff --git a/Units/parser-fortran.r/fortran-derived-type-params.d/expected.tags b/Units/parser-fortran.r/fortran-derived-type-params.d/expected.tags
@@ -1,9 +1,9 @@
 Members	input.f90	/^module Members$/;"	m
 MySubroutine	input.f90	/^  subroutine MySubroutine(/;"	s	module:Members
 coordinates	input.f90	/^    REAL :: coordinates(/;"	k	type:general_point
-d	input.f90	/^    INTEGER(selected_/;"	k	type:humongous_matrix
+d	input.f90	/^    INTEGER(selected_int_kind(12)), LEN :: d$/;"	k	type:humongous_matrix
 dim	input.f90	/^    INTEGER, KIND :: dim$/;"	k	type:general_point
 element	input.f90	/^    REAL(k) :: element(/;"	k	type:humongous_matrix
 general_point	input.f90	/^  TYPE general_point(/;"	t	module:Members
 humongous_matrix	input.f90	/^  TYPE humongous_matrix(/;"	t	module:Members
-k	input.f90	/^    INTEGER, KIND :: k /;"	k	type:humongous_matrix
+k	input.f90	/^    INTEGER, KIND :: k = ki/;"	k	type:humongous_matrix
diff --git a/Units/parser-fortran.r/fortran-enum.d/expected.tags b/Units/parser-fortran.r/fortran-enum.d/expected.tags
@@ -9,7 +9,7 @@ Named6	input.f90	/^  enum*8 :: Named6$/;"	E	module:Constants
 Named7	input.f90	/^  enum, bind(c) :: Named7$/;"	E	module:Constants
 __anoncfbded350103	input.f90	/^  enum, bind(c) ! unnamed 1$/;"	E	module:Constants
 __anoncfbded350203	input.f90	/^  enum ! unnamed 2$/;"	E	module:Constants
-a	input.f90	/^    enumerat/;"	N	enum:__anoncfbded350203
+a	input.f90	/^    enumerator :: a,/;"	N	enum:__anoncfbded350203
 b	input.f90	/^    enumerator :: a, b,/;"	N	enum:__anoncfbded350203
 black	input.f90	/^    enumerator :: red =1, blue, black /;"	N	enum:__anoncfbded350103
 blue	input.f90	/^    enumerator :: red =1, blue,/;"	N	enum:__anoncfbded350103
diff --git a/Units/parser-fortran.r/fortran-forall.d/expected.tags b/Units/parser-fortran.r/fortran-forall.d/expected.tags
@@ -1,4 +1,4 @@
-a	input.f90	/^  real/;"	v	module:with_forall
+a	input.f90	/^  real :: a$/;"	v	module:with_forall
 sub_with_forall	input.f90	/^  subroutine sub_with_forall(/;"	s	module:with_forall
 two	input.f90	/^  function two(/;"	f	module:with_forall
 with_forall	input.f90	/^module with_forall$/;"	m
diff --git a/Units/parser-fortran.r/fortran-method.d/expected.tags b/Units/parser-fortran.r/fortran-method.d/expected.tags
@@ -1,6 +1,6 @@
 +	input.f90	/^    generic :: operator(+)/;"	M	type:atype
-=	input.f90	/^    generic :: assignment(=)/;"	M	type:atype
-add	input.f90	/^    generic :: add /;"	M	type:atype
+=	input.f90	/^    generic :: assignment(=) =>/;"	M	type:atype
+add	input.f90	/^    generic :: add => add_/;"	M	type:atype
 add_1d	input.f90	/^    procedure, deferred :: add_1d,/;"	M	type:atype	implementation:deferred
 add_2d	input.f90	/^    procedure, deferred :: add_1d, add_2d,/;"	M	type:atype	implementation:deferred
 add_3d	input.f90	/^    procedure, deferred :: add_1d, add_2d, add_3d$/;"	M	type:atype	implementation:deferred
diff --git a/Units/parser-fortran.r/fortran-pointer.d/expected.tags b/Units/parser-fortran.r/fortran-pointer.d/expected.tags
@@ -7,6 +7,6 @@ ProcPointTwo	input.f90	/^  => null(), ProcPointTwo /;"	v	program:Main
 ProcTwo	input.f90	/^  function ProcTwo(/;"	f	module:Test
 Test	input.f90	/^module Test$/;"	m
 myparameter	input.f90	/^  real, parameter :: myparameter$/;"	v	module:Test
-variable	input.f90	/^  real :: variable,/;"	v	program:Main
+variable	input.f90	/^  real :: variable, variable_/;"	v	program:Main
 variable_three	input.f90	/^  integer :: variable_three$/;"	v	program:Main
 variable_two	input.f90	/^  real :: variable, variable_two$/;"	v	program:Main
diff --git a/Units/parser-fortran.r/fortran-procedure.d/expected.tags b/Units/parser-fortran.r/fortran-procedure.d/expected.tags
@@ -1,4 +1,4 @@
-a	input.f90	/^  real/;"	v	module:proc_pointer
+a	input.f90	/^  real :: a$/;"	v	module:proc_pointer
 my_pointer	input.f90	/^  procedure(sub), pointer :: my_pointer$/;"	v	module:proc_pointer
 proc_pointer	input.f90	/^module proc_pointer$/;"	m
-sub	input.f90	/^  subr/;"	s	module:proc_pointer
+sub	input.f90	/^  subroutine sub(/;"	s	module:proc_pointer
diff --git a/Units/parser-fortran.r/fortran-protected.d/expected.tags b/Units/parser-fortran.r/fortran-protected.d/expected.tags
@@ -1,2 +1,2 @@
-i	input.f90	/^  in/;"	v	module:test_implementation
+i	input.f90	/^  integer, public, protected :: i$/;"	v	module:test_implementation
 test_implementation	input.f90	/^module test_implementation$/;"	m
diff --git a/Units/parser-fortran.r/implied_program.f.d/expected.tags b/Units/parser-fortran.r/implied_program.f.d/expected.tags
@@ -1 +1 @@
-i	input.f	/^	in/;"	v
+i	input.f	/^	integer i$/;"	v
diff --git a/Units/parser-fortran.r/invalid_name.f90.d/expected.tags b/Units/parser-fortran.r/invalid_name.f90.d/expected.tags
@@ -4,4 +4,4 @@ DR_Lun	input.f90	/^      Integer :: DR_Lun$/;"	v	module:TR_DetectionRecording
 Detection_Record	input.f90	/^      Type Detection_Record$/;"	t	module:TR_DetectionRecording
 Face	input.f90	/^         Integer(2) :: Face$/;"	k	type:Detection_Record
 TR_DetectionRecording	input.f90	/^      Module TR_DetectionRecording$/;"	m
-Type	input.f90	/^         Integer(2) :: Type /;"	k	type:Detection_Record
+Type	input.f90	/^         Integer(2) :: Type           ! "Type"/;"	k	type:Detection_Record
diff --git a/Units/parser-fortran.r/misc_types.f90.d/expected.tags b/Units/parser-fortran.r/misc_types.f90.d/expected.tags
@@ -1,7 +1,7 @@
 align_second_16	input.f90	/^	integer(2) :: align_second_16$/;"	k	type:my_struct
 base_type	input.f90	/^	integer base_type$/;"	v	program:testalloc
 first_byte	input.f90	/^	integer(1) :: first_byte$/;"	k	type:my_struct
-i	input.f90	/^	in/;"	v	program:testalloc
+i	input.f90	/^	integer i,/;"	v	program:testalloc
 i2	input.f90	/^	integer i2$/;"	v	program:testalloc
 i3	input.f90	/^	integer i3$/;"	v	program:testalloc
 i4	input.f90	/^	integer i4$/;"	v	program:testalloc
diff --git a/Units/parser-fortran.r/multi-input-fixed-then-free.d/expected.tags b/Units/parser-fortran.r/multi-input-fixed-then-free.d/expected.tags
@@ -1,4 +1,4 @@
 p1	input.f	/^      program p1$/;"	p
 s	input.f	/^      character*5  s$/;"	v	program:p1
-r	input.f	/^      chara/;"	v	program:p1
+r	input.f	/^      character*5  r$/;"	v	program:p1
 s1	input-0.f90	/^subroutine s1$/;"	s
diff --git a/Units/parser-fortran.r/multi-input-free-then-fixed.d/expected.tags b/Units/parser-fortran.r/multi-input-free-then-fixed.d/expected.tags
@@ -1,4 +1,4 @@
 s1	input.f90	/^subroutine s1$/;"	s
 p1	input-0.f	/^      program p1$/;"	p
 s	input-0.f	/^      character*5  s$/;"	v	program:p1
-r	input-0.f	/^      chara/;"	v	program:p1
+r	input-0.f	/^      character*5  r$/;"	v	program:p1
diff --git a/Units/parser-fortran.r/pure_elem.f95.d/expected.tags b/Units/parser-fortran.r/pure_elem.f95.d/expected.tags
@@ -1,4 +1,4 @@
-F	input.f95	/^	PURE REAL FU/;"	f
+F	input.f95	/^	PURE REAL FUNCTION F(x,y) ! pure broken returns 'PURE REAL FU/;"	f
 elem_maxabs	input.f95	/^	ELEMENTAL REAL FUNCTION elem_maxabs(/;"	f
 pure_func	input.f95	/^	PURE REAL FUNCTION pure_func(/;"	f
 pure_maxabs2	input.f95	/^	PURE REAL FUNCTION pure_maxabs2(/;"	f
diff --git a/Units/parser-fortran.r/stdcall.f.d/expected.tags b/Units/parser-fortran.r/stdcall.f.d/expected.tags
@@ -10,20 +10,20 @@
 D02CJW	input.f	/^      DOUBLE PRECISION D02CJW,/;"	v
 FCN	input.f	/^      STDCALL SUBROUTINE FCN(/;"	s
 G	input.f	/^      DOUBLE PRECISION D02CJW, G,/;"	v
-G	input.f	/^      STDCALL DOUBLE PRECISION FUNCTION G(/;"	f
+G	input.f	/^      STDCALL DOUBLE PRECISION FUNCTION G(T,Y)                          !CHANGE/;"	f
 H	input.f	/^      DOUBLE PRECISION H,/;"	v
-I	input.f	/^      IN/;"	v
+I	input.f	/^      INTEGER          I, IFAIL/;"	v
 IFAIL	input.f	/^      INTEGER          I, IFAIL,/;"	v
 IW	input.f	/^      INTEGER          N, IW$/;"	v
 J	input.f	/^      INTEGER          I, IFAIL, J$/;"	v
 K	input.f	/^      INTEGER          K$/;"	v
-N	input.f	/^      INT/;"	v
+N	input.f	/^      INTEGER          N,/;"	v
 NOUT	input.f	/^      INTEGER          NOUT$/;"	v
-OUT	input.f	/^      STDCALL SUBROUTI/;"	s
+OUT	input.f	/^      STDCALL SUBROUTINE OUT(/;"	s
 PI	input.f	/^      DOUBLE PRECISION PI,/;"	v
 RELABS	input.f	/^      CHARACTER        RELABS*/;"	v
 TOL	input.f	/^      DOUBLE PRECISION PI, TOL,/;"	v
-W	input.f	/^      DOUBLE PRECISION W(/;"	v
+W	input.f	/^      DOUBLE PRECISION W(IW)/;"	v
 X	input.f	/^      DOUBLE PRECISION PI, TOL, X$/;"	v
 X01AAF	input.f	/^      DOUBLE PRECISION D02CJW, G, X01AAF$/;"	v
 XEND	input.f	/^      DOUBLE PRECISION H, XEND$/;"	v
diff --git a/Units/parser-fypp.r/first-if-area.d/expected.tags b/Units/parser-fypp.r/first-if-area.d/expected.tags
@@ -1,4 +1,4 @@
-STRU	input.fy	/^STRUC/;"	t
+STRU	input.fy	/^STRUCTURE \/STRU\//;"	t
 X	input.fy	/^	INTEGER*4 X$/;"	k	type:STRU
 A0	input.fy	/^	INTEGER*4 A0$/;"	k	type:STRU
 B0	input.fy	/^	INTEGER*4 B0$/;"	k	type:STRU
diff --git a/Units/parser-fypp.r/if-cont.d/expected.tags b/Units/parser-fypp.r/if-cont.d/expected.tags
@@ -1,4 +1,4 @@
-STRU	input.fy	/^STRUC/;"	t
+STRU	input.fy	/^STRUCTURE \/STRU\//;"	t
 X	input.fy	/^	INTEGER*4 X$/;"	k	type:STRU
 A0	input.fy	/^	INTEGER*4 A0$/;"	k	type:STRU
 B0	input.fy	/^	INTEGER*4 B0$/;"	k	type:STRU
diff --git a/main/entry.c b/main/entry.c
@@ -739,7 +739,7 @@ extern size_t truncateTagLineAfterTag (
 		char *const line, const char *const token, const bool discardNewline)
 {
 	size_t len = 0;
-	char *p = strstr (line, token);
+	char *p = strrstr (line, token);
 
 	if (p != NULL)
 	{
