Skip to content

Commit 2e827ea

Browse files
pcwaltonpcwalton
committed
stdlib: Port most of getopts over to interior vectors
1 parent 3427a41 commit 2e827ea

File tree

1 file changed

+46
-28
lines changed

1 file changed

+46
-28
lines changed

‎src/lib/getopts.rs

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fn optmulti(str name) -> opt {
6565

6666
tag optval { val(str); given; }
6767

68-
type match = rec(vec[opt] opts, vec[mutable vec[optval]] vals, vec[str] free);
68+
type match = rec(opt[] opts, (optval[])[mutable] vals, vec[str] free);
6969

7070
fn is_arg(str arg) -> bool {
7171
ret str::byte_len(arg) > 1u && arg.(0) == '-' as u8;
@@ -78,9 +78,9 @@ fn name_str(name nm) -> str {
7878
};
7979
}
8080

81-
fn find_opt(vec[opt] opts, name nm) -> option::t[uint] {
81+
fn find_opt(&opt[] opts, name nm) -> option::t[uint] {
8282
auto i = 0u;
83-
auto l = vec::len[opt](opts);
83+
auto l = ivec::len[opt](opts);
8484
while (i < l) {
8585
if (opts.(i).name == nm) { ret some[uint](i); }
8686
i += 1u;
@@ -119,19 +119,31 @@ fn fail_str(fail_ f) -> str {
119119
tag result { success(match); failure(fail_); }
120120

121121
fn getopts(vec[str] args, vec[opt] opts) -> result {
122-
auto n_opts = vec::len[opt](opts);
123-
fn f(uint x) -> vec[optval] { ret vec::empty(); }
124-
auto vals = vec::init_fn_mut[vec[optval]](f, n_opts);
122+
// FIXME: Remove this vec->ivec conversion.
123+
auto args_ivec = ~[]; auto opts_ivec = ~[];
124+
for (str arg in args) { args_ivec += ~[arg]; }
125+
for (opt o in opts) { opts_ivec += ~[o]; }
126+
ret getopts_ivec(args_ivec, opts_ivec);
127+
}
128+
129+
fn getopts_ivec(&str[] args, &opt[] opts) -> result {
130+
auto n_opts = ivec::len[opt](opts);
131+
fn f(uint x) -> optval[] { ret ~[]; }
132+
auto vals = ivec::init_fn_mut[optval[]](f, n_opts);
125133
let vec[str] free = [];
126-
auto l = vec::len[str](args);
134+
auto l = ivec::len[str](args);
127135
auto i = 0u;
128136
while (i < l) {
129137
auto cur = args.(i);
130138
auto curlen = str::byte_len(cur);
131139
if (!is_arg(cur)) {
132-
vec::push[str](free, cur);
140+
free += [cur];
133141
} else if (str::eq(cur, "--")) {
134-
free += vec::slice[str](args, i + 1u, l);
142+
auto j = i + 1u;
143+
while (j < l) {
144+
free += [args.(j)];
145+
j += 1u;
146+
}
135147
break;
136148
} else {
137149
auto names;
@@ -140,19 +152,19 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
140152
auto tail = str::slice(cur, 2u, curlen);
141153
auto eq = str::index(tail, '=' as u8);
142154
if (eq == -1) {
143-
names = [long(tail)];
155+
names = ~[long(tail)];
144156
} else {
145-
names = [long(str::slice(tail, 0u, eq as uint))];
157+
names = ~[long(str::slice(tail, 0u, eq as uint))];
146158
i_arg =
147159
option::some[str](str::slice(tail, (eq as uint) + 1u,
148160
curlen - 2u));
149161
}
150162
} else {
151163
auto j = 1u;
152-
names = [];
164+
names = ~[];
153165
while (j < curlen) {
154166
auto range = str::char_range_at(cur, j);
155-
vec::push[name](names, short(range._0));
167+
names += ~[short(range._0)];
156168
j = range._1;
157169
}
158170
}
@@ -171,29 +183,27 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
171183
if (!option::is_none[str](i_arg)) {
172184
ret failure(unexpected_argument(name_str(nm)));
173185
}
174-
vec::push[optval](vals.(optid), given);
186+
vals.(optid) += ~[given];
175187
}
176188
case (maybe) {
177189
if (!option::is_none[str](i_arg)) {
178-
vec::push[optval](vals.(optid),
179-
val(option::get[str](i_arg)));
180-
} else if (name_pos < vec::len[name](names) ||
190+
vals.(optid) += ~[val(option::get(i_arg))];
191+
} else if (name_pos < ivec::len[name](names) ||
181192
i + 1u == l || is_arg(args.(i + 1u))) {
182-
vec::push[optval](vals.(optid), given);
193+
vals.(optid) += ~[given];
183194
} else {
184195
i += 1u;
185-
vec::push[optval](vals.(optid), val(args.(i)));
196+
vals.(optid) += ~[val(args.(i))];
186197
}
187198
}
188199
case (yes) {
189200
if (!option::is_none[str](i_arg)) {
190-
vec::push[optval](vals.(optid),
191-
val(option::get[str](i_arg)));
201+
vals.(optid) += ~[val(option::get[str](i_arg))];
192202
} else if (i + 1u == l) {
193203
ret failure(argument_missing(name_str(nm)));
194204
} else {
195205
i += 1u;
196-
vec::push[optval](vals.(optid), val(args.(i)));
206+
vals.(optid) += ~[val(args.(i))];
197207
}
198208
}
199209
}
@@ -203,7 +213,7 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
203213
}
204214
i = 0u;
205215
while (i < n_opts) {
206-
auto n = vec::len[optval](vals.(i));
216+
auto n = ivec::len[optval](vals.(i));
207217
auto occ = opts.(i).occur;
208218
if (occ == req) {
209219
if (n == 0u) {
@@ -220,7 +230,7 @@ fn getopts(vec[str] args, vec[opt] opts) -> result {
220230
ret success(rec(opts=opts, vals=vals, free=free));
221231
}
222232

223-
fn opt_vals(match m, str nm) -> vec[optval] {
233+
fn opt_vals(match m, str nm) -> optval[] {
224234
ret alt (find_opt(m.opts, mkname(nm))) {
225235
case (some(?id)) { m.vals.(id) }
226236
case (none) { log_err "No option '" + nm + "' defined."; fail }
@@ -230,7 +240,7 @@ fn opt_vals(match m, str nm) -> vec[optval] {
230240
fn opt_val(match m, str nm) -> optval { ret opt_vals(m, nm).(0); }
231241

232242
fn opt_present(match m, str nm) -> bool {
233-
ret vec::len[optval](opt_vals(m, nm)) > 0u;
243+
ret ivec::len[optval](opt_vals(m, nm)) > 0u;
234244
}
235245

236246
fn opt_str(match m, str nm) -> str {
@@ -240,14 +250,22 @@ fn opt_str(match m, str nm) -> str {
240250
fn opt_strs(match m, str nm) -> vec[str] {
241251
let vec[str] acc = [];
242252
for (optval v in opt_vals(m, nm)) {
243-
alt (v) { case (val(?s)) { vec::push[str](acc, s); } case (_) { } }
253+
alt (v) { case (val(?s)) { acc += [s]; } case (_) { } }
254+
}
255+
ret acc;
256+
}
257+
258+
fn opt_strs_ivec(match m, str nm) -> str[] {
259+
let str[] acc = ~[];
260+
for (optval v in opt_vals(m, nm)) {
261+
alt (v) { case (val(?s)) { acc += ~[s]; } case (_) { } }
244262
}
245263
ret acc;
246264
}
247265

248266
fn opt_maybe_str(match m, str nm) -> option::t[str] {
249267
auto vals = opt_vals(m, nm);
250-
if (vec::len[optval](vals) == 0u) { ret none[str]; }
268+
if (ivec::len[optval](vals) == 0u) { ret none[str]; }
251269
ret alt (vals.(0)) {
252270
case (val(?s)) { some[str](s) }
253271
case (_) { none[str] }
@@ -260,7 +278,7 @@ fn opt_maybe_str(match m, str nm) -> option::t[str] {
260278
/// present and an argument was provided.
261279
fn opt_default(match m, str nm, str def) -> option::t[str] {
262280
auto vals = opt_vals(m, nm);
263-
if (vec::len[optval](vals) == 0u) { ret none[str]; }
281+
if (ivec::len[optval](vals) == 0u) { ret none[str]; }
264282
ret alt (vals.(0)) {
265283
case (val(?s)) { some[str](s) }
266284
case (_) { some[str](def) }

0 commit comments

Comments
 (0)