fix for #41

Co-Authored-By: Vo Luu Tuong Anh <[email protected]>

Author: shiroinekotfs

jcppkernel/code_processing.py

@@ -3,20 +3,15 @@
 from .external_header import CPPExternalHeader
 
 class CPPCodeProcessingUnit:
-    
     main_head = 'int main() {'
     main_foot = '\treturn 0;\n}'
     comments = r'\/\/.*?(?=\r?\n)|\/\*[\s\S]*?\*\/'
     main_method = r'\bmain\s*\(|^\s*#\s*define\s+\w+\s+main\b'
-    
-    def _prep_main_function(self, code):
-        code = f"{self.main_head}\n{code}\n{self.main_foot}"
-        return code
 
     def _add_code_compat(self, code, cpp_res_path):
         code = code_sub(self.comments, r'', code)
         if not code_search(self.main_method, code):
-            code = self._prep_main_function(code)
+            code = f"{self.main_head}\n{code}\n{self.main_foot}"
 
         code = f"#include {cpp_res_path}\n{code}"
         code = CPPExternalHeader._support_external_header(CPPExternalHeader, code)

jcppkernel/external_header.py

@@ -3,23 +3,19 @@
 
 class CPPExternalHeader:
     def _find_local_header(self):
-        if hasattr(self, "_cached_local_header"):
-            return self._cached_local_header
         search_paths = [path.abspath(path.dirname(__file__)), prefix]
         for base in search_paths:
             current = base
             while current != path.sep:
                 cpp_header_path = path.join(current, "share", "cpp_header")
                 if path.exists(path.join(cpp_header_path, "check_cpp.hpp")):
-                    self._cached_local_header = cpp_header_path
                     return cpp_header_path
                 new_current = path.dirname(current)
                 if new_current == current:
                     break
                 current = new_current
-        self._cached_local_header = ""
         return ""
-
+    
     def _support_external_header(self, code):
         DATA_FILES_PATH = self._find_local_header(self)
         includes = []

jcppkernel/temp_file_processing.py

@@ -2,12 +2,10 @@
 from tempfile import NamedTemporaryFile
 
 class CPPTempFileProcessing:
-    
     def _new_temp_file(self, files, **kwargs):
         file = NamedTemporaryFile(delete=False, mode="w", **kwargs)
         files.append(file.name)
         return file
-
 
     def _cleanup_files(self, master_path, files):
         for file in files:

jupyter-cpp-kernel-03/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-03",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 03",
     "language": "c++"

jupyter-cpp-kernel-11/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-11",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 11",
     "language": "c++"

jupyter-cpp-kernel-14/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-14",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 14",
     "language": "c++"

jupyter-cpp-kernel-17/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-17",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 17",
     "language": "c++"

jupyter-cpp-kernel-20/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-20",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 20",
     "language": "c++"

jupyter-cpp-kernel-23/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-23",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 23",
     "language": "c++"

jupyter-cpp-kernel-98/kernel_spec/kernel.json

@@ -4,7 +4,7 @@
         "-m",
         "jupyter-cpp-kernel-98",
         "-f",
-        "{connection_file}"
+        "\"{connection_file}\""
     ],
     "display_name": "C++ 98",
     "language": "c++"