Fix errors related to corner cases of function aliases

Author: mysticfall

bpystubgen/directives.py

@@ -333,8 +333,7 @@ def run(self) -> List[Node]:
                 alias_match = self._alias_pattern.match(ds.docstring.astext())
 
                 if alias_match:
-                    alias_text = alias_match.group(1)
-                    alias_text.replace(" and ", ", ")
+                    alias_text = alias_match.group(1).replace(" and ", ", ").replace(" or ", ", ")
 
                     for alias in map(lambda a: a.strip(), alias_text.split(",")):
                         copy = elem.deepcopy()

tests/fixtures/stub/bgl/__init__.pyi

@@ -147,11 +147,15 @@ for example.
 
 :func:`glEvalMesh`
 
-:func:`glEvalMesh1 or glEvalMesh2`
+:func:`glEvalMesh1`
+
+:func:`glEvalMesh2`
 
 :func:`glEvalPoint`
 
-:func:`glEvalPoint1 and glEvalPoint2`
+:func:`glEvalPoint1`
+
+:func:`glEvalPoint2`
 
 :func:`glFeedbackBuffer`
 
@@ -187,7 +191,9 @@ for example.
 
 :func:`glGetLight`
 
-:func:`glGetLightfv and glGetLightiv`
+:func:`glGetLightfv`
+
+:func:`glGetLightiv`
 
 :func:`glGetMap`
 
@@ -1592,7 +1598,21 @@ def glEvalMesh(mode: typing.Any, i1: typing.Any, i2: typing.Any) -> None:
 
   ...
 
-def glEvalMesh1 or glEvalMesh2(mode: typing.Any, i1: typing.Any, i2: typing.Any) -> None:
+def glEvalMesh1(mode: typing.Any, i1: typing.Any, i2: typing.Any) -> None:
+
+  """
+
+  B{glEvalMesh1 or glEvalMesh2}
+
+  Compute a one- or two-dimensional grid of points or lines
+
+  `OpenGL Docs <https://khronos.org/registry/OpenGL-Refpages/gl4/html/glEvalMesh.xhtml>`_
+
+  """
+
+  ...
+
+def glEvalMesh2(mode: typing.Any, i1: typing.Any, i2: typing.Any) -> None:
 
   """
 
@@ -1620,7 +1640,21 @@ def glEvalPoint(i: int, j: int) -> None:
 
   ...
 
-def glEvalPoint1 and glEvalPoint2(i: int, j: int) -> None:
+def glEvalPoint1(i: int, j: int) -> None:
+
+  """
+
+  B{glEvalPoint1 and glEvalPoint2}
+
+  Generate and evaluate a single point in a mesh
+
+  `OpenGL Docs <https://khronos.org/registry/OpenGL-Refpages/gl4/html/glEvalPoint.xhtml>`_
+
+  """
+
+  ...
+
+def glEvalPoint2(i: int, j: int) -> None:
 
   """
 
@@ -1860,7 +1894,21 @@ def glGetLight(light: typing.Any, pname: typing.Any, params: Buffer) -> None:
 
   ...
 
-def glGetLightfv and glGetLightiv(light: typing.Any, pname: typing.Any, params: Buffer) -> None:
+def glGetLightfv(light: typing.Any, pname: typing.Any, params: Buffer) -> None:
+
+  """
+
+  B{glGetLightfv and glGetLightiv}
+
+  Return light source parameter values
+
+  `OpenGL Docs <https://khronos.org/registry/OpenGL-Refpages/gl4/html/glGetLight.xhtml>`_
+
+  """
+
+  ...
+
+def glGetLightiv(light: typing.Any, pname: typing.Any, params: Buffer) -> None:
 
   """
 

tests/test_function.py

@@ -287,14 +287,12 @@ def test_parse_bpy_prop_collection(parser: Parser, document: document):
                                      "bpy.types.bpy_prop_collection]"
 
 
-def test_parse_alias(parser: Parser, document: document):
+def test_parse_alias_comma(parser: Parser, document: document):
     source = """
        .. function:: glEvalCoord (u,v):
 
           B{glEvalCoord1d, glEvalCoord1f, glEvalCoord2d, glEvalCoord2f, glEvalCoord1dv, glEvalCoord1fv,
           glEvalCoord2dv, glEvalCoord2fv}
-
-          Evaluate enabled one- and two-dimensional maps
     """.strip()
 
     parser.parse(source, document)
@@ -306,6 +304,22 @@ def test_parse_alias(parser: Parser, document: document):
                          "glEvalCoord2d", "glEvalCoord2dv", "glEvalCoord2f", "glEvalCoord2fv"}
 
 
+@mark.parametrize("conjunction", ("and", "or"))
+def test_parse_alias_conjunct(conjunction: str, parser: Parser, document: document):
+    source = f"""
+       .. function:: glEvalPoint (i, j):
+
+          B{{glEvalPoint1 {conjunction} glEvalPoint2}}
+    """.strip()
+
+    parser.parse(source, document)
+    document.transformer.apply_transforms()
+
+    functions = set(map(lambda f: f.name, document.traverse(Function)))
+
+    assert functions == {"glEvalPoint", "glEvalPoint1", "glEvalPoint2"}
+
+
 def test_parse_varargs(parser: Parser, document: document):
     source = """
        .. function:: app_template_paths(*, path=None)