+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
+2000-12-24 Ali Abdin <aliabdin@aucegypt.edu>
+
+ * Makefile.am, gcompat.h, glib.h: New gcompat.h header file
+ as recommended by Havoc.
+
+ * gdate.c, gdate.h, testgdate.c,
+ docs/reference/glib/glib-sections.txt,
+ docs/reference/glib/tmpl/date.sgml, tests/date-test.c: Rename some
+ of the gdate functions to use the '_get' in their name. Patch
+ reviewed by Havoc.
+
2000-12-22 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Determine the suffix of the shared librarries for
BUILT_SOURCES=glib-config-2.0
glib-config-2.0: glib-config-2.0.in
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+ -DG_DISBALE_COMPAT_H
EXTRA_DIST = \
ChangeLog.pre-1-2 \
gasyncqueue.h \
gbacktrace.h \
gcache.h \
+ gcompat.h \
gcompletion.h \
gconvert.h \
gdataset.h \
g_date_compare
<SUBSECTION>
-g_date_day
-g_date_month
-g_date_year
-g_date_julian
-g_date_weekday
-g_date_day_of_year
+g_date_get_day
+g_date_get_month
+g_date_get_year
+g_date_get_julian
+g_date_get_weekday
+g_date_get_day_of_year
<SUBSECTION>
-g_date_days_in_month
+g_date_get_days_in_month
g_date_is_first_of_month
g_date_is_last_of_month
g_date_is_leap_year
-g_date_monday_week_of_year
-g_date_monday_weeks_in_year
-g_date_sunday_week_of_year
-g_date_sunday_weeks_in_year
+g_date_get_monday_week_of_year
+g_date_get_monday_weeks_in_year
+g_date_get_sunday_week_of_year
+g_date_get_sunday_weeks_in_year
<SUBSECTION>
g_date_strftime
greater than zero if @lhs is greater than @rhs
-<!-- ##### FUNCTION g_date_day ##### -->
+<!-- ##### FUNCTION g_date_get_day ##### -->
<para>\r
Return the day of the month; the #GDate must be valid.\r
</para>
@Returns: Day of the month
-<!-- ##### FUNCTION g_date_month ##### -->
+<!-- ##### FUNCTION g_date_get_month ##### -->
<para>\r
Accessor for the month of the year. Date must be valid.\r
</para>
@Returns: A #GDateMonth
-<!-- ##### FUNCTION g_date_year ##### -->
+<!-- ##### FUNCTION g_date_get_year ##### -->
<para>\r
Accessor; returns the year of a #GDate. The date must be valid.\r
</para>
@Returns: Year in which the date falls
-<!-- ##### FUNCTION g_date_julian ##### -->
+<!-- ##### FUNCTION g_date_get_julian ##### -->
<para>\r
Accessor, returns the Julian day or "serial number" of the #GDate. The\r
Julian day is simply the number of days since January 1, Year 1; i.e.,\r
@Returns: Julian day
-<!-- ##### FUNCTION g_date_weekday ##### -->
+<!-- ##### FUNCTION g_date_get_weekday ##### -->
<para>\r
Returns the day of the week for a #GDate. The date must be valid.\r
</para>
@Returns: Day of the week as a #GDateWeekday
-<!-- ##### FUNCTION g_date_day_of_year ##### -->
+<!-- ##### FUNCTION g_date_get_day_of_year ##### -->
<para>\r
Return the day of the year, where Jan 1 is the first day of the\r
year. Date must be valid.\r
@Returns: Day of the year
-<!-- ##### FUNCTION g_date_days_in_month ##### -->
+<!-- ##### FUNCTION g_date_get_days_in_month ##### -->
<para>\r
Return the number of days in a month, taking leap years into account.\r
</para>
@Returns: Boolean, if the year is a leap year
-<!-- ##### FUNCTION g_date_monday_week_of_year ##### -->
+<!-- ##### FUNCTION g_date_get_monday_week_of_year ##### -->
<para>\r
Return the week of the year, where weeks are understood to start on\r
Monday. If the date is before the first Monday of the year, return\r
@Returns: Week of the year
-<!-- ##### FUNCTION g_date_monday_weeks_in_year ##### -->
+<!-- ##### FUNCTION g_date_get_monday_weeks_in_year ##### -->
<para>\r
Return the number of weeks in the year, where weeks are taken to start\r
on Monday. Will be 52 or 53. Date must be valid. (Years always have 52\r
@Returns: Number of Mondays in the year
-<!-- ##### FUNCTION g_date_sunday_week_of_year ##### -->
+<!-- ##### FUNCTION g_date_get_sunday_week_of_year ##### -->
<para>\r
Week of the year during which this date falls, if weeks are understood\r
to being on Sunday. Date must be valid. Can return 0 if the day is\r
@Returns: Week number
-<!-- ##### FUNCTION g_date_sunday_weeks_in_year ##### -->
+<!-- ##### FUNCTION g_date_get_sunday_weeks_in_year ##### -->
<para>\r
Return the number of weeks in the year, where weeks are taken to start\r
on Sunday. Will be 52 or 53. Date must be valid. (Years always have 52\r
--- /dev/null
+/* GLIB - Library of useful routines for C programming
+ *
+ * Copyright (C) 2000 Ali Abdin <aliabdin@aucegypt.edu>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __G_COMPAT_H__
+#define __G_COMPAT_H__
+
+#include <gmacros.h>
+
+G_BEGIN_DECLS
+
+#ifndef G_DISABLE_COMPAT_H
+
+#define g_date_weekday g_date_get_weekday
+#define g_date_month g_date_get_month
+#define g_date_year g_date_get_year
+#define g_date_day g_date_get_day
+#define g_date_julian g_date_get_julian
+#define g_date_day_of_year g_date_get_day_of_year
+#define g_date_monday_week_of_year g_date_get_monday_week_of_year
+#define g_date_sunday_week_of_year g_date_get_sunday_week_of_year
+#define g_date_days_in_month g_date_get_days_in_month
+#define g_date_monday_weeks_in_year g_date_get_monday_weeks_in_year
+#define g_date_sunday_weeks_in_year g_date_get_sunday_weeks_in_year
+
+#endif /* G_DISABLE_COMPAT_H */
+
+G_END_DECLS
+
+#endif /* __G_COMPAT_H__ */
}
GDateWeekday
-g_date_weekday (GDate *d)
+g_date_get_weekday (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_WEEKDAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_WEEKDAY);
}
GDateMonth
-g_date_month (GDate *d)
+g_date_get_month (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_MONTH);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_MONTH);
}
GDateYear
-g_date_year (GDate *d)
+g_date_get_year (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_YEAR);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_YEAR);
}
GDateDay
-g_date_day (GDate *d)
+g_date_get_day (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_DAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_DAY);
}
guint32
-g_date_julian (GDate *d)
+g_date_get_julian (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_JULIAN);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_JULIAN);
}
guint
-g_date_day_of_year (GDate *d)
+g_date_get_day_of_year (GDate *d)
{
gint index;
}
guint
-g_date_monday_week_of_year (GDate *d)
+g_date_get_monday_week_of_year (GDate *d)
{
GDateWeekday wd;
guint day;
g_date_set_dmy (&first, 1, 1, d->year);
- wd = g_date_weekday (&first) - 1; /* make Monday day 0 */
- day = g_date_day_of_year (d) - 1;
+ wd = g_date_get_weekday (&first) - 1; /* make Monday day 0 */
+ day = g_date_get_day_of_year (d) - 1;
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
guint
-g_date_sunday_week_of_year (GDate *d)
+g_date_get_sunday_week_of_year (GDate *d)
{
GDateWeekday wd;
guint day;
g_date_set_dmy (&first, 1, 1, d->year);
- wd = g_date_weekday (&first);
+ wd = g_date_get_weekday (&first);
if (wd == 7) wd = 0; /* make Sunday day 0 */
- day = g_date_day_of_year (d) - 1;
+ day = g_date_get_day_of_year (d) - 1;
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
}
guint8
-g_date_days_in_month (GDateMonth month,
- GDateYear year)
+g_date_get_days_in_month (GDateMonth month,
+ GDateYear year)
{
gint index;
}
guint8
-g_date_monday_weeks_in_year (GDateYear year)
+g_date_get_monday_weeks_in_year (GDateYear year)
{
GDate d;
g_date_clear (&d, 1);
g_date_set_dmy (&d, 1, 1, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
g_date_set_dmy (&d, 31, 12, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
if (g_date_is_leap_year (year))
{
g_date_set_dmy (&d, 2, 1, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
g_date_set_dmy (&d, 30, 12, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
}
return 52;
}
guint8
-g_date_sunday_weeks_in_year (GDateYear year)
+g_date_get_sunday_weeks_in_year (GDateYear year)
{
GDate d;
g_date_clear (&d, 1);
g_date_set_dmy (&d, 1, 1, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
g_date_set_dmy (&d, 31, 12, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
if (g_date_is_leap_year (year))
{
g_date_set_dmy (&d, 2, 1, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
g_date_set_dmy (&d, 30, 12, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
}
return 52;
}
tm->tm_mon = d->month - 1; /* 0-11 goes in tm */
tm->tm_year = ((int)d->year) - 1900; /* X/Open says tm_year can be negative */
- day = g_date_weekday (d);
+ day = g_date_get_weekday (d);
if (day == 7) day = 0; /* struct tm wants days since Sunday, so Sunday is 0 */
tm->tm_wday = (int)day;
- tm->tm_yday = g_date_day_of_year (d) - 1; /* 0 to 365 */
+ tm->tm_yday = g_date_get_day_of_year (d) - 1; /* 0 to 365 */
tm->tm_isdst = -1; /* -1 means "information not available" */
}
GDateMonth month,
GDateYear year) G_GNUC_CONST;
-GDateWeekday g_date_weekday (GDate *date);
-GDateMonth g_date_month (GDate *date);
-GDateYear g_date_year (GDate *date);
-GDateDay g_date_day (GDate *date);
-guint32 g_date_julian (GDate *date);
-guint g_date_day_of_year (GDate *date);
+GDateWeekday g_date_get_weekday (GDate *date);
+GDateMonth g_date_get_month (GDate *date);
+GDateYear g_date_get_year (GDate *date);
+GDateDay g_date_get_day (GDate *date);
+guint32 g_date_get_julian (GDate *date);
+guint g_date_get_day_of_year (GDate *date);
/* First monday/sunday is the start of week 1; if we haven't reached
* that day, return 0. These are not ISO weeks of the year; that
* routine needs to be added.
* these functions return the number of weeks, starting on the
* corrsponding day
*/
-guint g_date_monday_week_of_year (GDate *date);
-guint g_date_sunday_week_of_year (GDate *date);
+guint g_date_get_monday_week_of_year (GDate *date);
+guint g_date_get_sunday_week_of_year (GDate *date);
/* If you create a static date struct you need to clear it to get it
* in a sane state before use. You can clear a whole array at
void g_date_subtract_years (GDate *date,
guint n_years);
gboolean g_date_is_leap_year (GDateYear year) G_GNUC_CONST;
-guint8 g_date_days_in_month (GDateMonth month,
+guint8 g_date_get_days_in_month (GDateMonth month,
GDateYear year) G_GNUC_CONST;
-guint8 g_date_monday_weeks_in_year (GDateYear year) G_GNUC_CONST;
-guint8 g_date_sunday_weeks_in_year (GDateYear year) G_GNUC_CONST;
+guint8 g_date_get_monday_weeks_in_year (GDateYear year) G_GNUC_CONST;
+guint8 g_date_get_sunday_weeks_in_year (GDateYear year) G_GNUC_CONST;
/* qsort-friendly (with a cast...) */
gint g_date_compare (GDate *lhs,
#include <gasyncqueue.h>
#include <gbacktrace.h>
#include <gcache.h>
+#include <gcompat.h>
#include <gcompletion.h>
#include <gconvert.h>
#include <gdataset.h>
BUILT_SOURCES=glib-config-2.0
glib-config-2.0: glib-config-2.0.in
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+ -DG_DISBALE_COMPAT_H
EXTRA_DIST = \
ChangeLog.pre-1-2 \
gasyncqueue.h \
gbacktrace.h \
gcache.h \
+ gcompat.h \
gcompletion.h \
gconvert.h \
gdataset.h \
}
GDateWeekday
-g_date_weekday (GDate *d)
+g_date_get_weekday (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_WEEKDAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_WEEKDAY);
}
GDateMonth
-g_date_month (GDate *d)
+g_date_get_month (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_MONTH);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_MONTH);
}
GDateYear
-g_date_year (GDate *d)
+g_date_get_year (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_YEAR);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_YEAR);
}
GDateDay
-g_date_day (GDate *d)
+g_date_get_day (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_DAY);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_DAY);
}
guint32
-g_date_julian (GDate *d)
+g_date_get_julian (GDate *d)
{
g_return_val_if_fail (d != NULL, G_DATE_BAD_JULIAN);
g_return_val_if_fail (g_date_valid (d), G_DATE_BAD_JULIAN);
}
guint
-g_date_day_of_year (GDate *d)
+g_date_get_day_of_year (GDate *d)
{
gint index;
}
guint
-g_date_monday_week_of_year (GDate *d)
+g_date_get_monday_week_of_year (GDate *d)
{
GDateWeekday wd;
guint day;
g_date_set_dmy (&first, 1, 1, d->year);
- wd = g_date_weekday (&first) - 1; /* make Monday day 0 */
- day = g_date_day_of_year (d) - 1;
+ wd = g_date_get_weekday (&first) - 1; /* make Monday day 0 */
+ day = g_date_get_day_of_year (d) - 1;
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
guint
-g_date_sunday_week_of_year (GDate *d)
+g_date_get_sunday_week_of_year (GDate *d)
{
GDateWeekday wd;
guint day;
g_date_set_dmy (&first, 1, 1, d->year);
- wd = g_date_weekday (&first);
+ wd = g_date_get_weekday (&first);
if (wd == 7) wd = 0; /* make Sunday day 0 */
- day = g_date_day_of_year (d) - 1;
+ day = g_date_get_day_of_year (d) - 1;
return ((day + wd)/7U + (wd == 0 ? 1 : 0));
}
}
guint8
-g_date_days_in_month (GDateMonth month,
- GDateYear year)
+g_date_get_days_in_month (GDateMonth month,
+ GDateYear year)
{
gint index;
}
guint8
-g_date_monday_weeks_in_year (GDateYear year)
+g_date_get_monday_weeks_in_year (GDateYear year)
{
GDate d;
g_date_clear (&d, 1);
g_date_set_dmy (&d, 1, 1, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
g_date_set_dmy (&d, 31, 12, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
if (g_date_is_leap_year (year))
{
g_date_set_dmy (&d, 2, 1, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
g_date_set_dmy (&d, 30, 12, year);
- if (g_date_weekday (&d) == G_DATE_MONDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_MONDAY) return 53;
}
return 52;
}
guint8
-g_date_sunday_weeks_in_year (GDateYear year)
+g_date_get_sunday_weeks_in_year (GDateYear year)
{
GDate d;
g_date_clear (&d, 1);
g_date_set_dmy (&d, 1, 1, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
g_date_set_dmy (&d, 31, 12, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
if (g_date_is_leap_year (year))
{
g_date_set_dmy (&d, 2, 1, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
g_date_set_dmy (&d, 30, 12, year);
- if (g_date_weekday (&d) == G_DATE_SUNDAY) return 53;
+ if (g_date_get_weekday (&d) == G_DATE_SUNDAY) return 53;
}
return 52;
}
tm->tm_mon = d->month - 1; /* 0-11 goes in tm */
tm->tm_year = ((int)d->year) - 1900; /* X/Open says tm_year can be negative */
- day = g_date_weekday (d);
+ day = g_date_get_weekday (d);
if (day == 7) day = 0; /* struct tm wants days since Sunday, so Sunday is 0 */
tm->tm_wday = (int)day;
- tm->tm_yday = g_date_day_of_year (d) - 1; /* 0 to 365 */
+ tm->tm_yday = g_date_get_day_of_year (d) - 1; /* 0 to 365 */
tm->tm_isdst = -1; /* -1 means "information not available" */
}
GDateMonth month,
GDateYear year) G_GNUC_CONST;
-GDateWeekday g_date_weekday (GDate *date);
-GDateMonth g_date_month (GDate *date);
-GDateYear g_date_year (GDate *date);
-GDateDay g_date_day (GDate *date);
-guint32 g_date_julian (GDate *date);
-guint g_date_day_of_year (GDate *date);
+GDateWeekday g_date_get_weekday (GDate *date);
+GDateMonth g_date_get_month (GDate *date);
+GDateYear g_date_get_year (GDate *date);
+GDateDay g_date_get_day (GDate *date);
+guint32 g_date_get_julian (GDate *date);
+guint g_date_get_day_of_year (GDate *date);
/* First monday/sunday is the start of week 1; if we haven't reached
* that day, return 0. These are not ISO weeks of the year; that
* routine needs to be added.
* these functions return the number of weeks, starting on the
* corrsponding day
*/
-guint g_date_monday_week_of_year (GDate *date);
-guint g_date_sunday_week_of_year (GDate *date);
+guint g_date_get_monday_week_of_year (GDate *date);
+guint g_date_get_sunday_week_of_year (GDate *date);
/* If you create a static date struct you need to clear it to get it
* in a sane state before use. You can clear a whole array at
void g_date_subtract_years (GDate *date,
guint n_years);
gboolean g_date_is_leap_year (GDateYear year) G_GNUC_CONST;
-guint8 g_date_days_in_month (GDateMonth month,
+guint8 g_date_get_days_in_month (GDateMonth month,
GDateYear year) G_GNUC_CONST;
-guint8 g_date_monday_weeks_in_year (GDateYear year) G_GNUC_CONST;
-guint8 g_date_sunday_weeks_in_year (GDateYear year) G_GNUC_CONST;
+guint8 g_date_get_monday_weeks_in_year (GDateYear year) G_GNUC_CONST;
+guint8 g_date_get_sunday_weeks_in_year (GDateYear year) G_GNUC_CONST;
/* qsort-friendly (with a cast...) */
gint g_date_compare (GDate *lhs,
#include <gasyncqueue.h>
#include <gbacktrace.h>
#include <gcache.h>
+#include <gcompat.h>
#include <gcompletion.h>
#include <gconvert.h>
#include <gdataset.h>
TEST("January 1, Year 1 created and valid", g_date_valid(d));
- j = g_date_julian(d);
+ j = g_date_get_julian(d);
TEST("January 1, Year 1 is Julian date 1", j == 1);
- TEST("Returned month is January", g_date_month(d) == G_DATE_JANUARY);
- TEST("Returned day is 1", g_date_day(d) == 1);
- TEST("Returned year is 1", g_date_year(d) == 1);
+ TEST("Returned month is January", g_date_get_month(d) == G_DATE_JANUARY);
+ TEST("Returned day is 1", g_date_get_day(d) == 1);
+ TEST("Returned year is 1", g_date_get_year(d) == 1);
TEST("Bad month is invalid", !g_date_valid_month(G_DATE_BAD_MONTH));
TEST("Month 13 is invalid", !g_date_valid_month(13));
/* Note: this test will hopefully work, but no promises. */
TEST("Successfully parsed a %x-formatted string",
g_date_valid(d) &&
- g_date_month(d) == 1 &&
- g_date_day(d) == 10 &&
- g_date_year(d) == 2000);
+ g_date_get_month(d) == 1 &&
+ g_date_get_day(d) == 10 &&
+ g_date_get_year(d) == 2000);
if (failed)
g_date_debug_print(d);
guint32 first_day_of_year = G_DATE_BAD_JULIAN;
guint16 days_in_year = g_date_is_leap_year(y) ? 366 : 365;
guint sunday_week_of_year = 0;
- guint sunday_weeks_in_year = g_date_sunday_weeks_in_year(y);
+ guint sunday_weeks_in_year = g_date_get_sunday_weeks_in_year(y);
guint monday_week_of_year = 0;
- guint monday_weeks_in_year = g_date_monday_weeks_in_year(y);
+ guint monday_weeks_in_year = g_date_get_monday_weeks_in_year(y);
if (discontinuity)
g_print(" (Break in sequence of requested years to check)\n");
m = 1;
while (m < 13)
{
- guint8 dim = g_date_days_in_month(m,y);
+ guint8 dim = g_date_get_days_in_month(m,y);
GDate days[31]; /* This is the fast way, no allocation */
TEST("Sensible number of days in month", (dim > 0 && dim < 32));
if (m == G_DATE_JANUARY && day == 1)
{
- first_day_of_year = g_date_julian(d);
+ first_day_of_year = g_date_get_julian(d);
}
g_assert(first_day_of_year != G_DATE_BAD_JULIAN);
TEST("Date with DMY triplet is valid", g_date_valid(d));
- TEST("Month accessor works", g_date_month(d) == m);
- TEST("Year accessor works", g_date_year(d) == y);
- TEST("Day of month accessor works", g_date_day(d) == day);
+ TEST("Month accessor works", g_date_get_month(d) == m);
+ TEST("Year accessor works", g_date_get_year(d) == y);
+ TEST("Day of month accessor works", g_date_get_day(d) == day);
TEST("Day of year is consistent with Julian dates",
- ((g_date_julian(d) + 1 - first_day_of_year) ==
- (g_date_day_of_year(d))));
+ ((g_date_get_julian(d) + 1 - first_day_of_year) ==
+ (g_date_get_day_of_year(d))));
if (failed)
{
g_print("first day: %u this day: %u day of year: %u\n",
first_day_of_year,
- g_date_julian(d),
- g_date_day_of_year(d));
+ g_date_get_julian(d),
+ g_date_get_day_of_year(d));
}
if (m == G_DATE_DECEMBER && day == 31)
{
TEST("Last day of year equals number of days in year",
- g_date_day_of_year(d) == days_in_year);
+ g_date_get_day_of_year(d) == days_in_year);
if (failed)
{
g_print("last day: %u days in year: %u\n",
- g_date_day_of_year(d), days_in_year);
+ g_date_get_day_of_year(d), days_in_year);
}
}
TEST("Day of year is not more than number of days in the year",
- g_date_day_of_year(d) <= days_in_year);
+ g_date_get_day_of_year(d) <= days_in_year);
TEST("Monday week of year is not more than number of weeks in the year",
- g_date_monday_week_of_year(d) <= monday_weeks_in_year);
+ g_date_get_monday_week_of_year(d) <= monday_weeks_in_year);
if (failed)
{
g_print("Weeks in year: %u\n", monday_weeks_in_year);
g_date_debug_print(d);
}
TEST("Monday week of year is >= than last week of year",
- g_date_monday_week_of_year(d) >= monday_week_of_year);
+ g_date_get_monday_week_of_year(d) >= monday_week_of_year);
- if (g_date_weekday(d) == G_DATE_MONDAY)
+ if (g_date_get_weekday(d) == G_DATE_MONDAY)
{
TEST("Monday week of year on Monday 1 more than previous day's week of year",
- (g_date_monday_week_of_year(d) - monday_week_of_year) == 1);
+ (g_date_get_monday_week_of_year(d) - monday_week_of_year) == 1);
}
else
{
TEST("Monday week of year on non-Monday 0 more than previous day's week of year",
- (g_date_monday_week_of_year(d) - monday_week_of_year) == 0);
+ (g_date_get_monday_week_of_year(d) - monday_week_of_year) == 0);
}
- monday_week_of_year = g_date_monday_week_of_year(d);
+ monday_week_of_year = g_date_get_monday_week_of_year(d);
TEST("Sunday week of year is not more than number of weeks in the year",
- g_date_sunday_week_of_year(d) <= sunday_weeks_in_year);
+ g_date_get_sunday_week_of_year(d) <= sunday_weeks_in_year);
if (failed)
{
g_date_debug_print(d);
}
TEST("Sunday week of year is >= than last week of year",
- g_date_sunday_week_of_year(d) >= sunday_week_of_year);
+ g_date_get_sunday_week_of_year(d) >= sunday_week_of_year);
- if (g_date_weekday(d) == G_DATE_SUNDAY)
+ if (g_date_get_weekday(d) == G_DATE_SUNDAY)
{
TEST("Sunday week of year on Sunday 1 more than previous day's week of year",
- (g_date_sunday_week_of_year(d) - sunday_week_of_year) == 1);
+ (g_date_get_sunday_week_of_year(d) - sunday_week_of_year) == 1);
}
else
{
TEST("Sunday week of year on non-Sunday 0 more than previous day's week of year",
- (g_date_sunday_week_of_year(d) - sunday_week_of_year) == 0);
+ (g_date_get_sunday_week_of_year(d) - sunday_week_of_year) == 0);
}
- sunday_week_of_year = g_date_sunday_week_of_year(d);
+ sunday_week_of_year = g_date_get_sunday_week_of_year(d);
TEST("Date is equal to itself",
g_date_compare(d,d) == 0);
g_date_subtract_days(d, i);
TEST("Forward days then backward days returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
}
TEST("Forward days then backward days returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward days then backward days returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
g_date_subtract_months(d, i);
TEST("Forward months then backward months returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward months then backward months returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
/* Day should be unchanged */
TEST("Forward months then backward months returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
g_date_subtract_years(d, i);
TEST("Forward years then backward years returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward years then backward years returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
if (m != 2 && day != 29)
{
TEST("Forward years then backward years returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
/* We can only run sequence tests between sequential years */
TEST("Julians are sequential with increment 1",
- j+1 == g_date_julian(d));
+ j+1 == g_date_get_julian(d));
if (failed)
{
g_print("Out of sequence, prev: %u expected: %u got: %u\n",
- j, j+1, g_date_julian(d));
+ j, j+1, g_date_get_julian(d));
}
g_date_add_days(d,1);
TEST("Next day has julian 1 higher",
- g_date_julian(d) == j + 2);
+ g_date_get_julian(d) == j + 2);
g_date_subtract_days(d, 1);
if (j != G_DATE_BAD_JULIAN)
g_date_subtract_days(d, 1);
TEST("Previous day has julian 1 lower",
- g_date_julian(d) == j);
+ g_date_get_julian(d) == j);
g_date_add_days(d, 1); /* back to original */
}
fflush(stdout);
fflush(stderr);
- j = g_date_julian(d); /* inc current julian */
+ j = g_date_get_julian(d); /* inc current julian */
++day;
}
TEST("January 1, Year 1 created and valid", g_date_valid(d));
- j = g_date_julian(d);
+ j = g_date_get_julian(d);
TEST("January 1, Year 1 is Julian date 1", j == 1);
- TEST("Returned month is January", g_date_month(d) == G_DATE_JANUARY);
- TEST("Returned day is 1", g_date_day(d) == 1);
- TEST("Returned year is 1", g_date_year(d) == 1);
+ TEST("Returned month is January", g_date_get_month(d) == G_DATE_JANUARY);
+ TEST("Returned day is 1", g_date_get_day(d) == 1);
+ TEST("Returned year is 1", g_date_get_year(d) == 1);
TEST("Bad month is invalid", !g_date_valid_month(G_DATE_BAD_MONTH));
TEST("Month 13 is invalid", !g_date_valid_month(13));
/* Note: this test will hopefully work, but no promises. */
TEST("Successfully parsed a %x-formatted string",
g_date_valid(d) &&
- g_date_month(d) == 1 &&
- g_date_day(d) == 10 &&
- g_date_year(d) == 2000);
+ g_date_get_month(d) == 1 &&
+ g_date_get_day(d) == 10 &&
+ g_date_get_year(d) == 2000);
if (failed)
g_date_debug_print(d);
guint32 first_day_of_year = G_DATE_BAD_JULIAN;
guint16 days_in_year = g_date_is_leap_year(y) ? 366 : 365;
guint sunday_week_of_year = 0;
- guint sunday_weeks_in_year = g_date_sunday_weeks_in_year(y);
+ guint sunday_weeks_in_year = g_date_get_sunday_weeks_in_year(y);
guint monday_week_of_year = 0;
- guint monday_weeks_in_year = g_date_monday_weeks_in_year(y);
+ guint monday_weeks_in_year = g_date_get_monday_weeks_in_year(y);
if (discontinuity)
g_print(" (Break in sequence of requested years to check)\n");
m = 1;
while (m < 13)
{
- guint8 dim = g_date_days_in_month(m,y);
+ guint8 dim = g_date_get_days_in_month(m,y);
GDate days[31]; /* This is the fast way, no allocation */
TEST("Sensible number of days in month", (dim > 0 && dim < 32));
if (m == G_DATE_JANUARY && day == 1)
{
- first_day_of_year = g_date_julian(d);
+ first_day_of_year = g_date_get_julian(d);
}
g_assert(first_day_of_year != G_DATE_BAD_JULIAN);
TEST("Date with DMY triplet is valid", g_date_valid(d));
- TEST("Month accessor works", g_date_month(d) == m);
- TEST("Year accessor works", g_date_year(d) == y);
- TEST("Day of month accessor works", g_date_day(d) == day);
+ TEST("Month accessor works", g_date_get_month(d) == m);
+ TEST("Year accessor works", g_date_get_year(d) == y);
+ TEST("Day of month accessor works", g_date_get_day(d) == day);
TEST("Day of year is consistent with Julian dates",
- ((g_date_julian(d) + 1 - first_day_of_year) ==
- (g_date_day_of_year(d))));
+ ((g_date_get_julian(d) + 1 - first_day_of_year) ==
+ (g_date_get_day_of_year(d))));
if (failed)
{
g_print("first day: %u this day: %u day of year: %u\n",
first_day_of_year,
- g_date_julian(d),
- g_date_day_of_year(d));
+ g_date_get_julian(d),
+ g_date_get_day_of_year(d));
}
if (m == G_DATE_DECEMBER && day == 31)
{
TEST("Last day of year equals number of days in year",
- g_date_day_of_year(d) == days_in_year);
+ g_date_get_day_of_year(d) == days_in_year);
if (failed)
{
g_print("last day: %u days in year: %u\n",
- g_date_day_of_year(d), days_in_year);
+ g_date_get_day_of_year(d), days_in_year);
}
}
TEST("Day of year is not more than number of days in the year",
- g_date_day_of_year(d) <= days_in_year);
+ g_date_get_day_of_year(d) <= days_in_year);
TEST("Monday week of year is not more than number of weeks in the year",
- g_date_monday_week_of_year(d) <= monday_weeks_in_year);
+ g_date_get_monday_week_of_year(d) <= monday_weeks_in_year);
if (failed)
{
g_print("Weeks in year: %u\n", monday_weeks_in_year);
g_date_debug_print(d);
}
TEST("Monday week of year is >= than last week of year",
- g_date_monday_week_of_year(d) >= monday_week_of_year);
+ g_date_get_monday_week_of_year(d) >= monday_week_of_year);
- if (g_date_weekday(d) == G_DATE_MONDAY)
+ if (g_date_get_weekday(d) == G_DATE_MONDAY)
{
TEST("Monday week of year on Monday 1 more than previous day's week of year",
- (g_date_monday_week_of_year(d) - monday_week_of_year) == 1);
+ (g_date_get_monday_week_of_year(d) - monday_week_of_year) == 1);
}
else
{
TEST("Monday week of year on non-Monday 0 more than previous day's week of year",
- (g_date_monday_week_of_year(d) - monday_week_of_year) == 0);
+ (g_date_get_monday_week_of_year(d) - monday_week_of_year) == 0);
}
- monday_week_of_year = g_date_monday_week_of_year(d);
+ monday_week_of_year = g_date_get_monday_week_of_year(d);
TEST("Sunday week of year is not more than number of weeks in the year",
- g_date_sunday_week_of_year(d) <= sunday_weeks_in_year);
+ g_date_get_sunday_week_of_year(d) <= sunday_weeks_in_year);
if (failed)
{
g_date_debug_print(d);
}
TEST("Sunday week of year is >= than last week of year",
- g_date_sunday_week_of_year(d) >= sunday_week_of_year);
+ g_date_get_sunday_week_of_year(d) >= sunday_week_of_year);
- if (g_date_weekday(d) == G_DATE_SUNDAY)
+ if (g_date_get_weekday(d) == G_DATE_SUNDAY)
{
TEST("Sunday week of year on Sunday 1 more than previous day's week of year",
- (g_date_sunday_week_of_year(d) - sunday_week_of_year) == 1);
+ (g_date_get_sunday_week_of_year(d) - sunday_week_of_year) == 1);
}
else
{
TEST("Sunday week of year on non-Sunday 0 more than previous day's week of year",
- (g_date_sunday_week_of_year(d) - sunday_week_of_year) == 0);
+ (g_date_get_sunday_week_of_year(d) - sunday_week_of_year) == 0);
}
- sunday_week_of_year = g_date_sunday_week_of_year(d);
+ sunday_week_of_year = g_date_get_sunday_week_of_year(d);
TEST("Date is equal to itself",
g_date_compare(d,d) == 0);
g_date_subtract_days(d, i);
TEST("Forward days then backward days returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
}
TEST("Forward days then backward days returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward days then backward days returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
g_date_subtract_months(d, i);
TEST("Forward months then backward months returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward months then backward months returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
/* Day should be unchanged */
TEST("Forward months then backward months returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
g_date_subtract_years(d, i);
TEST("Forward years then backward years returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward years then backward years returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
if (m != 2 && day != 29)
{
TEST("Forward years then backward years returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
/* We can only run sequence tests between sequential years */
TEST("Julians are sequential with increment 1",
- j+1 == g_date_julian(d));
+ j+1 == g_date_get_julian(d));
if (failed)
{
g_print("Out of sequence, prev: %u expected: %u got: %u\n",
- j, j+1, g_date_julian(d));
+ j, j+1, g_date_get_julian(d));
}
g_date_add_days(d,1);
TEST("Next day has julian 1 higher",
- g_date_julian(d) == j + 2);
+ g_date_get_julian(d) == j + 2);
g_date_subtract_days(d, 1);
if (j != G_DATE_BAD_JULIAN)
g_date_subtract_days(d, 1);
TEST("Previous day has julian 1 lower",
- g_date_julian(d) == j);
+ g_date_get_julian(d) == j);
g_date_add_days(d, 1); /* back to original */
}
fflush(stdout);
fflush(stderr);
- j = g_date_julian(d); /* inc current julian */
+ j = g_date_get_julian(d); /* inc current julian */
++day;
}
TEST("January 1, Year 1 created and valid", g_date_valid(d));
- j = g_date_julian(d);
+ j = g_date_get_julian(d);
TEST("January 1, Year 1 is Julian date 1", j == 1);
- TEST("Returned month is January", g_date_month(d) == G_DATE_JANUARY);
- TEST("Returned day is 1", g_date_day(d) == 1);
- TEST("Returned year is 1", g_date_year(d) == 1);
+ TEST("Returned month is January", g_date_get_month(d) == G_DATE_JANUARY);
+ TEST("Returned day is 1", g_date_get_day(d) == 1);
+ TEST("Returned year is 1", g_date_get_year(d) == 1);
TEST("Bad month is invalid", !g_date_valid_month(G_DATE_BAD_MONTH));
TEST("Month 13 is invalid", !g_date_valid_month(13));
/* Note: this test will hopefully work, but no promises. */
TEST("Successfully parsed a %x-formatted string",
g_date_valid(d) &&
- g_date_month(d) == 1 &&
- g_date_day(d) == 10 &&
- g_date_year(d) == 2000);
+ g_date_get_month(d) == 1 &&
+ g_date_get_day(d) == 10 &&
+ g_date_get_year(d) == 2000);
if (failed)
g_date_debug_print(d);
guint32 first_day_of_year = G_DATE_BAD_JULIAN;
guint16 days_in_year = g_date_is_leap_year(y) ? 366 : 365;
guint sunday_week_of_year = 0;
- guint sunday_weeks_in_year = g_date_sunday_weeks_in_year(y);
+ guint sunday_weeks_in_year = g_date_get_sunday_weeks_in_year(y);
guint monday_week_of_year = 0;
- guint monday_weeks_in_year = g_date_monday_weeks_in_year(y);
+ guint monday_weeks_in_year = g_date_get_monday_weeks_in_year(y);
if (discontinuity)
g_print(" (Break in sequence of requested years to check)\n");
m = 1;
while (m < 13)
{
- guint8 dim = g_date_days_in_month(m,y);
+ guint8 dim = g_date_get_days_in_month(m,y);
GDate days[31]; /* This is the fast way, no allocation */
TEST("Sensible number of days in month", (dim > 0 && dim < 32));
if (m == G_DATE_JANUARY && day == 1)
{
- first_day_of_year = g_date_julian(d);
+ first_day_of_year = g_date_get_julian(d);
}
g_assert(first_day_of_year != G_DATE_BAD_JULIAN);
TEST("Date with DMY triplet is valid", g_date_valid(d));
- TEST("Month accessor works", g_date_month(d) == m);
- TEST("Year accessor works", g_date_year(d) == y);
- TEST("Day of month accessor works", g_date_day(d) == day);
+ TEST("Month accessor works", g_date_get_month(d) == m);
+ TEST("Year accessor works", g_date_get_year(d) == y);
+ TEST("Day of month accessor works", g_date_get_day(d) == day);
TEST("Day of year is consistent with Julian dates",
- ((g_date_julian(d) + 1 - first_day_of_year) ==
- (g_date_day_of_year(d))));
+ ((g_date_get_julian(d) + 1 - first_day_of_year) ==
+ (g_date_get_day_of_year(d))));
if (failed)
{
g_print("first day: %u this day: %u day of year: %u\n",
first_day_of_year,
- g_date_julian(d),
- g_date_day_of_year(d));
+ g_date_get_julian(d),
+ g_date_get_day_of_year(d));
}
if (m == G_DATE_DECEMBER && day == 31)
{
TEST("Last day of year equals number of days in year",
- g_date_day_of_year(d) == days_in_year);
+ g_date_get_day_of_year(d) == days_in_year);
if (failed)
{
g_print("last day: %u days in year: %u\n",
- g_date_day_of_year(d), days_in_year);
+ g_date_get_day_of_year(d), days_in_year);
}
}
TEST("Day of year is not more than number of days in the year",
- g_date_day_of_year(d) <= days_in_year);
+ g_date_get_day_of_year(d) <= days_in_year);
TEST("Monday week of year is not more than number of weeks in the year",
- g_date_monday_week_of_year(d) <= monday_weeks_in_year);
+ g_date_get_monday_week_of_year(d) <= monday_weeks_in_year);
if (failed)
{
g_print("Weeks in year: %u\n", monday_weeks_in_year);
g_date_debug_print(d);
}
TEST("Monday week of year is >= than last week of year",
- g_date_monday_week_of_year(d) >= monday_week_of_year);
+ g_date_get_monday_week_of_year(d) >= monday_week_of_year);
- if (g_date_weekday(d) == G_DATE_MONDAY)
+ if (g_date_get_weekday(d) == G_DATE_MONDAY)
{
TEST("Monday week of year on Monday 1 more than previous day's week of year",
- (g_date_monday_week_of_year(d) - monday_week_of_year) == 1);
+ (g_date_get_monday_week_of_year(d) - monday_week_of_year) == 1);
}
else
{
TEST("Monday week of year on non-Monday 0 more than previous day's week of year",
- (g_date_monday_week_of_year(d) - monday_week_of_year) == 0);
+ (g_date_get_monday_week_of_year(d) - monday_week_of_year) == 0);
}
- monday_week_of_year = g_date_monday_week_of_year(d);
+ monday_week_of_year = g_date_get_monday_week_of_year(d);
TEST("Sunday week of year is not more than number of weeks in the year",
- g_date_sunday_week_of_year(d) <= sunday_weeks_in_year);
+ g_date_get_sunday_week_of_year(d) <= sunday_weeks_in_year);
if (failed)
{
g_date_debug_print(d);
}
TEST("Sunday week of year is >= than last week of year",
- g_date_sunday_week_of_year(d) >= sunday_week_of_year);
+ g_date_get_sunday_week_of_year(d) >= sunday_week_of_year);
- if (g_date_weekday(d) == G_DATE_SUNDAY)
+ if (g_date_get_weekday(d) == G_DATE_SUNDAY)
{
TEST("Sunday week of year on Sunday 1 more than previous day's week of year",
- (g_date_sunday_week_of_year(d) - sunday_week_of_year) == 1);
+ (g_date_get_sunday_week_of_year(d) - sunday_week_of_year) == 1);
}
else
{
TEST("Sunday week of year on non-Sunday 0 more than previous day's week of year",
- (g_date_sunday_week_of_year(d) - sunday_week_of_year) == 0);
+ (g_date_get_sunday_week_of_year(d) - sunday_week_of_year) == 0);
}
- sunday_week_of_year = g_date_sunday_week_of_year(d);
+ sunday_week_of_year = g_date_get_sunday_week_of_year(d);
TEST("Date is equal to itself",
g_date_compare(d,d) == 0);
g_date_subtract_days(d, i);
TEST("Forward days then backward days returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
}
TEST("Forward days then backward days returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward days then backward days returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
g_date_subtract_months(d, i);
TEST("Forward months then backward months returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward months then backward months returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
/* Day should be unchanged */
TEST("Forward months then backward months returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
g_date_subtract_years(d, i);
TEST("Forward years then backward years returns us to current month",
- g_date_month(d) == m);
+ g_date_get_month(d) == m);
if (failed)
{
}
TEST("Forward years then backward years returns us to current year",
- g_date_year(d) == y);
+ g_date_get_year(d) == y);
if (failed)
{
if (m != 2 && day != 29)
{
TEST("Forward years then backward years returns us to current day",
- g_date_day(d) == day);
+ g_date_get_day(d) == day);
if (failed)
{
/* We can only run sequence tests between sequential years */
TEST("Julians are sequential with increment 1",
- j+1 == g_date_julian(d));
+ j+1 == g_date_get_julian(d));
if (failed)
{
g_print("Out of sequence, prev: %u expected: %u got: %u\n",
- j, j+1, g_date_julian(d));
+ j, j+1, g_date_get_julian(d));
}
g_date_add_days(d,1);
TEST("Next day has julian 1 higher",
- g_date_julian(d) == j + 2);
+ g_date_get_julian(d) == j + 2);
g_date_subtract_days(d, 1);
if (j != G_DATE_BAD_JULIAN)
g_date_subtract_days(d, 1);
TEST("Previous day has julian 1 lower",
- g_date_julian(d) == j);
+ g_date_get_julian(d) == j);
g_date_add_days(d, 1); /* back to original */
}
fflush(stdout);
fflush(stderr);
- j = g_date_julian(d); /* inc current julian */
+ j = g_date_get_julian(d); /* inc current julian */
++day;
}
projects / platform / upstream / glib.git / commitdiff