more func, more vars

gen/data/input/test_data/functions.h

@@ -7,9 +7,33 @@
 #include "vars.h"
 
 
+void func_void_void();
+
+int func_int_void();
+
+void func_void_int(int);
+
+int func_int_int(int);
+
+// struct
 struct _PS func__PS_V();
 
+// enum
+enum _E func__E_V();
+
+// typedef
+TP func_TP_V();
+void func_V_TP(TP);
+TP func_TP_TP(TP);
+
+APS func_APS_V();
+void func_V_APS(APS);
+APS func_APS_APS(APS);
+
+TPS func_TPS_V();
+void func_V_TPS(TPS);
+TPS func_TPS_TPS(TPS);
+
 
-TT_NNPS func_TT_NNPS_V();
 
 #endif //FUNCTIONS_H

gen/data/input/test_data/vars.h

@@ -11,10 +11,10 @@
 //void var_V;
 
 // _P
-char b;
+char var__P;
 
 // P
-int x;
+int var_P;
 
 
 // enums
@@ -31,15 +31,18 @@ AE var_AE;
 
 // structs
 // =======
-// Incomplete types:
+
+// Incomplete types
 // struct _IS var__IS;
 // struct IS var_IS;
 // AIS var_AIS;
 
+// primitive structs
 struct _PS var__PS;
 struct PS var_PS;
 APS var_APS;
 
+// complex structs
 struct _CS var__CS;
 struct CS var_CS;
 ACS var_ACS;
@@ -48,6 +51,7 @@ struct _CCS var__CCS;
 struct CCS var_CCS;
 ACCS var_ACCS;
 
+// nested structs / hosting structs
 struct _HS var__HS;
 struct _NCS var__NCS;
 
@@ -63,28 +67,63 @@ struct HHS var_HHS;
 struct _NHS1 var__NHS1;
 struct _NNCS var__NNCS;
 
+//nested enum in hosting struct
 enum _NENHS var__NENHS;
 AHHS var_ASHS;
 
 struct _HS1 var__HS1;
 enum _NEHS var_NEHS1;
 
+
+// TYPEDEFS
+// ========
+
 // Typedefs of primitive
+// ---------------------
 //TV var_TV;
 TP var_TP;
 
-// Typedef of structs
+// Typedefs of structs
+// ------------------
 // Incomplete types
 //T_IS var_T_IS;
 //TIS var_TIS;
 //TAIS var_TAIS;
+
+// primitive structs
 T_PS var_T_PS;
 TPS var_TPS;
 TAPS var_TAPS;
+
+// complex structs
+T_CS var__TC_S;
+TCS  var_TCS;
+TACS var_TACS;
+T_CCS var_T_CCS;
+TCCS var_TCCS;
+TACCS var_TACCS;
+
+// nested structs / hosting structs
+T_HS var_T_HS;
+T_NCS var_T_NCS;
+THS var_THS;
 T_NPS var_T_NPS;
+TAHS var_TAHS;
+T_HHS var_T_HHS;
+T_NHS var_T_NHS;
 T_NNPS var_T_NNPS;
+THHS var_THHS;
+TAHHS var_TAHHS;
+T_NNCS var_T_NNCS;
+T_NENHS var_T_NENHS;
+T_NHS1 var_T_NHS1;
+
+//nested enum in hosting struct
+T_HS1 var_T_HS1;
+T_NEHS var_T_NEHS;
 
 // Typedef of enums
+// ----------------
 // Incomplete types
 //T_IE var_TIE;
 //TIE var_TIE;
@@ -93,28 +132,53 @@ T_E var_T_E;
 TE var_TE;
 TAE var_TAE;
 
-// Typedef of typedefs
-//TTV var_TTV;
+
+
+// TYPEDEFS OF TYPEDEFS
+// ====================
+
+// Typedefs of primitive
+// ---------------------
 TTP var_TTP;
 
-// incomplete
-//TT_IS var_TT_IS;
-//TTIS var_TTIS;
-//TTAIS var_TTAIS;
+// Typedefs of structs
+// ------------------
+// primitive structs
 TT_PS var_TT_PS;
 TTPS var_TTPS;
 TTAPS var_TTAPS;
+
+// complex structs
+TT_CS var__TTC_S;
+TTCS  var_TTCS;
+TTACS var_TTACS;
+TT_CCS var_TT_CCS;
+TTCCS var_TTCCS;
+TTACCS var_TTACCS;
+
+// nested structs / hosting structs
+TT_HS var_TT_HS;
+TT_NCS var_TT_NCS;
+TTHS var_TTHS;
 TT_NPS var_TT_NPS;
+TTAHS var_TTAHS;
+TT_HHS var_TT_HHS;
+TT_NHS var_TT_NHS;
 TT_NNPS var_TT_NNPS;
+TTHHS var_TTHHS;
+TTAHHS var_TTAHHS;
+TT_NNCS var_TT_NNCS;
+TT_NENHS var_TT_NENHS;
+TT_NHS1 var_TT_NHS1;
 
-// incomplete
-//TT_IE var_TT_IE;
-//TTIE var_TTIE;
-//TTAIE var_TTAIE;
+//nested enum in hosting struct
+TT_HS1 var_TT_HS1;
+TT_NEHS var_TT_NEHS;
+
+// Typedef of enums
+// ----------------
 TT_E var_TT_E;
 TTE var_TTE;
-TAE var_TTAE;
-
-
+TTAE var_TTAE;
 
 #endif // VARS_H