Overview
Context
Changes
Modified src/OFConstantString.m
from [e612866855]
to [5e08953a1a].
︙ | | |
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
-
+
-
+
|
- initWithCString: (const char*)str
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- initWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding;
encoding: (of_string_encoding_t)encoding;
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- initWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
length: (size_t)len
{
@throw [OFNotImplementedException newWithClass: isa
selector: _cmd];
}
- initWithCString: (const char*)str
|
︙ | | |
Modified src/OFNumber.h
from [14ca51589b]
to [914f43516c].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
+
+
+
-
+
|
* file.
*/
#include <unistd.h>
#import "OFObject.h"
/**
* \brief The type of a number.
*/
enum of_number_type {
typedef enum of_number_type_t {
OF_NUMBER_BOOL,
OF_NUMBER_CHAR,
OF_NUMBER_SHORT,
OF_NUMBER_INT,
OF_NUMBER_LONG,
OF_NUMBER_UCHAR,
OF_NUMBER_USHORT,
|
︙ | | |
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
-
+
|
OF_NUMBER_INTMAX,
OF_NUMBER_UINTMAX,
OF_NUMBER_PTRDIFF,
OF_NUMBER_INTPTR,
OF_NUMBER_UINTPTR,
OF_NUMBER_FLOAT,
OF_NUMBER_DOUBLE,
};
} of_number_type_t;
/**
* \brief Provides a way to store a number in an object.
*/
@interface OFNumber: OFObject <OFCopying>
{
union {
|
︙ | | |
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
-
+
|
uintmax_t uintmax;
ptrdiff_t ptrdiff;
intptr_t intptr;
uintptr_t uintptr;
float float_;
double double_;
} value;
enum of_number_type type;
of_number_type_t type;
}
/**
* \param bool_ A BOOL which the OFNumber should contain
* \return A new autoreleased OFNumber
*/
+ numberWithBool: (BOOL)bool_;
|
︙ | | |
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
|
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
|
-
+
-
-
+
|
*
* \param double_ A double which the OFNumber should contain
* \return An initialized OFNumber
*/
- initWithDouble: (double)double_;
/**
* \return An enum of type of_number_type indicating the type of contained
* \return An of_number_type_t indicating the type of the number
* number of the OFNumber
*/
- (enum of_number_type)type;
- (of_number_type_t)type;
/**
* \return The OFNumber as a BOOL
*/
- (BOOL)boolValue;
/**
|
︙ | | |
Modified src/OFNumber.m
from [9b41925c57]
to [8d4f8ec1f8].
︙ | | |
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
|
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
|
-
+
|
value.double_ = double_;
type = OF_NUMBER_DOUBLE;
return self;
}
- (enum of_number_type)type
- (of_number_type_t)type
{
return type;
}
- (BOOL)boolValue
{
RETURN_AS(BOOL)
|
︙ | | |
Modified src/OFStream.h
from [0a6b8c3f80]
to [74be59fb41].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
+
-
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include <stdarg.h>
#import "OFObject.h"
#import "OFString.h"
@class OFString;
@class OFDataArray;
/**
* \brief A base class for different types of streams.
*
* IMPORTANT: If you want to subclass this, override _readNBytes:intoBuffer:,
* _writeNBytes:fromBuffer: and _isAtEndOfStream, but nothing else. Those are
|
︙ | | |
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
|
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
|
-
+
-
+
|
* Read with the specified encoding until a newline, \\0 or end of stream
* occurs.
*
* \param encoding The encoding used by the stream
* \return The line that was read, autoreleased, or nil if the end of the
* stream has been reached.
*/
- (OFString*)readLineWithEncoding: (enum of_string_encoding)encoding;
- (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding;
/**
* Read until the specified string or \\0 is found or the end of stream occurs.
*
* \param delimiter The delimiter
* \return The line that was read, autoreleased, or nil if the end of the
* stream has been reached.
*/
- (OFString*)readTillDelimiter: (OFString*)delimiter;
/**
* Read until the specified string or \\0 is found or the end of stream occurs.
*
* \param delimiter The delimiter
* \param encoding The encoding used by the stream
* \return The line that was read, autoreleased, or nil if the end of the
* stream has been reached.
*/
- (OFString*)readTillDelimiter: (OFString*)delimiter
withEncoding: (enum of_string_encoding)encoding;
withEncoding: (of_string_encoding_t)encoding;
/**
* \return A boolean whether writes are buffered
*/
- (BOOL)buffersWrites;
/**
|
︙ | | |
Modified src/OFStream.m
from [c884b52f6e]
to [515ee39e97].
︙ | | |
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
|
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
|
-
+
|
}
- (OFString*)readLine
{
return [self readLineWithEncoding: OF_STRING_ENCODING_UTF_8];
}
- (OFString*)readLineWithEncoding: (enum of_string_encoding)encoding
- (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding
{
size_t i, len, ret_len;
char *ret_c, *tmp, *tmp2;
OFString *ret;
/* Look if there's a line or \0 in our cache */
if (cache != NULL) {
|
︙ | | |
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
|
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
|
-
+
|
- (OFString*)readTillDelimiter: (OFString*)delimiter
{
return [self readTillDelimiter: delimiter
withEncoding: OF_STRING_ENCODING_UTF_8];
}
- (OFString*)readTillDelimiter: (OFString*)delimiter
withEncoding: (enum of_string_encoding)encoding
withEncoding: (of_string_encoding_t)encoding
{
const char *delim;
size_t i, j, delim_len, len, ret_len;
char *ret_c, *tmp, *tmp2;
OFString *ret;
/* FIXME: Convert delimiter to specified charset */
|
︙ | | |
Modified src/OFString.h
from [c3d27af413]
to [78d3e88b84].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
+
+
+
-
+
-
+
|
#include <stdio.h>
#include <stdarg.h>
#import "OFObject.h"
typedef uint32_t of_unichar_t;
/**
* \brief The encoding of a string.
*/
enum of_string_encoding {
typedef enum of_string_encoding_t {
OF_STRING_ENCODING_UTF_8,
OF_STRING_ENCODING_ISO_8859_1,
OF_STRING_ENCODING_ISO_8859_15,
OF_STRING_ENCODING_WINDOWS_1252
};
} of_string_encoding_t;
extern int of_string_check_utf8(const char*, size_t);
extern size_t of_string_unicode_to_utf8(of_unichar_t, char*);
extern size_t of_string_utf8_to_unicode(const char*, size_t, of_unichar_t*);
extern size_t of_string_position_to_index(const char*, size_t);
extern size_t of_string_index_to_position(const char*, size_t, size_t);
|
︙ | | |
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
|
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
|
-
+
-
+
|
* Creates a new OFString from a C string with the specified encoding.
*
* \param str A C string to initialize the OFString with
* \param encoding The encoding of the C string
* \return A new autoreleased OFString
*/
+ stringWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding;
encoding: (of_string_encoding_t)encoding;
/**
* Creates a new OFString from a C string with the specified encoding and
* length.
*
* \param str A C string to initialize the OFString with
* \param encoding The encoding of the C string
* \param len The length of the C string
* \return A new autoreleased OFString
*/
+ stringWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
length: (size_t)len;
/**
* Creates a new OFString from a UTF-8 encoded C string with the specified
* length.
*
* \param str A UTF-8 encoded C string to initialize the OFString with
|
︙ | | |
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
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
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
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
-
+
-
+
-
+
|
* specified encoding.
*
* \param path The path to the file
* \param encoding The encoding of the file
* \return A new autoreleased OFString
*/
+ stringWithContentsOfFile: (OFString*)path
encoding: (enum of_string_encoding)encoding;
encoding: (of_string_encoding_t)encoding;
/**
* Initializes an already allocated OFString from a UTF-8 encoded C string.
*
* \param str A UTF-8 encoded C string to initialize the OFString with
* \return An initialized OFString
*/
- initWithCString: (const char*)str;
/**
* Initializes an already allocated OFString from a C string with the specified
* encoding.
*
* \param str A C string to initialize the OFString with
* \param encoding The encoding of the C string
* \return An initialized OFString
*/
- initWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding;
encoding: (of_string_encoding_t)encoding;
/**
* Initializes an already allocated OFString from a C string with the specified
* encoding and length.
*
* \param str A C string to initialize the OFString with
* \param encoding The encoding of the C string
* \param len The length of the C string
* \return An initialized OFString
*/
- initWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
length: (size_t)len;
/**
* Initializes an already allocated OFString from a UTF-8 encoded C string with
* the specified length.
*
* \param str A UTF-8 encoded C string to initialize the OFString with
|
︙ | | |
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
-
+
|
* file in the specified encoding.
*
* \param path The path to the file
* \param encoding The encoding of the file
* \return An initialized OFString
*/
- initWithContentsOfFile: (OFString*)path
encoding: (enum of_string_encoding)encoding;
encoding: (of_string_encoding_t)encoding;
/**
* \return The OFString as a UTF-8 encoded C string
*/
- (const char*)cString;
/**
|
︙ | | |
Modified src/OFString.m
from [e1b8eb30ed]
to [a9943514ef].
︙ | | |
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
-
+
-
+
|
+ stringWithCString: (const char*)str
{
return [[[self alloc] initWithCString: str] autorelease];
}
+ stringWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
{
return [[[self alloc] initWithCString: str
encoding: encoding] autorelease];
}
+ stringWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
length: (size_t)len
{
return [[[self alloc] initWithCString: str
encoding: encoding
length: len] autorelease];
}
|
︙ | | |
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
|
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
|
-
+
-
+
-
+
|
+ stringWithContentsOfFile: (OFString*)path
{
return [[[self alloc] initWithContentsOfFile: path] autorelease];
}
+ stringWithContentsOfFile: (OFString*)path
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
{
return [[[self alloc] initWithContentsOfFile: path
encoding: encoding] autorelease];
}
- initWithCString: (const char*)str
{
return [self initWithCString: str
encoding: OF_STRING_ENCODING_UTF_8
length: strlen(str)];
}
- initWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
{
return [self initWithCString: str
encoding: encoding
length: strlen(str)];
}
- initWithCString: (const char*)str
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
length: (size_t)len
{
self = [super init];
@try {
size_t i, j;
const uint16_t *table;
|
︙ | | |
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
|
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
|
-
+
|
- initWithContentsOfFile: (OFString*)path
{
return [self initWithContentsOfFile: path
encoding: OF_STRING_ENCODING_UTF_8];
}
- initWithContentsOfFile: (OFString*)path
encoding: (enum of_string_encoding)encoding
encoding: (of_string_encoding_t)encoding
{
self = [super init];
@try {
OFFile *file;
char *tmp;
struct stat s;
|
︙ | | |