diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/lisplib.boot | 4 | ||||
| -rw-r--r-- | src/interp/nlib.lisp | 5 | ||||
| -rw-r--r-- | src/interp/setvars.boot | 10 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 4 |
5 files changed, 19 insertions, 11 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37f33f56..e78b0575 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2013-05-26 Gabriel Dos Reis <gdr@integrable-solutions.net> + * interp/lisplib.boot: Replace $FILEP with makeFullFilePath. + * interp/setvars.boot: Likewise. + * interp/nlib.lisp ($FILEP): Remove. + ($OUTFILEP): Likewise. + +2013-05-26 Gabriel Dos Reis <gdr@integrable-solutions.net> + * interp/sys-os.boot (getWorkingDirectory): New. Define via FFI. Replace all uses of GET-CURRENT-DIRECTORY. * interp/daase.lisp (GET-CURRENT-DIRECTORY): Remove. diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index f408b418..b2bbffe2 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2012, Gabriel Dos Reis. +-- Copyright (C) 2007-2013, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -442,7 +442,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,fal,fn) == ok := finalizeLisplib(db,libName) finally RSHUT $libFile if ok then lisplibDoRename(libName) - filearg := $FILEP(libName,$spadLibFT,$libraryDirectory) + filearg := makeFullFilePath [libName,$spadLibFT,$libraryDirectory] RPACKFILE filearg freshLine $algebraOutputStream sayMSG fillerSpaces(72,char "-") diff --git a/src/interp/nlib.lisp b/src/interp/nlib.lisp index f990c2c5..770c6ada 100644 --- a/src/interp/nlib.lisp +++ b/src/interp/nlib.lisp @@ -248,7 +248,7 @@ (cons cd $library-directory-list) $library-directory-list)) (t (adjoin cd - (adjoin (namestring (user-homedir-pathname)) + (adjoin (namestring (|userHomeDirectory|)) $directory-list :test #'string=) :test #'string=))))) @@ -267,9 +267,6 @@ (return newfn))) (|probeReadableFile| filename)))) -(defun $FILEP (&rest filearg) (|makeFullFilePath| filearg)) -(define-function '$OUTFILEP #'$FILEP) ;;temporary bogus def - (defun $findfile (filespec filetypelist) (let ((file-name (if (consp filespec) (car filespec) filespec)) (file-type (if (consp filespec) (cadr filespec) nil))) diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot index 906f2248..b89a8798 100644 --- a/src/interp/setvars.boot +++ b/src/interp/setvars.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2012, Gabriel Dos Reis. +-- Copyright (C) 2007-2013, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -925,7 +925,7 @@ setOutputAlgebra arg == fn := strconc(pathnameDirectory fn,pathnameName fn) ft := ptype if null fm then fm := 'A - filename := $FILEP(fn,ft,fm) + filename := makeFullFilePath [fn,ft,fm] null filename => sayKeyedMsg("S2IV0003",[fn,ft,fm]) (testStream := MAKE_-OUTSTREAM(filename,255,0)) => @@ -1122,7 +1122,7 @@ setOutputFortran arg == fn := strconc(pathnameDirectory fn,pathnameName fn) ft := ptype if null fm then fm := 'A - filename := $FILEP(fn,ft,fm) + filename := makeFullFilePath [fn,ft,fm] null filename => sayKeyedMsg("S2IV0003",[fn,ft,fm]) (testStream := makeStream(append,filename,255,0)) => SHUT $fortranOutputStream @@ -1232,7 +1232,7 @@ setOutputMathml arg == fn := strconc(pathnameDirectory fn,pathnameName fn) ft := ptype if null fm then fm := 'A - filename := $FILEP(fn,ft,fm) + filename := makeFullFilePath [fn,ft,fm] null filename => sayKeyedMsg("S2IV0003",[fn,ft,fm]) (testStream := MAKE_-OUTSTREAM(filename,255,0)) => @@ -1342,7 +1342,7 @@ setOutputTex arg == fn := strconc(pathnameDirectory fn,pathnameName fn) ft := ptype if null fm then fm := 'A - filename := $FILEP(fn,ft,fm) + filename := makeFullFilePath [fn,ft,fm] null filename => sayKeyedMsg("S2IV0003",[fn,ft,fm]) (testStream := MAKE_-OUTSTREAM(filename,255,0)) => diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index ae5902c2..38183144 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -203,6 +203,7 @@ "Option" "systemRootDirectory" "systemLibraryDirectory" + "userHomeDirectory" "pathBasename" @@ -650,6 +651,9 @@ (concatenate 'string (|systemRootDirectory|) "lib/")))) +(defmacro |userHomeDirectory| nil + (user-homedir-pathname)) + ;; Return the list of linkable fasls in in the directory `dir'. (defun linkset-from (dir) (mapcar #'(lambda(f) (concatenate 'string dir f)) |