1
0
mirror of https://github.com/janet-lang/janet synced 2025-05-03 16:04:15 +00:00

Fix help.

This commit is contained in:
Calvin Rose 2018-08-15 22:48:35 -04:00
parent 704b56068d
commit d95941597f
3 changed files with 14 additions and 17 deletions

View File

@ -92,7 +92,8 @@ void dst_struct_put(DstKV *st, Dst key, Dst value) {
* is closer to their source than current. We use robinhood * is closer to their source than current. We use robinhood
* hashing to ensure that equivalent structs that are contsructed * hashing to ensure that equivalent structs that are contsructed
* with different order have the same internal layout, and therefor * with different order have the same internal layout, and therefor
* will compare properly - i.e., {1 2 3 4} should equal {3 4 1 2}. */ * will compare properly - i.e., {1 2 3 4} should equal {3 4 1 2}.
* Collisions are resolved via an insertion sort insertion. */
otherhash = dst_hash(kv->key); otherhash = dst_hash(kv->key);
otherindex = dst_struct_maphash(cap, otherhash); otherindex = dst_struct_maphash(cap, otherhash);
otherdist = (i + cap - otherindex) & (cap - 1); otherdist = (i + cap - otherindex) & (cap - 1);
@ -155,11 +156,7 @@ const DstKV *dst_struct_end(DstKV *st) {
/* Get an item from a struct */ /* Get an item from a struct */
Dst dst_struct_get(const DstKV *st, Dst key) { Dst dst_struct_get(const DstKV *st, Dst key) {
const DstKV *kv = dst_struct_find(st, key); const DstKV *kv = dst_struct_find(st, key);
if (NULL == kv) { return kv ? kv->value : dst_wrap_nil();
return dst_wrap_nil();
} else {
return kv->value;
}
} }
/* Get the next key in a struct */ /* Get the next key in a struct */

View File

@ -10,8 +10,8 @@
# Flag handlers # Flag handlers
(def handlers :private (def handlers :private
{"h" (fn [] {"h" (fn @[]
(print "usage: " (get args 0) " [options] scripts...") (print "usage: " (get process.args 0) " [options] scripts...")
(print (print
`Options are: `Options are:
-h Show this help -h Show this help
@ -30,18 +30,18 @@
"-" (fn @[] (:= *handleopts* false) 1) "-" (fn @[] (:= *handleopts* false) 1)
"e" (fn @[i] "e" (fn @[i]
(:= *no-file* false) (:= *no-file* false)
(eval (get args (+ i 1))) (eval (get process.args (+ i 1)))
2)}) 2)})
(defn- dohandler @[n i] (defn- dohandler @[n i]
(def h (get handlers n)) (def h (get handlers n))
(if h (h i) (print "unknown flag -" n))) (if h (h i) (do (print "unknown flag -" n) ((get handlers "h")))))
# Process arguments # Process arguments
(var i 1) (var i 1)
(def lenargs (length args)) (def lenargs (length process.args))
(while (< i lenargs) (while (< i lenargs)
(def arg (get args i)) (def arg (get process.args i))
(if (and *handleopts* (= "-" (string.slice arg 0 1))) (if (and *handleopts* (= "-" (string.slice arg 0 1)))
(+= i (dohandler (string.slice arg 1 2) i)) (+= i (dohandler (string.slice arg 1 2) i))
(do (do

View File

@ -38,7 +38,7 @@ int main(int argc, char **argv) {
args = dst_array(argc); args = dst_array(argc);
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
dst_array_push(args, dst_cstringv(argv[i])); dst_array_push(args, dst_cstringv(argv[i]));
dst_env_def(env, "args", dst_wrap_array(args)); dst_env_def(env, "process.args", dst_wrap_array(args));
/* Expose line getter */ /* Expose line getter */
dst_env_def(env, "getline", dst_wrap_cfunction(dst_line_getter)); dst_env_def(env, "getline", dst_wrap_cfunction(dst_line_getter));