Add multi include path feature for bundling c++ code

Author: kjnh10

onlinejudge_bundle/main.py

@@ -22,12 +22,12 @@ def main(args: Optional[List[str]] = None) -> None:
     # parse command-line arguments
     parser = argparse.ArgumentParser()
     parser.add_argument('path', type=pathlib.Path)
-    parser.add_argument('-I', metavar='dir', type=pathlib.Path, dest='iquote', default=pathlib.Path.cwd(), help='add the directory dir to the list of directories to be searched for header files during preprocessing (default: ".")')
+    parser.add_argument('-I', metavar='dir', action='append', type=pathlib.Path, dest='iquote', default=[pathlib.Path.cwd()], help='add the directory dir to the list of directories to be searched for header files during preprocessing (default: ".")')
     parsed = parser.parse_args(args)
 
     language = onlinejudge_verify.languages.list.get(parsed.path)
     assert language is not None
-    sys.stdout.buffer.write(language.bundle(parsed.path, basedir=parsed.iquote))
+    sys.stdout.buffer.write(language.bundle(parsed.path, options={'include_paths': parsed.iquote}))
 
 
 if __name__ == "__main__":

onlinejudge_verify/languages/cplusplus.py

@@ -186,8 +186,8 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
         joined_CXXFLAGS = ' '.join(map(shlex.quote, [*env.CXXFLAGS, '-I', str(basedir)]))
         return _cplusplus_list_depending_files(path.resolve(), CXX=env.CXX, joined_CXXFLAGS=joined_CXXFLAGS)
 
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
-        bundler = Bundler(iquotes=[basedir])
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path=pathlib.Path.cwd(), options: Dict[str, Any]) -> bytes:
+        bundler = Bundler(iquotes=options['include_paths'])
         bundler.update(path)
         return bundler.get()
 

onlinejudge_verify/languages/models.py

@@ -40,7 +40,7 @@ def list_dependencies(self, path: pathlib.Path, *, basedir: pathlib.Path) -> Lis
         raise NotImplementedError
 
     @abc.abstractmethod
-    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path) -> bytes:
+    def bundle(self, path: pathlib.Path, *, basedir: pathlib.Path, options: Dict[str, Any]) -> bytes:
         """
         :throws Exception:
         :throws NotImplementedError: