Skip to content

Commit d285925

Browse files
JordyAalderingJordyAaldering
committed
don't inline stdio functions; they are not performance-critical
1 parent 7bc3fd2 commit d285925

File tree

6 files changed

+161
-222
lines changed

6 files changed

+161
-222
lines changed

‎src/stdio/ArrayIO.xsac

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,32 @@ external void showarray(TermFile &stream, int d, int[.] s, char[*] a);
6363
/******************************************************************************/
6464

6565
#define PRINT(typ, _postfix, _fmt, _zero, _one) \
66-
inline void fprint(TermFile &stream, string fmt, typ[d:shp] arr) \
66+
void fprint(TermFile &stream, string fmt, typ[d:shp] arr) \
6767
{ \
6868
printarray(stream, fmt, d, shp, arr); \
6969
} \
7070
\
71-
inline void fprint(TermFile &stream, typ[d:shp] arr) \
71+
void fprint(TermFile &stream, typ[d:shp] arr) \
7272
{ \
7373
printarray(stream, d, shp, arr); \
7474
} \
7575
\
76-
inline void fprint(File &stream, string fmt, typ[d:shp] arr) \
76+
void fprint(File &stream, string fmt, typ[d:shp] arr) \
7777
{ \
7878
printarray(stream, fmt, d, shp, arr); \
7979
} \
8080
\
81-
inline void fprint(File &stream, typ[d:shp] arr) \
81+
void fprint(File &stream, typ[d:shp] arr) \
8282
{ \
8383
printarray(stream, d, shp, arr); \
8484
} \
8585
\
86-
inline void print(string fmt, typ[d:shp] arr) \
86+
void print(string fmt, typ[d:shp] arr) \
8787
{ \
8888
printarray(stdout, fmt, d, shp, arr); \
8989
} \
9090
\
91-
inline void print(typ[d:shp] arr) \
91+
void print(typ[d:shp] arr) \
9292
{ \
9393
printarray(stdout, d, shp, arr); \
9494
}
@@ -98,7 +98,7 @@ BUILT_IN(PRINT)
9898
/******************************************************************************/
9999

100100
#define SHOW(typ) \
101-
inline void show(typ[+] arr) \
101+
void show(typ[+] arr) \
102102
{ \
103103
carr = format(arr); \
104104
showarray(stdout, dim(carr), shape(carr), carr); \

‎src/stdio/ComplexIO.sac

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ external void printarray( TermFile &stream, string format, int d, int[.] s, com
4343

4444
/*****************************************************************/
4545

46-
inline void fprint(File &stream, complex c)
46+
void fprint(File &stream, complex c)
4747
{
4848
File::fprintf(stream, "(%g,%g)", real(c), imag(c));
4949
}
5050

5151

5252
/*****************************************************************/
5353

54-
inline void fprint(File &stream, complex c, int mode)
54+
void fprint(File &stream, complex c, int mode)
5555
{
5656
if (mode==2)
5757
{
@@ -73,7 +73,7 @@ inline void fprint(File &stream, complex c, int mode)
7373

7474
/*****************************************************************/
7575

76-
inline void fprint(File &stream, complex c, int mode, int prec)
76+
void fprint(File &stream, complex c, int mode, int prec)
7777
{
7878
if (mode==2)
7979
{
@@ -97,15 +97,15 @@ inline void fprint(File &stream, complex c, int mode, int prec)
9797
/*****************************************************************/
9898

9999

100-
inline void fprint(TermFile &stream, complex c)
100+
void fprint(TermFile &stream, complex c)
101101
{
102102
TermFile::fprintf(stream, "(%g,%g)", real(c), imag(c));
103103
}
104104

105105

106106
/*****************************************************************/
107107

108-
inline void fprint(TermFile &stream, complex c, int mode)
108+
void fprint(TermFile &stream, complex c, int mode)
109109
{
110110
if (mode==2)
111111
{
@@ -127,7 +127,7 @@ inline void fprint(TermFile &stream, complex c, int mode)
127127

128128
/*****************************************************************/
129129

130-
inline void fprint(TermFile &stream, complex c, int mode, int prec)
130+
void fprint(TermFile &stream, complex c, int mode, int prec)
131131
{
132132
if (mode==2)
133133
{
@@ -150,37 +150,37 @@ inline void fprint(TermFile &stream, complex c, int mode, int prec)
150150
/*****************************************************************/
151151
/*****************************************************************/
152152

153-
inline void print(complex c)
153+
void print(complex c)
154154
{
155155
fprint(TermFile::stdout, c);
156156
}
157157

158158

159159
/*****************************************************************/
160160

161-
inline void print(complex c, int mode)
161+
void print(complex c, int mode)
162162
{
163163
fprint(TermFile::stdout, c, mode);
164164
}
165165

166166

167167
/*****************************************************************/
168168

169-
inline void print(complex c, int mode, int prec)
169+
void print(complex c, int mode, int prec)
170170
{
171171
fprint(TermFile::stdout, c, mode, prec);
172172
}
173173

174174
/*****************************************************************/
175175

176-
inline void print(complex[+] arr)
176+
void print(complex[+] arr)
177177
{
178178
printarray(TermFile::stdout, dim( arr), shape( arr), arr);
179179
}
180180

181181
/*****************************************************************/
182182

183-
inline void print(complex[+] arr, int mode)
183+
void print(complex[+] arr, int mode)
184184
{
185185
string format;
186186
if (mode==2)
@@ -203,7 +203,7 @@ inline void print(complex[+] arr, int mode)
203203

204204
/*****************************************************************/
205205

206-
inline void print(complex[+] arr, int mode, int prec)
206+
void print(complex[+] arr, int mode, int prec)
207207
{
208208
string format;
209209
if (mode==2)
@@ -227,7 +227,7 @@ inline void print(complex[+] arr, int mode, int prec)
227227
/*****************************************************************/
228228
/*****************************************************************/
229229

230-
inline bool, complex fscancomplex(File &stream)
230+
bool, complex fscancomplex(File &stream)
231231
{
232232
double re;
233233
double im;
@@ -244,7 +244,7 @@ inline bool, complex fscancomplex(File &stream)
244244
/*****************************************************************/
245245

246246

247-
inline bool, complex fscancomplex(File &stream, int mode)
247+
bool, complex fscancomplex(File &stream, int mode)
248248
{
249249
double re;
250250
double im;
@@ -277,7 +277,7 @@ inline bool, complex fscancomplex(File &stream, int mode)
277277
/*****************************************************************/
278278

279279

280-
inline bool, complex fscancomplex(TermFile &stream)
280+
bool, complex fscancomplex(TermFile &stream)
281281
{
282282
double re;
283283
double im;
@@ -294,7 +294,7 @@ inline bool, complex fscancomplex(TermFile &stream)
294294
/*****************************************************************/
295295

296296

297-
inline bool, complex fscancomplex(TermFile &stream, int mode)
297+
bool, complex fscancomplex(TermFile &stream, int mode)
298298
{
299299
double re;
300300
double im;
@@ -327,7 +327,7 @@ inline bool, complex fscancomplex(TermFile &stream, int mode)
327327
/*****************************************************************/
328328

329329

330-
inline bool, complex scancomplex()
330+
bool, complex scancomplex()
331331
{
332332
double re;
333333
double im;
@@ -344,7 +344,7 @@ inline bool, complex scancomplex()
344344
/*****************************************************************/
345345

346346

347-
inline bool, complex scancomplex(int mode)
347+
bool, complex scancomplex(int mode)
348348
{
349349
double re;
350350
double im;

‎src/stdio/FibreIO.sac

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -183,116 +183,116 @@ stringArray FibreScanStringArray()
183183

184184
/******************************************************************************/
185185

186-
inline void FibrePrint(File &stream, int[d:shp] arr)
186+
void FibrePrint(File &stream, int[d:shp] arr)
187187
{
188188
FibrePrint(stream, d, shp, arr);
189189
}
190190

191-
inline void FibrePrint(File &stream, int arr)
191+
void FibrePrint(File &stream, int arr)
192192
{
193193
File::fprintf(stream, "%d\n", arr);
194194
}
195195

196-
inline void FibrePrint(File &stream, float[d:shp] arr)
196+
void FibrePrint(File &stream, float[d:shp] arr)
197197
{
198198
FibrePrint(stream, d, shp, arr);
199199
}
200200

201-
inline void FibrePrint(File &stream, float arr)
201+
void FibrePrint(File &stream, float arr)
202202
{
203203
File::fprintf(stream, "%.16f\n", tod(arr));
204204
}
205205

206-
inline void FibrePrint(File &stream, double[d:shp] arr)
206+
void FibrePrint(File &stream, double[d:shp] arr)
207207
{
208208
FibrePrint(stream, d, shp, arr);
209209
}
210210

211-
inline void FibrePrint(File &stream, double arr)
211+
void FibrePrint(File &stream, double arr)
212212
{
213213
File::fprintf(stream, "%.16f\n", arr);
214214
}
215215

216-
inline void FibrePrint(File &stream, stringArray arr)
216+
void FibrePrint(File &stream, stringArray arr)
217217
{
218218
FibrePrint(stream, StringArray::dim(arr), StringArray::shape(arr), arr);
219219
}
220220

221221
/******************************************************************************/
222222

223-
inline void FibrePrint(TermFile &stream, int[d:shp] arr)
223+
void FibrePrint(TermFile &stream, int[d:shp] arr)
224224
{
225225
FibrePrint(stream, d, shp, arr);
226226
}
227227

228-
inline void FibrePrint(TermFile &stream, int arr)
228+
void FibrePrint(TermFile &stream, int arr)
229229
{
230230
TermFile::fprintf(stream, "%d\n", arr);
231231
}
232232

233-
inline void FibrePrint(TermFile &stream, float[d:shp] arr)
233+
void FibrePrint(TermFile &stream, float[d:shp] arr)
234234
{
235235
FibrePrint(stream, d, shp, arr);
236236
}
237237

238-
inline void FibrePrint(TermFile &stream, float arr)
238+
void FibrePrint(TermFile &stream, float arr)
239239
{
240240
TermFile::fprintf(stream, "%.16f\n", tod(arr));
241241
}
242242

243-
inline void FibrePrint(TermFile &stream, double[d:shp] arr)
243+
void FibrePrint(TermFile &stream, double[d:shp] arr)
244244
{
245245
FibrePrint(stream, d, shp, arr);
246246
}
247247

248-
inline void FibrePrint(TermFile &stream, double arr)
248+
void FibrePrint(TermFile &stream, double arr)
249249
{
250250
TermFile::fprintf(stream, "%.16f\n", arr);
251251
}
252252

253-
inline void FibrePrint(TermFile &stream, stringArray arr)
253+
void FibrePrint(TermFile &stream, stringArray arr)
254254
{
255255
FibrePrint(stream, StringArray::dim(arr), StringArray::shape(arr), arr);
256256
}
257257

258258
/******************************************************************************/
259259

260-
inline void FibrePrint(int[d:shp] arr)
260+
void FibrePrint(int[d:shp] arr)
261261
{
262262
FibrePrint(stdout, d, shp, arr);
263263
}
264264

265-
inline void FibrePrint(int arr)
265+
void FibrePrint(int arr)
266266
{
267267
TermFile::fprintf(stdout, "%d\n", arr);
268268
}
269269

270-
inline void FibrePrint(float[d:shp] arr)
270+
void FibrePrint(float[d:shp] arr)
271271
{
272272
FibrePrint(stdout, d, shp, arr);
273273
}
274274

275-
inline void FibrePrint(float arr)
275+
void FibrePrint(float arr)
276276
{
277277
TermFile::fprintf(stdout, "%.16f\n", tod(arr));
278278
}
279279

280-
inline void FibrePrint(double[d:shp] arr)
280+
void FibrePrint(double[d:shp] arr)
281281
{
282282
FibrePrint(stdout, d, shp, arr);
283283
}
284284

285-
inline void FibrePrint(double arr)
285+
void FibrePrint(double arr)
286286
{
287287
TermFile::fprintf(stdout, "%.16f\n", arr);
288288
}
289289

290-
inline void FibrePrint(StringArray::stringArray arr)
290+
void FibrePrint(StringArray::stringArray arr)
291291
{
292292
FibrePrint(stdout, StringArray::dim(arr), StringArray::shape(arr), arr);
293293
}
294294

295-
inline void FibrePrint(string scaler)
295+
void FibrePrint(string scaler)
296296
{
297297
TermFile::printf("%s", scaler);
298298
}
@@ -343,32 +343,32 @@ type[*] FibreScan##alias##Array() \
343343
}
344344

345345
#define FIBREPRINT(type,formatting) \
346-
inline void FibrePrint(File &stream, type[d:shp] arr) \
346+
void FibrePrint(File &stream, type[d:shp] arr) \
347347
{ \
348348
FibrePrint(stream, d, shp, arr); \
349349
} \
350350
\
351-
inline void FibrePrint(File &stream, type arr) \
351+
void FibrePrint(File &stream, type arr) \
352352
{ \
353353
File::fprintf(stream, SETFORMAT(formatting), arr); \
354354
} \
355355
\
356-
inline void FibrePrint(TermFile &stream, type[d:shp] arr) \
356+
void FibrePrint(TermFile &stream, type[d:shp] arr) \
357357
{ \
358358
FibrePrint(stream, d, shp, arr); \
359359
} \
360360
\
361-
inline void FibrePrint(TermFile &stream, type arr) \
361+
void FibrePrint(TermFile &stream, type arr) \
362362
{ \
363363
TermFile::fprintf(stream, SETFORMAT(formatting), arr); \
364364
} \
365365
\
366-
inline void FibrePrint(type[d:shp] arr) \
366+
void FibrePrint(type[d:shp] arr) \
367367
{ \
368368
FibrePrint(stdout, d, shp, arr); \
369369
} \
370370
\
371-
inline void FibrePrint(type arr) \
371+
void FibrePrint(type arr) \
372372
{ \
373373
TermFile::fprintf(stdout, SETFORMAT(formatting), arr); \
374374
}

0 commit comments

Comments
 (0)