Made GsweAntiscionData a refcounted boxed type

This is to satisfy #7

docs/reference/swe-glib/swe-glib-sections.txt

@@ -181,11 +181,16 @@ gswe_antiscion_axis_info_get_type
 <SECTION>
 <FILE>gswe-antiscion-data</FILE>
 GsweAntiscionData
-gswe_antiscion_data_get_antiscion_axis_info
+gswe_antiscion_data_new
-gswe_antiscion_data_get_axis
+gswe_antiscion_data_ref
-gswe_antiscion_data_get_difference
+gswe_antiscion_data_unref
+gswe_antiscion_data_set_planet1
 gswe_antiscion_data_get_planet1
+gswe_antiscion_data_set_planet2
 gswe_antiscion_data_get_planet2
+gswe_antiscion_data_get_axis
+gswe_antiscion_data_get_antiscion_axis_info
+gswe_antiscion_data_get_difference
 <SUBSECTION Standard>
 GSWE_TYPE_ANTISCION_DATA
 gswe_antiscion_data_get_type

src/gswe-antiscion-data-private.h

@@ -26,17 +26,19 @@
 struct _GsweAntiscionData {
     /* the first planet in the antiscion */
     GswePlanetData *planet1;
+
     /* the second planet in the antiscion */
     GswePlanetData *planet2;
-    /* the axis on which this antiscion is */
+
-    GsweAntiscionAxis axis;
     /* the #GsweAntiscionAxisInfo structure associated with this antiscion */
     GsweAntiscionAxisInfo *antiscion_axis_info;
+
     /* the difference in degrees between an exact antiscion and this given antiscion */
     gdouble difference;
-};
 
-GsweAntiscionData *gswe_antiscion_data_copy(GsweAntiscionData *antiscion_data);
+    /* reference count */
+    guint refcount;
+};
 
 #endif /* __SWE_GLIB_GSWE_ANTISCION_DATA_PRIVATE_H__ */
 #else /* not defined __SWE_GLIB_BUILDING__ */

src/gswe-antiscion-data.c

@@ -17,6 +17,8 @@
  */
 #include <glib-object.h>
 
+#include "swe-glib-private.h"
+#include "swe-glib.h"
 #include "gswe-antiscion-data.h"
 #include "gswe-antiscion-data-private.h"
 
@@ -32,25 +34,92 @@
  * between two planets, based on a specified axis.
  */
 
-GsweAntiscionData *
+G_DEFINE_BOXED_TYPE(GsweAntiscionData, gswe_antiscion_data, (GBoxedCopyFunc)gswe_antiscion_data_ref, (GBoxedFreeFunc)gswe_antiscion_data_unref);
-gswe_antiscion_data_copy(GsweAntiscionData *antiscion_data)
-{
-    GsweAntiscionData *ret = g_new0(GsweAntiscionData, 1);
 
-    ret->planet1 = antiscion_data->planet1;
+static void
-    ret->planet2 = antiscion_data->planet2;
+gswe_antiscion_data_free(GsweAntiscionData *antiscion_data)
-    ret->axis = antiscion_data->axis;
+{
-    ret->antiscion_axis_info = antiscion_data->antiscion_axis_info;
+    if (antiscion_data->planet1) {
-    ret->difference = antiscion_data->difference;
+        gswe_planet_data_unref(antiscion_data->planet1);
+    }
+
+    if (antiscion_data->planet2) {
+        gswe_planet_data_unref(antiscion_data->planet2);
+    }
+
+    if (antiscion_data->antiscion_axis_info) {
+        gswe_antiscion_axis_info_unref(antiscion_data->antiscion_axis_info);
+    }
+}
+
+/**
+ * gswe_antiscion_data_new:
+ *
+ * Creates a new #GsweAntiscionData object with reference count set to 1.
+ *
+ * Returns: (transfer full): a new #GsweAntiscionData object
+ */
+GsweAntiscionData *
+gswe_antiscion_data_new(void)
+{
+    GsweAntiscionData *ret;
+
+    ret = g_new0(GsweAntiscionData, 1);
+    ret->refcount = 1;
 
     return ret;
 }
 
-G_DEFINE_BOXED_TYPE(GsweAntiscionData, gswe_antiscion_data, (GBoxedCopyFunc)gswe_antiscion_data_copy, (GBoxedFreeFunc)g_free);
+/**
+ * gswe_antiscion_data_ref:
+ * @antiscion_data: (in): a #GsweAntiscionData
+ *
+ * Increases reference count on @antiscion_data.
+ *
+ * Returns: (transfer none): the same #GsweAntiscionData
+ */
+GsweAntiscionData *
+gswe_antiscion_data_ref(GsweAntiscionData *antiscion_data)
+{
+    antiscion_data->refcount++;
+
+    return antiscion_data;
+}
+
+/**
+ * gswe_antiscion_data_unref:
+ * @antiscion_data: (in): a #GsweAntiscionData
+ *
+ * Decreases reference count on @antiscion_data. If reference count reaches zero, @antiscion_data is freed.
+ */
+void
+gswe_antiscion_data_unref(GsweAntiscionData *antiscion_data)
+{
+    if (--antiscion_data->refcount == 0) {
+        gswe_antiscion_data_free(antiscion_data);
+    }
+}
+
+/**
+ * gswe_antiscion_data_set_planet1:
+ * @antiscion_data: (in): a #GsweAntiscionData
+ * @planet1: (in): a #GswePlanetData
+ *
+ * Sets @planet1 as the first planet of the antiscion.
+ */
+void
+gswe_antiscion_data_set_planet1(GsweAntiscionData *antiscion_data, GswePlanetData *planet1)
+{
+    if (antiscion_data->planet1) {
+        gswe_planet_data_unref(antiscion_data->planet1);
+    }
+
+    antiscion_data->planet1 = gswe_planet_data_ref(planet1);
+}
 
 /**
  * gswe_antiscion_data_get_planet1:
- * @antiscion_data: a #GsweAntiscionData
+ * @antiscion_data: (in): a #GsweAntiscionData
  *
  * Gets the first in the antiscion relationship.
  *
@@ -59,16 +128,29 @@ G_DEFINE_BOXED_TYPE(GsweAntiscionData, gswe_antiscion_data, (GBoxedCopyFunc)gswe
 GswePlanetData *
 gswe_antiscion_data_get_planet1(GsweAntiscionData *antiscion_data)
 {
-    if (antiscion_data) {
+    return antiscion_data->planet1;
-        return antiscion_data->planet1;
+}
-    } else {
+
-        return NULL;
+/**
+ * gswe_antiscion_data_set_planet2:
+ * @antiscion_data: (in): a #GsweAntiscionData
+ * @planet2: (in): a #GswePlanetData
+ *
+ * Sets @planet2 as the second planet of the antiscion.
+ */
+void
+gswe_antiscion_data_set_planet2(GsweAntiscionData *antiscion_data, GswePlanetData *planet2)
+{
+    if (antiscion_data->planet2) {
+        gswe_planet_data_unref(antiscion_data->planet2);
     }
+
+    antiscion_data->planet2 = gswe_planet_data_ref(planet2);
 }
 
 /**
  * gswe_antiscion_data_get_planet2:
- * @antiscion_data: a #GsweAntiscionData
+ * @antiscion_data: (in): a #GsweAntiscionData
  *
  * Gets the second in the antiscion relationship.
  *
@@ -77,16 +159,40 @@ gswe_antiscion_data_get_planet1(GsweAntiscionData *antiscion_data)
 GswePlanetData *
 gswe_antiscion_data_get_planet2(GsweAntiscionData *antiscion_data)
 {
-    if (antiscion_data) {
+    return antiscion_data->planet2;
-        return antiscion_data->planet2;
+}
-    } else {
+
-        return NULL;
+/**
+ * gswe_antiscion_data_set_axis:
+ * @antiscion_data: a #GsweAntiscionData
+ * @axis: the axis to set in @antiscion_data
+ * @err: a #GError
+ *
+ * Sets the antiscion axis, which must be known by SWE-GLib (e.g. by calling
+ * gswe_init()). @err is populated with GSWE_ERROR_UNKNOWN_ANTISCION_AXIS if
+ * the axis is not known.
+ */
+void
+gswe_antiscion_data_set_axis(GsweAntiscionData *antiscion_data, GsweAntiscionAxis axis, GError **err)
+{
+    GsweAntiscionAxisInfo *antiscion_axis_info;
+
+    if ((antiscion_axis_info = g_hash_table_lookup(gswe_antiscion_axis_info_table, GINT_TO_POINTER(axis))) == NULL) {
+        g_set_error(err, GSWE_ERROR, GSWE_ERROR_UNKNOWN_ANTISCION_AXIS, "Unknown antiscion axis");
+
+        return;
     }
+
+    if (antiscion_data->antiscion_axis_info) {
+        gswe_antiscion_axis_info_unref(antiscion_data->antiscion_axis_info);
+    }
+
+    antiscion_data->antiscion_axis_info = gswe_antiscion_axis_info_ref(antiscion_axis_info);
 }
 
 /**
  * gswe_antiscion_data_get_axis:
- * @antiscion_data: a #GsweAntiscionData
+ * @antiscion_data: (in): a #GsweAntiscionData
  *
  * Gets the axis on which the antiscion relationship exists.
  *
@@ -95,16 +201,33 @@ gswe_antiscion_data_get_planet2(GsweAntiscionData *antiscion_data)
 GsweAntiscionAxis
 gswe_antiscion_data_get_axis(GsweAntiscionData *antiscion_data)
 {
-    if (antiscion_data) {
+    if (antiscion_data->antiscion_axis_info) {
-        return antiscion_data->axis;
+        return antiscion_data->antiscion_axis_info->axis;
     } else {
         return GSWE_ANTISCION_AXIS_NONE;
     }
 }
 
+/**
+ * gswe_antiscion_data_set_antiscion_axis_info:
+ * @antiscion_data: (in): a #GsweAntiscionData
+ * @antiscion_axis_info: (in): a #GsweAntiscionAxisInfo
+ *
+ * Sets @antiscion_axis_info as the axis of this #GsweAntiscionData.
+ */
+void
+gswe_antiscion_data_set_antiscion_axis_info(GsweAntiscionData *antiscion_data, GsweAntiscionAxisInfo *antiscion_axis_info)
+{
+    if (antiscion_data->antiscion_axis_info) {
+        gswe_antiscion_axis_info_unref(antiscion_data->antiscion_axis_info);
+    }
+
+    antiscion_data->antiscion_axis_info = gswe_antiscion_axis_info_ref(antiscion_axis_info);
+}
+
 /**
  * gswe_antiscion_data_get_antiscion_axis_info:
- * @antiscion_data: a #GsweAntiscionData
+ * @antiscion_data: (in): a #GsweAntiscionData
  *
  * Gets the axis information related to the antiscion relationship's axis.
  *
@@ -113,16 +236,25 @@ gswe_antiscion_data_get_axis(GsweAntiscionData *antiscion_data)
 GsweAntiscionAxisInfo *
 gswe_antiscion_data_get_antiscion_axis_info(GsweAntiscionData *antiscion_data)
 {
-    if (antiscion_data) {
+    return antiscion_data->antiscion_axis_info;
-        return antiscion_data->antiscion_axis_info;
+}
-    } else {
+
-        return NULL;
+/**
-    }
+ * gswe_antiscion_data_set_difference:
+ * @antiscion_data: a #GsweAntiscionData
+ * @difference: the difference from an exact antiscion, in degrees
+ *
+ * Sets the difference of this antiscion from an exact antiscion.
+ */
+void
+gswe_antiscion_data_set_difference(GsweAntiscionData *antiscion_data, gdouble difference)
+{
+    antiscion_data->difference = difference;
 }
 
 /**
  * gswe_antiscion_data_get_difference:
- * @antiscion_data: a #GsweAntiscionData
+ * @antiscion_data: (in): a #GsweAntiscionData
  *
  * Gets the difference between an exact antiscion and this antiscion relationship.
  *
@@ -131,10 +263,6 @@ gswe_antiscion_data_get_antiscion_axis_info(GsweAntiscionData *antiscion_data)
 gdouble
 gswe_antiscion_data_get_difference(GsweAntiscionData *antiscion_data)
 {
-    if (antiscion_data) {
+    return antiscion_data->difference;
-        return antiscion_data->difference;
-    } else {
-        return 0.0;
-    }
 }
 

src/gswe-antiscion-data.h

@@ -38,8 +38,17 @@ typedef struct _GsweAntiscionData GsweAntiscionData;
 GType gswe_antiscion_data_get_type(void);
 #define GSWE_TYPE_ANTISCION_DATA (gswe_antiscion_data_get_type())
 
+GsweAntiscionData *gswe_antiscion_data_new(void);
+
+GsweAntiscionData *gswe_antiscion_data_ref(GsweAntiscionData *antiscion_data);
+void gswe_antiscion_data_unref(GsweAntiscionData *antiscion_data);
+
+void gswe_antiscion_data_set_planet1(GsweAntiscionData *antiscion_data, GswePlanetData *planet1);
 GswePlanetData *gswe_antiscion_data_get_planet1(GsweAntiscionData *antiscion_data);
+
+void gswe_antiscion_data_set_planet2(GsweAntiscionData *antiscion_data, GswePlanetData *planet2);
 GswePlanetData *gswe_antiscion_data_get_planet2(GsweAntiscionData *antiscion_data);
+
 GsweAntiscionAxis gswe_antiscion_data_get_axis(GsweAntiscionData *antiscion_data);
 GsweAntiscionAxisInfo *gswe_antiscion_data_get_antiscion_axis_info(GsweAntiscionData *antiscion_data);
 gdouble gswe_antiscion_data_get_difference(GsweAntiscionData *antiscion_data);

src/gswe-moment.c

@@ -204,6 +204,7 @@ gswe_moment_finalize(GObject *gobject)
     g_list_free_full(moment->priv->house_list, g_free);
     g_list_free_full(moment->priv->planet_list, (GDestroyNotify)gswe_planet_data_unref);
     g_list_free_full(moment->priv->aspect_list, (GDestroyNotify)gswe_aspect_data_unref);
+    g_list_free_full(moment->priv->antiscia_list, (GDestroyNotify)gswe_antiscion_data_unref);
     gswe_moon_phase_data_unref(moment->priv->moon_phase);
 
     G_OBJECT_CLASS(gswe_moment_parent_class)->finalize(gobject);
@@ -1166,7 +1167,6 @@ find_antiscion(gpointer axis_p, GsweAntiscionAxisInfo *antiscion_axis_info, Gswe
 
     if ((antiscion_data->difference = fabs(antiscion_data->planet2->position - axis_position)) <= planet_orb) {
         antiscion_data->antiscion_axis_info = antiscion_axis_info;
-        antiscion_data->axis = axis;
 
         return TRUE;
     } else {
@@ -1206,7 +1206,7 @@ gswe_moment_calculate_antiscia(GsweMoment *moment)
     }
 
     gswe_moment_calculate_all_planets(moment);
-    g_list_free_full(moment->priv->antiscia_list, g_free);
+    g_list_free_full(moment->priv->antiscia_list, (GDestroyNotify)gswe_antiscion_data_unref);
     moment->priv->antiscia_list = NULL;
 
     for (oplanet = moment->priv->planet_list; oplanet; oplanet = oplanet->next) {
@@ -1227,14 +1227,14 @@ gswe_moment_calculate_antiscia(GsweMoment *moment)
                 continue;
             }
 
-            antiscion_data = g_new0(GsweAntiscionData, 1);
+            antiscion_data = gswe_antiscion_data_new();
             antiscion_data->planet1 = outer_planet;
             antiscion_data->planet2 = inner_planet;
-            antiscion_data->axis = GSWE_ANTISCION_AXIS_NONE;
+            antiscion_data->antiscion_axis_info = NULL;
 
             (void)g_hash_table_find(gswe_antiscion_axis_info_table, (GHRFunc)find_antiscion, antiscion_data);
 
-            if (antiscion_data->axis == GSWE_ANTISCION_AXIS_NONE) {
+            if (antiscion_data->antiscion_axis_info->axis == GSWE_ANTISCION_AXIS_NONE) {
                 antiscion_data->antiscion_axis_info = g_hash_table_lookup(gswe_antiscion_axis_info_table, GINT_TO_POINTER(GSWE_ANTISCION_AXIS_NONE));
             }
 
@@ -1324,7 +1324,7 @@ gswe_moment_get_axis_all_antiscia(GsweMoment *moment, GsweAntiscionAxis axis)
     for (antiscion_l = moment->priv->antiscia_list; antiscion_l; antiscion_l = g_list_next(antiscion_l)) {
         GsweAntiscionData *antiscion_data = antiscion_l->data;
 
-        if (antiscion_data->axis == axis) {
+        if (antiscion_data->antiscion_axis_info->axis == axis) {
             ret = g_list_prepend(ret, antiscion_data);
         }
     }

src/swe-glib.h

@@ -46,6 +46,7 @@
  * @GSWE_ERROR_UNKNOWN_SIGN: an invalid zodiac sign would have been returned
  * @GSWE_ERROR_UNKNOWN_PLANET: the referenced planet was not added with
  *                             gswe_moment_add_planet()
+ * @GSWE_ERROR_UNKNOWN_ANTISCION_AXIS: the given axis is unknown to SWE-GLib
  *
  * Error codes returned by the SWE-GLib functions.
  */
@@ -59,6 +60,7 @@ typedef enum {
     GSWE_ERROR_UNKNOWN_HSYS,
     GSWE_ERROR_UNKNOWN_SIGN,
     GSWE_ERROR_UNKNOWN_PLANET,
+    GSWE_ERROR_UNKNOWN_ANTISCION_AXIS,
 } GsweError;
 
 /**