cxxheaderparser 1.7.2__tar.gz → 1.7.4__tar.gz

{cxxheaderparser-1.7.2 → cxxheaderparser-1.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cxxheaderparser
-Version: 1.7.2
+Version: 1.7.4
 Summary: Modern C++ header parser
 Project-URL: Source code, https://github.com/robotpy/cxxheaderparser
 Author-email: Dustin Spicuzza <robotpy@googlegroups.com>

{cxxheaderparser-1.7.2 → cxxheaderparser-1.7.4}/cxxheaderparser/lexer.py

@@ -125,6 +125,7 @@ class PlyLexer:
         "reinterpret_cast",
         "requires",
         "__restrict__",
+        "__restrict",
         "restrict",
         "return",
         "short",

{cxxheaderparser-1.7.2 → cxxheaderparser-1.7.4}/cxxheaderparser/parser.py

@@ -1606,7 +1606,7 @@ class CxxParser:
 
         else:
             # default value initializer
-            tok = self.lex.token_if("{")
+            tok = self.lex.token_if("{", "(")
             if tok:
                 if is_typedef:
                     raise self._parse_error(tok)
@@ -2432,7 +2432,7 @@ class CxxParser:
 
         while True:
             tok = self.lex.token_if(
-                "*", "const", "volatile", "__restrict__", "restrict", "("
+                "*", "const", "volatile", "__restrict__", "__restrict", "restrict", "("
             )
             if not tok:
                 break
@@ -2449,7 +2449,7 @@ class CxxParser:
                 if not isinstance(dtype, (Pointer, Type)):
                     raise self._parse_error(tok)
                 dtype.volatile = True
-            elif tok.type in ("__restrict__", "restrict"):
+            elif tok.type in ("__restrict__", "__restrict", "restrict"):
                 if not isinstance(dtype, (Pointer, Reference)):
                     raise self._parse_error(tok)
                 dtype.restrict = True
@@ -2524,7 +2524,7 @@ class CxxParser:
 
             # peek at the next token and see if it's a paren. If so, it might
             # be a nasty function pointer
-            if self.lex.token_peek_if("(", "__restrict__", "restrict"):
+            if self.lex.token_peek_if("(", "__restrict__", "__restrict", "restrict"):
                 dtype = self._parse_cv_ptr_or_fn(dtype, nonptr_fn)
 
         return dtype
@@ -2537,6 +2537,22 @@ class CxxParser:
 
     _parse_type_ptr_ref_paren = {"*", "&", "DBL_AMP", "("}
 
+    _parameter_start_tokens = (
+        _pqname_start_tokens
+        | _attribute_start_tokens
+        | _type_kwd_both
+        | _type_kwd_meth
+        | {
+            "volatile",
+            "mutable",
+            "__inline",
+            "__forceinline",
+            "this",
+            "ELLIPSIS",
+            ")",
+        }
+    )
+
     def _parse_type(
         self,
         tok: typing.Optional[LexToken],
@@ -2735,29 +2751,34 @@ class CxxParser:
 
         # TODO: "type fn(x);" is ambiguous here. Because this is a header
         # parser, we assume it's a function, not a variable declaration
-        # calling a constructor
+        # calling a constructor, unless the token after ( cannot start a
+        # parameter declaration.
 
-        # if ( then it's a function/method
-        if self.lex.token_if("("):
+        # if ( then it's usually a function/method
+        tok = self.lex.token_if("(")
+        if tok:
             if not pqname:
                 raise self._parse_error(None)
 
-            return self._parse_function(
-                mods,
-                dtype,
-                pqname,
-                op,
-                template,
-                doxygen,
-                location,
-                constructor,
-                destructor,
-                is_friend,
-                is_typedef,
-                msvc_convention,
-                is_guide,
-                attributes,
-            )
+            if not self.lex.token_peek_if(*self._parameter_start_tokens):
+                self.lex.return_token(tok)
+            else:
+                return self._parse_function(
+                    mods,
+                    dtype,
+                    pqname,
+                    op,
+                    template,
+                    doxygen,
+                    location,
+                    constructor,
+                    destructor,
+                    is_friend,
+                    is_typedef,
+                    msvc_convention,
+                    is_guide,
+                    attributes,
+                )
         elif msvc_convention:
             raise self._parse_error(msvc_convention)
 

{cxxheaderparser-1.7.2 → cxxheaderparser-1.7.4}/cxxheaderparser/version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.7.2'
-__version_tuple__ = version_tuple = (1, 7, 2)
+__version__ = version = '1.7.4'
+__version_tuple__ = version_tuple = (1, 7, 4)
 
 __commit_id__ = commit_id = None