From 3809c451bdd569d908cb144390ac3cd364c737c4 Mon Sep 17 00:00:00 2001 From: m455 Date: Sat, 1 Feb 2020 23:18:43 -0500 Subject: [PATCH] slowly cleaning things up --- args.rkt | 20 +++++++++++++------- rodo.rkt | 5 +++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/args.rkt b/args.rkt index f2289df..7cf4d5c 100644 --- a/args.rkt +++ b/args.rkt @@ -9,34 +9,40 @@ (provide (all-defined-out)) (define (check-args args) - (let ([args-length (length args)]) + (let ([args-length (length args)] + [is-member? (lambda (command) + (member (list-ref args 0) command))]) (cond [(equal? args-length 0) (utils:display-messages '(show-usage))] ;; help-command [(and (equal? args-length 1) - (member (list-ref args 0) config:help-commands)) + (is-member? config:help-commands)) (utils:display-messages '(show-help))] ;; initialize-command [(and (equal? args-length 1) - (member (list-ref args 0) config:initialize-commands)) + (is-member? config:initialize-commands)) (init:check-initialize-conditions)] ;; add-command - [(and (or (equal? args-length 2) (>= args-length 2)) - (member (list-ref args 0) config:add-commands)) + [(and (>= args-length 2) + (is-member? config:add-commands)) (utils:check-add-conditions args)] ;; list-command [(and (equal? args-length 1) - (member (list-ref args 0) config:list-commands)) + (is-member? config:list-commands)) (utils:check-list-conditions)] ;; remove-command [(and (equal? args-length 2) - (member (list-ref args 0) config:remove-commands) + (is-member? config:remove-commands) + ;; possibly replace this with something that checks + ;; the length, the creates a range with that, starting + ;; from zero, and checks to see if the user input + ;; is a member of that list (real? (string->number (list-ref args 1))) (or (positive? (string->number (list-ref args 1))) (zero? (string->number (list-ref args 1))))) diff --git a/rodo.rkt b/rodo.rkt index 7c7ab1a..23aab7c 100644 --- a/rodo.rkt +++ b/rodo.rkt @@ -3,6 +3,7 @@ (require (prefix-in args: "args.rkt")) (define (main args) - (args:check-args args)) + (let ([args-converted (vector->list args)]) + (args:check-args args-converted))) -(main (vector->list (current-command-line-arguments))) +(main (current-command-line-arguments))