cxxheaderparser 1.3.2__tar.gz → 1.3.4__tar.gz

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cxxheaderparser
-Version: 1.3.2
+Version: 1.3.4
 Summary: Parse C++ header files and generate a data structure representing the class
 Home-page: https://github.com/robotpy/cxxheaderparser
 Author: Dustin Spicuzza

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/cxxheaderparser/lexer.py

@@ -104,9 +104,11 @@ class PlyLexer:
         "final",
         "float",
         "for",
+        "__forceinline",
         "friend",
         "goto",
         "if",
+        "__inline",
         "inline",
         "int",
         "long",

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/cxxheaderparser/parser.py

@@ -718,6 +718,17 @@ class CxxParser:
             if dtype:
                 args.append(TemplateArgument(dtype, param_pack))
             else:
+                # special case for sizeof...(thing)
+                if (
+                    param_pack
+                    and len(val.tokens) == 1
+                    and val.tokens[0].value == "sizeof"
+                ):
+                    val.tokens.append(Token("...", "ELLIPSIS"))
+                    tok = self._next_token_must_be("(")
+                    raw_toks = self._consume_balanced_tokens(tok)
+                    val.tokens.extend(Token(tok.value, tok.type) for tok in raw_toks)
+
                 args.append(TemplateArgument(val, param_pack))
 
             tok = self._next_token_must_be(",", ">")
@@ -2371,6 +2382,8 @@ class CxxParser:
                 volatile = True
             elif tok_type in _attribute_start:
                 self._consume_attribute(tok)
+            elif tok_type in ("__inline", "__forceinline"):
+                both["inline"] = tok
             else:
                 break
 
@@ -2622,6 +2635,16 @@ class CxxParser:
         ):
             return
 
+        # Check for an abbreviated template return type, promote it
+        if not is_typedef and parsed_type is not None and self.lex.token_if_val("auto"):
+            abv_ret_tmpl = TemplateNonTypeParam(type=parsed_type, param_idx=-1)
+            if template is None:
+                template = TemplateDecl(params=[abv_ret_tmpl])
+            elif isinstance(template, TemplateDecl):
+                template.params.append(abv_ret_tmpl)
+            else:
+                template[-1].params.append(abv_ret_tmpl)
+
         var_ok = True
 
         if is_typedef:

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/cxxheaderparser/types.py

@@ -458,13 +458,18 @@ class TemplateNonTypeParam:
        // abbreviated template parameters are converted to this and param_idx is set
        void fn(C auto p)
                ~~~~~~
+
+       // abbreviated template parameters that are return types have param_idx = -1
+       C auto fn()
+       ~~~~~~
     """
 
     type: DecoratedType
     name: typing.Optional[str] = None
     default: typing.Optional[Value] = None
 
-    #: If this was promoted, the parameter index that this corresponds with
+    #: If this was promoted, the parameter index that this corresponds with. Return
+    #: types are set to -1
     param_idx: typing.Optional[int] = None
 
     #: Contains a ``...``

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/cxxheaderparser/version.py

@@ -1,2 +1,2 @@
 # Autogenerated by setup.py
-__version__ = '1.3.2'
+__version__ = '1.3.4'

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/cxxheaderparser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cxxheaderparser
-Version: 1.3.2
+Version: 1.3.4
 Summary: Parse C++ header files and generate a data structure representing the class
 Home-page: https://github.com/robotpy/cxxheaderparser
 Author: Dustin Spicuzza

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/tests/test_abv_template.py

@@ -351,3 +351,77 @@ def test_abv_template_f5() -> None:
             ]
         )
     )
+
+
+def test_returned_abv_template() -> None:
+    content = """
+      constexpr std::signed_integral auto FloorDiv(std::signed_integral auto x,
+                                                   std::signed_integral auto y);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(
+                            segments=[
+                                NameSpecifier(name="std"),
+                                NameSpecifier(name="signed_integral"),
+                            ]
+                        )
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="FloorDiv")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            name="x",
+                        ),
+                        Parameter(
+                            type=Type(typename=PQName(segments=[AutoSpecifier()])),
+                            name="y",
+                        ),
+                    ],
+                    constexpr=True,
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[
+                                            NameSpecifier(name="std"),
+                                            NameSpecifier(name="signed_integral"),
+                                        ]
+                                    )
+                                ),
+                                param_idx=-1,
+                            ),
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[
+                                            NameSpecifier(name="std"),
+                                            NameSpecifier(name="signed_integral"),
+                                        ]
+                                    )
+                                ),
+                                param_idx=0,
+                            ),
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[
+                                            NameSpecifier(name="std"),
+                                            NameSpecifier(name="signed_integral"),
+                                        ]
+                                    )
+                                ),
+                                param_idx=1,
+                            ),
+                        ]
+                    ),
+                )
+            ]
+        )
+    )

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/tests/test_fn.py

@@ -1258,3 +1258,58 @@ def test_method_trailing_return_with_body() -> None:
             ]
         )
     )
+
+
+def test_msvc_inline() -> None:
+    content = """
+      __inline double fn1() {}
+      __forceinline double fn2() {}
+      static __inline double fn3() {}
+      static __forceinline double fn4() {}
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="double")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="fn1")]),
+                    parameters=[],
+                    inline=True,
+                    has_body=True,
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="double")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="fn2")]),
+                    parameters=[],
+                    inline=True,
+                    has_body=True,
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="double")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="fn3")]),
+                    parameters=[],
+                    static=True,
+                    inline=True,
+                    has_body=True,
+                ),
+                Function(
+                    return_type=Type(
+                        typename=PQName(segments=[FundamentalSpecifier(name="double")])
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="fn4")]),
+                    parameters=[],
+                    static=True,
+                    inline=True,
+                    has_body=True,
+                ),
+            ]
+        )
+    )

{cxxheaderparser-1.3.2 → cxxheaderparser-1.3.4}/tests/test_template.py

@@ -2247,3 +2247,108 @@ def test_template_deduction_guide() -> None:
             ]
         )
     )
+
+
+def test_sizeof_pack() -> None:
+    content = """
+      template <std::same_as<int>... OutputIndices>
+      LinearSystem<States, Inputs, sizeof...(OutputIndices)> Slice(OutputIndices... outputIndices);
+    """
+    data = parse_string(content, cleandoc=True)
+
+    assert data == ParsedData(
+        namespace=NamespaceScope(
+            functions=[
+                Function(
+                    return_type=Type(
+                        typename=PQName(
+                            segments=[
+                                NameSpecifier(
+                                    name="LinearSystem",
+                                    specialization=TemplateSpecialization(
+                                        args=[
+                                            TemplateArgument(
+                                                arg=Type(
+                                                    typename=PQName(
+                                                        segments=[
+                                                            NameSpecifier(name="States")
+                                                        ]
+                                                    )
+                                                )
+                                            ),
+                                            TemplateArgument(
+                                                arg=Type(
+                                                    typename=PQName(
+                                                        segments=[
+                                                            NameSpecifier(name="Inputs")
+                                                        ]
+                                                    )
+                                                )
+                                            ),
+                                            TemplateArgument(
+                                                arg=Value(
+                                                    tokens=[
+                                                        Token(value="sizeof"),
+                                                        Token(value="..."),
+                                                        Token(value="("),
+                                                        Token(value="OutputIndices"),
+                                                        Token(value=")"),
+                                                    ]
+                                                ),
+                                                param_pack=True,
+                                            ),
+                                        ]
+                                    ),
+                                )
+                            ]
+                        )
+                    ),
+                    name=PQName(segments=[NameSpecifier(name="Slice")]),
+                    parameters=[
+                        Parameter(
+                            type=Type(
+                                typename=PQName(
+                                    segments=[NameSpecifier(name="OutputIndices")]
+                                )
+                            ),
+                            name="outputIndices",
+                            param_pack=True,
+                        )
+                    ],
+                    template=TemplateDecl(
+                        params=[
+                            TemplateNonTypeParam(
+                                type=Type(
+                                    typename=PQName(
+                                        segments=[
+                                            NameSpecifier(name="std"),
+                                            NameSpecifier(
+                                                name="same_as",
+                                                specialization=TemplateSpecialization(
+                                                    args=[
+                                                        TemplateArgument(
+                                                            arg=Type(
+                                                                typename=PQName(
+                                                                    segments=[
+                                                                        FundamentalSpecifier(
+                                                                            name="int"
+                                                                        )
+                                                                    ]
+                                                                )
+                                                            )
+                                                        )
+                                                    ]
+                                                ),
+                                            ),
+                                        ]
+                                    )
+                                ),
+                                name="OutputIndices",
+                                param_pack=True,
+                            )
+                        ]
+                    ),
+                )
+            ]
+        )
+    )