Merge pull request #100 from robotpy/msvc-inline

Parse MSVC inline/forceinline as inline
robotpy · Jun 9, 2024 · 544c253 · 544c253
2 parents 914838c + a7b156d
commit 544c253
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 0 deletions.
diff --git a/cxxheaderparser/lexer.py b/cxxheaderparser/lexer.py
@@ -104,9 +104,11 @@ class PlyLexer:
         "final",
         "float",
         "for",
+        "__forceinline",
         "friend",
         "goto",
         "if",
+        "__inline",
         "inline",
         "int",
         "long",

diff --git a/cxxheaderparser/parser.py b/cxxheaderparser/parser.py
@@ -2371,6 +2371,8 @@ def _parse_type(
                 volatile = True
             elif tok_type in _attribute_start:
                 self._consume_attribute(tok)
+            elif tok_type in ("__inline", "__forceinline"):
+                both["inline"] = tok
             else:
                 break
 

diff --git a/tests/test_fn.py b/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,
+                ),
+            ]
+        )
+    )