Overview
Comment: | of_dimension_t -> OFSize |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | new-naming-convention |
Files: | files | file ages | folders |
SHA3-256: |
8a7353b21983e6f9b2fa52f60c5c9fe4 |
User & Date: | js on 2021-04-17 01:10:22 |
Other Links: | branch diff | manifest | tags |
Context
2021-04-17
| ||
01:19 | of_rectangle_t -> OFRect check-in: dec9721b35 user: js tags: new-naming-convention | |
01:10 | of_dimension_t -> OFSize check-in: 8a7353b219 user: js tags: new-naming-convention | |
00:59 | Merge trunk into branch "new-naming-convention" check-in: b57126a21e user: js tags: new-naming-convention | |
Changes
Modified src/Makefile from [06838b11b3] to [dbf0faa04b].
︙ | ︙ | |||
177 178 179 180 181 182 183 | ${USE_INCLUDES_ATOMIC} SRCS += OFAdjacentArray.m \ OFAdjacentSubarray.m \ OFBitSetCharacterSet.m \ OFBytesValue.m \ OFCountedMapTableSet.m \ | < > | 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 | ${USE_INCLUDES_ATOMIC} SRCS += OFAdjacentArray.m \ OFAdjacentSubarray.m \ OFBitSetCharacterSet.m \ OFBytesValue.m \ OFCountedMapTableSet.m \ OFInvertedCharacterSet.m \ OFLHADecompressingStream.m \ OFMapTableDictionary.m \ OFMapTableSet.m \ OFMutableAdjacentArray.m \ OFMutableMapTableDictionary.m \ OFMutableMapTableSet.m \ OFMutableUTF8String.m \ OFNonretainedObjectValue.m \ OFPointValue.m \ OFPointerValue.m \ OFRangeCharacterSet.m \ OFRangeValue.m \ OFRectangleValue.m \ OFSandbox.m \ OFSizeValue.m \ OFSubarray.m \ OFUTF8String.m \ ${LIBBASES_M} \ ${RUNTIME_AUTORELEASE_M} \ ${RUNTIME_INSTANCE_M} SRCS_FILES += OFFileURLHandler.m \ OFINIFileSettings.m |
︙ | ︙ |
Modified src/OFNumber.h from [0f4bd36ed7] to [c1e91a3a26].
︙ | ︙ | |||
127 128 129 130 131 132 133 | #ifdef OF_HAVE_UNAVAILABLE + (instancetype)valueWithBytes: (const void *)bytes objCType: (const char *)objCType OF_UNAVAILABLE; + (instancetype)valueWithPointer: (const void *)pointer OF_UNAVAILABLE; + (instancetype)valueWithNonretainedObject: (id)object OF_UNAVAILABLE; + (instancetype)valueWithRange: (OFRange)range OF_UNAVAILABLE; + (instancetype)valueWithPoint: (OFPoint)point OF_UNAVAILABLE; | | | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | #ifdef OF_HAVE_UNAVAILABLE + (instancetype)valueWithBytes: (const void *)bytes objCType: (const char *)objCType OF_UNAVAILABLE; + (instancetype)valueWithPointer: (const void *)pointer OF_UNAVAILABLE; + (instancetype)valueWithNonretainedObject: (id)object OF_UNAVAILABLE; + (instancetype)valueWithRange: (OFRange)range OF_UNAVAILABLE; + (instancetype)valueWithPoint: (OFPoint)point OF_UNAVAILABLE; + (instancetype)valueWithSize: (OFSize)size OF_UNAVAILABLE; + (instancetype)valueWithRectangle: (of_rectangle_t)rectangle OF_UNAVAILABLE; #endif /** * @brief Creates a new OFNumber with the specified `bool`. * * @param value The `bool` value which the OFNumber should contain |
︙ | ︙ |
Modified src/OFObject.h from [257923a725] to [43c18460ed].
︙ | ︙ | |||
186 187 188 189 190 191 192 | if (point1.y != point2.y) return false; return true; } /** | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | if (point1.y != point2.y) return false; return true; } /** * @struct OFSize OFObject.h ObjFW/OFObject.h * * @brief A size. */ struct OF_BOXABLE OFSize { /** The width of the size */ float width; /** The height of the size */ float height; }; typedef struct OFSize OFSize; /** * @brief Creates a new OFSize. * * @param width The width of the size * @param height The height of the size * @return An OFSize with the specified width and height */ static OF_INLINE OFSize OF_CONST_FUNC OFMakeSize(float width, float height) { OFSize size = { width, height }; return size; } /** * @brief Returns whether the two sizes are equal. * * @param size1 The first size for the comparison * @param size2 The second size for the comparison * @return Whether the two sizes are equal */ static OF_INLINE bool OFEqualSizes(OFSize size1, OFSize size2) { if (size1.width != size2.width) return false; if (size1.height != size2.height) return false; return true; } /** * @struct of_rectangle_t OFObject.h ObjFW/OFObject.h * * @brief A rectangle. */ struct OF_BOXABLE of_rectangle_t { /** The point from where the rectangle originates */ OFPoint origin; /** The size of the rectangle */ OFSize size; }; typedef struct of_rectangle_t of_rectangle_t; /** * @brief Creates a new of_rectangle_t. * * @param x The x coordinate of the top left corner of the rectangle * @param y The y coordinate of the top left corner of the rectangle * @param width The width of the rectangle * @param height The height of the rectangle * @return An of_rectangle_t with the specified origin and size */ static OF_INLINE of_rectangle_t OF_CONST_FUNC of_rectangle(float x, float y, float width, float height) { of_rectangle_t rectangle = { OFMakePoint(x, y), OFMakeSize(width, height) }; return rectangle; } /** * @brief Returns whether the two rectangles are equal. * * @param rectangle1 The first rectangle for the comparison * @param rectangle2 The second rectangle for the comparison * @return Whether the two rectangles are equal */ static OF_INLINE bool of_rectangle_equal(of_rectangle_t rectangle1, of_rectangle_t rectangle2) { if (!OFEqualPoints(rectangle1.origin, rectangle2.origin)) return false; if (!OFEqualSizes(rectangle1.size, rectangle2.size)) return false; return true; } #ifdef __OBJC__ @class OFMethodSignature; |
︙ | ︙ |
Renamed and modified src/OFDimensionValue.h [1e5243cb9c] to src/OFSizeValue.h [48dc2259c8].
︙ | ︙ | |||
13 14 15 16 17 18 19 | * file. */ #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN | | | | | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * file. */ #import "OFValue.h" OF_ASSUME_NONNULL_BEGIN @interface OFSizeValue: OFValue { OFSize _size; } - (instancetype)initWithSize: (OFSize)size; @end OF_ASSUME_NONNULL_END |
Renamed and modified src/OFDimensionValue.m [8d1db9e33c] to src/OFSizeValue.m [c2a5ad86a9].
︙ | ︙ | |||
9 10 11 12 13 14 15 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | | | | | | | | | | < | 9 10 11 12 13 14 15 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 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFSizeValue.h" #import "OFMethodSignature.h" #import "OFString.h" #import "OFOutOfRangeException.h" @implementation OFSizeValue @synthesize sizeValue = _size; - (instancetype)initWithSize: (OFSize)size { self = [super init]; _size = size; return self; } - (const char *)objCType { return @encode(OFSize); } - (void)getValue: (void *)value size: (size_t)size { if (size != sizeof(_size)) @throw [OFOutOfRangeException exception]; memcpy(value, &_size, sizeof(_size)); } - (OFString *)description { return [OFString stringWithFormat: @"<OFValue: OFSize { %f, %f }>", _size.width, _size.height]; } @end |
Modified src/OFValue.h from [2be6441b1c] to [2987cd37b8].
︙ | ︙ | |||
43 44 45 46 47 48 49 | * @brief The value as a non-retained object. * * If the value is not pointer-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) id nonretainedObjectValue; /** | | | | | | | | | 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 | * @brief The value as a non-retained object. * * If the value is not pointer-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) id nonretainedObjectValue; /** * @brief The value as an OFRange. * * If the value is not OFRange-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) OFRange rangeValue; /** * @brief The value as an OFPoint. * * If the value is not OFPoint-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) OFPoint pointValue; /** * @brief The value as an OFSize. * * If the value is not OFSize-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) OFSize sizeValue; /** * @brief The value as a rectangle. * * If the value is not rectangle-sized, @ref OFOutOfRangeException is thrown. */ @property (readonly, nonatomic) of_rectangle_t rectangleValue; |
︙ | ︙ | |||
120 121 122 123 124 125 126 | * * @param point The point the OFValue should contain * @return A new, autoreleased OFValue */ + (instancetype)valueWithPoint: (OFPoint)point; /** | | < | | | 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | * * @param point The point the OFValue should contain * @return A new, autoreleased OFValue */ + (instancetype)valueWithPoint: (OFPoint)point; /** * @brief Creates a new, autoreleased OFValue containing the specified size. * * @param size The size the OFValue should contain * @return A new, autoreleased OFValue */ + (instancetype)valueWithSize: (OFSize)size; /** * @brief Creates a new, autoreleased OFValue containing the specified * rectangle. * * @param rectangle The rectangle the OFValue should contain * @return A new, autoreleased OFValue |
︙ | ︙ |
Modified src/OFValue.m from [073716b8bf] to [c62f9e27d2].
︙ | ︙ | |||
11 12 13 14 15 16 17 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFValue.h" #import "OFBytesValue.h" | < > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFValue.h" #import "OFBytesValue.h" #import "OFMethodSignature.h" #import "OFNonretainedObjectValue.h" #import "OFPointValue.h" #import "OFPointerValue.h" #import "OFRangeValue.h" #import "OFRectangleValue.h" #import "OFSizeValue.h" #import "OFString.h" #import "OFOutOfMemoryException.h" @implementation OFValue + (instancetype)alloc { |
︙ | ︙ | |||
59 60 61 62 63 64 65 | } + (instancetype)valueWithPoint: (OFPoint)point { return [[[OFPointValue alloc] initWithPoint: point] autorelease]; } | | | < | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | } + (instancetype)valueWithPoint: (OFPoint)point { return [[[OFPointValue alloc] initWithPoint: point] autorelease]; } + (instancetype)valueWithSize: (OFSize)size { return [[[OFSizeValue alloc] initWithSize: size] autorelease]; } + (instancetype)valueWithRectangle: (of_rectangle_t)rectangle { return [[[OFRectangleValue alloc] initWithRectangle: rectangle] autorelease]; } |
︙ | ︙ | |||
183 184 185 186 187 188 189 | - (OFPoint)pointValue { OFPoint ret; [self getValue: &ret size: sizeof(ret)]; return ret; } | | | | 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 | - (OFPoint)pointValue { OFPoint ret; [self getValue: &ret size: sizeof(ret)]; return ret; } - (OFSize)sizeValue { OFSize ret; [self getValue: &ret size: sizeof(ret)]; return ret; } - (of_rectangle_t)rectangleValue { of_rectangle_t ret; |
︙ | ︙ |
Modified tests/OFValueTests.m from [f272ff9674] to [30f9ae95fb].
︙ | ︙ | |||
23 24 25 26 27 28 29 | @implementation TestsAppDelegate (OFValueTests) - (void)valueTests { void *pool = objc_autoreleasePoolPush(); OFRange range = OFMakeRange(1, 64), range2; OFPoint point = OFMakePoint(1.5f, 3.0f), point2; | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | @implementation TestsAppDelegate (OFValueTests) - (void)valueTests { void *pool = objc_autoreleasePoolPush(); OFRange range = OFMakeRange(1, 64), range2; OFPoint point = OFMakePoint(1.5f, 3.0f), point2; OFSize size = OFMakeSize(4.5f, 5.0f), size2; of_rectangle_t rectangle = of_rectangle(1.5f, 3.0f, 4.5f, 6.0f); of_rectangle_t rectangle2; OFValue *value; void *pointer = &value; TEST(@"+[valueWithBytes:objCType:]", (value = [OFValue valueWithBytes: &range |
︙ | ︙ | |||
107 108 109 110 111 112 113 | OFEqualPoints(point2, point)) EXPECT_EXCEPTION(@"-[pointValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" objCType: @encode(char)] pointValue]) | | | | | | | | | | | | | | | 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 | OFEqualPoints(point2, point)) EXPECT_EXCEPTION(@"-[pointValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" objCType: @encode(char)] pointValue]) TEST(@"+[valueWithSize:]", (value = [OFValue valueWithSize: size])) TEST(@"-[sizeValue]", OFEqualSizes(value.sizeValue, size) && (value = [OFValue valueWithBytes: &size objCType: @encode(OFSize)]) && OFEqualSizes(value.sizeValue, size)) TEST(@"-[getValue:size:] for OFSizeValue", (value = [OFValue valueWithSize: size]) && R([value getValue: &size2 size: sizeof(size2)]) && OFEqualSizes(size2, size)) EXPECT_EXCEPTION(@"-[sizeValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" objCType: @encode(char)] sizeValue]) TEST(@"+[valueWithRectangle:]", (value = [OFValue valueWithRectangle: rectangle])) TEST(@"-[rectangleValue]", of_rectangle_equal(value.rectangleValue, rectangle) && (value = [OFValue valueWithBytes: &rectangle |
︙ | ︙ |