This is some cleanup before the OBEY fix.
Note on change in "editSpad2Cmd":
The arguments to system commands are symbols, and it is
common to convert them to strings at the top of the function.
- Qian
--
You received this message because you are subscribed to the Google Groups "FriCAS -
computer algebra system" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/fricas-devel/1c3a5406-0fda-42d8-a333-4407368665a6%40gmail.com.
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index bc9456e8..3088b8ba 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -82,8 +82,7 @@ buildLibdb(domainList) == --called by make-databases (daase.lisp)
domainList => 'done --leave new database in temp.text
-- FIXME: This is confusing: result is in olibdb.text,
-- but this is expected by save_browser_data
- OBEY '"sort _"temp.text_" > _"libdb.text_""
- RENAME_-FILE('"libdb.text", '"olibdb.text")
+ OBEY '"sort temp.text -o olibdb.text"
deleteFile '"temp.text"
buildLibdbConEntry conname ==
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 5cee2ab2..5bf9f186 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -563,8 +563,7 @@ compileAsharpArchiveCmd args ==
throwKeyedMsg("S2IL0027",[namestring dir, path])
if isDir ~= 1 then
- cmd := STRCONC('"mkdir ", namestring dir)
- rc := OBEY cmd
+ rc := makedir namestring dir
rc ~= 0 => throwKeyedMsg("S2IL0027", [namestring dir, path])
curDir := GET_-CURRENT_-DIRECTORY()
@@ -996,7 +995,7 @@ edit l == editSpad2Cmd l
editSpad2Cmd l ==
l:=
null l => $edit_file
- first l
+ PNAME first l
oldDir := pathnameDirectory l
fileTypes :=
pathnameType l => [pathnameType l]
@@ -1049,16 +1048,10 @@ newHelpSpad2Cmd args ==
null(helpFile := make_input_filename([narg, 'HELPSPAD])) => nil
$useFullScreenHelp =>
- OBEY STRCONC('"$FRICAS/lib/SPADEDIT ",namestring helpFile)
+ editFile helpFile
true
- filestream := MAKE_INSTREAM(helpFile)
- repeat
- line := read_line(filestream)
- NULL line =>
- SHUT filestream
- return true
- SAY line
+ print_text_file helpFile
true
--%
