@@ -55,7 +55,7 @@ type error =
55
55
56
56
exception Stop of error (* used internally *)
57
57
58
- open Printf
58
+
59
59
60
60
let rec assoc3 x l =
61
61
match l with
@@ -80,9 +80,18 @@ let print_spec buf (key, spec, doc) =
80
80
if String. length doc > 0 then
81
81
match spec with
82
82
| Symbol (l , _ ) ->
83
+ #if 0
83
84
bprintf buf " %s %s%s\n " key (make_symlist " {" " |" " }" l) doc
85
+ #else
86
+ let sym = make_symlist " {" " |" " }" l in
87
+ Buffer. add_string buf {j| $ (key) $ (sym)$ (doc)\n| j}
88
+ #end
84
89
| _ ->
90
+ #if 0
85
91
bprintf buf " %s %s\n " key doc
92
+ #else
93
+ Buffer. add_string buf {j| $ (key) $ (doc)\n| j}
94
+ #end
86
95
87
96
88
97
let help_action () = raise (Stop (Unknown " -help" ))
@@ -101,7 +110,11 @@ let add_help speclist =
101
110
102
111
103
112
let usage_b buf speclist errmsg =
113
+ #if 0
104
114
bprintf buf " %s\n " errmsg;
115
+ #else
116
+ Buffer. add_string buf {j|$ (errmsg)\n| j};
117
+ #end
105
118
List. iter (print_spec buf) (add_help speclist)
106
119
107
120
@@ -112,7 +125,7 @@ let usage_string speclist errmsg =
112
125
113
126
114
127
let usage speclist errmsg =
115
- eprintf " %s " (usage_string speclist errmsg)
128
+ Js. log (usage_string speclist errmsg)
116
129
117
130
118
131
let current = ref 0
@@ -142,14 +155,30 @@ let parse_and_expand_argv_dynamic_aux allow_expand current argv speclist anonfun
142
155
| Unknown "-help" -> ()
143
156
| Unknown "--help" -> ()
144
157
| Unknown s ->
158
+ #if 0
145
159
bprintf b " %s: unknown option '%s'.\n " progname s
160
+ #else
161
+ Buffer. add_string b {j|$ (progname): unknown option '$ (s)'.\n| j}
162
+ #end
146
163
| Missing s ->
164
+ #if 0
147
165
bprintf b " %s: option '%s' needs an argument.\n " progname s
166
+ #else
167
+ Buffer. add_string b {j|$ (progname): option '$ (s)' needs an argument.\n| j}
168
+ #end
148
169
| Wrong (opt , arg , expected ) ->
170
+ #if 0
149
171
bprintf b " %s: wrong argument '%s'; option '%s' expects %s.\n "
150
172
progname arg opt expected
173
+ #else
174
+ Buffer. add_string b {j|$ (progname): wrong argument '$ (arg)'; option '$ (opt)' expects $ (expected).\n| j}
175
+ #end
151
176
| Message s -> (* user error message *)
177
+ #if 0
152
178
bprintf b " %s: %s.\n " progname s
179
+ #else
180
+ Buffer. add_string b {j|$ (progname): $ (s).\n| j}
181
+ #end
153
182
end ;
154
183
usage_b b ! speclist errmsg;
155
184
if error = Unknown " -help" || error = Unknown " --help"
@@ -280,16 +309,16 @@ let parse l f msg =
280
309
try
281
310
parse_argv Sys. argv l f msg
282
311
with
283
- | Bad msg -> eprintf " %s " msg; exit 2
284
- | Help msg -> printf " %s " msg; exit 0
312
+ | Bad msg -> Js. log msg; exit 2
313
+ | Help msg -> Js. log msg; exit 0
285
314
286
315
287
316
let parse_dynamic l f msg =
288
317
try
289
318
parse_argv_dynamic Sys. argv l f msg
290
319
with
291
- | Bad msg -> eprintf " %s " msg; exit 2
292
- | Help msg -> printf " %s " msg; exit 0
320
+ | Bad msg -> Js. log msg; exit 2
321
+ | Help msg -> Js. log msg; exit 0
293
322
294
323
let parse_expand l f msg =
295
324
try
@@ -298,8 +327,8 @@ let parse_expand l f msg =
298
327
let current = ref (! current) in
299
328
parse_and_expand_argv_dynamic current argv spec f msg
300
329
with
301
- | Bad msg -> eprintf " %s " msg; exit 2
302
- | Help msg -> printf " %s " msg; exit 0
330
+ | Bad msg -> Js. log msg; exit 2
331
+ | Help msg -> Js. log msg; exit 0
303
332
304
333
305
334
let second_word s =
0 commit comments