Skip to content

Commit f5cb067

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

File tree

6 files changed

+152
-208
lines changed

6 files changed

+152
-208
lines changed

‎src/stdio/ArrayIO.xsac

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

6666
#define PRINT(typ, _postfix, _fmt, _zero, _one) \
67-
inline void fprint(TermFile &stream, string fmt, typ[d:shp] arr) \
67+
void fprint(TermFile &stream, string fmt, typ[d:shp] arr) \
6868
{ \
6969
printarray(stream, fmt, d, shp, arr); \
7070
} \
7171
\
72-
inline void fprint(TermFile &stream, typ[d:shp] arr) \
72+
void fprint(TermFile &stream, typ[d:shp] arr) \
7373
{ \
7474
printarray(stream, d, shp, arr); \
7575
} \
7676
\
77-
inline void fprint(File &stream, string fmt, typ[d:shp] arr) \
77+
void fprint(File &stream, string fmt, typ[d:shp] arr) \
7878
{ \
7979
printarray(stream, fmt, d, shp, arr); \
8080
} \
8181
\
82-
inline void fprint(File &stream, typ[d:shp] arr) \
82+
void fprint(File &stream, typ[d:shp] arr) \
8383
{ \
8484
printarray(stream, d, shp, arr); \
8585
} \
8686
\
87-
inline void print(string fmt, typ[d:shp] arr) \
87+
void print(string fmt, typ[d:shp] arr) \
8888
{ \
8989
printarray(stdout, fmt, d, shp, arr); \
9090
} \
9191
\
92-
inline void print(typ[d:shp] arr) \
92+
void print(typ[d:shp] arr) \
9393
{ \
9494
printarray(stdout, d, shp, arr); \
9595
}
@@ -99,7 +99,7 @@ BUILT_IN(PRINT)
9999
/******************************************************************************/
100100

101101
#define SHOW(typ) \
102-
inline void show(typ[+] arr) \
102+
void show(typ[+] arr) \
103103
{ \
104104
carr = format(arr); \
105105
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
@@ -44,15 +44,15 @@ external void printarray( TermFile &stream, string format, int d, int[.] s, com
4444

4545
/*****************************************************************/
4646

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

5252

5353
/*****************************************************************/
5454

55-
inline void fprint(File &stream, complex c, int mode)
55+
void fprint(File &stream, complex c, int mode)
5656
{
5757
if (mode==2)
5858
{
@@ -74,7 +74,7 @@ inline void fprint(File &stream, complex c, int mode)
7474

7575
/*****************************************************************/
7676

77-
inline void fprint(File &stream, complex c, int mode, int prec)
77+
void fprint(File &stream, complex c, int mode, int prec)
7878
{
7979
if (mode==2)
8080
{
@@ -98,15 +98,15 @@ inline void fprint(File &stream, complex c, int mode, int prec)
9898
/*****************************************************************/
9999

100100

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

106106

107107
/*****************************************************************/
108108

109-
inline void fprint(TermFile &stream, complex c, int mode)
109+
void fprint(TermFile &stream, complex c, int mode)
110110
{
111111
if (mode==2)
112112
{
@@ -128,7 +128,7 @@ inline void fprint(TermFile &stream, complex c, int mode)
128128

129129
/*****************************************************************/
130130

131-
inline void fprint(TermFile &stream, complex c, int mode, int prec)
131+
void fprint(TermFile &stream, complex c, int mode, int prec)
132132
{
133133
if (mode==2)
134134
{
@@ -151,37 +151,37 @@ inline void fprint(TermFile &stream, complex c, int mode, int prec)
151151
/*****************************************************************/
152152
/*****************************************************************/
153153

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

159159

160160
/*****************************************************************/
161161

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

167167

168168
/*****************************************************************/
169169

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

175175
/*****************************************************************/
176176

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

182182
/*****************************************************************/
183183

184-
inline void print(complex[+] arr, int mode)
184+
void print(complex[+] arr, int mode)
185185
{
186186
string format;
187187
if (mode==2)
@@ -204,7 +204,7 @@ inline void print(complex[+] arr, int mode)
204204

205205
/*****************************************************************/
206206

207-
inline void print(complex[+] arr, int mode, int prec)
207+
void print(complex[+] arr, int mode, int prec)
208208
{
209209
string format;
210210
if (mode==2)
@@ -228,7 +228,7 @@ inline void print(complex[+] arr, int mode, int prec)
228228
/*****************************************************************/
229229
/*****************************************************************/
230230

231-
inline bool, complex fscancomplex(File &stream)
231+
bool, complex fscancomplex(File &stream)
232232
{
233233
double re;
234234
double im;
@@ -245,7 +245,7 @@ inline bool, complex fscancomplex(File &stream)
245245
/*****************************************************************/
246246

247247

248-
inline bool, complex fscancomplex(File &stream, int mode)
248+
bool, complex fscancomplex(File &stream, int mode)
249249
{
250250
double re;
251251
double im;
@@ -278,7 +278,7 @@ inline bool, complex fscancomplex(File &stream, int mode)
278278
/*****************************************************************/
279279

280280

281-
inline bool, complex fscancomplex(TermFile &stream)
281+
bool, complex fscancomplex(TermFile &stream)
282282
{
283283
double re;
284284
double im;
@@ -295,7 +295,7 @@ inline bool, complex fscancomplex(TermFile &stream)
295295
/*****************************************************************/
296296

297297

298-
inline bool, complex fscancomplex(TermFile &stream, int mode)
298+
bool, complex fscancomplex(TermFile &stream, int mode)
299299
{
300300
double re;
301301
double im;
@@ -328,7 +328,7 @@ inline bool, complex fscancomplex(TermFile &stream, int mode)
328328
/*****************************************************************/
329329

330330

331-
inline bool, complex scancomplex()
331+
bool, complex scancomplex()
332332
{
333333
double re;
334334
double im;
@@ -345,7 +345,7 @@ inline bool, complex scancomplex()
345345
/*****************************************************************/
346346

347347

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

‎src/stdio/FibreIO.sac

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

185185
/******************************************************************************/
186186

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

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

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

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

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

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

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

222222
/******************************************************************************/
223223

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

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

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

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

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

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

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

259259
/******************************************************************************/
260260

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

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

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

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

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

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

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

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

346346
#define FIBREPRINT(type,formatting) \
347-
inline void FibrePrint(File &stream, type[d:shp] arr) \
347+
void FibrePrint(File &stream, type[d:shp] arr) \
348348
{ \
349349
FibrePrint(stream, d, shp, arr); \
350350
} \
351351
\
352-
inline void FibrePrint(File &stream, type arr) \
352+
void FibrePrint(File &stream, type arr) \
353353
{ \
354354
File::fprintf(stream, SETFORMAT(formatting), arr); \
355355
} \
356356
\
357-
inline void FibrePrint(TermFile &stream, type[d:shp] arr) \
357+
void FibrePrint(TermFile &stream, type[d:shp] arr) \
358358
{ \
359359
FibrePrint(stream, d, shp, arr); \
360360
} \
361361
\
362-
inline void FibrePrint(TermFile &stream, type arr) \
362+
void FibrePrint(TermFile &stream, type arr) \
363363
{ \
364364
TermFile::fprintf(stream, SETFORMAT(formatting), arr); \
365365
} \
366366
\
367-
inline void FibrePrint(type[d:shp] arr) \
367+
void FibrePrint(type[d:shp] arr) \
368368
{ \
369369
FibrePrint(stdout, d, shp, arr); \
370370
} \
371371
\
372-
inline void FibrePrint(type arr) \
372+
void FibrePrint(type arr) \
373373
{ \
374374
TermFile::fprintf(stdout, SETFORMAT(formatting), arr); \
375375
}

0 commit comments

Comments
 (0)