diff -r f27882976251 -r 289a30c4cfb7 Flask.thy --- a/Flask.thy Wed May 15 15:42:46 2013 +0800 +++ b/Flask.thy Thu May 16 15:18:44 2013 +0800 @@ -294,10 +294,7 @@ if (proc_fd_of_file \ f = {}) then (inum_of_file \) (f := None) else inum_of_file \ )" -| "inum_of_file (Rmdir p f # \) = ( - if (proc_fd_of_file \ f = {}) - then (inum_of_file \) (f := None) - else inum_of_file \ )" +| "inum_of_file (Rmdir p f # \) = (inum_of_file \) (f := None)" | "inum_of_file (Mkdir p f ino # \) = (inum_of_file \) (f:= Some ino)" | "inum_of_file (LinkHard p f\<^isub>1 f\<^isub>2 # \) = (inum_of_file \) (f\<^isub>2 := inum_of_file \ f\<^isub>1)" (* @@ -744,7 +741,7 @@ deleted obj s)" | "deleted obj (Clone p p' fds shms # s) = ((\ fd \ current_proc_fds s p. obj = O_fd p' fd \ fd \ fds) \ deleted obj s)" -| "deleted obj (UnLink p f # s) = ((obj = O_file f) \ deleted obj s)" +| "deleted obj (UnLink p f # s) = ((proc_fd_of_file s f = {} \ obj = O_file f) \ deleted obj s)" | "deleted obj (Rmdir p f # s) = ((obj = O_dir f) \ deleted obj s)" | "deleted obj (Exit p # s) = ((obj = O_proc p) \ (\ fd \ current_proc_fds s p. obj = O_fd p fd) \ (\ fd. obj = O_tcp_sock (p, fd) \ is_tcp_sock s (p,fd)) \