[gdb/python] Use py_{none,false} more often

Do:
...
$ sed -i \
    "s/gdbpy_ref<>::new_reference (Py_False)/py_false ()/" \
    gdb/python/*.{c,h}
...

Likewise for py_none.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index bcb1ba37d93d929240937f41cc7d88c573ef807e..c515446dad8036953a777537905511c3d446ace5 100644 (file)
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -186,7 +186,7 @@ cmdpy_completer_helper (struct cmd_list_element *command,
   if (word == NULL)
     {
       /* "brkchars" phase.  */
-      wordobj = gdbpy_ref<>::new_reference (Py_None);
+      wordobj = py_none ();
     }
   else
     {

diff --git a/gdb/python/py-connection.c b/gdb/python/py-connection.c
index 2d0b2e94659cb5e65779fb18e5a182620744eb2a..3f20e8876f98fb3e73837c44dc2f9ee414236cd4 100644 (file)
--- a/gdb/python/py-connection.c
+++ b/gdb/python/py-connection.c
@@ -74,7 +74,7 @@ gdbpy_ref<>
 target_to_connection_object (process_stratum_target *target)
 {
   if (target == nullptr)
-    return gdbpy_ref<>::new_reference (Py_None);
+    return py_none ();
 
   gdbpy_ref <connection_object> conn_obj;
   auto conn_obj_iter = all_connection_objects.find (target);

diff --git a/gdb/python/py-corefile.c b/gdb/python/py-corefile.c
index 2c5596d093c84ff45a0af0d2f99c1b7d5098d54f..5acfd98d32620947a6554340538b01efa2525b65 100644 (file)
--- a/gdb/python/py-corefile.c
+++ b/gdb/python/py-corefile.c
@@ -117,7 +117,7 @@ gdbpy_core_file_from_inferior (inferior *inf)
   gdb_assert (inf->pspace != nullptr);
 
   if (get_inferior_core_bfd (inf) == nullptr)
-    return gdbpy_ref<>::new_reference (Py_None);
+    return py_none ();
 
   PyObject *result = (PyObject *) cfpy_inferior_corefile_data_key.get (inf);
   if (result != nullptr)
@@ -265,7 +265,7 @@ cfpy_mapped_files (PyObject *self, PyObject *args)
            return nullptr;
        }
       else
-       build_id = gdbpy_ref<>::new_reference (Py_None);
+       build_id = py_none ();
 
       /* List to hold all the gdb.CorefileMappedFileRegion objects.  */
       gdbpy_ref<> regions (PyTuple_New (file.regions.size ()));

diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index 2a674ba52f83440e86eb8c6088f51cec6639f879..068b6260af57cd739430dfc93d4174eceabb4030 100644 (file)
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -420,7 +420,7 @@ frapy_older (PyObject *self, PyObject *args)
   if (prev)
     prev_obj = frame_info_to_frame_object (prev);
   else
-    prev_obj = gdbpy_ref<>::new_reference (Py_None);
+    prev_obj = py_none ();
 
   return prev_obj.release ();
 }
@@ -449,7 +449,7 @@ frapy_newer (PyObject *self, PyObject *args)
   if (next)
     next_obj = frame_info_to_frame_object (next);
   else
-    next_obj = gdbpy_ref<>::new_reference (Py_None);
+    next_obj = py_none ();
 
   return next_obj.release ();
 }

diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index d2fc159c227c683588872d5e9390b71165b6ce3d..426aec31e9ed8c8e614b74768e31f7ab1d1f1e65 100644 (file)
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -1026,7 +1026,7 @@ python_context_changed (user_selected_what selection)
   if (has_stack_frames ())
     frame_obj = gdbpy_ref<> (gdbpy_selected_frame (nullptr, nullptr));
   else
-    frame_obj = gdbpy_ref<>::new_reference (Py_None);
+    frame_obj = py_none ();
 
   if (frame_obj == nullptr)
     {

diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index a561196a2a9fcd9c6e357543b7e429f328e4c3a6..72ad5efcf0773604ec3940fc05c37c1e50108dba 100644 (file)
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -86,7 +86,7 @@ search_pp_list (PyObject *list, PyObject *value)
        return printer;
     }
 
-  return gdbpy_ref<>::new_reference (Py_None);
+  return py_none ();
 }
 
 /* Subroutine of find_pretty_printer to simplify it.
@@ -151,11 +151,11 @@ find_pretty_printer_from_gdb (PyObject *value)
   /* Fetch the global pretty printer list.  */
   if (gdb_python_module == NULL
       || ! PyObject_HasAttrString (gdb_python_module, "pretty_printers"))
-    return gdbpy_ref<>::new_reference (Py_None);
+    return py_none ();
   gdbpy_ref<> pp_list (PyObject_GetAttrString (gdb_python_module,
                                               "pretty_printers"));
   if (pp_list == NULL || ! PyList_Check (pp_list.get ()))
-    return gdbpy_ref<>::new_reference (Py_None);
+    return py_none ();
 
   return search_pp_list (pp_list.get (), value);
 }
@@ -199,7 +199,7 @@ pretty_print_one_value (PyObject *printer, struct value **out_value)
   try
     {
       if (!PyObject_HasAttr (printer, gdbpy_to_string_cst))
-       result = gdbpy_ref<>::new_reference (Py_None);
+       result = py_none ();
       else
        {
          result.reset (PyObject_CallMethodObjArgs (printer, gdbpy_to_string_cst,

diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 5f1c93170c65ddc5ea44330c0236396fdd96d4e3..bacb172fec4b493badb1f89ae4f69bcb6097d074 100644 (file)
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -824,7 +824,7 @@ recpy_call_filter (const uint64_t payload, std::optional<uint64_t> ip,
 
   gdbpy_ref<> py_ip;
   if (!ip.has_value ())
-    py_ip = gdbpy_ref<>::new_reference (Py_None);
+    py_ip = py_none ();
   else
     py_ip = gdb_py_object_from_ulongest (*ip);
 

diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index bf803a3b4872726aeb8b0dd7aaf96bedde7d5ba6..224e5d90f26e853bb08ecfa505099df7ffdf820f 100644 (file)
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -450,7 +450,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw)
        return nullptr;
     }
   else
-    sym_obj = gdbpy_ref<>::new_reference (Py_None);
+    sym_obj = py_none ();
 
   if (PyTuple_SetItem (ret_tuple.get (), 0, sym_obj.release ()) < 0)
     return nullptr;
@@ -495,7 +495,7 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw)
        return nullptr;
     }
   else
-    sym_obj = gdbpy_ref<>::new_reference (Py_None);
+    sym_obj = py_none ();
 
   return sym_obj.release ();
 }
@@ -560,7 +560,7 @@ gdbpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw)
        return nullptr;
     }
   else
-    sym_obj = gdbpy_ref<>::new_reference (Py_None);
+    sym_obj = py_none ();
 
   return sym_obj.release ();
 }

diff --git a/gdb/python/py-threadevent.c b/gdb/python/py-threadevent.c
index 13ce0d18daf8073a10a181362657abfd73e504ac..3c28aa1174a9e383cbac8ce3f311f10b79f86ae2 100644 (file)
--- a/gdb/python/py-threadevent.c
+++ b/gdb/python/py-threadevent.c
@@ -33,7 +33,7 @@ py_get_event_thread (ptid_t ptid)
       PyErr_SetString (PyExc_RuntimeError, "Could not find event thread");
       return NULL;
     }
-  return gdbpy_ref<>::new_reference (Py_None);
+  return py_none ();
 }
 
 gdbpy_ref<>

diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 89ff19cd7592150f43f5ef2fff92fd675f8e8a7f..775145a81350b9062f3f46a85b9d56a7da640a58 100644 (file)
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -147,7 +147,7 @@ convert_field (struct type *type, int field)
       else
        {
          if (type->field (field).loc_is_dwarf_block ())
-           arg = gdbpy_ref<>::new_reference (Py_None);
+           arg = py_none ();
          else
            arg = gdb_py_object_from_longest (type->field (field).loc_bitpos ());
          attrstring = "bitpos";
@@ -173,7 +173,7 @@ convert_field (struct type *type, int field)
        }
     }
   if (arg == NULL)
-    arg = gdbpy_ref<>::new_reference (Py_None);
+    arg = py_none ();
 
   if (PyObject_SetAttrString (result.get (), "name", arg.get ()) < 0)
     return NULL;
@@ -185,7 +185,7 @@ convert_field (struct type *type, int field)
   if (type->code () == TYPE_CODE_STRUCT)
     arg.reset (PyBool_FromLong (field < TYPE_N_BASECLASSES (type)));
   else
-    arg = gdbpy_ref<>::new_reference (Py_False);
+    arg = py_false ();
   if (PyObject_SetAttrString (result.get (), "is_base_class", arg.get ()) < 0)
     return NULL;
 
@@ -197,7 +197,7 @@ convert_field (struct type *type, int field)
 
   /* A field can have a NULL type in some situations.  */
   if (type->field (field).type () == NULL)
-    arg = gdbpy_ref<>::new_reference (Py_None);
+    arg = py_none ();
   else
     arg = type_to_type_object (type->field (field).type ());
   if (arg == NULL)
@@ -219,7 +219,7 @@ field_name (struct type *type, int field)
   if (type->field (field).name ())
     result.reset (PyUnicode_FromString (type->field (field).name ()));
   else
-    result = gdbpy_ref<>::new_reference (Py_None);
+    result = py_none ();
 
   return result;
 }

diff --git a/gdb/python/python.c b/gdb/python/python.c
index 4644d2868556d76d042a9446bff442d13788ded7..fd254a340d854d4a0123ee10550729f40b83692e 100644 (file)
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -1030,7 +1030,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
        }
     }
   else
-    result = gdbpy_ref<>::new_reference (Py_None);
+    result = py_none ();
 
   gdbpy_ref<> return_result (PyTuple_New (2));
   if (return_result == NULL)
@@ -1043,7 +1043,7 @@ gdbpy_decode_line (PyObject *self, PyObject *args)
        return NULL;
     }
   else
-    unparsed = gdbpy_ref<>::new_reference (Py_None);
+    unparsed = py_none ();
 
   if (PyTuple_SetItem (return_result.get (), 0, unparsed.release ()) < 0
       || PyTuple_SetItem (return_result.get (), 1, result.release ()) < 0)