ObjFW  Diff

Differences From Artifact [7be4d41cc6]:

To Artifact [a1eb70bd06]:


41
42
43
44
45
46
47
48


49
50
51
52
53

54

55
56
57
58
59
60
61
41
42
43
44
45
46
47

48
49
50
51
52
53

54
55
56
57
58
59
60
61
62
63







-
+
+




-
+

+







}

+ vectorWithDimension: (size_t)dimension
{
	return [[[self alloc] initWithDimension: dimension] autorelease];
}

+ vectorWithDimensionAndData: (size_t)dimension, ...
+ vectorWithDimension: (size_t)dimension
		 data: (float)data, ...
{
	id ret;
	va_list arguments;

	va_start(arguments, dimension);
	va_start(arguments, data);
	ret = [[[self alloc] initWithDimension: dimension
					  data: data
				     arguments: arguments] autorelease];
	va_end(arguments);

	return ret;
}

- init
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
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







-
+
+




-
+

+







+

















+
-
+







		[self release];
		@throw e;
	}

	return self;
}

- initWithDimensionAndData: (size_t)dimension_, ...
- initWithDimension: (size_t)dimension_
	       data: (float)data_, ...
{
	id ret;
	va_list arguments;

	va_start(arguments, dimension_);
	va_start(arguments, data_);
	ret = [self initWithDimension: dimension_
				 data: data_
			    arguments: arguments];
	va_end(arguments);

	return ret;
}

- initWithDimension: (size_t)dimension_
	       data: (float)data_
	  arguments: (va_list)arguments
{
	self = [super init];

	@try {
		size_t i;

		dimension = dimension_;

		if (SIZE_MAX / dimension < sizeof(float))
			@throw [OFOutOfRangeException newWithClass: isa];

		if ((data = malloc(dimension * sizeof(float))) == NULL)
			@throw [OFOutOfMemoryException
			     newWithClass: isa
			    requestedSize: dimension * sizeof(float)];

		data[0] = data_;
		for (i = 0; i < dimension; i++)
		for (i = 1; i < dimension; i++)
			data[i] = (float)va_arg(arguments, double);
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;