diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/lisplib.boot | 2 | ||||
| -rw-r--r-- | src/interp/nlib.lisp | 9 | ||||
| -rw-r--r-- | src/interp/sys-utility.boot | 7 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b1703f4c..e36e3649 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-05-26 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * interp/nlib.lisp (ADDOPTIONS): Move to sys-utility.boot. + * interp/sys-utility.boot (addCompilerOption): Rename from ADDOPTIONS. + 2013-05-25 Gabriel Dos Reis <gdr@integrable-solutions.net> * algebra/logic.spad.pamphlet: New file. diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 9f5279b2..f408b418 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -466,7 +466,7 @@ initializeLisplib libName == _$ERASE(libName,'ERRORLIB,$libraryDirectory) resetErrorCount() $libFile := writeLib1(libName,'ERRORLIB,$libraryDirectory) - ADDOPTIONS('FILE,$libFile) + addCompilerOption('FILE,$libFile) mkCtorDBForm ctor == ['constructorDB,quote ctor] diff --git a/src/interp/nlib.lisp b/src/interp/nlib.lisp index 4b57238e..e94a77d9 100644 --- a/src/interp/nlib.lisp +++ b/src/interp/nlib.lisp @@ -36,15 +36,6 @@ (IMPORT-MODULE "sys-utility") (in-package "BOOT") -(defun addoptions (key value) "adds pairs to $compilerOptions" - (push (cons key value) |$compilerOptions|) - (if (equal key 'FILE) - (push - (cons 'COMPILER-OUTPUT-STREAM - (open (concat (|libDirname| value) "/" "code.lsp") - :direction :output :if-exists :supersede)) - |$compilerOptions|))) - ;; (RDEFIOSTREAM ((MODE . IO) (FILE fn ft dir))) IO is I,O,INPUT,OUTPUT (defun rdefiostream (options &optional (missing-file-error-flag t)) (let ((mode (cdr (assoc 'mode options))) diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot index 189ff955..d3a8c18d 100644 --- a/src/interp/sys-utility.boot +++ b/src/interp/sys-utility.boot @@ -420,3 +420,10 @@ structure %Libstream == makeLibstream(m,p,idx==nil,st==nil) == mk%Libstream(m,p,idx,st) + +addCompilerOption(key,val) == + $compilerOptions := [[key,:val],:$compilerOptions] + key is 'FILE => + st := outputTextFile strconc(libDirname val,'"/code.lsp") + $compilerOptions := [['COMPILER_-OUTPUT_-STREAM,:st],:$compilerOptions] + nil |