diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some throws

Browse Source 
fix shell/1 and shell/2 in system library.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@539 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-06-17 06:27:00 +00:00
parent 9915a010cc
commit 804f7ecebc
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/system.yap
View File

@ -209,14 +209,14 @@ environ(Na,Val) :- var(Na), !,
environ(Na,Val) :- atom(Na), !,
bound_environ(Na, Val).
environ(Na,Val) :-
throw(type_error(atom,Na),environ(Na,Val)).
throw(error(type_error(atom,Na),environ(Na,Val))).
bound_environ(Na, Val) :- var(Val), !,
getenv(Na,Val).
bound_environ(Na, Val) :- atom(Val), !,
putenv(Na,Val).
bound_environ(Na, Val) :-
throw(type_error(atom,Val),environ(Na,Val)).
throw(error(type_error(atom,Val),environ(Na,Val))).
environ_enum(X,X).
environ_enum(X,X1) :-
@ -327,14 +327,14 @@ check_command(Com, G) :- var(Com), !,
throw(error(instantiation_error,G)).
check_command(Com, _) :- atom(Com), !.
check_command(Com, G) :-
throw(type_error(atom,Com),G).
throw(error(type_error(atom,Com),G)).
check_mode(Mode, _, G) :- var(Mode), !,
throw(error(instantiation_error,G)).
check_mode(read, 0, _) :- !.
check_mode(write,1, _) :- !.
check_mode(Mode, G) :-
throw(domain_error(io_mode,Mode),G).
throw(error(domain_error(io_mode,Mode),G)).
shell :-
G = shell,
@ -349,12 +349,10 @@ shell(Command) :-
check_command(Command, G),
get_shell(Shell),
atom_codes(Command, SC0),
protect_command(SC0, SC),
protect_command(SC0,SC),
append(Shell, [0'"|SC], ShellCommand),
atom_codes(FullCommand, ShellCommand),
exec_command(FullCommand, 0, 1, 2, PID, Error),
handle_system_error(Error, off, G),
wait(PID, _Status, Error),
do_system(FullCommand, _, Error),
handle_system_error(Error, off, G).
shell(Command, Status) :-
@ -362,15 +360,12 @@ shell(Command, Status) :-
check_command(Command, G),
get_shell(Shell),
atom_codes(Command, SC0),
protect_command(SC0, SC),
protect_command(SC0,SC),
append(Shell, [0'"|SC], ShellCommand),
atom_codes(FullCommand, ShellCommand),
exec_command(FullCommand, 0, 1, 2, PID, Error),
handle_system_error(Error, off, G),
wait(PID, Status,Error),
do_system(FullCommand, Status, Error),
handle_system_error(Error, off, G).
protect_command([], [0'"]).
protect_command([H|L], [H|NL]) :-
protect_command(L, NL).
@ -391,7 +386,7 @@ get_shell(Shell) :-
getenv('COMSPEC', Shell0),
atom_codes(Shell0, Codes),
append(Codes," /c ", Shell).
get_shell("/bin/sh -c").
get_shell("/bin/sh -c ").
system :-
default_shell(Command),

2
pl/boot.yap
View File

@ -1002,7 +1002,7 @@ break :- '$get_value'('$break',BL), NBL is BL+1,
'$command'(Command,Vars,Status).
'$abort_loop'(Stream) :-
throw(permission_error(input,closed_stream,Stream), loop).
throw(error(permission_error(input,closed_stream,Stream), loop)).
/* General purpose predicates */

4
pl/debug.yap
View File

@ -41,9 +41,9 @@
'$suspy'(A,S,M) :- atom(A), !,
'$suspy_predicates_by_name'(A,S,M).
'$suspy'(P,spy,M) :- !,
throw(error(domain_error(predicate_spec,P)),spy(M:P)).
throw(error(domain_error(predicate_spec,P),spy(M:P))).
'$suspy'(P,nospy,M) :-
throw(error(domain_error(predicate_spec,P)),nospy(M:P)).
throw(error(domain_error(predicate_spec,P),nospy(M:P))).
'$suspy_predicates_by_name'(A,S,M) :-
% just check one such predicate exists