Slight simplification of iterator definitions

Author: jim-easterbrook

src/interface/exif.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -61,10 +61,7 @@ INPUT_BUFFER_RO(const Exiv2::byte* buf, size_t size)
 
 EXTEND_METADATUM(Exiv2::Exifdatum)
 
-DATA_ITERATOR_TYPEMAPS(ExifData)
-#ifndef SWIGIMPORTED
-DATA_ITERATOR_CLASSES(ExifData, Exifdatum)
-#endif
+DATA_ITERATOR(ExifData, Exifdatum)
 
 // Get the current (or default if not set) type id of a datum
 %fragment("get_type_id"{Exiv2::Exifdatum}, "header") {

src/interface/iptc.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -42,10 +42,7 @@ EXCEPTION()
 
 EXTEND_METADATUM(Exiv2::Iptcdatum)
 
-DATA_ITERATOR_TYPEMAPS(IptcData)
-#ifndef SWIGIMPORTED
-DATA_ITERATOR_CLASSES(IptcData, Iptcdatum)
-#endif
+DATA_ITERATOR(IptcData, Iptcdatum)
 
 // Get the current (or default if not set) type id of a datum
 %fragment("get_type_id"{Exiv2::Iptcdatum}, "header") {

src/interface/shared/data_iterator.i

@@ -19,8 +19,8 @@
 %include "shared/keep_reference.i"
 
 
-// Macros to wrap data iterators
-%define DATA_ITERATOR_CLASSES(container_type, datum_type)
+// Macro to wrap data iterators
+%define DATA_ITERATOR(container_type, datum_type)
 %feature("python:slot", "tp_str", functype="reprfunc")
     container_type##_iterator::__str__;
 %feature("python:slot", "tp_iter", functype="getiterfunc")
@@ -48,7 +48,6 @@ KEEP_REFERENCE(container_type##_iterator*)
     $typemap(out, Exiv2::datum_type*)
 }
 %inline %{
-// Base class implements all methods except dereferencing
 class container_type##_iterator {
 private:
     Exiv2::container_type::iterator ptr;
@@ -68,9 +67,7 @@ public:
                 "container_type changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::datum_type* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::container_type::iterator operator*() const { return ptr; }
     bool operator==(const container_type##_iterator &other) const {
@@ -106,10 +103,7 @@ public:
     }
 };
 %}
-%enddef // DATA_ITERATOR_CLASSES
 
-// Declare typemaps for data iterators.
-%define DATA_ITERATOR_TYPEMAPS(container_type)
 %typemap(in) Exiv2::container_type::iterator
         (container_type##_iterator *argp=NULL) %{
     {
@@ -153,13 +147,11 @@ public:
 // Functions to store weak references to iterators (swig >= v4.4)
 %fragment("iterator_weakref_funcs", "header", fragment="private_data") {
 static void _process_list(PyObject* list, bool invalidate) {
-    PyObject* ref = NULL;
     PyObject* iterator = NULL;
     for (Py_ssize_t idx = PyList_Size(list); idx > 0; idx--) {
-        ref = PyList_GetItem(list, idx - 1);
-        iterator = PyWeakref_GetObject(ref);
+        iterator = PyWeakref_GetObject(PyList_GetItem(list, idx-1));
         if (iterator == Py_None)
-            PyList_SetSlice(list, idx - 1, idx, NULL);
+            PyList_SetSlice(list, idx-1, idx, NULL);
         else if (invalidate)
             Py_XDECREF(PyObject_CallMethod(iterator, "_invalidate", NULL));
     }
@@ -214,7 +206,8 @@ static int store_iterator_weakref(PyObject* py_self, PyObject* iterator) {
 %newobject Exiv2::container_type::findKey;
 // Assumes arg1 is the base class parent
 #if SWIG_VERSION >= 0x040400
-%typemap(out, fragment="iterator_weakref_funcs") Exiv2::container_type::iterator {
+%typemap(out, fragment="iterator_weakref_funcs")
+    Exiv2::container_type::iterator {
 #else
 %typemap(out) Exiv2::container_type::iterator {
 #endif
@@ -231,4 +224,4 @@ static int store_iterator_weakref(PyObject* py_self, PyObject* iterator) {
 }
 // Keep a reference to the data being iterated
 KEEP_REFERENCE(Exiv2::container_type::iterator)
-%enddef // DATA_ITERATOR_TYPEMAPS
+%enddef // DATA_ITERATOR

src/interface/xmp.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -42,10 +42,7 @@ EXCEPTION()
 
 EXTEND_METADATUM(Exiv2::Xmpdatum)
 
-DATA_ITERATOR_TYPEMAPS(XmpData)
-#ifndef SWIGIMPORTED
-DATA_ITERATOR_CLASSES(XmpData, Xmpdatum)
-#endif
+DATA_ITERATOR(XmpData, Xmpdatum)
 
 // Get the current (or default if not set) type id of a datum
 %fragment("get_type_id"{Exiv2::Xmpdatum}, "header") {

src/swig-0_27_7/exif_wrap.cxx

@@ -4380,7 +4380,6 @@ static void _set_python_exception() {
 #endif
 
 
-// Base class implements all methods except dereferencing
 class ExifData_iterator {
 private:
     Exiv2::ExifData::iterator ptr;
@@ -4400,9 +4399,7 @@ class ExifData_iterator {
                 "ExifData changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::Exifdatum* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::ExifData::iterator operator*() const { return ptr; }
     bool operator==(const ExifData_iterator &other) const {

src/swig-0_27_7/iptc_wrap.cxx

@@ -4369,7 +4369,6 @@ static void _set_python_exception() {
 };
 
 
-// Base class implements all methods except dereferencing
 class IptcData_iterator {
 private:
     Exiv2::IptcData::iterator ptr;
@@ -4389,9 +4388,7 @@ class IptcData_iterator {
                 "IptcData changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::Iptcdatum* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::IptcData::iterator operator*() const { return ptr; }
     bool operator==(const IptcData_iterator &other) const {

src/swig-0_27_7/xmp_wrap.cxx

@@ -4371,7 +4371,6 @@ static void _set_python_exception() {
 };
 
 
-// Base class implements all methods except dereferencing
 class XmpData_iterator {
 private:
     Exiv2::XmpData::iterator ptr;
@@ -4391,9 +4390,7 @@ class XmpData_iterator {
                 "XmpData changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::Xmpdatum* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::XmpData::iterator operator*() const { return ptr; }
     bool operator==(const XmpData_iterator &other) const {

src/swig-0_28_5/exif_wrap.cxx

@@ -4380,7 +4380,6 @@ static void _set_python_exception() {
 #endif
 
 
-// Base class implements all methods except dereferencing
 class ExifData_iterator {
 private:
     Exiv2::ExifData::iterator ptr;
@@ -4400,9 +4399,7 @@ class ExifData_iterator {
                 "ExifData changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::Exifdatum* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::ExifData::iterator operator*() const { return ptr; }
     bool operator==(const ExifData_iterator &other) const {

src/swig-0_28_5/iptc_wrap.cxx

@@ -4369,7 +4369,6 @@ static void _set_python_exception() {
 };
 
 
-// Base class implements all methods except dereferencing
 class IptcData_iterator {
 private:
     Exiv2::IptcData::iterator ptr;
@@ -4389,9 +4388,7 @@ class IptcData_iterator {
                 "IptcData changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::Iptcdatum* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::IptcData::iterator operator*() const { return ptr; }
     bool operator==(const IptcData_iterator &other) const {

src/swig-0_28_5/xmp_wrap.cxx

@@ -4371,7 +4371,6 @@ static void _set_python_exception() {
 };
 
 
-// Base class implements all methods except dereferencing
 class XmpData_iterator {
 private:
     Exiv2::XmpData::iterator ptr;
@@ -4391,9 +4390,7 @@ class XmpData_iterator {
                 "XmpData changed size during iteration");
         if (ptr == end)
             return NULL;
-        Exiv2::Xmpdatum* result = &(*ptr);
-        ptr++;
-        return result;
+        return &(*ptr++);
     }
     Exiv2::XmpData::iterator operator*() const { return ptr; }
     bool operator==(const XmpData_iterator &other) const {