ObjFW  Check-in [172e8f39da]

Overview
Comment:Add methods for local time to OFDate.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 172e8f39da803a2171824a5a96f7707edd7f8850b89d50bd7a3677e6ed603d43
User & Date: js on 2010-12-29 16:40:40
Other Links: manifest | tags
Context
2010-12-31
00:30
Add -[earlierDate:] and -[laterDate:] to OFDate. check-in: bb9a6fb0da user: js tags: trunk
2010-12-29
16:40
Add methods for local time to OFDate. check-in: 172e8f39da user: js tags: trunk
12:49
Allow hexadecimal values with h suffix in -[hexadecimalValue]. check-in: eb328c80df user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified configure.ac from [72341d46d1] to [39fb6de447].

︙︙
341
342
343
344
345
346
347



348
349
350
351
352
353
354


AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")

AC_CHECK_FUNC(gmtime_r, [
	AC_DEFINE(HAVE_GMTIME_R, 1, [Whether we have gmtime_r])
])




AC_CHECK_HEADER(poll.h, [
	AC_DEFINE(OF_HAVE_POLL, 1, [Whether poll is supported])
])
AC_CHECK_HEADERS(sys/select.h, [
	AC_DEFINE(OF_HAVE_SYS_SELECT_H, 1, [Whether we have sys/select.h])
])








>
>
>








341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357


AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32")

AC_CHECK_FUNC(gmtime_r, [
	AC_DEFINE(HAVE_GMTIME_R, 1, [Whether we have gmtime_r])
])
AC_CHECK_FUNC(localtime_r, [
	AC_DEFINE(HAVE_LOCALTIME_R, 1, [Whether we have localtime_r])
])

AC_CHECK_HEADER(poll.h, [
	AC_DEFINE(OF_HAVE_POLL, 1, [Whether poll is supported])
])
AC_CHECK_HEADERS(sys/select.h, [
	AC_DEFINE(OF_HAVE_SYS_SELECT_H, 1, [Whether we have sys/select.h])
])
︙︙

Modified src/OFDate.h from [5bb469595c] to [7de007fe1b].

︙︙
65
66
67
68
69
70
71
72





73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96





97
98
99
100
101





102
103
104
105
106
107
108
109
110
111





112
113
114
115
116





117
118
119
120
121
122
123
124
125










126

 * \param sec The seconds since 1970-01-01 00:00:00
 * \param usec The microsecond part of the time
 * \return An initialized OFDate with the specified date and time
 */
- initWithTimeIntervalSince1970: (time_t)sec
		   microseconds: (suseconds_t)usec;

/**





 * \return The seconds of the date
 */
- (int)seconds;

/**
 * \return The microseconds of the date
 */
- (suseconds_t)microseconds;

/**
 * \return The minutes of the date
 */
- (int)minutes;

/**
 * \return The hours of the date
 */
- (int)hours;

/**
 * \return The day of the month of the date
 */
- (int)dayOfMonth;






/**
 * \return The month of the year of the date
 */
- (int)monthOfYear;






/**
 * \return The year of the date
 */
- (int)year;

/**
 * \return The day of the week of the date
 */
- (int)dayOfWeek;






/**
 * \return The day of the year of the date
 */
- (int)dayOfYear;






/**
 * Creates a string of the date with the specified format.
 *
 * See the manpage for strftime for information on the format.
 *
 * \param fmt The format for the date string
 * \return A new, autoreleased OFString
 */
- (OFString*)stringWithFormat: (OFString*)fmt;










@end









>
>
>
>
>


|


|

|


|

|


|

|






>
>
>
>
>





>
>
>
>
>










>
>
>
>
>





>
>
>
>
>








|
>
>
>
>
>
>
>
>
>
>


65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161

 * \param sec The seconds since 1970-01-01 00:00:00
 * \param usec The microsecond part of the time
 * \return An initialized OFDate with the specified date and time
 */
- initWithTimeIntervalSince1970: (time_t)sec
		   microseconds: (suseconds_t)usec;

/**
 * \return The microsecond of the date
 */
- (suseconds_t)microsecond;

/**
 * \return The seconds of the date
 */
- (int)second;

/**
 * \return The minute of the date
 */
- (int)minute;

/**
 * \return The hour of the date
 */
- (int)hour;

/**
 * \return The hour of the date in local time
 */
- (int)localHour;

/**
 * \return The day of the month of the date
 */
- (int)dayOfMonth;

/**
 * \return The day of the month of the date in local time
 */
- (int)localDayOfMonth;

/**
 * \return The month of the year of the date
 */
- (int)monthOfYear;

/**
 * \return The month of the year of the date in local time
 */
- (int)localMonthOfYear;

/**
 * \return The year of the date
 */
- (int)year;

/**
 * \return The day of the week of the date
 */
- (int)dayOfWeek;

/**
 * \return The day of the week of the date in local time
 */
- (int)localDayOfWeek;

/**
 * \return The day of the year of the date
 */
- (int)dayOfYear;

/**
 * \return The day of the year of the date in local time
 */
- (int)localDayOfYear;

/**
 * Creates a string of the date with the specified format.
 *
 * See the manpage for strftime for information on the format.
 *
 * \param fmt The format for the date string
 * \return A new, autoreleased OFString
 */
- (OFString*)dateStringWithFormat: (OFString*)fmt;

/**
 * Creates a string of the local date with the specified format.
 *
 * See the manpage for strftime for information on the format.
 *
 * \param fmt The format for the date string
 * \return A new, autoreleased OFString
 */
- (OFString*)localDateStringWithFormat: (OFString*)fmt;
@end

Modified src/OFDate.m from [0a3ac06fbe] to [992907b8e8].

︙︙
16
17
18
19
20
21
22

23
24
25
26
27
28
29
30
31
32
33
34
35







36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51













52
53
54
55
56
57
58
59







60
61
62
63

64
65
66
67
68
69
70
71

#include <sys/time.h>

#import "OFDate.h"
#import "OFString.h"
#import "OFAutoreleasePool.h"
#import "OFExceptions.h"


#if !defined(HAVE_GMTIME_R) && defined(OF_THREADS)
# import "OFThread.h"

static OFMutex *mutex;
#endif

#ifdef HAVE_GMTIME_R
# define GMTIME_RET(field)						  \
	struct tm tm;							  \
									  \
	if (gmtime_r(&sec, &tm) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \







	return tm.field;
#else
# ifdef OF_THREADS
#  define GMTIME_RET(field)						  \
	struct tm *tm;							  \
									  \
	[mutex lock];							  \
									  \
	@try {								  \
		if ((tm = gmtime(&sec)) == NULL)			  \
			@throw [OFOutOfRangeException newWithClass: isa]; \
									  \
		return tm->field;					  \
	} @finally {							  \
		[mutex unlock];						  \
	}













# else
#  define GMTIME_RET(field)						  \
	struct tm *tm;							  \
									  \
	if ((tm = gmtime(&sec)) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm->field;







# endif
#endif

@implementation OFDate

#if !defined(HAVE_GMTIME_R) && defined(OF_THREADS)
+ (void)initialize
{
	if (self == [OFDate class])
		mutex = [[OFMutex alloc] init];
}
#endif









>
|












>
>
>
>
>
>
>
















>
>
>
>
>
>
>
>
>
>
>
>
>








>
>
>
>
>
>
>




>
|








16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100

#include <sys/time.h>

#import "OFDate.h"
#import "OFString.h"
#import "OFAutoreleasePool.h"
#import "OFExceptions.h"

#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
    defined(OF_THREADS)
# import "OFThread.h"

static OFMutex *mutex;
#endif

#ifdef HAVE_GMTIME_R
# define GMTIME_RET(field)						  \
	struct tm tm;							  \
									  \
	if (gmtime_r(&sec, &tm) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm.field;
# define LOCALTIME_RET(field)						  \
	struct tm tm;							  \
									  \
	if (localtime_r(&sec, &tm) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm.field;
#else
# ifdef OF_THREADS
#  define GMTIME_RET(field)						  \
	struct tm *tm;							  \
									  \
	[mutex lock];							  \
									  \
	@try {								  \
		if ((tm = gmtime(&sec)) == NULL)			  \
			@throw [OFOutOfRangeException newWithClass: isa]; \
									  \
		return tm->field;					  \
	} @finally {							  \
		[mutex unlock];						  \
	}
#  define LOCALTIME_RET(field)						  \
	struct tm *tm;							  \
									  \
	[mutex lock];							  \
									  \
	@try {								  \
		if ((tm = localtime(&sec)) == NULL)			  \
			@throw [OFOutOfRangeException newWithClass: isa]; \
									  \
		return tm->field;					  \
	} @finally {							  \
		[mutex unlock];						  \
	}
# else
#  define GMTIME_RET(field)						  \
	struct tm *tm;							  \
									  \
	if ((tm = gmtime(&sec)) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm->field;
#  define LOCALTIME_RET(field)						  \
	struct tm *tm;							  \
									  \
	if ((tm = localtime(&sec)) == NULL)				  \
		@throw [OFOutOfRangeException newWithClass: isa];	  \
									  \
	return tm->field;
# endif
#endif

@implementation OFDate
#if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \
    defined(OF_THREADS)
+ (void)initialize
{
	if (self == [OFDate class])
		mutex = [[OFMutex alloc] init];
}
#endif
︙︙
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172





173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191





192
193
194
195
196





197
198
199
200
201





202
203
204
205
206
207
208
209
210
211





212
213
214
215
216
217





218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236







































237
238
239
240
241
242
243

}

- (OFString*)description
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	OFString *tmp, *ret;

	tmp = [self stringWithFormat: @"%Y-%m-%dT%H:%M:%S"];

	if (usec == 0)
		ret = [OFString stringWithFormat: @"%sZ", [tmp cString]];
	else
		ret = [OFString stringWithFormat: @"%s.%06dZ", [tmp cString],
						  usec];

	[ret retain];
	[pool release];

	return [ret autorelease];
}






- (int)seconds
{
	GMTIME_RET(tm_sec)
}

- (suseconds_t)microseconds
{
	return usec;
}

- (int)minutes
{
	GMTIME_RET(tm_min)
}

- (int)hours
{
	GMTIME_RET(tm_hour)
}






- (int)dayOfMonth
{
	GMTIME_RET(tm_mday)
}






- (int)monthOfYear
{
	GMTIME_RET(tm_mon + 1)
}






- (int)year
{
	GMTIME_RET(tm_year + 1900)
}

- (int)dayOfWeek
{
	GMTIME_RET(tm_wday)
}






- (int)dayOfYear
{
	GMTIME_RET(tm_yday + 1)
}






- (OFString*)stringWithFormat: (OFString*)fmt
{
	struct tm tm;
	char *buf;

#ifdef HAVE_GMTIME_R
	if (gmtime_r(&sec, &tm) == NULL)
		@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
	[mutex lock];

	@try {
# endif
		struct tm *tmp;

		if ((tmp = gmtime(&sec)) == NULL)
			@throw [OFOutOfRangeException newWithClass: isa];








































		tm = *tmp;
# ifdef OF_THREADS
	} @finally {
		[mutex unlock];
	}
# endif
#endif








|













>
>
>
>
>
|




<
<
<
<
<
|




|



>
>
>
>
>





>
>
>
>
>





>
>
>
>
>










>
>
>
>
>






>
>
>
>
>
|


















>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211





212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336

}

- (OFString*)description
{
	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
	OFString *tmp, *ret;

	tmp = [self dateStringWithFormat: @"%Y-%m-%dT%H:%M:%S"];

	if (usec == 0)
		ret = [OFString stringWithFormat: @"%sZ", [tmp cString]];
	else
		ret = [OFString stringWithFormat: @"%s.%06dZ", [tmp cString],
						  usec];

	[ret retain];
	[pool release];

	return [ret autorelease];
}

- (suseconds_t)microsecond
{
	return usec;
}

- (int)second
{
	GMTIME_RET(tm_sec)
}






- (int)minute
{
	GMTIME_RET(tm_min)
}

- (int)hour
{
	GMTIME_RET(tm_hour)
}

- (int)localHour
{
	LOCALTIME_RET(tm_hour)
}

- (int)dayOfMonth
{
	GMTIME_RET(tm_mday)
}

- (int)localDayOfMonth
{
	LOCALTIME_RET(tm_mday)
}

- (int)monthOfYear
{
	GMTIME_RET(tm_mon + 1)
}

- (int)localMonthOfYear
{
	LOCALTIME_RET(tm_mon + 1)
}

- (int)year
{
	GMTIME_RET(tm_year + 1900)
}

- (int)dayOfWeek
{
	GMTIME_RET(tm_wday)
}

- (int)localDayOfWeek
{
	LOCALTIME_RET(tm_wday)
}

- (int)dayOfYear
{
	GMTIME_RET(tm_yday + 1)
}

- (int)localDayOfYear
{
	LOCALTIME_RET(tm_yday + 1)
}

- (OFString*)dateStringWithFormat: (OFString*)fmt
{
	struct tm tm;
	char *buf;

#ifdef HAVE_GMTIME_R
	if (gmtime_r(&sec, &tm) == NULL)
		@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
	[mutex lock];

	@try {
# endif
		struct tm *tmp;

		if ((tmp = gmtime(&sec)) == NULL)
			@throw [OFOutOfRangeException newWithClass: isa];

		tm = *tmp;
# ifdef OF_THREADS
	} @finally {
		[mutex unlock];
	}
# endif
#endif

	buf = [self allocMemoryWithSize: of_pagesize];

	@try {
		if (!strftime(buf, of_pagesize, [fmt cString], &tm))
			@throw [OFOutOfRangeException newWithClass: isa];

		return [OFString stringWithCString: buf];
	} @finally {
		[self freeMemory: buf];
	}
}

- (OFString*)localDateStringWithFormat: (OFString*)fmt
{
	struct tm tm;
	char *buf;

#ifdef HAVE_LOCALTIME_R
	if (localtime_r(&sec, &tm) == NULL)
		@throw [OFOutOfRangeException newWithClass: isa];
#else
# ifdef OF_THREADS
	[mutex lock];

	@try {
# endif
		struct tm *tmp;

		if ((tmp = localtime(&sec)) == NULL)
			@throw [OFOutOfRangeException newWithClass: isa];

		tm = *tmp;
# ifdef OF_THREADS
	} @finally {
		[mutex unlock];
	}
# endif
#endif
︙︙

Modified tests/OFDateTests.m from [6d4dee43e8] to [02a5df98fb].

︙︙
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

	TEST(@"-[isEqual:]",
	    [d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0]] &&
	    ![d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0
						   microseconds: 1]])

	TEST(@"-[compare:]", [d1 compare: d2] == OF_ORDERED_ASCENDING)

	TEST(@"-[seconds]", [d1 seconds] == 0 && [d2 seconds] == 5)

	TEST(@"-[microseconds]",
	    [d1 microseconds] == 0 && [d2 microseconds] == 1)

	TEST(@"-[minutes]", [d1 minutes] == 0 && [d2 minutes] == 0)

	TEST(@"-[hours]", [d1 hours] == 0 && [d2 hours] == 1)

	TEST(@"-[dayOfMonth]", [d1 dayOfMonth] == 1 && [d2 dayOfMonth] == 2)

	TEST(@"-[monthOfYear]", [d1 monthOfYear] == 1 && [d2 monthOfYear] == 1)

	TEST(@"-[year]", [d1 year] == 1970 && [d2 year] == 1970)









|

|
|

|

|








39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60

	TEST(@"-[isEqual:]",
	    [d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0]] &&
	    ![d1 isEqual: [OFDate dateWithTimeIntervalSince1970: 0
						   microseconds: 1]])

	TEST(@"-[compare:]", [d1 compare: d2] == OF_ORDERED_ASCENDING)

	TEST(@"-[seconds]", [d1 second] == 0 && [d2 second] == 5)

	TEST(@"-[microsecond]",
	    [d1 microsecond] == 0 && [d2 microsecond] == 1)

	TEST(@"-[minute]", [d1 minute] == 0 && [d2 minute] == 0)

	TEST(@"-[hour]", [d1 hour] == 0 && [d2 hour] == 1)

	TEST(@"-[dayOfMonth]", [d1 dayOfMonth] == 1 && [d2 dayOfMonth] == 2)

	TEST(@"-[monthOfYear]", [d1 monthOfYear] == 1 && [d2 monthOfYear] == 1)

	TEST(@"-[year]", [d1 year] == 1970 && [d2 year] == 1970)
︙︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.019s