Merge pull request #4198 from masatake/cpreprocessor--rich-ungetstr

CPreProcessor: adjust line numbers when reading characters from unget-chars-buffer

Units/parser-asm.r/asm-cpp-macro-expansion-with-multi-line-args-last-items.b/args.ctags

@@ -0,0 +1,7 @@
+--sort=no
+--param-Asm.useCPreProcessor=1
+--param-CPreProcessor._expand=1
+--fields=+{signature}{line}
+--fields-CPreProcessor=+{macrodef}
+--param-Asm.commentCharsAtBOL=#
+--param-Asm.extraLinesepChars=;

Units/parser-asm.r/asm-cpp-macro-expansion-with-multi-line-args-last-items.b/expected.tags

@@ -0,0 +1,7 @@
+ENTRY	input.S	/^#define ENTRY(/;"	d	line:1	file:	signature:(SYMBOL,LABEL)	macrodef:.global SYMBOL ;LABEL: nop
+E	input.S	/^ENTRY($/;"	s	line:6
+F	input.S	/^	F)$/;"	l	line:7
+G	input.S	/^ENTRY($/;"	s	line:10
+H	input.S	/^	)$/;"	l	line:11
+I	input.S	/^ENTRY($/;"	s	line:15
+J	input.S	/^	)$/;"	l	line:16

Units/parser-asm.r/asm-cpp-macro-expansion-with-multi-line-args-last-items.b/input.S

@@ -0,0 +1,18 @@
+#define ENTRY(SYMBOL,LABEL) .global SYMBOL	;\
+LABEL: \
+	nop
+
+ENTRY(
+	E,
+	F)
+
+ENTRY(
+	G,
+	H
+	)
+
+ENTRY(
+	I,
+	J,K,
+	L
+	)

Units/parser-asm.r/asm-cpp-macro-expansion-with-multi-line-args.d/args.ctags

@@ -1,7 +1,7 @@
 --sort=no
 --param-Asm.useCPreProcessor=1
 --param-CPreProcessor._expand=1
---fields=+{signature}
+--fields=+{signature}{line}
 --fields-CPreProcessor=+{macrodef}
 --param-Asm.commentCharsAtBOL=#
 --param-Asm.extraLinesepChars=;

Units/parser-asm.r/asm-cpp-macro-expansion-with-multi-line-args.d/expected.tags

@@ -1,11 +1,5 @@
-ENTRY	input.S	/^#define ENTRY(/;"	d	file:	signature:(SYMBOL,LABEL)	macrodef:.global SYMBOL ;LABEL: nop
-A	input.S	/^ENTRY(A, B)$/;"	s
-B	input.S	/^ENTRY(A, B)$/;"	l
-C	input.S	/^	D)$/;"	s
-D	input.S	/^	D)$/;"	l
-E	input.S	/^	F)$/;"	s
-F	input.S	/^	F)$/;"	l
-G	input.S	/^	)$/;"	s
-H	input.S	/^	)$/;"	l
-I	input.S	/^	)$/;"	s
-J	input.S	/^	)$/;"	l
+ENTRY	input.S	/^#define ENTRY(/;"	d	line:1	file:	signature:(SYMBOL,LABEL)	macrodef:.global SYMBOL ;LABEL: nop
+A	input.S	/^ENTRY(A, B)$/;"	s	line:5
+B	input.S	/^ENTRY(A, B)$/;"	l	line:5
+C	input.S	/^ENTRY(C,$/;"	s	line:6
+D	input.S	/^	D)$/;"	l	line:7

Units/parser-asm.r/asm-cpp-macro-expansion-with-multi-line-args.d/input.S

@@ -5,16 +5,3 @@ LABEL: \
 ENTRY(A, B)
 ENTRY(C,
 	D)
-ENTRY(
-	E,
-	F)
-ENTRY(
-	G,
-	H
-	)
-
-ENTRY(
-	I,
-	J,K,
-	L
-	)

Units/parser-c.r/macroexpand-with-linenum-adjustment.d/args.ctags

@@ -0,0 +1,6 @@
+--sort=no
+--fields=+ne
+-D SYSCALL_DEFINE3(name,...)=long name(__VA_ARGS__)
+--param-CPreProcessor._expand=1
+--fields=+{signature}
+--fields-C=+{macrodef}

Units/parser-c.r/macroexpand-with-linenum-adjustment.d/expected.tags

@@ -0,0 +1,8 @@
+faccessat	input.c	/^SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)$/;"	f	line:1	typeref:typename:long	signature:(int,dfd,const char __user *,filename,int,mode)	end:4
+fchmodat	input.c	/^SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename,$/;"	f	line:6	typeref:typename:long	signature:(int,dfd,const char __user *,filename,umode_t,mode)	end:10
+mysyscall	input.c	/^	mysyscall, int, dfd,$/;"	f	line:16	typeref:typename:long	signature:(int,dfd,const char __user *,filename,umode_t,mode)	end:21
+INJECT_MEMBERS	input.c	/^#define INJECT_MEMBERS(/;"	d	line:23	file:	signature:(m0,m1)	end:26	macrodef:int m0; int padding; int m1
+P	input.c	/^struct P {$/;"	s	line:28	file:	end:33
+x	input.c	/^		x$/;"	m	line:30	struct:P	typeref:typename:int	file:
+padding	input.c	/^	INJECT_MEMBERS($/;"	m	line:29	struct:P	typeref:typename:int	file:	end:29
+y	input.c	/^		y);$/;"	m	line:32	struct:P	typeref:typename:int	file:	end:32

Units/parser-c.r/macroexpand-with-linenum-adjustment.d/input.c

@@ -0,0 +1,33 @@
+SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
+{
+        return do_faccessat(dfd, filename, mode, 0);
+}
+
+SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename,
+                umode_t, mode)
+{
+        return do_fchmodat(dfd, filename, mode, 0);
+}
+
+SYSCALL_DEFINE3(
+	/*
+	 * noise
+	 */
+	mysyscall, int, dfd,
+	const char __user *, filename,
+                umode_t, mode)
+{
+        return 0;
+}
+
+#define INJECT_MEMBERS(m0, m1) \
+	int m0; \
+	int padding; \
+	int m1
+
+struct P {
+	INJECT_MEMBERS(
+		x
+		,
+		y);
+};

Units/parser-ldscript.r/lds-invalid-macro-call.d/args.ctags

@@ -0,0 +1,5 @@
+--sort=no
+--param-CPreProcessor._expand=1
+--fields=+{signature}{roles}{line}
+--fields-CPreProcessor=+{macrodef}
+--extras=+r

Units/parser-ldscript.r/lds-invalid-macro-call.d/expected.tags

@@ -0,0 +1,2 @@
+S	input.lds.S	/^#define S(A) A: AT(ADDR(.altinstr_aux) - LOAD_OFFSE/;"	d	line:1	file:	signature:(A)	roles:def	macrodef:A: AT(ADDR(.altinstr_aux) - LOAD_OFFSET) { *(A) }
+_etext	input.lds.S	/^	_etext = .;$/;"	s	line:7	roles:def

Units/parser-ldscript.r/lds-invalid-macro-call.d/input.lds.S

@@ -0,0 +1,9 @@
+#define S(A) A: AT(ADDR(.altinstr_aux) - LOAD_OFFSET) { \
+             *(A) \
+}
+
+SECTIONS
+{
+	_etext = .;
+	S(.altinstr_aux
+}

Units/parser-ldscript.r/lds-macro-expansion.d/args.ctags

@@ -1,5 +1,5 @@
 --sort=no
 --param-CPreProcessor._expand=1
---fields=+{signature}{roles}
+--fields=+{signature}{roles}{line}
 --fields-CPreProcessor=+{macrodef}
 --extras=+r

Units/parser-ldscript.r/lds-macro-expansion.d/expected.tags

@@ -1,10 +1,10 @@
-MEM_DISCARD	input.lds.S	/^#define MEM_DISCARD(/;"	d	file:	signature:(sec)	roles:def	macrodef:*(.mem##sec)
-INIT_TEXT	input.lds.S	/^#define INIT_TEXT(/;"	d	file:	signature:(X,A)	roles:def	macrodef:*A *X MEM_DISCARD(init.text*)
-INIT_TEXT_SECTION	input.lds.S	/^#define INIT_TEXT_SECTION(/;"	d	file:	signature:(inittext_align,Y,B)	roles:def	macrodef:. = ALIGN(inittext_align); .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { _sinittext = .; INIT_TEXT(Y,B) _einittext = .; }
-.init.text	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	S	roles:def
-_sinittext	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	s	section:.init.text	roles:def
-.init.text	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	i	section:.init.text	roles:mapped
-.init.text.	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	i	section:.init.text	roles:mapped
-.text.startup	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	i	section:.init.text	roles:mapped
-.meminit.text	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	i	section:.init.text	roles:mapped
-_einittext	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))$/;"	s	section:.init.text	roles:def
+MEM_DISCARD	input.lds.S	/^#define MEM_DISCARD(/;"	d	line:4	file:	signature:(sec)	roles:def	macrodef:*(.mem##sec)
+INIT_TEXT	input.lds.S	/^#define INIT_TEXT(/;"	d	line:6	file:	signature:(X,A)	roles:def	macrodef:*A *X MEM_DISCARD(init.text*)
+INIT_TEXT_SECTION	input.lds.S	/^#define INIT_TEXT_SECTION(/;"	d	line:11	file:	signature:(inittext_align,Y,B)	roles:def	macrodef:. = ALIGN(inittext_align); .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { _sinittext = .; INIT_TEXT(Y,B) _einittext = .; }
+.init.text	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE$/;"	S	line:22	roles:def
+_sinittext	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE$/;"	s	line:22	section:.init.text	roles:def
+.init.text	input.lds.S	/^	(.init.text .init.text.*)$/;"	i	line:26	section:.init.text	roles:mapped
+.init.text.	input.lds.S	/^	(.init.text .init.text.*)$/;"	i	line:26	section:.init.text	roles:mapped
+.text.startup	input.lds.S	/^	(.text.startup)$/;"	i	line:24	section:.init.text	roles:mapped
+.meminit.text	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE$/;"	i	line:22	section:.init.text	roles:mapped
+_einittext	input.lds.S	/^	INIT_TEXT_SECTION(PAGE_SIZE$/;"	s	line:22	section:.init.text	roles:def

Units/parser-ldscript.r/lds-macro-expansion.d/input.lds.S

@@ -19,7 +19,12 @@
 
 SECTIONS
 {
-	INIT_TEXT_SECTION(PAGE_SIZE,(.text.startup),(.init.text .init.text.*))
+	INIT_TEXT_SECTION(PAGE_SIZE
+	,
+	(.text.startup)
+	,
+	(.init.text .init.text.*)
+	)
 #ifdef CONFIG_X86_64
 	:init
 #endif