Adding extern C block for C++ use (#3)

* Adding extern C block for C++ use

* Fixing unit tests

src/camp/generators/create_gen_h.py

@@ -46,6 +46,7 @@ def write(self, outfile: TextIO):
 
         self.write_defines(outfile)
         self.write_includes(outfile)
+        outfile.write(campch.make_cplusplus_open())
         self.write_adm_template_documentation(outfile)
 
         self.write_agent_nickname_definitions(outfile)
@@ -62,6 +63,7 @@ def write(self, outfile: TextIO):
 
         self.write_initialization_functions(outfile)
 
+        outfile.write(campch.make_cplusplus_close())
         self.write_endifs(outfile)
 
     #
@@ -90,8 +92,9 @@ def write_endifs(self, outfile):
         name_upper = self.adm.norm_name.upper()
         ns_upper = self.adm.norm_namespace.replace("/", "_").upper()
         endifs_str = """\
+
 #endif /* _HAVE_{1}_ADM_ */
-#endif // ADM_{0}_H_
+#endif /* ADM_{0}_H_ */
 """
         outfile.write(endifs_str.format(name_upper, ns_upper))
 
@@ -491,7 +494,7 @@ def write_initialization_functions(self, outfile):
         name = self.adm.norm_namespace
         body = 	(
             "/* Initialization functions. */\n"
-            "void {0}_init();\n\n"
+            "void {0}_init();\n"
             ).format(name)
 
         outfile.write(body.format(name))

src/camp/generators/create_impl_h.py

@@ -55,6 +55,7 @@ def write(self, outfile: TextIO):
 
         self._scraper.write_custom_includes(outfile)
         self.write_includes(outfile)
+        outfile.write(campch.make_cplusplus_open())
 
         self._scraper.write_custom_type_enums(outfile)
 
@@ -75,6 +76,7 @@ def write(self, outfile: TextIO):
         self.write_operator_functions(outfile)
         self.write_table_functions(outfile)
 
+        outfile.write(campch.make_cplusplus_close())
         self.write_endifs(outfile)
 
     #
@@ -95,7 +97,7 @@ def write_endifs(self, outfile):
         name_upper = self.adm.norm_name.upper()
         endifs_str = """\
 
-#endif // ADM_{0}_IMPL_H_
+#endif /* ADM_{0}_IMPL_H_ */
 """
         outfile.write(endifs_str.format(name_upper))
 

src/camp/generators/lib/campch.py

@@ -691,3 +691,21 @@ def write_init_function(c_file, adm: ace.models.AdmFile, g_var_idx: str, mgr: bo
 
     c_file.write(init_decls + "\n")
     write_formatted_init_function(c_file, adm.norm_namespace, None, body)
+
+def make_cplusplus_open():
+    ''' Open an "extern C" block for C++ inclusion. '''
+    return """\
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+"""
+
+def make_cplusplus_close():
+    ''' Close  an "extern C" block for C++ inclusion. '''
+    return """\
+
+#ifdef __cplusplus
+}
+#endif
+"""

tests/data/gen_ch/agent/adm_test_adm_impl.h.jinja

@@ -28,6 +28,10 @@
 #include "shared/primitives/table.h"
 #include "shared/primitives/tnv.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*   START typeENUM */
 /*             TODO              */
 /*   STOP typeENUM  */
@@ -76,4 +80,8 @@ tnv_t *test_ns_op_plusreal64(vector_t *stack);
 tbl_t *test_ns_tblt_variables(ari_t *id);
 tbl_t *test_ns_tblt_rptts(ari_t *id);
 
-#endif // ADM_TEST_ADM_IMPL_H_
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ADM_TEST_ADM_IMPL_H_ */

tests/data/gen_ch/shared/adm/adm_test_adm.h.jinja

@@ -24,6 +24,10 @@
 #include "shared/utils/nm_types.h"
 #include "shared/adm/adm.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /*
  * +---------------------------------------------------------------------------------------------+
@@ -193,5 +197,9 @@ extern vec_idx_t g_test_ns_idx[11];
 /* Initialization functions. */
 void test_ns_init();
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _HAVE_TEST_NS_ADM_ */
-#endif // ADM_TEST_ADM_H_
+#endif /* ADM_TEST_ADM_H_ */