From 01b43dc3d93e632c3c42fb8e1105f200b9cee2ae Mon Sep 17 00:00:00 2001
From: Christian Tismer <tismer@stackless.com>
Date: Tue, 13 Aug 2019 11:15:52 +0200
Subject: Add QtCore.Slot.__signature__ and much more manually

The signature of QtCore.Slot and other classes could not automatically
be generated because the function is not generated by cppgenerator.cpp .
We add it manually in the C++ code into the generation process.

The case of QtCore.Slot had diverse follow-up issues to be solved:

- Classes which did not inherit from Shiboken were not generated.
  This is a long-standing omission and creates very many new
  simple types.

- The arity of Slot has default arguments after the varargs parameter
  "*types". This needed an extended Python parser analysis that fixes
  the arguments given to the inspect module, accordingly.

- The signature generation was completely new implemented and
  relies no longer on the restricted syntax of a Python (2) function
  but generates signatures directly as Parameter instances.

Implemented classes with hand-made signatures:

    QtCore.ClassInfo
    QtCore.MetaFunction,
    QtCore.MetaSignal
    QtCore.Property
    QtCore.Signal
    QtCore.SignalInstance
    QtCore.Slot
    QtQml.ListProperty
    QtQml.VolatileBool

As a side effect, many more subtypes were published.
Enums are done, which concludes this work.

Fixes: PYSIDE-945
Fixes: PYSIDE-1052
Change-Id: Ic09f02ece3a90325519e42e4e39719beb0c27ae9
Reviewed-by: Christian Tismer <tismer@stackless.com>
---
 .../files.dir/shibokensupport/signature/parser.py          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py')

diff --git a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
index 6109bceee..3d14ec7b3 100644
--- a/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
+++ b/sources/shiboken2/shibokenmodule/files.dir/shibokensupport/signature/parser.py
@@ -116,7 +116,7 @@ def _parse_line(line):
                 print("KEYWORD", ret)
             name = name + "_"
         if "=" in ann:
-            ann, default = ann.split("=")
+            ann, default = ann.split("=", 1)
             tup = name, ann, default
         else:
             tup = name, ann
@@ -167,9 +167,11 @@ def try_to_guess(thing, valtype):
 
 def _resolve_value(thing, valtype, line):
     if thing in ("0", "None") and valtype:
-        if valtype.startswith("PySide2."):
+        if valtype.startswith("PySide2.") or valtype.startswith("typing."):
             return None
-        name = type_map[valtype].__name__
+        mapped = type_map[valtype]
+        # typing.Any: '_SpecialForm' object has no attribute '__name__'
+        name = mapped.__name__ if hasattr(mapped, "__name__") else str(mapped)
         thing = "zero({})".format(name)
     if thing in type_map:
         return type_map[thing]
@@ -275,9 +277,9 @@ def calculate_props(line):
     for idx, tup in enumerate(arglist):
         name, ann = tup[:2]
         if ann == "...":
-            name = "*args"
-            # copy the fields back :()
-            ann = 'NULL' # maps to None
+            name = "*args" if name.startswith("arg_") else "*" + name
+            # copy the pathed fields back
+            ann = 'nullptr'     # maps to None
             tup = name, ann
             arglist[idx] = tup
         annotations[name] = _resolve_type(ann, line, 0)
-- 
cgit v1.2.3