Merge pull request #66 from robotpy/fn-operator

breaking change: Remove operator type and make part of Function

Author: virtuald

cxxheaderparser/parser.py

@@ -37,7 +37,6 @@
     NameSpecifier,
     NamespaceAlias,
     NamespaceDecl,
-    Operator,
     PQNameSegment,
     Parameter,
     PQName,
@@ -1825,33 +1824,19 @@ def _parse_function(
         if (is_class_block or multiple_name_segments) and not is_typedef:
             props.update(dict.fromkeys(mods.meths.keys(), True))
 
-            method: Method
-
-            if op:
-                method = Operator(
-                    return_type,
-                    pqname,
-                    params,
-                    vararg,
-                    doxygen=doxygen,
-                    operator=op,
-                    template=template,
-                    access=self._current_access,
-                    **props,  # type: ignore
-                )
-            else:
-                method = Method(
-                    return_type,
-                    pqname,
-                    params,
-                    vararg,
-                    doxygen=doxygen,
-                    constructor=constructor,
-                    destructor=destructor,
-                    template=template,
-                    access=self._current_access,
-                    **props,  # type: ignore
-                )
+            method = Method(
+                return_type,
+                pqname,
+                params,
+                vararg,
+                doxygen=doxygen,
+                constructor=constructor,
+                destructor=destructor,
+                template=template,
+                operator=op,
+                access=self._current_access,
+                **props,  # type: ignore
+            )
 
             self._parse_method_end(method)
 
@@ -1883,6 +1868,7 @@ def _parse_function(
                 vararg,
                 doxygen=doxygen,
                 template=template,
+                operator=op,
                 **props,
             )
             self._parse_fn_end(fn)

cxxheaderparser/types.py

@@ -550,6 +550,15 @@ class Function:
     #:            calling convention
     msvc_convention: typing.Optional[str] = None
 
+    #: The operator type (+, +=, etc).
+    #:
+    #: If this object is a Function, then this is a free operator function. If
+    #: this object is a Method, then it is an operator method.
+    #:
+    #: In the case of a conversion operator (such as 'operator bool'), this
+    #: is the string "conversion" and the full Type is found in return_type
+    operator: typing.Optional[str] = None
+
 
 @dataclass
 class Method(Function):
@@ -585,19 +594,6 @@ class Method(Function):
     override: bool = False
 
 
-@dataclass
-class Operator(Method):
-    """
-    Represents an operator method
-    """
-
-    #: The operator type (+, +=, etc).
-    #:
-    #: In the case of a conversion operator (such as 'operator bool'), this
-    #: is the string "conversion" and the full Type is found in return_type
-    operator: str = ""
-
-
 @dataclass
 class FriendDecl:
     """

tests/test_class.py

@@ -14,7 +14,6 @@
     Method,
     MoveReference,
     NameSpecifier,
-    Operator,
     PQName,
     Parameter,
     Pointer,
@@ -369,7 +368,7 @@ class M {
                             access="public",
                             constructor=True,
                         ),
-                        Operator(
+                        Method(
                             return_type=Type(
                                 typename=PQName(
                                     segments=[FundamentalSpecifier(name="int")]
@@ -399,7 +398,7 @@ class M {
                             const=True,
                             operator="()",
                         ),
-                        Operator(
+                        Method(
                             return_type=Reference(
                                 ref_to=Type(
                                     typename=PQName(

tests/test_doxygen.py

@@ -14,7 +14,6 @@
     Method,
     MoveReference,
     NameSpecifier,
-    Operator,
     PQName,
     Parameter,
     Pointer,

tests/test_fn.py

@@ -7,9 +7,9 @@
     Function,
     FunctionType,
     FundamentalSpecifier,
+    Method,
     MoveReference,
     NameSpecifier,
-    Operator,
     PQName,
     Parameter,
     Pointer,
@@ -888,7 +888,7 @@ def test_method_w_reference() -> None:
                         )
                     ),
                     methods=[
-                        Operator(
+                        Method(
                             return_type=Reference(
                                 ref_to=Type(
                                     typename=PQName(