diff --git a/src/test/out/awk.c b/src/test/out/awk.c
index 40e77739..6c17ca36 100644
--- a/src/test/out/awk.c
+++ b/src/test/out/awk.c
@@ -28364,61 +28364,61 @@ FID	NAME	RO
 27	time.h	1
 28	tran.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	5	0	0	5	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	660	2	3	4	NULL	NULL	NULL	NULL	NULL	4220	258	505	0	337	114	15	22	15	1	9	1	1	4	-1	4	0	0	5	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	6	0	6	92	0	4	0	0
-4	1	13892	1405	2856	0	16	486	96	667	NULL	3	4	0	3	0	0	0	4073	258	466	0	292	114	15	22	15	1	9	1	1	4	-1	4	0	0	5	263	374	379	711	37	94	99	147	0	1	3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
-5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	51	47	60	158	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	0	0	1	NULL	NULL	NULL	NULL	NULL	285	23	56	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-7	1	3077	1916	209	0	3	79	77	45	NULL	0	1	5	10	3	0	1	317	24	56	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	13	3	39	23	1	2	26	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-8	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	2	1	NULL	NULL	NULL	NULL	NULL	358	74	43	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	36	0	6	32	0	0
-8	1	6429	2737	674	0	58	233	92	466	NULL	2	3	2	77	1	22	50	953	78	96	0	53	0	1	2	1	0	0	0	0	0	0	0	0	0	0	41	34	102	174	40	9	75	122	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	0	0	1	NULL	NULL	NULL	NULL	NULL	1740	163	304	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
-9	1	6853	1167	834	0	2	195	84	46	NULL	0	1	0	0	0	0	0	1740	163	304	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	163	195	0	368	163	5	0	178	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-10	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	1	0	NULL	NULL	NULL	NULL	NULL	26	6	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	NULL	5	1	3	NULL	4	0	NULL	NULL	0	0	1	0	1	4	0	0
-10	1	1923	0	298	0	0	100	24	13	NULL	1	0	0	92	0	0	92	393	6	3	0	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	96	92	97	1	95	92	96	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-11	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	241	6	7	6	NULL	NULL	NULL	NULL	NULL	6649	616	1110	0	475	67	45	119	28	9	79	6	12	30	5	4	3	4	73	357	140	NULL	1321	65	10	NULL	174	3	NULL	NULL	26	1	10	5	1	3	0	0
-11	1	22382	4464	4373	0	91	942	93	232	NULL	7	5	0	20	1	6	6	5959	572	957	0	258	63	45	103	28	9	55	6	12	30	5	4	3	4	73	337	196	211	1446	61	21	31	201	3	1	6	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-12	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	110	16	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	3	0	0	0	0	0
-12	1	3554	2218	192	0	3	90	77	85	NULL	0	3	0	24	1	13	9	477	16	38	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	24	0	33	57	16	0	22	38	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-13	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	48	0	1	2	NULL	NULL	NULL	NULL	NULL	329	36	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	2	4	0	0
-13	1	3496	1964	291	0	8	112	77	60	NULL	1	2	5	17	4	0	5	385	37	40	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	29	23	10	62	29	4	7	40	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-14	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	573	5	6	4	NULL	NULL	NULL	NULL	NULL	4326	541	468	0	308	147	125	126	35	4	54	4	22	7	2	0	0	0	68	400	6	NULL	700	44	3	NULL	87	0	NULL	NULL	11	0	14	0	1	3	0	0
-14	1	12811	2083	2985	0	44	583	77	617	NULL	6	3	2	12	1	1	1	3282	373	440	0	91	131	69	70	36	4	54	4	22	7	2	0	0	0	13	228	134	227	745	44	64	86	172	0	1	6	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-15	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	252	4	6	5	NULL	NULL	NULL	NULL	NULL	5465	507	979	0	338	66	72	111	11	1	6	0	12	19	9	1	2	0	19	553	34	NULL	1109	102	10	NULL	197	0	NULL	NULL	28	0	18	2	0	0	0	0
-15	1	16671	2991	2986	0	56	689	86	63	NULL	5	4	0	11	0	0	2	4058	467	674	0	137	56	72	89	11	1	6	0	12	19	9	1	2	0	19	427	31	151	1095	99	10	28	219	0	1	9	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-16	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
-16	1	163	54	20	0	2	13	38	35	NULL	0	0	0	5	1	0	3	20	1	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	4	5	1	0	3	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-17	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	5	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-17	1	2382	2006	56	0	3	57	81	24	NULL	0	4	0	7	1	4	1	118	1	12	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	7	9	0	1	5	6	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-18	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	174	23	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
-18	1	1276	453	124	0	4	52	68	29	NULL	0	2	0	4	1	0	2	193	23	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	24	0	3	27	23	0	2	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-19	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	67	4	4	5	NULL	NULL	NULL	NULL	NULL	921	119	110	0	92	14	23	28	6	1	7	1	9	1	1	0	0	0	5	109	1	NULL	170	46	1	NULL	51	0	NULL	NULL	3	0	13	0	0	0	0	0
-19	1	5155	1878	754	0	27	190	107	70	NULL	4	3	0	9	0	0	1	893	116	98	0	73	14	23	25	6	1	7	1	9	1	1	0	0	0	5	97	1	23	181	44	1	13	62	0	1	8	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-20	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	0	1	1	NULL	NULL	NULL	NULL	NULL	88	21	13	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	18	0	0
-20	1	2677	1926	119	0	4	81	77	89	NULL	1	1	2	14	2	0	9	137	21	13	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	11	13	2	0	10	12	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-21	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-21	1	2622	2072	173	0	9	60	77	78	NULL	0	2	0	12	1	0	10	90	4	6	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	4	11	17	2	2	10	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-22	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	858	0	3	3	NULL	NULL	NULL	NULL	NULL	1001	51	59	0	109	1	152	4	1	0	0	0	0	3	1	0	2	0	1	44	1	NULL	96	15	1	NULL	27	0	NULL	NULL	1	0	3	0	1	3	0	0
-22	1	5129	1371	660	0	4	168	82	923	NULL	3	3	0	6	0	0	1	977	51	47	0	15	1	152	4	1	0	0	0	0	3	1	0	2	0	1	42	72	86	180	14	67	69	95	0	1	5	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-23	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	5	4	NULL	NULL	NULL	NULL	NULL	1321	132	229	0	56	0	6	13	2	0	0	0	0	3	0	0	0	0	28	60	89	NULL	392	36	2	NULL	118	0	NULL	NULL	23	0	2	0	0	0	0	0
-23	1	5185	1548	794	0	15	276	75	52	NULL	3	4	0	7	0	0	2	1295	128	216	0	25	0	6	11	2	0	0	0	0	3	0	0	0	0	28	59	91	34	421	34	4	18	133	0	1	5	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-24	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1028	1	2	1	NULL	NULL	NULL	NULL	NULL	816	7	104	0	6	0	93	1	0	0	0	0	0	0	0	0	0	0	2	95	4	NULL	107	39	3	NULL	44	0	NULL	NULL	1	0	1	1	0	0	0	0
-24	1	5123	1280	793	0	184	205	39	1136	NULL	2	1	0	3	0	0	0	824	7	104	0	3	0	93	1	0	0	0	0	0	0	0	0	0	0	2	95	7	3	110	39	5	2	46	0	1	3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-25	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	110	7	7	5	NULL	NULL	NULL	NULL	NULL	14020	1556	2276	0	831	82	131	344	167	8	61	8	46	34	11	3	2	5	101	920	236	NULL	3310	148	18	NULL	474	4	NULL	NULL	51	0	17	9	2	7	0	0
-25	1	43298	6307	8735	0	190	1913	95	83	NULL	7	4	8	24	3	1	3	12189	1370	1887	0	394	82	125	247	86	8	61	8	46	34	11	3	2	5	101	791	293	438	3515	142	57	115	583	4	1	9	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-26	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-26	1	2370	2229	22	0	3	53	77	26	NULL	0	1	0	3	1	0	1	29	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3	2	7	2	1	1	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-27	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	0	1	1	NULL	NULL	NULL	NULL	NULL	134	23	14	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	11	0	0
-27	1	3473	2519	157	0	14	97	77	50	NULL	1	1	5	17	5	0	2	185	24	14	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	13	10	32	9	3	5	17	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-28	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	103	4	5	4	NULL	NULL	NULL	NULL	NULL	3257	324	621	0	183	21	70	63	10	1	6	1	9	10	0	0	2	0	18	230	67	NULL	727	69	6	NULL	144	0	NULL	NULL	18	1	27	0	0	0	0	0
-28	1	12420	2921	1965	0	73	452	104	75	NULL	5	4	0	10	0	0	3	2893	297	527	0	60	21	63	48	10	1	6	1	9	10	0	0	2	0	18	203	67	125	806	66	6	24	165	0	1	7	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	0	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	5	0	0	5	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	660	2	3	4	NULL	NULL	NULL	NULL	NULL	4220	258	505	0	337	114	15	NULL	NULL	22	15	1	9	1	1	4	-1	4	0	0	5	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	6	0	6	92	0	4	0	0
+4	1	13892	1405	2856	0	16	486	96	667	NULL	3	4	0	3	0	0	0	4073	258	466	0	292	114	15	0	0	22	15	1	9	1	1	4	-1	4	0	0	5	263	374	379	711	37	94	99	147	0	1	3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
+5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	51	47	60	158	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	0	0	1	NULL	NULL	NULL	NULL	NULL	285	23	56	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+7	1	3077	1916	209	0	3	79	77	45	NULL	0	1	5	10	3	0	1	317	24	56	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	13	3	39	23	1	2	26	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+8	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	2	1	NULL	NULL	NULL	NULL	NULL	358	74	43	0	7	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	36	0	6	32	0	0
+8	1	6429	2737	674	0	58	233	92	466	NULL	2	3	2	77	1	22	50	953	78	96	0	53	0	1	0	0	2	1	0	0	0	0	0	0	0	0	0	0	41	34	102	174	40	9	75	122	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	0	0	1	NULL	NULL	NULL	NULL	NULL	1740	163	304	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
+9	1	6853	1167	834	0	2	195	84	46	NULL	0	1	0	0	0	0	0	1740	163	304	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	163	195	0	368	163	5	0	178	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+10	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	1	0	NULL	NULL	NULL	NULL	NULL	26	6	3	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	4	NULL	5	1	3	NULL	4	0	NULL	NULL	0	0	1	0	1	4	0	0
+10	1	1923	0	298	0	0	100	24	13	NULL	1	0	0	92	0	0	92	393	6	3	0	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	96	92	97	1	95	92	96	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+11	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	241	6	7	6	NULL	NULL	NULL	NULL	NULL	6649	616	1110	0	475	67	45	NULL	NULL	119	28	9	79	6	12	30	5	4	3	4	73	357	140	NULL	1321	65	10	NULL	174	3	NULL	NULL	26	1	10	5	1	3	0	0
+11	1	22382	4464	4373	0	91	942	93	232	NULL	7	5	0	20	1	6	6	5959	572	957	0	258	63	45	0	0	103	28	9	55	6	12	30	5	4	3	4	73	337	196	211	1446	61	21	31	201	3	1	6	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+12	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	110	16	3	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	3	0	0	0	0	0
+12	1	3554	2218	192	0	3	90	77	85	NULL	0	3	0	24	1	13	9	477	16	38	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	24	0	33	57	16	0	22	38	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+13	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	48	0	1	2	NULL	NULL	NULL	NULL	NULL	329	36	40	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	2	4	0	0
+13	1	3496	1964	291	0	8	112	77	60	NULL	1	2	5	17	4	0	5	385	37	40	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	29	23	10	62	29	4	7	40	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+14	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	573	5	6	4	NULL	NULL	NULL	NULL	NULL	4326	541	468	0	308	147	125	NULL	NULL	126	35	4	54	4	22	7	2	0	0	0	68	400	6	NULL	700	44	3	NULL	87	0	NULL	NULL	11	0	14	0	1	3	0	0
+14	1	12811	2083	2985	0	44	583	77	617	NULL	6	3	2	12	1	1	1	3282	373	440	0	91	131	69	0	0	70	36	4	54	4	22	7	2	0	0	0	13	228	134	227	745	44	64	86	172	0	1	6	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+15	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	252	4	6	5	NULL	NULL	NULL	NULL	NULL	5465	507	979	0	338	66	72	NULL	NULL	111	11	1	6	0	12	19	9	1	2	0	19	553	34	NULL	1109	102	10	NULL	197	0	NULL	NULL	28	0	18	2	0	0	0	0
+15	1	16671	2991	2986	0	56	689	86	63	NULL	5	4	0	11	0	0	2	4058	467	674	0	137	56	72	0	0	89	11	1	6	0	12	19	9	1	2	0	19	427	31	151	1095	99	10	28	219	0	1	9	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+16	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
+16	1	163	54	20	0	2	13	38	35	NULL	0	0	0	5	1	0	3	20	1	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	4	5	1	0	3	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+17	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	5	1	1	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+17	1	2382	2006	56	0	3	57	81	24	NULL	0	4	0	7	1	4	1	118	1	12	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	7	9	0	1	5	6	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+18	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	174	23	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
+18	1	1276	453	124	0	4	52	68	29	NULL	0	2	0	4	1	0	2	193	23	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	24	0	3	27	23	0	2	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+19	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	67	4	4	5	NULL	NULL	NULL	NULL	NULL	921	119	110	0	92	14	23	NULL	NULL	28	6	1	7	1	9	1	1	0	0	0	5	109	1	NULL	170	46	1	NULL	51	0	NULL	NULL	3	0	13	0	0	0	0	0
+19	1	5155	1878	754	0	27	190	107	70	NULL	4	3	0	9	0	0	1	893	116	98	0	73	14	23	0	0	25	6	1	7	1	9	1	1	0	0	0	5	97	1	23	181	44	1	13	62	0	1	8	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+20	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	0	1	1	NULL	NULL	NULL	NULL	NULL	88	21	13	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	18	0	0
+20	1	2677	1926	119	0	4	81	77	89	NULL	1	1	2	14	2	0	9	137	21	13	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	11	13	2	0	10	12	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+21	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+21	1	2622	2072	173	0	9	60	77	78	NULL	0	2	0	12	1	0	10	90	4	6	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	4	11	17	2	2	10	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+22	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	858	0	3	3	NULL	NULL	NULL	NULL	NULL	1001	51	59	0	109	1	152	NULL	NULL	4	1	0	0	0	0	3	1	0	2	0	1	44	1	NULL	96	15	1	NULL	27	0	NULL	NULL	1	0	3	0	1	3	0	0
+22	1	5129	1371	660	0	4	168	82	923	NULL	3	3	0	6	0	0	1	977	51	47	0	15	1	152	0	0	4	1	0	0	0	0	3	1	0	2	0	1	42	72	86	180	14	67	69	95	0	1	5	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+23	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	5	4	NULL	NULL	NULL	NULL	NULL	1321	132	229	0	56	0	6	NULL	NULL	13	2	0	0	0	0	3	0	0	0	0	28	60	89	NULL	392	36	2	NULL	118	0	NULL	NULL	23	0	2	0	0	0	0	0
+23	1	5185	1548	794	0	15	276	75	52	NULL	3	4	0	7	0	0	2	1295	128	216	0	25	0	6	0	0	11	2	0	0	0	0	3	0	0	0	0	28	59	91	34	421	34	4	18	133	0	1	5	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+24	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1028	1	2	1	NULL	NULL	NULL	NULL	NULL	816	7	104	0	6	0	93	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	2	95	4	NULL	107	39	3	NULL	44	0	NULL	NULL	1	0	1	1	0	0	0	0
+24	1	5123	1280	793	0	184	205	39	1136	NULL	2	1	0	3	0	0	0	824	7	104	0	3	0	93	0	0	1	0	0	0	0	0	0	0	0	0	0	2	95	7	3	110	39	5	2	46	0	1	3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+25	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	110	7	7	5	NULL	NULL	NULL	NULL	NULL	14020	1556	2276	0	831	82	131	NULL	NULL	344	167	8	61	8	46	34	11	3	2	5	101	920	236	NULL	3310	148	18	NULL	474	4	NULL	NULL	51	0	17	9	2	7	0	0
+25	1	43298	6307	8735	0	190	1913	95	83	NULL	7	4	8	24	3	1	3	12189	1370	1887	0	394	82	125	0	0	247	86	8	61	8	46	34	11	3	2	5	101	791	293	438	3515	142	57	115	583	4	1	9	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+26	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	21	3	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+26	1	2370	2229	22	0	3	53	77	26	NULL	0	1	0	3	1	0	1	29	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3	2	7	2	1	1	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+27	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	0	1	1	NULL	NULL	NULL	NULL	NULL	134	23	14	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	11	0	0
+27	1	3473	2519	157	0	14	97	77	50	NULL	1	1	5	17	5	0	2	185	24	14	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	13	10	32	9	3	5	17	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+28	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	103	4	5	4	NULL	NULL	NULL	NULL	NULL	3257	324	621	0	183	21	70	NULL	NULL	63	10	1	6	1	9	10	0	0	2	0	18	230	67	NULL	727	69	6	NULL	144	0	NULL	NULL	18	1	27	0	0	0	0	0
+28	1	12420	2921	1965	0	73	452	104	75	NULL	5	4	0	10	0	0	3	2893	297	527	0	60	21	63	0	0	48	10	1	6	1	9	10	0	0	2	0	18	203	67	125	806	66	6	24	165	0	1	7	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 1	17
@@ -30636,465 +30636,465 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 2241003	25	40066	25	42703
 2391811	25	42779	25	43297
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-70849	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	1	NULL	NULL	NULL	NULL	NULL	6	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	676	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-70849	1	14	0	3	0	0	1	13	6	NULL	0	1	0	0	0	0	0	6	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-71559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	1	0	2	NULL	NULL	NULL	NULL	NULL	59	7	12	6	3	0	1	1	0	0	0	0	0	0	0	0	0	0	1	3	4	NULL	14	3	1	NULL	6	0	932	NULL	1	4	2	2	2	2	64.0	113.3	128.0
-71559	1	178	0	33	0	0	10	58	36	NULL	0	2	0	0	0	0	0	59	7	12	6	1	0	1	1	0	0	0	0	0	0	0	0	0	0	1	3	4	2	16	3	1	1	7	0	NULL	0	NULL	4	2	2	2	2	64.0	110.413	128.0
-71697	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	22	1	1	1	1	484.0	0.0	484.0
-71697	1	55	0	16	0	0	2	53	28	NULL	2	2	0	0	0	0	0	25	3	3	3	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	1	2	0	NULL	1	NULL	22	1	2	2	2	484.0	13.9316	968.0
-75673	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	10	2	1	1	1	400.0	0.0	400.0
-75673	1	64	34	7	0	1	2	59	0	NULL	0	2	0	0	0	0	0	11	0	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	10	2	1	2	2	400.0	0.0	400.0
-75875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	36	2	1	1	1	5184.0	0.0	5184.0
-75875	1	32	0	6	0	0	2	30	15	NULL	0	2	0	0	0	0	0	13	2	0	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	36	2	2	2	2	5184.0	2.0	10368.0
-80943	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
-80943	1	41	23	4	0	1	1	39	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	5	0	1	1	1	0.0	0.0	0.0
-82927	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	12	2	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	1	0	932	NULL	1	1	0	1	1	1	0.0	10.0	0.0
-82927	1	34	0	8	0	0	4	18	10	NULL	0	1	0	0	0	0	0	12	2	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	3	0	0	1	2	0	NULL	0	NULL	1	0	1	1	1	0.0	10.0	0.0
-84023	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
-84023	1	42	23	4	0	1	1	40	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	3	0	1	1	1	0.0	0.0	0.0
-84073	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	22	1	1	1	1	484.0	0.0	484.0
-84073	1	20	0	5	0	0	1	18	0	NULL	0	1	0	0	0	0	0	6	1	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	1	NULL	22	1	2	2	2	484.0	2.0	968.0
-86343	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	32	5	6	3	2	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	9	1	1	NULL	5	0	932	NULL	2	3	1	1	1	1	9.0	56.4728	9.0
-86343	1	74	0	18	0	0	8	18	12	NULL	0	1	0	0	0	0	0	32	5	6	3	2	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	9	1	1	0	5	0	NULL	0	NULL	3	1	1	1	1	9.0	56.4728	9.0
-87159	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
-87159	1	16	0	3	0	0	1	14	0	NULL	0	1	0	0	0	0	0	8	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	5	0	1	1	1	0.0	2.0	0.0
-88839	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
-88839	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	8	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	5	0	1	1	1	0.0	2.0	0.0
-90519	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	0	1	1	1	0.0	0.0	0.0
-90519	1	13	0	3	0	0	2	11	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	2	0	1	1	1	0.0	0.0	0.0
-92167	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	41	6	8	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	11	1	1	NULL	6	0	932	NULL	3	2	1	1	1	1	4.0	78.8692	4.0
-92167	1	93	0	24	0	0	9	18	13	NULL	0	1	0	0	0	0	0	41	6	8	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	11	1	1	0	6	0	NULL	0	NULL	2	1	1	1	1	4.0	78.8692	4.0
-99559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	50	7	10	3	4	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	13	1	1	NULL	7	0	932	NULL	4	2	1	1	1	1	4.0	102.799	4.0
-99559	1	110	0	28	0	0	10	18	13	NULL	0	1	0	0	0	0	0	50	7	10	3	4	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	13	1	1	0	7	0	NULL	0	NULL	2	1	1	1	1	4.0	102.799	4.0
-108407	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	59	8	12	3	5	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	15	1	1	NULL	8	0	932	NULL	5	3	1	1	1	1	9.0	128.0	9.0
-108407	1	127	0	32	0	0	11	18	13	NULL	0	1	0	0	0	0	0	59	8	12	3	5	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	15	1	1	0	8	0	NULL	0	NULL	3	1	1	1	1	9.0	128.0	9.0
-110127	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	0	2	NULL	NULL	NULL	NULL	NULL	117	10	23	6	9	0	2	1	0	0	0	0	0	0	0	0	0	0	0	20	5	NULL	27	8	2	NULL	11	0	953	NULL	1	1	4	2	4	4	16.0	277.326	32.0
-110127	1	376	0	62	0	0	13	57	34	NULL	0	2	0	0	0	0	0	117	10	23	6	6	0	2	1	0	0	0	0	0	0	0	0	0	0	0	20	5	3	30	8	2	1	12	0	NULL	0	NULL	1	4	2	4	4	16.0	270.513	32.0
-116291	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-116291	1	70	0	12	0	0	3	65	0	NULL	0	4	0	0	0	0	0	27	0	4	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
-118711	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	25	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	8	1	1	NULL	5	0	932	NULL	2	1	1	1	1	1	1.0	41.209	1.0
-118711	1	62	0	16	0	0	7	18	14	NULL	0	1	0	0	0	0	0	25	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	9	1	1	1	6	0	NULL	0	NULL	1	1	1	1	1	1.0	41.209	1.0
-121499	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	1	1	1	1	9.0	0.0	9.0
-121499	1	49	0	9	0	0	3	44	0	NULL	0	2	0	0	0	0	0	18	0	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	2	0	1	1	2	0	NULL	2	NULL	3	1	1	1	1	9.0	11.6096	9.0
-123863	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	9	1	1	NULL	6	0	932	NULL	3	1	1	1	1	1	1.0	46.507	1.0
-123863	1	64	0	16	0	0	7	18	16	NULL	0	1	0	0	0	0	0	27	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	10	1	1	1	7	0	NULL	0	NULL	1	1	1	1	1	1.0	46.507	1.0
-125699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-125699	1	66	0	11	0	0	3	61	0	NULL	0	3	0	0	0	0	0	26	0	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	6.33985	0.0
-129631	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	29	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	10	1	1	NULL	7	0	932	NULL	4	1	1	1	1	1	1.0	51.8915	1.0
-129631	1	66	0	16	0	0	7	20	18	NULL	0	1	0	0	0	0	0	29	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	11	1	1	1	8	0	NULL	0	NULL	1	1	1	1	1	1.0	51.8915	1.0
-130739	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
-130739	1	13	0	3	0	0	2	11	0	NULL	0	2	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	3	0	1	1	1	0.0	0.0	0.0
-132919	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	2	1	2	NULL	NULL	NULL	NULL	NULL	88	9	10	6	2	0	2	1	0	0	0	0	0	1	0	0	0	0	0	8	2	NULL	25	5	2	NULL	11	0	953	NULL	2	2	4	3	3	3	64.0	157.173	192.0
-132919	1	271	0	56	0	0	13	52	32	NULL	1	2	0	0	0	0	0	88	9	10	6	1	0	2	1	0	0	0	0	0	1	0	0	0	0	0	8	2	1	26	5	2	1	12	0	NULL	0	NULL	2	4	3	3	3	64.0	157.173	192.0
-136015	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	31	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	11	1	1	NULL	8	0	932	NULL	5	1	1	1	1	1	1.0	57.3594	1.0
-136015	1	68	0	16	0	0	7	22	20	NULL	0	1	0	0	0	0	0	31	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	12	1	1	1	9	0	NULL	0	NULL	1	1	1	1	1	1.0	57.3594	1.0
-136775	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	63	2	1	3	NULL	NULL	NULL	NULL	NULL	267	31	47	8	11	0	1	6	0	0	0	0	0	2	0	0	0	0	4	33	1	NULL	74	11	1	NULL	19	0	923	NULL	2	6	5	9	11	11	900.0	692.726	8100.0
-136775	1	980	117	200	0	5	40	56	66	NULL	1	3	0	0	0	0	0	267	31	47	8	9	0	1	6	0	0	0	0	0	2	0	0	0	0	4	33	1	2	76	11	1	2	21	0	NULL	0	NULL	6	5	9	11	11	900.0	692.726	8100.0
-143015	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	25	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	8	1	1	NULL	5	0	932	NULL	2	2	1	1	1	1	4.0	41.209	4.0
-143015	1	62	0	16	0	0	7	18	14	NULL	0	1	0	0	0	0	0	25	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	9	1	1	1	6	0	NULL	0	NULL	2	1	1	1	1	4.0	41.209	4.0
-145265	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	0	1	NULL	NULL	NULL	NULL	NULL	347	23	65	5	47	0	32	0	0	0	0	0	0	0	0	0	0	0	0	63	0	NULL	63	25	0	NULL	25	0	1038	NULL	0	1	2	1	1	1	4.0	1096.69	4.0
-145265	1	1242	34	164	0	1	27	74	32	NULL	0	1	0	0	0	0	0	347	23	65	5	16	0	32	0	0	0	0	0	0	0	0	0	0	0	0	63	0	31	94	25	0	6	31	0	NULL	0	NULL	1	2	1	1	1	4.0	997.577	4.0
-148055	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	9	1	1	NULL	6	0	932	NULL	3	8	1	1	1	1	64.0	46.507	64.0
-148055	1	64	0	16	0	0	7	18	16	NULL	0	1	0	0	0	0	0	27	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	10	1	1	1	7	0	NULL	0	NULL	8	1	1	1	1	64.0	46.507	64.0
-151847	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	2	2	3	NULL	NULL	NULL	NULL	NULL	74	9	10	6	2	0	1	1	0	0	0	0	0	1	0	0	0	0	1	11	0	NULL	20	10	0	NULL	12	0	953	NULL	0	1	5	3	3	3	25.0	138.302	75.0
-151847	1	310	94	55	0	3	14	62	47	NULL	2	3	0	0	0	0	0	68	9	9	5	1	0	1	1	0	0	0	0	0	1	0	0	0	0	1	10	0	1	20	9	0	1	12	0	NULL	0	NULL	1	5	3	3	3	25.0	125.098	75.0
-153711	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	29	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	10	1	1	NULL	7	0	932	NULL	4	1	1	1	1	1	1.0	51.8915	1.0
-153711	1	66	0	16	0	0	7	20	18	NULL	0	1	0	0	0	0	0	29	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	11	1	1	1	8	0	NULL	0	NULL	1	1	1	1	1	1.0	51.8915	1.0
-156717	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	2	1	1	1	64.0	0.0	64.0
-156717	1	56	0	6	0	0	1	54	18	NULL	1	2	0	0	0	0	0	21	3	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	0	1	3	0	0	3	3	0	0	3	0	NULL	1	NULL	4	2	2	2	2	64.0	4.75489	128.0
-158195	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	3	2	1	NULL	NULL	NULL	NULL	NULL	108	16	24	9	5	0	1	5	0	0	0	0	0	0	0	0	0	0	2	2	0	NULL	31	2	0	NULL	11	0	1054	NULL	6	13	2	6	8	8	676.0	278.631	4056.0
-158195	1	447	38	112	0	1	21	47	30	NULL	2	1	0	0	0	0	0	108	16	24	9	4	0	1	5	0	0	0	0	0	0	0	0	0	0	2	2	0	1	32	2	0	1	12	0	NULL	0	NULL	13	2	6	8	8	676.0	278.631	4056.0
-159121	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
-159121	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	6	0	1	1	1	0.0	11.6096	0.0
-159983	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	31	4	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	11	1	1	NULL	8	0	932	NULL	5	1	1	1	1	1	1.0	57.3594	1.0
-159983	1	68	0	16	0	0	7	22	20	NULL	0	1	0	0	0	0	0	31	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	12	1	1	1	9	0	NULL	0	NULL	1	1	1	1	1	1.0	57.3594	1.0
-161921	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-161921	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
-162541	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	16	3	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	NULL	5	2	0	NULL	3	0	916	NULL	0	3	2	1	1	1	36.0	12.0	36.0
-162541	1	43	0	12	0	0	5	17	12	NULL	0	1	0	0	0	0	0	16	3	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	0	5	2	0	0	3	0	NULL	0	NULL	3	2	1	1	1	36.0	12.0	36.0
-164721	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-164721	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-165901	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	76	4	3	4	NULL	NULL	NULL	NULL	NULL	430	44	90	13	34	11	2	10	4	0	0	0	2	2	0	0	0	0	3	15	0	NULL	90	7	0	NULL	15	0	918	NULL	2	1	9	13	22	22	81.0	1392.71	1053.0
-165901	1	1389	287	351	0	12	60	57	62	NULL	3	3	0	0	0	0	0	362	44	77	12	21	11	2	10	4	0	0	0	2	2	0	0	0	0	3	11	0	4	90	6	0	3	17	0	NULL	0	NULL	1	9	13	22	22	81.0	1180.22	1053.0
-166871	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	0	0	2	NULL	NULL	NULL	NULL	NULL	41	6	9	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	2	NULL	11	1	1	NULL	5	0	932	NULL	2	3	1	1	1	1	9.0	79.5669	9.0
-166871	1	106	0	27	0	0	9	26	20	NULL	0	2	0	0	0	0	0	41	6	9	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	2	2	13	1	1	2	7	0	NULL	0	NULL	3	1	1	1	1	9.0	79.5669	9.0
-167521	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-167521	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-170321	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-170321	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
-170495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	102	4	5	4	NULL	NULL	NULL	NULL	NULL	463	58	81	13	39	4	5	16	1	0	0	0	0	0	1	0	2	0	2	71	0	NULL	96	27	0	NULL	34	0	953	NULL	3	2	14	18	21	21	784.0	1428.21	14112.0
-170495	1	1639	182	367	0	8	66	57	60	NULL	4	3	0	0	0	0	0	395	52	69	13	22	4	5	12	1	0	0	0	0	0	1	0	2	0	2	59	0	15	99	23	0	9	39	0	NULL	0	NULL	2	14	14	17	17	784.0	1219.37	10976.0
-173121	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
-173121	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	2	3	0	NULL	1	NULL	4	0	1	1	1	0.0	19.6515	0.0
-174767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	0	0	2	NULL	NULL	NULL	NULL	NULL	19	2	1	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	1	NULL	5	2	1	NULL	4	0	932	NULL	0	1	2	1	1	1	4.0	22.4588	4.0
-174767	1	78	0	11	0	0	4	50	18	NULL	0	2	0	0	0	0	0	19	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	2	2	7	3	2	2	6	0	NULL	0	NULL	1	2	1	1	1	4.0	22.4588	4.0
-176201	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-176201	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	2	3	0	NULL	1	NULL	1	0	1	1	1	0.0	19.6515	0.0
-179337	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	0	1	1	1	0.0	0.0	0.0
-179337	1	41	0	6	0	0	1	39	0	NULL	0	3	0	0	0	0	0	23	0	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	3	4	1	0	3	4	0	NULL	1	NULL	2	0	1	1	1	0.0	27.0	0.0
-181935	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	4	3	NULL	NULL	NULL	NULL	NULL	125	13	23	7	8	0	1	4	1	0	0	0	0	0	0	0	0	0	1	3	2	NULL	18	3	1	NULL	6	0	933	NULL	1	1	6	5	5	5	36.0	215.224	180.0
-181935	1	264	0	60	0	0	15	56	34	NULL	2	2	0	0	0	0	0	85	10	12	4	1	0	1	3	1	0	0	0	0	0	0	0	0	0	1	2	2	6	21	2	1	6	11	0	NULL	0	NULL	1	6	4	4	4	36.0	136.0	144.0
-182585	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-182585	1	47	0	6	0	0	1	45	0	NULL	0	3	0	0	0	0	0	27	0	6	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	14.0	0.0
-186169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-186169	1	44	0	6	0	0	1	42	0	NULL	0	3	0	0	0	0	0	25	0	5	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	12.0	0.0
-189585	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-189585	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-192385	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-192385	1	34	0	4	0	0	1	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
-195241	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-195241	1	34	0	5	0	0	2	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
-195799	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	58	1	0	5	NULL	NULL	NULL	NULL	NULL	274	21	42	7	23	0	3	3	0	0	0	0	0	0	0	0	0	0	1	17	14	NULL	58	9	5	NULL	19	0	923	NULL	2	1	9	4	4	4	81.0	690.609	324.0
-195799	1	867	172	121	0	5	27	80	56	NULL	0	4	0	0	0	0	0	244	21	37	7	10	0	3	3	0	0	0	0	0	0	0	0	0	0	1	17	14	13	66	9	9	6	25	0	NULL	0	NULL	1	9	4	4	4	81.0	609.332	324.0
-197501	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	67	4	3	3	NULL	NULL	NULL	NULL	NULL	656	87	71	12	74	14	19	21	4	1	7	1	9	0	1	0	0	0	1	64	0	NULL	119	37	0	NULL	40	0	937	NULL	2	0	28	24	33	39	0.0	1981.94	0.0
-197501	1	2623	379	536	0	14	105	107	70	NULL	3	3	0	0	0	0	0	644	84	70	12	64	14	19	18	4	1	7	1	9	0	1	0	0	0	1	57	0	13	125	36	0	9	48	0	NULL	0	NULL	0	28	21	30	36	0.0	1940.63	0.0
-206911	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	0	2	NULL	NULL	NULL	NULL	NULL	48	6	6	5	4	0	1	1	0	0	0	0	0	0	0	0	0	0	1	5	1	NULL	13	4	1	NULL	9	0	934	NULL	3	1	3	2	2	2	9.0	95.9083	18.0
-206911	1	173	0	31	0	0	9	55	27	NULL	0	2	0	0	0	0	0	48	6	6	5	0	0	1	1	0	0	0	0	0	0	0	0	0	0	1	5	2	4	17	4	2	3	12	0	NULL	0	NULL	1	3	2	2	2	9.0	94.0116	18.0
-209715	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	21	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	5	2	0	NULL	4	0	1054	NULL	1	1	3	1	1	1	9.0	10.0	9.0
-209715	1	70	0	13	0	0	7	27	11	NULL	0	1	0	0	0	0	0	21	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	5	3	0	0	4	0	NULL	0	NULL	1	3	1	1	1	9.0	10.0	9.0
-217163	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	3	2	3	NULL	NULL	NULL	NULL	NULL	290	31	56	11	15	0	1	11	3	0	0	0	0	1	0	0	0	0	5	15	5	NULL	54	10	2	NULL	16	0	1055	NULL	1	36	10	13	19	19	129600.0	674.04	1684800.0
-217163	1	669	41	154	0	1	34	70	33	NULL	2	2	0	0	0	0	0	223	29	32	7	1	0	1	10	2	0	0	0	0	1	0	0	0	0	5	12	6	12	60	8	3	9	23	0	NULL	0	NULL	36	10	12	16	16	129600.0	460.74	1555200.0
-218681	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	2	1	2	NULL	NULL	NULL	NULL	NULL	137	13	18	7	10	0	5	1	1	0	0	0	0	1	0	0	0	0	0	15	2	NULL	36	8	2	NULL	15	0	1038	NULL	2	1	5	3	3	3	25.0	320.0	75.0
-218681	1	440	29	83	0	1	18	65	37	NULL	1	2	0	0	0	0	0	137	13	18	7	4	0	5	1	1	0	0	0	0	1	0	0	0	0	0	15	2	6	42	8	2	4	19	0	NULL	0	NULL	1	5	3	3	3	25.0	314.041	75.0
-220183	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	1	0	1	NULL	NULL	NULL	NULL	NULL	65	11	10	5	3	0	0	3	1	0	0	0	0	1	0	0	0	0	4	1	1	NULL	16	1	1	NULL	5	0	934	NULL	2	1	0	5	5	5	0.0	107.313	0.0
-220183	1	220	34	51	0	1	14	54	20	NULL	0	1	0	0	0	0	0	65	11	10	5	0	0	0	3	1	0	0	0	0	1	0	0	0	0	4	1	1	3	19	1	1	1	6	0	NULL	0	NULL	1	0	5	5	5	0.0	100.324	0.0
-234295	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	1	1	3	NULL	NULL	NULL	NULL	NULL	116	16	21	7	4	0	3	3	0	0	0	0	0	1	0	0	0	0	2	5	1	NULL	26	4	1	NULL	10	0	934	NULL	3	1	4	5	5	5	16.0	224.008	80.0
-234295	1	448	46	84	0	2	21	68	36	NULL	1	2	0	0	0	0	0	109	15	19	6	2	0	3	2	0	0	0	0	0	1	0	0	0	0	2	3	1	3	27	2	1	3	11	0	NULL	0	NULL	1	4	4	4	4	16.0	203.901	64.0
-246737	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	2	1	3	NULL	NULL	NULL	NULL	NULL	134	15	22	7	10	2	2	3	1	0	0	0	0	1	0	0	2	0	0	12	1	NULL	31	7	1	NULL	11	0	1038	NULL	1	1	5	5	5	5	25.0	318.948	125.0
-246737	1	524	114	96	0	3	20	66	37	NULL	1	3	0	0	0	0	0	134	15	22	7	4	2	2	3	1	0	0	0	0	1	0	0	2	0	0	12	1	6	37	7	1	5	16	0	NULL	0	NULL	1	5	5	5	5	25.0	315.769	125.0
-251631	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	2	2	4	NULL	NULL	NULL	NULL	NULL	335	26	64	12	38	0	1	5	0	0	0	0	0	3	0	0	0	0	1	4	0	NULL	51	4	0	NULL	8	0	923	NULL	2	4	4	9	9	9	256.0	896.271	2304.0
-251631	1	665	22	133	0	1	30	66	51	NULL	2	4	0	0	0	0	0	292	23	56	12	28	0	1	4	0	0	0	0	0	3	0	0	0	0	1	3	0	4	52	3	0	4	11	0	NULL	0	NULL	4	4	8	8	8	256.0	771.45	2048.0
-255333	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	4	5	4	NULL	NULL	NULL	NULL	NULL	1930	294	114	14	105	83	55	79	21	1	28	1	3	1	1	0	0	0	51	242	0	NULL	281	29	0	NULL	32	0	928	NULL	0	0	19	83	89	116	0.0	4588.42	0.0
-255333	1	3686	191	1062	0	13	185	73	45	NULL	4	3	0	0	0	0	0	1084	153	106	13	16	67	8	32	21	1	28	1	3	1	1	0	0	0	4	98	47	102	237	25	27	34	62	0	NULL	0	NULL	0	19	36	42	69	0.0	3111.41	0.0
-257079	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	59	3	2	5	NULL	NULL	NULL	NULL	NULL	155	16	23	12	10	0	3	6	1	0	0	0	0	1	0	0	0	0	2	26	0	NULL	29	11	0	NULL	12	0	1002	NULL	0	1	5	8	9	9	25.0	315.423	200.0
-257079	1	390	0	104	0	0	21	57	41	NULL	2	3	0	0	0	0	0	113	16	12	5	2	0	3	6	1	0	0	0	0	1	0	0	0	0	2	21	0	8	32	9	0	4	14	0	NULL	0	NULL	1	5	8	8	8	25.0	202.047	200.0
-258267	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	1	3	NULL	NULL	NULL	NULL	NULL	265	30	33	8	21	0	2	12	3	0	0	0	1	0	1	0	0	2	2	17	1	NULL	42	9	1	NULL	12	2	1055	NULL	2	0	10	14	18	18	0.0	514.325	0.0
-258267	1	676	76	134	0	4	32	65	58	NULL	1	2	0	0	0	0	0	185	24	12	6	11	0	2	9	0	0	0	0	1	0	1	0	0	2	2	14	1	9	44	8	1	6	17	2	NULL	0	NULL	0	10	11	14	14	0.0	340.86	0.0
-263695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	50	2	0	4	NULL	NULL	NULL	NULL	NULL	67	7	13	7	5	0	0	1	0	0	0	0	0	1	0	0	0	0	2	3	3	NULL	16	2	2	NULL	7	0	934	NULL	1	3	1	3	3	3	9.0	144.43	27.0
-263695	1	214	35	46	0	1	10	51	52	NULL	0	4	0	0	0	0	0	67	7	13	7	5	0	0	1	0	0	0	0	0	1	0	0	0	0	2	3	3	0	16	2	2	0	7	0	NULL	0	NULL	3	1	3	3	3	9.0	144.43	27.0
-266983	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	2	NULL	NULL	NULL	NULL	NULL	25	4	4	4	2	0	0	1	0	0	0	0	0	0	0	0	0	0	0	6	0	NULL	6	4	0	NULL	4	0	953	NULL	0	1	1	2	2	2	1.0	39.8631	2.0
-266983	1	69	0	16	0	0	6	21	18	NULL	0	1	0	0	0	0	0	19	4	3	3	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	5	0	2	7	3	0	2	5	0	NULL	0	NULL	1	1	2	2	2	1.0	30.0	2.0
-272023	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	65	4	2	5	NULL	NULL	NULL	NULL	NULL	432	34	106	17	20	4	8	10	0	0	0	0	2	2	1	0	0	0	1	25	0	NULL	95	12	0	NULL	20	0	953	NULL	3	2	7	14	25	25	196.0	1334.42	2744.0
-272023	1	1158	63	240	0	3	39	86	62	NULL	2	3	0	0	0	0	0	337	33	78	14	10	4	8	9	0	0	0	0	2	2	1	0	0	0	1	20	0	11	95	9	0	3	20	0	NULL	0	NULL	2	7	13	21	21	196.0	1044.39	2548.0
-272625	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-272625	1	75	0	12	0	0	1	73	0	NULL	0	1	0	0	0	0	0	18	0	6	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3	3	5	2	2	2	4	0	NULL	1	NULL	1	1	1	3	3	1.0	34.8692	1.0
-277753	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	1	1	NULL	NULL	NULL	NULL	NULL	40	5	4	4	4	0	1	1	0	0	0	0	0	0	0	0	0	0	2	1	1	NULL	9	1	1	NULL	4	0	873	NULL	1	1	1	2	3	3	1.0	60.9444	2.0
-277753	1	148	0	31	0	0	9	39	35	NULL	1	1	0	0	0	0	0	40	5	4	4	1	0	1	1	0	0	0	0	0	0	0	0	0	0	2	1	4	3	12	1	3	2	6	0	NULL	0	NULL	1	1	2	3	3	1.0	58.8103	2.0
-277833	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
-277833	1	25	0	4	0	0	1	23	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	3	0	1	1	1	0.0	4.75489	0.0
-279441	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	0	2	NULL	NULL	NULL	NULL	NULL	80	10	18	5	3	0	1	1	0	0	0	0	0	0	0	0	0	0	1	3	6	NULL	22	3	2	NULL	8	0	1038	NULL	1	8	3	2	3	3	576.0	172.0	1152.0
-279441	1	239	0	49	0	0	13	42	26	NULL	0	2	0	0	0	0	0	80	10	18	5	1	0	1	1	0	0	0	0	0	0	0	0	0	0	1	3	6	2	24	3	2	1	9	0	NULL	0	NULL	8	3	2	3	3	576.0	167.996	1152.0
-280047	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	1	NULL	NULL	NULL	NULL	NULL	10	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	934	NULL	1	8	0	1	1	1	0.0	0.0	0.0
-280047	1	65	33	8	0	1	3	61	14	NULL	0	1	0	0	0	0	0	10	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	8	0	1	1	1	0.0	0.0	0.0
-280185	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-280185	1	24	0	4	0	0	1	22	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
-282279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	1	0	1	NULL	NULL	NULL	NULL	NULL	17	3	1	1	2	0	0	1	1	0	0	0	0	0	0	0	0	0	2	3	0	NULL	3	3	0	NULL	3	0	1002	NULL	0	2	0	2	2	2	0.0	15.5098	0.0
-282279	1	67	0	17	0	0	6	25	20	NULL	0	1	0	0	0	0	0	17	3	1	1	1	0	0	1	1	0	0	0	0	0	0	0	0	0	2	3	0	1	4	3	0	1	4	0	NULL	0	NULL	2	0	2	2	2	0.0	15.5098	0.0
-282425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	0	1	1	1	0.0	0.0	0.0
-282425	1	24	0	4	0	0	1	22	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	2	0	1	1	1	0.0	4.75489	0.0
-284665	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
-284665	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	6	0	1	1	1	0.0	4.75489	0.0
-286767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	0	1	NULL	NULL	NULL	NULL	NULL	11	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	NULL	2	0	1	NULL	2	0	934	NULL	1	3	0	1	1	1	0.0	4.75489	0.0
-286767	1	30	0	8	0	0	3	26	16	NULL	0	1	0	0	0	0	0	11	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	2	0	1	0	2	0	NULL	0	NULL	3	0	1	1	1	0.0	4.75489	0.0
-286849	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
-286849	1	24	0	4	0	0	1	22	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	5	0	1	1	1	0.0	4.75489	0.0
-289145	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-289145	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
-290831	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	1	1	2	NULL	NULL	NULL	NULL	NULL	157	14	17	3	17	0	1	0	0	1	11	1	4	0	0	0	0	0	0	4	2	NULL	18	2	1	NULL	4	0	923	NULL	1	2	7	2	2	12	196.0	238.418	392.0
-290831	1	346	14	69	0	1	22	60	26	NULL	1	2	0	0	0	0	0	102	14	5	2	0	0	1	0	0	1	2	1	4	0	0	0	0	0	0	4	4	16	34	2	3	9	13	0	NULL	0	NULL	2	7	2	2	3	196.0	152.369	392.0
-291329	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
-291329	1	49	0	8	0	0	1	47	0	NULL	0	2	0	0	0	0	0	17	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	1	NULL	6	0	1	2	2	0.0	16.2535	0.0
-294969	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
-294969	1	22	0	4	0	0	1	20	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	0	1	1	1	0.0	4.75489	0.0
-295905	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	3	4	4	NULL	NULL	NULL	NULL	NULL	224	27	44	11	13	0	1	6	0	0	0	0	0	2	0	0	0	0	2	6	3	NULL	44	2	2	NULL	9	0	1038	NULL	1	3	5	9	9	9	225.0	509.484	2025.0
-295905	1	499	27	109	0	1	26	75	28	NULL	2	2	0	0	0	0	0	156	21	28	9	3	0	1	4	0	0	0	0	0	2	0	0	0	0	2	4	3	6	44	2	2	4	13	0	NULL	0	NULL	3	5	7	7	7	225.0	348.289	1575.0
-297041	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
-297041	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	6	0	1	1	1	0.0	4.75489	0.0
-299001	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
-299001	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	5	0	1	1	1	0.0	4.75489	0.0
-300961	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
-300961	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	0	1	1	1	0.0	4.75489	0.0
-302921	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
-302921	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	3	0	1	1	1	0.0	4.75489	0.0
-304881	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	12	0	1	1	1	0.0	0.0	0.0
-304881	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	12	0	1	1	1	0.0	4.75489	0.0
-306841	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
-306841	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	3	0	1	1	1	0.0	4.75489	0.0
-308801	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	8	0	1	1	1	0.0	0.0	0.0
-308801	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	8	0	1	1	1	0.0	4.75489	0.0
-310985	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-310985	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
-313169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-313169	1	21	0	4	0	0	1	19	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	2.0	0.0
-314071	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	70	1	3	2	NULL	NULL	NULL	NULL	NULL	179	21	14	4	20	0	1	3	0	1	11	1	4	0	0	0	0	0	0	7	0	NULL	21	3	0	NULL	4	0	923	NULL	1	2	6	5	5	15	144.0	264.405	720.0
-314071	1	280	14	55	0	1	20	60	22	NULL	1	2	0	0	0	0	0	77	12	0	0	0	0	1	0	0	1	2	1	4	0	0	0	0	0	0	4	2	12	24	2	2	8	11	0	NULL	0	NULL	2	6	2	2	3	144.0	83.0264	288.0
-318377	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	13	0	1	1	1	0.0	0.0	0.0
-318377	1	42	0	9	0	0	2	40	0	NULL	0	3	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	2	2	0	NULL	1	NULL	13	0	1	1	1	0.0	18.0947	0.0
-326873	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	3	4	NULL	NULL	NULL	NULL	NULL	175	19	37	8	9	0	0	4	1	0	0	0	0	1	0	0	0	0	1	5	3	NULL	40	3	2	NULL	11	0	1038	NULL	2	1	5	6	6	6	25.0	413.433	150.0
-326873	1	413	27	107	0	2	21	56	65	NULL	1	2	0	0	0	0	0	137	16	28	6	1	0	0	3	1	0	0	0	0	1	0	0	0	0	1	4	3	5	42	3	2	3	14	0	NULL	0	NULL	1	5	5	5	5	25.0	311.855	125.0
-327483	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	89	4	4	3	NULL	NULL	NULL	NULL	NULL	903	91	144	20	44	0	16	26	9	0	0	0	0	4	0	0	0	0	2	67	6	NULL	207	16	2	NULL	32	0	1062	NULL	2	0	17	31	36	36	0.0	2601.06	0.0
-327483	1	2825	295	539	0	14	91	95	52	NULL	4	3	0	0	0	0	0	746	73	111	19	10	0	14	14	3	0	0	0	0	4	0	0	0	0	2	49	6	41	221	13	2	15	44	0	NULL	0	NULL	0	17	19	21	21	0.0	2116.92	0.0
-339551	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	2	1	4	NULL	NULL	NULL	NULL	NULL	159	12	47	11	13	7	0	3	2	0	0	0	0	1	0	0	0	0	1	2	2	NULL	31	1	1	NULL	6	0	923	NULL	1	1	2	5	8	8	4.0	510.526	20.0
-339551	1	360	39	112	0	1	16	67	48	NULL	1	2	0	0	0	0	0	129	12	42	9	8	7	0	3	2	0	0	0	0	1	0	0	0	0	1	0	2	2	31	0	1	2	7	0	NULL	0	NULL	1	2	5	8	8	4.0	435.969	20.0
-341687	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	66	9	5	2	3	0	3	1	0	0	0	0	0	0	0	0	0	0	1	5	2	NULL	21	5	2	NULL	12	0	953	NULL	1	2	4	2	2	2	64.0	118.536	128.0
-341687	1	209	0	42	0	0	11	52	23	NULL	0	2	0	0	0	0	0	64	8	5	2	2	0	3	0	0	0	0	0	0	0	0	0	0	0	1	5	2	2	21	4	2	2	12	0	NULL	0	NULL	2	4	1	1	1	64.0	112.0	64.0
-354649	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	103	1	1	3	NULL	NULL	NULL	NULL	NULL	246	24	46	9	6	0	6	5	0	0	0	0	0	0	0	0	0	0	2	12	3	NULL	62	8	1	NULL	16	0	1038	NULL	5	10	8	6	10	10	6400.0	564.778	38400.0
-354649	1	685	0	127	0	0	28	63	75	NULL	1	3	0	0	0	0	0	224	22	42	9	0	0	4	3	0	0	0	0	0	0	0	0	0	0	2	8	3	10	66	6	1	6	20	0	NULL	0	NULL	10	8	4	6	6	6400.0	524.662	25600.0
-355631	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	1	1	2	NULL	NULL	NULL	NULL	NULL	102	13	17	6	4	2	1	2	0	0	0	0	0	1	0	0	0	0	0	8	1	NULL	29	8	1	NULL	12	0	954	NULL	1	3	6	4	4	4	324.0	238.418	1296.0
-355631	1	276	0	64	0	0	16	55	29	NULL	1	2	0	0	0	0	0	100	12	17	6	2	2	1	1	0	0	0	0	0	1	0	0	0	0	0	6	1	3	30	6	1	3	13	0	NULL	0	NULL	3	6	3	3	3	324.0	230.702	972.0
-364135	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-364135	1	55	21	10	0	1	2	53	0	NULL	0	2	0	0	0	0	0	13	0	3	3	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	2	2	0.0	11.6096	0.0
-368167	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	3	2	3	NULL	NULL	NULL	NULL	NULL	199	25	51	10	2	22	0	10	7	0	0	0	0	0	0	0	0	0	1	1	0	NULL	39	1	0	NULL	5	0	924	NULL	1	2	2	11	14	14	16.0	602.536	176.0
-368167	1	570	91	163	0	5	31	61	35	NULL	2	2	0	0	0	0	0	170	25	40	7	2	16	0	10	7	0	0	0	0	0	0	0	0	0	1	1	0	3	39	1	0	1	6	0	NULL	0	NULL	2	2	11	11	11	16.0	480.557	176.0
-374055	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	69	3	4	4	NULL	NULL	NULL	NULL	NULL	827	95	170	15	55	11	3	24	3	0	0	0	2	5	2	1	0	0	1	69	2	NULL	177	23	2	NULL	34	0	954	NULL	0	4	15	33	40	40	3600.0	2827.19	118800.0
-374055	1	2502	482	543	0	11	100	80	44	NULL	2	3	0	0	0	0	0	669	83	138	14	27	11	3	20	3	0	0	0	2	5	2	1	0	0	1	57	2	18	177	22	2	8	41	0	NULL	0	NULL	4	15	29	36	36	3600.0	2308.32	104400.0
-397545	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	1	NULL	NULL	NULL	NULL	NULL	34	4	9	6	2	1	0	0	0	0	0	0	0	1	0	0	0	0	1	0	0	NULL	9	0	0	NULL	3	0	1038	NULL	2	4	0	2	2	2	0.0	75.2842	0.0
-397545	1	113	0	29	0	0	7	35	23	NULL	0	1	0	0	0	0	0	34	4	9	6	2	1	0	0	0	0	0	0	0	1	0	0	0	0	1	0	0	0	9	0	0	0	3	0	NULL	0	NULL	4	0	2	2	2	0.0	75.2842	0.0
-405351	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	1	0	3	NULL	NULL	NULL	NULL	NULL	85	9	7	3	10	0	0	2	0	0	0	0	0	0	0	0	0	0	2	1	4	NULL	20	1	1	NULL	6	0	925	NULL	2	1	1	3	3	3	1.0	157.173	3.0
-405351	1	180	0	45	0	0	12	36	47	NULL	0	3	0	0	0	0	0	85	9	7	3	10	0	0	2	0	0	0	0	0	0	0	0	0	0	2	1	4	0	20	1	1	0	6	0	NULL	0	NULL	1	1	3	3	3	1.0	157.173	3.0
-407737	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	2	2	2	NULL	NULL	NULL	NULL	NULL	141	15	31	6	3	0	0	1	0	0	0	0	0	2	0	0	0	0	1	3	3	NULL	43	3	1	NULL	11	0	1038	NULL	1	1	3	4	4	4	9.0	332.788	36.0
-407737	1	439	70	100	0	2	20	58	26	NULL	2	2	0	0	0	0	0	141	15	31	6	1	0	0	1	0	0	0	0	0	2	0	0	0	0	1	3	3	2	45	3	1	2	13	0	NULL	0	NULL	1	3	4	4	4	9.0	332.788	36.0
-417671	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	5	4	3	NULL	NULL	NULL	NULL	NULL	406	43	88	14	26	3	4	11	1	0	0	0	0	2	0	0	3	0	1	12	8	NULL	91	8	2	NULL	20	0	925	NULL	1	1	8	14	18	18	64.0	1243.27	896.0
-417671	1	1206	15	323	0	1	48	74	63	NULL	4	3	0	0	0	0	0	379	39	84	14	21	3	4	9	1	0	0	0	0	2	0	0	3	0	1	9	8	4	90	5	2	4	21	0	NULL	0	NULL	1	8	12	16	16	64.0	1164.76	768.0
-436409	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	2	0	2	NULL	NULL	NULL	NULL	NULL	63	7	10	5	3	0	0	1	0	0	0	0	0	1	0	0	0	0	2	2	1	NULL	17	2	1	NULL	7	0	1038	NULL	2	3	2	3	3	3	36.0	117.207	108.0
-436409	1	186	21	42	0	2	10	46	35	NULL	0	2	0	0	0	0	0	63	7	10	5	1	0	0	1	0	0	0	0	0	1	0	0	0	0	2	2	1	2	19	2	1	1	8	0	NULL	0	NULL	3	2	3	3	3	36.0	114.221	108.0
-450577	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	2	2	4	NULL	NULL	NULL	NULL	NULL	207	23	36	12	15	0	4	8	1	0	0	0	0	0	0	0	0	0	1	12	0	NULL	36	9	0	NULL	12	0	1038	NULL	2	12	9	9	10	10	11664.0	459.83	104976.0
-450577	1	593	100	107	0	5	22	78	37	NULL	1	3	0	0	0	0	0	146	18	21	10	4	0	3	5	1	0	0	0	0	0	0	0	0	0	1	7	0	11	39	6	0	8	17	0	NULL	0	NULL	12	9	6	6	6	11664.0	317.069	69984.0
-462757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	75	5	5	4	NULL	NULL	NULL	NULL	NULL	558	66	116	16	26	43	6	7	1	2	22	2	16	2	0	0	0	0	1	24	0	NULL	99	17	0	NULL	25	0	928	NULL	0	1	12	12	20	40	144.0	1925.91	1728.0
-462757	1	1747	50	529	0	3	77	62	62	NULL	5	3	0	0	0	0	0	528	63	114	16	18	43	5	6	1	2	22	2	16	2	0	0	0	0	0	20	1	7	102	13	1	7	28	0	NULL	0	NULL	1	12	11	19	39	144.0	1859.85	1584.0
-487537	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	1	0	3	NULL	NULL	NULL	NULL	NULL	66	5	10	2	2	0	3	2	0	0	0	0	0	0	0	0	0	0	0	3	0	NULL	14	2	0	NULL	4	0	1038	NULL	2	5	3	3	3	3	225.0	78.0	675.0
-487537	1	257	0	29	0	0	8	58	31	NULL	0	2	0	0	0	0	0	61	5	8	2	0	0	3	2	0	0	0	0	0	0	0	0	0	0	0	3	0	2	16	2	0	2	6	0	NULL	0	NULL	5	3	3	3	3	225.0	72.0	675.0
-488679	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	8	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	925	NULL	1	8	1	1	1	1	64.0	2.0	64.0
-488679	1	54	0	5	0	0	3	50	10	NULL	0	1	0	0	0	0	0	8	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	8	1	1	1	1	64.0	2.0	64.0
-488947	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-488947	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	1	NULL	1	1	1	2	2	1.0	27.0	1.0
-489939	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	0	3	NULL	NULL	NULL	NULL	NULL	78	9	23	6	6	0	0	1	0	0	0	0	0	0	0	0	0	0	1	2	1	NULL	16	2	1	NULL	5	0	1062	NULL	1	1	3	2	2	2	9.0	183.936	18.0
-489939	1	312	94	50	0	4	13	81	27	NULL	0	2	0	0	0	0	0	73	9	21	6	0	0	0	1	0	0	0	0	0	0	0	0	0	0	1	2	1	6	22	2	1	6	11	0	NULL	0	NULL	1	3	2	2	2	9.0	175.761	18.0
-493383	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	3	2	4	NULL	NULL	NULL	NULL	NULL	334	29	54	12	26	0	3	3	0	1	11	1	3	2	1	0	0	0	0	22	3	NULL	60	9	1	NULL	14	0	925	NULL	2	2	10	8	9	19	400.0	798.062	3200.0
-493383	1	945	58	189	0	3	39	62	47	NULL	2	4	0	0	0	0	0	287	29	44	12	10	0	3	3	0	1	2	1	3	2	1	0	0	0	0	22	5	15	75	9	3	9	23	0	NULL	0	NULL	2	10	8	9	10	400.0	708.449	3200.0
-497235	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-497235	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	2	NULL	1	1	1	4	4	1.0	107.313	1.0
-504337	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	2	4	NULL	NULL	NULL	NULL	NULL	264	28	45	12	16	0	6	9	1	0	0	0	0	0	0	0	0	0	1	15	0	NULL	50	10	0	NULL	14	0	1038	NULL	2	10	10	10	12	12	10000.0	598.547	100000.0
-504337	1	709	63	126	0	3	26	91	35	NULL	1	3	0	0	0	0	0	192	22	28	10	4	0	4	5	1	0	0	0	0	0	0	0	0	0	1	8	0	14	53	7	0	9	20	0	NULL	0	NULL	10	10	6	6	6	10000.0	432.434	60000.0
-510227	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-510227	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-510995	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	0	1	NULL	NULL	NULL	NULL	NULL	59	6	9	4	3	0	2	2	0	0	0	0	0	0	0	0	0	0	1	8	0	NULL	14	5	0	NULL	7	0	1062	NULL	2	0	3	3	3	3	0.0	98.9912	0.0
-510995	1	245	34	33	0	1	9	57	35	NULL	0	2	0	0	0	0	0	57	5	9	4	3	0	2	1	0	0	0	0	0	0	0	0	0	0	1	6	0	1	13	3	0	1	6	0	NULL	0	NULL	0	3	2	2	2	0.0	92.511	0.0
-512971	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-512971	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
-515827	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-515827	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-517527	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	3	4	NULL	NULL	NULL	NULL	NULL	98	11	21	9	8	0	1	2	0	0	0	0	0	1	0	0	0	0	0	2	1	NULL	18	2	1	NULL	7	0	954	NULL	2	2	2	4	4	4	16.0	215.493	64.0
-517527	1	189	21	52	0	1	12	33	19	NULL	1	2	0	0	0	0	0	60	8	12	6	0	0	1	1	0	0	0	0	0	1	0	0	0	0	0	1	1	5	20	1	1	5	11	0	NULL	0	NULL	2	2	3	3	3	16.0	130.799	48.0
-519467	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-519467	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-521427	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-521427	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-522995	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	1	1	1	1	16.0	0.0	16.0
-522995	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	1	1	1	1	16.0	0.0	16.0
-524731	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-524731	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-526747	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	1	1	1	1	4.0	0.0	4.0
-526747	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	2	1	1	1	1	4.0	0.0	4.0
-528187	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	42	3	3	3	NULL	NULL	NULL	NULL	NULL	272	31	29	8	23	0	2	7	5	1	6	1	0	0	0	0	0	0	6	28	1	NULL	51	17	1	NULL	21	0	1062	NULL	2	0	9	9	9	14	0.0	587.145	0.0
-528187	1	842	41	184	0	3	42	44	46	NULL	3	3	0	0	0	0	0	244	27	25	8	6	0	2	5	3	1	6	1	0	0	0	0	0	0	6	26	7	17	64	16	7	10	30	0	NULL	0	NULL	0	9	7	7	12	0.0	518.646	0.0
-528371	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-528371	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	2	NULL	1	1	1	1	1	1.0	0.0	1.0
-530387	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-530387	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-532067	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-532067	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-532255	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	1	0	2	NULL	NULL	NULL	NULL	NULL	35	5	3	3	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	7	1	NULL	13	6	1	NULL	8	0	954	NULL	1	2	3	2	2	2	36.0	60.9444	72.0
-532255	1	108	0	21	0	0	7	30	18	NULL	0	2	0	0	0	0	0	35	5	3	3	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	7	1	0	13	6	1	0	8	0	NULL	0	NULL	2	3	2	2	2	36.0	60.9444	72.0
-542223	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	1	0	1	NULL	NULL	NULL	NULL	NULL	33	5	2	2	1	0	1	2	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	9	4	0	NULL	5	0	954	NULL	1	1	2	3	3	3	4.0	36.0	12.0
-542223	1	174	53	23	0	2	7	49	21	NULL	0	1	0	0	0	0	0	33	5	2	2	1	0	1	2	0	0	0	0	0	0	0	0	0	0	1	4	0	0	9	4	0	0	5	0	NULL	0	NULL	1	2	3	3	3	4.0	36.0	12.0
-548241	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	1	3	NULL	NULL	NULL	NULL	NULL	157	13	31	9	10	0	3	6	1	0	0	0	0	0	0	0	0	0	1	9	0	NULL	25	9	0	NULL	10	0	1038	NULL	1	9	10	7	11	11	8100.0	320.627	56700.0
-548241	1	453	51	75	0	3	15	85	37	NULL	1	3	0	0	0	0	0	131	12	23	8	3	0	2	5	1	0	0	0	0	0	0	0	0	0	1	7	0	9	31	7	0	8	16	0	NULL	0	NULL	9	10	6	9	9	8100.0	271.029	48600.0
-551623	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	3	2	3	NULL	NULL	NULL	NULL	NULL	328	29	42	11	39	1	2	6	1	1	11	0	0	0	1	0	0	0	10	23	2	NULL	44	7	1	NULL	11	0	925	NULL	1	2	8	9	14	24	256.0	750.229	2304.0
-551623	1	954	81	192	0	4	38	77	44	NULL	2	3	0	0	0	0	0	279	29	31	10	20	1	2	6	1	1	5	0	0	0	1	0	0	0	10	23	8	18	62	7	7	11	22	0	NULL	0	NULL	2	8	9	14	18	256.0	652.983	2304.0
-554375	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	38	1	0	3	NULL	NULL	NULL	NULL	NULL	71	8	13	5	4	0	1	2	0	0	0	0	0	0	0	0	0	0	0	9	1	NULL	19	5	1	NULL	8	0	954	NULL	1	4	3	3	3	3	144.0	147.149	432.0
-554375	1	234	0	48	0	0	11	71	39	NULL	0	3	0	0	0	0	0	71	8	13	5	3	0	1	2	0	0	0	0	0	0	0	0	0	0	0	9	1	1	20	5	1	1	9	0	NULL	0	NULL	4	3	3	3	3	144.0	147.149	432.0
-561709	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	38	2	1	3	NULL	NULL	NULL	NULL	NULL	85	11	16	8	8	0	0	2	2	0	0	0	0	0	1	0	0	0	2	1	0	NULL	23	1	0	NULL	8	0	930	NULL	3	1	1	4	4	4	1.0	215.493	4.0
-561709	1	244	0	78	0	0	16	43	40	NULL	1	3	0	0	0	0	0	85	11	16	8	8	0	0	2	2	0	0	0	0	0	1	0	0	0	2	1	0	0	23	1	0	0	8	0	NULL	0	NULL	1	1	4	4	4	1.0	215.493	4.0
-571063	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	69	2	3	4	NULL	NULL	NULL	NULL	NULL	350	46	52	12	18	3	5	12	1	0	0	0	1	1	0	0	0	0	2	38	1	NULL	87	17	1	NULL	25	0	954	NULL	2	1	11	14	14	14	121.0	937.277	1694.0
-571063	1	1121	135	231	0	3	45	68	38	NULL	2	3	0	0	0	0	0	277	36	40	10	7	3	5	6	1	0	0	0	1	1	0	0	0	0	2	24	1	11	82	14	1	7	29	0	NULL	0	NULL	1	11	8	8	8	121.0	741.142	968.0
-577193	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	82	2	3	4	NULL	NULL	NULL	NULL	NULL	248	23	45	12	18	0	4	8	2	0	0	0	0	0	0	0	0	0	1	12	0	NULL	41	11	0	NULL	15	0	1039	NULL	2	2	13	9	12	12	676.0	571.153	6084.0
-577193	1	603	31	112	0	2	24	104	40	NULL	1	3	0	0	0	0	0	184	19	28	10	6	0	3	6	2	0	0	0	0	0	0	0	0	0	1	9	0	11	46	8	0	10	22	0	NULL	0	NULL	2	13	7	9	9	676.0	419.834	4732.0
-577893	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	42	3	3	3	NULL	NULL	NULL	NULL	NULL	382	51	35	13	21	2	14	14	2	1	4	1	0	0	0	0	0	0	8	46	1	NULL	72	13	1	NULL	18	0	930	NULL	1	1	6	16	18	21	36.0	748.135	576.0
-577893	1	840	48	193	0	3	41	66	44	NULL	2	3	0	0	0	0	0	238	27	31	13	5	2	6	6	2	1	4	1	0	0	0	0	0	0	0	22	8	20	64	10	7	11	26	0	NULL	0	NULL	1	6	8	10	13	36.0	563.403	288.0
-579595	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	2	3	3	NULL	NULL	NULL	NULL	NULL	371	45	47	9	27	1	1	11	8	0	0	0	0	0	0	0	0	0	1	33	4	NULL	88	20	3	NULL	31	0	1062	NULL	2	0	16	12	12	12	0.0	992.256	0.0
-579595	1	1229	238	256	0	11	51	62	50	NULL	3	3	0	0	0	0	0	323	39	40	9	16	1	1	8	5	0	0	0	0	0	0	0	0	0	1	29	5	11	92	18	4	5	34	0	NULL	0	NULL	0	16	9	9	9	0.0	880.127	0.0
-611935	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	54	3	3	3	NULL	NULL	NULL	NULL	NULL	117	16	10	4	9	0	0	3	1	1	5	0	0	0	0	0	0	0	5	6	1	NULL	20	2	1	NULL	5	0	925	NULL	1	2	6	5	5	9	144.0	162.627	720.0
-611935	1	373	40	99	0	2	29	48	51	NULL	3	3	0	0	0	0	0	106	16	5	3	1	0	0	3	1	1	5	0	0	0	0	0	0	0	5	6	7	11	31	2	7	10	15	0	NULL	0	NULL	2	6	5	5	9	144.0	157.173	720.0
-615497	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	3	1	1	NULL	3	0	1039	NULL	1	25	1	1	1	1	625.0	4.75489	625.0
-615497	1	42	0	11	0	0	3	38	12	NULL	0	1	0	0	0	0	0	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	3	1	1	0	3	0	NULL	0	NULL	25	1	1	1	1	625.0	4.75489	625.0
-621377	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	3	1	1	NULL	3	0	1039	NULL	1	1	1	1	1	1	1.0	4.75489	1.0
-621377	1	39	0	11	0	0	3	35	12	NULL	0	1	0	0	0	0	0	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	3	1	1	0	3	0	NULL	0	NULL	1	1	1	1	1	1.0	4.75489	1.0
-626165	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	5	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	1	1	0	NULL	1	0	930	NULL	0	1	0	1	1	1	0.0	4.75489	0.0
-626165	1	13	0	6	0	0	3	9	8	NULL	0	0	0	0	0	0	0	5	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	0	NULL	1	0	1	1	1	0.0	4.75489	0.0
-627705	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	21	1	0	2	NULL	NULL	NULL	NULL	NULL	46	6	5	4	2	0	1	1	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	12	4	0	NULL	6	0	1039	NULL	1	16	4	2	2	2	4096.0	68.1143	8192.0
-627705	1	138	0	26	0	0	9	45	23	NULL	0	2	0	0	0	0	0	46	6	5	4	1	0	1	1	0	0	0	0	0	0	0	0	0	0	1	4	0	1	13	4	0	1	7	0	NULL	0	NULL	16	4	2	2	2	4096.0	68.1143	8192.0
-631317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	2	2	3	NULL	NULL	NULL	NULL	NULL	198	25	35	11	11	6	4	5	2	0	0	0	1	1	0	0	0	0	1	14	0	NULL	40	11	0	NULL	15	0	930	NULL	0	1	8	7	9	9	64.0	499.216	448.0
-631317	1	594	0	143	0	0	28	60	47	NULL	2	3	0	0	0	0	0	181	22	35	11	8	6	3	4	2	0	0	0	1	1	0	0	0	0	0	11	1	3	40	8	1	3	15	0	NULL	0	NULL	1	8	6	8	8	64.0	473.652	384.0
-636967	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	2	0	1	NULL	NULL	NULL	NULL	NULL	34	5	7	4	2	0	0	1	0	0	0	0	0	0	1	0	0	0	2	0	2	NULL	7	0	1	NULL	4	0	925	NULL	2	1	0	3	3	3	0.0	53.1508	0.0
-636967	1	89	0	25	0	0	8	29	29	NULL	0	1	0	0	0	0	0	34	5	7	4	2	0	0	1	0	0	0	0	0	0	1	0	0	0	2	0	2	0	7	0	1	0	4	0	NULL	0	NULL	1	0	3	3	3	0.0	53.1508	0.0
-638767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	69	3	2	4	NULL	NULL	NULL	NULL	NULL	341	33	65	13	24	1	9	10	0	0	0	0	0	2	1	0	0	0	1	51	0	NULL	76	14	0	NULL	17	0	954	NULL	0	3	7	14	14	14	441.0	959.706	6174.0
-638767	1	967	0	175	0	0	34	84	63	NULL	2	3	0	0	0	0	0	291	27	56	13	14	1	9	6	0	0	0	0	0	2	1	0	0	0	1	42	0	8	75	11	0	6	20	0	NULL	0	NULL	3	7	10	10	10	441.0	815.405	4410.0
-638905	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	52	4	4	4	NULL	NULL	NULL	NULL	NULL	334	40	77	9	14	18	2	7	2	1	6	1	9	1	0	0	0	0	1	7	4	NULL	61	5	1	NULL	14	0	1039	NULL	2	2	5	10	10	15	100.0	982.831	1000.0
-638905	1	938	32	291	0	3	45	53	43	NULL	4	4	0	0	0	0	0	295	40	71	8	7	18	2	7	2	1	6	1	9	1	0	0	0	0	1	4	4	4	62	4	1	2	15	0	NULL	0	NULL	2	5	10	10	15	100.0	882.424	1000.0
-645031	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	36	2	1	2	NULL	NULL	NULL	NULL	NULL	114	14	19	6	6	0	0	3	1	0	0	0	0	0	0	1	0	0	3	2	2	NULL	27	2	1	NULL	8	0	925	NULL	2	1	2	5	6	6	4.0	224.74	20.0
-645031	1	268	0	72	0	0	17	44	39	NULL	1	2	0	0	0	0	0	114	14	19	6	6	0	0	3	1	0	0	0	0	0	0	1	0	0	3	2	2	0	27	2	1	0	8	0	NULL	0	NULL	1	2	5	6	6	4.0	224.74	20.0
-652563	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	0	1	NULL	NULL	NULL	NULL	NULL	21	3	2	2	2	0	0	1	0	0	0	0	0	0	0	0	0	0	1	2	1	NULL	4	2	1	NULL	4	0	1062	NULL	2	0	1	2	2	2	0.0	24.0	0.0
-652563	1	57	0	15	0	0	5	22	17	NULL	0	1	0	0	0	0	0	21	3	2	2	2	0	0	1	0	0	0	0	0	0	0	0	0	0	1	2	1	0	4	2	1	0	4	0	NULL	0	NULL	0	1	2	2	2	0.0	24.0	0.0
-658219	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	3	4	NULL	NULL	NULL	NULL	NULL	380	40	66	13	26	0	5	9	2	0	0	0	0	1	0	0	0	0	1	24	3	NULL	81	15	3	NULL	27	0	1062	NULL	2	0	16	11	12	12	0.0	1045.68	0.0
-658219	1	893	35	167	0	2	38	73	55	NULL	1	3	0	0	0	0	0	298	32	49	11	8	0	4	5	0	0	0	0	0	1	0	0	0	0	1	19	3	17	88	12	3	14	38	0	NULL	0	NULL	0	16	7	7	7	0.0	845.769	0.0
-663287	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	4	4	4	NULL	NULL	NULL	NULL	NULL	418	46	80	12	32	0	1	9	2	0	0	0	0	3	0	2	0	1	3	13	3	NULL	86	7	1	NULL	16	1	925	NULL	2	3	5	15	16	16	225.0	1169.56	3375.0
-663287	1	1059	53	306	0	4	51	68	51	NULL	4	4	0	0	0	0	0	383	43	74	12	27	0	1	8	2	0	0	0	0	3	0	2	0	1	3	12	3	3	84	6	1	3	18	1	NULL	0	NULL	3	5	14	15	15	225.0	1079.08	3150.0
-675333	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	37	2	1	2	NULL	NULL	NULL	NULL	NULL	94	15	22	10	4	1	0	6	3	0	0	0	0	0	0	0	0	0	1	11	0	NULL	23	6	0	NULL	8	0	940	NULL	0	7	1	7	7	7	49.0	226.178	343.0
-675333	1	323	23	89	0	2	19	44	40	NULL	1	2	0	0	0	0	0	91	15	21	9	2	1	0	6	3	0	0	0	0	0	0	0	0	0	1	15	0	2	25	7	0	2	10	0	NULL	0	NULL	7	1	7	7	7	49.0	218.512	343.0
-696669	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	1	0	2	NULL	NULL	NULL	NULL	NULL	52	7	12	9	1	1	1	3	0	0	0	0	0	0	0	0	0	0	0	12	0	NULL	14	6	0	NULL	7	0	941	NULL	1	6	1	4	4	4	36.0	116.758	144.0
-696669	1	188	0	39	0	0	9	50	31	NULL	0	2	0	0	0	0	0	52	7	12	9	1	1	1	3	0	0	0	0	0	0	0	0	0	0	0	12	0	0	14	6	0	0	7	0	NULL	0	NULL	6	1	4	4	4	36.0	116.758	144.0
-697511	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	1	NULL	NULL	NULL	NULL	NULL	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	954	NULL	1	0	1	1	1	1	0.0	2.0	0.0
-697511	1	15	0	4	0	0	3	11	7	NULL	0	1	0	0	0	0	0	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	0	1	1	1	1	0.0	2.0	0.0
-700031	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	1	0	5	NULL	NULL	NULL	NULL	NULL	192	17	23	11	13	0	5	3	0	0	0	0	0	0	0	0	0	0	1	21	2	NULL	34	9	1	NULL	14	0	954	NULL	1	12	6	4	5	5	5184.0	367.355	20736.0
-700031	1	482	0	75	0	0	20	50	36	NULL	0	2	0	0	0	0	0	119	17	10	7	4	0	5	3	0	0	0	0	0	0	0	0	0	0	1	17	1	10	36	9	1	4	17	0	NULL	0	NULL	12	6	4	5	5	5184.0	240.368	20736.0
-710669	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	0	2	NULL	NULL	NULL	NULL	NULL	30	3	4	4	2	0	0	0	0	0	0	0	0	1	0	0	0	0	0	2	0	NULL	9	2	0	NULL	4	0	941	NULL	1	2	2	2	2	2	16.0	49.8289	32.0
-710669	1	63	0	18	0	0	6	35	17	NULL	0	2	0	0	0	0	0	30	3	4	4	2	0	0	0	0	0	0	0	0	1	0	0	0	0	0	2	0	0	9	2	0	0	4	0	NULL	0	NULL	2	2	2	2	2	16.0	49.8289	32.0
-712707	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	2	3	NULL	NULL	NULL	NULL	NULL	284	34	43	10	16	0	2	7	3	0	0	0	0	1	0	0	0	0	2	24	2	NULL	71	15	2	NULL	25	0	1062	NULL	2	0	13	9	9	9	0.0	737.415	0.0
-712707	1	826	71	169	0	3	36	74	55	NULL	2	3	0	0	0	0	0	251	30	37	10	9	0	2	5	1	0	0	0	0	1	0	0	0	0	2	22	2	7	74	14	2	6	30	0	NULL	0	NULL	0	13	7	7	7	0.0	673.765	0.0
-726231	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	4	4	4	NULL	NULL	NULL	NULL	NULL	408	44	77	12	31	0	1	9	2	0	0	0	0	3	1	1	0	1	3	12	3	NULL	85	7	1	NULL	16	1	925	NULL	2	2	5	15	16	16	100.0	1135.35	1500.0
-726231	1	1035	62	297	0	4	50	68	51	NULL	4	4	0	0	0	0	0	373	41	71	12	26	0	1	8	2	0	0	0	0	3	1	1	0	1	3	11	3	3	83	6	1	3	18	1	NULL	0	NULL	2	5	14	15	15	100.0	1045.32	1400.0
-729039	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	8	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	955	NULL	1	1	1	1	1	1	1.0	2.0	1.0
-729039	1	45	0	5	0	0	3	41	10	NULL	0	1	0	0	0	0	0	8	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	1	1	1	1	1	1.0	2.0	1.0
-734281	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	1	0	3	NULL	NULL	NULL	NULL	NULL	50	5	8	3	2	0	2	2	1	0	0	0	0	0	0	0	0	0	0	3	0	NULL	8	2	0	NULL	3	0	889	NULL	1	1	3	3	3	3	9.0	54.0	27.0
-734281	1	178	0	21	0	0	7	65	24	NULL	0	2	0	0	0	0	0	40	5	4	2	0	0	2	2	1	0	0	0	0	0	0	0	0	0	0	3	0	2	10	2	0	2	5	0	NULL	0	NULL	1	3	3	3	3	9.0	39.303	27.0
-735199	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	1	0	3	NULL	NULL	NULL	NULL	NULL	68	9	7	5	2	7	0	1	0	0	0	0	0	0	1	0	0	0	1	8	0	NULL	14	6	0	NULL	8	0	958	NULL	0	2	3	3	4	4	36.0	133.783	108.0
-735199	1	211	0	44	0	0	12	42	34	NULL	0	3	0	0	0	0	0	65	9	6	4	1	7	0	1	0	0	0	0	0	0	1	0	0	0	1	8	0	1	15	6	0	1	9	0	NULL	0	NULL	2	3	3	4	4	36.0	127.377	108.0
-745593	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	0	0	2	NULL	NULL	NULL	NULL	NULL	31	1	7	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	NULL	3	0	1	NULL	2	0	889	NULL	1	1	1	1	2	2	1.0	41.209	1.0
-745593	1	64	0	11	0	0	3	60	34	NULL	0	2	0	0	0	0	0	26	1	5	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	5	0	1	2	4	0	NULL	0	NULL	1	1	1	2	2	1.0	34.8692	1.0
-748359	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	1	0	2	NULL	NULL	NULL	NULL	NULL	95	8	11	5	8	0	4	4	3	0	0	0	0	0	0	0	0	0	0	8	0	NULL	18	2	0	NULL	4	0	958	NULL	3	1	1	5	5	5	1.0	151.236	5.0
-748359	1	247	0	47	0	0	10	48	31	NULL	0	1	0	0	0	0	0	71	8	7	4	4	0	4	4	3	0	0	0	0	0	0	0	0	0	0	4	0	4	18	1	0	1	4	0	NULL	0	NULL	1	1	5	5	5	1.0	103.964	5.0
-750689	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	21	0	0	2	NULL	NULL	NULL	NULL	NULL	19	1	3	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	NULL	2	0	1	NULL	2	0	889	NULL	1	1	0	1	1	1	0.0	13.9316	0.0
-750689	1	41	0	6	0	0	3	37	22	NULL	0	2	0	0	0	0	0	19	1	3	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	2	0	1	0	2	0	NULL	0	NULL	1	0	1	1	1	0.0	13.9316	0.0
-754385	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	1	1	1	NULL	NULL	NULL	NULL	NULL	51	3	1	1	0	0	0	0	0	1	9	1	0	0	0	0	0	0	2	2	10	NULL	15	2	9	NULL	12	0	889	NULL	1	1	1	2	2	10	1.0	59.207	2.0
-754385	1	165	0	40	0	0	9	54	64	NULL	1	1	0	0	0	0	0	51	3	1	1	0	0	0	0	0	1	9	1	0	0	0	0	0	0	2	2	10	10	15	2	9	9	12	0	NULL	0	NULL	1	1	2	2	10	1.0	59.207	2.0
-763667	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	3	4	NULL	NULL	NULL	NULL	NULL	362	40	60	12	22	0	3	10	3	0	0	0	0	1	0	0	0	0	2	26	3	NULL	80	17	3	NULL	29	0	1062	NULL	2	0	15	12	12	12	0.0	968.319	0.0
-763667	1	872	18	169	0	2	39	73	55	NULL	1	3	0	0	0	0	0	289	32	45	11	7	0	3	6	1	0	0	0	0	1	0	0	0	0	2	21	3	13	84	14	3	11	37	0	NULL	0	NULL	0	15	8	8	8	0.0	786.265	0.0
-764319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	1	0	5	NULL	NULL	NULL	NULL	NULL	118	11	12	7	6	0	1	1	0	0	0	0	0	0	0	0	0	0	0	10	2	NULL	21	8	1	NULL	12	0	958	NULL	1	61	8	2	2	2	238144.0	181.11	476288.0
-764319	1	247	35	39	0	1	14	54	19	NULL	0	1	0	0	0	0	0	63	11	2	2	2	0	1	1	0	0	0	0	0	0	0	0	0	0	0	9	1	5	21	8	1	4	15	0	NULL	0	NULL	61	8	2	2	2	238144.0	106.198	476288.0
-764969	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	54	2	2	4	NULL	NULL	NULL	NULL	NULL	59	5	9	4	2	0	1	1	0	0	0	0	1	1	0	0	0	0	0	2	1	NULL	11	2	1	NULL	6	0	889	NULL	2	1	2	3	3	3	4.0	78.8692	12.0
-764969	1	166	0	39	0	0	9	54	56	NULL	2	4	0	0	0	0	0	59	5	9	4	2	0	1	1	0	0	0	0	1	1	0	0	0	0	0	2	1	0	11	2	1	0	6	0	NULL	0	NULL	1	2	3	3	3	4.0	78.8692	12.0
-780111	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	0	0	5	NULL	NULL	NULL	NULL	NULL	103	8	11	6	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	7	2	NULL	18	5	1	NULL	9	0	958	NULL	1	9	6	1	1	1	2916.0	140.182	2916.0
-780111	1	171	0	27	0	0	11	34	13	NULL	0	1	0	0	0	0	0	48	8	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	6	1	5	18	5	1	4	12	0	NULL	0	NULL	9	6	1	1	1	2916.0	70.3084	2916.0
-788111	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	0	4	NULL	NULL	NULL	NULL	NULL	88	11	10	4	3	2	2	3	0	0	0	0	0	0	0	0	0	0	2	9	8	NULL	22	7	4	NULL	13	0	925	NULL	1	1	5	4	4	4	25.0	164.999	100.0
-788111	1	471	177	58	0	4	15	75	33	NULL	0	2	0	0	0	0	0	74	10	8	4	0	2	2	2	0	0	0	0	0	0	0	0	0	0	2	7	7	4	22	5	5	3	14	0	NULL	0	NULL	1	5	3	3	3	25.0	138.302	75.0
-791759	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	50	2	1	2	NULL	NULL	NULL	NULL	NULL	191	15	26	7	15	0	9	5	1	0	0	0	0	0	0	0	0	0	0	31	1	NULL	35	10	1	NULL	12	0	958	NULL	0	2	4	6	11	11	64.0	386.647	384.0
-791759	1	583	0	91	0	0	19	61	46	NULL	1	2	0	0	0	0	0	143	15	18	6	6	0	9	5	1	0	0	0	0	0	0	0	0	0	0	26	1	9	36	10	1	2	13	0	NULL	0	NULL	2	4	6	11	11	64.0	278.631	384.0
-816755	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	48	2	1	3	NULL	NULL	NULL	NULL	NULL	284	35	46	9	19	0	0	7	5	0	0	0	0	0	0	0	0	0	3	19	6	NULL	74	14	3	NULL	28	0	1062	NULL	2	0	8	8	11	11	0.0	807.222	0.0
-816755	1	790	79	188	0	3	38	64	50	NULL	1	2	0	0	0	0	0	256	31	42	9	12	0	0	5	3	0	0	0	0	0	0	0	0	0	3	17	10	7	77	13	6	5	32	0	NULL	0	NULL	0	8	6	9	9	0.0	750.358	0.0
-818911	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	0	4	NULL	NULL	NULL	NULL	NULL	14	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	3	0	NULL	3	3	0	NULL	3	0	925	NULL	0	2	3	1	1	1	36.0	4.75489	36.0
-818911	1	37	0	5	0	0	3	33	16	NULL	0	4	0	0	0	0	0	14	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	3	0	0	3	3	0	0	3	0	NULL	0	NULL	2	3	1	1	1	36.0	4.75489	36.0
-824063	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	44	2	2	6	NULL	NULL	NULL	NULL	NULL	388	30	35	5	28	5	3	2	1	1	8	1	0	0	0	0	0	0	10	49	21	NULL	79	10	4	NULL	15	0	925	NULL	0	3	8	4	4	11	576.0	842.004	2304.0
-824063	1	1054	35	212	0	2	46	74	38	NULL	2	4	0	0	0	0	0	314	30	22	3	1	5	3	2	1	1	8	1	0	0	0	0	0	0	10	49	23	25	93	10	9	7	22	0	NULL	0	NULL	3	8	4	4	11	576.0	599.458	2304.0
-825247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	252	2	1	4	NULL	NULL	NULL	NULL	NULL	875	30	201	15	54	20	3	5	0	0	0	0	0	4	2	0	0	0	1	68	0	NULL	110	8	0	NULL	12	0	959	NULL	0	2	4	12	34	34	64.0	2563.41	768.0
-825247	1	685	0	178	0	0	34	63	55	NULL	1	3	0	0	0	0	0	242	30	57	12	6	10	3	5	0	0	0	0	0	4	2	0	0	0	1	17	0	12	65	6	0	3	13	0	NULL	0	NULL	2	4	12	22	22	64.0	739.342	768.0
-864019	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	2	1	3	NULL	NULL	NULL	NULL	NULL	225	33	21	5	13	0	1	8	6	1	3	1	0	0	0	0	0	0	9	15	1	NULL	44	5	1	NULL	11	0	1062	NULL	2	0	4	10	10	12	0.0	378.923	0.0
-864019	1	515	24	111	0	2	30	42	28	NULL	1	1	0	0	0	0	0	168	27	9	3	4	0	1	5	3	1	3	1	0	0	0	0	0	0	9	12	4	9	47	4	4	5	15	0	NULL	0	NULL	0	4	7	7	9	0.0	267.566	0.0
-866967	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	1	1	1	NULL	NULL	NULL	NULL	NULL	55	13	6	2	0	6	0	0	0	1	6	0	6	0	0	0	0	0	0	6	0	NULL	7	3	0	NULL	4	0	959	NULL	1	2	0	2	2	7	0.0	68.1143	0.0
-866967	1	200	0	38	0	0	10	29	19	NULL	1	1	0	0	0	0	0	55	13	6	2	0	6	0	0	0	1	6	0	6	0	0	0	0	0	0	6	0	0	7	3	0	0	4	0	NULL	0	NULL	2	0	2	2	7	0.0	68.1143	0.0
-879455	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	1	1	1	NULL	NULL	NULL	NULL	NULL	51	9	6	2	6	0	2	2	1	0	0	0	0	0	0	0	0	0	1	6	0	NULL	11	2	0	NULL	4	0	959	NULL	2	3	1	3	3	3	9.0	82.4541	27.0
-879455	1	198	0	50	0	0	13	42	25	NULL	1	1	0	0	0	0	0	51	9	6	2	4	0	2	2	1	0	0	0	0	0	0	0	0	0	1	6	0	2	13	2	0	2	6	0	NULL	0	NULL	3	1	3	3	3	9.0	82.4541	27.0
-884319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	1	1	4	NULL	NULL	NULL	NULL	NULL	50	3	0	0	6	2	0	0	0	1	7	0	0	0	0	0	0	0	2	4	0	NULL	6	4	0	NULL	5	0	925	NULL	1	3	3	2	2	8	81.0	51.8062	162.0
-884319	1	154	0	32	0	0	7	72	67	NULL	1	4	0	0	0	0	0	50	3	0	0	0	2	0	0	0	1	7	0	0	0	0	0	0	0	2	4	6	6	12	4	6	6	11	0	NULL	0	NULL	3	3	2	2	8	81.0	51.8062	162.0
-892783	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	56	2	0	5	NULL	NULL	NULL	NULL	NULL	113	7	29	12	9	4	0	2	0	0	0	0	1	1	0	0	0	0	2	2	2	NULL	16	1	1	NULL	4	0	959	NULL	1	3	2	4	8	8	36.0	281.763	144.0
-892783	1	196	0	53	0	0	10	45	35	NULL	0	4	0	0	0	0	0	77	7	22	10	2	4	0	2	0	0	0	0	1	1	0	0	0	0	2	0	2	2	16	0	1	2	5	0	NULL	0	NULL	3	2	4	8	8	36.0	193.262	144.0
-894343	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	24	1	1	5	NULL	NULL	NULL	NULL	NULL	40	4	2	2	2	0	0	1	0	0	0	0	0	0	0	0	0	0	2	7	0	NULL	9	6	0	NULL	7	0	925	NULL	1	2	5	2	2	2	100.0	44.9726	200.0
-894343	1	105	0	24	0	0	7	47	25	NULL	1	5	0	0	0	0	0	40	4	2	2	0	0	0	1	0	0	0	0	0	0	0	0	0	0	2	7	2	2	11	6	1	1	8	0	NULL	0	NULL	2	5	2	2	2	100.0	43.1851	200.0
-896891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	2	1	3	NULL	NULL	NULL	NULL	NULL	273	36	30	13	24	0	1	9	9	1	6	1	0	0	0	0	0	0	13	20	2	NULL	53	7	2	NULL	15	0	1062	NULL	2	0	5	11	14	19	0.0	609.947	0.0
-896891	1	706	24	144	0	2	33	45	37	NULL	1	2	0	0	0	0	0	245	32	26	13	14	0	1	7	7	1	6	1	0	0	0	0	0	0	13	18	8	10	59	6	8	8	22	0	NULL	0	NULL	0	5	9	12	17	0.0	555.856	0.0
-901455	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	1	1	5	NULL	NULL	NULL	NULL	NULL	104	8	6	2	9	0	0	0	0	1	3	1	0	0	0	0	0	0	4	13	3	NULL	20	4	1	NULL	6	0	925	NULL	1	2	3	2	2	4	36.0	143.061	72.0
-901455	1	254	0	56	0	0	15	38	25	NULL	1	3	0	0	0	0	0	86	8	3	1	0	0	0	0	0	1	3	1	0	0	0	0	0	0	4	13	6	9	26	4	3	4	9	0	NULL	0	NULL	2	3	2	2	4	36.0	96.3359	72.0
-919495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	1	0	3	NULL	NULL	NULL	NULL	NULL	80	11	22	6	5	4	0	2	1	0	0	0	0	0	1	0	0	0	3	4	0	NULL	17	3	0	NULL	6	0	1007	NULL	1	9	1	4	8	8	81.0	210.831	324.0
-919495	1	226	0	65	0	0	14	49	35	NULL	0	1	0	0	0	0	0	73	11	20	6	4	4	0	2	1	0	0	0	0	0	1	0	0	0	3	3	0	2	18	2	0	2	7	0	NULL	0	NULL	9	1	4	8	8	81.0	202.047	324.0
-939395	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	92	1	3	4	NULL	NULL	NULL	NULL	NULL	121	11	21	8	5	0	4	4	0	0	0	0	0	0	0	0	0	0	0	7	0	NULL	19	5	0	NULL	6	0	1062	NULL	1	1	5	5	7	7	25.0	191.157	125.0
-939395	1	201	0	38	0	0	10	74	44	NULL	1	3	0	0	0	0	0	63	7	8	3	0	0	2	2	0	0	0	0	0	0	0	0	0	0	0	4	0	5	17	2	0	4	7	0	NULL	0	NULL	1	5	3	3	3	25.0	83.0482	75.0
-953171	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	2	1	2	NULL	NULL	NULL	NULL	NULL	100	13	20	9	6	0	1	2	0	0	0	0	0	1	0	0	0	0	1	10	4	NULL	26	3	2	NULL	7	0	1062	NULL	0	14	2	4	4	4	784.0	231.89	3136.0
-953171	1	276	0	64	0	0	16	44	34	NULL	1	2	0	0	0	0	0	100	13	20	9	6	0	1	2	0	0	0	0	0	1	0	0	0	0	1	10	4	0	26	3	2	0	7	0	NULL	0	NULL	14	2	4	4	4	784.0	231.89	3136.0
-953703	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	0	NULL	NULL	NULL	NULL	NULL	10	1	3	2	0	2	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	1	0	928	NULL	1	0	0	1	2	2	0.0	16.2535	0.0
-953703	1	30	0	7	0	0	3	26	14	NULL	0	0	0	0	0	0	0	10	1	3	2	0	2	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	2	0	0	0	1	0	NULL	0	NULL	0	0	1	2	2	0.0	16.2535	0.0
-971035	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	0	3	NULL	NULL	NULL	NULL	NULL	103	14	16	6	5	0	1	2	1	0	0	0	0	0	0	0	0	0	1	7	1	NULL	27	7	1	NULL	12	0	1062	NULL	2	0	7	3	4	4	0.0	217.131	0.0
-971035	1	347	75	56	0	3	16	59	43	NULL	0	3	0	0	0	0	0	89	12	14	6	2	0	1	1	0	0	0	0	0	0	0	0	0	0	1	6	1	3	28	6	1	3	14	0	NULL	0	NULL	0	7	2	3	3	0.0	196.215	0.0
-981647	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	61	6	6	3	NULL	NULL	NULL	NULL	NULL	555	60	115	14	32	23	5	14	8	1	12	1	1	3	0	0	0	0	11	15	23	NULL	103	9	4	NULL	21	0	930	NULL	0	4	7	19	23	34	784.0	1772.28	14896.0
-981647	1	2136	161	548	0	4	82	93	64	NULL	6	3	0	0	0	0	0	551	60	114	14	19	23	5	14	8	1	12	1	1	3	0	0	0	0	11	15	32	12	115	9	12	10	31	0	NULL	0	NULL	4	7	19	23	34	784.0	1746.04	14896.0
-993267	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	37	2	2	3	NULL	NULL	NULL	NULL	NULL	387	53	54	10	27	1	2	15	9	0	0	0	0	0	0	0	0	0	2	19	1	NULL	96	9	1	NULL	19	0	1062	NULL	2	0	8	16	16	16	0.0	1038.25	0.0
-993267	1	740	31	205	0	1	46	55	31	NULL	2	2	0	0	0	0	0	301	40	42	8	21	1	2	8	3	0	0	0	0	0	0	0	0	0	2	11	1	7	89	6	1	2	18	0	NULL	0	NULL	0	8	9	9	9	0.0	854.499	0.0
-1038403	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	2	2	3	NULL	NULL	NULL	NULL	NULL	190	22	37	9	6	3	0	3	2	0	0	0	1	2	0	0	0	0	1	8	3	NULL	53	5	2	NULL	17	0	1062	NULL	2	0	5	6	7	7	0.0	507.799	0.0
-1038403	1	404	10	106	0	1	24	56	36	NULL	2	1	0	0	0	0	0	162	18	33	8	4	3	0	1	0	0	0	0	1	2	0	0	0	0	1	6	3	2	51	4	2	1	17	0	NULL	0	NULL	0	5	4	5	5	0.0	455.0	0.0
-1065507	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	4	4	4	NULL	NULL	NULL	NULL	NULL	1012	117	185	16	33	43	15	19	4	2	19	2	14	2	1	0	2	0	1	56	2	NULL	255	14	2	NULL	31	0	1063	NULL	4	2	14	25	29	46	784.0	3582.34	19600.0
-1065507	1	3237	204	767	0	7	133	95	51	NULL	4	3	0	0	0	0	0	962	113	176	15	22	43	15	17	2	2	19	2	14	2	1	0	2	0	1	53	2	9	259	12	2	5	34	0	NULL	0	NULL	2	14	23	27	44	784.0	3416.45	18032.0
-1104287	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	241	6	5	4	NULL	NULL	NULL	NULL	NULL	845	68	172	18	57	0	4	15	2	0	0	0	0	9	1	0	0	2	2	44	5	NULL	184	10	1	NULL	19	1	930	NULL	3	4	7	26	41	41	784.0	2707.05	20384.0
-1104287	1	2308	187	544	0	6	87	87	232	NULL	5	4	0	0	0	0	0	759	62	155	18	36	0	4	13	2	0	0	0	0	9	1	0	0	2	2	42	11	14	188	9	7	11	29	1	NULL	0	NULL	4	7	24	39	39	784.0	2416.14	18816.0
-1235495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	82	2	3	3	NULL	NULL	NULL	NULL	NULL	273	26	52	9	15	0	0	7	0	0	0	0	0	2	0	0	0	0	1	5	0	NULL	43	1	0	NULL	3	0	930	NULL	1	1	1	10	11	11	1.0	523.038	10.0
-1235495	1	275	0	59	0	0	15	54	51	NULL	1	2	0	0	0	0	0	118	11	23	7	2	0	0	2	0	0	0	0	0	2	0	0	0	0	1	0	2	8	30	0	2	4	6	0	NULL	0	NULL	1	1	5	6	6	1.0	214.879	5.0
-1252211	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	37	1	0	3	NULL	NULL	NULL	NULL	NULL	131	17	22	6	7	0	2	3	1	0	0	0	0	0	0	0	0	0	1	9	2	NULL	33	8	2	NULL	15	0	1063	NULL	2	0	7	4	4	4	0.0	298.056	0.0
-1252211	1	369	0	63	0	0	18	65	39	NULL	0	3	0	0	0	0	0	117	15	20	6	4	0	2	2	0	0	0	0	0	0	0	0	0	0	1	8	2	3	34	7	2	3	17	0	NULL	0	NULL	0	7	3	3	3	0.0	275.783	0.0
-1276067	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	43	2	1	5	NULL	NULL	NULL	NULL	NULL	247	26	29	7	18	0	4	6	2	0	0	0	0	0	0	0	0	0	1	20	3	NULL	56	15	3	NULL	25	0	1063	NULL	2	0	13	7	7	7	0.0	581.317	0.0
-1276067	1	794	145	120	0	4	32	64	45	NULL	1	4	0	0	0	0	0	203	24	19	6	9	0	4	5	1	0	0	0	0	0	0	0	0	0	1	17	3	7	59	13	3	4	27	0	NULL	0	NULL	0	13	6	6	6	0.0	469.132	0.0
-1323275	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	2	1	3	NULL	NULL	NULL	NULL	NULL	273	40	33	14	17	0	4	6	3	1	7	1	7	0	0	0	0	0	1	16	2	NULL	71	10	2	NULL	20	0	1063	NULL	2	0	10	8	9	15	0.0	686.363	0.0
-1323275	1	777	36	201	0	2	50	62	52	NULL	1	2	0	0	0	0	0	245	36	29	13	7	0	4	4	1	1	7	1	7	0	0	0	0	0	1	14	10	10	77	9	9	8	27	0	NULL	0	NULL	0	10	6	7	13	0.0	627.669	0.0
-1370595	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	1	0	1	NULL	NULL	NULL	NULL	NULL	45	7	8	6	5	0	0	2	1	0	0	0	0	0	0	0	0	0	3	1	0	NULL	12	1	0	NULL	4	0	1063	NULL	2	3	1	3	3	3	9.0	97.6723	27.0
-1370595	1	118	0	43	0	0	11	19	25	NULL	0	1	0	0	0	0	0	45	7	8	6	5	0	0	2	1	0	0	0	0	0	0	0	0	0	3	1	0	0	12	1	0	0	4	0	NULL	0	NULL	3	1	3	3	3	9.0	97.6723	27.0
-1381963	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	1	1	3	NULL	NULL	NULL	NULL	NULL	120	16	18	8	8	0	0	2	1	0	0	0	0	0	0	0	0	0	2	7	2	NULL	35	5	2	NULL	13	0	1063	NULL	2	0	5	3	6	6	0.0	296.337	0.0
-1381963	1	280	0	72	0	0	18	46	35	NULL	1	1	0	0	0	0	0	106	14	16	7	3	0	0	1	0	0	0	0	0	0	0	0	0	0	2	6	6	5	38	4	5	4	16	0	NULL	0	NULL	0	5	2	5	5	0.0	267.925	0.0
-1400667	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	2	2	3	NULL	NULL	NULL	NULL	NULL	381	50	47	16	24	0	5	10	7	1	6	1	7	0	0	0	0	0	2	23	2	NULL	91	12	2	NULL	21	0	1063	NULL	2	0	14	12	14	19	0.0	960.779	0.0
-1400667	1	1196	131	264	0	5	61	64	52	NULL	2	3	0	0	0	0	0	343	46	39	16	6	0	5	8	5	1	6	1	7	0	0	0	0	0	2	21	9	18	105	11	9	14	34	0	NULL	0	NULL	0	14	10	12	17	0.0	871.103	0.0
-1471563	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	1	0	3	NULL	NULL	NULL	NULL	NULL	183	24	29	5	7	0	1	3	2	0	0	0	0	0	0	0	0	0	1	13	1	NULL	50	8	1	NULL	16	0	1063	NULL	2	0	8	4	4	4	0.0	413.433	0.0
-1471563	1	421	0	82	0	0	24	59	29	NULL	0	1	0	0	0	0	0	155	20	25	5	3	0	1	1	0	0	0	0	0	0	0	0	0	0	1	11	1	4	50	7	1	3	18	0	NULL	0	NULL	0	8	2	2	2	0.0	366.634	0.0
-1497883	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	1	2	3	NULL	NULL	NULL	NULL	NULL	83	10	9	4	7	0	0	3	2	0	0	0	0	0	0	0	0	0	1	4	1	NULL	17	2	1	NULL	5	0	1063	NULL	2	0	3	4	4	4	0.0	132.0	0.0
-1497883	1	155	0	47	0	0	14	21	29	NULL	2	2	0	0	0	0	0	64	8	5	3	5	0	0	2	1	0	0	0	0	0	0	0	0	0	1	3	1	2	17	1	1	2	6	0	NULL	0	NULL	0	3	3	3	3	0.0	102.799	0.0
-1509475	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	2	1	3	NULL	NULL	NULL	NULL	NULL	156	20	17	4	12	0	0	6	2	0	0	0	0	0	0	0	0	0	2	11	1	NULL	33	5	1	NULL	9	0	1063	NULL	2	0	4	7	7	7	0.0	287.919	0.0
-1509475	1	313	0	75	0	0	21	28	33	NULL	1	2	0	0	0	0	0	118	16	9	3	8	0	0	4	0	0	0	0	0	0	0	0	0	0	2	9	1	4	33	4	1	2	10	0	NULL	0	NULL	0	4	5	5	5	0.0	219.616	0.0
-1530195	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	63	4	4	4	NULL	NULL	NULL	NULL	NULL	1031	117	180	17	69	14	11	23	15	0	0	0	2	3	2	2	0	1	1	54	15	NULL	248	21	4	NULL	40	1	1063	NULL	2	0	18	31	43	43	0.0	3643.06	0.0
-1530195	1	2971	156	768	0	8	128	76	48	NULL	4	3	0	0	0	0	0	965	110	170	15	38	14	10	19	12	0	0	0	2	3	2	2	0	1	1	48	20	32	270	17	6	11	47	1	NULL	0	NULL	0	18	27	38	38	0.0	3361.78	0.0
-1700883	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	1	1	3	NULL	NULL	NULL	NULL	NULL	95	12	10	4	6	0	0	3	3	0	0	0	0	0	0	0	0	0	1	5	1	NULL	19	2	1	NULL	5	0	1063	NULL	2	0	3	4	4	4	0.0	136.741	0.0
-1700883	1	149	0	38	0	0	13	20	19	NULL	1	2	0	0	0	0	0	62	8	4	2	3	0	0	1	1	0	0	0	0	0	0	0	0	0	1	3	1	3	18	1	1	2	6	0	NULL	0	NULL	0	3	2	2	2	0.0	86.4858	0.0
-1712531	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	1	3	NULL	NULL	NULL	NULL	NULL	104	13	11	5	8	0	0	4	3	0	0	0	0	0	0	0	0	0	1	5	1	NULL	20	2	1	NULL	5	0	1063	NULL	2	0	3	5	5	5	0.0	162.627	0.0
-1712531	1	164	0	42	0	0	13	24	27	NULL	1	2	0	0	0	0	0	71	9	5	3	5	0	0	2	1	0	0	0	0	0	0	0	0	0	1	3	1	3	19	1	1	2	6	0	NULL	0	NULL	0	3	3	3	3	0.0	110.413	0.0
-1725299	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	2	2	3	NULL	NULL	NULL	NULL	NULL	156	17	24	6	10	0	0	5	2	0	0	0	0	1	0	0	0	0	3	5	1	NULL	25	3	1	NULL	6	0	1063	NULL	2	0	7	7	10	10	0.0	263.106	0.0
-1725299	1	240	0	66	0	0	18	41	34	NULL	2	2	0	0	0	0	0	95	13	7	4	2	0	0	3	0	0	0	0	0	1	0	0	0	0	3	3	1	7	27	2	1	6	11	0	NULL	0	NULL	0	7	5	7	7	0.0	147.149	0.0
-1742043	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	2	1	3	NULL	NULL	NULL	NULL	NULL	148	16	23	6	10	0	0	5	2	0	0	0	0	1	0	0	0	0	3	5	1	NULL	23	3	1	NULL	6	0	1063	NULL	2	0	7	7	10	10	0.0	249.728	0.0
-1742043	1	223	0	57	0	0	16	41	31	NULL	1	2	0	0	0	0	0	87	12	6	4	2	0	0	3	0	0	0	0	0	1	0	0	0	0	3	3	1	7	25	2	1	6	11	0	NULL	0	NULL	0	7	5	7	7	0.0	134.886	0.0
-1757835	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	2	3	NULL	NULL	NULL	NULL	NULL	218	25	30	7	16	0	0	8	5	0	0	0	0	1	0	0	0	0	3	9	1	NULL	36	3	1	NULL	6	0	1063	NULL	2	0	7	10	13	13	0.0	398.354	0.0
-1757835	1	341	16	82	0	1	21	41	31	NULL	2	2	0	0	0	0	0	129	17	9	5	6	0	0	4	1	0	0	0	0	1	0	0	0	0	3	5	1	9	36	2	1	6	11	0	NULL	0	NULL	0	7	6	8	8	0.0	227.431	0.0
-1780683	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	82	3	3	3	NULL	NULL	NULL	NULL	NULL	278	30	47	10	15	0	0	7	4	0	0	0	0	2	0	0	0	0	4	11	3	NULL	58	4	2	NULL	14	0	1063	NULL	2	0	8	10	13	13	0.0	634.248	0.0
-1780683	1	560	29	140	0	1	30	67	36	NULL	3	2	0	0	0	0	0	189	22	26	8	4	0	0	3	0	0	0	0	0	2	0	0	0	0	4	7	3	10	59	3	2	7	20	0	NULL	0	NULL	0	8	6	8	8	0.0	445.0	0.0
-1815515	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	63	4	2	4	NULL	NULL	NULL	NULL	NULL	724	81	84	12	44	0	6	12	9	1	14	1	13	3	0	0	0	0	2	54	12	NULL	163	31	7	NULL	48	0	1063	NULL	2	0	34	17	18	31	0.0	1949.83	0.0
-1815515	1	2161	204	443	0	7	97	66	45	NULL	2	4	0	0	0	0	0	610	75	64	10	11	0	6	9	6	1	14	1	13	3	0	0	0	0	2	48	12	31	183	27	7	25	68	0	NULL	0	NULL	0	34	14	15	28	0.0	1670.74	0.0
-1941403	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	2	1	4	NULL	NULL	NULL	NULL	NULL	178	20	22	6	13	0	1	5	3	0	0	0	0	1	0	0	0	0	1	15	3	NULL	44	13	3	NULL	20	0	1064	NULL	2	0	10	7	7	7	0.0	417.547	0.0
-1941403	1	439	44	93	0	1	24	64	26	NULL	1	2	0	0	0	0	0	149	18	16	5	7	0	1	4	2	0	0	0	0	1	0	0	0	0	1	13	3	5	46	11	3	4	22	0	NULL	0	NULL	0	10	6	6	6	0.0	351.035	0.0
-1968899	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	12	3	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	4	0	0	NULL	2	0	1064	NULL	2	1	0	1	1	1	0.0	14.0	0.0
-1968899	1	30	0	13	0	0	5	10	8	NULL	0	0	0	0	0	0	0	12	3	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	4	0	0	0	2	0	NULL	0	NULL	1	0	1	1	1	0.0	14.0	0.0
-1972539	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	3	NULL	NULL	NULL	NULL	NULL	71	12	9	4	2	0	1	2	1	0	0	0	0	0	0	0	0	0	1	5	2	NULL	22	5	2	NULL	12	0	1064	NULL	2	2	5	3	3	3	100.0	137.608	300.0
-1972539	1	184	0	39	0	0	13	37	21	NULL	0	1	0	0	0	0	0	57	10	7	3	0	0	1	1	0	0	0	0	0	0	0	0	0	0	1	4	2	2	22	4	2	2	13	0	NULL	0	NULL	2	5	2	2	2	100.0	116.0	200.0
-1999979	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	46	3	9	3	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	0	NULL	6	2	0	NULL	2	0	1067	NULL	0	1	0	1	1	1	0.0	72.6481	0.0
-1999979	1	71	0	14	0	0	5	22	13	NULL	0	0	0	0	0	0	0	28	3	6	2	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	3	6	1	0	3	4	0	NULL	0	NULL	1	0	1	1	1	0.0	47.5489	0.0
-2007707	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	80	3	1	2	NULL	NULL	NULL	NULL	NULL	339	37	53	12	22	2	9	13	5	0	0	0	1	2	0	0	0	0	4	24	1	NULL	79	8	1	NULL	15	0	1067	NULL	2	3	6	16	20	20	324.0	884.898	5184.0
-2007707	1	1138	154	239	0	8	44	70	83	NULL	1	2	0	0	0	0	0	327	37	51	11	6	2	9	13	5	0	0	0	1	2	0	0	0	0	4	22	8	16	93	7	5	9	23	0	NULL	0	NULL	3	6	16	20	20	324.0	819.632	5184.0
-2074011	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	2	0	1	NULL	NULL	NULL	NULL	NULL	39	5	6	5	2	0	1	1	0	0	0	0	0	1	0	0	0	0	2	2	0	NULL	9	1	0	NULL	3	0	1067	NULL	1	2	0	3	3	3	0.0	56.4728	0.0
-2074011	1	111	0	29	0	0	8	32	31	NULL	0	1	0	0	0	0	0	39	5	6	5	1	0	1	1	0	0	0	0	0	1	0	0	0	0	2	2	0	1	10	1	0	1	4	0	NULL	0	NULL	2	0	3	3	3	0.0	56.4728	0.0
-2081739	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	83	3	4	4	NULL	NULL	NULL	NULL	NULL	280	28	44	13	15	1	2	7	2	0	0	0	0	1	0	0	0	0	1	25	2	NULL	64	11	2	NULL	18	0	1067	NULL	2	0	11	9	11	11	0.0	688.769	0.0
-2081739	1	705	51	144	0	2	29	63	73	NULL	2	2	0	0	0	0	0	223	23	33	11	5	1	2	5	1	0	0	0	0	1	0	0	0	0	1	21	3	8	65	9	3	7	23	0	NULL	0	NULL	0	11	7	9	9	0.0	553.481	0.0
-2123123	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	2	4	NULL	NULL	NULL	NULL	NULL	131	10	21	10	6	1	2	4	1	0	0	0	0	1	0	0	0	0	0	12	0	NULL	28	4	0	NULL	6	0	1067	NULL	0	1	4	6	7	7	16.0	253.319	96.0
-2123123	1	382	0	84	0	0	16	69	52	NULL	2	2	0	0	0	0	0	119	10	17	6	1	1	2	4	1	0	0	0	0	1	0	0	0	0	0	12	1	4	32	4	1	4	10	0	NULL	0	NULL	1	4	6	7	7	16.0	212.666	96.0
-2145747	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	2	0	1	NULL	NULL	NULL	NULL	NULL	36	4	5	4	2	0	0	1	0	0	0	0	0	1	0	0	0	0	0	3	0	NULL	9	2	0	NULL	3	0	1068	NULL	0	1	1	3	3	3	1.0	50.7188	3.0
-2145747	1	88	0	23	0	0	7	32	28	NULL	0	1	0	0	0	0	0	36	4	5	4	1	0	0	1	0	0	0	0	0	1	0	0	0	0	0	3	0	1	10	2	0	1	4	0	NULL	0	NULL	1	1	3	3	3	1.0	50.7188	3.0
-2154651	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	67	4	3	3	NULL	NULL	NULL	NULL	NULL	496	56	102	13	21	3	7	11	6	0	0	0	0	1	3	0	0	0	1	40	3	NULL	135	17	2	NULL	30	0	1070	NULL	2	0	12	16	19	19	0.0	1583.25	0.0
-2154651	1	1486	129	317	0	5	58	63	69	NULL	3	3	0	0	0	0	0	454	50	96	12	17	3	7	8	3	0	0	0	0	1	3	0	0	0	1	37	3	4	133	16	2	2	31	0	NULL	0	NULL	0	12	13	16	16	0.0	1488.34	0.0
-2241003	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	7	6	3	NULL	NULL	NULL	NULL	NULL	782	91	176	13	36	5	11	17	9	0	0	0	0	2	4	1	0	2	1	52	3	NULL	210	16	2	NULL	32	1	1070	NULL	2	0	13	25	28	28	0.0	2744.02	0.0
-2241003	1	2638	279	663	0	11	98	71	49	NULL	6	3	0	0	0	0	0	740	85	170	13	31	5	11	14	6	0	0	0	0	2	4	1	0	2	1	49	3	5	209	15	2	3	34	1	NULL	0	NULL	0	13	22	25	25	0.0	2645.64	0.0
-2391811	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	52	2	2	1	NULL	NULL	NULL	NULL	NULL	142	17	48	6	7	8	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	NULL	27	0	0	NULL	4	0	1070	NULL	2	2	0	5	6	6	0.0	417.947	0.0
-2391811	1	519	83	136	0	6	24	59	56	NULL	2	1	0	0	0	0	0	142	17	48	6	7	8	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	27	0	0	0	4	0	NULL	0	NULL	2	0	5	6	6	0.0	417.947	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+70849	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	1	NULL	NULL	NULL	NULL	NULL	6	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	676	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+70849	1	14	0	3	0	0	1	13	6	NULL	0	1	0	0	0	0	0	6	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+71559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	1	0	2	NULL	NULL	NULL	NULL	NULL	59	7	12	6	3	0	1	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	3	4	NULL	14	3	1	NULL	6	0	932	NULL	1	4	2	2	2	2	64.0	113.3	128.0
+71559	1	178	0	33	0	0	10	58	36	NULL	0	2	0	0	0	0	0	59	7	12	6	1	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	3	4	2	16	3	1	1	7	0	NULL	0	NULL	4	2	2	2	2	64.0	110.413	128.0
+71697	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	22	1	1	1	1	484.0	0.0	484.0
+71697	1	55	0	16	0	0	2	53	28	NULL	2	2	0	0	0	0	0	25	3	3	3	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	1	2	0	NULL	1	NULL	22	1	2	2	2	484.0	13.9316	968.0
+75673	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	10	2	1	1	1	400.0	0.0	400.0
+75673	1	64	34	7	0	1	2	59	0	NULL	0	2	0	0	0	0	0	11	0	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	10	2	1	2	2	400.0	0.0	400.0
+75875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	36	2	1	1	1	5184.0	0.0	5184.0
+75875	1	32	0	6	0	0	2	30	15	NULL	0	2	0	0	0	0	0	13	2	0	0	0	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	36	2	2	2	2	5184.0	2.0	10368.0
+80943	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
+80943	1	41	23	4	0	1	1	39	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	5	0	1	1	1	0.0	0.0	0.0
+82927	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	12	2	2	2	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	1	0	932	NULL	1	1	0	1	1	1	0.0	10.0	0.0
+82927	1	34	0	8	0	0	4	18	10	NULL	0	1	0	0	0	0	0	12	2	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	3	0	0	1	2	0	NULL	0	NULL	1	0	1	1	1	0.0	10.0	0.0
+84023	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
+84023	1	42	23	4	0	1	1	40	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	3	0	1	1	1	0.0	0.0	0.0
+84073	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	22	1	1	1	1	484.0	0.0	484.0
+84073	1	20	0	5	0	0	1	18	0	NULL	0	1	0	0	0	0	0	6	1	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	1	NULL	22	1	2	2	2	484.0	2.0	968.0
+86343	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	32	5	6	3	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	9	1	1	NULL	5	0	932	NULL	2	3	1	1	1	1	9.0	56.4728	9.0
+86343	1	74	0	18	0	0	8	18	12	NULL	0	1	0	0	0	0	0	32	5	6	3	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	9	1	1	0	5	0	NULL	0	NULL	3	1	1	1	1	9.0	56.4728	9.0
+87159	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
+87159	1	16	0	3	0	0	1	14	0	NULL	0	1	0	0	0	0	0	8	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	5	0	1	1	1	0.0	2.0	0.0
+88839	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
+88839	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	8	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	5	0	1	1	1	0.0	2.0	0.0
+90519	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	0	1	1	1	0.0	0.0	0.0
+90519	1	13	0	3	0	0	2	11	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	2	0	1	1	1	0.0	0.0	0.0
+92167	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	41	6	8	3	3	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	11	1	1	NULL	6	0	932	NULL	3	2	1	1	1	1	4.0	78.8692	4.0
+92167	1	93	0	24	0	0	9	18	13	NULL	0	1	0	0	0	0	0	41	6	8	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	11	1	1	0	6	0	NULL	0	NULL	2	1	1	1	1	4.0	78.8692	4.0
+99559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	50	7	10	3	4	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	13	1	1	NULL	7	0	932	NULL	4	2	1	1	1	1	4.0	102.799	4.0
+99559	1	110	0	28	0	0	10	18	13	NULL	0	1	0	0	0	0	0	50	7	10	3	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	13	1	1	0	7	0	NULL	0	NULL	2	1	1	1	1	4.0	102.799	4.0
+108407	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	59	8	12	3	5	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	15	1	1	NULL	8	0	932	NULL	5	3	1	1	1	1	9.0	128.0	9.0
+108407	1	127	0	32	0	0	11	18	13	NULL	0	1	0	0	0	0	0	59	8	12	3	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	15	1	1	0	8	0	NULL	0	NULL	3	1	1	1	1	9.0	128.0	9.0
+110127	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	0	2	NULL	NULL	NULL	NULL	NULL	117	10	23	6	9	0	2	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	20	5	NULL	27	8	2	NULL	11	0	953	NULL	1	1	4	2	4	4	16.0	277.326	32.0
+110127	1	376	0	62	0	0	13	57	34	NULL	0	2	0	0	0	0	0	117	10	23	6	6	0	2	0	0	1	0	0	0	0	0	0	0	0	0	0	0	20	5	3	30	8	2	1	12	0	NULL	0	NULL	1	4	2	4	4	16.0	270.513	32.0
+116291	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+116291	1	70	0	12	0	0	3	65	0	NULL	0	4	0	0	0	0	0	27	0	4	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
+118711	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	25	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	8	1	1	NULL	5	0	932	NULL	2	1	1	1	1	1	1.0	41.209	1.0
+118711	1	62	0	16	0	0	7	18	14	NULL	0	1	0	0	0	0	0	25	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	9	1	1	1	6	0	NULL	0	NULL	1	1	1	1	1	1.0	41.209	1.0
+121499	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	1	1	1	1	9.0	0.0	9.0
+121499	1	49	0	9	0	0	3	44	0	NULL	0	2	0	0	0	0	0	18	0	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	2	0	1	1	2	0	NULL	2	NULL	3	1	1	1	1	9.0	11.6096	9.0
+123863	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	9	1	1	NULL	6	0	932	NULL	3	1	1	1	1	1	1.0	46.507	1.0
+123863	1	64	0	16	0	0	7	18	16	NULL	0	1	0	0	0	0	0	27	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	10	1	1	1	7	0	NULL	0	NULL	1	1	1	1	1	1.0	46.507	1.0
+125699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+125699	1	66	0	11	0	0	3	61	0	NULL	0	3	0	0	0	0	0	26	0	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	6.33985	0.0
+129631	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	29	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	10	1	1	NULL	7	0	932	NULL	4	1	1	1	1	1	1.0	51.8915	1.0
+129631	1	66	0	16	0	0	7	20	18	NULL	0	1	0	0	0	0	0	29	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	11	1	1	1	8	0	NULL	0	NULL	1	1	1	1	1	1.0	51.8915	1.0
+130739	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
+130739	1	13	0	3	0	0	2	11	0	NULL	0	2	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	3	0	1	1	1	0.0	0.0	0.0
+132919	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	2	1	2	NULL	NULL	NULL	NULL	NULL	88	9	10	6	2	0	2	NULL	NULL	1	0	0	0	0	0	1	0	0	0	0	0	8	2	NULL	25	5	2	NULL	11	0	953	NULL	2	2	4	3	3	3	64.0	157.173	192.0
+132919	1	271	0	56	0	0	13	52	32	NULL	1	2	0	0	0	0	0	88	9	10	6	1	0	2	0	0	1	0	0	0	0	0	1	0	0	0	0	0	8	2	1	26	5	2	1	12	0	NULL	0	NULL	2	4	3	3	3	64.0	157.173	192.0
+136015	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	31	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	11	1	1	NULL	8	0	932	NULL	5	1	1	1	1	1	1.0	57.3594	1.0
+136015	1	68	0	16	0	0	7	22	20	NULL	0	1	0	0	0	0	0	31	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	12	1	1	1	9	0	NULL	0	NULL	1	1	1	1	1	1.0	57.3594	1.0
+136775	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	63	2	1	3	NULL	NULL	NULL	NULL	NULL	267	31	47	8	11	0	1	NULL	NULL	6	0	0	0	0	0	2	0	0	0	0	4	33	1	NULL	74	11	1	NULL	19	0	923	NULL	2	6	5	9	11	11	900.0	692.726	8100.0
+136775	1	980	117	200	0	5	40	56	66	NULL	1	3	0	0	0	0	0	267	31	47	8	9	0	1	0	0	6	0	0	0	0	0	2	0	0	0	0	4	33	1	2	76	11	1	2	21	0	NULL	0	NULL	6	5	9	11	11	900.0	692.726	8100.0
+143015	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	25	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	8	1	1	NULL	5	0	932	NULL	2	2	1	1	1	1	4.0	41.209	4.0
+143015	1	62	0	16	0	0	7	18	14	NULL	0	1	0	0	0	0	0	25	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	9	1	1	1	6	0	NULL	0	NULL	2	1	1	1	1	4.0	41.209	4.0
+145265	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	0	1	NULL	NULL	NULL	NULL	NULL	347	23	65	5	47	0	32	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	63	0	NULL	63	25	0	NULL	25	0	1038	NULL	0	1	2	1	1	1	4.0	1096.69	4.0
+145265	1	1242	34	164	0	1	27	74	32	NULL	0	1	0	0	0	0	0	347	23	65	5	16	0	32	0	0	0	0	0	0	0	0	0	0	0	0	0	0	63	0	31	94	25	0	6	31	0	NULL	0	NULL	1	2	1	1	1	4.0	997.577	4.0
+148055	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	9	1	1	NULL	6	0	932	NULL	3	8	1	1	1	1	64.0	46.507	64.0
+148055	1	64	0	16	0	0	7	18	16	NULL	0	1	0	0	0	0	0	27	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	10	1	1	1	7	0	NULL	0	NULL	8	1	1	1	1	64.0	46.507	64.0
+151847	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	2	2	3	NULL	NULL	NULL	NULL	NULL	74	9	10	6	2	0	1	NULL	NULL	1	0	0	0	0	0	1	0	0	0	0	1	11	0	NULL	20	10	0	NULL	12	0	953	NULL	0	1	5	3	3	3	25.0	138.302	75.0
+151847	1	310	94	55	0	3	14	62	47	NULL	2	3	0	0	0	0	0	68	9	9	5	1	0	1	0	0	1	0	0	0	0	0	1	0	0	0	0	1	10	0	1	20	9	0	1	12	0	NULL	0	NULL	1	5	3	3	3	25.0	125.098	75.0
+153711	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	29	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	10	1	1	NULL	7	0	932	NULL	4	1	1	1	1	1	1.0	51.8915	1.0
+153711	1	66	0	16	0	0	7	20	18	NULL	0	1	0	0	0	0	0	29	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	11	1	1	1	8	0	NULL	0	NULL	1	1	1	1	1	1.0	51.8915	1.0
+156717	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	2	1	1	1	64.0	0.0	64.0
+156717	1	56	0	6	0	0	1	54	18	NULL	1	2	0	0	0	0	0	21	3	0	0	0	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	3	0	0	3	3	0	0	3	0	NULL	1	NULL	4	2	2	2	2	64.0	4.75489	128.0
+158195	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	3	2	1	NULL	NULL	NULL	NULL	NULL	108	16	24	9	5	0	1	NULL	NULL	5	0	0	0	0	0	0	0	0	0	0	2	2	0	NULL	31	2	0	NULL	11	0	1054	NULL	6	13	2	6	8	8	676.0	278.631	4056.0
+158195	1	447	38	112	0	1	21	47	30	NULL	2	1	0	0	0	0	0	108	16	24	9	4	0	1	0	0	5	0	0	0	0	0	0	0	0	0	0	2	2	0	1	32	2	0	1	12	0	NULL	0	NULL	13	2	6	8	8	676.0	278.631	4056.0
+159121	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
+159121	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	6	0	1	1	1	0.0	11.6096	0.0
+159983	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	31	4	4	3	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	11	1	1	NULL	8	0	932	NULL	5	1	1	1	1	1	1.0	57.3594	1.0
+159983	1	68	0	16	0	0	7	22	20	NULL	0	1	0	0	0	0	0	31	4	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	1	12	1	1	1	9	0	NULL	0	NULL	1	1	1	1	1	1.0	57.3594	1.0
+161921	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+161921	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
+162541	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	16	3	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	2	0	NULL	5	2	0	NULL	3	0	916	NULL	0	3	2	1	1	1	36.0	12.0	36.0
+162541	1	43	0	12	0	0	5	17	12	NULL	0	1	0	0	0	0	0	16	3	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	0	5	2	0	0	3	0	NULL	0	NULL	3	2	1	1	1	36.0	12.0	36.0
+164721	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+164721	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+165901	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	76	4	3	4	NULL	NULL	NULL	NULL	NULL	430	44	90	13	34	11	2	NULL	NULL	10	4	0	0	0	2	2	0	0	0	0	3	15	0	NULL	90	7	0	NULL	15	0	918	NULL	2	1	9	13	22	22	81.0	1392.71	1053.0
+165901	1	1389	287	351	0	12	60	57	62	NULL	3	3	0	0	0	0	0	362	44	77	12	21	11	2	0	0	10	4	0	0	0	2	2	0	0	0	0	3	11	0	4	90	6	0	3	17	0	NULL	0	NULL	1	9	13	22	22	81.0	1180.22	1053.0
+166871	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	0	0	2	NULL	NULL	NULL	NULL	NULL	41	6	9	3	3	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	2	NULL	11	1	1	NULL	5	0	932	NULL	2	3	1	1	1	1	9.0	79.5669	9.0
+166871	1	106	0	27	0	0	9	26	20	NULL	0	2	0	0	0	0	0	41	6	9	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	2	2	13	1	1	2	7	0	NULL	0	NULL	3	1	1	1	1	9.0	79.5669	9.0
+167521	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+167521	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+170321	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+170321	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
+170495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	102	4	5	4	NULL	NULL	NULL	NULL	NULL	463	58	81	13	39	4	5	NULL	NULL	16	1	0	0	0	0	0	1	0	2	0	2	71	0	NULL	96	27	0	NULL	34	0	953	NULL	3	2	14	18	21	21	784.0	1428.21	14112.0
+170495	1	1639	182	367	0	8	66	57	60	NULL	4	3	0	0	0	0	0	395	52	69	13	22	4	5	0	0	12	1	0	0	0	0	0	1	0	2	0	2	59	0	15	99	23	0	9	39	0	NULL	0	NULL	2	14	14	17	17	784.0	1219.37	10976.0
+173121	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
+173121	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	2	3	0	NULL	1	NULL	4	0	1	1	1	0.0	19.6515	0.0
+174767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	0	0	2	NULL	NULL	NULL	NULL	NULL	19	2	1	1	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	2	1	NULL	5	2	1	NULL	4	0	932	NULL	0	1	2	1	1	1	4.0	22.4588	4.0
+174767	1	78	0	11	0	0	4	50	18	NULL	0	2	0	0	0	0	0	19	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	2	2	7	3	2	2	6	0	NULL	0	NULL	1	2	1	1	1	4.0	22.4588	4.0
+176201	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+176201	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	2	3	0	NULL	1	NULL	1	0	1	1	1	0.0	19.6515	0.0
+179337	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	0	1	1	1	0.0	0.0	0.0
+179337	1	41	0	6	0	0	1	39	0	NULL	0	3	0	0	0	0	0	23	0	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	3	4	1	0	3	4	0	NULL	1	NULL	2	0	1	1	1	0.0	27.0	0.0
+181935	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	4	3	NULL	NULL	NULL	NULL	NULL	125	13	23	7	8	0	1	NULL	NULL	4	1	0	0	0	0	0	0	0	0	0	1	3	2	NULL	18	3	1	NULL	6	0	933	NULL	1	1	6	5	5	5	36.0	215.224	180.0
+181935	1	264	0	60	0	0	15	56	34	NULL	2	2	0	0	0	0	0	85	10	12	4	1	0	1	0	0	3	1	0	0	0	0	0	0	0	0	0	1	2	2	6	21	2	1	6	11	0	NULL	0	NULL	1	6	4	4	4	36.0	136.0	144.0
+182585	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+182585	1	47	0	6	0	0	1	45	0	NULL	0	3	0	0	0	0	0	27	0	6	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	14.0	0.0
+186169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+186169	1	44	0	6	0	0	1	42	0	NULL	0	3	0	0	0	0	0	25	0	5	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	12.0	0.0
+189585	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+189585	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+192385	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+192385	1	34	0	4	0	0	1	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
+195241	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+195241	1	34	0	5	0	0	2	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
+195799	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	58	1	0	5	NULL	NULL	NULL	NULL	NULL	274	21	42	7	23	0	3	NULL	NULL	3	0	0	0	0	0	0	0	0	0	0	1	17	14	NULL	58	9	5	NULL	19	0	923	NULL	2	1	9	4	4	4	81.0	690.609	324.0
+195799	1	867	172	121	0	5	27	80	56	NULL	0	4	0	0	0	0	0	244	21	37	7	10	0	3	0	0	3	0	0	0	0	0	0	0	0	0	0	1	17	14	13	66	9	9	6	25	0	NULL	0	NULL	1	9	4	4	4	81.0	609.332	324.0
+197501	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	67	4	3	3	NULL	NULL	NULL	NULL	NULL	656	87	71	12	74	14	19	NULL	NULL	21	4	1	7	1	9	0	1	0	0	0	1	64	0	NULL	119	37	0	NULL	40	0	937	NULL	2	0	28	24	33	39	0.0	1981.94	0.0
+197501	1	2623	379	536	0	14	105	107	70	NULL	3	3	0	0	0	0	0	644	84	70	12	64	14	19	0	0	18	4	1	7	1	9	0	1	0	0	0	1	57	0	13	125	36	0	9	48	0	NULL	0	NULL	0	28	21	30	36	0.0	1940.63	0.0
+206911	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	0	2	NULL	NULL	NULL	NULL	NULL	48	6	6	5	4	0	1	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	5	1	NULL	13	4	1	NULL	9	0	934	NULL	3	1	3	2	2	2	9.0	95.9083	18.0
+206911	1	173	0	31	0	0	9	55	27	NULL	0	2	0	0	0	0	0	48	6	6	5	0	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	5	2	4	17	4	2	3	12	0	NULL	0	NULL	1	3	2	2	2	9.0	94.0116	18.0
+209715	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	21	4	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	5	2	0	NULL	4	0	1054	NULL	1	1	3	1	1	1	9.0	10.0	9.0
+209715	1	70	0	13	0	0	7	27	11	NULL	0	1	0	0	0	0	0	21	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	5	3	0	0	4	0	NULL	0	NULL	1	3	1	1	1	9.0	10.0	9.0
+217163	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	3	2	3	NULL	NULL	NULL	NULL	NULL	290	31	56	11	15	0	1	NULL	NULL	11	3	0	0	0	0	1	0	0	0	0	5	15	5	NULL	54	10	2	NULL	16	0	1055	NULL	1	36	10	13	19	19	129600.0	674.04	1684800.0
+217163	1	669	41	154	0	1	34	70	33	NULL	2	2	0	0	0	0	0	223	29	32	7	1	0	1	0	0	10	2	0	0	0	0	1	0	0	0	0	5	12	6	12	60	8	3	9	23	0	NULL	0	NULL	36	10	12	16	16	129600.0	460.74	1555200.0
+218681	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	2	1	2	NULL	NULL	NULL	NULL	NULL	137	13	18	7	10	0	5	NULL	NULL	1	1	0	0	0	0	1	0	0	0	0	0	15	2	NULL	36	8	2	NULL	15	0	1038	NULL	2	1	5	3	3	3	25.0	320.0	75.0
+218681	1	440	29	83	0	1	18	65	37	NULL	1	2	0	0	0	0	0	137	13	18	7	4	0	5	0	0	1	1	0	0	0	0	1	0	0	0	0	0	15	2	6	42	8	2	4	19	0	NULL	0	NULL	1	5	3	3	3	25.0	314.041	75.0
+220183	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	1	0	1	NULL	NULL	NULL	NULL	NULL	65	11	10	5	3	0	0	NULL	NULL	3	1	0	0	0	0	1	0	0	0	0	4	1	1	NULL	16	1	1	NULL	5	0	934	NULL	2	1	0	5	5	5	0.0	107.313	0.0
+220183	1	220	34	51	0	1	14	54	20	NULL	0	1	0	0	0	0	0	65	11	10	5	0	0	0	0	0	3	1	0	0	0	0	1	0	0	0	0	4	1	1	3	19	1	1	1	6	0	NULL	0	NULL	1	0	5	5	5	0.0	100.324	0.0
+234295	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	1	1	3	NULL	NULL	NULL	NULL	NULL	116	16	21	7	4	0	3	NULL	NULL	3	0	0	0	0	0	1	0	0	0	0	2	5	1	NULL	26	4	1	NULL	10	0	934	NULL	3	1	4	5	5	5	16.0	224.008	80.0
+234295	1	448	46	84	0	2	21	68	36	NULL	1	2	0	0	0	0	0	109	15	19	6	2	0	3	0	0	2	0	0	0	0	0	1	0	0	0	0	2	3	1	3	27	2	1	3	11	0	NULL	0	NULL	1	4	4	4	4	16.0	203.901	64.0
+246737	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	2	1	3	NULL	NULL	NULL	NULL	NULL	134	15	22	7	10	2	2	NULL	NULL	3	1	0	0	0	0	1	0	0	2	0	0	12	1	NULL	31	7	1	NULL	11	0	1038	NULL	1	1	5	5	5	5	25.0	318.948	125.0
+246737	1	524	114	96	0	3	20	66	37	NULL	1	3	0	0	0	0	0	134	15	22	7	4	2	2	0	0	3	1	0	0	0	0	1	0	0	2	0	0	12	1	6	37	7	1	5	16	0	NULL	0	NULL	1	5	5	5	5	25.0	315.769	125.0
+251631	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	2	2	4	NULL	NULL	NULL	NULL	NULL	335	26	64	12	38	0	1	NULL	NULL	5	0	0	0	0	0	3	0	0	0	0	1	4	0	NULL	51	4	0	NULL	8	0	923	NULL	2	4	4	9	9	9	256.0	896.271	2304.0
+251631	1	665	22	133	0	1	30	66	51	NULL	2	4	0	0	0	0	0	292	23	56	12	28	0	1	0	0	4	0	0	0	0	0	3	0	0	0	0	1	3	0	4	52	3	0	4	11	0	NULL	0	NULL	4	4	8	8	8	256.0	771.45	2048.0
+255333	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	4	5	4	NULL	NULL	NULL	NULL	NULL	1930	294	114	14	105	83	55	NULL	NULL	79	21	1	28	1	3	1	1	0	0	0	51	242	0	NULL	281	29	0	NULL	32	0	928	NULL	0	0	19	83	89	116	0.0	4588.42	0.0
+255333	1	3686	191	1062	0	13	185	73	45	NULL	4	3	0	0	0	0	0	1084	153	106	13	16	67	8	0	0	32	21	1	28	1	3	1	1	0	0	0	4	98	47	102	237	25	27	34	62	0	NULL	0	NULL	0	19	36	42	69	0.0	3111.41	0.0
+257079	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	59	3	2	5	NULL	NULL	NULL	NULL	NULL	155	16	23	12	10	0	3	NULL	NULL	6	1	0	0	0	0	1	0	0	0	0	2	26	0	NULL	29	11	0	NULL	12	0	1002	NULL	0	1	5	8	9	9	25.0	315.423	200.0
+257079	1	390	0	104	0	0	21	57	41	NULL	2	3	0	0	0	0	0	113	16	12	5	2	0	3	0	0	6	1	0	0	0	0	1	0	0	0	0	2	21	0	8	32	9	0	4	14	0	NULL	0	NULL	1	5	8	8	8	25.0	202.047	200.0
+258267	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	1	3	NULL	NULL	NULL	NULL	NULL	265	30	33	8	21	0	2	NULL	NULL	12	3	0	0	0	1	0	1	0	0	2	2	17	1	NULL	42	9	1	NULL	12	2	1055	NULL	2	0	10	14	18	18	0.0	514.325	0.0
+258267	1	676	76	134	0	4	32	65	58	NULL	1	2	0	0	0	0	0	185	24	12	6	11	0	2	0	0	9	0	0	0	0	1	0	1	0	0	2	2	14	1	9	44	8	1	6	17	2	NULL	0	NULL	0	10	11	14	14	0.0	340.86	0.0
+263695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	50	2	0	4	NULL	NULL	NULL	NULL	NULL	67	7	13	7	5	0	0	NULL	NULL	1	0	0	0	0	0	1	0	0	0	0	2	3	3	NULL	16	2	2	NULL	7	0	934	NULL	1	3	1	3	3	3	9.0	144.43	27.0
+263695	1	214	35	46	0	1	10	51	52	NULL	0	4	0	0	0	0	0	67	7	13	7	5	0	0	0	0	1	0	0	0	0	0	1	0	0	0	0	2	3	3	0	16	2	2	0	7	0	NULL	0	NULL	3	1	3	3	3	9.0	144.43	27.0
+266983	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	2	NULL	NULL	NULL	NULL	NULL	25	4	4	4	2	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	6	0	NULL	6	4	0	NULL	4	0	953	NULL	0	1	1	2	2	2	1.0	39.8631	2.0
+266983	1	69	0	16	0	0	6	21	18	NULL	0	1	0	0	0	0	0	19	4	3	3	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	5	0	2	7	3	0	2	5	0	NULL	0	NULL	1	1	2	2	2	1.0	30.0	2.0
+272023	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	65	4	2	5	NULL	NULL	NULL	NULL	NULL	432	34	106	17	20	4	8	NULL	NULL	10	0	0	0	0	2	2	1	0	0	0	1	25	0	NULL	95	12	0	NULL	20	0	953	NULL	3	2	7	14	25	25	196.0	1334.42	2744.0
+272023	1	1158	63	240	0	3	39	86	62	NULL	2	3	0	0	0	0	0	337	33	78	14	10	4	8	0	0	9	0	0	0	0	2	2	1	0	0	0	1	20	0	11	95	9	0	3	20	0	NULL	0	NULL	2	7	13	21	21	196.0	1044.39	2548.0
+272625	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+272625	1	75	0	12	0	0	1	73	0	NULL	0	1	0	0	0	0	0	18	0	6	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3	3	5	2	2	2	4	0	NULL	1	NULL	1	1	1	3	3	1.0	34.8692	1.0
+277753	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	1	1	NULL	NULL	NULL	NULL	NULL	40	5	4	4	4	0	1	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	2	1	1	NULL	9	1	1	NULL	4	0	873	NULL	1	1	1	2	3	3	1.0	60.9444	2.0
+277753	1	148	0	31	0	0	9	39	35	NULL	1	1	0	0	0	0	0	40	5	4	4	1	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	2	1	4	3	12	1	3	2	6	0	NULL	0	NULL	1	1	2	3	3	1.0	58.8103	2.0
+277833	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
+277833	1	25	0	4	0	0	1	23	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	3	0	1	1	1	0.0	4.75489	0.0
+279441	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	0	2	NULL	NULL	NULL	NULL	NULL	80	10	18	5	3	0	1	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	3	6	NULL	22	3	2	NULL	8	0	1038	NULL	1	8	3	2	3	3	576.0	172.0	1152.0
+279441	1	239	0	49	0	0	13	42	26	NULL	0	2	0	0	0	0	0	80	10	18	5	1	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	3	6	2	24	3	2	1	9	0	NULL	0	NULL	8	3	2	3	3	576.0	167.996	1152.0
+280047	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	1	NULL	NULL	NULL	NULL	NULL	10	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	934	NULL	1	8	0	1	1	1	0.0	0.0	0.0
+280047	1	65	33	8	0	1	3	61	14	NULL	0	1	0	0	0	0	0	10	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	8	0	1	1	1	0.0	0.0	0.0
+280185	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+280185	1	24	0	4	0	0	1	22	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
+282279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	1	0	1	NULL	NULL	NULL	NULL	NULL	17	3	1	1	2	0	0	NULL	NULL	1	1	0	0	0	0	0	0	0	0	0	2	3	0	NULL	3	3	0	NULL	3	0	1002	NULL	0	2	0	2	2	2	0.0	15.5098	0.0
+282279	1	67	0	17	0	0	6	25	20	NULL	0	1	0	0	0	0	0	17	3	1	1	1	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	2	3	0	1	4	3	0	1	4	0	NULL	0	NULL	2	0	2	2	2	0.0	15.5098	0.0
+282425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	0	1	1	1	0.0	0.0	0.0
+282425	1	24	0	4	0	0	1	22	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	2	0	1	1	1	0.0	4.75489	0.0
+284665	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
+284665	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	6	0	1	1	1	0.0	4.75489	0.0
+286767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	0	1	NULL	NULL	NULL	NULL	NULL	11	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	1	NULL	2	0	1	NULL	2	0	934	NULL	1	3	0	1	1	1	0.0	4.75489	0.0
+286767	1	30	0	8	0	0	3	26	16	NULL	0	1	0	0	0	0	0	11	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	2	0	1	0	2	0	NULL	0	NULL	3	0	1	1	1	0.0	4.75489	0.0
+286849	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
+286849	1	24	0	4	0	0	1	22	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	5	0	1	1	1	0.0	4.75489	0.0
+289145	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+289145	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
+290831	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	1	1	2	NULL	NULL	NULL	NULL	NULL	157	14	17	3	17	0	1	NULL	NULL	0	0	1	11	1	4	0	0	0	0	0	0	4	2	NULL	18	2	1	NULL	4	0	923	NULL	1	2	7	2	2	12	196.0	238.418	392.0
+290831	1	346	14	69	0	1	22	60	26	NULL	1	2	0	0	0	0	0	102	14	5	2	0	0	1	0	0	0	0	1	2	1	4	0	0	0	0	0	0	4	4	16	34	2	3	9	13	0	NULL	0	NULL	2	7	2	2	3	196.0	152.369	392.0
+291329	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
+291329	1	49	0	8	0	0	1	47	0	NULL	0	2	0	0	0	0	0	17	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	1	NULL	6	0	1	2	2	0.0	16.2535	0.0
+294969	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
+294969	1	22	0	4	0	0	1	20	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	0	1	1	1	0.0	4.75489	0.0
+295905	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	3	4	4	NULL	NULL	NULL	NULL	NULL	224	27	44	11	13	0	1	NULL	NULL	6	0	0	0	0	0	2	0	0	0	0	2	6	3	NULL	44	2	2	NULL	9	0	1038	NULL	1	3	5	9	9	9	225.0	509.484	2025.0
+295905	1	499	27	109	0	1	26	75	28	NULL	2	2	0	0	0	0	0	156	21	28	9	3	0	1	0	0	4	0	0	0	0	0	2	0	0	0	0	2	4	3	6	44	2	2	4	13	0	NULL	0	NULL	3	5	7	7	7	225.0	348.289	1575.0
+297041	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	6	0	1	1	1	0.0	0.0	0.0
+297041	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	6	0	1	1	1	0.0	4.75489	0.0
+299001	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	5	0	1	1	1	0.0	0.0	0.0
+299001	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	5	0	1	1	1	0.0	4.75489	0.0
+300961	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
+300961	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	0	1	1	1	0.0	4.75489	0.0
+302921	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
+302921	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	3	0	1	1	1	0.0	4.75489	0.0
+304881	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	12	0	1	1	1	0.0	0.0	0.0
+304881	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	12	0	1	1	1	0.0	4.75489	0.0
+306841	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
+306841	1	20	0	4	0	0	1	18	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	3	0	1	1	1	0.0	4.75489	0.0
+308801	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	8	0	1	1	1	0.0	0.0	0.0
+308801	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	8	0	1	1	1	0.0	4.75489	0.0
+310985	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+310985	1	23	0	4	0	0	1	21	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	4.75489	0.0
+313169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+313169	1	21	0	4	0	0	1	19	0	NULL	0	2	0	0	0	0	0	9	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	2.0	0.0
+314071	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	70	1	3	2	NULL	NULL	NULL	NULL	NULL	179	21	14	4	20	0	1	NULL	NULL	3	0	1	11	1	4	0	0	0	0	0	0	7	0	NULL	21	3	0	NULL	4	0	923	NULL	1	2	6	5	5	15	144.0	264.405	720.0
+314071	1	280	14	55	0	1	20	60	22	NULL	1	2	0	0	0	0	0	77	12	0	0	0	0	1	0	0	0	0	1	2	1	4	0	0	0	0	0	0	4	2	12	24	2	2	8	11	0	NULL	0	NULL	2	6	2	2	3	144.0	83.0264	288.0
+318377	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	13	0	1	1	1	0.0	0.0	0.0
+318377	1	42	0	9	0	0	2	40	0	NULL	0	3	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	2	2	0	NULL	1	NULL	13	0	1	1	1	0.0	18.0947	0.0
+326873	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	3	4	NULL	NULL	NULL	NULL	NULL	175	19	37	8	9	0	0	NULL	NULL	4	1	0	0	0	0	1	0	0	0	0	1	5	3	NULL	40	3	2	NULL	11	0	1038	NULL	2	1	5	6	6	6	25.0	413.433	150.0
+326873	1	413	27	107	0	2	21	56	65	NULL	1	2	0	0	0	0	0	137	16	28	6	1	0	0	0	0	3	1	0	0	0	0	1	0	0	0	0	1	4	3	5	42	3	2	3	14	0	NULL	0	NULL	1	5	5	5	5	25.0	311.855	125.0
+327483	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	89	4	4	3	NULL	NULL	NULL	NULL	NULL	903	91	144	20	44	0	16	NULL	NULL	26	9	0	0	0	0	4	0	0	0	0	2	67	6	NULL	207	16	2	NULL	32	0	1062	NULL	2	0	17	31	36	36	0.0	2601.06	0.0
+327483	1	2825	295	539	0	14	91	95	52	NULL	4	3	0	0	0	0	0	746	73	111	19	10	0	14	0	0	14	3	0	0	0	0	4	0	0	0	0	2	49	6	41	221	13	2	15	44	0	NULL	0	NULL	0	17	19	21	21	0.0	2116.92	0.0
+339551	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	2	1	4	NULL	NULL	NULL	NULL	NULL	159	12	47	11	13	7	0	NULL	NULL	3	2	0	0	0	0	1	0	0	0	0	1	2	2	NULL	31	1	1	NULL	6	0	923	NULL	1	1	2	5	8	8	4.0	510.526	20.0
+339551	1	360	39	112	0	1	16	67	48	NULL	1	2	0	0	0	0	0	129	12	42	9	8	7	0	0	0	3	2	0	0	0	0	1	0	0	0	0	1	0	2	2	31	0	1	2	7	0	NULL	0	NULL	1	2	5	8	8	4.0	435.969	20.0
+341687	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	66	9	5	2	3	0	3	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	5	2	NULL	21	5	2	NULL	12	0	953	NULL	1	2	4	2	2	2	64.0	118.536	128.0
+341687	1	209	0	42	0	0	11	52	23	NULL	0	2	0	0	0	0	0	64	8	5	2	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	5	2	2	21	4	2	2	12	0	NULL	0	NULL	2	4	1	1	1	64.0	112.0	64.0
+354649	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	103	1	1	3	NULL	NULL	NULL	NULL	NULL	246	24	46	9	6	0	6	NULL	NULL	5	0	0	0	0	0	0	0	0	0	0	2	12	3	NULL	62	8	1	NULL	16	0	1038	NULL	5	10	8	6	10	10	6400.0	564.778	38400.0
+354649	1	685	0	127	0	0	28	63	75	NULL	1	3	0	0	0	0	0	224	22	42	9	0	0	4	0	0	3	0	0	0	0	0	0	0	0	0	0	2	8	3	10	66	6	1	6	20	0	NULL	0	NULL	10	8	4	6	6	6400.0	524.662	25600.0
+355631	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	1	1	2	NULL	NULL	NULL	NULL	NULL	102	13	17	6	4	2	1	NULL	NULL	2	0	0	0	0	0	1	0	0	0	0	0	8	1	NULL	29	8	1	NULL	12	0	954	NULL	1	3	6	4	4	4	324.0	238.418	1296.0
+355631	1	276	0	64	0	0	16	55	29	NULL	1	2	0	0	0	0	0	100	12	17	6	2	2	1	0	0	1	0	0	0	0	0	1	0	0	0	0	0	6	1	3	30	6	1	3	13	0	NULL	0	NULL	3	6	3	3	3	324.0	230.702	972.0
+364135	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+364135	1	55	21	10	0	1	2	53	0	NULL	0	2	0	0	0	0	0	13	0	3	3	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	2	2	0.0	11.6096	0.0
+368167	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	3	2	3	NULL	NULL	NULL	NULL	NULL	199	25	51	10	2	22	0	NULL	NULL	10	7	0	0	0	0	0	0	0	0	0	1	1	0	NULL	39	1	0	NULL	5	0	924	NULL	1	2	2	11	14	14	16.0	602.536	176.0
+368167	1	570	91	163	0	5	31	61	35	NULL	2	2	0	0	0	0	0	170	25	40	7	2	16	0	0	0	10	7	0	0	0	0	0	0	0	0	0	1	1	0	3	39	1	0	1	6	0	NULL	0	NULL	2	2	11	11	11	16.0	480.557	176.0
+374055	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	69	3	4	4	NULL	NULL	NULL	NULL	NULL	827	95	170	15	55	11	3	NULL	NULL	24	3	0	0	0	2	5	2	1	0	0	1	69	2	NULL	177	23	2	NULL	34	0	954	NULL	0	4	15	33	40	40	3600.0	2827.19	118800.0
+374055	1	2502	482	543	0	11	100	80	44	NULL	2	3	0	0	0	0	0	669	83	138	14	27	11	3	0	0	20	3	0	0	0	2	5	2	1	0	0	1	57	2	18	177	22	2	8	41	0	NULL	0	NULL	4	15	29	36	36	3600.0	2308.32	104400.0
+397545	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	1	NULL	NULL	NULL	NULL	NULL	34	4	9	6	2	1	0	NULL	NULL	0	0	0	0	0	0	1	0	0	0	0	1	0	0	NULL	9	0	0	NULL	3	0	1038	NULL	2	4	0	2	2	2	0.0	75.2842	0.0
+397545	1	113	0	29	0	0	7	35	23	NULL	0	1	0	0	0	0	0	34	4	9	6	2	1	0	0	0	0	0	0	0	0	0	1	0	0	0	0	1	0	0	0	9	0	0	0	3	0	NULL	0	NULL	4	0	2	2	2	0.0	75.2842	0.0
+405351	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	1	0	3	NULL	NULL	NULL	NULL	NULL	85	9	7	3	10	0	0	NULL	NULL	2	0	0	0	0	0	0	0	0	0	0	2	1	4	NULL	20	1	1	NULL	6	0	925	NULL	2	1	1	3	3	3	1.0	157.173	3.0
+405351	1	180	0	45	0	0	12	36	47	NULL	0	3	0	0	0	0	0	85	9	7	3	10	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	2	1	4	0	20	1	1	0	6	0	NULL	0	NULL	1	1	3	3	3	1.0	157.173	3.0
+407737	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	2	2	2	NULL	NULL	NULL	NULL	NULL	141	15	31	6	3	0	0	NULL	NULL	1	0	0	0	0	0	2	0	0	0	0	1	3	3	NULL	43	3	1	NULL	11	0	1038	NULL	1	1	3	4	4	4	9.0	332.788	36.0
+407737	1	439	70	100	0	2	20	58	26	NULL	2	2	0	0	0	0	0	141	15	31	6	1	0	0	0	0	1	0	0	0	0	0	2	0	0	0	0	1	3	3	2	45	3	1	2	13	0	NULL	0	NULL	1	3	4	4	4	9.0	332.788	36.0
+417671	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	5	4	3	NULL	NULL	NULL	NULL	NULL	406	43	88	14	26	3	4	NULL	NULL	11	1	0	0	0	0	2	0	0	3	0	1	12	8	NULL	91	8	2	NULL	20	0	925	NULL	1	1	8	14	18	18	64.0	1243.27	896.0
+417671	1	1206	15	323	0	1	48	74	63	NULL	4	3	0	0	0	0	0	379	39	84	14	21	3	4	0	0	9	1	0	0	0	0	2	0	0	3	0	1	9	8	4	90	5	2	4	21	0	NULL	0	NULL	1	8	12	16	16	64.0	1164.76	768.0
+436409	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	2	0	2	NULL	NULL	NULL	NULL	NULL	63	7	10	5	3	0	0	NULL	NULL	1	0	0	0	0	0	1	0	0	0	0	2	2	1	NULL	17	2	1	NULL	7	0	1038	NULL	2	3	2	3	3	3	36.0	117.207	108.0
+436409	1	186	21	42	0	2	10	46	35	NULL	0	2	0	0	0	0	0	63	7	10	5	1	0	0	0	0	1	0	0	0	0	0	1	0	0	0	0	2	2	1	2	19	2	1	1	8	0	NULL	0	NULL	3	2	3	3	3	36.0	114.221	108.0
+450577	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	2	2	4	NULL	NULL	NULL	NULL	NULL	207	23	36	12	15	0	4	NULL	NULL	8	1	0	0	0	0	0	0	0	0	0	1	12	0	NULL	36	9	0	NULL	12	0	1038	NULL	2	12	9	9	10	10	11664.0	459.83	104976.0
+450577	1	593	100	107	0	5	22	78	37	NULL	1	3	0	0	0	0	0	146	18	21	10	4	0	3	0	0	5	1	0	0	0	0	0	0	0	0	0	1	7	0	11	39	6	0	8	17	0	NULL	0	NULL	12	9	6	6	6	11664.0	317.069	69984.0
+462757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	75	5	5	4	NULL	NULL	NULL	NULL	NULL	558	66	116	16	26	43	6	NULL	NULL	7	1	2	22	2	16	2	0	0	0	0	1	24	0	NULL	99	17	0	NULL	25	0	928	NULL	0	1	12	12	20	40	144.0	1925.91	1728.0
+462757	1	1747	50	529	0	3	77	62	62	NULL	5	3	0	0	0	0	0	528	63	114	16	18	43	5	0	0	6	1	2	22	2	16	2	0	0	0	0	0	20	1	7	102	13	1	7	28	0	NULL	0	NULL	1	12	11	19	39	144.0	1859.85	1584.0
+487537	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	1	0	3	NULL	NULL	NULL	NULL	NULL	66	5	10	2	2	0	3	NULL	NULL	2	0	0	0	0	0	0	0	0	0	0	0	3	0	NULL	14	2	0	NULL	4	0	1038	NULL	2	5	3	3	3	3	225.0	78.0	675.0
+487537	1	257	0	29	0	0	8	58	31	NULL	0	2	0	0	0	0	0	61	5	8	2	0	0	3	0	0	2	0	0	0	0	0	0	0	0	0	0	0	3	0	2	16	2	0	2	6	0	NULL	0	NULL	5	3	3	3	3	225.0	72.0	675.0
+488679	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	8	1	0	0	0	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	925	NULL	1	8	1	1	1	1	64.0	2.0	64.0
+488679	1	54	0	5	0	0	3	50	10	NULL	0	1	0	0	0	0	0	8	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	8	1	1	1	1	64.0	2.0	64.0
+488947	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+488947	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	1	NULL	1	1	1	2	2	1.0	27.0	1.0
+489939	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	0	3	NULL	NULL	NULL	NULL	NULL	78	9	23	6	6	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	2	1	NULL	16	2	1	NULL	5	0	1062	NULL	1	1	3	2	2	2	9.0	183.936	18.0
+489939	1	312	94	50	0	4	13	81	27	NULL	0	2	0	0	0	0	0	73	9	21	6	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	1	2	1	6	22	2	1	6	11	0	NULL	0	NULL	1	3	2	2	2	9.0	175.761	18.0
+493383	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	3	2	4	NULL	NULL	NULL	NULL	NULL	334	29	54	12	26	0	3	NULL	NULL	3	0	1	11	1	3	2	1	0	0	0	0	22	3	NULL	60	9	1	NULL	14	0	925	NULL	2	2	10	8	9	19	400.0	798.062	3200.0
+493383	1	945	58	189	0	3	39	62	47	NULL	2	4	0	0	0	0	0	287	29	44	12	10	0	3	0	0	3	0	1	2	1	3	2	1	0	0	0	0	22	5	15	75	9	3	9	23	0	NULL	0	NULL	2	10	8	9	10	400.0	708.449	3200.0
+497235	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+497235	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	2	NULL	1	1	1	4	4	1.0	107.313	1.0
+504337	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	2	4	NULL	NULL	NULL	NULL	NULL	264	28	45	12	16	0	6	NULL	NULL	9	1	0	0	0	0	0	0	0	0	0	1	15	0	NULL	50	10	0	NULL	14	0	1038	NULL	2	10	10	10	12	12	10000.0	598.547	100000.0
+504337	1	709	63	126	0	3	26	91	35	NULL	1	3	0	0	0	0	0	192	22	28	10	4	0	4	0	0	5	1	0	0	0	0	0	0	0	0	0	1	8	0	14	53	7	0	9	20	0	NULL	0	NULL	10	10	6	6	6	10000.0	432.434	60000.0
+510227	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+510227	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+510995	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	1	0	1	NULL	NULL	NULL	NULL	NULL	59	6	9	4	3	0	2	NULL	NULL	2	0	0	0	0	0	0	0	0	0	0	1	8	0	NULL	14	5	0	NULL	7	0	1062	NULL	2	0	3	3	3	3	0.0	98.9912	0.0
+510995	1	245	34	33	0	1	9	57	35	NULL	0	2	0	0	0	0	0	57	5	9	4	3	0	2	0	0	1	0	0	0	0	0	0	0	0	0	0	1	6	0	1	13	3	0	1	6	0	NULL	0	NULL	0	3	2	2	2	0.0	92.511	0.0
+512971	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+512971	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
+515827	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+515827	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+517527	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	3	4	NULL	NULL	NULL	NULL	NULL	98	11	21	9	8	0	1	NULL	NULL	2	0	0	0	0	0	1	0	0	0	0	0	2	1	NULL	18	2	1	NULL	7	0	954	NULL	2	2	2	4	4	4	16.0	215.493	64.0
+517527	1	189	21	52	0	1	12	33	19	NULL	1	2	0	0	0	0	0	60	8	12	6	0	0	1	0	0	1	0	0	0	0	0	1	0	0	0	0	0	1	1	5	20	1	1	5	11	0	NULL	0	NULL	2	2	3	3	3	16.0	130.799	48.0
+519467	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+519467	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+521427	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+521427	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+522995	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	1	1	1	1	16.0	0.0	16.0
+522995	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	1	1	1	1	16.0	0.0	16.0
+524731	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+524731	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+526747	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	1	1	1	1	4.0	0.0	4.0
+526747	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	2	1	1	1	1	4.0	0.0	4.0
+528187	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	42	3	3	3	NULL	NULL	NULL	NULL	NULL	272	31	29	8	23	0	2	NULL	NULL	7	5	1	6	1	0	0	0	0	0	0	6	28	1	NULL	51	17	1	NULL	21	0	1062	NULL	2	0	9	9	9	14	0.0	587.145	0.0
+528187	1	842	41	184	0	3	42	44	46	NULL	3	3	0	0	0	0	0	244	27	25	8	6	0	2	0	0	5	3	1	6	1	0	0	0	0	0	0	6	26	7	17	64	16	7	10	30	0	NULL	0	NULL	0	9	7	7	12	0.0	518.646	0.0
+528371	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+528371	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	2	NULL	1	1	1	1	1	1.0	0.0	1.0
+530387	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+530387	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+532067	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+532067	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+532255	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	1	0	2	NULL	NULL	NULL	NULL	NULL	35	5	3	3	1	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	7	1	NULL	13	6	1	NULL	8	0	954	NULL	1	2	3	2	2	2	36.0	60.9444	72.0
+532255	1	108	0	21	0	0	7	30	18	NULL	0	2	0	0	0	0	0	35	5	3	3	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	7	1	0	13	6	1	0	8	0	NULL	0	NULL	2	3	2	2	2	36.0	60.9444	72.0
+542223	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	1	0	1	NULL	NULL	NULL	NULL	NULL	33	5	2	2	1	0	1	NULL	NULL	2	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	9	4	0	NULL	5	0	954	NULL	1	1	2	3	3	3	4.0	36.0	12.0
+542223	1	174	53	23	0	2	7	49	21	NULL	0	1	0	0	0	0	0	33	5	2	2	1	0	1	0	0	2	0	0	0	0	0	0	0	0	0	0	1	4	0	0	9	4	0	0	5	0	NULL	0	NULL	1	2	3	3	3	4.0	36.0	12.0
+548241	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	1	3	NULL	NULL	NULL	NULL	NULL	157	13	31	9	10	0	3	NULL	NULL	6	1	0	0	0	0	0	0	0	0	0	1	9	0	NULL	25	9	0	NULL	10	0	1038	NULL	1	9	10	7	11	11	8100.0	320.627	56700.0
+548241	1	453	51	75	0	3	15	85	37	NULL	1	3	0	0	0	0	0	131	12	23	8	3	0	2	0	0	5	1	0	0	0	0	0	0	0	0	0	1	7	0	9	31	7	0	8	16	0	NULL	0	NULL	9	10	6	9	9	8100.0	271.029	48600.0
+551623	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	3	2	3	NULL	NULL	NULL	NULL	NULL	328	29	42	11	39	1	2	NULL	NULL	6	1	1	11	0	0	0	1	0	0	0	10	23	2	NULL	44	7	1	NULL	11	0	925	NULL	1	2	8	9	14	24	256.0	750.229	2304.0
+551623	1	954	81	192	0	4	38	77	44	NULL	2	3	0	0	0	0	0	279	29	31	10	20	1	2	0	0	6	1	1	5	0	0	0	1	0	0	0	10	23	8	18	62	7	7	11	22	0	NULL	0	NULL	2	8	9	14	18	256.0	652.983	2304.0
+554375	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	38	1	0	3	NULL	NULL	NULL	NULL	NULL	71	8	13	5	4	0	1	NULL	NULL	2	0	0	0	0	0	0	0	0	0	0	0	9	1	NULL	19	5	1	NULL	8	0	954	NULL	1	4	3	3	3	3	144.0	147.149	432.0
+554375	1	234	0	48	0	0	11	71	39	NULL	0	3	0	0	0	0	0	71	8	13	5	3	0	1	0	0	2	0	0	0	0	0	0	0	0	0	0	0	9	1	1	20	5	1	1	9	0	NULL	0	NULL	4	3	3	3	3	144.0	147.149	432.0
+561709	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	38	2	1	3	NULL	NULL	NULL	NULL	NULL	85	11	16	8	8	0	0	NULL	NULL	2	2	0	0	0	0	0	1	0	0	0	2	1	0	NULL	23	1	0	NULL	8	0	930	NULL	3	1	1	4	4	4	1.0	215.493	4.0
+561709	1	244	0	78	0	0	16	43	40	NULL	1	3	0	0	0	0	0	85	11	16	8	8	0	0	0	0	2	2	0	0	0	0	0	1	0	0	0	2	1	0	0	23	1	0	0	8	0	NULL	0	NULL	1	1	4	4	4	1.0	215.493	4.0
+571063	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	69	2	3	4	NULL	NULL	NULL	NULL	NULL	350	46	52	12	18	3	5	NULL	NULL	12	1	0	0	0	1	1	0	0	0	0	2	38	1	NULL	87	17	1	NULL	25	0	954	NULL	2	1	11	14	14	14	121.0	937.277	1694.0
+571063	1	1121	135	231	0	3	45	68	38	NULL	2	3	0	0	0	0	0	277	36	40	10	7	3	5	0	0	6	1	0	0	0	1	1	0	0	0	0	2	24	1	11	82	14	1	7	29	0	NULL	0	NULL	1	11	8	8	8	121.0	741.142	968.0
+577193	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	82	2	3	4	NULL	NULL	NULL	NULL	NULL	248	23	45	12	18	0	4	NULL	NULL	8	2	0	0	0	0	0	0	0	0	0	1	12	0	NULL	41	11	0	NULL	15	0	1039	NULL	2	2	13	9	12	12	676.0	571.153	6084.0
+577193	1	603	31	112	0	2	24	104	40	NULL	1	3	0	0	0	0	0	184	19	28	10	6	0	3	0	0	6	2	0	0	0	0	0	0	0	0	0	1	9	0	11	46	8	0	10	22	0	NULL	0	NULL	2	13	7	9	9	676.0	419.834	4732.0
+577893	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	42	3	3	3	NULL	NULL	NULL	NULL	NULL	382	51	35	13	21	2	14	NULL	NULL	14	2	1	4	1	0	0	0	0	0	0	8	46	1	NULL	72	13	1	NULL	18	0	930	NULL	1	1	6	16	18	21	36.0	748.135	576.0
+577893	1	840	48	193	0	3	41	66	44	NULL	2	3	0	0	0	0	0	238	27	31	13	5	2	6	0	0	6	2	1	4	1	0	0	0	0	0	0	0	22	8	20	64	10	7	11	26	0	NULL	0	NULL	1	6	8	10	13	36.0	563.403	288.0
+579595	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	2	3	3	NULL	NULL	NULL	NULL	NULL	371	45	47	9	27	1	1	NULL	NULL	11	8	0	0	0	0	0	0	0	0	0	1	33	4	NULL	88	20	3	NULL	31	0	1062	NULL	2	0	16	12	12	12	0.0	992.256	0.0
+579595	1	1229	238	256	0	11	51	62	50	NULL	3	3	0	0	0	0	0	323	39	40	9	16	1	1	0	0	8	5	0	0	0	0	0	0	0	0	0	1	29	5	11	92	18	4	5	34	0	NULL	0	NULL	0	16	9	9	9	0.0	880.127	0.0
+611935	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	54	3	3	3	NULL	NULL	NULL	NULL	NULL	117	16	10	4	9	0	0	NULL	NULL	3	1	1	5	0	0	0	0	0	0	0	5	6	1	NULL	20	2	1	NULL	5	0	925	NULL	1	2	6	5	5	9	144.0	162.627	720.0
+611935	1	373	40	99	0	2	29	48	51	NULL	3	3	0	0	0	0	0	106	16	5	3	1	0	0	0	0	3	1	1	5	0	0	0	0	0	0	0	5	6	7	11	31	2	7	10	15	0	NULL	0	NULL	2	6	5	5	9	144.0	157.173	720.0
+615497	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	9	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	3	1	1	NULL	3	0	1039	NULL	1	25	1	1	1	1	625.0	4.75489	625.0
+615497	1	42	0	11	0	0	3	38	12	NULL	0	1	0	0	0	0	0	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	3	1	1	0	3	0	NULL	0	NULL	25	1	1	1	1	625.0	4.75489	625.0
+621377	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	9	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	1	NULL	3	1	1	NULL	3	0	1039	NULL	1	1	1	1	1	1	1.0	4.75489	1.0
+621377	1	39	0	11	0	0	3	35	12	NULL	0	1	0	0	0	0	0	9	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	1	0	3	1	1	0	3	0	NULL	0	NULL	1	1	1	1	1	1.0	4.75489	1.0
+626165	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	5	1	1	1	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	1	1	0	NULL	1	0	930	NULL	0	1	0	1	1	1	0.0	4.75489	0.0
+626165	1	13	0	6	0	0	3	9	8	NULL	0	0	0	0	0	0	0	5	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	0	NULL	1	0	1	1	1	0.0	4.75489	0.0
+627705	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	21	1	0	2	NULL	NULL	NULL	NULL	NULL	46	6	5	4	2	0	1	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	12	4	0	NULL	6	0	1039	NULL	1	16	4	2	2	2	4096.0	68.1143	8192.0
+627705	1	138	0	26	0	0	9	45	23	NULL	0	2	0	0	0	0	0	46	6	5	4	1	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	4	0	1	13	4	0	1	7	0	NULL	0	NULL	16	4	2	2	2	4096.0	68.1143	8192.0
+631317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	2	2	3	NULL	NULL	NULL	NULL	NULL	198	25	35	11	11	6	4	NULL	NULL	5	2	0	0	0	1	1	0	0	0	0	1	14	0	NULL	40	11	0	NULL	15	0	930	NULL	0	1	8	7	9	9	64.0	499.216	448.0
+631317	1	594	0	143	0	0	28	60	47	NULL	2	3	0	0	0	0	0	181	22	35	11	8	6	3	0	0	4	2	0	0	0	1	1	0	0	0	0	0	11	1	3	40	8	1	3	15	0	NULL	0	NULL	1	8	6	8	8	64.0	473.652	384.0
+636967	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	2	0	1	NULL	NULL	NULL	NULL	NULL	34	5	7	4	2	0	0	NULL	NULL	1	0	0	0	0	0	0	1	0	0	0	2	0	2	NULL	7	0	1	NULL	4	0	925	NULL	2	1	0	3	3	3	0.0	53.1508	0.0
+636967	1	89	0	25	0	0	8	29	29	NULL	0	1	0	0	0	0	0	34	5	7	4	2	0	0	0	0	1	0	0	0	0	0	0	1	0	0	0	2	0	2	0	7	0	1	0	4	0	NULL	0	NULL	1	0	3	3	3	0.0	53.1508	0.0
+638767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	69	3	2	4	NULL	NULL	NULL	NULL	NULL	341	33	65	13	24	1	9	NULL	NULL	10	0	0	0	0	0	2	1	0	0	0	1	51	0	NULL	76	14	0	NULL	17	0	954	NULL	0	3	7	14	14	14	441.0	959.706	6174.0
+638767	1	967	0	175	0	0	34	84	63	NULL	2	3	0	0	0	0	0	291	27	56	13	14	1	9	0	0	6	0	0	0	0	0	2	1	0	0	0	1	42	0	8	75	11	0	6	20	0	NULL	0	NULL	3	7	10	10	10	441.0	815.405	4410.0
+638905	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	52	4	4	4	NULL	NULL	NULL	NULL	NULL	334	40	77	9	14	18	2	NULL	NULL	7	2	1	6	1	9	1	0	0	0	0	1	7	4	NULL	61	5	1	NULL	14	0	1039	NULL	2	2	5	10	10	15	100.0	982.831	1000.0
+638905	1	938	32	291	0	3	45	53	43	NULL	4	4	0	0	0	0	0	295	40	71	8	7	18	2	0	0	7	2	1	6	1	9	1	0	0	0	0	1	4	4	4	62	4	1	2	15	0	NULL	0	NULL	2	5	10	10	15	100.0	882.424	1000.0
+645031	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	36	2	1	2	NULL	NULL	NULL	NULL	NULL	114	14	19	6	6	0	0	NULL	NULL	3	1	0	0	0	0	0	0	1	0	0	3	2	2	NULL	27	2	1	NULL	8	0	925	NULL	2	1	2	5	6	6	4.0	224.74	20.0
+645031	1	268	0	72	0	0	17	44	39	NULL	1	2	0	0	0	0	0	114	14	19	6	6	0	0	0	0	3	1	0	0	0	0	0	0	1	0	0	3	2	2	0	27	2	1	0	8	0	NULL	0	NULL	1	2	5	6	6	4.0	224.74	20.0
+652563	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	0	1	NULL	NULL	NULL	NULL	NULL	21	3	2	2	2	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	2	1	NULL	4	2	1	NULL	4	0	1062	NULL	2	0	1	2	2	2	0.0	24.0	0.0
+652563	1	57	0	15	0	0	5	22	17	NULL	0	1	0	0	0	0	0	21	3	2	2	2	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	1	2	1	0	4	2	1	0	4	0	NULL	0	NULL	0	1	2	2	2	0.0	24.0	0.0
+658219	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	3	4	NULL	NULL	NULL	NULL	NULL	380	40	66	13	26	0	5	NULL	NULL	9	2	0	0	0	0	1	0	0	0	0	1	24	3	NULL	81	15	3	NULL	27	0	1062	NULL	2	0	16	11	12	12	0.0	1045.68	0.0
+658219	1	893	35	167	0	2	38	73	55	NULL	1	3	0	0	0	0	0	298	32	49	11	8	0	4	0	0	5	0	0	0	0	0	1	0	0	0	0	1	19	3	17	88	12	3	14	38	0	NULL	0	NULL	0	16	7	7	7	0.0	845.769	0.0
+663287	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	4	4	4	NULL	NULL	NULL	NULL	NULL	418	46	80	12	32	0	1	NULL	NULL	9	2	0	0	0	0	3	0	2	0	1	3	13	3	NULL	86	7	1	NULL	16	1	925	NULL	2	3	5	15	16	16	225.0	1169.56	3375.0
+663287	1	1059	53	306	0	4	51	68	51	NULL	4	4	0	0	0	0	0	383	43	74	12	27	0	1	0	0	8	2	0	0	0	0	3	0	2	0	1	3	12	3	3	84	6	1	3	18	1	NULL	0	NULL	3	5	14	15	15	225.0	1079.08	3150.0
+675333	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	37	2	1	2	NULL	NULL	NULL	NULL	NULL	94	15	22	10	4	1	0	NULL	NULL	6	3	0	0	0	0	0	0	0	0	0	1	11	0	NULL	23	6	0	NULL	8	0	940	NULL	0	7	1	7	7	7	49.0	226.178	343.0
+675333	1	323	23	89	0	2	19	44	40	NULL	1	2	0	0	0	0	0	91	15	21	9	2	1	0	0	0	6	3	0	0	0	0	0	0	0	0	0	1	15	0	2	25	7	0	2	10	0	NULL	0	NULL	7	1	7	7	7	49.0	218.512	343.0
+696669	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	1	0	2	NULL	NULL	NULL	NULL	NULL	52	7	12	9	1	1	1	NULL	NULL	3	0	0	0	0	0	0	0	0	0	0	0	12	0	NULL	14	6	0	NULL	7	0	941	NULL	1	6	1	4	4	4	36.0	116.758	144.0
+696669	1	188	0	39	0	0	9	50	31	NULL	0	2	0	0	0	0	0	52	7	12	9	1	1	1	0	0	3	0	0	0	0	0	0	0	0	0	0	0	12	0	0	14	6	0	0	7	0	NULL	0	NULL	6	1	4	4	4	36.0	116.758	144.0
+697511	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	1	NULL	NULL	NULL	NULL	NULL	6	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	954	NULL	1	0	1	1	1	1	0.0	2.0	0.0
+697511	1	15	0	4	0	0	3	11	7	NULL	0	1	0	0	0	0	0	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	0	1	1	1	1	0.0	2.0	0.0
+700031	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	1	0	5	NULL	NULL	NULL	NULL	NULL	192	17	23	11	13	0	5	NULL	NULL	3	0	0	0	0	0	0	0	0	0	0	1	21	2	NULL	34	9	1	NULL	14	0	954	NULL	1	12	6	4	5	5	5184.0	367.355	20736.0
+700031	1	482	0	75	0	0	20	50	36	NULL	0	2	0	0	0	0	0	119	17	10	7	4	0	5	0	0	3	0	0	0	0	0	0	0	0	0	0	1	17	1	10	36	9	1	4	17	0	NULL	0	NULL	12	6	4	5	5	5184.0	240.368	20736.0
+710669	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	0	2	NULL	NULL	NULL	NULL	NULL	30	3	4	4	2	0	0	NULL	NULL	0	0	0	0	0	0	1	0	0	0	0	0	2	0	NULL	9	2	0	NULL	4	0	941	NULL	1	2	2	2	2	2	16.0	49.8289	32.0
+710669	1	63	0	18	0	0	6	35	17	NULL	0	2	0	0	0	0	0	30	3	4	4	2	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	2	0	0	9	2	0	0	4	0	NULL	0	NULL	2	2	2	2	2	16.0	49.8289	32.0
+712707	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	53	2	2	3	NULL	NULL	NULL	NULL	NULL	284	34	43	10	16	0	2	NULL	NULL	7	3	0	0	0	0	1	0	0	0	0	2	24	2	NULL	71	15	2	NULL	25	0	1062	NULL	2	0	13	9	9	9	0.0	737.415	0.0
+712707	1	826	71	169	0	3	36	74	55	NULL	2	3	0	0	0	0	0	251	30	37	10	9	0	2	0	0	5	1	0	0	0	0	1	0	0	0	0	2	22	2	7	74	14	2	6	30	0	NULL	0	NULL	0	13	7	7	7	0.0	673.765	0.0
+726231	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	4	4	4	NULL	NULL	NULL	NULL	NULL	408	44	77	12	31	0	1	NULL	NULL	9	2	0	0	0	0	3	1	1	0	1	3	12	3	NULL	85	7	1	NULL	16	1	925	NULL	2	2	5	15	16	16	100.0	1135.35	1500.0
+726231	1	1035	62	297	0	4	50	68	51	NULL	4	4	0	0	0	0	0	373	41	71	12	26	0	1	0	0	8	2	0	0	0	0	3	1	1	0	1	3	11	3	3	83	6	1	3	18	1	NULL	0	NULL	2	5	14	15	15	100.0	1045.32	1400.0
+729039	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	8	1	0	0	0	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	955	NULL	1	1	1	1	1	1	1.0	2.0	1.0
+729039	1	45	0	5	0	0	3	41	10	NULL	0	1	0	0	0	0	0	8	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	1	1	1	1	1	1.0	2.0	1.0
+734281	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	1	0	3	NULL	NULL	NULL	NULL	NULL	50	5	8	3	2	0	2	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	3	0	NULL	8	2	0	NULL	3	0	889	NULL	1	1	3	3	3	3	9.0	54.0	27.0
+734281	1	178	0	21	0	0	7	65	24	NULL	0	2	0	0	0	0	0	40	5	4	2	0	0	2	0	0	2	1	0	0	0	0	0	0	0	0	0	0	3	0	2	10	2	0	2	5	0	NULL	0	NULL	1	3	3	3	3	9.0	39.303	27.0
+735199	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	1	0	3	NULL	NULL	NULL	NULL	NULL	68	9	7	5	2	7	0	NULL	NULL	1	0	0	0	0	0	0	1	0	0	0	1	8	0	NULL	14	6	0	NULL	8	0	958	NULL	0	2	3	3	4	4	36.0	133.783	108.0
+735199	1	211	0	44	0	0	12	42	34	NULL	0	3	0	0	0	0	0	65	9	6	4	1	7	0	0	0	1	0	0	0	0	0	0	1	0	0	0	1	8	0	1	15	6	0	1	9	0	NULL	0	NULL	2	3	3	4	4	36.0	127.377	108.0
+745593	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	0	0	2	NULL	NULL	NULL	NULL	NULL	31	1	7	4	3	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	1	NULL	3	0	1	NULL	2	0	889	NULL	1	1	1	1	2	2	1.0	41.209	1.0
+745593	1	64	0	11	0	0	3	60	34	NULL	0	2	0	0	0	0	0	26	1	5	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	2	5	0	1	2	4	0	NULL	0	NULL	1	1	1	2	2	1.0	34.8692	1.0
+748359	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	1	0	2	NULL	NULL	NULL	NULL	NULL	95	8	11	5	8	0	4	NULL	NULL	4	3	0	0	0	0	0	0	0	0	0	0	8	0	NULL	18	2	0	NULL	4	0	958	NULL	3	1	1	5	5	5	1.0	151.236	5.0
+748359	1	247	0	47	0	0	10	48	31	NULL	0	1	0	0	0	0	0	71	8	7	4	4	0	4	0	0	4	3	0	0	0	0	0	0	0	0	0	0	4	0	4	18	1	0	1	4	0	NULL	0	NULL	1	1	5	5	5	1.0	103.964	5.0
+750689	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	21	0	0	2	NULL	NULL	NULL	NULL	NULL	19	1	3	2	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	1	NULL	2	0	1	NULL	2	0	889	NULL	1	1	0	1	1	1	0.0	13.9316	0.0
+750689	1	41	0	6	0	0	3	37	22	NULL	0	2	0	0	0	0	0	19	1	3	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	2	0	1	0	2	0	NULL	0	NULL	1	0	1	1	1	0.0	13.9316	0.0
+754385	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	1	1	1	NULL	NULL	NULL	NULL	NULL	51	3	1	1	0	0	0	NULL	NULL	0	0	1	9	1	0	0	0	0	0	0	2	2	10	NULL	15	2	9	NULL	12	0	889	NULL	1	1	1	2	2	10	1.0	59.207	2.0
+754385	1	165	0	40	0	0	9	54	64	NULL	1	1	0	0	0	0	0	51	3	1	1	0	0	0	0	0	0	0	1	9	1	0	0	0	0	0	0	2	2	10	10	15	2	9	9	12	0	NULL	0	NULL	1	1	2	2	10	1.0	59.207	2.0
+763667	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	60	2	3	4	NULL	NULL	NULL	NULL	NULL	362	40	60	12	22	0	3	NULL	NULL	10	3	0	0	0	0	1	0	0	0	0	2	26	3	NULL	80	17	3	NULL	29	0	1062	NULL	2	0	15	12	12	12	0.0	968.319	0.0
+763667	1	872	18	169	0	2	39	73	55	NULL	1	3	0	0	0	0	0	289	32	45	11	7	0	3	0	0	6	1	0	0	0	0	1	0	0	0	0	2	21	3	13	84	14	3	11	37	0	NULL	0	NULL	0	15	8	8	8	0.0	786.265	0.0
+764319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	1	0	5	NULL	NULL	NULL	NULL	NULL	118	11	12	7	6	0	1	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	10	2	NULL	21	8	1	NULL	12	0	958	NULL	1	61	8	2	2	2	238144.0	181.11	476288.0
+764319	1	247	35	39	0	1	14	54	19	NULL	0	1	0	0	0	0	0	63	11	2	2	2	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	9	1	5	21	8	1	4	15	0	NULL	0	NULL	61	8	2	2	2	238144.0	106.198	476288.0
+764969	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	54	2	2	4	NULL	NULL	NULL	NULL	NULL	59	5	9	4	2	0	1	NULL	NULL	1	0	0	0	0	1	1	0	0	0	0	0	2	1	NULL	11	2	1	NULL	6	0	889	NULL	2	1	2	3	3	3	4.0	78.8692	12.0
+764969	1	166	0	39	0	0	9	54	56	NULL	2	4	0	0	0	0	0	59	5	9	4	2	0	1	0	0	1	0	0	0	0	1	1	0	0	0	0	0	2	1	0	11	2	1	0	6	0	NULL	0	NULL	1	2	3	3	3	4.0	78.8692	12.0
+780111	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	0	0	5	NULL	NULL	NULL	NULL	NULL	103	8	11	6	4	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	7	2	NULL	18	5	1	NULL	9	0	958	NULL	1	9	6	1	1	1	2916.0	140.182	2916.0
+780111	1	171	0	27	0	0	11	34	13	NULL	0	1	0	0	0	0	0	48	8	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	1	5	18	5	1	4	12	0	NULL	0	NULL	9	6	1	1	1	2916.0	70.3084	2916.0
+788111	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	0	4	NULL	NULL	NULL	NULL	NULL	88	11	10	4	3	2	2	NULL	NULL	3	0	0	0	0	0	0	0	0	0	0	2	9	8	NULL	22	7	4	NULL	13	0	925	NULL	1	1	5	4	4	4	25.0	164.999	100.0
+788111	1	471	177	58	0	4	15	75	33	NULL	0	2	0	0	0	0	0	74	10	8	4	0	2	2	0	0	2	0	0	0	0	0	0	0	0	0	0	2	7	7	4	22	5	5	3	14	0	NULL	0	NULL	1	5	3	3	3	25.0	138.302	75.0
+791759	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	50	2	1	2	NULL	NULL	NULL	NULL	NULL	191	15	26	7	15	0	9	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	31	1	NULL	35	10	1	NULL	12	0	958	NULL	0	2	4	6	11	11	64.0	386.647	384.0
+791759	1	583	0	91	0	0	19	61	46	NULL	1	2	0	0	0	0	0	143	15	18	6	6	0	9	0	0	5	1	0	0	0	0	0	0	0	0	0	0	26	1	9	36	10	1	2	13	0	NULL	0	NULL	2	4	6	11	11	64.0	278.631	384.0
+816755	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	48	2	1	3	NULL	NULL	NULL	NULL	NULL	284	35	46	9	19	0	0	NULL	NULL	7	5	0	0	0	0	0	0	0	0	0	3	19	6	NULL	74	14	3	NULL	28	0	1062	NULL	2	0	8	8	11	11	0.0	807.222	0.0
+816755	1	790	79	188	0	3	38	64	50	NULL	1	2	0	0	0	0	0	256	31	42	9	12	0	0	0	0	5	3	0	0	0	0	0	0	0	0	0	3	17	10	7	77	13	6	5	32	0	NULL	0	NULL	0	8	6	9	9	0.0	750.358	0.0
+818911	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	0	4	NULL	NULL	NULL	NULL	NULL	14	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	3	0	NULL	3	3	0	NULL	3	0	925	NULL	0	2	3	1	1	1	36.0	4.75489	36.0
+818911	1	37	0	5	0	0	3	33	16	NULL	0	4	0	0	0	0	0	14	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	3	0	0	3	3	0	0	3	0	NULL	0	NULL	2	3	1	1	1	36.0	4.75489	36.0
+824063	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	44	2	2	6	NULL	NULL	NULL	NULL	NULL	388	30	35	5	28	5	3	NULL	NULL	2	1	1	8	1	0	0	0	0	0	0	10	49	21	NULL	79	10	4	NULL	15	0	925	NULL	0	3	8	4	4	11	576.0	842.004	2304.0
+824063	1	1054	35	212	0	2	46	74	38	NULL	2	4	0	0	0	0	0	314	30	22	3	1	5	3	0	0	2	1	1	8	1	0	0	0	0	0	0	10	49	23	25	93	10	9	7	22	0	NULL	0	NULL	3	8	4	4	11	576.0	599.458	2304.0
+825247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	252	2	1	4	NULL	NULL	NULL	NULL	NULL	875	30	201	15	54	20	3	NULL	NULL	5	0	0	0	0	0	4	2	0	0	0	1	68	0	NULL	110	8	0	NULL	12	0	959	NULL	0	2	4	12	34	34	64.0	2563.41	768.0
+825247	1	685	0	178	0	0	34	63	55	NULL	1	3	0	0	0	0	0	242	30	57	12	6	10	3	0	0	5	0	0	0	0	0	4	2	0	0	0	1	17	0	12	65	6	0	3	13	0	NULL	0	NULL	2	4	12	22	22	64.0	739.342	768.0
+864019	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	2	1	3	NULL	NULL	NULL	NULL	NULL	225	33	21	5	13	0	1	NULL	NULL	8	6	1	3	1	0	0	0	0	0	0	9	15	1	NULL	44	5	1	NULL	11	0	1062	NULL	2	0	4	10	10	12	0.0	378.923	0.0
+864019	1	515	24	111	0	2	30	42	28	NULL	1	1	0	0	0	0	0	168	27	9	3	4	0	1	0	0	5	3	1	3	1	0	0	0	0	0	0	9	12	4	9	47	4	4	5	15	0	NULL	0	NULL	0	4	7	7	9	0.0	267.566	0.0
+866967	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	1	1	1	NULL	NULL	NULL	NULL	NULL	55	13	6	2	0	6	0	NULL	NULL	0	0	1	6	0	6	0	0	0	0	0	0	6	0	NULL	7	3	0	NULL	4	0	959	NULL	1	2	0	2	2	7	0.0	68.1143	0.0
+866967	1	200	0	38	0	0	10	29	19	NULL	1	1	0	0	0	0	0	55	13	6	2	0	6	0	0	0	0	0	1	6	0	6	0	0	0	0	0	0	6	0	0	7	3	0	0	4	0	NULL	0	NULL	2	0	2	2	7	0.0	68.1143	0.0
+879455	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	1	1	1	NULL	NULL	NULL	NULL	NULL	51	9	6	2	6	0	2	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	1	6	0	NULL	11	2	0	NULL	4	0	959	NULL	2	3	1	3	3	3	9.0	82.4541	27.0
+879455	1	198	0	50	0	0	13	42	25	NULL	1	1	0	0	0	0	0	51	9	6	2	4	0	2	0	0	2	1	0	0	0	0	0	0	0	0	0	1	6	0	2	13	2	0	2	6	0	NULL	0	NULL	3	1	3	3	3	9.0	82.4541	27.0
+884319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	1	1	4	NULL	NULL	NULL	NULL	NULL	50	3	0	0	6	2	0	NULL	NULL	0	0	1	7	0	0	0	0	0	0	0	2	4	0	NULL	6	4	0	NULL	5	0	925	NULL	1	3	3	2	2	8	81.0	51.8062	162.0
+884319	1	154	0	32	0	0	7	72	67	NULL	1	4	0	0	0	0	0	50	3	0	0	0	2	0	0	0	0	0	1	7	0	0	0	0	0	0	0	2	4	6	6	12	4	6	6	11	0	NULL	0	NULL	3	3	2	2	8	81.0	51.8062	162.0
+892783	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	56	2	0	5	NULL	NULL	NULL	NULL	NULL	113	7	29	12	9	4	0	NULL	NULL	2	0	0	0	0	1	1	0	0	0	0	2	2	2	NULL	16	1	1	NULL	4	0	959	NULL	1	3	2	4	8	8	36.0	281.763	144.0
+892783	1	196	0	53	0	0	10	45	35	NULL	0	4	0	0	0	0	0	77	7	22	10	2	4	0	0	0	2	0	0	0	0	1	1	0	0	0	0	2	0	2	2	16	0	1	2	5	0	NULL	0	NULL	3	2	4	8	8	36.0	193.262	144.0
+894343	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	24	1	1	5	NULL	NULL	NULL	NULL	NULL	40	4	2	2	2	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	2	7	0	NULL	9	6	0	NULL	7	0	925	NULL	1	2	5	2	2	2	100.0	44.9726	200.0
+894343	1	105	0	24	0	0	7	47	25	NULL	1	5	0	0	0	0	0	40	4	2	2	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	2	7	2	2	11	6	1	1	8	0	NULL	0	NULL	2	5	2	2	2	100.0	43.1851	200.0
+896891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	2	1	3	NULL	NULL	NULL	NULL	NULL	273	36	30	13	24	0	1	NULL	NULL	9	9	1	6	1	0	0	0	0	0	0	13	20	2	NULL	53	7	2	NULL	15	0	1062	NULL	2	0	5	11	14	19	0.0	609.947	0.0
+896891	1	706	24	144	0	2	33	45	37	NULL	1	2	0	0	0	0	0	245	32	26	13	14	0	1	0	0	7	7	1	6	1	0	0	0	0	0	0	13	18	8	10	59	6	8	8	22	0	NULL	0	NULL	0	5	9	12	17	0.0	555.856	0.0
+901455	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	1	1	5	NULL	NULL	NULL	NULL	NULL	104	8	6	2	9	0	0	NULL	NULL	0	0	1	3	1	0	0	0	0	0	0	4	13	3	NULL	20	4	1	NULL	6	0	925	NULL	1	2	3	2	2	4	36.0	143.061	72.0
+901455	1	254	0	56	0	0	15	38	25	NULL	1	3	0	0	0	0	0	86	8	3	1	0	0	0	0	0	0	0	1	3	1	0	0	0	0	0	0	4	13	6	9	26	4	3	4	9	0	NULL	0	NULL	2	3	2	2	4	36.0	96.3359	72.0
+919495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	1	0	3	NULL	NULL	NULL	NULL	NULL	80	11	22	6	5	4	0	NULL	NULL	2	1	0	0	0	0	0	1	0	0	0	3	4	0	NULL	17	3	0	NULL	6	0	1007	NULL	1	9	1	4	8	8	81.0	210.831	324.0
+919495	1	226	0	65	0	0	14	49	35	NULL	0	1	0	0	0	0	0	73	11	20	6	4	4	0	0	0	2	1	0	0	0	0	0	1	0	0	0	3	3	0	2	18	2	0	2	7	0	NULL	0	NULL	9	1	4	8	8	81.0	202.047	324.0
+939395	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	92	1	3	4	NULL	NULL	NULL	NULL	NULL	121	11	21	8	5	0	4	NULL	NULL	4	0	0	0	0	0	0	0	0	0	0	0	7	0	NULL	19	5	0	NULL	6	0	1062	NULL	1	1	5	5	7	7	25.0	191.157	125.0
+939395	1	201	0	38	0	0	10	74	44	NULL	1	3	0	0	0	0	0	63	7	8	3	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	4	0	5	17	2	0	4	7	0	NULL	0	NULL	1	5	3	3	3	25.0	83.0482	75.0
+953171	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	2	1	2	NULL	NULL	NULL	NULL	NULL	100	13	20	9	6	0	1	NULL	NULL	2	0	0	0	0	0	1	0	0	0	0	1	10	4	NULL	26	3	2	NULL	7	0	1062	NULL	0	14	2	4	4	4	784.0	231.89	3136.0
+953171	1	276	0	64	0	0	16	44	34	NULL	1	2	0	0	0	0	0	100	13	20	9	6	0	1	0	0	2	0	0	0	0	0	1	0	0	0	0	1	10	4	0	26	3	2	0	7	0	NULL	0	NULL	14	2	4	4	4	784.0	231.89	3136.0
+953703	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	0	NULL	NULL	NULL	NULL	NULL	10	1	3	2	0	2	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	1	0	928	NULL	1	0	0	1	2	2	0.0	16.2535	0.0
+953703	1	30	0	7	0	0	3	26	14	NULL	0	0	0	0	0	0	0	10	1	3	2	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	2	0	0	0	1	0	NULL	0	NULL	0	0	1	2	2	0.0	16.2535	0.0
+971035	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	0	3	NULL	NULL	NULL	NULL	NULL	103	14	16	6	5	0	1	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	1	7	1	NULL	27	7	1	NULL	12	0	1062	NULL	2	0	7	3	4	4	0.0	217.131	0.0
+971035	1	347	75	56	0	3	16	59	43	NULL	0	3	0	0	0	0	0	89	12	14	6	2	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	6	1	3	28	6	1	3	14	0	NULL	0	NULL	0	7	2	3	3	0.0	196.215	0.0
+981647	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	61	6	6	3	NULL	NULL	NULL	NULL	NULL	555	60	115	14	32	23	5	NULL	NULL	14	8	1	12	1	1	3	0	0	0	0	11	15	23	NULL	103	9	4	NULL	21	0	930	NULL	0	4	7	19	23	34	784.0	1772.28	14896.0
+981647	1	2136	161	548	0	4	82	93	64	NULL	6	3	0	0	0	0	0	551	60	114	14	19	23	5	0	0	14	8	1	12	1	1	3	0	0	0	0	11	15	32	12	115	9	12	10	31	0	NULL	0	NULL	4	7	19	23	34	784.0	1746.04	14896.0
+993267	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	37	2	2	3	NULL	NULL	NULL	NULL	NULL	387	53	54	10	27	1	2	NULL	NULL	15	9	0	0	0	0	0	0	0	0	0	2	19	1	NULL	96	9	1	NULL	19	0	1062	NULL	2	0	8	16	16	16	0.0	1038.25	0.0
+993267	1	740	31	205	0	1	46	55	31	NULL	2	2	0	0	0	0	0	301	40	42	8	21	1	2	0	0	8	3	0	0	0	0	0	0	0	0	0	2	11	1	7	89	6	1	2	18	0	NULL	0	NULL	0	8	9	9	9	0.0	854.499	0.0
+1038403	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	2	2	3	NULL	NULL	NULL	NULL	NULL	190	22	37	9	6	3	0	NULL	NULL	3	2	0	0	0	1	2	0	0	0	0	1	8	3	NULL	53	5	2	NULL	17	0	1062	NULL	2	0	5	6	7	7	0.0	507.799	0.0
+1038403	1	404	10	106	0	1	24	56	36	NULL	2	1	0	0	0	0	0	162	18	33	8	4	3	0	0	0	1	0	0	0	0	1	2	0	0	0	0	1	6	3	2	51	4	2	1	17	0	NULL	0	NULL	0	5	4	5	5	0.0	455.0	0.0
+1065507	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	4	4	4	NULL	NULL	NULL	NULL	NULL	1012	117	185	16	33	43	15	NULL	NULL	19	4	2	19	2	14	2	1	0	2	0	1	56	2	NULL	255	14	2	NULL	31	0	1063	NULL	4	2	14	25	29	46	784.0	3582.34	19600.0
+1065507	1	3237	204	767	0	7	133	95	51	NULL	4	3	0	0	0	0	0	962	113	176	15	22	43	15	0	0	17	2	2	19	2	14	2	1	0	2	0	1	53	2	9	259	12	2	5	34	0	NULL	0	NULL	2	14	23	27	44	784.0	3416.45	18032.0
+1104287	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	241	6	5	4	NULL	NULL	NULL	NULL	NULL	845	68	172	18	57	0	4	NULL	NULL	15	2	0	0	0	0	9	1	0	0	2	2	44	5	NULL	184	10	1	NULL	19	1	930	NULL	3	4	7	26	41	41	784.0	2707.05	20384.0
+1104287	1	2308	187	544	0	6	87	87	232	NULL	5	4	0	0	0	0	0	759	62	155	18	36	0	4	0	0	13	2	0	0	0	0	9	1	0	0	2	2	42	11	14	188	9	7	11	29	1	NULL	0	NULL	4	7	24	39	39	784.0	2416.14	18816.0
+1235495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	82	2	3	3	NULL	NULL	NULL	NULL	NULL	273	26	52	9	15	0	0	NULL	NULL	7	0	0	0	0	0	2	0	0	0	0	1	5	0	NULL	43	1	0	NULL	3	0	930	NULL	1	1	1	10	11	11	1.0	523.038	10.0
+1235495	1	275	0	59	0	0	15	54	51	NULL	1	2	0	0	0	0	0	118	11	23	7	2	0	0	0	0	2	0	0	0	0	0	2	0	0	0	0	1	0	2	8	30	0	2	4	6	0	NULL	0	NULL	1	1	5	6	6	1.0	214.879	5.0
+1252211	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	37	1	0	3	NULL	NULL	NULL	NULL	NULL	131	17	22	6	7	0	2	NULL	NULL	3	1	0	0	0	0	0	0	0	0	0	1	9	2	NULL	33	8	2	NULL	15	0	1063	NULL	2	0	7	4	4	4	0.0	298.056	0.0
+1252211	1	369	0	63	0	0	18	65	39	NULL	0	3	0	0	0	0	0	117	15	20	6	4	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	1	8	2	3	34	7	2	3	17	0	NULL	0	NULL	0	7	3	3	3	0.0	275.783	0.0
+1276067	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	43	2	1	5	NULL	NULL	NULL	NULL	NULL	247	26	29	7	18	0	4	NULL	NULL	6	2	0	0	0	0	0	0	0	0	0	1	20	3	NULL	56	15	3	NULL	25	0	1063	NULL	2	0	13	7	7	7	0.0	581.317	0.0
+1276067	1	794	145	120	0	4	32	64	45	NULL	1	4	0	0	0	0	0	203	24	19	6	9	0	4	0	0	5	1	0	0	0	0	0	0	0	0	0	1	17	3	7	59	13	3	4	27	0	NULL	0	NULL	0	13	6	6	6	0.0	469.132	0.0
+1323275	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	2	1	3	NULL	NULL	NULL	NULL	NULL	273	40	33	14	17	0	4	NULL	NULL	6	3	1	7	1	7	0	0	0	0	0	1	16	2	NULL	71	10	2	NULL	20	0	1063	NULL	2	0	10	8	9	15	0.0	686.363	0.0
+1323275	1	777	36	201	0	2	50	62	52	NULL	1	2	0	0	0	0	0	245	36	29	13	7	0	4	0	0	4	1	1	7	1	7	0	0	0	0	0	1	14	10	10	77	9	9	8	27	0	NULL	0	NULL	0	10	6	7	13	0.0	627.669	0.0
+1370595	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	1	0	1	NULL	NULL	NULL	NULL	NULL	45	7	8	6	5	0	0	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	3	1	0	NULL	12	1	0	NULL	4	0	1063	NULL	2	3	1	3	3	3	9.0	97.6723	27.0
+1370595	1	118	0	43	0	0	11	19	25	NULL	0	1	0	0	0	0	0	45	7	8	6	5	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	3	1	0	0	12	1	0	0	4	0	NULL	0	NULL	3	1	3	3	3	9.0	97.6723	27.0
+1381963	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	1	1	3	NULL	NULL	NULL	NULL	NULL	120	16	18	8	8	0	0	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	2	7	2	NULL	35	5	2	NULL	13	0	1063	NULL	2	0	5	3	6	6	0.0	296.337	0.0
+1381963	1	280	0	72	0	0	18	46	35	NULL	1	1	0	0	0	0	0	106	14	16	7	3	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	2	6	6	5	38	4	5	4	16	0	NULL	0	NULL	0	5	2	5	5	0.0	267.925	0.0
+1400667	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	2	2	3	NULL	NULL	NULL	NULL	NULL	381	50	47	16	24	0	5	NULL	NULL	10	7	1	6	1	7	0	0	0	0	0	2	23	2	NULL	91	12	2	NULL	21	0	1063	NULL	2	0	14	12	14	19	0.0	960.779	0.0
+1400667	1	1196	131	264	0	5	61	64	52	NULL	2	3	0	0	0	0	0	343	46	39	16	6	0	5	0	0	8	5	1	6	1	7	0	0	0	0	0	2	21	9	18	105	11	9	14	34	0	NULL	0	NULL	0	14	10	12	17	0.0	871.103	0.0
+1471563	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	1	0	3	NULL	NULL	NULL	NULL	NULL	183	24	29	5	7	0	1	NULL	NULL	3	2	0	0	0	0	0	0	0	0	0	1	13	1	NULL	50	8	1	NULL	16	0	1063	NULL	2	0	8	4	4	4	0.0	413.433	0.0
+1471563	1	421	0	82	0	0	24	59	29	NULL	0	1	0	0	0	0	0	155	20	25	5	3	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	11	1	4	50	7	1	3	18	0	NULL	0	NULL	0	8	2	2	2	0.0	366.634	0.0
+1497883	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	1	2	3	NULL	NULL	NULL	NULL	NULL	83	10	9	4	7	0	0	NULL	NULL	3	2	0	0	0	0	0	0	0	0	0	1	4	1	NULL	17	2	1	NULL	5	0	1063	NULL	2	0	3	4	4	4	0.0	132.0	0.0
+1497883	1	155	0	47	0	0	14	21	29	NULL	2	2	0	0	0	0	0	64	8	5	3	5	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	1	3	1	2	17	1	1	2	6	0	NULL	0	NULL	0	3	3	3	3	0.0	102.799	0.0
+1509475	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	2	1	3	NULL	NULL	NULL	NULL	NULL	156	20	17	4	12	0	0	NULL	NULL	6	2	0	0	0	0	0	0	0	0	0	2	11	1	NULL	33	5	1	NULL	9	0	1063	NULL	2	0	4	7	7	7	0.0	287.919	0.0
+1509475	1	313	0	75	0	0	21	28	33	NULL	1	2	0	0	0	0	0	118	16	9	3	8	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	2	9	1	4	33	4	1	2	10	0	NULL	0	NULL	0	4	5	5	5	0.0	219.616	0.0
+1530195	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	63	4	4	4	NULL	NULL	NULL	NULL	NULL	1031	117	180	17	69	14	11	NULL	NULL	23	15	0	0	0	2	3	2	2	0	1	1	54	15	NULL	248	21	4	NULL	40	1	1063	NULL	2	0	18	31	43	43	0.0	3643.06	0.0
+1530195	1	2971	156	768	0	8	128	76	48	NULL	4	3	0	0	0	0	0	965	110	170	15	38	14	10	0	0	19	12	0	0	0	2	3	2	2	0	1	1	48	20	32	270	17	6	11	47	1	NULL	0	NULL	0	18	27	38	38	0.0	3361.78	0.0
+1700883	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	1	1	3	NULL	NULL	NULL	NULL	NULL	95	12	10	4	6	0	0	NULL	NULL	3	3	0	0	0	0	0	0	0	0	0	1	5	1	NULL	19	2	1	NULL	5	0	1063	NULL	2	0	3	4	4	4	0.0	136.741	0.0
+1700883	1	149	0	38	0	0	13	20	19	NULL	1	2	0	0	0	0	0	62	8	4	2	3	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	1	3	1	3	18	1	1	2	6	0	NULL	0	NULL	0	3	2	2	2	0.0	86.4858	0.0
+1712531	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	1	3	NULL	NULL	NULL	NULL	NULL	104	13	11	5	8	0	0	NULL	NULL	4	3	0	0	0	0	0	0	0	0	0	1	5	1	NULL	20	2	1	NULL	5	0	1063	NULL	2	0	3	5	5	5	0.0	162.627	0.0
+1712531	1	164	0	42	0	0	13	24	27	NULL	1	2	0	0	0	0	0	71	9	5	3	5	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	1	3	1	3	19	1	1	2	6	0	NULL	0	NULL	0	3	3	3	3	0.0	110.413	0.0
+1725299	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	2	2	3	NULL	NULL	NULL	NULL	NULL	156	17	24	6	10	0	0	NULL	NULL	5	2	0	0	0	0	1	0	0	0	0	3	5	1	NULL	25	3	1	NULL	6	0	1063	NULL	2	0	7	7	10	10	0.0	263.106	0.0
+1725299	1	240	0	66	0	0	18	41	34	NULL	2	2	0	0	0	0	0	95	13	7	4	2	0	0	0	0	3	0	0	0	0	0	1	0	0	0	0	3	3	1	7	27	2	1	6	11	0	NULL	0	NULL	0	7	5	7	7	0.0	147.149	0.0
+1742043	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	2	1	3	NULL	NULL	NULL	NULL	NULL	148	16	23	6	10	0	0	NULL	NULL	5	2	0	0	0	0	1	0	0	0	0	3	5	1	NULL	23	3	1	NULL	6	0	1063	NULL	2	0	7	7	10	10	0.0	249.728	0.0
+1742043	1	223	0	57	0	0	16	41	31	NULL	1	2	0	0	0	0	0	87	12	6	4	2	0	0	0	0	3	0	0	0	0	0	1	0	0	0	0	3	3	1	7	25	2	1	6	11	0	NULL	0	NULL	0	7	5	7	7	0.0	134.886	0.0
+1757835	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	2	3	NULL	NULL	NULL	NULL	NULL	218	25	30	7	16	0	0	NULL	NULL	8	5	0	0	0	0	1	0	0	0	0	3	9	1	NULL	36	3	1	NULL	6	0	1063	NULL	2	0	7	10	13	13	0.0	398.354	0.0
+1757835	1	341	16	82	0	1	21	41	31	NULL	2	2	0	0	0	0	0	129	17	9	5	6	0	0	0	0	4	1	0	0	0	0	1	0	0	0	0	3	5	1	9	36	2	1	6	11	0	NULL	0	NULL	0	7	6	8	8	0.0	227.431	0.0
+1780683	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	82	3	3	3	NULL	NULL	NULL	NULL	NULL	278	30	47	10	15	0	0	NULL	NULL	7	4	0	0	0	0	2	0	0	0	0	4	11	3	NULL	58	4	2	NULL	14	0	1063	NULL	2	0	8	10	13	13	0.0	634.248	0.0
+1780683	1	560	29	140	0	1	30	67	36	NULL	3	2	0	0	0	0	0	189	22	26	8	4	0	0	0	0	3	0	0	0	0	0	2	0	0	0	0	4	7	3	10	59	3	2	7	20	0	NULL	0	NULL	0	8	6	8	8	0.0	445.0	0.0
+1815515	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	63	4	2	4	NULL	NULL	NULL	NULL	NULL	724	81	84	12	44	0	6	NULL	NULL	12	9	1	14	1	13	3	0	0	0	0	2	54	12	NULL	163	31	7	NULL	48	0	1063	NULL	2	0	34	17	18	31	0.0	1949.83	0.0
+1815515	1	2161	204	443	0	7	97	66	45	NULL	2	4	0	0	0	0	0	610	75	64	10	11	0	6	0	0	9	6	1	14	1	13	3	0	0	0	0	2	48	12	31	183	27	7	25	68	0	NULL	0	NULL	0	34	14	15	28	0.0	1670.74	0.0
+1941403	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	2	1	4	NULL	NULL	NULL	NULL	NULL	178	20	22	6	13	0	1	NULL	NULL	5	3	0	0	0	0	1	0	0	0	0	1	15	3	NULL	44	13	3	NULL	20	0	1064	NULL	2	0	10	7	7	7	0.0	417.547	0.0
+1941403	1	439	44	93	0	1	24	64	26	NULL	1	2	0	0	0	0	0	149	18	16	5	7	0	1	0	0	4	2	0	0	0	0	1	0	0	0	0	1	13	3	5	46	11	3	4	22	0	NULL	0	NULL	0	10	6	6	6	0.0	351.035	0.0
+1968899	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	12	3	2	1	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	4	0	0	NULL	2	0	1064	NULL	2	1	0	1	1	1	0.0	14.0	0.0
+1968899	1	30	0	13	0	0	5	10	8	NULL	0	0	0	0	0	0	0	12	3	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	4	0	0	0	2	0	NULL	0	NULL	1	0	1	1	1	0.0	14.0	0.0
+1972539	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	3	NULL	NULL	NULL	NULL	NULL	71	12	9	4	2	0	1	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	1	5	2	NULL	22	5	2	NULL	12	0	1064	NULL	2	2	5	3	3	3	100.0	137.608	300.0
+1972539	1	184	0	39	0	0	13	37	21	NULL	0	1	0	0	0	0	0	57	10	7	3	0	0	1	0	0	1	0	0	0	0	0	0	0	0	0	0	1	4	2	2	22	4	2	2	13	0	NULL	0	NULL	2	5	2	2	2	100.0	116.0	200.0
+1999979	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	46	3	9	3	6	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	6	0	NULL	6	2	0	NULL	2	0	1067	NULL	0	1	0	1	1	1	0.0	72.6481	0.0
+1999979	1	71	0	14	0	0	5	22	13	NULL	0	0	0	0	0	0	0	28	3	6	2	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	3	6	1	0	3	4	0	NULL	0	NULL	1	0	1	1	1	0.0	47.5489	0.0
+2007707	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	80	3	1	2	NULL	NULL	NULL	NULL	NULL	339	37	53	12	22	2	9	NULL	NULL	13	5	0	0	0	1	2	0	0	0	0	4	24	1	NULL	79	8	1	NULL	15	0	1067	NULL	2	3	6	16	20	20	324.0	884.898	5184.0
+2007707	1	1138	154	239	0	8	44	70	83	NULL	1	2	0	0	0	0	0	327	37	51	11	6	2	9	0	0	13	5	0	0	0	1	2	0	0	0	0	4	22	8	16	93	7	5	9	23	0	NULL	0	NULL	3	6	16	20	20	324.0	819.632	5184.0
+2074011	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	2	0	1	NULL	NULL	NULL	NULL	NULL	39	5	6	5	2	0	1	NULL	NULL	1	0	0	0	0	0	1	0	0	0	0	2	2	0	NULL	9	1	0	NULL	3	0	1067	NULL	1	2	0	3	3	3	0.0	56.4728	0.0
+2074011	1	111	0	29	0	0	8	32	31	NULL	0	1	0	0	0	0	0	39	5	6	5	1	0	1	0	0	1	0	0	0	0	0	1	0	0	0	0	2	2	0	1	10	1	0	1	4	0	NULL	0	NULL	2	0	3	3	3	0.0	56.4728	0.0
+2081739	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	83	3	4	4	NULL	NULL	NULL	NULL	NULL	280	28	44	13	15	1	2	NULL	NULL	7	2	0	0	0	0	1	0	0	0	0	1	25	2	NULL	64	11	2	NULL	18	0	1067	NULL	2	0	11	9	11	11	0.0	688.769	0.0
+2081739	1	705	51	144	0	2	29	63	73	NULL	2	2	0	0	0	0	0	223	23	33	11	5	1	2	0	0	5	1	0	0	0	0	1	0	0	0	0	1	21	3	8	65	9	3	7	23	0	NULL	0	NULL	0	11	7	9	9	0.0	553.481	0.0
+2123123	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	3	2	4	NULL	NULL	NULL	NULL	NULL	131	10	21	10	6	1	2	NULL	NULL	4	1	0	0	0	0	1	0	0	0	0	0	12	0	NULL	28	4	0	NULL	6	0	1067	NULL	0	1	4	6	7	7	16.0	253.319	96.0
+2123123	1	382	0	84	0	0	16	69	52	NULL	2	2	0	0	0	0	0	119	10	17	6	1	1	2	0	0	4	1	0	0	0	0	1	0	0	0	0	0	12	1	4	32	4	1	4	10	0	NULL	0	NULL	1	4	6	7	7	16.0	212.666	96.0
+2145747	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	2	0	1	NULL	NULL	NULL	NULL	NULL	36	4	5	4	2	0	0	NULL	NULL	1	0	0	0	0	0	1	0	0	0	0	0	3	0	NULL	9	2	0	NULL	3	0	1068	NULL	0	1	1	3	3	3	1.0	50.7188	3.0
+2145747	1	88	0	23	0	0	7	32	28	NULL	0	1	0	0	0	0	0	36	4	5	4	1	0	0	0	0	1	0	0	0	0	0	1	0	0	0	0	0	3	0	1	10	2	0	1	4	0	NULL	0	NULL	1	1	3	3	3	1.0	50.7188	3.0
+2154651	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	67	4	3	3	NULL	NULL	NULL	NULL	NULL	496	56	102	13	21	3	7	NULL	NULL	11	6	0	0	0	0	1	3	0	0	0	1	40	3	NULL	135	17	2	NULL	30	0	1070	NULL	2	0	12	16	19	19	0.0	1583.25	0.0
+2154651	1	1486	129	317	0	5	58	63	69	NULL	3	3	0	0	0	0	0	454	50	96	12	17	3	7	0	0	8	3	0	0	0	0	1	3	0	0	0	1	37	3	4	133	16	2	2	31	0	NULL	0	NULL	0	12	13	16	16	0.0	1488.34	0.0
+2241003	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	45	7	6	3	NULL	NULL	NULL	NULL	NULL	782	91	176	13	36	5	11	NULL	NULL	17	9	0	0	0	0	2	4	1	0	2	1	52	3	NULL	210	16	2	NULL	32	1	1070	NULL	2	0	13	25	28	28	0.0	2744.02	0.0
+2241003	1	2638	279	663	0	11	98	71	49	NULL	6	3	0	0	0	0	0	740	85	170	13	31	5	11	0	0	14	6	0	0	0	0	2	4	1	0	2	1	49	3	5	209	15	2	3	34	1	NULL	0	NULL	0	13	22	25	25	0.0	2645.64	0.0
+2391811	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	52	2	2	1	NULL	NULL	NULL	NULL	NULL	142	17	48	6	7	8	0	NULL	NULL	4	4	0	0	0	0	0	0	0	0	0	0	0	0	NULL	27	0	0	NULL	4	0	1070	NULL	2	2	0	5	6	6	0.0	417.947	0.0
+2391811	1	519	83	136	0	6	24	59	56	NULL	2	1	0	0	0	0	0	142	17	48	6	7	8	0	0	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	27	0	0	0	4	0	NULL	0	NULL	2	0	5	6	6	0.0	417.947	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 32517	0	32517
diff --git a/src/test/out/c00-unused.c b/src/test/out/c00-unused.c
index 80fb982a..11efa880 100644
--- a/src/test/out/c00-unused.c
+++ b/src/test/out/c00-unused.c
@@ -277,15 +277,15 @@ FID	NAME	RO
 4	c00-unused.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	38	0	1	3	NULL	NULL	NULL	NULL	NULL	134	20	4	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	40	4	NULL	50	20	1	NULL	24	0	NULL	NULL	1	0	18	0	1	2	0	0
-4	1	723	54	152	2	0	30	67	35	NULL	1	3	0	1	0	0	1	151	20	4	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	20	2	24	49	20	1	1	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	38	0	1	3	NULL	NULL	NULL	NULL	NULL	134	20	4	0	5	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	40	4	NULL	50	20	1	NULL	24	0	NULL	NULL	1	0	18	0	1	2	0	0
+4	1	723	54	152	2	0	30	67	35	NULL	1	3	0	1	0	0	1	151	20	4	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	20	2	24	49	20	1	1	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -334,13 +334,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 4279	4	448	4	471
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	36	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	2	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	36	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-4279	1	24	0	10	0	0	2	18	9	NULL	0	0	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	0	1	2	0	NULL	0	NULL	0	0	1	1	1	0.0	2.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	28	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	36	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	2	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	36	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+4279	1	24	0	10	0	0	2	18	9	NULL	0	0	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	0	1	2	0	NULL	0	NULL	0	0	1	1	1	0.0	2.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	28	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c01-idtest.c b/src/test/out/c01-idtest.c
index 7501194a..c144c093 100644
--- a/src/test/out/c01-idtest.c
+++ b/src/test/out/c01-idtest.c
@@ -176,15 +176,15 @@ FID	NAME	RO
 4	c01-idtest.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	1	2	NULL	NULL	NULL	NULL	NULL	76	12	5	0	2	0	0	1	0	0	0	0	0	0	0	0	0	1	2	10	2	NULL	20	3	1	NULL	7	3	NULL	NULL	1	0	2	1	2	4	0	0
-4	1	282	0	83	0	0	23	31	31	NULL	1	2	0	1	0	1	0	82	12	4	0	2	0	0	1	0	0	0	0	0	0	0	0	0	1	2	5	1	3	13	3	1	1	8	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	1	2	NULL	NULL	NULL	NULL	NULL	76	12	5	0	2	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	1	2	10	2	NULL	20	3	1	NULL	7	3	NULL	NULL	1	0	2	1	2	4	0	0
+4	1	282	0	83	0	0	23	31	31	NULL	1	2	0	1	0	1	0	82	12	4	0	2	0	0	0	0	1	0	0	0	0	0	0	0	0	0	1	2	5	1	3	13	3	1	1	8	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -237,15 +237,15 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1559	4	186	4	280
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-89	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-89	1	15	0	4	0	0	1	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	1	1	0.0	0.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	2	NULL	NULL	NULL	NULL	NULL	35	5	4	3	2	0	0	1	0	0	0	0	0	0	0	0	0	1	2	2	0	NULL	4	2	0	NULL	4	1	15	NULL	0	0	1	2	2	2	0.0	31.6993	0.0
-1559	1	95	0	31	0	0	7	31	21	NULL	0	1	0	0	0	0	0	29	5	2	2	2	0	0	1	0	0	0	0	0	0	0	0	0	1	2	2	0	2	6	2	0	1	5	1	NULL	0	NULL	0	1	2	2	2	0.0	31.6993	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+89	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+89	1	15	0	4	0	0	1	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	1	1	0.0	0.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	1	0	2	NULL	NULL	NULL	NULL	NULL	35	5	4	3	2	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	1	2	2	0	NULL	4	2	0	NULL	4	1	15	NULL	0	0	1	2	2	2	0.0	31.6993	0.0
+1559	1	95	0	31	0	0	7	31	21	NULL	0	1	0	0	0	0	0	29	5	2	2	2	0	0	0	0	1	0	0	0	0	0	0	0	0	0	1	2	2	0	2	6	2	0	1	5	1	NULL	0	NULL	0	1	2	2	2	0.0	31.6993	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 89	0	89
diff --git a/src/test/out/c02-include_sites.c b/src/test/out/c02-include_sites.c
index 7b43522c..70068176 100644
--- a/src/test/out/c02-include_sites.c
+++ b/src/test/out/c02-include_sites.c
@@ -106,19 +106,19 @@ FID	NAME	RO
 6	unused1.h	0
 7	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-4	1	100	0	23	0	0	8	26	0	NULL	0	0	0	6	1	0	1	19	0	0	0	0	0	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	4	4	0	0	2	2	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
-5	1	18	0	4	0	0	1	17	6	NULL	0	0	0	0	0	0	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+4	1	100	0	23	0	0	8	26	0	NULL	0	0	0	6	1	0	1	19	0	0	0	0	0	2	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	4	4	0	0	2	2	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
+5	1	18	0	4	0	0	1	17	6	NULL	0	0	0	0	0	0	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -167,11 +167,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1247	7	95	7	117
 7495	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 1247	0	1247
diff --git a/src/test/out/c03-ptrtypes.c b/src/test/out/c03-ptrtypes.c
index c12c10a5..20c435fd 100644
--- a/src/test/out/c03-ptrtypes.c
+++ b/src/test/out/c03-ptrtypes.c
@@ -169,15 +169,15 @@ FID	NAME	RO
 4	c03-ptrtypes.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	42	1	2	1	NULL	NULL	NULL	NULL	NULL	97	12	10	0	5	0	2	1	0	0	0	0	0	0	0	0	0	0	1	16	0	NULL	16	5	0	NULL	5	0	NULL	NULL	2	0	3	0	3	5	0	0
-4	1	375	14	130	0	1	24	48	44	NULL	2	1	0	0	0	0	0	96	12	10	0	5	0	2	1	0	0	0	0	0	0	0	0	0	0	1	8	0	0	8	5	0	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	42	1	2	1	NULL	NULL	NULL	NULL	NULL	97	12	10	0	5	0	2	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	1	16	0	NULL	16	5	0	NULL	5	0	NULL	NULL	2	0	3	0	3	5	0	0
+4	1	375	14	130	0	1	24	48	44	NULL	2	1	0	0	0	0	0	96	12	10	0	5	0	2	0	0	1	0	0	0	0	0	0	0	0	0	0	1	8	0	0	8	5	0	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -227,13 +227,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 3049	4	315	4	369
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	0	NULL	NULL	NULL	NULL	NULL	8	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	1	1	0	NULL	1	0	20	NULL	0	0	0	1	1	1	0.0	3.0	0.0
-891	1	19	0	4	0	0	0	0	9	NULL	0	0	0	0	0	0	0	8	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	3.0	0.0
-3049	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	1	0	1	NULL	NULL	NULL	NULL	NULL	12	2	3	3	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	0	19	NULL	0	0	0	2	3	3	0.0	13.9316	0.0
-3049	1	55	0	21	0	0	3	48	20	NULL	0	1	0	0	0	0	0	12	2	3	3	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	0	NULL	0	0	2	3	3	0.0	13.9316	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	13	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	0	NULL	NULL	NULL	NULL	NULL	8	1	2	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	1	1	0	NULL	1	0	20	NULL	0	0	0	1	1	1	0.0	3.0	0.0
+891	1	19	0	4	0	0	0	0	9	NULL	0	0	0	0	0	0	0	8	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	3.0	0.0
+3049	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	1	0	1	NULL	NULL	NULL	NULL	NULL	12	2	3	3	1	0	0	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	0	19	NULL	0	0	0	2	3	3	0.0	13.9316	0.0
+3049	1	55	0	21	0	0	3	48	20	NULL	0	1	0	0	0	0	0	12	2	3	3	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	0	NULL	0	0	2	3	3	0.0	13.9316	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	13	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	829
diff --git a/src/test/out/c04-designators.c b/src/test/out/c04-designators.c
index 01413a81..11d02a04 100644
--- a/src/test/out/c04-designators.c
+++ b/src/test/out/c04-designators.c
@@ -196,15 +196,15 @@ FID	NAME	RO
 4	c04-designators.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	120	0	3	0	NULL	NULL	NULL	NULL	NULL	152	9	33	0	18	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	8	4	0	NULL	4	0	NULL	NULL	0	0	4	0	4	8	0	0
-4	1	303	0	106	0	0	12	64	120	NULL	3	0	0	0	0	0	0	151	9	33	0	18	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	4	4	0	0	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	120	0	3	0	NULL	NULL	NULL	NULL	NULL	152	9	33	0	18	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	8	4	0	NULL	4	0	NULL	NULL	0	0	4	0	4	8	0	0
+4	1	303	0	106	0	0	12	64	120	NULL	3	0	0	0	0	0	0	151	9	33	0	18	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	4	4	0	0	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -250,11 +250,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c05-gcc_labels.c b/src/test/out/c05-gcc_labels.c
index c57db5f0..292efed9 100644
--- a/src/test/out/c05-gcc_labels.c
+++ b/src/test/out/c05-gcc_labels.c
@@ -171,15 +171,15 @@ FID	NAME	RO
 4	c05-gcc_labels.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	2	2	NULL	NULL	NULL	NULL	NULL	115	20	17	0	7	0	0	0	0	0	0	0	0	2	0	0	0	0	0	2	0	NULL	54	1	0	NULL	7	2	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	349	0	131	0	0	17	54	26	NULL	2	2	0	0	0	0	0	114	20	17	0	7	0	0	0	0	0	0	0	0	2	0	0	0	0	0	1	0	0	27	1	0	0	7	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	1	2	2	NULL	NULL	NULL	NULL	NULL	115	20	17	0	7	0	0	NULL	NULL	0	0	0	0	0	0	2	0	0	0	0	0	2	0	NULL	54	1	0	NULL	7	2	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	349	0	131	0	0	17	54	26	NULL	2	2	0	0	0	0	0	114	20	17	0	7	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	1	0	0	27	1	0	0	7	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -227,13 +227,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-69	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	1	2	NULL	NULL	NULL	NULL	NULL	80	16	13	5	7	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	NULL	18	0	0	NULL	6	1	11	NULL	4	0	0	3	3	3	0.0	158.457	0.0
-69	1	196	0	65	0	0	10	54	16	NULL	1	2	0	0	0	0	0	80	16	13	5	7	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	18	0	0	0	6	1	NULL	0	NULL	0	0	3	3	3	0.0	158.457	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+69	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	1	2	NULL	NULL	NULL	NULL	NULL	80	16	13	5	7	0	0	NULL	NULL	0	0	0	0	0	0	2	0	0	0	0	0	0	0	NULL	18	0	0	NULL	6	1	11	NULL	4	0	0	3	3	3	0.0	158.457	0.0
+69	1	196	0	65	0	0	10	54	16	NULL	1	2	0	0	0	0	0	80	16	13	5	7	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	18	0	0	0	6	1	NULL	0	NULL	0	0	3	3	3	0.0	158.457	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 69	0	69
diff --git a/src/test/out/c06-namespace.c b/src/test/out/c06-namespace.c
index 99a5044e..8afec0f5 100644
--- a/src/test/out/c06-namespace.c
+++ b/src/test/out/c06-namespace.c
@@ -121,15 +121,15 @@ FID	NAME	RO
 4	c06-namespace.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	24	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	2	NULL	NULL	1	0	0	0	2	2	0	0
-4	1	243	100	74	0	6	15	47	19	NULL	1	1	0	0	0	0	0	23	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	24	4	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	2	NULL	NULL	1	0	0	0	2	2	0	0
+4	1	243	100	74	0	6	15	47	19	NULL	1	1	0	0	0	0	0	23	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -175,13 +175,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 2109	4	217	4	241
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2109	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	1	11	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-2109	1	25	7	10	0	1	2	20	0	NULL	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2109	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	3	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	1	11	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+2109	1	25	7	10	0	1	2	20	0	NULL	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c07-incomplete_typedef.c b/src/test/out/c07-incomplete_typedef.c
index 36ce1598..3f95fbd7 100644
--- a/src/test/out/c07-incomplete_typedef.c
+++ b/src/test/out/c07-incomplete_typedef.c
@@ -170,15 +170,15 @@ FID	NAME	RO
 4	c07-incomplete_typedef.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	3	1	NULL	NULL	NULL	NULL	NULL	84	14	3	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	1	8	10	NULL	18	3	2	NULL	5	0	NULL	NULL	1	0	1	0	3	5	0	0
-4	1	296	13	98	1	0	33	24	31	NULL	3	1	0	0	0	0	0	83	14	3	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	5	0	9	3	2	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	3	1	NULL	NULL	NULL	NULL	NULL	84	14	3	0	4	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	8	10	NULL	18	3	2	NULL	5	0	NULL	NULL	1	0	1	0	3	5	0	0
+4	1	296	13	98	1	0	33	24	31	NULL	3	1	0	0	0	0	0	83	14	3	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	5	0	9	3	2	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -227,11 +227,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	4	264	4	290
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	10	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	1	1	0	NULL	1	0	18	NULL	0	0	1	1	1	1	0.0	3.0	0.0
-891	1	27	0	7	0	0	2	22	13	NULL	0	1	0	0	0	0	0	10	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	0	1	0	NULL	0	NULL	0	1	1	1	1	0.0	3.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	12	0	0	1	NULL	NULL	NULL	NULL	NULL	10	1	2	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	1	1	0	NULL	1	0	18	NULL	0	0	1	1	1	1	0.0	3.0	0.0
+891	1	27	0	7	0	0	2	22	13	NULL	0	1	0	0	0	0	0	10	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	0	1	0	NULL	0	NULL	0	1	1	1	1	0.0	3.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 679	0	679
diff --git a/src/test/out/c08-partial_identifiers.c b/src/test/out/c08-partial_identifiers.c
index 2a828d9f..04c39e2e 100644
--- a/src/test/out/c08-partial_identifiers.c
+++ b/src/test/out/c08-partial_identifiers.c
@@ -1190,19 +1190,19 @@ FID	NAME	RO
 6	_ansi.h	1
 7	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	0	1	2	NULL	NULL	NULL	NULL	NULL	158	10	8	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	8	66	0	NULL	130	19	0	NULL	21	0	NULL	NULL	9	0	0	0	0	0	0	0
-4	1	412	0	95	0	0	20	58	159	NULL	1	2	0	2	0	1	0	158	3	10	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	1	26	0	9	39	19	0	1	22	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
-5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	45	47	56	148	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	0	1	2	NULL	NULL	NULL	NULL	NULL	158	10	8	0	4	0	2	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	8	66	0	NULL	130	19	0	NULL	21	0	NULL	NULL	9	0	0	0	0	0	0	0
+4	1	412	0	95	0	0	20	58	159	NULL	1	2	0	2	0	1	0	158	3	10	0	4	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	1	26	0	9	39	19	0	1	22	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
+5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	45	47	56	148	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -1359,57 +1359,57 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 132605	5	9480	5	9493
 133025	5	9511	5	9528
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-429	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-429	1	64	0	20	0	0	2	58	33	NULL	1	1	0	0	0	0	0	20	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	5	1	0	0	3	0	NULL	3	NULL	0	0	1	1	1	0.0	14.0	0.0
-1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	69	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1843	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	155	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
-1843	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-2151	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	157	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-2151	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2459	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	159	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-2459	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	161	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-2767	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3075	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	163	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-3075	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	165	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-3425	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3775	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	167	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
-3775	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-4125	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	169	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-4125	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4321	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	2	NULL	NULL	NULL	NULL	NULL	25	2	0	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	8	6	0	NULL	6	0	169	NULL	0	0	3	1	1	1	0.0	39.8631	0.0
-4321	1	92	0	27	0	0	3	47	17	NULL	0	2	0	0	0	0	0	25	2	0	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	0	8	0	0	8	6	0	0	6	0	NULL	0	NULL	0	3	1	1	1	0.0	39.8631	0.0
-7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	61	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-122245	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-122245	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
-124317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-124317	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
-127565	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-127565	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-128251	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-128251	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-128965	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-128965	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-129875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-129875	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-130365	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-130365	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-130757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-130757	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-131191	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-131191	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-131695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-131695	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-132101	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132101	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-132605	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132605	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-133025	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-133025	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+429	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+429	1	64	0	20	0	0	2	58	33	NULL	1	1	0	0	0	0	0	20	1	2	1	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	5	1	0	0	3	0	NULL	3	NULL	0	0	1	1	1	0.0	14.0	0.0
+1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	69	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1843	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	155	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
+1843	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+2151	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	157	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+2151	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2459	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	159	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+2459	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	161	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+2767	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3075	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	163	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+3075	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	165	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+3425	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3775	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	167	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
+3775	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+4125	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	169	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+4125	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4321	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	2	NULL	NULL	NULL	NULL	NULL	25	2	0	0	4	0	2	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	8	6	0	NULL	6	0	169	NULL	0	0	3	1	1	1	0.0	39.8631	0.0
+4321	1	92	0	27	0	0	3	47	17	NULL	0	2	0	0	0	0	0	25	2	0	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	0	0	8	6	0	0	6	0	NULL	0	NULL	0	3	1	1	1	0.0	39.8631	0.0
+7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	61	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+122245	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+122245	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
+124317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+124317	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
+127565	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+127565	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+128251	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+128251	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+128965	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+128965	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+129875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+129875	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+130365	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+130365	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+130757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+130757	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+131191	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+131191	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+131695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+131695	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+132101	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132101	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+132605	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132605	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+133025	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+133025	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 429	0	429
diff --git a/src/test/out/c09-concfun.c b/src/test/out/c09-concfun.c
index aece883a..077c3461 100644
--- a/src/test/out/c09-concfun.c
+++ b/src/test/out/c09-concfun.c
@@ -136,15 +136,15 @@ FID	NAME	RO
 4	c09-concfun.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	21	0	1	1	NULL	NULL	NULL	NULL	NULL	47	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	NULL	18	4	0	NULL	4	0	NULL	NULL	3	0	0	0	0	0	0	0
-4	1	192	0	40	0	0	13	34	51	NULL	1	1	0	1	0	1	0	64	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	0	2	11	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	21	0	1	1	NULL	NULL	NULL	NULL	NULL	47	4	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	18	0	NULL	18	4	0	NULL	4	0	NULL	NULL	3	0	0	0	0	0	0	0
+4	1	192	0	40	0	0	13	34	51	NULL	1	1	0	1	0	1	0	64	4	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	9	0	2	11	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -196,19 +196,19 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1409	4	150	4	151
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-249	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	11	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-249	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-659	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	13	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-659	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1139	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1139	1	10	0	5	0	0	1	8	0	NULL	0	0	0	0	0	0	0	3	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-1409	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1409	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+249	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	11	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+249	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+659	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	13	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+659	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1139	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1139	1	10	0	5	0	0	1	8	0	NULL	0	0	0	0	0	0	0	3	0	1	1	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+1409	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1409	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 249	0	59
diff --git a/src/test/out/c10-hello.c b/src/test/out/c10-hello.c
index ed8e7dcc..78fb55e1 100644
--- a/src/test/out/c10-hello.c
+++ b/src/test/out/c10-hello.c
@@ -1387,23 +1387,23 @@ FID	NAME	RO
 8	assert.h	1
 9	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	207	1	2	4	NULL	NULL	NULL	NULL	NULL	234	11	39	0	14	5	2	0	0	0	0	0	0	1	0	0	0	0	0	46	2	NULL	62	15	1	NULL	19	0	NULL	NULL	1	0	6	1	0	0	0	0
-4	1	638	50	141	3	1	42	41	90	NULL	2	2	0	10	2	1	2	164	13	12	0	3	1	2	0	0	0	0	0	0	1	0	0	0	0	0	23	1	13	44	14	1	7	25	0	1	3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
-5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	48	47	59	154	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	0	0	1	NULL	NULL	NULL	NULL	NULL	285	23	56	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-7	1	3077	1916	209	0	3	79	77	45	NULL	0	1	5	10	3	0	1	317	24	56	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	13	3	39	23	1	2	26	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-8	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	14	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-8	1	2548	2341	35	0	3	58	77	99	NULL	0	2	2	6	1	1	0	62	1	3	0	2	0	0	0	1	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	2	3	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-9	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	207	1	2	4	NULL	NULL	NULL	NULL	NULL	234	11	39	0	14	5	2	NULL	NULL	0	0	0	0	0	0	1	0	0	0	0	0	46	2	NULL	62	15	1	NULL	19	0	NULL	NULL	1	0	6	1	0	0	0	0
+4	1	638	50	141	3	1	42	41	90	NULL	2	2	0	10	2	1	2	164	13	12	0	3	1	2	2	0	0	0	0	0	0	0	1	0	0	0	0	0	23	1	13	44	14	1	7	25	0	1	3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
+5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	48	47	59	154	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	0	0	1	NULL	NULL	NULL	NULL	NULL	285	23	56	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+7	1	3077	1916	209	0	3	79	77	45	NULL	0	1	5	10	3	0	1	317	24	56	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	13	3	39	23	1	2	26	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+8	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	14	1	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+8	1	2548	2341	35	0	3	58	77	99	NULL	0	2	2	6	1	1	0	62	1	3	0	2	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	1	0	2	3	1	0	2	3	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+9	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -1608,45 +1608,45 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 170489	5	9480	5	9493
 171029	5	9511	5	9528
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-1603	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	90	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1603	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3231	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	207	1	1	4	NULL	NULL	NULL	NULL	NULL	196	5	37	10	14	5	1	0	0	0	0	0	0	1	0	0	0	0	0	14	0	NULL	19	4	0	NULL	6	0	207	NULL	0	0	4	2	5	5	0.0	384.696	0.0
-3231	1	159	16	36	1	0	9	41	17	NULL	1	2	0	0	0	0	0	42	5	4	4	3	1	1	0	0	0	0	0	0	1	0	0	0	0	0	2	0	2	9	2	0	2	6	0	NULL	0	NULL	0	4	2	2	2	0.0	64.725	0.0
-8559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-8559	1	12	0	6	0	0	1	10	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	1	0	1	1	1	0.0	0.0	0.0
-9225	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	0	0	2	NULL	NULL	NULL	NULL	NULL	22	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	9	0	NULL	9	9	0	NULL	9	0	221	NULL	0	0	2	1	1	1	0.0	28.5293	0.0
-9225	1	109	0	26	0	0	6	25	60	NULL	0	2	0	0	0	0	0	42	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	9	0	4	13	9	0	1	10	0	NULL	0	NULL	0	2	1	1	1	0.0	43.1851	0.0
-9635	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	84	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-9635	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-43145	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-43145	1	12	0	2	0	0	1	10	0	NULL	0	2	0	0	0	0	0	6	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	1	1	0.0	0.0	0.0
-157169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-157169	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
-159833	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-159833	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	2	NULL	1	1	1	4	4	1.0	107.313	1.0
-164009	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-164009	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-164891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-164891	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-165809	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-165809	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-166979	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-166979	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-167609	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-167609	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-168113	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-168113	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-168671	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-168671	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-169319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-169319	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-169841	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-169841	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	2	NULL	1	1	1	1	1	1.0	0.0	1.0
-170489	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-170489	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-171029	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-171029	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	1	NULL	1	1	1	1	1	1.0	2.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+1603	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	90	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1603	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3231	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	207	1	1	4	NULL	NULL	NULL	NULL	NULL	196	5	37	10	14	5	1	NULL	NULL	0	0	0	0	0	0	1	0	0	0	0	0	14	0	NULL	19	4	0	NULL	6	0	207	NULL	0	0	4	2	5	5	0.0	384.696	0.0
+3231	1	159	16	36	1	0	9	41	17	NULL	1	2	0	0	0	0	0	42	5	4	4	3	1	1	0	0	0	0	0	0	0	0	1	0	0	0	0	0	2	0	2	9	2	0	2	6	0	NULL	0	NULL	0	4	2	2	2	0.0	64.725	0.0
+8559	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+8559	1	12	0	6	0	0	1	10	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	1	0	1	1	1	0.0	0.0	0.0
+9225	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	0	0	2	NULL	NULL	NULL	NULL	NULL	22	1	0	0	0	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	9	0	NULL	9	9	0	NULL	9	0	221	NULL	0	0	2	1	1	1	0.0	28.5293	0.0
+9225	1	109	0	26	0	0	6	25	60	NULL	0	2	0	0	0	0	0	42	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	0	4	13	9	0	1	10	0	NULL	0	NULL	0	2	1	1	1	0.0	43.1851	0.0
+9635	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	84	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+9635	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+43145	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+43145	1	12	0	2	0	0	1	10	0	NULL	0	2	0	0	0	0	0	6	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	1	1	0.0	0.0	0.0
+157169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+157169	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
+159833	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+159833	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	2	NULL	1	1	1	4	4	1.0	107.313	1.0
+164009	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+164009	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+164891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+164891	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+165809	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+165809	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+166979	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+166979	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+167609	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+167609	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+168113	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+168113	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+168671	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+168671	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+169319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+169319	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+169841	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+169841	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	2	NULL	1	1	1	1	1	1.0	0.0	1.0
+170489	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+170489	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+171029	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+171029	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	1	NULL	1	1	1	1	1	1.0	2.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 1603	0	1603
diff --git a/src/test/out/c11-decldef.c b/src/test/out/c11-decldef.c
index ec65e83c..5ac0a73a 100644
--- a/src/test/out/c11-decldef.c
+++ b/src/test/out/c11-decldef.c
@@ -1127,19 +1127,19 @@ FID	NAME	RO
 6	_ansi.h	1
 7	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	1	1	NULL	NULL	NULL	NULL	NULL	102	12	11	0	2	0	2	0	0	0	0	0	0	0	0	0	0	0	0	22	12	NULL	46	8	3	NULL	17	0	NULL	NULL	2	0	3	0	0	0	0	0
-4	1	400	0	102	0	0	30	34	31	NULL	1	1	0	2	0	0	1	108	12	11	0	2	0	2	0	0	0	0	0	0	0	0	0	0	0	0	11	6	2	25	8	3	1	18	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
-5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	45	47	56	148	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	1	1	NULL	NULL	NULL	NULL	NULL	102	12	11	0	2	0	2	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	22	12	NULL	46	8	3	NULL	17	0	NULL	NULL	2	0	3	0	0	0	0	0
+4	1	400	0	102	0	0	30	34	31	NULL	1	1	0	2	0	0	1	108	12	11	0	2	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	11	6	2	25	8	3	1	18	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
+5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	45	47	56	148	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -1282,41 +1282,41 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 132605	5	9480	5	9493
 133025	5	9511	5	9528
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	67	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1353	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	0	1	NULL	NULL	NULL	NULL	NULL	10	2	1	1	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	155	NULL	0	0	1	1	1	1	0.0	8.0	0.0
-1353	1	37	0	13	0	0	4	15	9	NULL	0	1	0	0	0	0	0	10	2	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	2	0	1	3	2	0	1	3	0	NULL	0	NULL	0	1	1	1	1	0.0	8.0	0.0
-3551	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	1	NULL	NULL	NULL	NULL	NULL	9	1	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	162	NULL	1	0	1	1	1	1	0.0	4.75489	0.0
-3551	1	29	0	9	0	0	2	24	14	NULL	0	1	0	0	0	0	0	9	1	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	0	1	1	1	1	0.0	4.75489	0.0
-7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	59	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-122245	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-122245	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
-124317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-124317	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
-127565	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-127565	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-128251	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-128251	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-128965	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-128965	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-129875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-129875	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-130365	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-130365	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-130757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-130757	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-131191	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-131191	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-131695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-131695	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-132101	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132101	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-132605	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132605	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-133025	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-133025	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	67	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1353	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	0	1	NULL	NULL	NULL	NULL	NULL	10	2	1	1	1	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	155	NULL	0	0	1	1	1	1	0.0	8.0	0.0
+1353	1	37	0	13	0	0	4	15	9	NULL	0	1	0	0	0	0	0	10	2	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	1	3	2	0	1	3	0	NULL	0	NULL	0	1	1	1	1	0.0	8.0	0.0
+3551	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	1	NULL	NULL	NULL	NULL	NULL	9	1	1	1	0	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	162	NULL	1	0	1	1	1	1	0.0	4.75489	0.0
+3551	1	29	0	9	0	0	2	24	14	NULL	0	1	0	0	0	0	0	9	1	1	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	0	1	1	1	1	0.0	4.75489	0.0
+7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	59	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+122245	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+122245	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
+124317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+124317	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
+127565	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+127565	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+128251	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+128251	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+128965	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+128965	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+129875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+129875	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+130365	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+130365	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+130757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+130757	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+131191	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+131191	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+131695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+131695	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+132101	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132101	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+132605	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132605	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+133025	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+133025	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 1247	0	1247
diff --git a/src/test/out/c12-call_graph.c b/src/test/out/c12-call_graph.c
index 2fce25c0..cbebaa1c 100644
--- a/src/test/out/c12-call_graph.c
+++ b/src/test/out/c12-call_graph.c
@@ -1190,19 +1190,19 @@ FID	NAME	RO
 6	_ansi.h	1
 7	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	0	1	2	NULL	NULL	NULL	NULL	NULL	158	10	8	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	8	66	0	NULL	130	19	0	NULL	21	0	NULL	NULL	9	0	0	0	0	0	0	0
-4	1	412	0	95	0	0	20	58	159	NULL	1	2	0	2	0	1	0	158	3	10	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	1	26	0	9	39	19	0	1	22	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
-5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	45	47	56	148	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	33	0	1	2	NULL	NULL	NULL	NULL	NULL	158	10	8	0	4	0	2	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	8	66	0	NULL	130	19	0	NULL	21	0	NULL	NULL	9	0	0	0	0	0	0	0
+4	1	412	0	95	0	0	20	58	159	NULL	1	2	0	2	0	1	0	158	3	10	0	4	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	1	26	0	9	39	19	0	1	22	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	602	72	84	0	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
+5	1	9551	5558	760	0	60	274	77	326	NULL	1	3	0	58	6	13	31	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	45	47	56	148	45	3	46	94	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+7	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -1359,57 +1359,57 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 132605	5	9480	5	9493
 133025	5	9511	5	9528
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-429	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-429	1	64	0	20	0	0	2	58	33	NULL	1	1	0	0	0	0	0	20	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	5	1	0	0	3	0	NULL	3	NULL	0	0	1	1	1	0.0	14.0	0.0
-1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	69	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1843	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	155	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
-1843	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-2151	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	157	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-2151	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2459	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	159	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-2459	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	161	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-2767	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3075	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	163	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-3075	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	165	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-3425	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3775	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	167	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
-3775	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-4125	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	169	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
-4125	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4321	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	2	NULL	NULL	NULL	NULL	NULL	25	2	0	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	8	6	0	NULL	6	0	169	NULL	0	0	3	1	1	1	0.0	39.8631	0.0
-4321	1	92	0	27	0	0	3	47	17	NULL	0	2	0	0	0	0	0	25	2	0	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	0	8	0	0	8	6	0	0	6	0	NULL	0	NULL	0	3	1	1	1	0.0	39.8631	0.0
-7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	61	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-122245	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-122245	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
-124317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-124317	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
-127565	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-127565	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-128251	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-128251	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-128965	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-128965	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-129875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-129875	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-130365	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-130365	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-130757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-130757	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-131191	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-131191	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-131695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-131695	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-132101	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132101	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-132605	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132605	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-133025	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-133025	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+429	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+429	1	64	0	20	0	0	2	58	33	NULL	1	1	0	0	0	0	0	20	1	2	1	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	5	1	0	0	3	0	NULL	3	NULL	0	0	1	1	1	0.0	14.0	0.0
+1247	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	69	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1247	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1843	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	155	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
+1843	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+2151	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	157	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+2151	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2459	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	159	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+2459	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2767	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	161	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+2767	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3075	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	163	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+3075	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	165	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+3425	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3775	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	167	NULL	2	1	0	1	1	1	0.0	4.75489	0.0
+3775	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+4125	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	2	0	0	NULL	2	0	169	NULL	2	0	0	1	1	1	0.0	4.75489	0.0
+4125	1	0	0	0	0	0	0	0	0	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4321	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	2	NULL	NULL	NULL	NULL	NULL	25	2	0	0	4	0	2	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	8	6	0	NULL	6	0	169	NULL	0	0	3	1	1	1	0.0	39.8631	0.0
+4321	1	92	0	27	0	0	3	47	17	NULL	0	2	0	0	0	0	0	25	2	0	0	4	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	0	0	8	6	0	0	6	0	NULL	0	NULL	0	3	1	1	1	0.0	39.8631	0.0
+7495	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	61	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+7495	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+122245	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+122245	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
+124317	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+124317	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
+127565	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+127565	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+128251	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+128251	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+128965	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+128965	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+129875	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+129875	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+130365	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+130365	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+130757	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+130757	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+131191	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+131191	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+131695	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+131695	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+132101	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132101	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+132605	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132605	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+133025	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+133025	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 429	0	429
diff --git a/src/test/out/c13-allinc.c b/src/test/out/c13-allinc.c
index ead477f5..cd55eadc 100644
--- a/src/test/out/c13-allinc.c
+++ b/src/test/out/c13-allinc.c
@@ -2833,47 +2833,47 @@ FID	NAME	RO
 20	stdarg.h	1
 21	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	24	0	1	1	NULL	NULL	NULL	NULL	NULL	24	2	1	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	6	0	NULL	10	3	0	NULL	5	0	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	384	0	62	0	0	21	29	117	NULL	1	1	0	15	0	0	0	68	2	1	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	5	3	0	0	5	0	1	15	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-5	1	3850	3104	119	0	23	83	86	0	NULL	0	1	0	22	1	0	20	109	0	10	0	22	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21	21	0	0	20	20	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-6	1	3168	2181	127	0	14	76	79	0	NULL	0	1	0	32	1	0	30	137	0	4	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	31	31	0	0	30	30	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
-7	1	163	54	20	0	2	13	38	35	NULL	0	0	0	5	1	0	3	20	1	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	4	5	1	0	3	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-8	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	14	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-8	1	2548	2341	35	0	3	58	77	99	NULL	0	2	2	6	1	1	0	62	1	3	0	2	0	0	0	1	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	110	16	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	3	0	0	0	0	0
-9	1	3554	2218	192	0	3	90	77	85	NULL	0	3	0	24	1	13	9	477	16	38	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	16	0	23	39	16	0	22	38	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-10	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-10	1	2622	2072	173	0	9	60	77	78	NULL	0	2	0	12	1	0	10	90	4	6	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	4	11	17	2	2	10	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-11	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	0	0	1	NULL	NULL	NULL	NULL	NULL	290	24	56	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-11	1	3077	1916	209	0	3	79	77	45	NULL	0	1	0	10	3	0	2	317	24	56	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	14	7	44	23	1	3	27	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-12	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-12	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-13	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	174	23	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
-13	1	1276	453	124	0	4	52	68	29	NULL	0	2	0	4	1	0	2	193	23	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	0	3	26	23	0	2	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-14	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	597	71	84	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
-14	1	9551	5558	760	0	60	274	77	326	NULL	1	3	5	58	6	13	30	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	45	46	52	143	45	3	45	93	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-15	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-15	1	2370	2229	22	0	3	53	77	26	NULL	0	1	0	3	1	0	1	29	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3	2	7	2	1	1	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-16	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	0	1	1	NULL	NULL	NULL	NULL	NULL	88	21	13	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	18	0	0
-16	1	2677	1926	119	0	4	81	77	89	NULL	1	1	2	14	2	0	9	137	21	13	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	11	13	2	0	10	12	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-17	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	0	1	1	NULL	NULL	NULL	NULL	NULL	134	23	14	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	11	0	0
-17	1	3473	2519	157	0	14	97	77	50	NULL	1	1	5	17	5	0	2	185	24	14	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	13	10	32	9	3	5	17	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-18	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	8	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-18	1	2315	1915	50	0	3	64	77	30	NULL	0	4	5	14	4	1	1	73	3	3	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	8	10	0	2	5	7	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-19	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	48	0	1	2	NULL	NULL	NULL	NULL	NULL	325	35	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	2	4	0	0
-19	1	3496	1964	291	0	8	112	77	60	NULL	1	2	8	17	4	0	5	385	37	40	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	29	22	7	58	29	4	6	39	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-20	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	5	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-20	1	2382	2006	56	0	3	57	81	24	NULL	0	4	0	7	1	4	1	118	1	12	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	6	7	0	1	5	6	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-21	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-21	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	24	0	1	1	NULL	NULL	NULL	NULL	NULL	24	2	1	0	1	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	6	0	NULL	10	3	0	NULL	5	0	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	384	0	62	0	0	21	29	117	NULL	1	1	0	15	0	0	0	68	2	1	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	5	3	0	0	5	0	1	15	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+5	1	3850	3104	119	0	23	83	86	0	NULL	0	1	0	22	1	0	20	109	0	10	0	22	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21	21	0	0	20	20	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+6	1	3168	2181	127	0	14	76	79	0	NULL	0	1	0	32	1	0	30	137	0	4	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	31	31	0	0	30	30	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+7	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
+7	1	163	54	20	0	2	13	38	35	NULL	0	0	0	5	1	0	3	20	1	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	4	5	1	0	3	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+8	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	14	1	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+8	1	2548	2341	35	0	3	58	77	99	NULL	0	2	2	6	1	1	0	62	1	3	0	2	0	0	0	1	0	1	0	0	0	0	0	0	0	0	0	0	1	0	1	2	1	0	1	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	110	16	3	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	3	0	0	0	0	0
+9	1	3554	2218	192	0	3	90	77	85	NULL	0	3	0	24	1	13	9	477	16	38	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	16	0	23	39	16	0	22	38	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+10	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	1	NULL	NULL	NULL	NULL	NULL	27	4	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+10	1	2622	2072	173	0	9	60	77	78	NULL	0	2	0	12	1	0	10	90	4	6	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	4	11	17	2	2	10	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+11	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	25	0	0	1	NULL	NULL	NULL	NULL	NULL	290	24	56	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+11	1	3077	1916	209	0	3	79	77	45	NULL	0	1	0	10	3	0	2	317	24	56	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	14	7	44	23	1	3	27	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+12	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+12	1	2634	2330	52	0	10	60	84	0	NULL	0	0	0	9	1	0	7	35	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	8	0	0	7	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+13	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	0	1	NULL	NULL	NULL	NULL	NULL	174	23	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	0	0	0	0
+13	1	1276	453	124	0	4	52	68	29	NULL	0	2	0	4	1	0	2	193	23	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	0	3	26	23	0	2	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+14	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	26	0	1	1	NULL	NULL	NULL	NULL	NULL	597	71	84	0	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	1	0	3	23	0	0
+14	1	9551	5558	760	0	60	274	77	326	NULL	1	3	5	58	6	13	30	1068	72	126	0	36	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	45	46	52	143	45	3	45	93	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+15	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	21	3	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+15	1	2370	2229	22	0	3	53	77	26	NULL	0	1	0	3	1	0	1	29	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	3	2	7	2	1	1	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+16	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	0	1	1	NULL	NULL	NULL	NULL	NULL	88	21	13	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	18	0	0
+16	1	2677	1926	119	0	4	81	77	89	NULL	1	1	2	14	2	0	9	137	21	13	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	11	13	2	0	10	12	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+17	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	30	0	1	1	NULL	NULL	NULL	NULL	NULL	134	23	14	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	11	0	0
+17	1	3473	2519	157	0	14	97	77	50	NULL	1	1	5	17	5	0	2	185	24	14	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	13	10	32	9	3	5	17	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+18	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	8	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+18	1	2315	1915	50	0	3	64	77	30	NULL	0	4	5	14	4	1	1	73	3	3	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	8	10	0	2	5	7	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+19	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	48	0	1	2	NULL	NULL	NULL	NULL	NULL	325	35	40	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	2	4	0	0
+19	1	3496	1964	291	0	8	112	77	60	NULL	1	2	8	17	4	0	5	385	37	40	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	29	22	7	58	29	4	6	39	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+20	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	5	1	1	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+20	1	2382	2006	56	0	3	57	81	24	NULL	0	4	0	7	1	4	1	118	1	12	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	6	7	0	1	5	6	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+21	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+21	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -3277,77 +3277,77 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 397811	14	9480	14	9493
 399071	14	9511	14	9528
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-3739	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	169	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-3739	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-12987	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	1	NULL	NULL	NULL	NULL	NULL	11	2	0	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	491	NULL	0	0	2	1	1	1	0.0	4.75489	0.0
-12987	1	43	0	9	0	0	3	27	8	NULL	0	1	0	0	0	0	0	11	2	0	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	0	NULL	0	2	1	1	1	0.0	4.75489	0.0
-22475	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	161	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-22475	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-87233	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-87233	1	70	0	12	0	0	3	65	0	NULL	0	4	0	0	0	0	0	27	0	4	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	11.6096	0.0
-91139	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-91139	1	49	0	9	0	0	3	44	0	NULL	0	2	0	0	0	0	0	18	0	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	4.75489	0.0
-93865	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-93865	1	35	0	4	0	0	2	33	0	NULL	0	4	0	0	0	0	0	17	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	8.0	0.0
-94289	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-94289	1	66	0	11	0	0	3	61	0	NULL	0	3	0	0	0	0	0	26	0	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	6.33985	0.0
-98069	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-98069	1	13	0	3	0	0	2	11	0	NULL	0	2	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-102077	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-102077	1	53	0	8	0	0	1	51	0	NULL	0	2	0	0	0	0	0	20	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	2.0	0.0
-119341	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-119341	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-121441	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-121441	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-123541	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-123541	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-125641	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-125641	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-127741	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-127741	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-129841	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-129841	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-132151	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-132151	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-134503	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-134503	1	41	0	6	0	0	1	39	0	NULL	0	3	0	0	0	0	0	23	0	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	10.0	0.0
-136939	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-136939	1	47	0	6	0	0	1	45	0	NULL	0	3	0	0	0	0	0	27	0	6	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	14.0	0.0
-139627	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-139627	1	44	0	6	0	0	1	42	0	NULL	0	3	0	0	0	0	0	25	0	5	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	12.0	0.0
-142189	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-142189	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
-144289	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-144289	1	34	0	4	0	0	1	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	2.0	0.0
-146431	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-146431	1	34	0	5	0	0	2	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	2.0	0.0
-366731	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-366731	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
-372947	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-372947	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
-382691	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-382691	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-384749	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-384749	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-386891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-386891	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
-389621	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-389621	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-391091	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-391091	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-392267	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-392267	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-393569	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-393569	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-395081	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-395081	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-396299	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-396299	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-397811	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-397811	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-399071	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-399071	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+3739	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	169	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+3739	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+12987	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	1	NULL	NULL	NULL	NULL	NULL	11	2	0	0	1	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	491	NULL	0	0	2	1	1	1	0.0	4.75489	0.0
+12987	1	43	0	9	0	0	3	27	8	NULL	0	1	0	0	0	0	0	11	2	0	0	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	0	NULL	0	2	1	1	1	0.0	4.75489	0.0
+22475	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	161	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+22475	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+87233	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+87233	1	70	0	12	0	0	3	65	0	NULL	0	4	0	0	0	0	0	27	0	4	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	11.6096	0.0
+91139	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+91139	1	49	0	9	0	0	3	44	0	NULL	0	2	0	0	0	0	0	18	0	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	4.75489	0.0
+93865	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+93865	1	35	0	4	0	0	2	33	0	NULL	0	4	0	0	0	0	0	17	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	8.0	0.0
+94289	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+94289	1	66	0	11	0	0	3	61	0	NULL	0	3	0	0	0	0	0	26	0	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	6.33985	0.0
+98069	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+98069	1	13	0	3	0	0	2	11	0	NULL	0	2	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+102077	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+102077	1	53	0	8	0	0	1	51	0	NULL	0	2	0	0	0	0	0	20	0	1	1	1	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	2.0	0.0
+119341	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+119341	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+121441	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+121441	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+123541	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+123541	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+125641	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+125641	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+127741	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+127741	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+129841	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+129841	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+132151	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+132151	1	38	0	6	0	0	1	36	0	NULL	0	3	0	0	0	0	0	21	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+134503	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+134503	1	41	0	6	0	0	1	39	0	NULL	0	3	0	0	0	0	0	23	0	4	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	10.0	0.0
+136939	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+136939	1	47	0	6	0	0	1	45	0	NULL	0	3	0	0	0	0	0	27	0	6	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	14.0	0.0
+139627	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+139627	1	44	0	6	0	0	1	42	0	NULL	0	3	0	0	0	0	0	25	0	5	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	12.0	0.0
+142189	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+142189	1	33	0	6	0	0	1	31	0	NULL	0	3	0	0	0	0	0	17	0	2	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	4.75489	0.0
+144289	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+144289	1	34	0	4	0	0	1	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	2.0	0.0
+146431	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+146431	1	34	0	5	0	0	2	32	0	NULL	0	3	0	0	0	0	0	15	0	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	2.0	0.0
+366731	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+366731	1	51	0	8	0	0	1	49	0	NULL	0	3	0	0	0	0	0	28	0	7	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	2	2	0.0	22.4588	0.0
+372947	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+372947	1	211	0	55	0	0	9	41	0	NULL	0	3	0	0	0	0	0	98	0	24	9	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	4	4	0.0	96.794	0.0
+382691	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+382691	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+384749	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+384749	1	32	0	6	0	0	1	30	0	NULL	0	3	0	0	0	0	0	13	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+386891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+386891	1	44	0	4	0	0	1	42	0	NULL	0	3	0	0	0	0	0	19	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	8.0	0.0
+389621	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+389621	1	15	0	3	0	0	2	13	0	NULL	0	2	0	0	0	0	0	7	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+391091	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+391091	1	14	0	3	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+392267	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+392267	1	15	0	2	0	0	1	13	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+393569	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+393569	1	17	0	3	0	0	2	15	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+395081	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+395081	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+396299	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+396299	1	17	0	4	0	0	2	15	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+397811	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+397811	1	14	0	2	0	0	1	12	0	NULL	0	1	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+399071	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+399071	1	18	0	3	0	0	1	16	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 3739	0	3739
diff --git a/src/test/out/c14-namespace.c b/src/test/out/c14-namespace.c
index 7653c8af..154b1929 100644
--- a/src/test/out/c14-namespace.c
+++ b/src/test/out/c14-namespace.c
@@ -220,15 +220,15 @@ FID	NAME	RO
 4	c14-namespace.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	1	2	4	NULL	NULL	NULL	NULL	NULL	133	18	12	0	5	0	0	4	3	0	0	0	0	0	0	1	0	1	4	34	0	NULL	52	1	0	NULL	4	33	NULL	NULL	1	0	0	0	2	2	0	0
-4	1	616	0	231	0	0	29	69	102	NULL	1	3	0	4	0	4	0	169	18	9	0	5	0	0	4	3	0	0	0	0	0	0	1	0	1	4	12	0	10	30	1	0	4	8	11	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	1	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	1	2	4	NULL	NULL	NULL	NULL	NULL	133	18	12	0	5	0	0	NULL	NULL	4	3	0	0	0	0	0	0	1	0	1	4	34	0	NULL	52	1	0	NULL	4	33	NULL	NULL	1	0	0	0	2	2	0	0
+4	1	616	0	231	0	0	29	69	102	NULL	1	3	0	4	0	4	0	169	18	9	0	5	0	0	0	0	4	3	0	0	0	0	0	0	1	0	1	4	12	0	10	30	1	0	4	8	11	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	1	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -284,19 +284,19 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 2259	4	239	4	287
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-849	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-849	1	29	0	5	0	0	1	27	0	NULL	0	3	0	0	0	0	0	12	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	NULL	2	NULL	1	0	1	1	1	0.0	4.75489	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	1	1	4	NULL	NULL	NULL	NULL	NULL	108	14	11	6	5	0	0	4	3	0	0	0	0	0	0	1	0	1	4	13	0	NULL	21	1	0	NULL	4	12	16	NULL	0	1	5	6	7	7	25.0	144.555	150.0
-891	1	306	0	155	0	0	13	42	37	NULL	0	2	0	0	0	0	0	61	9	1	1	1	0	0	3	3	0	0	0	0	0	0	0	0	0	3	7	0	6	18	1	0	4	8	7	NULL	0	NULL	1	5	4	5	5	25.0	66.4386	100.0
-1389	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1389	1	13	0	3	0	0	1	11	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	1	NULL	1	NULL	1	0	1	1	1	0.0	2.0	0.0
-1699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1699	1	40	0	7	0	0	1	38	0	NULL	0	3	0	0	0	0	0	17	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
-2259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-2259	1	49	0	11	0	0	1	47	18	NULL	1	2	0	0	0	0	0	24	5	1	1	3	0	0	1	0	0	0	0	0	0	0	1	0	1	1	0	0	0	0	0	0	0	0	-1	NULL	1	NULL	1	0	3	3	3	0.0	8.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+849	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+849	1	29	0	5	0	0	1	27	0	NULL	0	3	0	0	0	0	0	12	0	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	NULL	2	NULL	1	0	1	1	1	0.0	4.75489	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	49	1	1	4	NULL	NULL	NULL	NULL	NULL	108	14	11	6	5	0	0	NULL	NULL	4	3	0	0	0	0	0	0	1	0	1	4	13	0	NULL	21	1	0	NULL	4	12	16	NULL	0	1	5	6	7	7	25.0	144.555	150.0
+891	1	306	0	155	0	0	13	42	37	NULL	0	2	0	0	0	0	0	61	9	1	1	1	0	0	0	0	3	3	0	0	0	0	0	0	0	0	0	3	7	0	6	18	1	0	4	8	7	NULL	0	NULL	1	5	4	5	5	25.0	66.4386	100.0
+1389	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1389	1	13	0	3	0	0	1	11	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	1	NULL	1	NULL	1	0	1	1	1	0.0	2.0	0.0
+1699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1699	1	40	0	7	0	0	1	38	0	NULL	0	3	0	0	0	0	0	17	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	NULL	1	NULL	1	0	1	1	1	0.0	11.6096	0.0
+2259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+2259	1	49	0	11	0	0	1	47	18	NULL	1	2	0	0	0	0	0	24	5	1	1	3	0	0	0	0	1	0	0	0	0	0	0	0	1	0	1	1	0	0	0	0	0	0	0	0	-1	NULL	1	NULL	1	0	3	3	3	0.0	8.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 849	0	849
diff --git a/src/test/out/c15-fungraph.c b/src/test/out/c15-fungraph.c
index 7ded1bc3..e31042bf 100644
--- a/src/test/out/c15-fungraph.c
+++ b/src/test/out/c15-fungraph.c
@@ -134,15 +134,15 @@ FID	NAME	RO
 4	c15-fungraph.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	0	1	1	NULL	NULL	NULL	NULL	NULL	33	4	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	14	0	NULL	14	5	0	NULL	5	0	NULL	NULL	3	0	0	0	0	0	0	0
-4	1	232	0	63	0	0	11	34	64	NULL	1	1	0	3	0	3	0	56	4	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	7	0	6	13	5	0	3	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	27	0	1	1	NULL	NULL	NULL	NULL	NULL	33	4	0	0	0	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	14	0	NULL	14	5	0	NULL	5	0	NULL	NULL	3	0	0	0	0	0	0	0
+4	1	232	0	63	0	0	11	34	64	NULL	1	1	0	3	0	3	0	56	4	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	7	0	6	13	5	0	3	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -205,23 +205,23 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1319	4	139	4	230
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-89	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-89	1	17	0	3	0	0	1	15	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-399	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-399	1	15	0	3	0	0	1	13	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-749	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-749	1	23	0	3	0	0	1	13	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-999	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	14	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-999	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-1159	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1159	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-1319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	1	NULL	NULL	NULL	NULL	NULL	18	4	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	16	NULL	0	0	4	1	1	1	0.0	8.0	0.0
-1319	1	92	0	43	0	0	5	25	8	NULL	0	1	0	0	0	0	0	18	4	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	3	0	1	4	3	0	1	4	0	NULL	0	NULL	0	4	1	1	1	0.0	8.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+89	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+89	1	17	0	3	0	0	1	15	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+399	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+399	1	15	0	3	0	0	1	13	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+749	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+749	1	23	0	3	0	0	1	13	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	1	0	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+999	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	14	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+999	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+1159	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1159	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+1319	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	1	NULL	NULL	NULL	NULL	NULL	18	4	0	0	0	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	16	NULL	0	0	4	1	1	1	0.0	8.0	0.0
+1319	1	92	0	43	0	0	5	25	8	NULL	0	1	0	0	0	0	0	18	4	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	1	4	3	0	1	4	0	NULL	0	NULL	0	4	1	1	1	0.0	8.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 89	0	89
diff --git a/src/test/out/c16-cond.c b/src/test/out/c16-cond.c
index 9244cf13..f5b8b932 100644
--- a/src/test/out/c16-cond.c
+++ b/src/test/out/c16-cond.c
@@ -277,15 +277,15 @@ FID	NAME	RO
 4	c16-cond.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	415	0	1	4	NULL	NULL	NULL	NULL	NULL	368	10	67	0	27	0	0	0	0	0	0	0	0	0	0	0	0	0	4	2	24	NULL	60	1	5	NULL	7	0	NULL	NULL	1	3	0	0	2	2	0	0
-4	1	1274	350	190	0	2	57	92	265	NULL	1	2	0	7	0	5	2	238	10	26	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	4	1	12	25	43	1	5	7	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	415	0	1	4	NULL	NULL	NULL	NULL	NULL	368	10	67	0	27	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	4	2	24	NULL	60	1	5	NULL	7	0	NULL	NULL	1	3	0	0	2	2	0	0
+4	1	1274	350	190	0	2	57	92	265	NULL	1	2	0	7	0	5	2	238	10	26	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	1	12	25	43	1	5	7	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -352,29 +352,29 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 11819	4	1195	4	1210
 12189	4	1231	4	1272
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2759	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	12	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-2759	1	16	0	7	0	0	2	11	7	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-3439	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
-3439	1	33	0	11	0	0	1	31	0	NULL	0	2	0	0	0	0	0	15	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	0	1	2	2	0.0	11.6096	0.0
-4049	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-4049	1	51	0	9	0	0	1	49	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	2	2	0	NULL	1	NULL	1	1	1	2	2	1.0	18.0947	1.0
-4859	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-4859	1	51	0	10	0	0	1	49	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	2	2	0	NULL	1	NULL	1	1	1	2	2	1.0	18.0947	1.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-5879	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5879	1	52	0	9	0	0	1	50	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	3	3	0	NULL	1	NULL	1	1	1	2	2	1.0	19.6515	1.0
-6699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-6699	1	52	0	10	0	0	1	50	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	3	3	0	NULL	1	NULL	1	1	1	2	2	1.0	19.6515	1.0
-9769	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	394	0	0	4	NULL	NULL	NULL	NULL	NULL	274	1	63	6	24	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	16	0	0	NULL	1	0	20	NULL	1	1	4	1	13	13	16.0	510.282	16.0
-9769	1	120	0	21	0	0	6	26	39	NULL	0	1	0	0	0	0	0	22	1	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	4	8	0	0	4	5	0	NULL	0	NULL	1	4	1	1	1	16.0	28.4346	16.0
-11819	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	21	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-11819	1	16	0	7	0	0	2	11	7	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-12189	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	0	0	3	NULL	NULL	NULL	NULL	NULL	21	1	3	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	3	NULL	3	0	3	NULL	3	0	21	NULL	0	0	3	1	1	1	0.0	18.0947	0.0
-12189	1	42	0	11	0	0	2	37	22	NULL	0	1	0	0	0	0	0	15	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	3	1	4	0	3	1	4	0	NULL	0	NULL	0	3	1	1	1	0.0	13.9316	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2759	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	12	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+2759	1	16	0	7	0	0	2	11	7	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+3439	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	4	0	1	1	1	0.0	0.0	0.0
+3439	1	33	0	11	0	0	1	31	0	NULL	0	2	0	0	0	0	0	15	0	3	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	4	0	1	2	2	0.0	11.6096	0.0
+4049	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+4049	1	51	0	9	0	0	1	49	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	2	2	0	NULL	1	NULL	1	1	1	2	2	1.0	18.0947	1.0
+4859	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+4859	1	51	0	10	0	0	1	49	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	2	2	0	NULL	1	NULL	1	1	1	2	2	1.0	18.0947	1.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+5879	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5879	1	52	0	9	0	0	1	50	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	3	3	0	NULL	1	NULL	1	1	1	2	2	1.0	19.6515	1.0
+6699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+6699	1	52	0	10	0	0	1	50	0	NULL	0	2	0	0	0	0	0	17	0	4	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	3	0	0	3	3	0	NULL	1	NULL	1	1	1	2	2	1.0	19.6515	1.0
+9769	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	394	0	0	4	NULL	NULL	NULL	NULL	NULL	274	1	63	6	24	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	16	0	0	NULL	1	0	20	NULL	1	1	4	1	13	13	16.0	510.282	16.0
+9769	1	120	0	21	0	0	6	26	39	NULL	0	1	0	0	0	0	0	22	1	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	4	8	0	0	4	5	0	NULL	0	NULL	1	4	1	1	1	16.0	28.4346	16.0
+11819	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	21	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+11819	1	16	0	7	0	0	2	11	7	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+12189	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	29	0	0	3	NULL	NULL	NULL	NULL	NULL	21	1	3	2	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	3	NULL	3	0	3	NULL	3	0	21	NULL	0	0	3	1	1	1	0.0	18.0947	0.0
+12189	1	42	0	11	0	0	2	37	22	NULL	0	1	0	0	0	0	0	15	1	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	3	1	4	0	3	1	4	0	NULL	0	NULL	0	3	1	1	1	0.0	13.9316	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c17-inline.c b/src/test/out/c17-inline.c
index bdcce79f..182122bd 100644
--- a/src/test/out/c17-inline.c
+++ b/src/test/out/c17-inline.c
@@ -219,15 +219,15 @@ FID	NAME	RO
 4	c17-inline.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	47	0	1	1	NULL	NULL	NULL	NULL	NULL	144	5	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	12	8	NULL	60	3	2	NULL	25	0	NULL	NULL	3	2	0	0	0	0	0	0
-4	1	547	0	88	0	0	10	58	47	NULL	1	1	0	0	0	0	0	143	5	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	4	0	30	3	2	0	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	47	0	1	1	NULL	NULL	NULL	NULL	NULL	144	5	20	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	12	8	NULL	60	3	2	NULL	25	0	NULL	NULL	3	2	0	0	0	0	0	0
+4	1	547	0	88	0	0	10	58	47	NULL	1	1	0	0	0	0	0	143	5	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	4	0	30	3	2	0	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -281,19 +281,19 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 5029	4	543	4	545
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	12	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-1699	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2789	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	14	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-2789	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3879	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-3879	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5029	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-5029	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1699	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	12	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+1699	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2789	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	14	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+2789	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3879	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+3879	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5029	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+5029	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	79
diff --git a/src/test/out/c18-typeof.c b/src/test/out/c18-typeof.c
index 2a2d6bbf..d56be9f7 100644
--- a/src/test/out/c18-typeof.c
+++ b/src/test/out/c18-typeof.c
@@ -334,15 +334,15 @@ FID	NAME	RO
 4	c18-typeof.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	2	2	NULL	NULL	NULL	NULL	NULL	210	33	20	0	12	0	1	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	104	1	0	NULL	21	0	NULL	NULL	1	0	0	0	1	1	0	0
-4	1	853	127	266	0	2	57	82	58	NULL	1	2	0	4	0	3	1	225	30	16	0	10	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	13	57	1	0	4	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	2	2	NULL	NULL	NULL	NULL	NULL	210	33	20	0	12	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	104	1	0	NULL	21	0	NULL	NULL	1	0	0	0	1	1	0	0
+4	1	853	127	266	0	2	57	82	58	NULL	1	2	0	4	0	3	1	225	30	16	0	10	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	13	57	1	0	4	25	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -399,19 +399,19 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 3919	4	400	4	851
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1789	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1789	1	106	0	55	0	0	4	34	18	NULL	1	2	0	0	0	0	0	32	3	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	8	0	0	1	3	0	NULL	2	NULL	1	0	1	2	2	0.0	31.0196	0.0
-3019	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-3019	1	16	0	5	0	0	1	14	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	2.0	0.0
-3349	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-3349	1	17	0	5	0	0	1	15	0	NULL	0	1	0	0	0	0	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	2	NULL	1	0	1	1	1	0.0	0.0	0.0
-3919	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	1	2	NULL	NULL	NULL	NULL	NULL	197	31	20	4	12	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	51	0	0	NULL	20	0	13	NULL	0	0	3	1	3	3	0.0	429.104	0.0
-3919	1	452	0	166	0	0	35	36	20	NULL	0	2	0	0	0	0	0	143	25	11	2	10	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	42	0	0	4	22	0	NULL	0	NULL	0	3	1	1	1	0.0	320.51	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1789	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1789	1	106	0	55	0	0	4	34	18	NULL	1	2	0	0	0	0	0	32	3	4	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	8	0	0	1	3	0	NULL	2	NULL	1	0	1	2	2	0.0	31.0196	0.0
+3019	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+3019	1	16	0	5	0	0	1	14	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	1	NULL	1	0	1	1	1	0.0	2.0	0.0
+3349	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+3349	1	17	0	5	0	0	1	15	0	NULL	0	1	0	0	0	0	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	2	NULL	1	0	1	1	1	0.0	0.0	0.0
+3919	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	1	2	NULL	NULL	NULL	NULL	NULL	197	31	20	4	12	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	51	0	0	NULL	20	0	13	NULL	0	0	3	1	3	3	0.0	429.104	0.0
+3919	1	452	0	166	0	0	35	36	20	NULL	0	2	0	0	0	0	0	143	25	11	2	10	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	42	0	0	4	22	0	NULL	0	NULL	0	3	1	1	1	0.0	320.51	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c19-initializers.c b/src/test/out/c19-initializers.c
index 450dfb25..3a5e8f3f 100644
--- a/src/test/out/c19-initializers.c
+++ b/src/test/out/c19-initializers.c
@@ -355,15 +355,15 @@ FID	NAME	RO
 4	c19-initializers.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	115	0	3	2	NULL	NULL	NULL	NULL	NULL	474	22	123	0	48	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	38	1	0	NULL	8	0	NULL	NULL	1	0	0	0	5	9	0	0
-4	1	1458	282	409	1	8	55	58	122	NULL	3	2	0	0	0	0	0	473	22	123	0	48	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	19	1	0	0	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	115	0	3	2	NULL	NULL	NULL	NULL	NULL	474	22	123	0	48	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	38	1	0	NULL	8	0	NULL	NULL	1	0	0	0	5	9	0	0
+4	1	1458	282	409	1	8	55	58	122	NULL	3	2	0	0	0	0	0	473	22	123	0	48	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	19	1	0	0	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -414,13 +414,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-59	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	115	0	2	2	NULL	NULL	NULL	NULL	NULL	468	22	123	4	48	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	18	0	0	NULL	7	0	9	NULL	0	0	0	1	1	1	0.0	1111.82	0.0
-59	1	1443	282	404	1	8	52	58	122	NULL	2	2	0	0	0	0	0	468	22	123	4	48	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	0	0	7	0	NULL	0	NULL	0	0	1	1	1	0.0	1111.82	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+59	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	115	0	2	2	NULL	NULL	NULL	NULL	NULL	468	22	123	4	48	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	18	0	0	NULL	7	0	9	NULL	0	0	0	1	1	1	0.0	1111.82	0.0
+59	1	1443	282	404	1	8	52	58	122	NULL	2	2	0	0	0	0	0	468	22	123	4	48	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	0	0	7	0	NULL	0	NULL	0	0	1	1	1	0.0	1111.82	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 59	0	59
diff --git a/src/test/out/c20-implicit-fdecl.c b/src/test/out/c20-implicit-fdecl.c
index bd002381..1a7dc994 100644
--- a/src/test/out/c20-implicit-fdecl.c
+++ b/src/test/out/c20-implicit-fdecl.c
@@ -176,15 +176,15 @@ FID	NAME	RO
 4	c20-implicit-fdecl.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	54	0	1	1	NULL	NULL	NULL	NULL	NULL	150	20	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	4	54	8	NULL	54	13	2	NULL	13	0	NULL	NULL	9	2	0	0	0	0	0	0
-4	1	356	0	109	0	0	32	34	54	NULL	1	1	0	0	0	0	0	149	20	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	4	27	4	0	27	13	2	0	13	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	54	0	1	1	NULL	NULL	NULL	NULL	NULL	150	20	0	0	4	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	4	54	8	NULL	54	13	2	NULL	13	0	NULL	NULL	9	2	0	0	0	0	0	0
+4	1	356	0	109	0	0	32	34	54	NULL	1	1	0	0	0	0	0	149	20	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	27	4	0	27	13	2	0	13	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -257,33 +257,33 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 3259	4	335	4	354
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	26	6	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	5	3	0	NULL	4	0	13	NULL	0	0	3	1	1	1	0.0	13.9316	0.0
-279	1	62	0	24	0	0	7	17	11	NULL	0	1	0	0	0	0	0	26	6	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	5	1	0	5	4	1	0	4	0	NULL	0	NULL	0	3	1	1	1	0.0	13.9316	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	28	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1059	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	4	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1059	1	11	0	2	0	0	0	0	4	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-1339	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	4	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1339	1	11	0	2	0	0	0	0	4	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-1619	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	4	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1619	1	11	0	2	0	0	0	0	4	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2019	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	13	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	NULL	3	3	0	NULL	3	0	21	NULL	0	2	3	1	1	1	36.0	4.75489	36.0
-2019	1	24	0	5	0	0	0	0	5	NULL	0	1	0	0	0	0	0	13	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	3	3	0	0	3	0	NULL	0	NULL	2	3	1	1	1	36.0	4.75489	36.0
-2369	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	0	2	0	1	1	1	0.0	0.0	0.0
-2369	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	2	0	1	1	1	0.0	0.0	0.0
-2509	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-2509	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-2649	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-2649	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-2749	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	29	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-2749	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-2889	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	13	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	NULL	3	3	0	NULL	3	0	31	NULL	0	1	3	1	1	1	9.0	4.75489	9.0
-2889	1	23	0	5	0	0	0	0	5	NULL	0	1	0	0	0	0	0	13	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	3	3	0	0	3	0	NULL	0	NULL	1	3	1	1	1	9.0	4.75489	9.0
-3259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	1	NULL	NULL	NULL	NULL	NULL	9	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	33	NULL	0	0	2	1	1	1	0.0	2.0	0.0
-3259	1	20	0	9	0	0	3	7	7	NULL	0	1	0	0	0	0	0	9	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	0	NULL	0	2	1	1	1	0.0	2.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	20	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	26	6	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	5	3	0	NULL	4	0	13	NULL	0	0	3	1	1	1	0.0	13.9316	0.0
+279	1	62	0	24	0	0	7	17	11	NULL	0	1	0	0	0	0	0	26	6	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	5	1	0	5	4	1	0	4	0	NULL	0	NULL	0	3	1	1	1	0.0	13.9316	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	28	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1059	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	4	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1059	1	11	0	2	0	0	0	0	4	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+1339	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	4	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1339	1	11	0	2	0	0	0	0	4	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+1619	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	4	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1619	1	11	0	2	0	0	0	0	4	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2019	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	13	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	3	0	NULL	3	3	0	NULL	3	0	21	NULL	0	2	3	1	1	1	36.0	4.75489	36.0
+2019	1	24	0	5	0	0	0	0	5	NULL	0	1	0	0	0	0	0	13	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	3	3	0	0	3	0	NULL	0	NULL	2	3	1	1	1	36.0	4.75489	36.0
+2369	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	0	2	0	1	1	1	0.0	0.0	0.0
+2369	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	2	0	1	1	1	0.0	0.0	0.0
+2509	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+2509	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+2649	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+2649	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+2749	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	29	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+2749	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+2889	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	13	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	3	0	NULL	3	3	0	NULL	3	0	31	NULL	0	1	3	1	1	1	9.0	4.75489	9.0
+2889	1	23	0	5	0	0	0	0	5	NULL	0	1	0	0	0	0	0	13	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	3	3	0	0	3	0	NULL	0	NULL	1	3	1	1	1	9.0	4.75489	9.0
+3259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	6	0	0	1	NULL	NULL	NULL	NULL	NULL	9	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	33	NULL	0	0	2	1	1	1	0.0	2.0	0.0
+3259	1	20	0	9	0	0	3	7	7	NULL	0	1	0	0	0	0	0	9	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	0	NULL	0	2	1	1	1	0.0	2.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	20	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 49	0	49
diff --git a/src/test/out/c21-chunking.c b/src/test/out/c21-chunking.c
index 5c868741..d1090730 100644
--- a/src/test/out/c21-chunking.c
+++ b/src/test/out/c21-chunking.c
@@ -115,15 +115,15 @@ FID	NAME	RO
 4	c21-chunking.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	0	NULL	NULL	NULL	NULL	NULL	27	5	6	0	0	2	3	0	0	0	0	0	0	0	0	0	0	0	0	10	0	NULL	10	5	0	NULL	5	0	NULL	NULL	0	0	5	0	0	0	0	0
-4	1	177	66	19	1	4	10	38	14	NULL	0	0	0	0	0	0	0	26	5	6	0	0	2	3	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	5	5	0	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	0	NULL	NULL	NULL	NULL	NULL	27	5	6	0	0	2	3	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	10	0	NULL	10	5	0	NULL	5	0	NULL	NULL	0	0	5	0	0	0	0	0
+4	1	177	66	19	1	4	10	38	14	NULL	0	0	0	0	0	0	0	26	5	6	0	0	2	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	5	5	0	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -169,11 +169,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	21	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	13	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	21	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	13	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c22-typeof.c b/src/test/out/c22-typeof.c
index 7da1d7e3..71cb895f 100644
--- a/src/test/out/c22-typeof.c
+++ b/src/test/out/c22-typeof.c
@@ -98,15 +98,15 @@ FID	NAME	RO
 4	c22-typeof.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	12	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	NULL	6	0	2	NULL	2	0	NULL	NULL	0	0	0	1	0	0	0	0
-4	1	43	0	10	0	0	3	25	13	NULL	0	1	0	0	0	0	0	11	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	3	0	2	0	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	12	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	6	NULL	6	0	2	NULL	2	0	NULL	NULL	0	0	0	1	0	0	0	0
+4	1	43	0	10	0	0	3	25	13	NULL	0	1	0	0	0	0	0	11	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	3	0	2	0	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -152,11 +152,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c23-opt-designator.c b/src/test/out/c23-opt-designator.c
index 76693d72..acddd448 100644
--- a/src/test/out/c23-opt-designator.c
+++ b/src/test/out/c23-opt-designator.c
@@ -125,15 +125,15 @@ FID	NAME	RO
 4	c23-opt-designator.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	2	0	NULL	NULL	NULL	NULL	NULL	39	5	4	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	0	NULL	NULL	0	0	1	0	2	4	0	0
-4	1	107	0	45	0	0	11	16	39	NULL	2	0	0	0	0	0	0	38	5	4	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	2	0	NULL	NULL	NULL	NULL	NULL	39	5	4	0	3	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	0	NULL	NULL	0	0	1	0	2	4	0	0
+4	1	107	0	45	0	0	11	16	39	NULL	2	0	0	0	0	0	0	38	5	4	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -181,11 +181,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c24-goto-expr.c b/src/test/out/c24-goto-expr.c
index 20fd1e83..4a58f2be 100644
--- a/src/test/out/c24-goto-expr.c
+++ b/src/test/out/c24-goto-expr.c
@@ -107,15 +107,15 @@ FID	NAME	RO
 4	c24-goto-expr.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	32	5	6	0	1	0	0	0	0	0	0	0	0	0	0	0	0	3	0	2	0	NULL	10	1	0	NULL	2	3	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	85	0	35	0	0	11	16	16	NULL	1	1	0	0	0	0	0	31	5	6	0	1	0	0	0	0	0	0	0	0	0	0	0	0	3	0	1	0	0	5	1	0	0	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	32	5	6	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	3	0	2	0	NULL	10	1	0	NULL	2	3	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	85	0	35	0	0	11	16	16	NULL	1	1	0	0	0	0	0	31	5	6	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	1	0	0	5	1	0	0	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -166,13 +166,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	1	NULL	NULL	NULL	NULL	NULL	27	5	6	4	1	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	NULL	4	0	0	NULL	1	0	9	NULL	0	0	0	1	2	2	0.0	28.4346	0.0
-9	1	75	0	32	0	0	9	16	16	NULL	0	1	0	0	0	0	0	27	5	6	4	1	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	4	0	0	0	1	0	NULL	0	NULL	0	0	1	2	2	0.0	28.4346	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	0	1	NULL	NULL	NULL	NULL	NULL	27	5	6	4	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	3	0	0	0	NULL	4	0	0	NULL	1	0	9	NULL	0	0	0	1	2	2	0.0	28.4346	0.0
+9	1	75	0	32	0	0	9	16	16	NULL	0	1	0	0	0	0	0	27	5	6	4	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	4	0	0	0	1	0	NULL	0	NULL	0	0	1	2	2	0.0	28.4346	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 9	0	9
diff --git a/src/test/out/c25-nested-fun.c b/src/test/out/c25-nested-fun.c
index f2c66c1f..fbc041f5 100644
--- a/src/test/out/c25-nested-fun.c
+++ b/src/test/out/c25-nested-fun.c
@@ -204,15 +204,15 @@ FID	NAME	RO
 4	c25-nested-fun.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	0	2	1	NULL	NULL	NULL	NULL	NULL	147	12	3	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	6	26	0	NULL	62	7	0	NULL	18	0	NULL	NULL	7	0	0	0	0	0	0	0
-4	1	460	87	107	2	0	24	52	67	NULL	2	1	0	0	0	0	0	146	12	3	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	6	13	0	0	31	7	0	0	18	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	62	0	2	1	NULL	NULL	NULL	NULL	NULL	147	12	3	0	6	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	6	26	0	NULL	62	7	0	NULL	18	0	NULL	NULL	7	0	0	0	0	0	0	0
+4	1	460	87	107	2	0	24	52	67	NULL	2	1	0	0	0	0	0	146	12	3	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6	13	0	0	31	7	0	0	18	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -278,31 +278,31 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 3729	4	390	4	410
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-49	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	11	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-49	1	12	0	3	0	0	0	0	5	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-329	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	13	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-329	1	12	0	3	0	0	0	0	5	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-629	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	15	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-629	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-809	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-809	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	25	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-989	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-989	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-1169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	21	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1169	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-1369	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	3	1	NULL	NULL	NULL	NULL	NULL	69	6	2	1	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	5	0	NULL	18	5	0	NULL	15	0	23	NULL	0	0	7	1	1	1	0.0	97.7023	0.0
-1369	1	255	87	53	2	0	13	48	29	NULL	3	1	0	0	0	0	0	69	6	2	1	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	5	0	0	18	5	0	0	15	0	NULL	0	NULL	0	7	1	1	1	0.0	97.7023	0.0
-1719	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	23	NULL	2	1	0	1	1	1	0.0	0.0	0.0
-1719	1	13	0	4	0	0	0	0	5	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
-2659	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	12	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	4	0	0	NULL	3	0	24	NULL	2	1	1	1	1	1	1.0	6.33985	1.0
-2659	1	28	0	7	0	0	0	0	11	NULL	0	1	0	0	0	0	0	12	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	4	0	0	0	3	0	NULL	0	NULL	1	1	1	1	1	1.0	6.33985	1.0
-3729	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	8	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	2	1	0	NULL	2	0	25	NULL	2	1	1	1	1	1	1.0	4.75489	1.0
-3729	1	21	0	6	0	0	0	0	11	NULL	0	1	0	0	0	0	0	8	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	2	1	0	0	2	0	NULL	0	NULL	1	1	1	1	1	1.0	4.75489	1.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	17	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+49	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	11	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+49	1	12	0	3	0	0	0	0	5	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+329	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	13	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+329	1	12	0	3	0	0	0	0	5	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+629	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	15	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+629	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+809	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+809	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	25	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+989	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+989	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+1169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	21	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1169	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+1369	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	3	1	NULL	NULL	NULL	NULL	NULL	69	6	2	1	3	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	5	0	NULL	18	5	0	NULL	15	0	23	NULL	0	0	7	1	1	1	0.0	97.7023	0.0
+1369	1	255	87	53	2	0	13	48	29	NULL	3	1	0	0	0	0	0	69	6	2	1	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	5	0	0	18	5	0	0	15	0	NULL	0	NULL	0	7	1	1	1	0.0	97.7023	0.0
+1719	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	4	1	0	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	0	0	0	NULL	0	0	23	NULL	2	1	0	1	1	1	0.0	0.0	0.0
+1719	1	13	0	4	0	0	0	0	5	NULL	0	0	0	0	0	0	0	4	1	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	NULL	0	NULL	1	0	1	1	1	0.0	0.0	0.0
+2659	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	12	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	4	0	0	NULL	3	0	24	NULL	2	1	1	1	1	1	1.0	6.33985	1.0
+2659	1	28	0	7	0	0	0	0	11	NULL	0	1	0	0	0	0	0	12	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	4	0	0	0	3	0	NULL	0	NULL	1	1	1	1	1	1.0	6.33985	1.0
+3729	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	1	NULL	NULL	NULL	NULL	NULL	8	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	2	1	0	NULL	2	0	25	NULL	2	1	1	1	1	1	1.0	4.75489	1.0
+3729	1	21	0	6	0	0	0	0	11	NULL	0	1	0	0	0	0	0	8	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	2	1	0	0	2	0	NULL	0	NULL	1	1	1	1	1	1.0	4.75489	1.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	17	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 49	0	49
diff --git a/src/test/out/c26-file-metric.c b/src/test/out/c26-file-metric.c
index 0be44910..2b020a46 100644
--- a/src/test/out/c26-file-metric.c
+++ b/src/test/out/c26-file-metric.c
@@ -284,15 +284,15 @@ FID	NAME	RO
 4	c26-file-metric.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	2	1	NULL	NULL	NULL	NULL	NULL	106	19	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	22	NULL	30	4	11	NULL	15	0	NULL	NULL	1	1	2	3	3	8	2	6
-4	1	587	28	172	0	1	54	33	32	NULL	2	1	4	9	1	3	1	156	20	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	4	11	4	19	4	11	4	19	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	2	1	NULL	NULL	NULL	NULL	NULL	106	19	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	8	22	NULL	30	4	11	NULL	15	0	NULL	NULL	1	1	2	3	3	8	2	6
+4	1	587	28	172	0	1	54	33	32	NULL	2	1	4	9	1	3	1	156	20	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	4	11	4	19	4	11	4	19	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -350,21 +350,21 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 4859	4	498	4	510
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2209	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	0	NULL	NULL	NULL	NULL	NULL	14	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-2209	1	50	0	22	0	0	5	14	18	NULL	1	0	0	0	0	0	0	14	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2989	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-2989	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4299	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-4299	1	7	0	3	0	0	1	5	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4529	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-4529	1	13	0	4	0	0	1	11	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-4859	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-4859	1	13	0	5	0	0	1	11	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2209	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	0	NULL	NULL	NULL	NULL	NULL	14	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+2209	1	50	0	22	0	0	5	14	18	NULL	1	0	0	0	0	0	0	14	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2989	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+2989	1	2	0	1	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4299	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+4299	1	7	0	3	0	0	1	5	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4529	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+4529	1	13	0	4	0	0	1	11	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+4859	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+4859	1	13	0	5	0	0	1	11	0	NULL	0	1	0	0	0	0	0	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	2	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c27-fun-metric.c b/src/test/out/c27-fun-metric.c
index 1a6cd330..95566089 100644
--- a/src/test/out/c27-fun-metric.c
+++ b/src/test/out/c27-fun-metric.c
@@ -147,15 +147,15 @@ FID	NAME	RO
 4	c27-fun-metric.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	2	2	1	NULL	NULL	NULL	NULL	NULL	197	47	1	0	41	1	0	32	1	1	2	1	0	1	1	1	0	0	0	4	0	NULL	14	2	0	NULL	5	0	NULL	NULL	2	0	0	0	0	0	0	0
-4	1	493	32	165	0	1	41	86	87	NULL	2	1	2	6	2	3	0	158	28	2	0	22	1	0	13	1	1	3	1	0	1	1	1	0	0	0	2	0	7	14	2	0	3	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	2	2	1	NULL	NULL	NULL	NULL	NULL	197	47	1	0	41	1	0	NULL	NULL	32	1	1	2	1	0	1	1	1	0	0	0	4	0	NULL	14	2	0	NULL	5	0	NULL	NULL	2	0	0	0	0	0	0	0
+4	1	493	32	165	0	1	41	86	87	NULL	2	1	2	6	2	3	0	158	28	2	0	22	1	0	0	0	13	1	1	3	1	0	1	1	1	0	0	0	2	0	7	14	2	0	3	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -211,21 +211,21 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 4529	4	470	4	491
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-469	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	2	1	1	NULL	NULL	NULL	NULL	NULL	139	35	1	1	30	1	0	22	1	1	2	1	0	1	1	1	0	0	0	0	0	NULL	4	0	0	NULL	2	0	11	NULL	0	0	2	27	27	28	0.0	183.149	0.0
-469	1	250	0	89	0	0	23	25	63	NULL	1	1	0	6	2	3	0	77	12	1	1	10	1	0	3	1	1	3	1	0	0	1	0	0	0	0	0	0	5	9	0	0	3	5	0	NULL	0	NULL	0	2	6	6	8	0.0	85.8367	0.0
-819	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-819	1	11	0	6	0	0	1	9	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-2259	1	49	0	20	0	0	4	13	9	NULL	1	1	0	0	0	0	0	16	4	0	0	1	0	0	0	0	0	0	0	0	1	0	1	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	1	1	3	3	3	1.0	2.0	3.0
-2869	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
-2869	1	75	0	24	0	0	1	73	0	NULL	0	1	0	0	0	0	0	41	10	0	0	11	0	0	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	3	0	11	11	11	0.0	38.0537	0.0
-4529	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	0	0	1	NULL	NULL	NULL	NULL	NULL	46	12	0	0	11	0	0	10	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	16	NULL	0	0	1	11	11	11	0.0	43.0196	0.0
-4529	1	22	0	10	0	0	3	8	7	NULL	0	1	0	0	0	0	0	8	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	0	1	2	0	NULL	0	NULL	0	1	1	1	1	0.0	2.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+469	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	2	1	1	NULL	NULL	NULL	NULL	NULL	139	35	1	1	30	1	0	NULL	NULL	22	1	1	2	1	0	1	1	1	0	0	0	0	0	NULL	4	0	0	NULL	2	0	11	NULL	0	0	2	27	27	28	0.0	183.149	0.0
+469	1	250	0	89	0	0	23	25	63	NULL	1	1	0	6	2	3	0	77	12	1	1	10	1	0	0	0	3	1	1	3	1	0	0	1	0	0	0	0	0	0	5	9	0	0	3	5	0	NULL	0	NULL	0	2	6	6	8	0.0	85.8367	0.0
+819	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+819	1	11	0	6	0	0	1	9	0	NULL	0	1	0	0	0	0	0	5	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	0	0	1	1	1	0.0	0.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+2259	1	49	0	20	0	0	4	13	9	NULL	1	1	0	0	0	0	0	16	4	0	0	1	0	0	0	0	0	0	0	0	0	0	1	0	1	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	1	1	3	3	3	1.0	2.0	3.0
+2869	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	3	0	1	1	1	0.0	0.0	0.0
+2869	1	75	0	24	0	0	1	73	0	NULL	0	1	0	0	0	0	0	41	10	0	0	11	0	0	0	0	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	3	0	11	11	11	0.0	38.0537	0.0
+4529	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	64	0	0	1	NULL	NULL	NULL	NULL	NULL	46	12	0	0	11	0	0	NULL	NULL	10	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	16	NULL	0	0	1	11	11	11	0.0	43.0196	0.0
+4529	1	22	0	10	0	0	3	8	7	NULL	0	1	0	0	0	0	0	8	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	0	1	2	0	NULL	0	NULL	0	1	1	1	1	0.0	2.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 469	0	469
diff --git a/src/test/out/c28-fun-nparam.c b/src/test/out/c28-fun-nparam.c
index bc3f7b54..2b140ab7 100644
--- a/src/test/out/c28-fun-nparam.c
+++ b/src/test/out/c28-fun-nparam.c
@@ -202,15 +202,15 @@ FID	NAME	RO
 4	c28-fun-nparam.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	1	1	NULL	NULL	NULL	NULL	NULL	111	16	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	20	0	NULL	54	10	0	NULL	21	0	NULL	NULL	10	0	0	0	0	0	0	0
-4	1	477	0	156	0	0	62	30	31	NULL	1	1	0	0	0	0	0	110	16	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10	0	0	27	10	0	0	21	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	28	0	1	1	NULL	NULL	NULL	NULL	NULL	111	16	2	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	20	0	NULL	54	10	0	NULL	21	0	NULL	NULL	10	0	0	0	0	0	0	0
+4	1	477	0	156	0	0	62	30	31	NULL	1	1	0	0	0	0	0	110	16	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10	0	0	27	10	0	0	21	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -276,31 +276,31 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 4379	4	468	4	475
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	11	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-9	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-339	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	13	NULL	1	0	0	1	1	1	0.0	0.0	0.0
-339	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-869	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	15	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-869	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	26	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1599	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1599	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1959	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	1	0	0	1	1	1	0.0	0.0	0.0
-1959	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2519	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	21	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-2519	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3239	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	23	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-3239	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3589	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	25	NULL	1	0	0	1	1	1	0.0	0.0	0.0
-3589	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3949	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-3949	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4379	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	29	NULL	2	0	0	1	1	1	0.0	0.0	0.0
-4379	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	18	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+9	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	11	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+9	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+339	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	13	NULL	1	0	0	1	1	1	0.0	0.0	0.0
+339	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+869	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	15	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+869	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	26	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1599	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1599	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1959	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	1	0	0	1	1	1	0.0	0.0	0.0
+1959	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2519	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	21	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+2519	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3239	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	23	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+3239	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3589	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	25	NULL	1	0	0	1	1	1	0.0	0.0	0.0
+3589	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3949	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	27	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+3949	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4379	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	3	0	0	0	NULL	NULL	NULL	NULL	NULL	2	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	29	NULL	2	0	0	1	1	1	0.0	0.0	0.0
+4379	1	8	0	6	0	0	2	3	4	NULL	0	0	0	0	0	0	0	2	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	18	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 9	0	9
diff --git a/src/test/out/c29-spec-decl.c b/src/test/out/c29-spec-decl.c
index f61f8029..0367408d 100644
--- a/src/test/out/c29-spec-decl.c
+++ b/src/test/out/c29-spec-decl.c
@@ -113,15 +113,15 @@ FID	NAME	RO
 4	c29-spec-decl.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	1	1	NULL	NULL	NULL	NULL	NULL	37	2	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	NULL	12	0	1	NULL	5	0	NULL	NULL	0	2	0	0	0	0	0	0
-4	1	189	0	41	0	0	11	44	38	NULL	1	1	0	0	0	0	0	36	2	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	6	0	1	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	1	1	NULL	NULL	NULL	NULL	NULL	37	2	3	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	4	NULL	12	0	1	NULL	5	0	NULL	NULL	0	2	0	0	0	0	0	0
+4	1	189	0	41	0	0	11	44	38	NULL	1	1	0	0	0	0	0	36	2	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	6	0	1	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -167,13 +167,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1219	4	67	4	96
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1219	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	0	NULL	NULL	NULL	NULL	NULL	7	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	10	NULL	1	0	0	1	1	1	0.0	2.0	0.0
-1219	1	30	0	9	0	0	2	25	12	NULL	0	0	0	0	0	0	0	7	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	2.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1219	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	11	0	0	0	NULL	NULL	NULL	NULL	NULL	7	1	1	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	10	NULL	1	0	0	1	1	1	0.0	2.0	0.0
+1219	1	30	0	9	0	0	2	25	12	NULL	0	0	0	0	0	0	0	7	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	2.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c30-compile-const.c b/src/test/out/c30-compile-const.c
index 9176b8c4..3ed06ee3 100644
--- a/src/test/out/c30-compile-const.c
+++ b/src/test/out/c30-compile-const.c
@@ -264,15 +264,15 @@ FID	NAME	RO
 4	c30-compile-const.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	0	NULL	NULL	NULL	NULL	NULL	266	34	34	0	59	0	0	0	0	0	0	0	0	0	0	0	0	0	0	76	0	NULL	76	34	0	NULL	34	0	NULL	NULL	0	0	34	0	0	0	0	0
-4	1	714	77	169	1	0	39	79	14	NULL	0	0	0	0	0	0	0	265	34	34	0	59	0	0	0	0	0	0	0	0	0	0	0	0	0	0	38	0	0	38	34	0	0	34	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	14	0	0	0	NULL	NULL	NULL	NULL	NULL	266	34	34	0	59	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	76	0	NULL	76	34	0	NULL	34	0	NULL	NULL	0	0	34	0	0	0	0	0
+4	1	714	77	169	1	0	39	79	14	NULL	0	0	0	0	0	0	0	265	34	34	0	59	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	38	0	0	38	34	0	0	34	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -318,11 +318,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	50	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	42	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	50	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	42	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c31-serial-initializers.c b/src/test/out/c31-serial-initializers.c
index 89279cce..38703490 100644
--- a/src/test/out/c31-serial-initializers.c
+++ b/src/test/out/c31-serial-initializers.c
@@ -370,15 +370,15 @@ FID	NAME	RO
 4	c31-serial-initializers.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	0	3	1	NULL	NULL	NULL	NULL	NULL	404	25	59	0	49	0	1	0	0	0	0	0	0	0	0	0	0	0	0	28	10	NULL	46	13	3	NULL	20	0	NULL	NULL	1	1	12	0	4	9	0	0
-4	1	2032	120	445	27	0	118	76	73	NULL	3	1	0	13	0	0	0	455	25	59	0	49	0	14	0	0	0	0	0	0	0	0	0	0	0	0	14	5	0	23	13	3	0	20	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	57	0	3	1	NULL	NULL	NULL	NULL	NULL	404	25	59	0	49	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	28	10	NULL	46	13	3	NULL	20	0	NULL	NULL	1	1	12	0	4	9	0	0
+4	1	2032	120	445	27	0	118	76	73	NULL	3	1	0	13	0	0	0	455	25	59	0	49	0	14	0	0	0	0	0	0	0	0	0	0	0	0	0	0	14	5	0	23	13	3	0	20	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -428,15 +428,15 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 15259	4	1539	4	1706
 19079	4	1941	4	2028
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	29	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	21	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-15259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	0	2	0	NULL	NULL	NULL	NULL	NULL	21	1	3	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	35	NULL	0	0	0	1	1	1	0.0	18.0947	0.0
-15259	1	168	28	33	4	0	8	68	57	NULL	2	0	0	1	0	0	0	25	1	3	2	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	18.0947	0.0
-19079	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	2	0	NULL	NULL	NULL	NULL	NULL	20	1	3	2	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	2	0	1	NULL	2	0	38	NULL	2	0	0	1	1	1	0.0	13.9316	0.0
-19079	1	88	0	19	0	0	4	53	35	NULL	2	0	0	0	0	0	0	20	1	3	2	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	2	0	1	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	13.9316	0.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	29	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	21	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+15259	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	40	0	2	0	NULL	NULL	NULL	NULL	NULL	21	1	3	2	2	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	2	1	0	NULL	2	0	35	NULL	0	0	0	1	1	1	0.0	18.0947	0.0
+15259	1	168	28	33	4	0	8	68	57	NULL	2	0	0	1	0	0	0	25	1	3	2	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	2	1	0	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	18.0947	0.0
+19079	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	2	0	NULL	NULL	NULL	NULL	NULL	20	1	3	2	1	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	2	0	1	NULL	2	0	38	NULL	2	0	0	1	1	1	0.0	13.9316	0.0
+19079	1	88	0	19	0	0	4	53	35	NULL	2	0	0	0	0	0	0	20	1	3	2	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	2	0	1	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	13.9316	0.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c32-array-init.c b/src/test/out/c32-array-init.c
index 25709617..c58b8f1b 100644
--- a/src/test/out/c32-array-init.c
+++ b/src/test/out/c32-array-init.c
@@ -91,15 +91,15 @@ FID	NAME	RO
 4	c32-array-init.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1530	0	2	0	NULL	NULL	NULL	NULL	NULL	1021	1	1	0	478	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	0	NULL	NULL	0	0	1	0	0	0	0	0
-4	1	2394	0	512	0	0	30	86	1530	NULL	2	0	0	0	0	0	0	1020	1	1	0	478	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1530	0	2	0	NULL	NULL	NULL	NULL	NULL	1021	1	1	0	478	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	1	0	NULL	1	0	NULL	NULL	0	0	1	0	0	0	0	0
+4	1	2394	0	512	0	0	30	86	1530	NULL	2	0	0	0	0	0	0	1020	1	1	0	478	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -145,11 +145,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c33-incomplete-initializer.c b/src/test/out/c33-incomplete-initializer.c
index 3297420a..1cc10355 100644
--- a/src/test/out/c33-incomplete-initializer.c
+++ b/src/test/out/c33-incomplete-initializer.c
@@ -167,15 +167,15 @@ FID	NAME	RO
 4	c33-incomplete-initializer.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	52	0	3	1	NULL	NULL	NULL	NULL	NULL	80	11	14	0	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	2	6	NULL	14	1	1	NULL	4	0	NULL	NULL	1	0	0	0	2	6	0	0
-4	1	454	0	179	0	0	25	42	61	NULL	3	1	0	0	0	0	0	79	11	14	0	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	1	3	0	7	1	1	0	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	52	0	3	1	NULL	NULL	NULL	NULL	NULL	80	11	14	0	4	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	6	NULL	14	1	1	NULL	4	0	NULL	NULL	1	0	0	0	2	6	0	0
+4	1	454	0	179	0	0	25	42	61	NULL	3	1	0	0	0	0	0	79	11	14	0	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	3	0	7	1	1	0	4	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -223,11 +223,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	4	259	4	452
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	44	0	2	0	NULL	NULL	NULL	NULL	NULL	37	3	11	4	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	2	NULL	5	0	1	NULL	3	0	16	NULL	0	0	0	1	1	1	0.0	69.1886	0.0
-891	1	194	0	92	0	0	9	32	49	NULL	2	0	0	0	0	0	0	37	3	11	4	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	5	0	1	0	3	0	NULL	0	NULL	0	0	1	1	1	0.0	69.1886	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	44	0	2	0	NULL	NULL	NULL	NULL	NULL	37	3	11	4	4	0	1	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	2	NULL	5	0	1	NULL	3	0	16	NULL	0	0	0	1	1	1	0.0	69.1886	0.0
+891	1	194	0	92	0	0	9	32	49	NULL	2	0	0	0	0	0	0	37	3	11	4	4	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	5	0	1	0	3	0	NULL	0	NULL	0	0	1	1	1	0.0	69.1886	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c34-idflink.c b/src/test/out/c34-idflink.c
index d20f508d..bda71d0b 100644
--- a/src/test/out/c34-idflink.c
+++ b/src/test/out/c34-idflink.c
@@ -140,15 +140,15 @@ FID	NAME	RO
 4	c34-idflink.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	0	1	1	NULL	NULL	NULL	NULL	NULL	107	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	20	NULL	30	5	5	NULL	8	0	NULL	NULL	3	5	0	0	0	0	0	0
-4	1	381	36	91	0	2	26	24	37	NULL	1	1	0	0	0	0	0	106	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	10	0	15	5	5	0	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	31	0	1	1	NULL	NULL	NULL	NULL	NULL	107	7	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	18	20	NULL	30	5	5	NULL	8	0	NULL	NULL	3	5	0	0	0	0	0	0
+4	1	381	36	91	0	2	26	24	37	NULL	1	1	0	0	0	0	0	106	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9	10	0	15	5	5	0	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -208,25 +208,25 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 3669	4	377	4	379
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-349	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	10	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-349	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-839	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	12	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-839	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	7	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	22	0	7	0	0	2	17	10	NULL	0	1	0	0	0	0	0	7	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1329	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	13	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1329	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1819	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	15	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1819	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2479	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-2479	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2899	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-2899	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-3669	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	22	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-3669	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	13	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+349	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	10	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+349	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+839	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	12	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+839	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	1	NULL	NULL	NULL	NULL	NULL	7	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	0	0	NULL	1	0	20	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	22	0	7	0	0	2	17	10	NULL	0	1	0	0	0	0	0	7	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	1	1	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1329	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	13	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1329	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1819	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	15	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1819	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2479	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+2479	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2899	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+2899	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+3669	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	22	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+3669	1	3	0	2	0	0	0	0	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	13	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 349	0	129
diff --git a/src/test/out/c35-enum-designator.c b/src/test/out/c35-enum-designator.c
index 68c90c60..fc148021 100644
--- a/src/test/out/c35-enum-designator.c
+++ b/src/test/out/c35-enum-designator.c
@@ -163,15 +163,15 @@ FID	NAME	RO
 4	c35-enum-designator.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	73	0	1	0	NULL	NULL	NULL	NULL	NULL	78	3	11	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	32	NULL	34	1	10	NULL	11	0	NULL	NULL	0	0	1	0	0	0	2	10
-4	1	183	0	90	0	0	24	14	80	NULL	1	0	0	0	0	0	0	77	3	11	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	16	0	17	1	10	0	11	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	73	0	1	0	NULL	NULL	NULL	NULL	NULL	78	3	11	0	9	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	32	NULL	34	1	10	NULL	11	0	NULL	NULL	0	0	1	0	0	0	2	10
+4	1	183	0	90	0	0	24	14	80	NULL	1	0	0	0	0	0	0	77	3	11	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	16	0	17	1	10	0	11	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -217,11 +217,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c36-endlabel.c b/src/test/out/c36-endlabel.c
index dfbc95f1..037937c0 100644
--- a/src/test/out/c36-endlabel.c
+++ b/src/test/out/c36-endlabel.c
@@ -131,15 +131,15 @@ FID	NAME	RO
 4	c36-endlabel.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	2	1	NULL	NULL	NULL	NULL	NULL	76	10	3	0	7	0	0	1	1	3	3	2	0	1	0	0	0	0	0	4	0	NULL	18	1	0	NULL	2	8	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	405	137	112	0	4	30	63	52	NULL	2	1	0	0	0	0	0	75	10	3	0	7	0	0	1	1	3	3	2	0	1	0	0	0	0	0	2	0	0	9	1	0	0	2	4	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	2	1	NULL	NULL	NULL	NULL	NULL	76	10	3	0	7	0	0	NULL	NULL	1	1	3	3	2	0	1	0	0	0	0	0	4	0	NULL	18	1	0	NULL	2	8	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	405	137	112	0	4	30	63	52	NULL	2	1	0	0	0	0	0	75	10	3	0	7	0	0	0	0	1	1	3	3	2	0	1	0	0	0	0	0	2	0	0	9	1	0	0	2	4	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -187,11 +187,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	4	8	4	403
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	1	1	NULL	NULL	NULL	NULL	NULL	71	10	3	1	7	0	0	1	1	3	3	2	0	1	0	0	0	0	0	1	0	NULL	8	1	0	NULL	2	4	16	NULL	0	1	1	6	6	6	1.0	59.7947	6.0
-891	1	396	137	109	0	4	28	63	52	NULL	1	1	0	0	0	0	0	71	10	3	1	7	0	0	1	1	3	3	2	0	1	0	0	0	0	0	1	0	0	8	1	0	0	2	4	NULL	0	NULL	1	1	6	6	6	1.0	59.7947	6.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	41	1	1	1	NULL	NULL	NULL	NULL	NULL	71	10	3	1	7	0	0	NULL	NULL	1	1	3	3	2	0	1	0	0	0	0	0	1	0	NULL	8	1	0	NULL	2	4	16	NULL	0	1	1	6	6	6	1.0	59.7947	6.0
+891	1	396	137	109	0	4	28	63	52	NULL	1	1	0	0	0	0	0	71	10	3	1	7	0	0	0	0	1	1	3	3	2	0	1	0	0	0	0	0	1	0	0	8	1	0	0	2	4	NULL	0	NULL	1	1	6	6	6	1.0	59.7947	6.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	9
diff --git a/src/test/out/c37-yyvalid.c b/src/test/out/c37-yyvalid.c
index c796f3a8..a8ba7dc5 100644
--- a/src/test/out/c37-yyvalid.c
+++ b/src/test/out/c37-yyvalid.c
@@ -160,15 +160,15 @@ FID	NAME	RO
 4	c37-yyvalid.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	1	2	1	NULL	NULL	NULL	NULL	NULL	74	17	0	0	2	0	0	1	1	0	0	0	0	1	0	1	0	0	0	2	0	NULL	38	1	0	NULL	13	0	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	381	112	118	0	1	32	61	21	NULL	2	1	0	0	0	0	0	73	17	0	0	2	0	0	1	1	0	0	0	0	1	0	1	0	0	0	1	0	0	19	1	0	0	13	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	1	2	1	NULL	NULL	NULL	NULL	NULL	74	17	0	0	2	0	0	NULL	NULL	1	1	0	0	0	0	1	0	1	0	0	0	2	0	NULL	38	1	0	NULL	13	0	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	381	112	118	0	1	32	61	21	NULL	2	1	0	0	0	0	0	73	17	0	0	2	0	0	0	0	1	1	0	0	0	0	1	0	1	0	0	0	1	0	0	19	1	0	0	13	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -219,13 +219,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1209	4	129	4	379
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1209	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	1	1	1	NULL	NULL	NULL	NULL	NULL	69	17	0	0	2	0	0	1	1	0	0	0	0	1	0	1	0	0	0	0	0	NULL	18	0	0	NULL	12	0	9	NULL	0	0	0	4	4	4	0.0	76.1471	0.0
-1209	1	251	0	111	0	0	26	18	21	NULL	1	1	0	0	0	0	0	69	17	0	0	2	0	0	1	1	0	0	0	0	1	0	1	0	0	0	0	0	0	18	0	0	0	12	0	NULL	0	NULL	0	0	4	4	4	0.0	76.1471	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1209	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	17	1	1	1	NULL	NULL	NULL	NULL	NULL	69	17	0	0	2	0	0	NULL	NULL	1	1	0	0	0	0	1	0	1	0	0	0	0	0	NULL	18	0	0	NULL	12	0	9	NULL	0	0	0	4	4	4	0.0	76.1471	0.0
+1209	1	251	0	111	0	0	26	18	21	NULL	1	1	0	0	0	0	0	69	17	0	0	2	0	0	0	0	1	1	0	0	0	0	1	0	1	0	0	0	0	0	0	18	0	0	0	12	0	NULL	0	NULL	0	0	4	4	4	0.0	76.1471	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c38-thread-local.c b/src/test/out/c38-thread-local.c
index 8e8a9602..91d8f022 100644
--- a/src/test/out/c38-thread-local.c
+++ b/src/test/out/c38-thread-local.c
@@ -96,15 +96,15 @@ FID	NAME	RO
 4	c38-thread-local.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	0	0	NULL	NULL	NULL	NULL	NULL	8	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	2	0	NULL	2	0	NULL	NULL	0	0	2	0	0	0	0	0
-4	1	40	0	7	0	0	2	21	8	NULL	0	0	0	0	0	0	0	7	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	0	0	NULL	NULL	NULL	NULL	NULL	8	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	2	0	NULL	2	0	NULL	NULL	0	0	2	0	0	0	0	0
+4	1	40	0	7	0	0	2	21	8	NULL	0	0	0	0	0	0	0	7	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -150,11 +150,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c39-complex.c b/src/test/out/c39-complex.c
index ee59270c..0290085a 100644
--- a/src/test/out/c39-complex.c
+++ b/src/test/out/c39-complex.c
@@ -769,17 +769,17 @@ FID	NAME	RO
 5	complex.h	1
 6	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	1	1	NULL	NULL	NULL	NULL	NULL	66	11	11	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	26	2	0	NULL	12	0	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	487	177	64	0	2	24	76	22	NULL	1	1	0	1	0	0	0	64	11	7	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	6	19	2	0	5	17	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	0	1	NULL	NULL	NULL	NULL	NULL	570	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-5	1	4036	769	741	0	3	103	71	68	NULL	0	1	0	8	1	0	6	601	66	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	66	0	131	197	66	0	6	72	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-6	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	1	1	NULL	NULL	NULL	NULL	NULL	66	11	11	0	7	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	4	0	NULL	26	2	0	NULL	12	0	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	487	177	64	0	2	24	76	22	NULL	1	1	0	1	0	0	0	64	11	7	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	0	6	19	2	0	5	17	0	1	1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	23	0	0	1	NULL	NULL	NULL	NULL	NULL	570	66	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+5	1	4036	769	741	0	3	103	71	68	NULL	0	1	0	8	1	0	6	601	66	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	66	0	131	197	66	0	6	72	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+6	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+6	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -914,13 +914,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 1069	6	95	6	117
 6425	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-825	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	60	11	11	4	7	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	12	1	0	NULL	11	0	147	NULL	0	0	1	1	1	1	0.0	133.783	0.0
-825	1	411	141	57	0	1	20	76	18	NULL	0	1	0	0	0	0	0	56	11	7	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	6	18	1	0	5	16	0	NULL	0	NULL	0	1	1	1	1	0.0	124.864	0.0
-1069	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	82	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-1069	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-6425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	74	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-6425	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+825	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	18	0	0	1	NULL	NULL	NULL	NULL	NULL	60	11	11	4	7	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	1	0	NULL	12	1	0	NULL	11	0	147	NULL	0	0	1	1	1	1	0.0	133.783	0.0
+825	1	411	141	57	0	1	20	76	18	NULL	0	1	0	0	0	0	0	56	11	7	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	6	18	1	0	5	16	0	NULL	0	NULL	0	1	1	1	1	0.0	124.864	0.0
+1069	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	82	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+1069	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+6425	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	74	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+6425	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 825	0	529
diff --git a/src/test/out/c40-gnu-asm.c b/src/test/out/c40-gnu-asm.c
index c57a2702..eb4af0cc 100644
--- a/src/test/out/c40-gnu-asm.c
+++ b/src/test/out/c40-gnu-asm.c
@@ -135,15 +135,15 @@ FID	NAME	RO
 4	c40-gnu-asm.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	0	1	2	NULL	NULL	NULL	NULL	NULL	96	10	2	0	2	0	13	0	0	0	0	0	0	0	0	0	0	1	0	2	0	NULL	16	1	0	NULL	4	3	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	374	19	129	0	3	14	72	35	NULL	1	2	0	0	0	0	0	95	10	2	0	2	0	13	0	0	0	0	0	0	0	0	0	0	1	0	1	0	0	8	1	0	0	4	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	0	1	2	NULL	NULL	NULL	NULL	NULL	96	10	2	0	2	0	13	NULL	NULL	0	0	0	0	0	0	0	0	0	0	1	0	2	0	NULL	16	1	0	NULL	4	3	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	374	19	129	0	3	14	72	35	NULL	1	2	0	0	0	0	0	95	10	2	0	2	0	13	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	0	8	1	0	0	4	1	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -191,11 +191,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	4	12	4	372
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	0	0	2	NULL	NULL	NULL	NULL	NULL	90	10	2	1	2	0	13	0	0	0	0	0	0	0	0	0	0	1	0	0	0	NULL	7	0	0	NULL	3	1	16	NULL	0	0	0	1	1	1	0.0	28.4346	0.0
-891	1	361	19	125	0	3	12	72	35	NULL	0	2	0	0	0	0	0	90	10	2	1	2	0	13	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	7	0	0	0	3	1	NULL	0	NULL	0	0	1	1	1	0.0	28.4346	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	34	0	0	2	NULL	NULL	NULL	NULL	NULL	90	10	2	1	2	0	13	NULL	NULL	0	0	0	0	0	0	0	0	0	0	1	0	0	0	NULL	7	0	0	NULL	3	1	16	NULL	0	0	0	1	1	1	0.0	28.4346	0.0
+891	1	361	19	125	0	3	12	72	35	NULL	0	2	0	0	0	0	0	90	10	2	1	2	0	13	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	7	0	0	0	3	1	NULL	0	NULL	0	0	1	1	1	0.0	28.4346	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	49
diff --git a/src/test/out/c41-unnamed-struct-init.c b/src/test/out/c41-unnamed-struct-init.c
index 524b60a5..9e9e2035 100644
--- a/src/test/out/c41-unnamed-struct-init.c
+++ b/src/test/out/c41-unnamed-struct-init.c
@@ -197,15 +197,15 @@ FID	NAME	RO
 4	c41-unnamed-struct-init.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	0	3	1	NULL	NULL	NULL	NULL	NULL	182	23	26	0	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	10	0	NULL	10	3	0	NULL	3	0	NULL	NULL	1	0	2	0	6	8	0	0
-4	1	574	49	164	0	1	37	48	33	NULL	3	1	0	0	0	0	0	181	23	26	0	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	5	3	0	0	3	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	0	3	1	NULL	NULL	NULL	NULL	NULL	182	23	26	0	13	0	3	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	10	0	NULL	10	3	0	NULL	3	0	NULL	NULL	1	0	2	0	6	8	0	0
+4	1	574	49	164	0	1	37	48	33	NULL	3	1	0	0	0	0	0	181	23	26	0	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	5	3	0	0	3	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -256,13 +256,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 2449	4	252	4	573
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2449	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	0	2	1	NULL	NULL	NULL	NULL	NULL	125	10	25	2	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	13	NULL	0	0	0	1	1	1	0.0	163.499	0.0
-2449	1	322	0	99	0	0	13	48	33	NULL	2	1	0	0	0	0	0	125	10	25	2	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	163.499	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	18	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2449	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	32	0	2	1	NULL	NULL	NULL	NULL	NULL	125	10	25	2	13	0	3	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	2	2	0	NULL	2	0	13	NULL	0	0	0	1	1	1	0.0	163.499	0.0
+2449	1	322	0	99	0	0	13	48	33	NULL	2	1	0	0	0	0	0	125	10	25	2	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	2	2	0	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	163.499	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c42-funargptr.c b/src/test/out/c42-funargptr.c
index 602ac057..e580de09 100644
--- a/src/test/out/c42-funargptr.c
+++ b/src/test/out/c42-funargptr.c
@@ -194,15 +194,15 @@ FID	NAME	RO
 4	c42-funargptr.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	44	1	2	3	NULL	NULL	NULL	NULL	NULL	120	11	9	0	5	0	0	1	1	0	0	0	0	0	0	0	0	0	6	12	0	NULL	54	5	0	NULL	18	0	NULL	NULL	4	0	1	0	0	0	0	0
-4	1	361	0	83	0	0	29	60	46	NULL	2	3	0	0	0	0	0	119	11	9	0	5	0	0	1	1	0	0	0	0	0	0	0	0	0	6	6	0	0	27	5	0	0	18	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	44	1	2	3	NULL	NULL	NULL	NULL	NULL	120	11	9	0	5	0	0	NULL	NULL	1	1	0	0	0	0	0	0	0	0	0	6	12	0	NULL	54	5	0	NULL	18	0	NULL	NULL	4	0	1	0	0	0	0	0
+4	1	361	0	83	0	0	29	60	46	NULL	2	3	0	0	0	0	0	119	11	9	0	5	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	6	6	0	0	27	5	0	0	18	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -258,21 +258,21 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 3069	4	320	4	341
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-79	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	11	NULL	1	1	0	1	1	1	0.0	4.75489	0.0
-79	1	17	0	6	0	0	1	16	9	NULL	0	0	0	0	0	0	0	6	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	1	0	1	1	1	0.0	4.75489	0.0
-619	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	0	1	NULL	NULL	NULL	NULL	NULL	21	5	2	2	2	0	0	1	1	0	0	0	0	0	0	0	0	0	2	1	0	NULL	5	1	0	NULL	4	0	13	NULL	3	0	1	2	3	3	0.0	27.0	0.0
-619	1	81	0	25	0	0	9	25	17	NULL	0	1	0	0	0	0	0	21	5	2	2	2	0	0	1	1	0	0	0	0	0	0	0	0	0	2	1	0	0	5	1	0	0	4	0	NULL	0	NULL	0	1	2	3	3	0.0	27.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	22	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-2079	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	7	2	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	15	NULL	1	0	0	1	1	1	0.0	4.75489	0.0
-2079	1	22	0	7	0	0	4	10	6	NULL	0	0	0	0	0	0	0	7	2	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	4.75489	0.0
-2879	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	0	1	1	NULL	NULL	NULL	NULL	NULL	14	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	4	0	0	NULL	3	0	19	NULL	1	0	1	1	1	1	0.0	6.33985	0.0
-2879	1	39	0	10	0	0	4	18	22	NULL	1	1	0	0	0	0	0	14	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	4	0	0	0	3	0	NULL	0	NULL	0	1	1	1	1	0.0	6.33985	0.0
-3069	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	20	NULL	1	1	0	1	1	1	0.0	4.75489	0.0
-3069	1	22	0	9	0	0	3	17	10	NULL	0	0	0	0	0	0	0	6	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	1	0	1	1	1	0.0	4.75489	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	14	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+79	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	11	NULL	1	1	0	1	1	1	0.0	4.75489	0.0
+79	1	17	0	6	0	0	1	16	9	NULL	0	0	0	0	0	0	0	6	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	1	0	1	1	1	0.0	4.75489	0.0
+619	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	1	0	1	NULL	NULL	NULL	NULL	NULL	21	5	2	2	2	0	0	NULL	NULL	1	1	0	0	0	0	0	0	0	0	0	2	1	0	NULL	5	1	0	NULL	4	0	13	NULL	3	0	1	2	3	3	0.0	27.0	0.0
+619	1	81	0	25	0	0	9	25	17	NULL	0	1	0	0	0	0	0	21	5	2	2	2	0	0	0	0	1	1	0	0	0	0	0	0	0	0	0	2	1	0	0	5	1	0	0	4	0	NULL	0	NULL	0	1	2	3	3	0.0	27.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	22	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+2079	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	0	NULL	NULL	NULL	NULL	NULL	7	2	1	1	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	15	NULL	1	0	0	1	1	1	0.0	4.75489	0.0
+2079	1	22	0	7	0	0	4	10	6	NULL	0	0	0	0	0	0	0	7	2	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	0	0	1	1	1	0.0	4.75489	0.0
+2879	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	19	0	1	1	NULL	NULL	NULL	NULL	NULL	14	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	4	0	0	NULL	3	0	19	NULL	1	0	1	1	1	1	0.0	6.33985	0.0
+2879	1	39	0	10	0	0	4	18	22	NULL	1	1	0	0	0	0	0	14	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	4	0	0	0	3	0	NULL	0	NULL	0	1	1	1	1	0.0	6.33985	0.0
+3069	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	9	0	0	0	NULL	NULL	NULL	NULL	NULL	6	1	1	1	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	1	0	0	NULL	1	0	0	NULL	1	0	20	NULL	1	1	0	1	1	1	0.0	4.75489	0.0
+3069	1	22	0	9	0	0	3	17	10	NULL	0	0	0	0	0	0	0	6	1	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	1	0	0	0	1	0	NULL	0	NULL	1	0	1	1	1	0.0	4.75489	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	14	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 79	0	79
diff --git a/src/test/out/c43-generic.c b/src/test/out/c43-generic.c
index 5c671ed2..a9e5ab19 100644
--- a/src/test/out/c43-generic.c
+++ b/src/test/out/c43-generic.c
@@ -131,15 +131,15 @@ FID	NAME	RO
 4	c43-generic.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	2	1	NULL	NULL	NULL	NULL	NULL	56	7	2	0	4	0	0	0	0	0	0	1	0	0	0	0	0	0	1	2	0	NULL	18	1	0	NULL	5	0	NULL	NULL	1	0	0	0	1	1	0	0
-4	1	209	0	63	0	0	16	23	42	NULL	2	1	0	0	0	0	0	55	7	2	0	4	0	0	0	0	0	0	1	0	0	0	0	0	0	1	1	0	0	9	1	0	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	2	1	NULL	NULL	NULL	NULL	NULL	56	7	2	0	4	0	0	NULL	NULL	0	0	0	0	1	0	0	0	0	0	0	1	2	0	NULL	18	1	0	NULL	5	0	NULL	NULL	1	0	0	0	1	1	0	0
+4	1	209	0	63	0	0	16	23	42	NULL	2	1	0	0	0	0	0	55	7	2	0	4	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	1	1	0	0	9	1	0	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -187,13 +187,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-49	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	1	1	NULL	NULL	NULL	NULL	NULL	49	7	2	1	4	0	0	0	0	0	0	1	0	0	0	0	0	0	1	0	0	NULL	8	0	0	NULL	4	0	11	NULL	0	0	0	1	1	1	0.0	44.379	0.0
-49	1	196	0	61	0	0	14	23	42	NULL	1	1	0	0	0	0	0	49	7	2	1	4	0	0	0	0	0	0	1	0	0	0	0	0	0	1	0	0	0	8	0	0	0	4	0	NULL	0	NULL	0	0	1	1	1	0.0	44.379	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+49	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	35	0	1	1	NULL	NULL	NULL	NULL	NULL	49	7	2	1	4	0	0	NULL	NULL	0	0	0	0	1	0	0	0	0	0	0	1	0	0	NULL	8	0	0	NULL	4	0	11	NULL	0	0	0	1	1	1	0.0	44.379	0.0
+49	1	196	0	61	0	0	14	23	42	NULL	1	1	0	0	0	0	0	49	7	2	1	4	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	1	0	0	0	8	0	0	0	4	0	NULL	0	NULL	0	0	1	1	1	0.0	44.379	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 49	0	49
diff --git a/src/test/out/c44-array-enum-init.c b/src/test/out/c44-array-enum-init.c
index 5c2a5d5e..b45fc06e 100644
--- a/src/test/out/c44-array-enum-init.c
+++ b/src/test/out/c44-array-enum-init.c
@@ -155,15 +155,15 @@ FID	NAME	RO
 4	c44-array-enum-init.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	24	0	1	0	NULL	NULL	NULL	NULL	NULL	123	9	14	0	19	0	0	0	0	0	0	0	0	0	0	0	0	0	0	14	22	NULL	36	1	4	NULL	5	0	NULL	NULL	0	0	7	0	0	0	2	4
-4	1	476	92	73	7	1	30	54	27	NULL	1	0	0	0	0	0	0	122	9	14	0	19	0	0	0	0	0	0	0	0	0	0	0	0	0	0	7	11	0	18	1	4	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	24	0	1	0	NULL	NULL	NULL	NULL	NULL	123	9	14	0	19	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	14	22	NULL	36	1	4	NULL	5	0	NULL	NULL	0	0	7	0	0	0	2	4
+4	1	476	92	73	7	1	30	54	27	NULL	1	0	0	0	0	0	0	122	9	14	0	19	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	7	11	0	18	1	4	0	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -209,11 +209,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c45-empty-struct-decl.c b/src/test/out/c45-empty-struct-decl.c
index 24501651..5d4da1f2 100644
--- a/src/test/out/c45-empty-struct-decl.c
+++ b/src/test/out/c45-empty-struct-decl.c
@@ -91,15 +91,15 @@ FID	NAME	RO
 4	c45-empty-struct-decl.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	1	0	NULL	NULL	NULL	NULL	NULL	7	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	0	0	0
-4	1	43	22	5	1	0	2	24	9	NULL	1	0	0	0	0	0	0	6	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	1	0	NULL	NULL	NULL	NULL	NULL	7	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	1	0	0	0
+4	1	43	22	5	1	0	2	24	9	NULL	1	0	0	0	0	0	0	6	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -143,11 +143,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	8	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c46-double-split.c b/src/test/out/c46-double-split.c
index 3f959aac..390a696f 100644
--- a/src/test/out/c46-double-split.c
+++ b/src/test/out/c46-double-split.c
@@ -187,15 +187,15 @@ FID	NAME	RO
 4	c46-double-split.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	15	2	1	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	26	1	0	NULL	5	0	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	298	120	48	0	1	17	52	101	NULL	1	1	0	2	0	2	0	86	2	9	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	4	13	1	0	2	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	15	2	1	0	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	26	1	0	NULL	5	0	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	298	120	48	0	1	17	52	101	NULL	1	1	0	2	0	2	0	86	2	9	0	5	0	0	8	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	4	13	1	0	2	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -247,17 +247,17 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 2279	4	238	4	297
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-1349	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1349	1	19	0	9	0	0	2	17	0	NULL	0	0	0	0	0	0	0	7	0	3	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	3	NULL	1	0	1	1	1	0.0	0.0	0.0
-1779	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-1779	1	29	0	13	0	0	2	27	0	NULL	0	0	0	0	0	0	0	11	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	4	NULL	1	0	1	1	1	0.0	0.0	0.0
-2279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	8	2	1	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	12	0	0	NULL	4	0	13	NULL	0	0	2	1	1	1	0.0	36.1895	0.0
-2279	1	60	0	15	0	0	5	27	31	NULL	0	1	0	0	0	0	0	40	2	1	1	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10	0	0	2	6	0	NULL	0	NULL	0	2	1	1	1	0.0	57.3594	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+1349	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1349	1	19	0	9	0	0	2	17	0	NULL	0	0	0	0	0	0	0	7	0	3	1	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	3	NULL	1	0	1	1	1	0.0	0.0	0.0
+1779	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+1779	1	29	0	13	0	0	2	27	0	NULL	0	0	0	0	0	0	0	11	0	5	1	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	4	NULL	1	0	1	1	1	0.0	0.0	0.0
+2279	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	7	0	0	0	NULL	NULL	NULL	NULL	NULL	8	2	1	1	1	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	12	0	0	NULL	4	0	13	NULL	0	0	2	1	1	1	0.0	36.1895	0.0
+2279	1	60	0	15	0	0	5	27	31	NULL	0	1	0	0	0	0	0	40	2	1	1	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	10	0	0	2	6	0	NULL	0	NULL	0	2	1	1	1	0.0	57.3594	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c47-array-static-decl.c b/src/test/out/c47-array-static-decl.c
index d8a5e00c..17120a79 100644
--- a/src/test/out/c47-array-static-decl.c
+++ b/src/test/out/c47-array-static-decl.c
@@ -124,15 +124,15 @@ FID	NAME	RO
 4	c47-array-static-decl.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	53	4	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	16	4	0	NULL	8	0	NULL	NULL	0	0	0	0	0	0	0	0
-4	1	739	546	26	0	1	19	70	23	NULL	0	1	0	0	0	0	0	52	4	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	8	4	0	0	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	22	0	0	1	NULL	NULL	NULL	NULL	NULL	53	4	0	0	4	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	8	0	NULL	16	4	0	NULL	8	0	NULL	NULL	0	0	0	0	0	0	0	0
+4	1	739	546	26	0	1	19	70	23	NULL	0	1	0	0	0	0	0	52	4	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	8	4	0	0	8	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -181,11 +181,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	19	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	12	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 891	0	891
diff --git a/src/test/out/c48-builtin_choose_expr.c b/src/test/out/c48-builtin_choose_expr.c
index 378191a9..7b7c88b9 100644
--- a/src/test/out/c48-builtin_choose_expr.c
+++ b/src/test/out/c48-builtin_choose_expr.c
@@ -274,15 +274,15 @@ FID	NAME	RO
 4	c48-builtin_choose_expr.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	135	0	2	15	NULL	NULL	NULL	NULL	NULL	189	7	26	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	22	2	0	NULL	5	0	NULL	NULL	1	0	1	0	3	2	0	0
-4	1	897	76	163	2	0	43	77	174	NULL	2	6	0	9	0	7	2	269	7	24	0	16	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	21	28	2	0	9	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	135	0	2	15	NULL	NULL	NULL	NULL	NULL	189	7	26	0	21	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	22	2	0	NULL	5	0	NULL	NULL	1	0	1	0	3	2	0	0
+4	1	897	76	163	2	0	43	77	174	NULL	2	6	0	9	0	7	2	269	7	24	0	16	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	21	28	2	0	9	14	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -344,25 +344,25 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 6209	4	635	4	736
 7459	4	758	4	815
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-889	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-889	1	31	0	4	0	0	2	29	0	NULL	0	1	0	0	0	0	0	6	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	0	0	1	1	1	0.0	2.0	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	115	0	1	15	NULL	NULL	NULL	NULL	NULL	134	2	25	12	13	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	7	0	0	NULL	3	0	17	NULL	0	0	1	1	2	2	0.0	216.331	0.0
-891	1	212	0	23	0	0	6	166	83	NULL	0	1	0	7	0	6	1	59	1	2	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	11	0	0	7	10	0	NULL	0	NULL	0	1	1	1	1	0.0	57.1103	0.0
-2709	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	1	1	1	1	4.0	0.0	4.0
-2709	1	6	0	2	0	0	1	4	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	2	1	1	1	1	4.0	0.0	4.0
-3169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
-3169	1	82	0	22	0	0	3	77	0	NULL	0	6	0	0	0	0	0	37	0	6	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	2	2	0.0	23.2647	0.0
-4239	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-4239	1	44	0	6	0	0	2	42	23	NULL	1	5	0	0	0	0	0	24	1	3	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	1	1	1	1	1.0	3.0	1.0
-4959	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	2	1	1	1	4.0	0.0	4.0
-4959	1	92	0	13	0	0	4	43	0	NULL	0	5	0	0	0	0	0	28	0	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	2	NULL	1	2	1	1	1	4.0	10.0	4.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
-6209	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-6209	1	102	0	36	0	0	4	50	0	NULL	0	4	0	0	0	0	0	42	0	9	6	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	4	0	0	2	2	0	NULL	2	NULL	1	1	1	1	1	1.0	66.6079	1.0
-7459	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-7459	1	58	0	16	0	0	3	53	0	NULL	0	2	0	0	0	0	0	15	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	2	NULL	1	1	1	1	1	1.0	4.75489	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+889	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+889	1	31	0	4	0	0	2	29	0	NULL	0	1	0	0	0	0	0	6	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	1	0	0	1	1	0	NULL	0	NULL	0	0	1	1	1	0.0	2.0	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	115	0	1	15	NULL	NULL	NULL	NULL	NULL	134	2	25	12	13	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	7	0	0	NULL	3	0	17	NULL	0	0	1	1	2	2	0.0	216.331	0.0
+891	1	212	0	23	0	0	6	166	83	NULL	0	1	0	7	0	6	1	59	1	2	2	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	8	11	0	0	7	10	0	NULL	0	NULL	0	1	1	1	1	0.0	57.1103	0.0
+2709	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	2	1	1	1	1	4.0	0.0	4.0
+2709	1	6	0	2	0	0	1	4	0	NULL	0	1	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	2	1	1	1	1	4.0	0.0	4.0
+3169	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	0	1	1	1	0.0	0.0	0.0
+3169	1	82	0	22	0	0	3	77	0	NULL	0	6	0	0	0	0	0	37	0	6	3	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	0	1	2	2	0.0	23.2647	0.0
+4239	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+4239	1	44	0	6	0	0	2	42	23	NULL	1	5	0	0	0	0	0	24	1	3	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	1	NULL	1	1	1	1	1	1.0	3.0	1.0
+4959	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	2	1	1	1	4.0	0.0	4.0
+4959	1	92	0	13	0	0	4	43	0	NULL	0	5	0	0	0	0	0	28	0	2	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	2	NULL	1	2	1	1	1	4.0	10.0	4.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	10	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+6209	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+6209	1	102	0	36	0	0	4	50	0	NULL	0	4	0	0	0	0	0	42	0	9	6	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	4	0	0	2	2	0	NULL	2	NULL	1	1	1	1	1	1.0	66.6079	1.0
+7459	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	0	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	0	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+7459	1	58	0	16	0	0	3	53	0	NULL	0	2	0	0	0	0	0	15	0	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2	0	0	2	2	0	NULL	2	NULL	1	1	1	1	1	1.0	4.75489	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 889	0	889
diff --git a/src/test/out/c49-sizeof.c b/src/test/out/c49-sizeof.c
index ad9e3f8a..e8889fad 100644
--- a/src/test/out/c49-sizeof.c
+++ b/src/test/out/c49-sizeof.c
@@ -121,15 +121,15 @@ FID	NAME	RO
 4	c49-sizeof.c	0
 5	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	52	8	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	26	1	0	NULL	3	0	NULL	NULL	1	0	0	0	0	0	0	0
-4	1	149	0	39	0	0	15	22	14	NULL	1	1	0	0	0	0	0	51	8	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	13	1	0	0	3	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	13	0	1	1	NULL	NULL	NULL	NULL	NULL	52	8	6	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	2	0	NULL	26	1	0	NULL	3	0	NULL	NULL	1	0	0	0	0	0	0	0
+4	1	149	0	39	0	0	15	22	14	NULL	1	1	0	0	0	0	0	51	8	6	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	13	1	0	0	3	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+5	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	4	0	NULL	4	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+5	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -177,13 +177,13 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 891	5	95	5	117
 5355	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-59	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	45	8	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	12	0	0	NULL	2	0	11	NULL	0	0	0	1	1	1	0.0	28.5293	0.0
-59	1	135	0	37	0	0	13	22	12	NULL	0	1	0	0	0	0	0	45	8	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	12	0	0	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	28.5293	0.0
-891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+59	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	10	0	0	1	NULL	NULL	NULL	NULL	NULL	45	8	6	1	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	12	0	0	NULL	2	0	11	NULL	0	0	0	1	1	1	0.0	28.5293	0.0
+59	1	135	0	37	0	0	13	22	12	NULL	0	1	0	0	0	0	0	45	8	6	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	12	0	0	0	2	0	NULL	0	NULL	0	0	1	1	1	0.0	28.5293	0.0
+891	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	17	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+891	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+5355	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	9	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+5355	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 59	0	59
diff --git a/src/test/out/prj2.c b/src/test/out/prj2.c
index a8b207ae..d797c9a0 100644
--- a/src/test/out/prj2.c
+++ b/src/test/out/prj2.c
@@ -88,13 +88,13 @@ FID	NAME	RO
 3	host-incs.h	1
 4	prj2.c	0
 Table: Filemetrics
-FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
-2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
-2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
-3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
-4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	12	0	NULL	12	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
-4	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+FID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NCOPIES	NINCFILE	NPFUNCTION	NFFUNCTION	NPVAR	NFVAR	NAGGREGATE	NAMEMBER	NENUM	NEMEMBER
+2	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	16	0	1	1	NULL	NULL	NULL	NULL	NULL	18	2	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	1	0	0	0	0	0	0
+2	1	578	367	29	0	3	22	61	47	NULL	1	1	0	5	0	0	5	37	2	0	0	2	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	2	5	8	1	1	5	7	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+3	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	15	0	1	1	NULL	NULL	NULL	NULL	NULL	0	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	NULL	NULL	0	0	0	0	0	0	0	0
+3	1	295	187	13	0	2	13	54	28	NULL	1	1	0	1	0	0	0	16	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+4	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	8	0	1	1	NULL	NULL	NULL	NULL	NULL	18	3	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	12	0	NULL	12	4	0	NULL	4	0	NULL	NULL	1	0	2	0	0	0	0	0
+4	1	121	34	26	2	0	11	21	14	NULL	1	1	0	1	0	0	1	21	3	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	1	5	4	0	1	5	0	1	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 Table: FileProj
 FID	PID
 2	17
@@ -143,11 +143,11 @@ FUNCTIONID	FIDBEGIN	FOFFSETBEGIN	FIDEND	FOFFSETEND
 713	4	95	4	117
 4285	2	557	2	577
 Table: FunctionMetrics
-FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
-713	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
-713	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
-4285	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
-4285	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
+FUNCTIONID	PRECPP	NCHAR	NCCOMMENT	NSPACE	NLCOMMENT	NBCOMMENT	NLINE	MAXLINELEN	MAXSTMTLEN	MAXSTMTNEST	MAXBRACENEST	MAXBRACKNEST	NULINE	NPPDIRECTIVE	NPPCOND	NPPFMACRO	NPPOMACRO	NTOKEN	NSTMT	NOP	NUOP	NNCONST	NCLIT	NSTRING	NPPCONCATOP	NPPSTRINGOP	NIF	NELSE	NSWITCH	NCASE	NDEFAULT	NBREAK	NFOR	NWHILE	NDO	NCONTINUE	NGOTO	NRETURN	NPID	NFID	NMID	NID	NUPID	NUFID	NUMID	NUID	NLABEL	NGNSOC	NMPARAM	NFPARAM	FANIN	FANOUT	CCYCL1	CCYCL2	CCYCL3	CSTRUC	CHAL	IFLOW
+713	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	0	0	0	0	NULL	NULL	NULL	NULL	NULL	1	0	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	0	0	NULL	0	0	16	NULL	0	0	0	1	1	1	0.0	0.0	0.0
+713	1	23	15	4	1	0	2	18	0	NULL	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	NULL	0	NULL	0	0	1	1	1	0.0	0.0	0.0
+4285	0	NULL	NULL	NULL	NULL	NULL	NULL	NULL	5	0	0	1	NULL	NULL	NULL	NULL	NULL	5	1	0	0	0	0	0	NULL	NULL	0	0	0	0	0	0	0	0	0	0	0	0	0	1	NULL	1	0	1	NULL	1	0	11	NULL	0	1	1	1	1	1	1.0	0.0	1.0
+4285	1	21	0	3	0	0	1	20	5	NULL	0	1	0	0	0	0	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	1	0	1	0	1	0	NULL	0	NULL	1	1	1	1	1	1.0	0.0	1.0
 Table: FunctionId
 FUNCTIONID	ORDINAL	EID
 713	0	713