Mercurial > octave

comparison src/oct-stream.cc @ 3233:98d0ee053ba4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1999-01-27 20:23:40 by jwe]
author jwe
date Wed, 27 Jan 1999 20:23:46 +0000
parents c17387059fd3
children 8092e8197ce4
comparison
equal deleted inserted replaced
3232:3f6ae91e86b0 3233:98d0ee053ba4
287 } 287 }
288 } 288 }
289 break; 289 break;
290 290
291 case 'h': case 'l': case 'L': 291 case 'h': case 'l': case 'L':
292 // We accept these but we don't actually use them.
293 if (modifier != '\0') 292 if (modifier != '\0')
294 nconv = -1; 293 nconv = -1;
295 else 294 else
296 modifier = s[i++]; 295 modifier = s[i++];
297 break; 296 break;
923 } 922 }
924 } 923 }
925 924
926 template void 925 template void
927 do_scanf_conv (istream&, const char*, int*, Matrix&, double*, int&, 926 do_scanf_conv (istream&, const char*, int*, Matrix&, double*, int&,
927 int, int, bool);
928
929 template void
930 do_scanf_conv (istream&, const char*, long int*, Matrix&, double*, int&,
931 int, int, bool);
932
933 template void
934 do_scanf_conv (istream&, const char*, short int*, Matrix&, double*, int&,
928 int, int, bool); 935 int, int, bool);
929 936
930 #if 0 937 #if 0
931 template void 938 template void
932 do_scanf_conv (istream&, const char*, float*, Matrix&, double*, int&, 939 do_scanf_conv (istream&, const char*, float*, Matrix&, double*, int&,
1031 } 1038 }
1032 break; 1039 break;
1033 1040
1034 case 'd': case 'i': case 'o': case 'u': case 'x': 1041 case 'd': case 'i': case 'o': case 'u': case 'x':
1035 { 1042 {
1036 int tmp; 1043 switch (elt->modifier)
1037 1044 {
1038 do_scanf_conv (is, fmt, &tmp, mval, data, count, 1045 case 'h':
1039 nr, max_size, discard); 1046 {
1047 short int tmp;
1048 do_scanf_conv (is, fmt, &tmp, mval, data, count,
1049 nr, max_size, discard);
1050 }
1051 break;
1052
1053 case 'l':
1054 {
1055 long int tmp;
1056 do_scanf_conv (is, fmt, &tmp, mval, data, count,
1057 nr, max_size, discard);
1058 }
1059 break;
1060
1061 default:
1062 {
1063 int tmp;
1064 do_scanf_conv (is, fmt, &tmp, mval, data, count,
1065 nr, max_size, discard);
1066 }
1067 break;
1068 }
1040 } 1069 }
1041 break; 1070 break;
1042 1071
1043 case 'e': case 'f': case 'g': 1072 case 'e': case 'f': case 'g':
1044 { 1073 {