Deploying to gh-pages from @ d94df61 🚀

cxxheaderparser/options.py

@@ -2,7 +2,7 @@
 from typing import Callable, Optional
 
 #: arguments are (filename, content)
-PreprocessorFunction = Callable[[str, Optional[str]], str]
+PreprocessorFunction = Callable[[str, str], str]
 
 
 @dataclass

cxxheaderparser/parser.py

@@ -74,10 +74,9 @@ class CxxParser:
     def __init__(
         self,
         filename: str,
-        content: typing.Optional[str],
+        content: str,
         visitor: CxxVisitor,
         options: typing.Optional[ParserOptions] = None,
-        encoding: typing.Optional[str] = None,
     ) -> None:
         self.visitor = visitor
         self.filename = filename
@@ -86,13 +85,6 @@ def __init__(
         if options and options.preprocessor is not None:
             content = options.preprocessor(filename, content)
 
-        if content is None:
-            if encoding is None:
-                encoding = "utf-8-sig"
-
-            with open(filename, "r", encoding=encoding) as fp:
-                content = fp.read()
-
         self.lex: lexer.TokenStream = lexer.LexerTokenStream(filename, content)
 
         global_ns = NamespaceDecl([], False)

cxxheaderparser/preprocessor.py

@@ -7,7 +7,6 @@
 import os
 import subprocess
 import sys
-import tempfile
 import typing
 
 from .options import PreprocessorFunction
@@ -75,7 +74,7 @@ def make_gcc_preprocessor(
     if not encoding:
         encoding = "utf-8"
 
-    def _preprocess_file(filename: str, content: typing.Optional[str]) -> str:
+    def _preprocess_file(filename: str, content: str) -> str:
         cmd = gcc_args + ["-w", "-E", "-C"]
 
         for p in include_paths:
@@ -87,8 +86,6 @@ def _preprocess_file(filename: str, content: typing.Optional[str]) -> str:
         if filename == "<str>":
             cmd.append("-")
             filename = "<stdin>"
-            if content is None:
-                raise PreprocessorError("no content specified for stdin")
             kwargs["input"] = content
         else:
             cmd.append(filename)
@@ -105,109 +102,6 @@ def _preprocess_file(filename: str, content: typing.Optional[str]) -> str:
     return _preprocess_file
 
 
-#
-# Microsoft Visual Studio preprocessor support
-#
-
-
-def _msvc_filter(fp: typing.TextIO) -> str:
-    # MSVC outputs the original file as the very first #line directive
-    # so we just use that
-    new_output = io.StringIO()
-    keep = True
-
-    first = fp.readline()
-    assert first.startswith("#line")
-    fname = first[first.find('"') :]
-
-    for line in fp:
-        if line.startswith("#line"):
-            keep = line.endswith(fname)
-
-        if keep:
-            new_output.write(line)
-
-    new_output.seek(0)
-    return new_output.read()
-
-
-def make_msvc_preprocessor(
-    *,
-    defines: typing.List[str] = [],
-    include_paths: typing.List[str] = [],
-    retain_all_content: bool = False,
-    encoding: typing.Optional[str] = None,
-    msvc_args: typing.List[str] = ["cl.exe"],
-    print_cmd: bool = True,
-) -> PreprocessorFunction:
-    """
-    Creates a preprocessor function that uses g++ to preprocess the input text.
-
-    gcc is a high performance and accurate precompiler, but if an #include
-    directive can't be resolved or other oddity exists in your input it will
-    throw an error.
-
-    :param defines: list of #define macros specified as "key value"
-    :param include_paths: list of directories to search for included files
-    :param retain_all_content: If False, only the parsed file content will be retained
-    :param encoding: If specified any include files are opened with this encoding
-    :param gcc_args: This is the path to G++ and any extra args you might want
-    :param print_cmd: Prints the gcc command as its executed
-
-    .. code-block:: python
-
-        pp = make_gcc_preprocessor()
-        options = ParserOptions(preprocessor=pp)
-
-        parse_file(content, options=options)
-
-    """
-
-    if not encoding:
-        encoding = "utf-8"
-
-    def _preprocess_file(filename: str, content: typing.Optional[str]) -> str:
-        cmd = msvc_args + ["/nologo", "/E", "/C"]
-
-        for p in include_paths:
-            cmd.append(f"/I{p}")
-        for d in defines:
-            cmd.append(f"/D{d.replace(' ', '=')}")
-
-        tfpname = None
-
-        try:
-            kwargs = {"encoding": encoding}
-            if filename == "<str>":
-                if content is None:
-                    raise PreprocessorError("no content specified for stdin")
-
-                tfp = tempfile.NamedTemporaryFile(
-                    mode="w", encoding=encoding, suffix=".h", delete=False
-                )
-                tfpname = tfp.name
-                tfp.write(content)
-                tfp.close()
-                # tfp.seek(0)
-                cmd.append(tfpname)
-            else:
-                cmd.append(filename)
-
-            if print_cmd:
-                print("+", " ".join(cmd), file=sys.stderr)
-
-            result: str = subprocess.check_output(cmd, **kwargs)  # type: ignore
-            if not retain_all_content:
-                result = _msvc_filter(io.StringIO(result))
-        finally:
-            if tfpname:
-                os.unlink(tfpname)
-
-        return result
-
-    return _preprocess_file
-
-
 #
 # PCPP preprocessor support (not installed by default)
 #
@@ -297,7 +191,7 @@ def make_pcpp_preprocessor(
     if pcpp is None:
         raise PreprocessorError("pcpp is not installed")
 
-    def _preprocess_file(filename: str, content: typing.Optional[str]) -> str:
+    def _preprocess_file(filename: str, content: str) -> str:
         pp = _CustomPreprocessor(encoding, passthru_includes)
         if include_paths:
             for p in include_paths:
@@ -309,10 +203,6 @@ def _preprocess_file(filename: str, content: typing.Optional[str]) -> str:
         if not retain_all_content:
             pp.line_directive = "#line"
 
-        if content is None:
-            with open(filename, "r", encoding=encoding) as fp:
-                content = fp.read()
-
         pp.parse(content, filename)
 
         if pp.errors:

cxxheaderparser/simple.py

@@ -348,10 +348,7 @@ def parse_file(
     if filename == "-":
         content = sys.stdin.read()
     else:
-        content = None
+        with open(filename, encoding=encoding) as fp:
+            content = fp.read()
 
-    visitor = SimpleCxxVisitor()
-    parser = CxxParser(filename, content, visitor, options)
-    parser.parse()
-
-    return visitor.data
+    return parse_string(content, filename=filename, options=options)

cxxheaderparser/version.py

@@ -1 +1 @@
-__version__ = '1.0.0-10-gb3d7272'
+__version__ = '1.0.0-8-gd94df61'