From 580d7e3fb0dcc848d8479a6202421dbb8ac39908 Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Wed, 10 May 2006 16:24:53 +0000 Subject: [PATCH] 2006-05-10 Dave Brolley * read.scm (-cgen): Add trailing "/" to arch-path. * utils.scm (dirname): Removed. dirname is a primitive function. --- ChangeLog | 5 +++++ read.scm | 2 +- utils.scm | 9 --------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6e4e88..82c36ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-10 Dave Brolley + + * read.scm (-cgen): Add trailing "/" to arch-path. + * utils.scm (dirname): Removed. dirname is a primitive function. + 2006-05-09 Dave Brolley * utils-sim.scm (-gen-decode-insn-entry): Generated code should shift diff --git a/read.scm b/read.scm index b1bddb1..b9ac1e3 100644 --- a/read.scm +++ b/read.scm @@ -1074,7 +1074,7 @@ Define a preprocessor-style macro. (else (cond ((str=? "-a" (car opt)) (set! arch-file arg) - (set! arch-path (dirname arg)) + (set! arch-path (string-append (dirname arg) "/")) ) ((str=? "-b" (car opt)) (set! debugging #t) diff --git a/utils.scm b/utils.scm index c79f374..f6ec33b 100644 --- a/utils.scm +++ b/utils.scm @@ -155,15 +155,6 @@ (->string str)) ) -; Return the directory name of the given file name - -(define (dirname s) - (let loop ((i (string-length s))) - (cond ((= i 0) "") - ((char=? #\/ (string-ref s (- i 1))) (substring s 0 i)) - (else (loop (- i 1))))) -) - ; Turn STR into lowercase. (define (string-downcase str) -- 2.43.5