Merge pull request #341 from kjnh10/bugfix/#340

Bugfix/#340

Author: kmyk

onlinejudge_verify/languages/cplusplus_bundle.py

@@ -184,7 +184,7 @@ def _get_uncommented_code(path: pathlib.Path, *, iquotes_options: Tuple[str, ...
         if compiler == 'g++':
             raise BundleError(f'A fake g++ is detected. Please install the GNU C++ compiler.: {compiler}')
         raise BundleError(f"It's not g++. Please specify g++ with $CXX envvar.: {compiler}")
-    command = [compiler, *iquotes_options, '-fpreprocessed', '-dD', '-E', str(path)]
+    command = [compiler, '-x', 'c++', *iquotes_options, '-fpreprocessed', '-dD', '-E', str(path)]
     return subprocess.check_output(command)
 
 

tests/test_bundle.py

@@ -65,6 +65,24 @@ def test_uncommenting(self) -> None:
                 self.assertIn(b'void foo() {}', bundled)
                 self.assertNotIn(b'void bar() {}', bundled)
 
+    def test_without_extension(self) -> None:
+        # .hppといった拡張子がないheader fileがinclude中に現れても正しく展開される事を確認
+
+        files = {
+            'example.test.cpp': b'#include "bar"\n#include "foo.hpp"',
+            'bar': b'#include "./bar.hpp"',
+            'bar.hpp': b'hello bar\n',
+            'foo.hpp': b'hello foo\n',
+        }
+        path = pathlib.Path('example.test.cpp')
+        with tests.utils.load_files(files) as tempdir:
+            with tests.utils.chdir(tempdir):
+                bundler = cplusplus_bundle.Bundler(iquotes=[tempdir])
+                bundler.update(path)
+                res = bundler.get()
+                self.assertIn(b'hello bar\n', res)
+                self.assertIn(b'hello foo\n', res)
+
     @unittest.skipIf(shutil.which('clang++') is None, 'clang++ is required for this test')
     def test_reject_clang(self) -> None:
         files = {